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 12:17:01 UTC
[1/5] incubator-kylin git commit: Give larger PermSize to avoid “OutOfMemoryError: PermGen space”
Repository: incubator-kylin
Updated Branches:
refs/heads/staging 17892f588 -> bf8e51ab2
Give larger PermSize to avoid “OutOfMemoryError: PermGen space”
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/3809d301
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/3809d301
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/3809d301
Branch: refs/heads/staging
Commit: 3809d301ec14d1261862134b2eef140a892f5a7c
Parents: edc8919
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Fri Apr 3 11:38:20 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Fri Apr 3 11:38:20 2015 +0800
----------------------------------------------------------------------
bin/kylin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3809d301/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/bin/kylin.sh b/bin/kylin.sh
index ceab0aa..5dabb37 100644
--- a/bin/kylin.sh
+++ b/bin/kylin.sh
@@ -34,7 +34,7 @@ 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 -XX:MaxPermSize=512m"
hbase ${JAVA_OPTS} ${KYLIN_EXTRA_START_OPTS} \
-Djava.util.logging.config.file=${tomcat_root}/conf/logging.properties \
[5/5] incubator-kylin git commit: Merge pull request #453 from
janzhongi/staging
Posted by li...@apache.org.
Merge pull request #453 from janzhongi/staging
KYLIN_659
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/bf8e51ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/bf8e51ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/bf8e51ab
Branch: refs/heads/staging
Commit: bf8e51ab24e52990f5b56c289c21975548d2499a
Parents: f8e6eaf 9e4b151
Author: Zhong,Jian <ji...@ebay.com>
Authored: Fri Apr 3 17:58:33 2015 +0800
Committer: Zhong,Jian <ji...@ebay.com>
Committed: Fri Apr 3 17:58:33 2015 +0800
----------------------------------------------------------------------
webapp/app/index.html | 2 +-
webapp/app/js/controllers/cubes.js | 7 ++++---
webapp/app/js/controllers/job.js | 5 +++--
webapp/grunt.json | 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-kylin git commit: Update sample sql
Posted by li...@apache.org.
Update sample sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/f8e6eaf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/f8e6eaf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/f8e6eaf7
Branch: refs/heads/staging
Commit: f8e6eaf7a84a765f8e41e8b7dfbbf4319cde4c8f
Parents: b116373
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Fri Apr 3 17:36:24 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Fri Apr 3 17:36:24 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/f8e6eaf7/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 ffcee88..8246aa6 100644
--- a/docs/Tutorial/Quick play with a sample cube.md
+++ b/docs/Tutorial/Quick play with a sample cube.md
@@ -7,7 +7,7 @@ Kylin provides a script for you to create a sample Cube; the script will also cr
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%;
5. Execute SQLs in the "Query" tab, for example:
- select cal_dt, sum(price) as total_selled, count(distinct seller_id) as sellers from kylin_sales group by cal_dt order by cal_dt
+ select part_dt, sum(price) as total_selled, count(distinct seller_id) as sellers from kylin_sales group by part_dt order by part_dt
6. You can verify the query result and compare the response time with hive;
[4/5] incubator-kylin git commit: KYLIN_659
Posted by li...@apache.org.
KYLIN_659
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9e4b1517
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9e4b1517
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9e4b1517
Branch: refs/heads/staging
Commit: 9e4b1517ad961afa9f3efa4e94ad8eb057dc263f
Parents: 17892f5
Author: jiazhong <ji...@ebay.com>
Authored: Fri Apr 3 17:56:47 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Fri Apr 3 17:56:47 2015 +0800
----------------------------------------------------------------------
webapp/app/index.html | 2 +-
webapp/app/js/controllers/cubes.js | 7 ++++---
webapp/app/js/controllers/job.js | 5 +++--
webapp/grunt.json | 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index df87007..44021a9 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -100,7 +100,7 @@
<script src="components/underscore/underscore.js"></script>
<script src="components/angular-underscore/angular-underscore.js"></script>
<script src="components/jquery-ui/jquery-ui.min.js"></script>
-<script src="components/angular-ui-sortable/sortable.min.js"></script>
+<script src="components/angular-ui-sortable/sortable.js"></script>
<script src="js/app.js"></script>
<script src="js/config.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/app/js/controllers/cubes.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index a08422a..fce706a 100755
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -41,8 +41,10 @@ KylinApp
dimensionFilter: '', measureFilter: ''};
$scope.list = function (offset, limit) {
+ var defer = $q.defer();
if(!$scope.projectModel.projects.length){
- return [];
+ defer.resolve([]);
+ return defer.promise;
}
offset = (!!offset) ? offset : 0;
limit = (!!limit) ? limit : 20;
@@ -55,11 +57,10 @@ KylinApp
$scope.loading = true;
- var defer = $q.defer();
return CubeList.list(queryParam).then(function(resp){
$scope.loading = false;
defer.resolve(resp);
- defer.promise;
+ return defer.promise;
});
};
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/app/js/controllers/job.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index c5fd311..0054915 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -49,8 +49,10 @@ KylinApp
});
$scope.list = function (offset, limit) {
+ var defer = $q.defer();
if(!$scope.projectModel.projects.length){
- return [];
+ defer.resolve([]);
+ return defer.promise;
}
offset = (!!offset) ? offset : 0;
var selectedJob = null;
@@ -58,7 +60,6 @@ KylinApp
selectedJob = $scope.state.selectedJob;
}
- var defer = $q.defer();
var statusIds = [];
angular.forEach($scope.status, function (statusObj, index) {
statusIds.push(statusObj.value);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9e4b1517/webapp/grunt.json
----------------------------------------------------------------------
diff --git a/webapp/grunt.json b/webapp/grunt.json
index f326df4..9a4499f 100755
--- a/webapp/grunt.json
+++ b/webapp/grunt.json
@@ -38,8 +38,8 @@
"app/components/angular-sweetalert/SweetAlert.js",
"app/components/underscore/underscore.js",
"app/components/angular-underscore/angular-underscore.js",
- "app/components/angular-ui-sortable/jquery-ui.min.js",
- "app/components/angular-ui-sortable/sortable.min.js",
+ "app/components/jquery-ui/jquery-ui.min.js",
+ "app/components/angular-ui-sortable/sortable.js",
"tmp/js/scripts.js"
],
"dest": "tmp/js/scripts.min.js"
[2/5] 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/b116373b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b116373b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b116373b
Branch: refs/heads/staging
Commit: b116373b0d1be1a48a6b873bb87f5316e6ae183e
Parents: 3809d30 17892f5
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Fri Apr 3 15:54:39 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Fri Apr 3 15:54:39 2015 +0800
----------------------------------------------------------------------
docs/TechInside/Kylin 0.7 Lambda Architecture.md | 12 ++++++++++++
docs/TechInside/Kylin_0.7_Lambda_Architecture.png | Bin 0 -> 48256 bytes
2 files changed, 12 insertions(+)
----------------------------------------------------------------------