kylin git commit: minor, UI fix add cube/model page refresh issue
Repository: kylin Updated Branches: refs/heads/2.0-rc 2aeca11e6 -> f18f7b025 minor, UI fix add cube/model page refresh issue Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f18f7b02 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f18f7b02 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f18f7b02 Branch: refs/heads/2.0-rc Commit: f18f7b025cc10c7a2d0b160fbdcb344991d7bde2 Parents: 2aeca11 Author: janzhongi Authored: Tue Feb 23 15:43:46 2016 +0800 Committer: janzhongi Committed: Tue Feb 23 15:43:46 2016 +0800 -- webapp/app/js/controllers/cubeEdit.js | 2 +- webapp/app/js/controllers/modelEdit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/f18f7b02/webapp/app/js/controllers/cubeEdit.js -- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 5901c4f..2e1c9c5 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -30,7 +30,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio var absUrl = $location.absUrl(); $scope.cubeMode = absUrl.indexOf("/cubes/add") != -1 ? 'addNewCube' : absUrl.indexOf("/cubes/edit") != -1 ? 'editExistCube' : 'default'; - if ($scope.cubeMode == "addNewCube" && !ProjectModel.getSelectedProject()) { + if ($scope.cubeMode == "addNewCube" && ProjectModel.selectedProject==null) { SweetAlert.swal('Oops...', 'Please select your project first.', 'warning'); $location.path("/models"); return; http://git-wip-us.apache.org/repos/asf/kylin/blob/f18f7b02/webapp/app/js/controllers/modelEdit.js -- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index 34c0bd5..aafa122 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -24,7 +24,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati var absUrl = $location.absUrl(); $scope.modelMode = absUrl.indexOf("/models/add")!=-1?'addNewModel':absUrl.indexOf("/models/edit")!=-1?'editExistModel':'default'; -if($scope.modelMode=="addNewModel"&&!ProjectModel.getSelectedProject()){ +if($scope.modelMode=="addNewModel" && ProjectModel.selectedProject==null){ SweetAlert.swal('Oops...', 'Please select your project first.', 'warning'); $location.path("/models"); }
kylin git commit: minor, UI fix add cube/model page refresh issue
Repository: kylin Updated Branches: refs/heads/2.x-staging ce5bcd2b0 -> ed6d971e9 minor, UI fix add cube/model page refresh issue Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ed6d971e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ed6d971e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ed6d971e Branch: refs/heads/2.x-staging Commit: ed6d971e9ad394543be2b01cfcaa6750106b1998 Parents: ce5bcd2 Author: janzhongi Authored: Tue Feb 23 15:41:36 2016 +0800 Committer: janzhongi Committed: Tue Feb 23 15:41:36 2016 +0800 -- webapp/app/js/controllers/cubeEdit.js | 2 +- webapp/app/js/controllers/modelEdit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/ed6d971e/webapp/app/js/controllers/cubeEdit.js -- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 2968a9b..578f6c8 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -30,7 +30,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio var absUrl = $location.absUrl(); $scope.cubeMode = absUrl.indexOf("/cubes/add") != -1 ? 'addNewCube' : absUrl.indexOf("/cubes/edit") != -1 ? 'editExistCube' : 'default'; - if ($scope.cubeMode == "addNewCube" && !ProjectModel.getSelectedProject()) { + if ($scope.cubeMode == "addNewCube" && ProjectModel.selectedProject==null) { SweetAlert.swal('Oops...', 'Please select your project first.', 'warning'); $location.path("/models"); return; http://git-wip-us.apache.org/repos/asf/kylin/blob/ed6d971e/webapp/app/js/controllers/modelEdit.js -- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index d0785dc..2de251e 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -24,7 +24,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati var absUrl = $location.absUrl(); $scope.modelMode = absUrl.indexOf("/models/add")!=-1?'addNewModel':absUrl.indexOf("/models/edit")!=-1?'editExistModel':'default'; -if($scope.modelMode=="addNewModel"&&!ProjectModel.getSelectedProject()){ +if($scope.modelMode=="addNewModel"&&ProjectModel.selectedProject==null){ SweetAlert.swal('Oops...', 'Please select your project first.', 'warning'); $location.path("/models"); }
kylin git commit: minor,UI check project in API param
Repository: kylin Updated Branches: refs/heads/2.0-rc dbb267479 -> 2aeca11e6 minor,UI check project in API param Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2aeca11e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2aeca11e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2aeca11e Branch: refs/heads/2.0-rc Commit: 2aeca11e6979ea89ea7ba2bac016d87743f85622 Parents: dbb2674 Author: janzhongi Authored: Tue Feb 23 14:51:00 2016 +0800 Committer: janzhongi Committed: Tue Feb 23 14:51:00 2016 +0800 -- webapp/app/js/controllers/cubeEdit.js | 2 +- webapp/app/js/controllers/modelEdit.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/2aeca11e/webapp/app/js/controllers/cubeEdit.js -- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 4f7d67d..5901c4f 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -785,7 +785,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio } $scope.$watch('projectModel.selectedProject', function (newValue, oldValue) { -if (!newValue) { +if(!$scope.projectModel.getSelectedProject()) { return; } var param = { http://git-wip-us.apache.org/repos/asf/kylin/blob/2aeca11e/webapp/app/js/controllers/modelEdit.js -- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index b908a96..34c0bd5 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -210,9 +210,9 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati } $scope.$watch('projectModel.selectedProject', function (newValue, oldValue) { -if(!newValue){ -return; -} + if(!$scope.projectModel.getSelectedProject()) { +return; + } var param = { ext: true, project:newValue
kylin git commit: minor,UI check project in API param
Repository: kylin Updated Branches: refs/heads/2.x-staging 4dd1b3438 -> ce5bcd2b0 minor,UI check project in API param Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ce5bcd2b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ce5bcd2b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ce5bcd2b Branch: refs/heads/2.x-staging Commit: ce5bcd2b0882bbf0e130ebaeb6ec30af1e978507 Parents: 4dd1b34 Author: janzhongi Authored: Tue Feb 23 14:48:28 2016 +0800 Committer: janzhongi Committed: Tue Feb 23 14:48:52 2016 +0800 -- webapp/app/js/controllers/cubeEdit.js | 2 +- webapp/app/js/controllers/modelEdit.js | 8 webapp/app/js/model/tableModel.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/ce5bcd2b/webapp/app/js/controllers/cubeEdit.js -- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 8259ab1..2968a9b 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -676,7 +676,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio } $scope.$watch('projectModel.selectedProject', function (newValue, oldValue) { -if (!newValue) { +if(!$scope.projectModel.getSelectedProject()) { return; } var param = { http://git-wip-us.apache.org/repos/asf/kylin/blob/ce5bcd2b/webapp/app/js/controllers/modelEdit.js -- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index 111ca91..d0785dc 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -208,10 +208,10 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati } $scope.$watch('projectModel.selectedProject', function (newValue, oldValue) { -if(!newValue){ -return; -} -var param = { + if(!$scope.projectModel.getSelectedProject()) { +return; + } + var param = { ext: true, project:newValue }; http://git-wip-us.apache.org/repos/asf/kylin/blob/ce5bcd2b/webapp/app/js/model/tableModel.js -- diff --git a/webapp/app/js/model/tableModel.js b/webapp/app/js/model/tableModel.js index 767c555..bb124c9 100755 --- a/webapp/app/js/model/tableModel.js +++ b/webapp/app/js/model/tableModel.js @@ -60,12 +60,12 @@ KylinApp.service('TableModel', function(ProjectModel,$q,TableService,$log) { project:ProjectModel.selectedProject }; -if(!ProjectModel.selectedProject){ + if(!ProjectModel.selectedProject||!ProjectModel.isSelectedProjectValid()){ defer.resolve(); return defer.promise; } -TableService.list(param, function (tables) { + TableService.list(param, function (tables) { var tableMap = []; angular.forEach(tables, function (table) {
kylin git commit: KYLIN-1324 Update kylin.sh
Repository: kylin Updated Branches: refs/heads/2.x-staging 6678ae372 -> 4dd1b3438 KYLIN-1324 Update kylin.sh Signed-off-by: Li, Yang This closes #20 Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4dd1b343 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4dd1b343 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4dd1b343 Branch: refs/heads/2.x-staging Commit: 4dd1b3438f281b1d76ef4d5cab6232a392a8c1fc Parents: 6678ae3 Author: IT-DONG Authored: Sat Jan 16 21:06:21 2016 +0800 Committer: Li, Yang Committed: Tue Feb 23 11:47:19 2016 +0800 -- build/bin/kylin.sh | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/4dd1b343/build/bin/kylin.sh -- diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh index f52f923..a21928e 100644 --- a/build/bin/kylin.sh +++ b/build/bin/kylin.sh @@ -18,6 +18,11 @@ # dir=$(dirname ${0}) + +# We should set KYLIN_HOME here for multiple tomcat instsances that are on the same node. +# In addition, we should set a KYLIN_HOME for the global use as normal. +export KYLIN_HOME=${dir}/../ + source ${dir}/check-env.sh mkdir -p ${KYLIN_HOME}/logs
kylin git commit: KYLIN-1427 Support additional partition_time_column and partition_time_format besides partition_date_column and partition_date_format
Repository: kylin Updated Branches: refs/heads/2.x-staging 7dc56a343 -> 6678ae372 KYLIN-1427 Support additional partition_time_column and partition_time_format besides partition_date_column and partition_date_format Signed-off-by: Li, Yang This closes #27 Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6678ae37 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6678ae37 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6678ae37 Branch: refs/heads/2.x-staging Commit: 6678ae3725d030d4acb08e2aa5f20261aa7bf16b Parents: 7dc56a3 Author: Hao Chen Authored: Mon Feb 22 19:06:23 2016 +0800 Committer: Li, Yang Committed: Tue Feb 23 11:31:54 2016 +0800 -- .../apache/kylin/common/util/DateFormat.java| 1 + .../kylin/metadata/model/PartitionDesc.java | 66 + .../DefaultPartitionConditionBuilderTest.java | 77 3 files changed, 130 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/6678ae37/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java -- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java b/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java index e2777e5..b487dca 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java @@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentHashMap; public class DateFormat { public static final String DEFAULT_DATE_PATTERN = "-MM-dd"; +public static final String DEFAULT_TIME_PATTERN = "HH:mm:ss"; public static final String DEFAULT_DATETIME_PATTERN_WITHOUT_MILLISECONDS = "-MM-dd HH:mm:ss"; public static final String DEFAULT_DATETIME_PATTERN_WITH_MILLISECONDS = "-MM-dd HH:mm:ss.SSS"; public static final String[] SUPPORTED_DATETIME_PATTERN = { DEFAULT_DATE_PATTERN, DEFAULT_DATETIME_PATTERN_WITHOUT_MILLISECONDS, DEFAULT_DATETIME_PATTERN_WITH_MILLISECONDS, "MMdd" }; http://git-wip-us.apache.org/repos/asf/kylin/blob/6678ae37/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java -- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java index 6194df3..2556743 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/PartitionDesc.java @@ -43,11 +43,18 @@ public class PartitionDesc { @JsonProperty("partition_date_column") private String partitionDateColumn; - + +@JsonProperty("partition_time_column") +private String partitionTimeColumn; + @JsonProperty("partition_date_start") private long partitionDateStart = 0L; @JsonProperty("partition_date_format") private String partitionDateFormat = DateFormat.DEFAULT_DATE_PATTERN; + +@JsonProperty("partition_time_format") +private String partitionTimeFormat = DateFormat.DEFAULT_TIME_PATTERN; + @JsonProperty("partition_type") private PartitionType partitionType = PartitionType.APPEND; @JsonProperty("partition_condition_builder") @@ -93,6 +100,14 @@ public class PartitionDesc { this.partitionDateColumn = partitionDateColumn; } +public String getPartitionTimeColumn() { +return partitionTimeColumn; +} + +public void setPartitionTimeColumn(String partitionTimeColumn) { +this.partitionTimeColumn = partitionTimeColumn; +} + @Deprecated public long getPartitionDateStart() { return partitionDateStart; @@ -111,6 +126,14 @@ public class PartitionDesc { this.partitionDateFormat = partitionDateFormat; } +public String getPartitionTimeFormat() { +return partitionTimeFormat; +} + +public void setPartitionTimeFormat(String partitionTimeFormat) { +this.partitionTimeFormat = partitionTimeFormat; +} + public PartitionType getCubePartitionType() { return partitionType; } @@ -137,27 +160,42 @@ public class PartitionDesc { @Override public String buildDateRangeCondition(PartitionDesc partDesc, long startInclusive, long endExclusive, Map tableAlias) { -String partitionColumnName = partDesc.getPartitionDateColumn(); +StringBuilder builder = new StringBuilder(); +String partitionDateColumnName = partDesc.getPartitionDateColumn(); +String partitionTimeColumnName = partDesc.getPartitionTimeColumn(); -
kylin git commit: KYLIN-1412 fix select option long name display issue
Repository: kylin Updated Branches: refs/heads/1.x-staging 0e5be051f -> 19ee6cc71 KYLIN-1412 fix select option long name display issue Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/19ee6cc7 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/19ee6cc7 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/19ee6cc7 Branch: refs/heads/1.x-staging Commit: 19ee6cc71ba0b11b8f58edf0ddaf17f268b9fa06 Parents: 0e5be05 Author: janzhongi Authored: Mon Feb 22 16:48:54 2016 +0800 Committer: janzhongi Committed: Mon Feb 22 16:48:54 2016 +0800 -- webapp/app/less/app.less | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/19ee6cc7/webapp/app/less/app.less -- diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less index 4c17b9b..5f8e941 100644 --- a/webapp/app/less/app.less +++ b/webapp/app/less/app.less @@ -627,3 +627,6 @@ ul.messenger .messenger-message-inner ,.ngCellText,.tree-label,.tree-leaf{ .progress.progress-striped { background-color:#DCDCDC; } +.chosen-container .chosen-results li.active-result{ + word-break: break-all; +}
kylin git commit: KYLIN-1412 fix select option long name display issue and rm deprecated css style
Repository: kylin Updated Branches: refs/heads/2.x-staging daf30a67f -> 7dc56a343 KYLIN-1412 fix select option long name display issue and rm deprecated css style Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7dc56a34 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7dc56a34 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7dc56a34 Branch: refs/heads/2.x-staging Commit: 7dc56a3438d3e2835e7f33bec430b0479ff3d1ee Parents: daf30a6 Author: janzhongi Authored: Mon Feb 22 16:45:06 2016 +0800 Committer: janzhongi Committed: Mon Feb 22 16:45:06 2016 +0800 -- webapp/app/less/app.less | 23 +++ 1 file changed, 3 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/7dc56a34/webapp/app/less/app.less -- diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less index 9a4c1e3..128457c 100644 --- a/webapp/app/less/app.less +++ b/webapp/app/less/app.less @@ -612,26 +612,6 @@ ul.messenger .messenger-message-inner,.ngCellText { border-radius: 0px !important; } -//.cube-models-cntnr{ -// -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 2s; -// -moz-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 2s; -// -o-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 2s; -// transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 2s; -// line-height:20px; -// opacity:1; -// left: 0; -// padding:10px; -// background:white; -//} - - -//.cube-models-cntnr.ng-hide { -// line-height:0; -// opacity:0; -// left: -100%; -// padding:0 10px; -//} - .cube-models-cntnr.ng-hide-add { -webkit-animation: slideOutLeft 0.5s;; animation: slideOutLeft 0.5s;; @@ -738,3 +718,6 @@ ul.messenger .messenger-message-inner,.ngCellText { border:1px solid #94a0b4; color:#000 } +.chosen-container .chosen-results li.active-result{ + word-break: break-all; +}
kylin git commit: KYLIN-1412 add word-break for options in jquery chosen select, will fix option long name issue
Repository: kylin Updated Branches: refs/heads/2.0-rc e686d8580 -> dbb267479 KYLIN-1412 add word-break for options in jquery chosen select, will fix option long name issue Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/dbb26747 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/dbb26747 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/dbb26747 Branch: refs/heads/2.0-rc Commit: dbb267479b1912f34a85cc888dec10ee2899bde4 Parents: e686d85 Author: janzhongi Authored: Mon Feb 22 16:41:59 2016 +0800 Committer: janzhongi Committed: Mon Feb 22 16:41:59 2016 +0800 -- webapp/app/less/app.less | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/kylin/blob/dbb26747/webapp/app/less/app.less -- diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less index 9a4dc4e..83e7972 100644 --- a/webapp/app/less/app.less +++ b/webapp/app/less/app.less @@ -676,3 +676,6 @@ ul.messenger .messenger-message-inner,.ngCellText { .clone-cube-window .modal-dialog { width: 600px; /* desired relative width */ } +.chosen-container .chosen-results li.active-result{ + word-break: break-all; +}