status
stringclasses 1
value | repo_name
stringclasses 31
values | repo_url
stringclasses 31
values | issue_id
int64 1
104k
| title
stringlengths 4
233
| body
stringlengths 0
186k
⌀ | issue_url
stringlengths 38
56
| pull_url
stringlengths 37
54
| before_fix_sha
stringlengths 40
40
| after_fix_sha
stringlengths 40
40
| report_datetime
timestamp[us, tz=UTC] | language
stringclasses 5
values | commit_datetime
timestamp[us, tz=UTC] | updated_file
stringlengths 7
188
| chunk_content
stringlengths 1
1.03M
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
}
} else {
defaultPath = storageOperate.getResDir(tenantCode);
if (type.equals(ResourceType.UDF)) {
defaultPath = storageOperate.getUdfDir(tenantCode);
}
resourcesList = storageOperate.listFilesStatusRecursively(fullName, defaultPath, tenantCode, type);
}
Visitor resourceTreeVisitor = new ResourceTreeVisitor(resourcesList);
result.put(Constants.DATA_LIST, resourceTreeVisitor.visit(defaultPath).getChildren());
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query resource list by program type
*
* @param loginUser login user
* @param type resource type
* @return resource list
*/
@Override
public Result<Object> queryResourceByProgramType(User loginUser, ResourceType type, ProgramType programType) {
Result<Object> result = new Result<>();
Set<Integer> resourceIds = resourcePermissionCheckService
.userOwnedResourceIdsAcquisition(checkResourceType(type), loginUser.getId(), log);
if (resourceIds.isEmpty()) {
result.setData(Collections.emptyList());
putMsg(result, Status.SUCCESS);
return result;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
List<Resource> allResourceList = resourcesMapper.selectBatchIds(resourceIds);
String suffix = ".jar";
if (programType != null) {
switch (programType) {
case JAVA:
case SCALA:
break;
case PYTHON:
suffix = ".py";
break;
default:
}
}
List<Resource> resources = new ResourceFilter(suffix, new ArrayList<>(allResourceList)).filter();
List<StorageEntity> transformedResourceList = resources.stream()
.map(this::createStorageEntityBasedOnResource)
.collect(Collectors.toList());
Visitor visitor = new ResourceTreeVisitor(transformedResourceList);
result.setData(visitor.visit("").getChildren());
putMsg(result, Status.SUCCESS);
return result;
}
/**
* transform resource object into StorageEntity object
*
* @param resource a resource object
* @return a storageEntity object
*/
private StorageEntity createStorageEntityBasedOnResource(Resource resource) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
StorageEntity entity = new StorageEntity();
entity.setFullName(resource.getFullName());
entity.setPfullName(resource.getPid() == -1 ? ""
: resourcesMapper.selectById(resource.getPid()).getFullName());
entity.setDirectory(resource.isDirectory());
entity.setAlias(resource.getAlias());
entity.setId(resource.getId());
entity.setType(resource.getType());
entity.setDescription(resource.getDescription());
return entity;
}
/**
* delete resource
*
* @param loginUser login user
* @param fullName resource full name
* @param resTenantCode tenantCode in the request field "resTenantCode" for tenant code owning the resource,
* can be different from the login user in the case of logging in as admin users.
* @return delete result code
* @throws IOException exception
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<Object> delete(User loginUser, String fullName,
String resTenantCode) throws IOException {
Result<Object> result = new Result<>();
result = checkResourceUploadStartupState();
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
return result;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
User user = userMapper.selectById(loginUser.getId());
if (user == null) {
log.error("user {} not exists", loginUser.getId());
putMsg(result, Status.USER_NOT_EXIST, loginUser.getId());
return result;
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
log.error("tenant not exists");
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
return result;
}
String tenantCode = tenant.getTenantCode();
if (!isUserTenantValid(isAdmin(loginUser), tenantCode, resTenantCode)) {
log.error("current user does not have permission");
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
String defaultPath = storageOperate.getResDir(tenantCode);
StorageEntity resource;
try {
resource = storageOperate.getFileStatus(fullName, defaultPath, resTenantCode, null);
} catch (Exception e) {
log.error(e.getMessage() + " Resource path: {}", fullName, e);
putMsg(result, Status.RESOURCE_NOT_EXIST);
throw new ServiceException(String.format(e.getMessage() + " Resource path: %s", fullName));
}
if (resource == null) {
log.error("Resource does not exist, resource full name:{}.", fullName);
putMsg(result, Status.RESOURCE_NOT_EXIST);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
return result;
}
List<String> allChildren = storageOperate.listFilesStatusRecursively(fullName, defaultPath,
resTenantCode, resource.getType()).stream().map(storageEntity -> storageEntity.getFullName())
.collect(Collectors.toList());
Set<ResourcesTask> resourcesNeedToDeleteSet = new HashSet<>();
String[] allChildrenFullNameArray = allChildren.stream().toArray(String[]::new);
if (allChildrenFullNameArray.length != 0) {
resourcesNeedToDeleteSet.addAll(
resourceTaskMapper.selectBatchFullNames(allChildrenFullNameArray));
}
if (resource.getType() == (ResourceType.UDF)) {
List<UdfFunc> udfFuncs = udfFunctionMapper.listUdfByResourceFullName(allChildrenFullNameArray);
if (CollectionUtils.isNotEmpty(udfFuncs)) {
log.warn("Resource can not be deleted because it is bound by UDF functions, udfFuncIds:{}",
udfFuncs);
putMsg(result, Status.UDF_RESOURCE_IS_BOUND, udfFuncs.get(0).getFuncName());
return result;
}
}
if (resourcesNeedToDeleteSet.size() > 0) {
for (ResourcesTask resourcesTask : resourcesNeedToDeleteSet) {
int taskId = resourcesTask.getTaskId();
if (processService.isTaskOnline(taskDefinitionMapper.selectById(taskId).getCode())) {
log.error("can't be deleted,because it is used of process definition that's online");
log.error("resource task relation id:{} is used of task code {}", resourcesTask.getId(),
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
taskDefinitionMapper.selectById(taskId).getCode());
putMsg(result, Status.RESOURCE_IS_USED);
return result;
}
}
for (ResourcesTask existResource : resourcesNeedToDeleteSet) {
int taskId = existResource.getTaskId();
long taskCode = taskDefinitionMapper.selectById(taskId).getCode();
List<ProcessTaskRelation> processTaskRelation = processTaskRelationMapper.selectByMap(
Collections.singletonMap("post_task_code", taskCode));
if (processTaskRelation.size() > 0) {
long processDefinitionCode = processTaskRelation.get(0).getProcessDefinitionCode();
int processDefinitionVersion = processTaskRelation.get(0).getProcessDefinitionVersion();
List<ProcessTaskRelation> taskRelationList = processTaskRelationMapper.queryByProcessCode(
processTaskRelation.get(0).getProjectCode(),
processDefinitionCode);
List<TaskDefinition> taskDefinitionLogList = new ArrayList<>();
if (taskRelationList.size() > 0) {
ProcessDefinitionLog processDefinition =
processDefinitionLogMapper.queryByDefinitionCodeAndVersion(
processDefinitionCode, processDefinitionVersion);
for (ProcessTaskRelation taskRelation : taskRelationList) {
long taskCodeInProcess = taskRelation.getPostTaskCode();
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(taskCodeInProcess);
if (taskCodeInProcess == taskCode) {
taskDefinition.setTaskParams(RemoveResourceFromResourceList(existResource.getFullName(),
taskDefinition.getTaskParams(), false));
}
taskDefinitionLogList.add(taskDefinition);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
}
if (processDefinition != null) {
processDefinitionService.updateProcessDefinition(loginUser,
processDefinition.getProjectCode(),
processDefinition.getName(),
processDefinition.getCode(),
processDefinition.getDescription(),
processDefinition.getGlobalParams(),
processDefinition.getLocations(),
processDefinition.getTimeout(),
tenantCode,
JSONUtils.toJsonString(taskRelationList.toArray()),
JSONUtils.toJsonString(taskDefinitionLogList.toArray()),
"",
processDefinition.getExecutionType());
}
}
}
}
}
storageOperate.delete(fullName, allChildren, true);
putMsg(result, Status.SUCCESS);
return result;
}
private String RemoveResourceFromResourceList(String stringToDelete, String taskParameter, boolean isDir) {
Map<String, Object> taskParameters = JSONUtils.parseObject(
taskParameter,
new TypeReference<Map<String, Object>>() {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
});
if (taskParameters.containsKey("resourceList")) {
String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList"));
List<ResourceInfo> resourceInfoList = JSONUtils.toList(resourceListStr, ResourceInfo.class);
List<ResourceInfo> updatedResourceInfoList;
if (isDir) {
String stringToDeleteWSeparator = stringToDelete + FOLDER_SEPARATOR;
updatedResourceInfoList = resourceInfoList.stream()
.filter(Objects::nonNull)
.filter(resourceInfo -> !resourceInfo.getResourceName().startsWith(stringToDeleteWSeparator))
.collect(Collectors.toList());
} else {
updatedResourceInfoList = resourceInfoList.stream()
.filter(Objects::nonNull)
.filter(resourceInfo -> !resourceInfo.getResourceName().equals(stringToDelete))
.collect(Collectors.toList());
}
taskParameters.put("resourceList", updatedResourceInfoList);
return JSONUtils.toJsonString(taskParameters);
}
return taskParameter;
}
private String AddResourceToResourceList(String oldPrefix, String newPrefix, String resFullName,
String taskParameter, boolean isDir) {
Map<String, Object> taskParameters = JSONUtils.parseObject(
taskParameter,
new TypeReference<Map<String, Object>>() {
});
if (taskParameters.containsKey("resourceList")) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList"));
List<ResourceInfo> resourceInfos = JSONUtils.toList(resourceListStr, ResourceInfo.class);
ResourceInfo newResource = new ResourceInfo();
if (isDir) {
String oldFullNameWSeparator = oldPrefix + FOLDER_SEPARATOR;
String newFullNameWSpearator = newPrefix + FOLDER_SEPARATOR;
newResource.setResourceName(resFullName.replace(oldFullNameWSeparator, newFullNameWSpearator));
} else {
newResource.setResourceName(newPrefix);
}
resourceInfos.add(newResource);
taskParameters.put("resourceList", resourceInfos);
return JSONUtils.toJsonString(taskParameters);
}
return taskParameter;
}
private String RemoveResourceFromIdsNew(int idToDelete, String idNews) {
String[] resourceIds = idNews.split(",");
Set<Integer> resourceIdSet = Arrays.stream(resourceIds)
.map(Integer::parseInt)
.filter(integerId -> !integerId.equals(idToDelete))
.collect(Collectors.toSet());
return Joiner.on(",").join(resourceIdSet);
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
* verify resource by name and type
*
* @param loginUser login user
* @param fullName resource full name
* @param type resource type
* @return true if the resource name not exists, otherwise return false
*/
@Override
public Result<Object> verifyResourceName(String fullName, ResourceType type, User loginUser) {
Result<Object> result = new Result<>();
putMsg(result, Status.SUCCESS);
if (checkResourceExists(fullName)) {
log.error("Resource with same name exists so can not create again, resourceType:{}, resourceName:{}.",
type, RegexUtils.escapeNRT(fullName));
putMsg(result, Status.RESOURCE_EXIST);
}
return result;
}
/**
* verify resource by full name or pid and type
*
* @param fileName resource file name
* @param type resource type
* @param resTenantCode tenantCode in the request field "resTenantCode" for tenant code owning the resource,
* can be different from the login user in the case of logging in as admin users.
* @return true if the resource full name or pid not exists, otherwise return false
*/
@Override
public Result<Object> queryResourceByFileName(User loginUser, String fileName, ResourceType type,
String resTenantCode) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
Result<Object> result = new Result<>();
if (StringUtils.isBlank(fileName)) {
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR);
return result;
}
User user = userMapper.selectById(loginUser.getId());
if (user == null) {
log.error("user {} not exists", loginUser.getId());
putMsg(result, Status.USER_NOT_EXIST, loginUser.getId());
return result;
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
log.error("tenant not exists");
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
return result;
}
String tenantCode = tenant.getTenantCode();
if (!isUserTenantValid(isAdmin(loginUser), tenantCode, resTenantCode)) {
log.error("current user does not have permission");
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
String defaultPath = storageOperate.getResDir(resTenantCode);
if (type.equals(ResourceType.UDF)) {
defaultPath = storageOperate.getUdfDir(resTenantCode);
}
StorageEntity file;
try {
file = storageOperate.getFileStatus(defaultPath + fileName, defaultPath, resTenantCode, type);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
} catch (Exception e) {
log.error(e.getMessage() + " Resource path: {}", defaultPath + fileName, e);
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
}
putMsg(result, Status.SUCCESS);
result.setData(file);
return result;
}
/**
* get resource by id
* @param fullName resource full name
* @param resTenantCode tenantCode in the request field "resTenantCode" for tenant code owning the resource,
* can be different from the login user in the case of logging in as admin users.
* @return resource
*/
@Override
public Result<Object> queryResourceByFullName(User loginUser, String fullName, String resTenantCode,
ResourceType type) throws IOException {
Result<Object> result = new Result<>();
User user = userMapper.selectById(loginUser.getId());
if (user == null) {
log.error("user {} not exists", loginUser.getId());
putMsg(result, Status.USER_NOT_EXIST, loginUser.getId());
return result;
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
log.error("tenant not exists");
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
return result;
}
String tenantCode = tenant.getTenantCode();
if (!isUserTenantValid(isAdmin(loginUser), tenantCode, resTenantCode)) {
log.error("current user does not have permission");
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
String defaultPath = storageOperate.getResDir(resTenantCode);
if (type.equals(ResourceType.UDF)) {
defaultPath = storageOperate.getUdfDir(resTenantCode);
}
StorageEntity file;
try {
file = storageOperate.getFileStatus(fullName, defaultPath, resTenantCode, type);
} catch (Exception e) {
log.error(e.getMessage() + " Resource path: {}", fullName, e);
putMsg(result, Status.RESOURCE_NOT_EXIST);
throw new ServiceException(String.format(e.getMessage() + " Resource path: %s", fullName));
}
putMsg(result, Status.SUCCESS);
result.setData(file);
return result;
}
/**
* view resource file online
*
* @param fullName resource fullName
* @param resTenantCode owner's tenant code of the resource
* @param skipLineNum skip line number
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
* @param limit limit
* @return resource content
*/
@Override
public Result<Object> readResource(User loginUser, String fullName, String resTenantCode,
int skipLineNum, int limit) {
Result<Object> result = checkResourceUploadStartupState();
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
return result;
}
User user = userMapper.selectById(loginUser.getId());
if (user == null) {
log.error("user {} not exists", loginUser.getId());
putMsg(result, Status.USER_NOT_EXIST, loginUser.getId());
return result;
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
log.error("tenant not exists");
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
return result;
}
String tenantCode = tenant.getTenantCode();
if (!isUserTenantValid(isAdmin(loginUser), tenantCode, resTenantCode)) {
log.error("current user does not have permission");
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
String nameSuffix = Files.getFileExtension(fullName);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
String resourceViewSuffixes = FileUtils.getResourceViewSuffixes();
if (StringUtils.isNotEmpty(resourceViewSuffixes)) {
List<String> strList = Arrays.asList(resourceViewSuffixes.split(","));
if (!strList.contains(nameSuffix)) {
log.error("Resource suffix does not support view,resourceFullName:{}, suffix:{}.", fullName,
nameSuffix);
putMsg(result, Status.RESOURCE_SUFFIX_NOT_SUPPORT_VIEW);
return result;
}
}
List<String> content = new ArrayList<>();
try {
if (storageOperate.exists(fullName)) {
content = storageOperate.vimFile(tenantCode, fullName, skipLineNum, limit);
} else {
log.error("read file {} not exist in storage", fullName);
putMsg(result, Status.RESOURCE_FILE_NOT_EXIST, fullName);
return result;
}
} catch (Exception e) {
log.error("Resource {} read failed", fullName, e);
putMsg(result, Status.HDFS_OPERATION_ERROR);
return result;
}
putMsg(result, Status.SUCCESS);
Map<String, Object> map = new HashMap<>();
map.put(ALIAS, fullName);
map.put(CONTENT, String.join("\n", content));
result.setData(map);
return result;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
}
/**
* create resource file online
*
* @param loginUser login user
* @param type resource type
* @param fileName file name
* @param fileSuffix file suffix
* @param desc description
* @param content content
* @param currentDir current directory
* @return create result code
*/
@Override
@Transactional
public Result<Object> onlineCreateResource(User loginUser, ResourceType type, String fileName, String fileSuffix,
String desc, String content, String currentDir) {
Result<Object> result = new Result<>();
result = checkResourceUploadStartupState();
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
return result;
}
User user = userMapper.selectById(loginUser.getId());
if (user == null) {
log.error("user {} not exists", loginUser.getId());
putMsg(result, Status.USER_NOT_EXIST, loginUser.getId());
return result;
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
log.error("tenant not exists");
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
return result;
}
String tenantCode = tenant.getTenantCode();
if (!isUserTenantValid(isAdmin(loginUser), tenantCode, "")) {
log.error("current user does not have permission");
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
if (FileUtils.directoryTraversal(fileName)) {
log.warn("File name verify failed, fileName:{}.", RegexUtils.escapeNRT(fileName));
putMsg(result, Status.VERIFY_PARAMETER_NAME_FAILED);
return result;
}
String nameSuffix = fileSuffix.trim();
String resourceViewSuffixes = FileUtils.getResourceViewSuffixes();
if (StringUtils.isNotEmpty(resourceViewSuffixes)) {
List<String> strList = Arrays.asList(resourceViewSuffixes.split(","));
if (!strList.contains(nameSuffix)) {
log.warn("Resource suffix does not support view, suffix:{}.", nameSuffix);
putMsg(result, Status.RESOURCE_SUFFIX_NOT_SUPPORT_VIEW);
return result;
}
}
String name = fileName.trim() + "." + nameSuffix;
String fullName = "";
String userResRootPath = storageOperate.getResDir(tenantCode);
if (!currentDir.contains(userResRootPath)) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
fullName = userResRootPath + name;
} else {
fullName = currentDir + name;
}
result = verifyResourceName(fullName, type, loginUser);
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
return result;
}
result = uploadContentToStorage(loginUser, fullName, tenantCode, content);
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
throw new ServiceException(result.getMsg());
}
return result;
}
@Override
@Transactional
public StorageEntity createOrUpdateResource(String userName, String filepath,
String resourceContent) throws Exception {
User user = userMapper.queryByUserNameAccurately(userName);
int suffixLabelIndex = filepath.indexOf(PERIOD);
if (suffixLabelIndex == -1) {
throw new IllegalArgumentException(String
.format("Not allow create or update resources without extension name, filepath: %s", filepath));
}
String defaultPath = storageOperate.getResDir(user.getTenantCode());
String fullName = defaultPath + filepath;
Result<Object> result = uploadContentToStorage(user, fullName, user.getTenantCode(), resourceContent);
if (result.getCode() != Status.SUCCESS.getCode()) {
throw new ServiceException(result.getMsg());
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
return storageOperate.getFileStatus(fullName, defaultPath, user.getTenantCode(), ResourceType.FILE);
}
private void permissionPostHandle(ResourceType resourceType, User loginUser, Integer resourceId) {
AuthorizationType authorizationType =
resourceType.equals(ResourceType.FILE) ? AuthorizationType.RESOURCE_FILE_ID
: AuthorizationType.UDF_FILE;
permissionPostHandle(authorizationType, loginUser.getId(), Collections.singletonList(resourceId), log);
}
private Result<Object> checkResourceUploadStartupState() {
Result<Object> result = new Result<>();
putMsg(result, Status.SUCCESS);
if (!PropertyUtils.getResUploadStartupState()) {
log.error("Storage does not start up, resource upload startup state: {}.",
PropertyUtils.getResUploadStartupState());
putMsg(result, Status.STORAGE_NOT_STARTUP);
return result;
}
return result;
}
private Result<Object> verifyResource(User loginUser, ResourceType type, String fullName, int pid) {
Result<Object> result = verifyResourceName(fullName, type, loginUser);
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
return result;
}
return verifyPid(loginUser, pid);
}
private Result<Object> verifyPid(User loginUser, int pid) {
Result<Object> result = new Result<>();
putMsg(result, Status.SUCCESS);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
if (pid != -1) {
Resource parentResource = resourcesMapper.selectById(pid);
if (parentResource == null) {
log.error("Parent resource does not exist, parentResourceId:{}.", pid);
putMsg(result, Status.PARENT_RESOURCE_NOT_EXIST);
return result;
}
if (!canOperator(loginUser, parentResource.getUserId())) {
log.warn("User does not have operation privilege, loginUserName:{}.", loginUser.getUserName());
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
}
return result;
}
/**
* updateProcessInstance resource
*
* @param fullName resource full name
* @param resTenantCode tenantCode in the request field "resTenantCode" for tenant code owning the resource,
* can be different from the login user in the case of logging in as admin users.
* @param content content
* @return update result cod
*/
@Override
@Transactional
public Result<Object> updateResourceContent(User loginUser, String fullName, String resTenantCode,
String content) {
Result<Object> result = checkResourceUploadStartupState();
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
return result;
}
User user = userMapper.selectById(loginUser.getId());
if (user == null) {
log.error("user {} not exists", loginUser.getId());
putMsg(result, Status.USER_NOT_EXIST, loginUser.getId());
return result;
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
log.error("tenant not exists");
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
return result;
}
String tenantCode = tenant.getTenantCode();
if (!isUserTenantValid(isAdmin(loginUser), tenantCode, resTenantCode)) {
log.error("current user does not have permission");
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
StorageEntity resource;
try {
resource = storageOperate.getFileStatus(fullName, "", resTenantCode, ResourceType.FILE);
} catch (Exception e) {
log.error("error occurred when fetching resource information , resource full name {}", fullName);
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
}
if (resource == null) {
log.error("Resource does not exist, resource full name:{}.", fullName);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
}
String nameSuffix = Files.getFileExtension(resource.getAlias());
String resourceViewSuffixes = FileUtils.getResourceViewSuffixes();
if (StringUtils.isNotEmpty(resourceViewSuffixes)) {
List<String> strList = Arrays.asList(resourceViewSuffixes.split(","));
if (!strList.contains(nameSuffix)) {
log.warn("Resource suffix does not support view, resource full name:{}, suffix:{}.",
fullName, nameSuffix);
putMsg(result, Status.RESOURCE_SUFFIX_NOT_SUPPORT_VIEW);
return result;
}
}
result = uploadContentToStorage(loginUser, resource.getFullName(), resTenantCode, content);
if (!result.getCode().equals(Status.SUCCESS.getCode())) {
throw new ServiceException(result.getMsg());
} else
log.info("Update resource content complete, resource full name:{}.", fullName);
return result;
}
/**
* @param fullName resource full name
* @param tenantCode tenant code
* @param content content
* @return result
*/
private Result<Object> uploadContentToStorage(User loginUser, String fullName, String tenantCode, String content) {
Result<Object> result = new Result<>();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
String localFilename = "";
try {
localFilename = FileUtils.getUploadFilename(tenantCode, UUID.randomUUID().toString());
if (!FileUtils.writeContent2File(content, localFilename)) {
log.error("Write file error, fileName:{}, content:{}.", localFilename,
RegexUtils.escapeNRT(content));
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
}
String resourcePath = storageOperate.getResDir(tenantCode);
log.info("resource path is {}, resource dir is {}", fullName, resourcePath);
if (!storageOperate.exists(resourcePath)) {
storageOperate.createTenantDirIfNotExists(tenantCode);
log.info("Create tenant dir because path {} does not exist, tenantCode:{}.", resourcePath,
tenantCode);
}
if (storageOperate.exists(fullName)) {
storageOperate.delete(fullName, false);
}
storageOperate.upload(tenantCode, localFilename, fullName, true, true);
} catch (Exception e) {
log.error("Upload content to storage error, tenantCode:{}, destFileName:{}.", tenantCode, localFilename,
e);
result.setCode(Status.HDFS_OPERATION_ERROR.getCode());
result.setMsg(String.format("copy %s to hdfs %s fail", localFilename, fullName));
return result;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
log.info("Upload content to storage complete, tenantCode:{}, destFileName:{}.", tenantCode, localFilename);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* download file
* @return resource content
* @throws IOException exception
*/
@Override
public org.springframework.core.io.Resource downloadResource(User loginUser,
String fullName) throws IOException {
if (!PropertyUtils.getResUploadStartupState()) {
log.warn("Storage does not start up, resource upload startup state: {}.",
PropertyUtils.getResUploadStartupState());
throw new ServiceException("hdfs not startup");
}
if (fullName.endsWith("/")) {
log.error("resource id {} is directory,can't download it", fullName);
throw new ServiceException("can't download directory");
}
int userId = loginUser.getId();
User user = userMapper.selectById(userId);
if (user == null) {
log.error("User does not exits, userId:{}.", userId);
throw new ServiceException(String.format("Resource owner id %d does not exist", userId));
}
String tenantCode = "";
if (user.getTenantId() != 0) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
log.error("Tenant id {} not exists", user.getTenantId());
throw new ServiceException(
String.format("The tenant id %d of resource owner not exist", user.getTenantId()));
}
tenantCode = tenant.getTenantCode();
}
String[] aliasArr = fullName.split("/");
String alias = aliasArr[aliasArr.length - 1];
String localFileName = FileUtils.getDownloadFilename(alias);
log.info("Resource path is {}, download local filename is {}", alias, localFileName);
try {
storageOperate.download(tenantCode, fullName, localFileName, false, true);
return org.apache.dolphinscheduler.api.utils.FileUtils.file2Resource(localFileName);
} catch (IOException e) {
log.error("Download resource error, the path is {}, and local filename is {}, the error message is {}",
fullName, localFileName, e.getMessage());
throw new ServiceException("Download the resource file failed ,it may be related to your storage");
}
}
/**
* list all file
*
* @param loginUser login user
* @param userId user id
* @return unauthorized result code
*/
@Override
public Map<String, Object> authorizeResourceTree(User loginUser, Integer userId) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
Map<String, Object> result = new HashMap<>();
if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
List<Resource> resourceList;
if (isAdmin(loginUser)) {
resourceList = resourcesMapper.queryResourceExceptUserId(userId);
} else {
resourceList = resourcesMapper.queryResourceListAuthored(loginUser.getId(), -1);
}
List<ResourceComponent> list;
if (CollectionUtils.isNotEmpty(resourceList)) {
List<StorageEntity> transformedResourceList = resourceList.stream()
.map(this::createStorageEntityBasedOnResource)
.collect(Collectors.toList());
Visitor visitor = new ResourceTreeVisitor(transformedResourceList);
list = visitor.visit("").getChildren();
} else {
list = new ArrayList<>(0);
}
result.put(Constants.DATA_LIST, list);
putMsg(result, Status.SUCCESS);
return result;
}
@Override
public StorageEntity queryFileStatus(String userName, String fileName) throws Exception {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
User user = userMapper.queryByUserNameAccurately(userName);
String defaultPath = storageOperate.getResDir(user.getTenantCode());
return storageOperate.getFileStatus(defaultPath + fileName, defaultPath, user.getTenantCode(),
ResourceType.FILE);
}
@Override
public DeleteDataTransferResponse deleteDataTransferData(User loginUser, Integer days) {
DeleteDataTransferResponse result = new DeleteDataTransferResponse();
User user = userMapper.selectById(loginUser.getId());
if (user == null) {
log.error("user {} not exists", loginUser.getId());
putMsg(result, Status.USER_NOT_EXIST, loginUser.getId());
return result;
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
log.error("tenant not exists");
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
return result;
}
String tenantCode = tenant.getTenantCode();
String baseFolder = storageOperate.getResourceFileName(tenantCode, "DATA_TRANSFER");
LocalDateTime now = LocalDateTime.now();
now = now.minus(days, ChronoUnit.DAYS);
String deleteDate = now.toLocalDate().toString().replace("-", "");
List<StorageEntity> storageEntities;
try {
storageEntities = new ArrayList<>(
storageOperate.listFilesStatus(baseFolder, baseFolder, tenantCode, ResourceType.FILE));
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
} catch (Exception e) {
log.error("delete data transfer data error", e);
putMsg(result, Status.DELETE_RESOURCE_ERROR);
return result;
}
List<String> successList = new ArrayList<>();
List<String> failList = new ArrayList<>();
for (StorageEntity storageEntity : storageEntities) {
File path = new File(storageEntity.getFullName());
String date = path.getName();
if (date.compareTo(deleteDate) <= 0) {
try {
storageOperate.delete(storageEntity.getFullName(), true);
successList.add(storageEntity.getFullName());
} catch (Exception ex) {
log.error("delete data transfer data {} error, please delete it manually", date, ex);
failList.add(storageEntity.getFullName());
}
}
}
result.setSuccessList(successList);
result.setFailedList(failList);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* unauthorized file
*
* @param loginUser login user
* @param userId user id
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
* @return unauthorized result code
*/
@Override
public Map<String, Object> unauthorizedFile(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
List<Resource> resourceList;
if (isAdmin(loginUser)) {
resourceList = resourcesMapper.queryResourceExceptUserId(userId);
} else {
resourceList = resourcesMapper.queryResourceListAuthored(loginUser.getId(), -1);
}
List<Resource> list;
if (resourceList != null && !resourceList.isEmpty()) {
Set<Resource> resourceSet = new HashSet<>(resourceList);
List<Resource> authedResourceList = queryResourceList(userId, Constants.AUTHORIZE_WRITABLE_PERM);
getAuthorizedResourceList(resourceSet, authedResourceList);
list = new ArrayList<>(resourceSet);
} else {
list = new ArrayList<>(0);
}
List<StorageEntity> transformedResourceList = list.stream()
.map(this::createStorageEntityBasedOnResource)
.collect(Collectors.toList());
Visitor visitor = new ResourceTreeVisitor(transformedResourceList);
result.put(Constants.DATA_LIST, visitor.visit("").getChildren());
putMsg(result, Status.SUCCESS);
return result;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
}
/**
* unauthorized udf function
*
* @param loginUser login user
* @param userId user id
* @return unauthorized result code
*/
@Override
public Map<String, Object> unauthorizedUDFFunction(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
List<UdfFunc> udfFuncList;
if (isAdmin(loginUser)) {
udfFuncList = udfFunctionMapper.queryUdfFuncExceptUserId(userId);
} else {
udfFuncList = udfFunctionMapper.selectByMap(Collections.singletonMap("user_id", loginUser.getId()));
}
List<UdfFunc> resultList = new ArrayList<>();
Set<UdfFunc> udfFuncSet;
if (CollectionUtils.isNotEmpty(udfFuncList)) {
udfFuncSet = new HashSet<>(udfFuncList);
List<UdfFunc> authedUDFFuncList = udfFunctionMapper.queryAuthedUdfFunc(userId);
getAuthorizedResourceList(udfFuncSet, authedUDFFuncList);
resultList = new ArrayList<>(udfFuncSet);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
}
result.put(Constants.DATA_LIST, resultList);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* authorized udf function
*
* @param loginUser login user
* @param userId user id
* @return authorized result code
*/
@Override
public Map<String, Object> authorizedUDFFunction(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
List<UdfFunc> udfFuncs = udfFunctionMapper.queryAuthedUdfFunc(userId);
result.put(Constants.DATA_LIST, udfFuncs);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* authorized file
*
* @param loginUser login user
* @param userId user id
* @return authorized result
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
*/
@Override
public Map<String, Object> authorizedFile(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
List<Resource> authedResources = queryResourceList(userId, Constants.AUTHORIZE_WRITABLE_PERM);
List<StorageEntity> transformedResourceList = authedResources.stream()
.map(this::createStorageEntityBasedOnResource)
.collect(Collectors.toList());
Visitor visitor = new ResourceTreeVisitor(transformedResourceList);
String visit = JSONUtils.toJsonString(visitor.visit(""), SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
log.info(visit);
String jsonTreeStr =
JSONUtils.toJsonString(visitor.visit("").getChildren(), SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
log.info(jsonTreeStr);
result.put(Constants.DATA_LIST, visitor.visit("").getChildren());
putMsg(result, Status.SUCCESS);
return result;
}
/**
* get authorized resource list
*
* @param resourceSet resource set
* @param authedResourceList authorized resource list
*/
private void getAuthorizedResourceList(Set<?> resourceSet, List<?> authedResourceList) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
Set<?> authedResourceSet;
if (CollectionUtils.isNotEmpty(authedResourceList)) {
authedResourceSet = new HashSet<>(authedResourceList);
resourceSet.removeAll(authedResourceSet);
}
}
/**
* list all children id
*
* @param resource resource
* @param containSelf whether add self to children list
* @return all children id
*/
List<Integer> listAllChildren(Resource resource, boolean containSelf) {
List<Integer> childList = new ArrayList<>();
if (resource.getId() != null && containSelf) {
childList.add(resource.getId());
}
if (resource.isDirectory()) {
listAllChildren(resource.getId(), childList);
}
return childList;
}
/**
* list all children id
*
* @param resourceId resource id
* @param childList child list
*/
void listAllChildren(int resourceId, List<Integer> childList) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
List<Integer> children = resourcesMapper.listChildren(resourceId);
for (int childId : children) {
childList.add(childId);
listAllChildren(childId, childList);
}
}
/**
* query authored resource list (own and authorized)
*
* @param loginUser login user
* @param type ResourceType
* @return all authored resource list
*/
private List<Resource> queryAuthoredResourceList(User loginUser, ResourceType type) {
Set<Integer> resourceIds = resourcePermissionCheckService
.userOwnedResourceIdsAcquisition(checkResourceType(type), loginUser.getId(), log);
if (resourceIds.isEmpty()) {
return Collections.emptyList();
}
List<Resource> resources = resourcesMapper.selectBatchIds(resourceIds);
resources = resources.stream().filter(rs -> rs.getType() == type).collect(Collectors.toList());
return resources;
}
/**
* query resource list by userId and perm
*
* @param userId userId
* @param perm perm
* @return resource list
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
|
private List<Resource> queryResourceList(Integer userId, int perm) {
List<Integer> resIds = resourceUserMapper.queryResourcesIdListByUserIdAndPerm(userId, perm);
return CollectionUtils.isEmpty(resIds) ? new ArrayList<>() : resourcesMapper.queryResourceListById(resIds);
}
private AuthorizationType checkResourceType(ResourceType type) {
return type.equals(ResourceType.FILE) ? AuthorizationType.RESOURCE_FILE_ID : AuthorizationType.UDF_FILE;
}
/**
* check permission by comparing login user's tenantCode with tenantCode in the request
*
* @param isAdmin is the login user admin
* @param userTenantCode loginUser's tenantCode
* @param resTenantCode tenantCode in the request field "resTenantCode" for tenant code owning the resource,
* can be different from the login user in the case of logging in as admin users.
* @return isValid
*/
private boolean isUserTenantValid(boolean isAdmin, String userTenantCode,
String resTenantCode) throws ServiceException {
if (!isAdmin) {
resTenantCode = resTenantCode == null ? "" : resTenantCode;
if (!StringUtils.isBlank(resTenantCode) && !resTenantCode.equals(userTenantCode)) {
return false;
}
}
return true;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesTask.java
|
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
package org.apache.dolphinscheduler.dao.entity;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@Data
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesTask.java
|
@TableName("t_ds_relation_resources_task")
public class ResourcesTask {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private String fullName;
private int taskId;
private ResourceType type;
public ResourcesTask(int id, String fullName, int taskId, ResourceType type) {
this.id = id;
this.fullName = fullName;
this.taskId = taskId;
this.type = type;
}
public ResourcesTask(int taskId, String fullName, ResourceType type) {
this.taskId = taskId;
this.fullName = fullName;
this.type = type;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceTaskMapper.java
|
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
package org.apache.dolphinscheduler.dao.mapper;
import org.apache.dolphinscheduler.dao.entity.ResourcesTask;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* resource task relation mapper interface
*/
public interface ResourceTaskMapper extends BaseMapper<ResourcesTask> {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceTaskMapper.java
|
Integer existResourceByTaskIdNFullName(@Param("taskId") int task_id, @Param("fullName") String fullName);
int deleteIds(@Param("resIds") Integer[] resIds);
int updateResource(@Param("id") int id, @Param("fullName") String fullName);
List<ResourcesTask> selectBatchFullNames(@Param("fullNameArr") String[] fullNameArr);
List<ResourcesTask> selectSubfoldersFullNames(@Param("folderPath") String folderPath);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.service.process;
import static java.util.stream.Collectors.toSet;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_END_DATE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_START_DATE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_EMPTY_SUB_PROCESS;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID;
import static org.apache.dolphinscheduler.common.constants.Constants.LOCAL_PARAMS;
import static org.apache.dolphinscheduler.plugin.task.api.enums.DataType.VARCHAR;
import static org.apache.dolphinscheduler.plugin.task.api.enums.Direct.IN;
import static org.apache.dolphinscheduler.plugin.task.api.utils.DataQualityConstants.TASK_INSTANCE_ID;
import org.apache.dolphinscheduler.common.constants.CommandKeyConstants;
import org.apache.dolphinscheduler.common.constants.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus;
import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils.CodeGenerateException;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.DagData;
import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.DependentProcessDefinition;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.dolphinscheduler.dao.entity.DqComparisonType;
import org.apache.dolphinscheduler.dao.entity.DqExecuteResult;
import org.apache.dolphinscheduler.dao.entity.DqRule;
import org.apache.dolphinscheduler.dao.entity.DqRuleExecuteSql;
import org.apache.dolphinscheduler.dao.entity.DqRuleInputEntry;
import org.apache.dolphinscheduler.dao.entity.DqTaskStatisticsValue;
import org.apache.dolphinscheduler.dao.entity.Environment;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.ProjectUser;
import org.apache.dolphinscheduler.dao.entity.Resource;
import org.apache.dolphinscheduler.dao.entity.ResourcesTask;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.UdfFunc;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.apache.dolphinscheduler.dao.mapper.DqComparisonTypeMapper;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.dolphinscheduler.dao.mapper.DqExecuteResultMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleExecuteSqlMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleInputEntryMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleMapper;
import org.apache.dolphinscheduler.dao.mapper.DqTaskStatisticsValueMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceTaskMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceUserMapper;
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.dao.mapper.WorkFlowLineageMapper;
import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
import org.apache.dolphinscheduler.dao.repository.ProcessInstanceMapDao;
import org.apache.dolphinscheduler.dao.repository.TaskDefinitionDao;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.dolphinscheduler.dao.repository.TaskDefinitionLogDao;
import org.apache.dolphinscheduler.dao.repository.TaskInstanceDao;
import org.apache.dolphinscheduler.dao.utils.DqRuleUtils;
import org.apache.dolphinscheduler.plugin.task.api.TaskPluginManager;
import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.plugin.task.api.enums.dp.DqTaskState;
import org.apache.dolphinscheduler.plugin.task.api.model.DateInterval;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode;
import org.apache.dolphinscheduler.plugin.task.api.parameters.SubProcessParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.TaskTimeoutParameter;
import org.apache.dolphinscheduler.remote.command.TaskEventChangeCommand;
import org.apache.dolphinscheduler.remote.command.WorkflowStateEventChangeCommand;
import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.command.CommandService;
import org.apache.dolphinscheduler.service.cron.CronUtils;
import org.apache.dolphinscheduler.service.exceptions.CronParseException;
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
import org.apache.dolphinscheduler.service.expand.CuringParamsService;
import org.apache.dolphinscheduler.service.log.LogClient;
import org.apache.dolphinscheduler.service.model.TaskNode;
import org.apache.dolphinscheduler.service.utils.ClusterConfUtils;
import org.apache.dolphinscheduler.service.utils.DagHelper;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
/**
* process relative dao that some mappers in this.
*/
@Component
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
@Slf4j
public class ProcessServiceImpl implements ProcessService {
@Autowired
private UserMapper userMapper;
@Autowired
private ProcessDefinitionMapper processDefineMapper;
@Autowired
private ProcessDefinitionLogMapper processDefineLogMapper;
@Autowired
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
private ProcessInstanceMapper processInstanceMapper;
@Autowired
private ProcessInstanceDao processInstanceDao;
@Autowired
private TaskDefinitionDao taskDefinitionDao;
@Autowired
private TaskInstanceDao taskInstanceDao;
@Autowired
private TaskDefinitionLogDao taskDefinitionLogDao;
@Autowired
private ProcessInstanceMapDao processInstanceMapDao;
@Autowired
private DataSourceMapper dataSourceMapper;
@Autowired
private ProcessInstanceMapMapper processInstanceMapMapper;
@Autowired
private TaskInstanceMapper taskInstanceMapper;
@Autowired
private CommandMapper commandMapper;
@Autowired
private ScheduleMapper scheduleMapper;
@Autowired
private UdfFuncMapper udfFuncMapper;
@Autowired
private ResourceMapper resourceMapper;
@Autowired
private ResourceTaskMapper resourceTaskMapper;
@Autowired
private ResourceUserMapper resourceUserMapper;
@Autowired
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
private ErrorCommandMapper errorCommandMapper;
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProjectMapper projectMapper;
@Autowired
private DqExecuteResultMapper dqExecuteResultMapper;
@Autowired
private DqRuleMapper dqRuleMapper;
@Autowired
private DqRuleInputEntryMapper dqRuleInputEntryMapper;
@Autowired
private DqRuleExecuteSqlMapper dqRuleExecuteSqlMapper;
@Autowired
private DqComparisonTypeMapper dqComparisonTypeMapper;
@Autowired
private DqTaskStatisticsValueMapper dqTaskStatisticsValueMapper;
@Autowired
private TaskDefinitionMapper taskDefinitionMapper;
@Autowired
private TaskDefinitionLogMapper taskDefinitionLogMapper;
@Autowired
private ProcessTaskRelationMapper processTaskRelationMapper;
@Autowired
private ProcessTaskRelationLogMapper processTaskRelationLogMapper;
@Autowired
StateEventCallbackService stateEventCallbackService;
@Autowired
private EnvironmentMapper environmentMapper;
@Autowired
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
private TaskGroupQueueMapper taskGroupQueueMapper;
@Autowired
private TaskGroupMapper taskGroupMapper;
@Autowired
private WorkFlowLineageMapper workFlowLineageMapper;
@Autowired
private TaskPluginManager taskPluginManager;
@Autowired
private ClusterMapper clusterMapper;
@Autowired
private CuringParamsService curingGlobalParamsService;
@Autowired
private LogClient logClient;
@Autowired
private CommandService commandService;
@Autowired
private TriggerRelationService triggerRelationService;
/**
* handle Command (construct ProcessInstance from Command) , wrapped in transaction
*
* @param host host
* @param command found command
* @return process instance
*/
@Override
@Transactional
public ProcessInstance handleCommand(String host,
Command command) throws CronParseException, CodeGenerateException {
ProcessInstance processInstance = constructProcessInstance(command, host);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (processInstance == null) {
log.error("scan command, command parameter is error: {}", command);
commandService.moveToErrorCommand(command, "process instance is null");
return null;
}
processInstance.setCommandType(command.getCommandType());
processInstance.addHistoryCmd(command.getCommandType());
processInstance.setTestFlag(command.getTestFlag());
ProcessDefinition processDefinition = this.findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
if (processDefinition.getExecutionType().typeIsSerial()) {
saveSerialProcess(processInstance, processDefinition);
if (processInstance.getState() != WorkflowExecutionStatus.RUNNING_EXECUTION) {
setSubProcessParam(processInstance);
triggerRelationService.saveProcessInstanceTrigger(command.getId(), processInstance.getId());
deleteCommandWithCheck(command.getId());
return null;
}
} else {
processInstanceDao.upsertProcessInstance(processInstance);
}
triggerRelationService.saveProcessInstanceTrigger(command.getId(), processInstance.getId());
setSubProcessParam(processInstance);
deleteCommandWithCheck(command.getId());
return processInstance;
}
protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinition processDefinition) {
processInstance.setStateWithDesc(WorkflowExecutionStatus.SERIAL_WAIT, "wait by serial_wait strategy");
processInstanceDao.upsertProcessInstance(processInstance);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (processDefinition.getExecutionType().typeIsSerialWait()) {
List<ProcessInstance> runningProcessInstances =
this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(
processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(),
org.apache.dolphinscheduler.service.utils.Constants.RUNNING_PROCESS_STATE,
processInstance.getId());
if (CollectionUtils.isEmpty(runningProcessInstances)) {
processInstance.setStateWithDesc(WorkflowExecutionStatus.RUNNING_EXECUTION,
"submit from serial_wait strategy");
processInstanceDao.upsertProcessInstance(processInstance);
}
} else if (processDefinition.getExecutionType().typeIsSerialDiscard()) {
List<ProcessInstance> runningProcessInstances =
this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(
processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(),
org.apache.dolphinscheduler.service.utils.Constants.RUNNING_PROCESS_STATE,
processInstance.getId());
if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
processInstance.setStateWithDesc(WorkflowExecutionStatus.STOP, "stop by serial_discard strategy");
processInstanceDao.upsertProcessInstance(processInstance);
return;
}
processInstance.setStateWithDesc(WorkflowExecutionStatus.RUNNING_EXECUTION,
"submit from serial_discard strategy");
processInstanceDao.upsertProcessInstance(processInstance);
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
List<ProcessInstance> runningProcessInstances =
this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(
processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(),
org.apache.dolphinscheduler.service.utils.Constants.RUNNING_PROCESS_STATE,
processInstance.getId());
for (ProcessInstance info : runningProcessInstances) {
info.setCommandType(CommandType.STOP);
info.addHistoryCmd(CommandType.STOP);
info.setStateWithDesc(WorkflowExecutionStatus.READY_STOP, "ready stop by serial_priority strategy");
int update = processInstanceDao.updateProcessInstance(info);
if (update > 0) {
WorkflowStateEventChangeCommand workflowStateEventChangeCommand =
new WorkflowStateEventChangeCommand(
info.getId(), 0, info.getState(), info.getId(), 0);
try {
Host host = new Host(info.getHost());
stateEventCallbackService.sendResult(host, workflowStateEventChangeCommand.convert2Command());
} catch (Exception e) {
log.error("sendResultError", e);
}
}
}
processInstance.setStateWithDesc(WorkflowExecutionStatus.RUNNING_EXECUTION,
"submit by serial_priority strategy");
processInstanceDao.upsertProcessInstance(processInstance);
}
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* find process instance detail by id
*
* @param processId processId
* @return process instance
*/
@Override
public Optional<ProcessInstance> findProcessInstanceDetailById(int processId) {
return Optional.ofNullable(processInstanceMapper.queryDetailById(processId));
}
/**
* find process instance by id
*
* @param processId processId
* @return process instance
*/
@Override
public ProcessInstance findProcessInstanceById(int processId) {
return processInstanceMapper.selectById(processId);
}
/**
* find process define by id.
*
* @param processDefinitionId processDefinitionId
* @return process definition
*/
@Override
public ProcessDefinition findProcessDefineById(int processDefinitionId) {
return processDefineMapper.selectById(processDefinitionId);
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* find process define by code and version.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
@Override
public ProcessDefinition findProcessDefinition(Long processDefinitionCode, int version) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode);
if (processDefinition == null || processDefinition.getVersion() != version) {
processDefinition = processDefineLogMapper.queryByDefinitionCodeAndVersion(processDefinitionCode, version);
if (processDefinition != null) {
processDefinition.setId(0);
}
}
return processDefinition;
}
/**
* find process define by code.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
@Override
public ProcessDefinition findProcessDefinitionByCode(Long processDefinitionCode) {
return processDefineMapper.queryByCode(processDefinitionCode);
}
/**
* delete work process instance by id
*
* @param processInstanceId processInstanceId
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @return delete process instance result
*/
@Override
public int deleteWorkProcessInstanceById(int processInstanceId) {
return processInstanceMapper.deleteById(processInstanceId);
}
/**
* delete all sub process by parent instance id
*
* @param processInstanceId processInstanceId
* @return delete all sub process instance result
*/
@Override
public int deleteAllSubWorkProcessByParentId(int processInstanceId) {
List<Integer> subProcessIdList = processInstanceMapMapper.querySubIdListByParentId(processInstanceId);
for (Integer subId : subProcessIdList) {
deleteAllSubWorkProcessByParentId(subId);
deleteWorkProcessMapByParentId(subId);
removeTaskLogFile(subId);
deleteWorkProcessInstanceById(subId);
}
return 1;
}
/**
* remove task log file
*
* @param processInstanceId processInstanceId
*/
@Override
public void removeTaskLogFile(Integer processInstanceId) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
List<TaskInstance> taskInstanceList = taskInstanceDao.findTaskInstanceByWorkflowInstanceId(processInstanceId);
if (CollectionUtils.isEmpty(taskInstanceList)) {
return;
}
for (TaskInstance taskInstance : taskInstanceList) {
String taskLogPath = taskInstance.getLogPath();
if (StringUtils.isEmpty(taskInstance.getHost()) || StringUtils.isEmpty(taskLogPath)) {
continue;
}
logClient.removeTaskLog(Host.of(taskInstance.getHost()), taskLogPath);
}
}
/**
* recursive query sub process definition id by parent id.
*
* @param parentCode parentCode
* @param ids ids
*/
@Override
public void recurseFindSubProcess(long parentCode, List<Long> ids) {
List<TaskDefinition> taskNodeList = taskDefinitionDao.getTaskDefinitionListByDefinition(parentCode);
if (taskNodeList != null && !taskNodeList.isEmpty()) {
for (TaskDefinition taskNode : taskNodeList) {
String parameter = taskNode.getTaskParams();
ObjectNode parameterJson = JSONUtils.parseObject(parameter);
if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_CODE) != null) {
SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class);
ids.add(subProcessParam.getProcessDefinitionCode());
recurseFindSubProcess(subProcessParam.getProcessDefinitionCode(), ids);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
}
}
/**
* get schedule time from command
*
* @param command command
* @param cmdParam cmdParam map
* @return date
*/
private Date getScheduleTime(Command command, Map<String, String> cmdParam) throws CronParseException {
Date scheduleTime = command.getScheduleTime();
if (scheduleTime == null && cmdParam != null && cmdParam.containsKey(CMD_PARAM_COMPLEMENT_DATA_START_DATE)) {
Date start = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_END_DATE));
List<Schedule> schedules =
queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode());
List<Date> complementDateList = CronUtils.getSelfFireDateList(start, end, schedules);
if (CollectionUtils.isNotEmpty(complementDateList)) {
scheduleTime = complementDateList.get(0);
} else {
log.error("set scheduler time error: complement date list is empty, command: {}",
command.toString());
}
}
return scheduleTime;
}
/**
* generate a new work process instance from command.
*
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @param processDefinition processDefinition
* @param command command
* @param cmdParam cmdParam map
* @return process instance
*/
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
Command command,
Map<String, String> cmdParam) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.setProcessDefinitionCode(processDefinition.getCode());
processInstance.setProcessDefinitionVersion(processDefinition.getVersion());
processInstance.setProjectCode(processDefinition.getProjectCode());
processInstance.setStateWithDesc(WorkflowExecutionStatus.RUNNING_EXECUTION, "init running");
processInstance.setRecovery(Flag.NO);
processInstance.setStartTime(new Date());
processInstance.setRestartTime(null);
processInstance.setRunTimes(1);
processInstance.setMaxTryTimes(0);
processInstance.setCommandParam(command.getCommandParam());
processInstance.setCommandType(command.getCommandType());
processInstance.setIsSubProcess(Flag.NO);
processInstance.setTaskDependType(command.getTaskDependType());
processInstance.setFailureStrategy(command.getFailureStrategy());
processInstance.setExecutorId(command.getExecutorId());
processInstance.setExecutorName(Optional.ofNullable(userMapper.selectById(command.getExecutorId()))
.map(User::getUserName).orElse(null));
WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType();
processInstance.setWarningType(warningType);
Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processInstance.setWarningGroupId(warningGroupId);
processInstance.setDryRun(command.getDryRun());
processInstance.setTestFlag(command.getTestFlag());
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setCommandStartTime(command.getStartTime());
processInstance.setLocations(processDefinition.getLocations());
setGlobalParamIfCommanded(processDefinition, cmdParam);
Map<String, String> commandParamMap = JSONUtils.toMap(command.getCommandParam());
String timezoneId = null;
if (commandParamMap != null) {
timezoneId = commandParamMap.get(Constants.SCHEDULE_TIMEZONE);
}
String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
getCommandTypeIfComplement(processInstance, command),
processInstance.getScheduleTime(), timezoneId);
processInstance.setGlobalParams(globalParams);
processInstance.setProcessInstancePriority(command.getProcessInstancePriority());
String workerGroup = Strings.isNullOrEmpty(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP
: command.getWorkerGroup();
processInstance.setWorkerGroup(workerGroup);
processInstance
.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode());
processInstance.setTimeout(processDefinition.getTimeout());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processInstance.setTenantId(processDefinition.getTenantId());
processInstance.setTenantCode(Optional.ofNullable(tenantMapper.queryById(processDefinition.getTenantId()))
.map(Tenant::getTenantCode).orElse(null));
return processInstance;
}
private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) {
Map<String, String> startParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_START_PARAMS)) {
String startParamJson = cmdParam.get(CommandKeyConstants.CMD_PARAM_START_PARAMS);
startParamMap = JSONUtils.toMap(startParamJson);
}
Map<String, String> fatherParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_FATHER_PARAMS)) {
String fatherParamJson = cmdParam.get(CommandKeyConstants.CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtils.toMap(fatherParamJson);
}
startParamMap.putAll(fatherParamMap);
Map<String, String> globalMap = processDefinition.getGlobalParamMap();
List<Property> globalParamList = processDefinition.getGlobalParamList();
if (MapUtils.isNotEmpty(startParamMap) && globalMap != null) {
for (Map.Entry<String, String> param : globalMap.entrySet()) {
String val = startParamMap.get(param.getKey());
if (val != null) {
param.setValue(val);
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
for (Entry<String, String> startParam : startParamMap.entrySet()) {
if (!globalMap.containsKey(startParam.getKey())) {
globalMap.put(startParam.getKey(), startParam.getValue());
globalParamList.add(new Property(startParam.getKey(), IN, VARCHAR, startParam.getValue()));
}
}
}
}
/**
* get process tenant
* there is tenant id in definition, use the tenant of the definition.
* if there is not tenant id in the definiton or the tenant not exist
* use definition creator's tenant.
*
* @param tenantId tenantId
* @param userId userId
* @return tenant
*/
@Override
public Tenant getTenantForProcess(int tenantId, int userId) {
Tenant tenant = null;
if (tenantId >= 0) {
tenant = tenantMapper.queryById(tenantId);
}
if (userId == 0) {
return null;
}
if (tenant == null) {
User user = userMapper.selectById(userId);
tenant = tenantMapper.queryById(user.getTenantId());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
return tenant;
}
/**
* get an environment
* use the code of the environment to find a environment.
*
* @param environmentCode environmentCode
* @return Environment
*/
@Override
public Environment findEnvironmentByCode(Long environmentCode) {
Environment environment = null;
if (environmentCode >= 0) {
environment = environmentMapper.queryByEnvironmentCode(environmentCode);
}
return environment;
}
/**
* check command parameters is valid
*
* @param command command
* @param cmdParam cmdParam map
* @return whether command param is valid
*/
private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
if (command.getTaskDependType() == TaskDependType.TASK_ONLY
|| command.getTaskDependType() == TaskDependType.TASK_PRE) {
if (cmdParam == null
|| !cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_START_NODES)
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
|| cmdParam.get(CommandKeyConstants.CMD_PARAM_START_NODES).isEmpty()) {
log.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
return false;
}
}
return true;
}
/**
* construct process instance according to one command.
*
* @param command command
* @param host host
* @return process instance
*/
protected @Nullable ProcessInstance constructProcessInstance(Command command,
String host) throws CronParseException, CodeGenerateException {
ProcessInstance processInstance;
ProcessDefinition processDefinition;
CommandType commandType = command.getCommandType();
processDefinition =
this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion());
if (processDefinition == null) {
log.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode());
throw new IllegalArgumentException("Cannot find the process definition for this workflowInstance");
}
Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam());
if (cmdParam == null) {
cmdParam = new HashMap<>();
}
int processInstanceId = command.getProcessInstanceId();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (processInstanceId == 0) {
processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
} else {
processInstance = this.findProcessInstanceDetailById(processInstanceId).orElse(null);
if (processInstance == null) {
return null;
}
}
CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command);
if (commandTypeIfComplement == CommandType.REPEAT_RUNNING) {
setGlobalParamIfCommanded(processDefinition, cmdParam);
}
String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE);
String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
commandTypeIfComplement,
processInstance.getScheduleTime(), timezoneId);
processInstance.setGlobalParams(globalParams);
processInstance.setProcessDefinition(processDefinition);
if (processInstance.getCommandParam() != null) {
Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam());
Map<String, String> finalCmdParam = cmdParam;
processCmdParam.forEach((key, value) -> {
if (!finalCmdParam.containsKey(key)) {
finalCmdParam.put(key, value);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
});
}
if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_SUB_PROCESS)) {
processInstance.setCommandParam(command.getCommandParam());
}
if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {
log.error("command parameter check failed!");
return null;
}
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setHost(host);
processInstance.setRestartTime(new Date());
WorkflowExecutionStatus runStatus = WorkflowExecutionStatus.RUNNING_EXECUTION;
int runTime = processInstance.getRunTimes();
switch (commandType) {
case START_PROCESS:
break;
case START_FAILURE_TASK_PROCESS:
List<Integer> failedList =
this.findTaskIdByInstanceState(processInstance.getId(), TaskExecutionStatus.FAILURE);
List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(),
TaskExecutionStatus.NEED_FAULT_TOLERANCE);
List<Integer> killedList =
this.findTaskIdByInstanceState(processInstance.getId(), TaskExecutionStatus.KILL);
cmdParam.remove(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
failedList.addAll(killedList);
failedList.addAll(toleranceList);
for (Integer taskId : failedList) {
initTaskInstance(taskInstanceDao.findTaskInstanceById(taskId));
}
cmdParam.put(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING,
String.join(Constants.COMMA, convertIntListToString(failedList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case START_CURRENT_TASK_PROCESS:
break;
case RECOVER_WAITING_THREAD:
break;
case RECOVER_SUSPENDED_PROCESS:
cmdParam.remove(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING);
List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(),
TaskExecutionStatus.KILL);
for (Integer taskId : stopNodeList) {
initTaskInstance(taskInstanceDao.findTaskInstanceById(taskId));
}
cmdParam.put(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING,
String.join(Constants.COMMA, convertIntListToString(stopNodeList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case RECOVER_TOLERANCE_FAULT_PROCESS:
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processInstance.setRecovery(Flag.YES);
processInstance.setRunTimes(runTime + 1);
runStatus = processInstance.getState();
break;
case COMPLEMENT_DATA:
if (processInstance.getId() != null) {
List<TaskInstance> taskInstanceList =
taskInstanceDao.findValidTaskListByProcessId(processInstance.getId(),
processInstance.getTestFlag());
for (TaskInstance taskInstance : taskInstanceList) {
taskInstance.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(taskInstance);
}
}
break;
case REPEAT_RUNNING:
if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING);
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
}
if (processInstance.getCommandType().equals(CommandType.EXECUTE_TASK)) {
cmdParam.remove(CommandKeyConstants.CMD_PARAM_START_NODES);
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setTaskDependType(command.getTaskDependType());
}
List<TaskInstance> validTaskList =
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
taskInstanceDao.findValidTaskListByProcessId(processInstance.getId(),
processInstance.getTestFlag());
for (TaskInstance taskInstance : validTaskList) {
taskInstance.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(taskInstance);
}
processInstance.setStartTime(new Date());
processInstance.setRestartTime(processInstance.getStartTime());
processInstance.setEndTime(null);
processInstance.setRunTimes(runTime + 1);
initComplementDataParam(processDefinition, processInstance, cmdParam);
break;
case SCHEDULER:
break;
case EXECUTE_TASK:
processInstance.setRunTimes(runTime + 1);
processInstance.setTaskDependType(command.getTaskDependType());
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
break;
default:
break;
}
processInstance.setStateWithDesc(runStatus, commandType.getDescp());
return processInstance;
}
/**
* get process definition by command
* If it is a fault-tolerant command, get the specified version of ProcessDefinition through ProcessInstance
* Otherwise, get the latest version of ProcessDefinition
*
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @return ProcessDefinition
*/
private @Nullable ProcessDefinition getProcessDefinitionByCommand(long processDefinitionCode,
Map<String, String> cmdParam) {
if (cmdParam != null) {
int processInstanceId = 0;
if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) {
processInstanceId =
Integer.parseInt(cmdParam.get(CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING));
} else if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_SUB_PROCESS)) {
processInstanceId = Integer.parseInt(cmdParam.get(CommandKeyConstants.CMD_PARAM_SUB_PROCESS));
} else if (cmdParam.containsKey(CommandKeyConstants.CMD_PARAM_RECOVERY_WAITING_THREAD)) {
processInstanceId =
Integer.parseInt(cmdParam.get(CommandKeyConstants.CMD_PARAM_RECOVERY_WAITING_THREAD));
}
if (processInstanceId != 0) {
ProcessInstance processInstance = this.findProcessInstanceDetailById(processInstanceId).orElse(null);
if (processInstance == null) {
return null;
}
return processDefineLogMapper.queryByDefinitionCodeAndVersion(
processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
}
}
return processDefineMapper.queryByCode(processDefinitionCode);
}
/**
* return complement data if the process start with complement data
*
* @param processInstance processInstance
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @param command command
* @return command type
*/
private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) {
if (CommandType.COMPLEMENT_DATA == processInstance.getCmdTypeIfComplement()) {
return CommandType.COMPLEMENT_DATA;
} else {
return command.getCommandType();
}
}
/**
* initialize complement data parameters
*
* @param processDefinition processDefinition
* @param processInstance processInstance
* @param cmdParam cmdParam
*/
private void initComplementDataParam(ProcessDefinition processDefinition,
ProcessInstance processInstance,
Map<String, String> cmdParam) throws CronParseException {
if (!processInstance.isComplementData()) {
return;
}
Date start = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_END_DATE));
List<Date> complementDate = Lists.newLinkedList();
if (start != null && end != null) {
List<Schedule> listSchedules =
queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode());
complementDate = CronUtils.getSelfFireDateList(start, end, listSchedules);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
if (cmdParam.containsKey(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) {
complementDate = CronUtils.getSelfScheduleDateList(cmdParam);
}
if (CollectionUtils.isNotEmpty(complementDate) && Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTime(complementDate.get(0));
}
String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE);
String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime(), timezoneId);
processInstance.setGlobalParams(globalParams);
}
/**
* set sub work process parameters.
* handle sub work process instance, update relation table and command parameters
* set sub work process flag, extends parent work process command parameters
*
* @param subProcessInstance subProcessInstance
*/
@Override
public void setSubProcessParam(ProcessInstance subProcessInstance) {
String cmdParam = subProcessInstance.getCommandParam();
if (Strings.isNullOrEmpty(cmdParam)) {
return;
}
Map<String, String> paramMap = JSONUtils.toMap(cmdParam);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS)
&& CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
paramMap.remove(CMD_PARAM_SUB_PROCESS);
paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId()));
subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap));
subProcessInstance.setIsSubProcess(Flag.YES);
processInstanceDao.upsertProcessInstance(subProcessInstance);
}
String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
if (!Strings.isNullOrEmpty(parentInstanceId)) {
ProcessInstance parentInstance =
findProcessInstanceDetailById(Integer.parseInt(parentInstanceId)).orElse(null);
if (parentInstance != null) {
subProcessInstance.setGlobalParams(
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
subProcessInstance
.setVarPool(joinVarPool(parentInstance.getVarPool(), subProcessInstance.getVarPool()));
processInstanceDao.upsertProcessInstance(subProcessInstance);
} else {
log.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
}
}
ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class);
if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) {
return;
}
processInstanceMap.setProcessInstanceId(subProcessInstance.getId());
processInstanceMapDao.updateWorkProcessInstanceMap(processInstanceMap);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
/**
* join parent global params into sub process.
* only the keys doesn't in sub process global would be joined.
*
* @param parentGlobalParams parentGlobalParams
* @param subGlobalParams subGlobalParams
* @return global params join
*/
private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
List<Property> parentParams = Lists.newArrayList(JSONUtils.toList(parentGlobalParams, Property.class));
List<Property> subParams = JSONUtils.toList(subGlobalParams, Property.class);
Set<String> parentParamKeys = parentParams.stream().map(Property::getProp).collect(toSet());
List<Property> extraSubParams = subParams.stream()
.filter(subProp -> !parentParamKeys.contains(subProp.getProp())).collect(Collectors.toList());
parentParams.addAll(extraSubParams);
return JSONUtils.toJsonString(parentParams);
}
/**
* join parent var pool params into sub process.
* only the keys doesn't in sub process global would be joined.
*
* @param parentValPool
* @param subValPool
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @return
*/
private String joinVarPool(String parentValPool, String subValPool) {
List<Property> parentValPools = Lists.newArrayList(JSONUtils.toList(parentValPool, Property.class));
parentValPools = parentValPools.stream().filter(valPool -> valPool.getDirect() == Direct.OUT)
.collect(Collectors.toList());
List<Property> subValPools = Lists.newArrayList(JSONUtils.toList(subValPool, Property.class));
Set<String> parentValPoolKeys = parentValPools.stream().map(Property::getProp).collect(toSet());
List<Property> extraSubValPools = subValPools.stream().filter(sub -> !parentValPoolKeys.contains(sub.getProp()))
.collect(Collectors.toList());
parentValPools.addAll(extraSubValPools);
return JSONUtils.toJsonString(parentValPools);
}
/**
* initialize task instance
*
* @param taskInstance taskInstance
*/
private void initTaskInstance(TaskInstance taskInstance) {
if (!taskInstance.isSubProcess()
&& (taskInstance.getState().isKill() || taskInstance.getState().isFailure())) {
taskInstance.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(taskInstance);
return;
}
taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS);
taskInstanceDao.updateTaskInstance(taskInstance);
}
/**
* retry submit task to db
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
*/
@Override
public TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance,
int commitRetryTimes, long commitInterval) {
int retryTimes = 1;
TaskInstance task = null;
while (retryTimes <= commitRetryTimes) {
try {
task = submitTask(processInstance, taskInstance);
if (task != null && task.getId() != null) {
break;
}
log.error(
"task commit to db failed , taskCode: {} has already retry {} times, please check the database",
taskInstance.getTaskCode(),
retryTimes);
Thread.sleep(commitInterval);
} catch (Exception e) {
log.error("task commit to db failed", e);
} finally {
retryTimes += 1;
}
}
return task;
}
/**
* // todo: This method need to refactor, we find when the db down, but the taskInstanceId is not 0. It's better to change to void, rather than return TaskInstance
* submit task to db
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* submit sub process to command
*
* @param processInstance processInstance
* @param taskInstance taskInstance
* @return task instance
*/
@Override
@Transactional
public TaskInstance submitTask(ProcessInstance processInstance, TaskInstance taskInstance) {
log.info("Start save taskInstance to database : {}, processInstance id:{}, state: {}",
taskInstance.getName(),
taskInstance.getProcessInstanceId(),
processInstance.getState());
TaskInstance task = taskInstanceDao.submitTaskInstanceToDB(taskInstance, processInstance);
if (task == null) {
log.error("Save taskInstance to db error, task name:{}, process id:{} state: {} ",
taskInstance.getName(),
taskInstance.getProcessInstance().getId(),
processInstance.getState());
return null;
}
if (!task.getState().isFinished()) {
createSubWorkProcess(processInstance, task);
}
log.info(
"End save taskInstance to db successfully:{}, taskInstanceName: {}, taskInstance state:{}, processInstanceId:{}, processInstanceState: {}",
task.getId(),
task.getName(),
task.getState(),
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processInstance.getId(),
processInstance.getState());
return task;
}
/**
* set work process instance map
* consider o
* repeat running does not generate new sub process instance
* set map {parent instance id, task instance id, 0(child instance id)}
*
* @param parentInstance parentInstance
* @param parentTask parentTask
* @param processMap processMap
* @return process instance map
*/
private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask,
ProcessInstanceMap processMap) {
if (processMap != null) {
return processMap;
}
if (parentInstance.getCommandType() == CommandType.REPEAT_RUNNING) {
processMap = findPreviousTaskProcessMap(parentInstance, parentTask);
if (processMap != null) {
processMap.setParentTaskInstanceId(parentTask.getId());
processInstanceMapDao.updateWorkProcessInstanceMap(processMap);
return processMap;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processMap = new ProcessInstanceMap();
processMap.setParentProcessInstanceId(parentInstance.getId());
processMap.setParentTaskInstanceId(parentTask.getId());
processInstanceMapDao.createWorkProcessInstanceMap(processMap);
return processMap;
}
/**
* find previous task work process map.
*
* @param parentProcessInstance parentProcessInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance,
TaskInstance parentTask) {
Integer preTaskId = 0;
List<TaskInstance> preTaskList =
taskInstanceDao.findPreviousTaskListByWorkProcessId(parentProcessInstance.getId());
for (TaskInstance task : preTaskList) {
if (task.getName().equals(parentTask.getName())) {
preTaskId = task.getId();
ProcessInstanceMap map =
processInstanceMapDao.findWorkProcessMapByParent(parentProcessInstance.getId(), preTaskId);
if (map != null) {
return map;
}
}
}
log.info("sub process instance is not found,parent task:{},parent instance:{}",
parentTask.getId(), parentProcessInstance.getId());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return null;
}
/**
* create sub work process command
*
* @param parentProcessInstance parentProcessInstance
* @param task task
*/
@Override
public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) {
if (!task.isSubProcess()) {
return;
}
ProcessInstanceMap instanceMap =
processInstanceMapDao.findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId());
if (null != instanceMap
&& CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) {
return;
}
instanceMap = setProcessInstanceMap(parentProcessInstance, task, instanceMap);
ProcessInstance childInstance = null;
if (instanceMap.getProcessInstanceId() != 0) {
childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId());
}
if (childInstance != null && childInstance.getState() == WorkflowExecutionStatus.SUCCESS
&& CommandType.START_FAILURE_TASK_PROCESS == parentProcessInstance.getCommandType()) {
log.info("sub process instance {} status is success, so skip creating command", childInstance.getId());
return;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
}
Command subProcessCommand =
commandService.createSubProcessCommand(parentProcessInstance, childInstance, instanceMap, task);
if (subProcessCommand == null) {
log.error("create sub process command failed, so skip creating command");
return;
}
updateSubProcessDefinitionByParent(parentProcessInstance, subProcessCommand.getProcessDefinitionCode());
initSubInstanceState(childInstance);
commandService.createCommand(subProcessCommand);
log.info("sub process command created: {} ", subProcessCommand);
}
/**
* initialize sub work flow state
* child instance state would be initialized when 'recovery from pause/stop/failure'
*/
private void initSubInstanceState(ProcessInstance childInstance) {
if (childInstance != null) {
childInstance.setStateWithDesc(WorkflowExecutionStatus.RUNNING_EXECUTION, "init sub workflow instance");
processInstanceDao.updateProcessInstance(childInstance);
}
}
/**
* get sub work flow command type
* child instance exist: child command = fatherCommand
* child instance not exists: child command = fatherCommand[0]
*/
private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) {
CommandType commandType = parentProcessInstance.getCommandType();
if (childInstance == null) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
String fatherHistoryCommand = parentProcessInstance.getHistoryCmd();
commandType = CommandType.valueOf(fatherHistoryCommand.split(Constants.COMMA)[0]);
}
return commandType;
}
/**
* update sub process definition
*
* @param parentProcessInstance parentProcessInstance
* @param childDefinitionCode childDefinitionId
*/
private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) {
ProcessDefinition fatherDefinition =
this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(),
parentProcessInstance.getProcessDefinitionVersion());
ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode);
if (childDefinition != null && fatherDefinition != null) {
childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId());
processDefineMapper.updateById(childDefinition);
}
}
/**
* package task instance
*/
@Override
public void packageTaskInstance(TaskInstance taskInstance, ProcessInstance processInstance) {
taskInstance.setProcessInstance(processInstance);
taskInstance.setProcessDefine(processInstance.getProcessDefinition());
taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority());
TaskDefinition taskDefinition = taskDefinitionDao.findTaskDefinition(
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
taskInstance.getTaskCode(),
taskInstance.getTaskDefinitionVersion());
this.updateTaskDefinitionResources(taskDefinition);
taskInstance.setTaskDefine(taskDefinition);
taskInstance.setTestFlag(processInstance.getTestFlag());
}
/**
* Update {@link ResourceInfo} information in {@link TaskDefinition}
*
* @param taskDefinition the given {@link TaskDefinition}
*/
@Override
public void updateTaskDefinitionResources(TaskDefinition taskDefinition) {
Map<String, Object> taskParameters = JSONUtils.parseObject(
taskDefinition.getTaskParams(),
new TypeReference<Map<String, Object>>() {
});
if (taskParameters != null) {
if (taskParameters.containsKey("mainJar")) {
Object mainJarObj = taskParameters.get("mainJar");
ResourceInfo mainJar = JSONUtils.parseObject(
JSONUtils.toJsonString(mainJarObj),
ResourceInfo.class);
ResourceInfo resourceInfo = updateResourceInfo(taskDefinition.getId(), mainJar);
if (resourceInfo != null) {
taskParameters.put("mainJar", resourceInfo);
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (taskParameters.containsKey("resourceList")) {
String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList"));
List<ResourceInfo> resourceInfos = JSONUtils.toList(resourceListStr, ResourceInfo.class);
List<ResourceInfo> updatedResourceInfos = resourceInfos
.stream()
.map(resourceInfo -> updateResourceInfo(taskDefinition.getId(), resourceInfo))
.filter(Objects::nonNull)
.collect(Collectors.toList());
taskParameters.put("resourceList", updatedResourceInfos);
}
taskDefinition.setTaskParams(JSONUtils.toJsonString(taskParameters));
}
}
/**
* update {@link ResourceInfo} by given original ResourceInfo
*
* @param res origin resource info
* @return {@link ResourceInfo}
*/
protected ResourceInfo updateResourceInfo(int task_id, ResourceInfo res) {
ResourceInfo resourceInfo = null;
if (res != null) {
String resourceFullName = res.getResourceName();
if (StringUtils.isBlank(resourceFullName)) {
log.error("invalid resource full name, {}", resourceFullName);
return new ResourceInfo();
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
resourceInfo = new ResourceInfo();
Integer resultList = resourceTaskMapper.existResourceByTaskIdNFullName(task_id, resourceFullName);
if (resultList != null) {
resourceInfo.setId(resultList);
resourceInfo.setRes(res.getRes());
resourceInfo.setResourceName(resourceFullName);
}
log.info("updated resource info {}",
JSONUtils.toJsonString(resourceInfo));
}
return resourceInfo;
}
/**
* get id list by task state
*
* @param instanceId instanceId
* @param state state
* @return task instance states
*/
@Override
public List<Integer> findTaskIdByInstanceState(int instanceId, TaskExecutionStatus state) {
return taskInstanceMapper.queryTaskByProcessIdAndState(instanceId, state.getCode());
}
/**
* delete work process map by parent process id
*
* @param parentWorkProcessId parentWorkProcessId
* @return delete process map result
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
@Override
public int deleteWorkProcessMapByParentId(int parentWorkProcessId) {
return processInstanceMapMapper.deleteByParentProcessId(parentWorkProcessId);
}
/**
* find sub process instance
*
* @param parentProcessId parentProcessId
* @param parentTaskId parentTaskId
* @return process instance
*/
@Override
public ProcessInstance findSubProcessInstance(Integer parentProcessId, Integer parentTaskId) {
ProcessInstance processInstance = null;
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryByParentId(parentProcessId, parentTaskId);
if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) {
return processInstance;
}
processInstance = findProcessInstanceById(processInstanceMap.getProcessInstanceId());
return processInstance;
}
/**
* find parent process instance
*
* @param subProcessId subProcessId
* @return process instance
*/
@Override
public ProcessInstance findParentProcessInstance(Integer subProcessId) {
ProcessInstance processInstance = null;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(subProcessId);
if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) {
return processInstance;
}
processInstance = findProcessInstanceById(processInstanceMap.getParentProcessInstanceId());
return processInstance;
}
/**
* for show in page of taskInstance
*/
@Override
public void changeOutParam(TaskInstance taskInstance) {
if (Strings.isNullOrEmpty(taskInstance.getVarPool())) {
return;
}
List<Property> properties = JSONUtils.toList(taskInstance.getVarPool(), Property.class);
if (CollectionUtils.isEmpty(properties)) {
return;
}
Map<String, Object> taskParams =
JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference<Map<String, Object>>() {
});
Object localParams = taskParams.get(LOCAL_PARAMS);
if (localParams == null) {
return;
}
List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class);
Map<String, String> outProperty = new HashMap<>();
for (Property info : properties) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (info.getDirect() == Direct.OUT) {
outProperty.put(info.getProp(), info.getValue());
}
}
for (Property info : allParam) {
if (info.getDirect() == Direct.OUT) {
String paramName = info.getProp();
info.setValue(outProperty.get(paramName));
}
}
taskParams.put(LOCAL_PARAMS, allParam);
taskInstance.setTaskParams(JSONUtils.toJsonString(taskParams));
}
/**
* convert integer list to string list
*
* @param intList intList
* @return string list
*/
private List<String> convertIntListToString(List<Integer> intList) {
if (intList == null) {
return new ArrayList<>();
}
List<String> result = new ArrayList<>(intList.size());
for (Integer intVar : intList) {
result.add(String.valueOf(intVar));
}
return result;
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* query schedule by id
*
* @param id id
* @return schedule
*/
@Override
public Schedule querySchedule(int id) {
return scheduleMapper.selectById(id);
}
/**
* query Schedule by processDefinitionCode
*
* @param processDefinitionCode processDefinitionCode
* @see Schedule
*/
@Override
public List<Schedule> queryReleaseSchedulerListByProcessDefinitionCode(long processDefinitionCode) {
return scheduleMapper.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode);
}
/**
* query dependent process definition by process definition code
*
* @param processDefinitionCode processDefinitionCode
* @see DependentProcessDefinition
*/
@Override
public List<DependentProcessDefinition> queryDependentProcessDefinitionByProcessDefinitionCode(long processDefinitionCode) {
return workFlowLineageMapper.queryDependentProcessDefinitionByProcessDefinitionCode(processDefinitionCode);
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* query need failover process instance
*
* @param host host
* @return process instance list
*/
@Override
public List<ProcessInstance> queryNeedFailoverProcessInstances(String host) {
return processInstanceMapper.queryByHostAndStatus(host,
WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
}
@Override
public List<String> queryNeedFailoverProcessInstanceHost() {
return processInstanceMapper
.queryNeedFailoverProcessInstanceHost(WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
}
/**
* process need failover process instance
*
* @param processInstance processInstance
*/
@Override
@Transactional
public void processNeedFailoverProcessInstances(ProcessInstance processInstance) {
processInstance.setHost(Constants.NULL);
processInstanceMapper.updateById(processInstance);
ProcessDefinition processDefinition = findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
Command cmd = new Command();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
cmd.setProcessDefinitionCode(processDefinition.getCode());
cmd.setProcessDefinitionVersion(processDefinition.getVersion());
cmd.setProcessInstanceId(processInstance.getId());
cmd.setCommandParam(
String.format("{\"%s\":%d}", CMD_PARAM_RECOVER_PROCESS_ID_STRING, processInstance.getId()));
cmd.setExecutorId(processInstance.getExecutorId());
cmd.setCommandType(CommandType.RECOVER_TOLERANCE_FAULT_PROCESS);
cmd.setProcessInstancePriority(processInstance.getProcessInstancePriority());
cmd.setTestFlag(processInstance.getTestFlag());
commandService.createCommand(cmd);
}
/**
* find data source by id
*
* @param id id
* @return datasource
*/
@Override
public DataSource findDataSourceById(int id) {
return dataSourceMapper.selectById(id);
}
/**
* find process instance by the task id
*
* @param taskId taskId
* @return process instance
*/
@Override
public ProcessInstance findProcessInstanceByTaskId(int taskId) {
TaskInstance taskInstance = taskInstanceMapper.selectById(taskId);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (taskInstance != null) {
return processInstanceMapper.selectById(taskInstance.getProcessInstanceId());
}
return null;
}
/**
* find udf function list by id list string
*
* @param ids ids
* @return udf function list
*/
@Override
public List<UdfFunc> queryUdfFunListByIds(Integer[] ids) {
return udfFuncMapper.queryUdfByIdStr(ids, null);
}
/**
* find tenant code by resource name
*
* @param resName resource name
* @param resourceType resource type
* @return tenant code
*/
@Override
public String queryTenantCodeByResName(String resName, ResourceType resourceType) {
String fullName = resName.startsWith("/") ? resName : String.format("/%s", resName);
List<Resource> resourceList = resourceMapper.queryResource(fullName, resourceType.ordinal());
if (CollectionUtils.isEmpty(resourceList)) {
return "";
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
int userId = resourceList.get(0).getUserId();
User user = userMapper.selectById(userId);
if (Objects.isNull(user)) {
return "";
}
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (Objects.isNull(tenant)) {
return "";
}
return tenant.getTenantCode();
}
/**
* find schedule list by process define codes.
*
* @param codes codes
* @return schedule list
*/
@Override
public List<Schedule> selectAllByProcessDefineCode(long[] codes) {
return scheduleMapper.selectAllByProcessDefineArray(codes);
}
/**
* find last scheduler process instance in the date interval
*
* @param definitionCode definitionCode
* @param dateInterval dateInterval
* @return process instance
*/
@Override
public ProcessInstance findLastSchedulerProcessInterval(Long definitionCode, DateInterval dateInterval,
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
int testFlag) {
return processInstanceMapper.queryLastSchedulerProcess(definitionCode,
dateInterval.getStartTime(),
dateInterval.getEndTime(),
testFlag);
}
/**
* find last manual process instance interval
*
* @param definitionCode process definition code
* @param dateInterval dateInterval
* @return process instance
*/
@Override
public ProcessInstance findLastManualProcessInterval(Long definitionCode, DateInterval dateInterval, int testFlag) {
return processInstanceMapper.queryLastManualProcess(definitionCode,
dateInterval.getStartTime(),
dateInterval.getEndTime(),
testFlag);
}
/**
* find last running process instance
*
* @param definitionCode process definition code
* @param startTime start time
* @param endTime end time
* @return process instance
*/
@Override
public ProcessInstance findLastRunningProcess(Long definitionCode, Date startTime, Date endTime, int testFlag) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
return processInstanceMapper.queryLastRunningProcess(definitionCode,
startTime,
endTime,
testFlag,
WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
}
/**
* query user queue by process instance
*
* @param processInstance processInstance
* @return queue
*/
@Override
public String queryUserQueueByProcessInstance(ProcessInstance processInstance) {
String queue = "";
if (processInstance == null) {
return queue;
}
User executor = userMapper.selectById(processInstance.getExecutorId());
if (executor != null) {
queue = executor.getQueue();
}
return queue;
}
/**
* query project name and user name by processInstanceId.
*
* @param processInstanceId processInstanceId
* @return projectName and userName
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
@Override
public ProjectUser queryProjectWithUserByProcessInstanceId(int processInstanceId) {
return projectMapper.queryProjectWithUserByProcessInstanceId(processInstanceId);
}
/**
* get have perm project list
*
* @param userId userId
* @return project list
*/
@Override
public List<Project> getProjectListHavePerm(int userId) {
List<Project> createProjects = projectMapper.queryProjectCreatedByUser(userId);
List<Project> authedProjects = projectMapper.queryAuthedProjectListByUserId(userId);
if (createProjects == null) {
createProjects = new ArrayList<>();
}
if (authedProjects != null) {
createProjects.addAll(authedProjects);
}
return createProjects;
}
/**
* list unauthorized udf function
*
* @param userId user id
* @param needChecks data source id array
* @return unauthorized udf function list
*/
@Override
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
public <T> List<T> listUnauthorized(int userId, T[] needChecks, AuthorizationType authorizationType) {
List<T> resultList = new ArrayList<>();
if (Objects.nonNull(needChecks) && needChecks.length > 0) {
Set<T> originResSet = new HashSet<>(Arrays.asList(needChecks));
switch (authorizationType) {
case RESOURCE_FILE_ID:
case UDF_FILE:
List<Resource> ownUdfResources = resourceMapper.listAuthorizedResourceById(userId, needChecks);
addAuthorizedResources(ownUdfResources, userId);
Set<Integer> authorizedResourceFiles =
ownUdfResources.stream().map(Resource::getId).collect(toSet());
originResSet.removeAll(authorizedResourceFiles);
break;
case RESOURCE_FILE_NAME:
List<Resource> ownResources = resourceMapper.listAuthorizedResource(userId, needChecks);
addAuthorizedResources(ownResources, userId);
Set<String> authorizedResources = ownResources.stream().map(Resource::getFullName).collect(toSet());
originResSet.removeAll(authorizedResources);
break;
case DATASOURCE:
Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks)
.stream().map(DataSource::getId).collect(toSet());
originResSet.removeAll(authorizedDatasources);
break;
case UDF:
Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream()
.map(UdfFunc::getId).collect(toSet());
originResSet.removeAll(authorizedUdfs);
break;
default:
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
break;
}
resultList.addAll(originResSet);
}
return resultList;
}
/**
* get user by user id
*
* @param userId user id
* @return User
*/
@Override
public User getUserById(int userId) {
return userMapper.selectById(userId);
}
/**
* get resource by resource id
*
* @param resourceId resource id
* @return Resource
*/
@Override
public Resource getResourceById(int resourceId) {
return resourceMapper.selectById(resourceId);
}
/**
* list resources by ids
*
* @param resIds resIds
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
* @return resource list
*/
@Override
public List<Resource> listResourceByIds(Integer[] resIds) {
return resourceMapper.listResourceByIds(resIds);
}
/**
* format task app id in task instance
*/
@Override
public String formatTaskAppId(TaskInstance taskInstance) {
ProcessInstance processInstance = findProcessInstanceById(taskInstance.getProcessInstanceId());
if (processInstance == null) {
return "";
}
ProcessDefinition definition = findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
if (definition == null) {
return "";
}
return String.format("%s_%s_%s", definition.getId(), processInstance.getId(), taskInstance.getId());
}
/**
* switch process definition version to process definition log version
*/
@Override
public int switchVersion(ProcessDefinition processDefinition, ProcessDefinitionLog processDefinitionLog) {
if (null == processDefinition || null == processDefinitionLog) {
return Constants.DEFINITION_FAILURE;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
processDefinitionLog.setId(processDefinition.getId());
processDefinitionLog.setReleaseState(ReleaseState.OFFLINE);
processDefinitionLog.setFlag(Flag.YES);
int result = processDefineMapper.updateById(processDefinitionLog);
if (result > 0) {
result = switchProcessTaskRelationVersion(processDefinitionLog);
if (result <= 0) {
return Constants.EXIT_CODE_FAILURE;
}
}
return result;
}
@Override
public int switchProcessTaskRelationVersion(ProcessDefinition processDefinition) {
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper
.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode());
if (!processTaskRelationList.isEmpty()) {
processTaskRelationMapper.deleteByCode(processDefinition.getProjectCode(), processDefinition.getCode());
}
List<ProcessTaskRelation> processTaskRelationListFromLog = processTaskRelationLogMapper
.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()).stream()
.map(ProcessTaskRelation::new).collect(Collectors.toList());
int batchInsert = processTaskRelationMapper.batchInsert(processTaskRelationListFromLog);
if (batchInsert == 0) {
return Constants.EXIT_CODE_FAILURE;
} else {
int result = 0;
for (ProcessTaskRelation taskRelation : processTaskRelationListFromLog) {
int switchResult = switchTaskDefinitionVersion(taskRelation.getPostTaskCode(),
taskRelation.getPostTaskVersion());
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,651 |
[Improvement][Resource Center] Remove useless table t_ds_relation_resources_task
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In new resource center, task can download resources directly by `fullName`, also, according to discussion before (https://github.com/apache/dolphinscheduler/pull/13593#issuecomment-1438045083), when delete or update resource, we don't have to check online status of the related task. In this way, `t_ds_relation_resources_task` is useless, DS doesn't have to keep the relation of task and resource.
Can we remove table `t_ds_relation_resources_task` and correlative entity, which can simplify code logic in resource center?
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13651
|
https://github.com/apache/dolphinscheduler/pull/13721
|
41801663fdc1b265df8e105680d3c53f8923c724
|
8895921d87ad34d5dc98f69ab024a28a1e6b1598
| 2023-03-01T09:23:18Z |
java
| 2023-03-23T14:52:23Z |
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
|
if (switchResult != Constants.EXIT_CODE_FAILURE) {
result++;
}
}
return result;
}
}
@Override
public int switchTaskDefinitionVersion(long taskCode, int taskVersion) {
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(taskCode);
if (taskDefinition == null) {
return Constants.EXIT_CODE_FAILURE;
}
if (taskDefinition.getVersion() == taskVersion) {
return Constants.EXIT_CODE_SUCCESS;
}
TaskDefinitionLog taskDefinitionUpdate =
taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskVersion);
if (taskDefinitionUpdate == null) {
return Constants.EXIT_CODE_FAILURE;
}
taskDefinitionUpdate.setUpdateTime(new Date());
taskDefinitionUpdate.setId(taskDefinition.getId());
return taskDefinitionMapper.updateById(taskDefinitionUpdate);
}
/**
* get resource ids
*
* @param taskDefinition taskDefinition
* @return resource ids
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.