Repository: kylin Updated Branches: refs/heads/2.1.x f52190b12 -> 3b71fe72c
KYLIN-1351 bug fix Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3b71fe72 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3b71fe72 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3b71fe72 Branch: refs/heads/2.1.x Commit: 3b71fe72c1cb2ee2971b2c89ac6b8f3d522316ab Parents: f52190b Author: Hongbin Ma <mahong...@apache.org> Authored: Fri Aug 11 16:00:12 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Fri Aug 11 16:00:12 2017 +0800 ---------------------------------------------------------------------- .../apache/kylin/metadata/MetadataManager.java | 23 ++++++++++---------- .../kylin/metadata/model/TableExtDesc.java | 22 +++++++++---------- .../apache/kylin/rest/service/TableService.java | 2 +- .../kylin/source/hive/HiveMetadataExplorer.java | 2 +- .../apache/kylin/source/jdbc/JdbcExplorer.java | 2 +- 5 files changed, 26 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3b71fe72/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 1cbf9ad..5fede65 100755 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java @@ -205,25 +205,26 @@ public class MetadataManager { * @return */ public TableExtDesc getTableExt(String tableName) { - if (tableName.indexOf(".") < 0) - tableName = "DEFAULT." + tableName; + TableDesc t = getTableDesc(tableName); + if (t == null) + return null; - TableExtDesc result = srcTableExdMap.get(tableName.toUpperCase()); + TableExtDesc result = srcTableExdMap.get(t.getIdentity()); // create new if (null == result) { result = new TableExtDesc(); - result.setName(tableName); + result.setIdentity(t.getIdentity()); result.setUuid(UUID.randomUUID().toString()); result.setLastModified(0); result.init(); - srcTableExdMap.put(result.getName(), result); + srcTableExdMap.put(t.getIdentity(), result); } return result; } public void saveTableExt(TableExtDesc tableExt) throws IOException { - if (tableExt.getUuid() == null || tableExt.getName() == null) { + if (tableExt.getUuid() == null || tableExt.getIdentity() == null) { throw new IllegalArgumentException(); } @@ -234,11 +235,11 @@ public class MetadataManager { ResourceStore store = getStore(); TableExtDesc t = store.getResource(path, TableExtDesc.class, TABLE_EXT_SERIALIZER); - if (t != null && t.getName() == null) + if (t != null && t.getIdentity() == null) store.deleteResource(path); store.putResource(path, tableExt, TABLE_EXT_SERIALIZER); - srcTableExdMap.put(tableExt.getName(), tableExt); + srcTableExdMap.put(tableExt.getIdentity(), tableExt); } public void removeTableExt(String tableName) throws IOException { @@ -405,13 +406,13 @@ public class MetadataManager { } // convert old tableExt json to new one - if (t.getName() == null) { + if (t.getIdentity() == null) { t = convertOldTableExtToNewer(path); } t.init(); - srcTableExdMap.putLocal(t.getName(), t); + srcTableExdMap.putLocal(t.getIdentity(), t); return t; } @@ -439,7 +440,7 @@ public class MetadataManager { } String tableIdentity = file.substring(0, file.length() - MetadataConstants.FILE_SURFIX.length()).toUpperCase(); TableExtDesc result = new TableExtDesc(); - result.setName(tableIdentity); + result.setIdentity(tableIdentity); result.setUuid(UUID.randomUUID().toString()); result.setLastModified(0); result.init(); http://git-wip-us.apache.org/repos/asf/kylin/blob/3b71fe72/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java index a0f67f0..8408d19 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableExtDesc.java @@ -38,7 +38,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class TableExtDesc extends RootPersistentEntity { @JsonProperty("table_name") - private String tableName; + private String tableIdentity; @JsonProperty("last_build_job_id") private String jodID; @@ -63,7 +63,7 @@ public class TableExtDesc extends RootPersistentEntity { } public String getResourcePath() { - return concatResourcePath(getName()); + return concatResourcePath(getIdentity()); } public static String concatResourcePath(String tableIdentity) { @@ -78,8 +78,8 @@ public class TableExtDesc extends RootPersistentEntity { this.frequency = frequency; } - public String getName() { - return this.tableName; + public String getIdentity() { + return this.tableIdentity; } public String getJodID() { @@ -137,7 +137,7 @@ public class TableExtDesc extends RootPersistentEntity { this.columnStats.get(i).setCardinality(Long.parseLong(cardi[i])); } } else { - throw new IllegalArgumentException("The given cardinality columns don't match tables " + tableName); + throw new IllegalArgumentException("The given cardinality columns don't match tables " + tableIdentity); } } @@ -159,8 +159,8 @@ public class TableExtDesc extends RootPersistentEntity { return this.totalRows; } - public void setName(String name) { - this.tableName = name; + public void setIdentity(String name) { + this.tableIdentity = name; } public void setJodID(String jobID) { @@ -168,8 +168,8 @@ public class TableExtDesc extends RootPersistentEntity { } public void init() { - if (this.tableName != null) - this.tableName = this.tableName.toUpperCase(); + if (this.tableIdentity != null) + this.tableIdentity = this.tableIdentity.toUpperCase(); } public void setLastModifiedTime(long lastModifiedTime) { @@ -186,7 +186,7 @@ public class TableExtDesc extends RootPersistentEntity { @Override public int hashCode() { - return getName().hashCode(); + return getIdentity().hashCode(); } @Override @@ -198,7 +198,7 @@ public class TableExtDesc extends RootPersistentEntity { @Override public String toString() { - return "TableExtDesc{" + "name='" + (null == tableName ? "NULL" : tableName) + '\'' + ", columns_samples=" + (null == columnStats ? "null" : Arrays.toString(columnStats.toArray())); + return "TableExtDesc{" + "name='" + (null == tableIdentity ? "NULL" : tableIdentity) + '\'' + ", columns_samples=" + (null == columnStats ? "null" : Arrays.toString(columnStats.toArray())); } @JsonIgnoreProperties(ignoreUnknown = true) http://git-wip-us.apache.org/repos/asf/kylin/blob/3b71fe72/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 915a9be..588611a 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 @@ -125,7 +125,7 @@ public class TableService extends BasicService { Preconditions.checkState(tableDesc.getName().equals(entry.getValue())); Preconditions.checkState(tableDesc.getIdentity().equals(entry.getKey() + "." + entry.getValue())); TableExtDesc extDesc = pair.getSecond(); - Preconditions.checkState(tableDesc.getIdentity().equals(extDesc.getName())); + Preconditions.checkState(tableDesc.getIdentity().equals(extDesc.getIdentity())); allMeta.add(pair); } http://git-wip-us.apache.org/repos/asf/kylin/blob/3b71fe72/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMetadataExplorer.java ---------------------------------------------------------------------- diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMetadataExplorer.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMetadataExplorer.java index 00a1c3b..2b05a56 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMetadataExplorer.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMetadataExplorer.java @@ -101,7 +101,7 @@ public class HiveMetadataExplorer implements ISourceMetadataExplorer, ISampleDat } TableExtDesc tableExtDesc = new TableExtDesc(); - tableExtDesc.setName(tableDesc.getIdentity()); + tableExtDesc.setIdentity(tableDesc.getIdentity()); tableExtDesc.setUuid(UUID.randomUUID().toString()); tableExtDesc.setLastModified(0); http://git-wip-us.apache.org/repos/asf/kylin/blob/3b71fe72/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java ---------------------------------------------------------------------- diff --git a/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java b/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java index 7dc4e43..6fd9576 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java +++ b/source-hive/src/main/java/org/apache/kylin/source/jdbc/JdbcExplorer.java @@ -291,7 +291,7 @@ public class JdbcExplorer implements ISourceMetadataExplorer, ISampleDataDeploye tableDesc.setColumns(columns.toArray(new ColumnDesc[columns.size()])); TableExtDesc tableExtDesc = new TableExtDesc(); - tableExtDesc.setName(table); + tableExtDesc.setIdentity(tableDesc.getIdentity()); tableExtDesc.setUuid(UUID.randomUUID().toString()); tableExtDesc.setLastModified(0); tableExtDesc.init();
