Skip to content

Commit c84f8bd

Browse files
committed
feature:本地归集增加可以指定文件的功能
1 parent 288782d commit c84f8bd

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

backend/services/data-collection-service/src/main/java/com/dataengine/collection/interfaces/facade/CollectionTaskController.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,11 @@ private String mapToJsonString(Map<String, Object> map, String taskId) {
8181
if (Objects.nonNull(map) && "DATAX".equals(map.get("type"))) {
8282
// NFS相关校验和处理
8383
map.put("destPath", "/dataset/local/" + taskId);
84-
map.put("filePaths", Arrays.asList(map.get("destPath")));
84+
if (map.containsKey("filePaths") && map.get("filePaths") != null && map.get("filePaths") instanceof List) {
85+
((List) map.get("filePaths")).add(map.get("destPath"));
86+
} else {
87+
map.put("filePaths", Collections.singletonList(map.get("destPath")));
88+
}
8589
return objectMapper.writeValueAsString(map);
8690
}
8791

backend/shared/domain-common/src/main/java/com/dataengine/common/domain/model/ChunkUploadPreRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class ChunkUploadPreRequest {
2828
public void incrementUploadedFileNum() {
2929
if (this.uploadedFileNum == null) {
3030
this.uploadedFileNum = 1;
31+
return;
3132
}
3233
this.uploadedFileNum++;
3334
}

runtime/datax/nfswriter/src/main/java/com/modelengine/edatamate/plugin/writer/nfswriter/NfsWriter.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.alibaba.datax.common.spi.Writer;
88
import com.alibaba.datax.common.util.Configuration;
99

10-
1110
import org.apache.commons.lang3.StringUtils;
1211

1312
import java.io.File;
@@ -62,12 +61,14 @@ public static class Task extends Writer.Task {
6261
private Configuration jobConfig;
6362
private String mountPoint;
6463
private String destPath;
64+
private List<String> files;
6565

6666
@Override
6767
public void init() {
6868
this.jobConfig = super.getPluginJobConf();
6969
this.destPath = this.jobConfig.getString("destPath");
7070
this.mountPoint = this.jobConfig.getString("mountPoint");
71+
this.files = this.jobConfig.getList("files", Collections.emptyList(), String.class);
7172
}
7273

7374
@Override
@@ -79,6 +80,9 @@ public void startWrite(RecordReceiver lineReceiver) {
7980
if (StringUtils.isBlank(fileName)) {
8081
continue;
8182
}
83+
if (!files.isEmpty() && !files.contains(fileName)) {
84+
continue;
85+
}
8286

8387
String filePath = this.mountPoint + "/" + fileName;
8488
ShellUtil.runCommand("rsync", Arrays.asList("--no-links", "--chmod=750", "--", filePath,
@@ -93,4 +97,4 @@ public void startWrite(RecordReceiver lineReceiver) {
9397
public void destroy() {
9498
}
9599
}
96-
}
100+
}

0 commit comments

Comments
 (0)