From 48069f563fc71df74ca97789825aa38636b9db0d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 3 Jun 2021 15:10:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A4=E6=96=AD=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/ExtractDataService.java | 12 +++++++++++- frontend/src/views/dataset/data/UpdateInfo.vue | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index c2baf87982..7118982df8 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -112,7 +112,17 @@ public class ExtractDataService { "PROPERTIES(\"replication_num\" = \"1\");"; private static String dropTableSql = "DROP TABLE IF EXISTS TABLE_NAME;"; - private static String shellScript = "curl --location-trusted -u %s:%s -H \"label:%s\" -H \"column_separator:%s\" -H \"columns:%s\" -H \"merge_type: %s\" -T %s -XPUT http://%s:%s/api/%s/%s/_stream_load\n" + + private static String shellScript = "result=`curl --location-trusted -u %s:%s -H \"label:%s\" -H \"column_separator:%s\" -H \"columns:%s\" -H \"merge_type: %s\" -T %s -XPUT http://%s:%s/api/%s/%s/_stream_load`\n" + + "if [ $? == 0 ] ; then\n" + + " failstatus=$(echo $result | grep '\"Status\": \"Fail\"')\n" + + " if [[ \"$failstatus\" != \"\" ]]; then\n" + + " echo $result\n" + + " exit 1\n" + + " fi\n" + + "else\n" + + " echo $result\n" + + " exit 1\n" + + "fi\n" + "rm -rf %s\n"; private String createDorisTablColumnSql(List datasetTableFields) { String Column_Fields = "dataease_uuid varchar(50), `"; diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index ff82b6ff96..5f17e73c04 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -461,8 +461,11 @@ export default { post('/dataset/table/incrementalConfig', { tableId: this.table.id }).then(response => { this.incrementalConfig = response.data this.incrementalUpdateType = 'incrementalAdd' + console.log(this.sql); if (this.incrementalConfig.incrementalAdd) { this.sql = this.incrementalConfig.incrementalAdd + }else { + this.sql = '' } }) },