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 2017/01/03 06:42:41 UTC
[05/15] kylin git commit: KYLIN-2343 fix the wrong TABLE name when
loading
KYLIN-2343 fix the wrong TABLE name when loading
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e7e29f1f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e7e29f1f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e7e29f1f
Branch: refs/heads/sparkcubing-rebase
Commit: e7e29f1fee854f64f18bb898033f09e32996f16a
Parents: fdcb9b8
Author: Billy Liu <bi...@apache.org>
Authored: Fri Dec 30 18:59:46 2016 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Fri Dec 30 19:00:11 2016 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/metadata/MetadataManager.java | 8 ++++----
.../java/org/apache/kylin/rest/service/TableService.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/e7e29f1f/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index 7290d4c..3b6eb61 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -503,8 +503,8 @@ public class MetadataManager {
public List<String> getModelsUsingTable(String tableName, String projectName) throws IOException {
List<String> models = new ArrayList<>();
for (DataModelDesc modelDesc : getModels(projectName)) {
- for(TableRef tableRef : modelDesc.getAllTables()){
- if(tableRef.getTableName().equalsIgnoreCase(tableName)){
+ for (TableRef tableRef : modelDesc.getAllTables()) {
+ if (tableRef.getTableName().equalsIgnoreCase(tableName)) {
models.add(modelDesc.getName());
}
}
@@ -514,8 +514,8 @@ public class MetadataManager {
public boolean isTableInAnyModel(String tableName) {
for (DataModelDesc modelDesc : getModels()) {
- for(TableRef tableRef : modelDesc.getAllTables()){
- if(tableRef.getTableName().equalsIgnoreCase(tableName)){
+ for (TableRef tableRef : modelDesc.getAllTables()) {
+ if (tableRef.getTableName().equalsIgnoreCase(tableName)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/e7e29f1f/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java b/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
index 461800e..3325907 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
@@ -102,7 +102,7 @@ public class TableService extends BasicService {
@PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
private void unLoadHiveTable(String tableName) throws IOException {
tableName = normalizeHiveTableName(tableName);
- HiveSourceTableLoader.unLoadHiveTable(tableName.toUpperCase());
+ HiveSourceTableLoader.unLoadHiveTable(tableName);
}
@PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
@@ -313,6 +313,6 @@ public class TableService extends BasicService {
public String normalizeHiveTableName(String tableName){
String[] dbTableName = HadoopUtil.parseHiveTableName(tableName);
- return dbTableName[0] + "." + dbTableName[1];
+ return (dbTableName[0] + "." + dbTableName[1]).toUpperCase();
}
}