You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/12/30 02:31:31 UTC
[39/42] kylin git commit: KYLIN-2323 code review
KYLIN-2323 code review
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a9ee6d33
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a9ee6d33
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a9ee6d33
Branch: refs/heads/sparkcubing-rebase
Commit: a9ee6d33eca53f67d9d4dd1da52b6fbfe98cb510
Parents: 5cbef32
Author: Yang Li <li...@apache.org>
Authored: Fri Dec 30 07:07:53 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Fri Dec 30 07:07:53 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/common/util/StringUtil.java | 11 +++++++++++
.../apache/kylin/rest/controller/TableController.java | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a9ee6d33/core-common/src/main/java/org/apache/kylin/common/util/StringUtil.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/StringUtil.java b/core-common/src/main/java/org/apache/kylin/common/util/StringUtil.java
index bbc9448..12e7279 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/StringUtil.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/StringUtil.java
@@ -153,4 +153,15 @@ public class StringUtil {
}
}
+ public static String[] splitAndTrim(String str, String splitBy) {
+ String[] split = str.split(splitBy);
+ ArrayList<String> r = new ArrayList<>(split.length);
+ for (String s : split) {
+ s = s.trim();
+ if (!s.isEmpty())
+ r.add(s);
+ }
+ return (String[]) r.toArray(new String[r.size()]);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/a9ee6d33/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java
----------------------------------------------------------------------
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 eed5413..1ab6ba6 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
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.kylin.common.util.StringUtil;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.rest.exception.InternalErrorException;
import org.apache.kylin.rest.exception.NotFoundException;
@@ -94,7 +95,7 @@ public class TableController extends BasicController {
public Map<String, String[]> loadHiveTables(@PathVariable String tables, @PathVariable String project, @RequestBody HiveTableRequest request) throws IOException {
String submitter = SecurityContextHolder.getContext().getAuthentication().getName();
Map<String, String[]> result = new HashMap<String, String[]>();
- String[] tableNames = tables.split(",");
+ String[] tableNames = StringUtil.splitAndTrim(tables, ",");
try {
String[] loaded = tableService.loadHiveTablesToProject(tableNames, project);
result.put("result.loaded", loaded);