[incubator-dolphinscheduler] branch dev-1.3.0 updated: copy resources need get top directory first (#2866)

[lidongdai]

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
     new 6723454  copy resources need get top directory first (#2866)
6723454 is described below

commit 6723454df9c7d85d3f034d2c13a080db4c130fc1
Author: lgcareer <18610854...@163.com>
AuthorDate: Mon Jun 1 18:32:06 2020 +0800

    copy resources need get top directory first (#2866)
    
    * copy resources need get top directory first
    
    * copy resources need get top directory first
---
 .../apache/dolphinscheduler/api/service/UsersService.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
index f2bf447..b76ca83 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
@@ -18,6 +18,8 @@ package org.apache.dolphinscheduler.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
+import 
org.apache.dolphinscheduler.api.dto.resources.visitor.ResourceTreeVisitor;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.CheckUtils;
 import org.apache.dolphinscheduler.api.utils.PageInfo;
@@ -334,8 +336,10 @@ public class UsersService extends BaseService {
                         List<Resource> fileResourcesList = 
resourceMapper.queryResourceList(
                                 null, userId, ResourceType.FILE.ordinal());
                         if (CollectionUtils.isNotEmpty(fileResourcesList)) {
-                            for (Resource resource : fileResourcesList) {
-                                HadoopUtils.getInstance().copy(oldResourcePath 
+ "/" + resource.getAlias(), newResourcePath, false, true);
+                            ResourceTreeVisitor resourceTreeVisitor = new 
ResourceTreeVisitor(fileResourcesList);
+                            ResourceComponent resourceComponent = 
resourceTreeVisitor.visit();
+                            for (ResourceComponent resource : 
resourceComponent.getChildren()) {
+                                HadoopUtils.getInstance().copy(oldResourcePath 
+ "/" + resource.getName(), newResourcePath, false, true);
                             }
                         }
 
@@ -343,8 +347,10 @@ public class UsersService extends BaseService {
                         List<Resource> udfResourceList = 
resourceMapper.queryResourceList(
                                 null, userId, ResourceType.UDF.ordinal());
                         if (CollectionUtils.isNotEmpty(udfResourceList)) {
-                            for (Resource resource : udfResourceList) {
-                                HadoopUtils.getInstance().copy(oldUdfsPath + 
"/" + resource.getAlias(), newUdfsPath, false, true);
+                            ResourceTreeVisitor resourceTreeVisitor = new 
ResourceTreeVisitor(udfResourceList);
+                            ResourceComponent resourceComponent = 
resourceTreeVisitor.visit();
+                            for (ResourceComponent resource : 
resourceComponent.getChildren()) {
+                                HadoopUtils.getInstance().copy(oldUdfsPath + 
"/" + resource.getName(), newUdfsPath, false, true);
                             }
                         }