center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix：抽取数据

Browse Source
This commit is contained in:
taojinlong 2021-06-16 19:28:02 +08:00
parent 946c84ecaf
commit 74df70866d
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java
View File

@ -14,6 +14,10 @@ public class DorisTableUtils {
return "delete_" + dorisName; return "delete_" + dorisName;
} }
public static String dorisAddName(String dorisName) {
return "add_" + dorisName;
}
public static String dorisFieldName(String dorisName) { public static String dorisFieldName(String dorisName) {
return "f_" + Md5Utils.md5(dorisName); return "f_" + Md5Utils.md5(dorisName);
} }

18
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -491,7 +491,7 @@ public class ExtractDataService {
case "all_scope": case "all_scope":
transName = "trans_" + DorisTableUtils.dorisName(datasetTable.getId()); transName = "trans_" + DorisTableUtils.dorisName(datasetTable.getId());
outFile = DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId())); outFile = DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId()));
jobName = "job_" + datasetTable.getId(); jobName = "job_" + DorisTableUtils.dorisName(datasetTable.getId());
script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention);
break; break;
case "incremental_add": case "incremental_add":
@ -649,7 +649,7 @@ public class ExtractDataService {
break; break;
case "incremental_add": case "incremental_add":
transName = "trans_add_" + DorisTableUtils.dorisName(datasetTable.getId()); transName = "trans_add_" + DorisTableUtils.dorisName(datasetTable.getId());
outFile = DorisTableUtils.dorisName(datasetTable.getId()); outFile = DorisTableUtils.dorisAddName(datasetTable.getId());
transMeta.setName(transName); transMeta.setName(transName);
break; break;
case "incremental_delete": case "incremental_delete":
@ -789,18 +789,18 @@ public class ExtractDataService {
switch (type) { switch (type) {
case "all_scope": case "all_scope":
transName = "trans_" + dataSetTableId; transName = "trans_" + DorisTableUtils.dorisName(dataSetTableId);
jobName = "job_" + dataSetTableId; jobName = "job_" + DorisTableUtils.dorisName(dataSetTableId);
fileName = DorisTableUtils.dorisTmpName(dataSetTableId); fileName = DorisTableUtils.dorisTmpName(dataSetTableId);
break; break;
case "incremental_add": case "incremental_add":
transName = "trans_add_" + dataSetTableId; transName = "trans_add_" + DorisTableUtils.dorisName(dataSetTableId);
jobName = "job_add_" + dataSetTableId; jobName = "job_add_" + DorisTableUtils.dorisName(dataSetTableId);
fileName = DorisTableUtils.dorisName(dataSetTableId); fileName = DorisTableUtils.dorisAddName(dataSetTableId);
break; break;
case "incremental_delete": case "incremental_delete":
transName = "trans_delete_" + dataSetTableId; transName = "trans_delete_" + DorisTableUtils.dorisName(dataSetTableId);
jobName = "job_delete_" + dataSetTableId; jobName = "job_delete_" + DorisTableUtils.dorisName(dataSetTableId);
fileName = DorisTableUtils.dorisDeleteName(dataSetTableId); fileName = DorisTableUtils.dorisDeleteName(dataSetTableId);
break; break;
default: default: