[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-26 Thread ASF subversion and git services (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16558169#comment-16558169
 ] 

ASF subversion and git services commented on KYLIN-3418:


Commit f5e28fb60ef42551deb58e81b08499e725afdf74 in kylin's branch 
refs/heads/master from Emiya0306
[ https://gitbox.apache.org/repos/asf?p=kylin.git;h=f5e28fb ]

KYLIN-3418 User interface for hybrid model - Frontend


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-26 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16558168#comment-16558168
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

shaofengshi closed pull request #175: KYLIN-3418 User interface for hybrid 
model - Frontend
URL: https://github.com/apache/kylin/pull/175
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/webapp/app/fonts/kylin.eot b/webapp/app/fonts/kylin.eot
new file mode 100755
index 00..4cb39d1272
Binary files /dev/null and b/webapp/app/fonts/kylin.eot differ
diff --git a/webapp/app/fonts/kylin.svg b/webapp/app/fonts/kylin.svg
new file mode 100755
index 00..df507bb9a8
--- /dev/null
+++ b/webapp/app/fonts/kylin.svg
@@ -0,0 +1,13 @@
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; >
+http://www.w3.org/2000/svg;>
+Generated by IcoMoon
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/app/fonts/kylin.ttf b/webapp/app/fonts/kylin.ttf
new file mode 100755
index 00..8294ac99f9
Binary files /dev/null and b/webapp/app/fonts/kylin.ttf differ
diff --git a/webapp/app/fonts/kylin.woff b/webapp/app/fonts/kylin.woff
new file mode 100755
index 00..4b6f197e4c
Binary files /dev/null and b/webapp/app/fonts/kylin.woff differ
diff --git a/webapp/app/image/checkbox+.svg b/webapp/app/image/checkbox+.svg
new file mode 100644
index 00..b8630a3dd8
--- /dev/null
+++ b/webapp/app/image/checkbox+.svg
@@ -0,0 +1,15 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+Group Copy 2
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/app/image/checkbox-.svg b/webapp/app/image/checkbox-.svg
new file mode 100644
index 00..6de232a15b
--- /dev/null
+++ b/webapp/app/image/checkbox-.svg
@@ -0,0 +1,17 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+bg copy 2
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/app/index.html b/webapp/app/index.html
index 12daaa2486..8f7e9540d2 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -149,6 +149,7 @@
 
 
 
+
 
 
 
@@ -172,6 +173,7 @@
 
 
 
+
 
 
 
@@ -210,6 +212,8 @@
 
 
 
+
+
 
 
 
@@ -256,6 +260,24 @@ Model Schema
   
 
 
+
+
+  
+

Error Message

+

{{text}}

+
+
+

Hybrid Instance Schema

+
{{schema}}
+
+ + + +
+

{{text}}

+
+ +

[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-26 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16558166#comment-16558166
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

shaofengshi closed pull request #174: KYLIN-3418 Adjust hybrid API
URL: https://github.com/apache/kylin/pull/174
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
index 286af5f360..5bb4450b34 100644
--- 
a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
@@ -26,6 +26,8 @@
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.persistence.ResourceStore;
 import org.apache.kylin.common.persistence.RootPersistentEntity;
+import org.apache.kylin.cube.CubeInstance;
+import org.apache.kylin.cube.CubeManager;
 import org.apache.kylin.metadata.model.ColumnDesc;
 import org.apache.kylin.metadata.model.DataModelDesc;
 import org.apache.kylin.metadata.model.MeasureDesc;
@@ -62,7 +64,7 @@ public static HybridInstance create(KylinConfig config, 
String name, List getRealizationEntries() {
 return realizationEntries;
 }
@@ -222,8 +224,15 @@ public RealizationType getType() {
 
 @Override
 public DataModelDesc getModel() {
-if (this.getLatestRealization() != null)
+if (this.getLatestRealization() != null) {
 return this.getLatestRealization().getModel();
+}
+// all included cubes are disabled
+if (this.getRealizationEntries() != null && 
this.getRealizationEntries().size() > 0) {
+String cubeName = 
this.getRealizationEntries().get(0).getRealization();
+CubeInstance cubeInstance = 
CubeManager.getInstance(config).getCube(cubeName);
+return cubeInstance.getModel();
+}
 return null;
 }
 
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java
 
b/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java
index f23f26c7df..c139b8dba8 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/HybridController.java
@@ -19,8 +19,12 @@
 package org.apache.kylin.rest.controller;
 
 import java.util.Collection;
+import java.util.List;
 
+import com.google.common.collect.Lists;
+import org.apache.kylin.metadata.model.DataModelDesc;
 import org.apache.kylin.rest.request.HybridRequest;
+import org.apache.kylin.rest.response.HybridRespone;
 import org.apache.kylin.rest.service.HybridService;
 import org.apache.kylin.storage.hybrid.HybridInstance;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,45 +45,58 @@
 
 @RequestMapping(value = "", method = RequestMethod.POST, produces = { 
"application/json" })
 @ResponseBody
-public HybridInstance create(@RequestBody HybridRequest request) {
+public HybridRespone create(@RequestBody HybridRequest request) {
 checkRequiredArg("hybrid", request.getHybrid());
 checkRequiredArg("project", request.getProject());
 checkRequiredArg("model", request.getModel());
 checkRequiredArg("cubes", request.getCubes());
-HybridInstance instance = 
hybridService.createHybridCube(request.getHybrid(), request.getProject(), 
request.getModel(), request.getCubes());
-return instance;
+HybridInstance hybridInstance = 
hybridService.createHybridInstance(request.getHybrid(), request.getProject(), 
request.getModel(),
+request.getCubes());
+return hybridInstance2response(hybridInstance);
 }
 
 @RequestMapping(value = "", method = RequestMethod.PUT, produces = { 
"application/json" })
 @ResponseBody
-public HybridInstance update(@RequestBody HybridRequest request) {
+public HybridRespone update(@RequestBody HybridRequest request) {
 checkRequiredArg("hybrid", request.getHybrid());
 checkRequiredArg("project", request.getProject());
 checkRequiredArg("model", request.getModel());
 checkRequiredArg("cubes", request.getCubes());
-HybridInstance instance = 
hybridService.updateHybridCube(request.getHybrid(), request.getProject(), 
request.getModel(), request.getCubes());
-return instance;
+HybridInstance hybridInstance = 
hybridService.updateHybridInstance(request.getHybrid(), request.getProject(), 
request.getModel(),
+request.getCubes());
+return 

[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-26 Thread ASF subversion and git services (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16558167#comment-16558167
 ] 

ASF subversion and git services commented on KYLIN-3418:


Commit 88a242f514a9ea9ae44f5b22a213dcd3a0aefb0b in kylin's branch 
refs/heads/master from chao long
[ https://gitbox.apache.org/repos/asf?p=kylin.git;h=88a242f ]

KYLIN-3418 Adjust hybrid API


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-25 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16556797#comment-16556797
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

coveralls edited a comment on issue #175: KYLIN-3418 User interface for hybrid 
model - Frontend
URL: https://github.com/apache/kylin/pull/175#issuecomment-407663956
 
 
   ## Pull Request Test Coverage Report for [Build 
3355](https://coveralls.io/builds/18170010)
   
   * **0** of **0**   changed or added relevant lines in **0** files are 
covered.
   * **2** unchanged lines in **2** files lost coverage.
   * Overall coverage increased (+**0.003%**) to **24.629%**
   
   ---
   
   
   |  Files with Coverage Reduction | New Missed Lines | % |
   | :-|--|--: |
   | 
[core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java](https://coveralls.io/builds/18170010/source?filename=core-cube%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fcube%2Finmemcubing%2FMemDiskStore.java#L553)
 | 1 | 78.12% |
   | 
[core-metadata/src/main/java/org/apache/kylin/metadata/cachesync/Broadcaster.java](https://coveralls.io/builds/18170010/source?filename=core-metadata%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fmetadata%2Fcachesync%2FBroadcaster.java#L149)
 | 1 | 57.71% |
   
   
   |  Totals | [![Coverage 
Status](https://coveralls.io/builds/18170010/badge)](https://coveralls.io/builds/18170010)
 |
   | :-- | --: |
   | Change from base [Build 3354](https://coveralls.io/builds/18169908): |  
0.003% |
   | Covered Lines: | 15464 |
   | Relevant Lines: | 62787 |
   
   ---
   #   - [Coveralls](https://coveralls.io)
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-25 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555315#comment-16555315
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

coveralls commented on issue #175: KYLIN-3418 User interface for hybrid model - 
Frontend
URL: https://github.com/apache/kylin/pull/175#issuecomment-407663956
 
 
   ## Pull Request Test Coverage Report for [Build 
3347](https://coveralls.io/builds/18151829)
   
   * **0** of **0**   changed or added relevant lines in **0** files are 
covered.
   * **3** unchanged lines in **3** files lost coverage.
   * Overall coverage decreased (**-0.005%**) to **24.64%**
   
   ---
   
   
   |  Files with Coverage Reduction | New Missed Lines | % |
   | :-|--|--: |
   | 
[server-base/src/main/java/org/apache/kylin/rest/util/QueryRequestLimits.java](https://coveralls.io/builds/18151829/source?filename=server-base%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Frest%2Futil%2FQueryRequestLimits.java#L72)
 | 1 | 47.62% |
   | 
[core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java](https://coveralls.io/builds/18151829/source?filename=core-cube%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fcube%2Finmemcubing%2FMemDiskStore.java#L553)
 | 1 | 78.12% |
   | 
[core-dictionary/src/main/java/org/apache/kylin/dict/lookup/cache/RocksDBLookupTable.java](https://coveralls.io/builds/18151829/source?filename=core-dictionary%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fdict%2Flookup%2Fcache%2FRocksDBLookupTable.java#L64)
 | 1 | 81.08% |
   
   
   |  Totals | [![Coverage 
Status](https://coveralls.io/builds/18151829/badge)](https://coveralls.io/builds/18151829)
 |
   | :-- | --: |
   | Change from base [Build 3340](https://coveralls.io/builds/18095307): |  
-0.005% |
   | Covered Lines: | 15460 |
   | Relevant Lines: | 62743 |
   
   ---
   #   - [Coveralls](https://coveralls.io)
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-25 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555344#comment-16555344
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

coveralls edited a comment on issue #175: KYLIN-3418 User interface for hybrid 
model - Frontend
URL: https://github.com/apache/kylin/pull/175#issuecomment-407663956
 
 
   ## Pull Request Test Coverage Report for [Build 
3349](https://coveralls.io/builds/18152307)
   
   * **0** of **0**   changed or added relevant lines in **0** files are 
covered.
   * **1** unchanged line in **1** file lost coverage.
   * Overall coverage increased (+**0.002%**) to **24.647%**
   
   ---
   
   
   |  Files with Coverage Reduction | New Missed Lines | % |
   | :-|--|--: |
   | 
[server-base/src/main/java/org/apache/kylin/rest/util/QueryRequestLimits.java](https://coveralls.io/builds/18152307/source?filename=server-base%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Frest%2Futil%2FQueryRequestLimits.java#L72)
 | 1 | 47.62% |
   
   
   |  Totals | [![Coverage 
Status](https://coveralls.io/builds/18152307/badge)](https://coveralls.io/builds/18152307)
 |
   | :-- | --: |
   | Change from base [Build 3340](https://coveralls.io/builds/18095307): |  
0.002% |
   | Covered Lines: | 15464 |
   | Relevant Lines: | 62743 |
   
   ---
   #   - [Coveralls](https://coveralls.io)
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


***UNCHECKED*** [jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-25 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555267#comment-16555267
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

asfgit commented on issue #175: KYLIN-3418 User interface for hybrid model - 
Frontend
URL: https://github.com/apache/kylin/pull/175#issuecomment-407655261
 
 
   Can one of the admins verify this patch?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


***UNCHECKED*** [jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-25 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555266#comment-16555266
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

Emiya0306 opened a new pull request #175: KYLIN-3418 User interface for hybrid 
model - Frontend
URL: https://github.com/apache/kylin/pull/175
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-25 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555212#comment-16555212
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

Emiya0306 closed pull request #173: KYLIN-3418 User interface for hybrid model 
- Frontend
URL: https://github.com/apache/kylin/pull/173
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/webapp/app/fonts/kylin.eot b/webapp/app/fonts/kylin.eot
new file mode 100755
index 00..4cb39d1272
Binary files /dev/null and b/webapp/app/fonts/kylin.eot differ
diff --git a/webapp/app/fonts/kylin.svg b/webapp/app/fonts/kylin.svg
new file mode 100755
index 00..df507bb9a8
--- /dev/null
+++ b/webapp/app/fonts/kylin.svg
@@ -0,0 +1,13 @@
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; >
+http://www.w3.org/2000/svg;>
+Generated by IcoMoon
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/app/fonts/kylin.ttf b/webapp/app/fonts/kylin.ttf
new file mode 100755
index 00..8294ac99f9
Binary files /dev/null and b/webapp/app/fonts/kylin.ttf differ
diff --git a/webapp/app/fonts/kylin.woff b/webapp/app/fonts/kylin.woff
new file mode 100755
index 00..4b6f197e4c
Binary files /dev/null and b/webapp/app/fonts/kylin.woff differ
diff --git a/webapp/app/image/checkbox+.svg b/webapp/app/image/checkbox+.svg
new file mode 100644
index 00..b8630a3dd8
--- /dev/null
+++ b/webapp/app/image/checkbox+.svg
@@ -0,0 +1,15 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+Group Copy 2
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/app/image/checkbox-.svg b/webapp/app/image/checkbox-.svg
new file mode 100644
index 00..6de232a15b
--- /dev/null
+++ b/webapp/app/image/checkbox-.svg
@@ -0,0 +1,17 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+bg copy 2
+Created with Sketch.
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/app/index.html b/webapp/app/index.html
index 12daaa2486..18c4c9ce45 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -149,6 +149,7 @@
 
 
 
+
 
 
 
@@ -172,6 +173,7 @@
 
 
 
+
 
 
 
@@ -210,6 +212,8 @@
 
 
 
+
+
 
 
 
@@ -256,6 +260,24 @@ Model Schema
   
 
 
+
+
+  
+

Error Message

+

{{text}}

+
+
+

Hybrid Cube Schema

+
{{schema}}
+
+ + + +
+

{{text}}

+
+ +

[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-25 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555210#comment-16555210
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

coveralls edited a comment on issue #173: KYLIN-3418 User interface for hybrid 
model - Frontend
URL: https://github.com/apache/kylin/pull/173#issuecomment-407273221
 
 
   ## Pull Request Test Coverage Report for [Build 
3346](https://coveralls.io/builds/18151257)
   
   * **0** of **0**   changed or added relevant lines in **0** files are 
covered.
   * **8** unchanged lines in **4** files lost coverage.
   * Overall coverage decreased (**-0.008%**) to **24.637%**
   
   ---
   
   
   |  Files with Coverage Reduction | New Missed Lines | % |
   | :-|--|--: |
   | 
[server-base/src/main/java/org/apache/kylin/rest/util/QueryRequestLimits.java](https://coveralls.io/builds/18151257/source?filename=server-base%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Frest%2Futil%2FQueryRequestLimits.java#L72)
 | 1 | 47.62% |
   | 
[core-metadata/src/main/java/org/apache/kylin/source/datagen/ColumnGenerator.java](https://coveralls.io/builds/18151257/source?filename=core-metadata%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fsource%2Fdatagen%2FColumnGenerator.java#L317)
 | 1 | 81.08% |
   | 
[core-dictionary/src/main/java/org/apache/kylin/dict/lookup/cache/RocksDBLookupTable.java](https://coveralls.io/builds/18151257/source?filename=core-dictionary%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fdict%2Flookup%2Fcache%2FRocksDBLookupTable.java#L64)
 | 1 | 81.08% |
   | 
[core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java](https://coveralls.io/builds/18151257/source?filename=core-cube%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fcube%2Finmemcubing%2FMemDiskStore.java#L439)
 | 5 | 77.81% |
   
   
   |  Totals | [![Coverage 
Status](https://coveralls.io/builds/18151257/badge)](https://coveralls.io/builds/18151257)
 |
   | :-- | --: |
   | Change from base [Build 3340](https://coveralls.io/builds/18095307): |  
-0.008% |
   | Covered Lines: | 15458 |
   | Relevant Lines: | 62743 |
   
   ---
   #   - [Coveralls](https://coveralls.io)
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-24 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555075#comment-16555075
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

shaofengshi commented on a change in pull request #173: KYLIN-3418 User 
interface for hybrid model - Frontend
URL: https://github.com/apache/kylin/pull/173#discussion_r204969762
 
 

 ##
 File path: webapp/app/js/model/hybridCubeManager.js
 ##
 @@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+KylinApp.service('hybridCubeManager', function($q, HybridCubeService, 
ProjectModel) {
+  var _this = this;
+  this.hybridCubes = [];
 
 Review comment:
   Hi, there is no "hybridCubes" concept, please use "hybridInstance"


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-24 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555070#comment-16555070
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

shaofengshi commented on a change in pull request #174: KYLIN-3418 adjust 
hybrid API
URL: https://github.com/apache/kylin/pull/174#discussion_r204969453
 
 

 ##
 File path: 
server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
 ##
 @@ -66,8 +66,7 @@ public HybridInstance createHybridCube(String hybridName, 
String projectName, St
 return getHybridInstance(hybridName);
 }
 
-public HybridInstance updateHybridCube(String hybridName, String 
projectName, String modelName,
-String[] cubeNames) {
+public HybridRespone updateHybridCube(String hybridName, String 
projectName, String modelName, String[] cubeNames) {
 
 Review comment:
   "HybridInstance" is a better name than "HybridCube"


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-24 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555037#comment-16555037
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

shaofengshi commented on a change in pull request #174: KYLIN-3418 adjust 
hybrid API
URL: https://github.com/apache/kylin/pull/174#discussion_r204966171
 
 

 ##
 File path: 
server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
 ##
 @@ -43,8 +44,7 @@
 @Autowired
 private AclEvaluate aclEvaluate;
 
-public HybridInstance createHybridCube(String hybridName, String 
projectName, String modelName,
-String[] cubeNames) {
+public HybridRespone createHybridCube(String hybridName, String 
projectName, String modelName, String[] cubeNames) {
 
 Review comment:
   "HybridRespone" is from the rest layer, it shouldn't be referenced at the 
service layer. Here the interface should be "HybridInstance"


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-24 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16555035#comment-16555035
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

shaofengshi commented on a change in pull request #174: KYLIN-3418 adjust 
hybrid API
URL: https://github.com/apache/kylin/pull/174#discussion_r204965852
 
 

 ##
 File path: 
server-base/src/main/java/org/apache/kylin/rest/job/HybridCubeCLI.java
 ##
 @@ -105,6 +105,18 @@ protected void execute(OptionsHelper optionsHelper) 
throws Exception {
 String projectName = optionsHelper.getOptionValue(OPTION_PROJECT);
 String modelName = optionsHelper.getOptionValue(OPTION_MODEL);
 String cubeNamesStr = optionsHelper.getOptionValue(OPTION_CUBES);
+
+HybridInstance hybridInstance = 
hybridManager.getHybridInstance(hybridName);
+
+if ("delete".equals(action)) {
+if (hybridInstance == null) {
+throw new RuntimeException("The Hybrid Cube doesn't exist, 
could not delete: " + hybridName);
 
 Review comment:
   Please use illegal argument exception.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-24 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16554319#comment-16554319
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

asfgit commented on issue #174: KYLIN-3418 adjust hybrid API
URL: https://github.com/apache/kylin/pull/174#issuecomment-407431944
 
 
   Can one of the admins verify this patch?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-24 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16554318#comment-16554318
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

Wayne1c opened a new pull request #174: KYLIN-3418 adjust hybrid API
URL: https://github.com/apache/kylin/pull/174
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-24 Thread Chao Long (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16554104#comment-16554104
 ] 

Chao Long commented on KYLIN-3418:
--

Hi [~emiya0306], I`d like to support this issue on the API side.

> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-23 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16553773#comment-16553773
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

coveralls commented on issue #173: KYLIN-3418 User interface for hybrid model - 
Frontend
URL: https://github.com/apache/kylin/pull/173#issuecomment-407273221
 
 
   ## Pull Request Test Coverage Report for [Build 
3342](https://coveralls.io/builds/18129057)
   
   * **0** of **0**   changed or added relevant lines in **0** files are 
covered.
   * **2** unchanged lines in **2** files lost coverage.
   * Overall coverage decreased (**-0.003%**) to **24.642%**
   
   ---
   
   
   |  Files with Coverage Reduction | New Missed Lines | % |
   | :-|--|--: |
   | 
[core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java](https://coveralls.io/builds/18129057/source?filename=core-cube%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fcube%2Finmemcubing%2FMemDiskStore.java#L553)
 | 1 | 78.12% |
   | 
[core-dictionary/src/main/java/org/apache/kylin/dict/lookup/cache/RocksDBLookupTable.java](https://coveralls.io/builds/18129057/source?filename=core-dictionary%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fkylin%2Fdict%2Flookup%2Fcache%2FRocksDBLookupTable.java#L64)
 | 1 | 81.08% |
   
   
   |  Totals | [![Coverage 
Status](https://coveralls.io/builds/18129057/badge)](https://coveralls.io/builds/18129057)
 |
   | :-- | --: |
   | Change from base [Build 3340](https://coveralls.io/builds/18095307): |  
-0.003% |
   | Covered Lines: | 15461 |
   | Relevant Lines: | 62743 |
   
   ---
   #   - [Coveralls](https://coveralls.io)
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-23 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16553755#comment-16553755
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

Emiya0306 opened a new pull request #173: KYLIN-3418 User interface for hybrid 
model - Frontend
URL: https://github.com/apache/kylin/pull/173
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Commented] (KYLIN-3418) User interface for hybrid model

2018-07-23 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/KYLIN-3418?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16553757#comment-16553757
 ] 

ASF GitHub Bot commented on KYLIN-3418:
---

asfgit commented on issue #173: KYLIN-3418 User interface for hybrid model - 
Frontend
URL: https://github.com/apache/kylin/pull/173#issuecomment-407269285
 
 
   Can one of the admins verify this patch?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> User interface for hybrid model
> ---
>
> Key: KYLIN-3418
> URL: https://issues.apache.org/jira/browse/KYLIN-3418
> Project: Kylin
>  Issue Type: Improvement
>  Components: Web 
>Reporter: Shaofeng SHI
>Assignee: Roger
>Priority: Major
> Fix For: v2.5.0
>
>
> Hybrid model is useful for model change. While now there is no entry for it 
> from GUI, this makes many users don't see such feature.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)