You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2020/09/20 07:29:20 UTC
[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4729 Fix the hive
table will be overwrited when add csv table with the same name
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this push:
new 70b1afa KYLIN-4729 Fix the hive table will be overwrited when add csv table with the same name
70b1afa is described below
commit 70b1afa65149ba94741c45907dc2ec8dc091cd98
Author: rupengwang <wa...@live.cn>
AuthorDate: Thu Sep 17 14:45:26 2020 +0800
KYLIN-4729 Fix the hive table will be overwrited when add csv table with the same name
---
.../main/java/org/apache/kylin/rest/controller/TableController.java | 6 +++++-
webapp/app/js/controllers/sourceMeta.js | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
index fc9ff82..108b145 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
@@ -247,7 +247,7 @@ public class TableController extends BasicController {
@RequestMapping(value = "/saveCsvTable", method = { RequestMethod.POST })
@ResponseBody
- public TableDesc salveCsvTable(@RequestParam(value = "file") MultipartFile file,
+ public TableDesc saveCsvTable(@RequestParam(value = "file") MultipartFile file,
@RequestParam(value = "withHeader", required = false) boolean withHeader,
@RequestParam(value = "separator", required = true) String separator,
@RequestParam(value = "tableName", required = true) String tableName,
@@ -257,6 +257,10 @@ public class TableController extends BasicController {
throw new IllegalArgumentException("Please select a file");
}
+ if (tableService.getTableDescByName(tableName, false, project) != null) {
+ throw new InternalErrorException("Table " + tableName + " already exists!");
+ }
+
TableDesc desc = tableService.generateCsvTableDesc(tableName, JsonUtil.readValue(columnDescList, List.class));
TableExtDesc extDesc = tableService.generateTableExtDesc(desc, withHeader, separator);
tableService.loadTableToProject(desc, extDesc, project);
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index a64d52f..dd03bd5 100755
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -1523,7 +1523,7 @@ KylinApp
$scope.columnList = JSON.parse(response);
},
function (errResponse) {
- SweetAlert.error("Failed to load csv file.")
+ SweetAlert.swal('',JSON.parse(errResponse.data).msg, 'error')
}
);
}
@@ -1542,7 +1542,7 @@ KylinApp
scope.aceSrcTbLoaded(true);
},
function (errResponse) {
- SweetAlert.error("Failed to load csv file.")
+ SweetAlert.swal('',JSON.parse(errResponse.data).msg, 'error')
}
);
}