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 2015/04/03 05:39:54 UTC

[01/12] incubator-kylin git commit: update binary package with commit d936208 and update website content

Repository: incubator-kylin
Updated Branches:
  refs/heads/staging d93620882 -> 17892f588


update binary package with commit d936208 and update website content


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/16f15af3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/16f15af3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/16f15af3

Branch: refs/heads/staging
Commit: 16f15af30cf3a3cd5bb179ac050f2646cf0f016c
Parents: d936208
Author: lukehan <lu...@apache.org>
Authored: Wed Apr 1 13:54:28 2015 +0800
Committer: lukehan <lu...@apache.org>
Committed: Wed Apr 1 13:54:28 2015 +0800

----------------------------------------------------------------------
 docs/website/assets/js/main.js    | 150 ++++++++++++++++-----------------
 docs/website/community/index.html |   3 +-
 docs/website/download/index.md    |   4 +-
 3 files changed, 77 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/16f15af3/docs/website/assets/js/main.js
----------------------------------------------------------------------
diff --git a/docs/website/assets/js/main.js b/docs/website/assets/js/main.js
index 5a9b3d4..13de766 100644
--- a/docs/website/assets/js/main.js
+++ b/docs/website/assets/js/main.js
@@ -1,78 +1,74 @@
-jQuery(document).ready(function ($) {
-	
-	
-  
-	
-
-    //parallax effect
-    var parallax_animation = function () {
-        $('.parallax').each(function (i, obj) {
-            var speed = $(this).attr('parallax-speed');
-            if (speed) {
-                var background_pos = '-' + (window.pageYOffset / speed) + "px";
-                $(this).css('background-position', 'center ' + background_pos);
-            }
-        });
-    }
-
-
-
-
-   // page elements animation 
-    var image_animation = function () {
-        var diagramTop = $('#diagram').offset().top;
-		var coremTop = $('#core').offset().top;
-
-        
-        var scroll_top = $(window).scrollTop();
-        var currentPosition = scroll_top + 320;
-
-        if (diagramTop < currentPosition) {
-            $('#diagram').addClass("animated fadeIn");
-        } else {
-            $('#diagram').removeClass("animated fadeIn");
-        }
-
-        if (coremTop< currentPosition) {
-
-            $('#core').addClass("animated fadeInRight");
-        } else {
-            $('#core').removeClass("animated fadeInRight");
-        }
-
-    }
-	
-	
-	
-	
-	//document page 
-	$( "#content-container" ).load("docs/intro-content.html");
-	$( "#left-menu li" ).eq(0).css("background-color", "#efefef");
-
-    $( "#left-menu li" ).click(function(){
-		var selectedID = $(this).attr("id");
-		$("#content-container").load( "docs/"+selectedID+"-content.html", function() { $(this).fadeIn(500);});
-		$(this).css("background-color", "#efefef");
-		$(this).siblings().css("background-color", "transparent")
-		});
- 
-  $('#nav-wrapper').height($("#nav").height());
-    
-    $('#nav').affix({
-        offset: { top: $('#nav').offset().top }
-    });
-	
-
-
-
-    $(document).scroll(function () {
-        
-        parallax_animation();
-		image_animation();
-       
-
-    });
-
-
-
+jQuery(document).ready(function ($) {
+	
+	
+  
+	
+
+    //parallax effect
+    var parallax_animation = function () {
+        $('.parallax').each(function (i, obj) {
+            var speed = $(this).attr('parallax-speed');
+            if (speed) {
+                var background_pos = '-' + (window.pageYOffset / speed) + "px";
+                $(this).css('background-position', 'center ' + background_pos);
+            }
+        });
+    }
+
+
+
+
+   // page elements animation 
+    var image_animation = function () {
+        //var diagramTop = $('#diagram').offset().top;
+		var coremTop = $('#core').offset().top;
+
+        
+        var scroll_top = $(window).scrollTop();
+        var currentPosition = scroll_top + 320;
+
+        
+
+        if (coremTop< currentPosition) {
+
+            $('#core').addClass("animated fadeInRight");
+        } else {
+            $('#core').removeClass("animated fadeInRight");
+        }
+
+    }
+	
+	
+	
+	
+	//document page 
+	$( "#content-container" ).load("docs/intro-content.html");
+	$( "#left-menu li" ).eq(0).css("background-color", "#efefef");
+
+    $( "#left-menu li" ).click(function(){
+		var selectedID = $(this).attr("id");
+		$("#content-container").load( "docs/"+selectedID+"-content.html", function() { $(this).fadeIn(500);});
+		$(this).css("background-color", "#efefef");
+		$(this).siblings().css("background-color", "transparent")
+		});
+ 
+  $('#nav-wrapper').height($("#nav").height());
+    
+    $('#nav').affix({
+        offset: { top: $('#nav').offset().top }
+    });
+	
+
+
+
+    $(document).scroll(function () {
+        
+        parallax_animation();
+		image_animation();
+       
+
+    });
+
+
+
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/16f15af3/docs/website/community/index.html
----------------------------------------------------------------------
diff --git a/docs/website/community/index.html b/docs/website/community/index.html
index c0452d8..a426f6c 100644
--- a/docs/website/community/index.html
+++ b/docs/website/community/index.html
@@ -38,7 +38,8 @@ title: Community
             
             <div class="col-sm-4 col-md-4">
               <p class="big_text">DISCUSSION</p>
-              <p>Developement and User maililng list: <a href="mailto:dev@kylin.incubator.apache.org" target="_blank"> dev@kylin.incubator.apache.org</a></p>              
+              <p>Developement and User maililng list: <a href="mailto:dev@kylin.incubator.apache.org" target="_blank"> dev@kylin.incubator.apache.org</a></p>
+              <p>Please subscribe by sending email to: <a href="mailto:dev-subscribe@kylin.incubator.apache.org" target="_blank">dev-subscribe@kylin.incubator.apache.org</a></p>              
               <p>The official Kylin Twitter account: <a href="https://twitter.com/ApacheKylin" target="_blank"> @ApacheKylin</a></p>
             </div>
             <div class="col-sm-4 col-md-4">

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/16f15af3/docs/website/download/index.md
----------------------------------------------------------------------
diff --git a/docs/website/download/index.md b/docs/website/download/index.md
index a2cc3e5..b2e9315 100644
--- a/docs/website/download/index.md
+++ b/docs/website/download/index.md
@@ -16,7 +16,7 @@ title: Community
               <p class="big_text">Binary Package (v0.7.x)</p>
               <p><a href="http://kylin.incubator.apache.org/download/kylin-0.7.1-SNAPSHOT.tgz" target="_blank">v0.7.1-SNAPSHOT (Dev Build)</a> 
               <br/>Updated Date - March 24, 2015 <br/>	
-              <br/>Git Commit: <a href="https://github.com/KylinOLAP/Kylin/tree/6f1d30fcab48fd02e18f91386b41c12bfd188178" target="_blank">6f1d30f</a>						
+              <br/>Git Commit: <a href="https://github.com/KylinOLAP/Kylin/tree/d936208823d4f94b735b39568382162789d29f4c" target="_blank">d936208</a>						
 							</p>
             </div>
 
@@ -32,7 +32,7 @@ title: Community
 
             <div class="col-sm-4 col-md-4">
               <p class="big_text">Installation Guide</p> 
-							<p>v0.7.x: <a href="https://github.com/KylinOLAP/Kylin/blob/master/docs/Installation/install_and_run.md" target="_blank">https://github.com/KylinOLAP/Kylin/blob/master/docs/Installation/install_and_run.md</a></p>
+							<p>v0.7.x: <a href="https://github.com/apache/incubator-kylin/blob/master/docs/Installation/Installation.md" target="_blank">Installation Tutorial</a></p>
              
               <p>v0.6.x: <a href="https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation" target="_blank">https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation</a></p>
               


[09/12] incubator-kylin git commit: Report the jobId in log when a job was failed.

Posted by li...@apache.org.
Report the jobId in log when a job was failed.

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/edc8919c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/edc8919c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/edc8919c

Branch: refs/heads/staging
Commit: edc8919c6af28540123232b9d6382a43d9281b67
Parents: 397f614
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Fri Apr 3 11:22:28 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Fri Apr 3 11:22:28 2015 +0800

----------------------------------------------------------------------
 .../test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/edc8919c/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
index 2a5bacb..e6277db 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
@@ -162,7 +162,7 @@ public class BuildCubeWithEngineTest {
     }
 
     private void assertJobSucceed(String jobId) {
-        assertEquals(ExecutableState.SUCCEED, jobService.getOutput(jobId).getState());
+        assertEquals("The job '" + jobId + "' is failed.", ExecutableState.SUCCEED, jobService.getOutput(jobId).getState());
     }
 
     private class TestCallable implements Callable<List<String>> {


[11/12] incubator-kylin git commit: Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging

Posted by li...@apache.org.
Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/07db8376
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/07db8376
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/07db8376

Branch: refs/heads/staging
Commit: 07db8376410f550f4fd68da4708f24c5adac7ade
Parents: 77647fa edc8919
Author: liyang@apache.org <ya...@D-SHC-00801746.corp.ebay.com>
Authored: Fri Apr 3 04:25:22 2015 +0100
Committer: liyang@apache.org <ya...@D-SHC-00801746.corp.ebay.com>
Committed: Fri Apr 3 04:25:22 2015 +0100

----------------------------------------------------------------------
 bin/kylin.sh                                                  | 4 ++--
 docs/Tutorial/Quick play with a sample cube.md                | 2 +-
 examples/sample_cube/create_sample_tables.sql                 | 2 +-
 .../sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json | 4 ++--
 .../sample_cube/metadata/model_desc/kylin_sales_model.json    | 4 ++--
 examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json  | 2 +-
 .../java/org/apache/kylin/job/BuildCubeWithEngineTest.java    | 2 +-
 .../main/java/org/apache/kylin/metadata/MetadataManager.java  | 7 ++++++-
 8 files changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------



[04/12] incubator-kylin git commit: Skip wrong-format ModelDesc, otherwise it will cause all other models not loaded.

Posted by li...@apache.org.
Skip wrong-format ModelDesc, otherwise it will cause all other models not loaded.

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4b0bd7d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4b0bd7d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4b0bd7d5

Branch: refs/heads/staging
Commit: 4b0bd7d5ae71cf61dc0cd3895f45f954691df2ed
Parents: 8be6b20
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu Apr 2 16:57:31 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu Apr 2 16:57:31 2015 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/metadata/MetadataManager.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4b0bd7d5/metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index aedefd4..b5a3e96 100644
--- a/metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -294,7 +294,12 @@ public class MetadataManager {
 
         List<String> paths = store.collectResourceRecursively(ResourceStore.DATA_MODEL_DESC_RESOURCE_ROOT, MetadataConstants.FILE_SURFIX);
         for (String path : paths) {
-            reloadDataModelDescAt(path);
+            try {
+                reloadDataModelDescAt(path);
+            } catch (IllegalStateException e) {
+                logger.error("Error to load DataModel at " + path, e);
+                continue;
+            }
         }
 
         logger.debug("Loaded " + dataModelDescMap.size() + " DataModel(s)");


[05/12] incubator-kylin git commit: KYLIN-658, don't be too smart, stop auto replace PK with FK on dimensions

Posted by li...@apache.org.
KYLIN-658, don't be too smart, stop auto replace PK with FK on dimensions


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/fdbf5492
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/fdbf5492
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/fdbf5492

Branch: refs/heads/staging
Commit: fdbf54927a46a750652b39109f5fba1989356d7e
Parents: 16f15af
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Apr 2 17:54:56 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Apr 2 17:54:56 2015 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/cube/model/CubeDesc.java   | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/fdbf5492/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index 499dd63..f236c4e 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -575,16 +575,6 @@ public class CubeDesc extends RootPersistentEntity {
             throw new IllegalArgumentException("No column '" + colName + "' found in table " + table);
         
         TblColRef ref = new TblColRef(col);
-        
-        // always use FK instead PK, FK could be shared by more than one lookup tables
-        JoinDesc join = dim.getJoin();
-        if (join != null) {
-            int idx = ArrayUtils.indexOf(join.getPrimaryKeyColumns(), ref);
-            if (idx >= 0) {
-                ref = join.getForeignKeyColumns()[idx];
-            }
-        }
-
         return initDimensionColRef(ref);
     }
 


[12/12] incubator-kylin git commit: alter 0.7 architecture png

Posted by li...@apache.org.
alter 0.7 architecture png


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/17892f58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/17892f58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/17892f58

Branch: refs/heads/staging
Commit: 17892f588ab7bcba0af9c1e35ba4a7713e494d73
Parents: 07db837
Author: liyang@apache.org <ya...@D-SHC-00801746.corp.ebay.com>
Authored: Fri Apr 3 04:38:47 2015 +0100
Committer: liyang@apache.org <ya...@D-SHC-00801746.corp.ebay.com>
Committed: Fri Apr 3 04:38:47 2015 +0100

----------------------------------------------------------------------
 .../Kylin_0.7_Lambda_Architecture.png           | Bin 56204 -> 48256 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/17892f58/docs/TechInside/Kylin_0.7_Lambda_Architecture.png
----------------------------------------------------------------------
diff --git a/docs/TechInside/Kylin_0.7_Lambda_Architecture.png b/docs/TechInside/Kylin_0.7_Lambda_Architecture.png
index df3775d..7adb099 100644
Binary files a/docs/TechInside/Kylin_0.7_Lambda_Architecture.png and b/docs/TechInside/Kylin_0.7_Lambda_Architecture.png differ


[03/12] incubator-kylin git commit: Remind user to restart Kylin after run sample.sh

Posted by li...@apache.org.
Remind user to restart Kylin after run sample.sh

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/8be6b20a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/8be6b20a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/8be6b20a

Branch: refs/heads/staging
Commit: 8be6b20ac782e5a968cb13aae673bc38935c74d0
Parents: 5860b98
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu Apr 2 15:59:30 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu Apr 2 15:59:30 2015 +0800

----------------------------------------------------------------------
 docs/Tutorial/Quick play with a sample cube.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8be6b20a/docs/Tutorial/Quick play with a sample cube.md
----------------------------------------------------------------------
diff --git a/docs/Tutorial/Quick play with a sample cube.md b/docs/Tutorial/Quick play with a sample cube.md
index 9495b4a..ffcee88 100644
--- a/docs/Tutorial/Quick play with a sample cube.md	
+++ b/docs/Tutorial/Quick play with a sample cube.md	
@@ -2,7 +2,7 @@
 
 Kylin provides a script for you to create a sample Cube; the script will also create three sample hive tables:
 
-1. Run ${KYLIN_HOME}/bin/sample.sh
+1. Run ${KYLIN_HOME}/bin/sample.sh ; Restart kylin server to flush the caches;
 2. Logon Kylin web, select project "learn_kylin";
 3. Select the sample cube "kylin_sales_cube", click "Actions" -> "Build", pick up a date later than 2014-01-01 (to cover all 10000 sample records);
 4. Check the build progress in "Jobs" tab, until 100%;


[10/12] incubator-kylin git commit: doc for Kylin 0.7 Lambda Architecture

Posted by li...@apache.org.
doc for Kylin 0.7 Lambda Architecture


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/77647fab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/77647fab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/77647fab

Branch: refs/heads/staging
Commit: 77647fabcad502684ba18eaf399323634aa4af3c
Parents: fdbf549
Author: liyang@apache.org <ya...@D-SHC-00801746.corp.ebay.com>
Authored: Fri Apr 3 04:24:35 2015 +0100
Committer: liyang@apache.org <ya...@D-SHC-00801746.corp.ebay.com>
Committed: Fri Apr 3 04:24:35 2015 +0100

----------------------------------------------------------------------
 docs/TechInside/Kylin 0.7 Lambda Architecture.md  |  12 ++++++++++++
 docs/TechInside/Kylin_0.7_Lambda_Architecture.png | Bin 0 -> 56204 bytes
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/77647fab/docs/TechInside/Kylin 0.7 Lambda Architecture.md
----------------------------------------------------------------------
diff --git a/docs/TechInside/Kylin 0.7 Lambda Architecture.md b/docs/TechInside/Kylin 0.7 Lambda Architecture.md
new file mode 100644
index 0000000..9ee40bc
--- /dev/null
+++ b/docs/TechInside/Kylin 0.7 Lambda Architecture.md	
@@ -0,0 +1,12 @@
+Kylin 0.7 Lambda Architecture
+===
+
+Start from 0.7, Kylin adopts a [Lambda Architecture](http://en.wikipedia.org/wiki/Lambda_architecture) to support near real-time analysis from streaming input.
+
+* Data is separated into Young and Aged.
+* The young generation is batch loaded from streaming (e.g. every minute) and saved in a real-time storage with inverted index.
+* Aged generation is batch loaded from real-time storage to historic storage daily or hourly. Aged generation is stored as OLAP cube with pre-calculation.
+* A hybrid storage interface sits on top of the real-time and historic storage, and provides a view of complete data set for SQL queries.
+* The combination of inverted index and OLAP cube enables subsecond query latencies on near real-time data with huge history.
+
+![Kylin 0.7 Lambda Architecture](Kylin_0.7_Lambda_Architecture.png)

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/77647fab/docs/TechInside/Kylin_0.7_Lambda_Architecture.png
----------------------------------------------------------------------
diff --git a/docs/TechInside/Kylin_0.7_Lambda_Architecture.png b/docs/TechInside/Kylin_0.7_Lambda_Architecture.png
new file mode 100644
index 0000000..df3775d
Binary files /dev/null and b/docs/TechInside/Kylin_0.7_Lambda_Architecture.png differ


[02/12] incubator-kylin git commit: Add {JAVA_OPTS} when use HBASE command to startup kylin server

Posted by li...@apache.org.
Add {JAVA_OPTS} when use HBASE command to startup kylin server

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/5860b985
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/5860b985
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/5860b985

Branch: refs/heads/staging
Commit: 5860b985c65eae9774bdb65b17e13a2293fa4258
Parents: 16f15af
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu Apr 2 15:57:06 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu Apr 2 15:57:06 2015 +0800

----------------------------------------------------------------------
 bin/kylin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/5860b985/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/bin/kylin.sh b/bin/kylin.sh
index bffe37f..ceab0aa 100644
--- a/bin/kylin.sh
+++ b/bin/kylin.sh
@@ -34,9 +34,9 @@ then
 
     export HBASE_CLASSPATH_PREFIX=${tomcat_root}/bin/bootstrap.jar:${tomcat_root}/bin/tomcat-juli.jar:${tomcat_root}/lib/*:$HBASE_CLASSPATH_PREFIX
     export HBASE_CLASSPATH=$hive_dependency:${HBASE_CLASSPATH}
-    export  JAVA_OPTS="-Xms2048M -Xmx2048M"
+    export JAVA_OPTS="-Xms2048M -Xmx2048M"
 
-    hbase ${KYLIN_EXTRA_START_OPTS} \
+    hbase ${JAVA_OPTS} ${KYLIN_EXTRA_START_OPTS} \
     -Djava.util.logging.config.file=${tomcat_root}/conf/logging.properties \
     -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
     -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \


[08/12] incubator-kylin git commit: Update sample cube desc

Posted by li...@apache.org.
Update sample cube desc

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/397f614f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/397f614f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/397f614f

Branch: refs/heads/staging
Commit: 397f614f8073b2b2da3eda83ff1f2bfe55a60aa7
Parents: da242d9
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu Apr 2 18:07:04 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu Apr 2 18:07:04 2015 +0800

----------------------------------------------------------------------
 .../sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/397f614f/examples/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
----------------------------------------------------------------------
diff --git a/examples/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json b/examples/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
index 3883882..a67e70e 100644
--- a/examples/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
+++ b/examples/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
@@ -118,7 +118,7 @@
   } ],
   "rowkey" : {
     "rowkey_columns" : [ {
-      "column" : "cal_dt",
+      "column" : "part_dt",
       "length" : 0,
       "dictionary" : "true",
       "mandatory" : false
@@ -153,7 +153,7 @@
       "dictionary" : "true",
       "mandatory" : false
     } ],
-    "aggregation_groups" : [ [ "cal_dt", "lstg_site_id", "leaf_categ_id", "meta_categ_name", "categ_lvl3_name", "categ_lvl2_name", "lstg_format_name" ] ]
+    "aggregation_groups" : [ [ "part_dt", "lstg_site_id", "leaf_categ_id", "meta_categ_name", "categ_lvl3_name", "categ_lvl2_name", "lstg_format_name" ] ]
   },
   "signature" : "ZJWTQ2jIPXjBfuwYeizpxg==",
   "last_modified" : 1426255280419,


[07/12] incubator-kylin git commit: Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging

Posted by li...@apache.org.
Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/da242d92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/da242d92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/da242d92

Branch: refs/heads/staging
Commit: da242d92f28348b24d9a16658d28d8e831b95a1d
Parents: c0cbf98 fdbf549
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu Apr 2 17:55:55 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu Apr 2 17:55:55 2015 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/cube/model/CubeDesc.java   | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------



[06/12] incubator-kylin git commit: Change sample fact tables’ CAL_DT column name to PART_DT

Posted by li...@apache.org.
Change sample fact tables’ CAL_DT column name to PART_DT

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/c0cbf98a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c0cbf98a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c0cbf98a

Branch: refs/heads/staging
Commit: c0cbf98a7489f9dea6a0e0bc029340d0629191ba
Parents: 4b0bd7d
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu Apr 2 17:55:28 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu Apr 2 17:55:28 2015 +0800

----------------------------------------------------------------------
 examples/sample_cube/create_sample_tables.sql                   | 2 +-
 examples/sample_cube/metadata/model_desc/kylin_sales_model.json | 4 ++--
 examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c0cbf98a/examples/sample_cube/create_sample_tables.sql
----------------------------------------------------------------------
diff --git a/examples/sample_cube/create_sample_tables.sql b/examples/sample_cube/create_sample_tables.sql
index b49b16f..ad6f3d6 100644
--- a/examples/sample_cube/create_sample_tables.sql
+++ b/examples/sample_cube/create_sample_tables.sql
@@ -155,7 +155,7 @@ DROP TABLE IF EXISTS DEFAULT.KYLIN_SALES;
 CREATE TABLE DEFAULT.KYLIN_SALES
 (
 TRANS_ID bigint
-,CAL_DT date
+,PART_DT date
 ,LSTG_FORMAT_NAME string
 ,LEAF_CATEG_ID bigint
 ,LSTG_SITE_ID int

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c0cbf98a/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
----------------------------------------------------------------------
diff --git a/examples/sample_cube/metadata/model_desc/kylin_sales_model.json b/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
index bdefd3e..157a036 100644
--- a/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
+++ b/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
@@ -6,7 +6,7 @@
     "join" : {
       "type" : "inner",
       "primary_key" : [ "CAL_DT" ],
-      "foreign_key" : [ "CAL_DT" ]
+      "foreign_key" : [ "PART_DT" ]
     }
   }, {
     "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS",
@@ -21,7 +21,7 @@
   "fact_table" : "DEFAULT.KYLIN_SALES",
   "filter_condition" : null,
   "partition_desc" : {
-    "partition_date_column" : "DEFAULT.KYLIN_SALES.CAL_DT",
+    "partition_date_column" : "DEFAULT.KYLIN_SALES.PART_DT",
     "partition_date_start" : 0,
     "partition_type" : "APPEND"
   }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c0cbf98a/examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json
----------------------------------------------------------------------
diff --git a/examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json b/examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json
index 33a8807..be7cde5 100644
--- a/examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json
+++ b/examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json
@@ -7,7 +7,7 @@
     "datatype" : "bigint"
   }, {
     "id" : "2",
-    "name" : "CAL_DT",
+    "name" : "PART_DT",
     "datatype" : "date"
   }, {
     "id" : "3",