You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/10/21 10:20:49 UTC
kylin git commit: minor
Repository: kylin
Updated Branches:
refs/heads/KYLIN-1971 f1f69d44e -> ed4fcd333
minor
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ed4fcd33
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ed4fcd33
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ed4fcd33
Branch: refs/heads/KYLIN-1971
Commit: ed4fcd333a685b101cd53442aa65b4376bc8b25d
Parents: f1f69d4
Author: Li Yang <li...@apache.org>
Authored: Fri Oct 21 18:20:29 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Fri Oct 21 18:20:29 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/metadata/model/DataModelDesc.java | 5 +++--
.../src/main/java/org/apache/kylin/metadata/model/TableRef.java | 5 ++++-
.../org/apache/kylin/rest/controller/CubeDescController.java | 4 ----
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed4fcd33/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
index aba6380..f175d92 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
@@ -279,10 +279,11 @@ public class DataModelDesc extends RootPersistentEntity {
if (tables.containsKey(lookup.getTable()) == false)
throw new IllegalStateException("Lookup table does not exist:" + lookup.getTable());
+ TableDesc tableDesc = tables.get(lookup.getTable());
String alias = lookup.getAlias();
if (alias == null)
- alias = lookup.getTable();
- TableRef ref = new TableRef(this, alias, tables.get(lookup.getTable()));
+ alias = tableDesc.getName();
+ TableRef ref = new TableRef(this, alias, tableDesc);
lookup.setTableRef(ref);
lookupTableRefs.add(ref);
addAlias(ref);
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed4fcd33/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java
index afe25fd..626fb16 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java
@@ -94,6 +94,9 @@ public class TableRef {
@Override
public String toString() {
- return "TableRef[" + alias + "." + table.getName() + "]";
+ if (alias.equals(table.getName()))
+ return "TableRef[" + table.getName() + "]";
+ else
+ return "TableRef[" + alias + ":" + table.getName() + "]";
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed4fcd33/server-base/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
index fc4c694..5a8eeec 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeDescController.java
@@ -19,14 +19,10 @@
package org.apache.kylin.rest.controller;
import java.io.IOException;
-import java.util.Map;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.model.CubeDesc;
-import org.apache.kylin.metadata.model.ISourceAware;
-import org.apache.kylin.rest.response.GeneralResponse;
import org.apache.kylin.rest.service.CubeService;
-import org.apache.kylin.source.kafka.util.KafkaClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;