From 02e8fe6635f0f6f80f03a1fd44728c10cfe510eb Mon Sep 17 00:00:00 2001 From: jiazhong Date: Wed, 29 Oct 2014 14:12:37 +0800 Subject: [PATCH 01/26] add project2home branch --- server/src/main/resources/kylinSecurity.xml | 1 + webapp/app/js/controllers/cubes.js | 22 ++++++++++-------- webapp/app/js/controllers/job.js | 10 ++++++-- webapp/app/js/controllers/page.js | 19 ++++++++++++++- webapp/app/js/controllers/projectMeta.js | 27 +++++----------------- webapp/app/partials/cubes/cubes.html | 10 +------- webapp/app/partials/header.html | 11 ++++++++- webapp/app/partials/jobs/jobs.html | 8 ------- webapp/app/partials/login.html | 10 ++++++++ .../app/partials/projects/project_table_tree.html | 10 -------- 10 files changed, 67 insertions(+), 61 deletions(-) diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml index ee3f3e2..9ad18bd 100644 --- a/server/src/main/resources/kylinSecurity.xml +++ b/server/src/main/resources/kylinSecurity.xml @@ -20,6 +20,7 @@ + diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index ece6f01..bc6d038 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -4,10 +4,10 @@ KylinApp .controller('CubesCtrl', function ($scope, $q, $routeParams, $location, $modal, MessageService, CubeDescService, CubeService, JobService, UserService, ProjectService) { $scope.listParams={ cubeName: $routeParams.cubeName, - projectName: null + projectName: $scope.project.selectedProject }; $scope.cubes = []; - $scope.projects = []; +// $scope.projects = []; $scope.loading = false; $scope.action = {}; @@ -24,11 +24,11 @@ KylinApp $scope.state = { filterAttr: 'create_time', filterReverse: true, reverseColumn: 'create_time', dimensionFilter: '', measureFilter: ''}; - ProjectService.list({}, function (projects) { - angular.forEach(projects, function(project, index){ - $scope.projects.push(project.name); - }); - }); +// ProjectService.list({}, function (projects) { +// angular.forEach(projects, function(project, index){ +// $scope.projects.push(project.name); +// }); +// }); $scope.list = function (offset, limit) { offset = (!!offset) ? offset : 0; @@ -39,8 +39,8 @@ KylinApp if ($scope.listParams.cubeName) { queryParam.cubeName = $scope.listParams.cubeName; } - if ($scope.listParams.projectName){ - queryParam.projectName = $scope.listParams.projectName; + if ($scope.project.selectedProject){ + queryParam.projectName = $scope.project.selectedProject; } $scope.loading = true; @@ -65,6 +65,10 @@ KylinApp return defer.promise; } + $scope.$watch('project.selectedProject', function (newValue, oldValue) { + $scope.cubes=[]; + $scope.list(); + }); $scope.reload = function () { // trigger reload action in pagination directive $scope.action.reload = !$scope.action.reload; diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js index 7a0df27..ab522a7 100644 --- a/webapp/app/js/controllers/job.js +++ b/webapp/app/js/controllers/job.js @@ -22,7 +22,8 @@ KylinApp {attr: 'duration', name: 'Duration'} ]; $scope.status = [$scope.allStatus[0], $scope.allStatus[1], $scope.allStatus[2], $scope.allStatus[3], $scope.allStatus[4], $scope.allStatus[5]]; - $scope.state = {loading: false, refreshing: false, filterAttr: 'last_modified', filterReverse: true, reverseColumn: 'last_modified', projectName:null}; + // projectName from page ctrl + $scope.state = {loading: false, refreshing: false, filterAttr: 'last_modified', filterReverse: true, reverseColumn: 'last_modified', projectName:$scope.project.selectedProject}; ProjectService.list({}, function (projects) { angular.forEach(projects, function(project, index){ @@ -77,8 +78,13 @@ KylinApp $scope.reload = function () { // trigger reload action in pagination directive $scope.action.reload = !$scope.action.reload; - } + }; + $scope.$watch('project.selectedProject', function (newValue, oldValue) { + $scope.jobs={}; + $scope.state.projectName = $scope.project.selectedProject; + $scope.list(); + }); $scope.resume = function (job) { if (confirm("Are you sure to resume the job?")) { JobService.resume({jobId: job.uuid}, {}, function (job) { diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js index 960ea28..e2187f6 100644 --- a/webapp/app/js/controllers/page.js +++ b/webapp/app/js/controllers/page.js @@ -1,6 +1,6 @@ 'use strict'; -KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $location, $rootScope, $routeParams, $http, UserService) { +KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $location, $rootScope, $routeParams, $http, UserService,ProjectService) { $scope.header = {show: true}; $scope.footer = { @@ -116,6 +116,23 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $location, return size; } + + + $scope.project = { + projects:[], + selectedProject: null + }; + ProjectService.list({}, function (projects) { + angular.forEach(projects, function(project, index){ + $scope.project.projects.push(project.name); + }); + }); + +// $scope.$watch('curProject', function (newValue, oldValue) { +// if (newValue) { +// $scope.curProject = newValue; +// } +// }); }); var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService, projects, project) { diff --git a/webapp/app/js/controllers/projectMeta.js b/webapp/app/js/controllers/projectMeta.js index 37081ff..45d5d75 100644 --- a/webapp/app/js/controllers/projectMeta.js +++ b/webapp/app/js/controllers/projectMeta.js @@ -2,7 +2,6 @@ KylinApp .controller('ProjectMetaCtrl', function ($scope, $q, ProjectService, QueryService) { - $scope.projects = []; $scope.selectedSrcDb = []; $scope.treeOptions = { nodeChildren: "columns", @@ -16,30 +15,13 @@ KylinApp label: "a6", labelSelected: "a8" } - } - - ProjectService.list({}, function (projects) { - angular.forEach(projects, function (project, index) { - $scope.projects.push(project.name); - }); - - if ($scope.projects.length > 0) - { - $scope.state.selectedProject=$scope.projects[0]; - $scope.projectMetaLoad(); - } - }); + }; $scope.projectMetaLoad = function () { - if (!$scope.state.selectedProject) - { - return; - } var defer = $q.defer(); $scope.selectedSrcDb = []; - $scope.loading = true; - QueryService.getTables({project: $scope.state.selectedProject}, {}, function (tables) { + QueryService.getTables({project: $scope.project.selectedProject}, {}, function (tables) { var tableMap = []; angular.forEach(tables, function (table) { if (!tableMap[table.table_SCHEM]) { @@ -63,7 +45,6 @@ KylinApp $scope.loading = false; defer.resolve(); }); - return defer.promise; } @@ -75,5 +56,9 @@ KylinApp return typeName.trim().toLowerCase(); } + + $scope.$watch('project.selectedProject', function (newValue, oldValue) { + $scope.projectMetaLoad(); + }); }); diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index a0a7e31..2086c13 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -1,14 +1,6 @@
- - Project: - - + diff --git a/webapp/app/partials/header.html b/webapp/app/partials/header.html index e903ba7..d8941e5 100644 --- a/webapp/app/partials/header.html +++ b/webapp/app/partials/header.html @@ -10,7 +10,16 @@ Kylin
- +
+
+ +
+
  • diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html index 20bcb7f..55e5009 100644 --- a/webapp/app/partials/jobs/jobs.html +++ b/webapp/app/partials/jobs/jobs.html @@ -1,13 +1,5 @@
    - - Project: - - diff --git a/webapp/app/partials/login.html b/webapp/app/partials/login.html index 6e7ac21..db5ec4f 100644 --- a/webapp/app/partials/login.html +++ b/webapp/app/partials/login.html @@ -24,6 +24,16 @@

    <

    +
    + + + +
    Login Issue? diff --git a/webapp/app/partials/projects/project_table_tree.html b/webapp/app/partials/projects/project_table_tree.html index e8e39ec..1eb4bbb 100644 --- a/webapp/app/partials/projects/project_table_tree.html +++ b/webapp/app/partials/projects/project_table_tree.html @@ -2,16 +2,6 @@
    -
    Project
    -
    -
    - -
    -
    From ba5784712373825b5f143f3ac59ab3b61d4fe72c Mon Sep 17 00:00:00 2001 From: jiazhong Date: Tue, 4 Nov 2014 16:49:17 +0800 Subject: [PATCH 02/26] add select project to login page v2 --- webapp/app/js/controllers/auth.js | 6 +++++ webapp/app/js/controllers/page.js | 26 ++++++++++++++++------ webapp/app/partials/cubes/cubes.html | 23 ++++++++++++++----- webapp/app/partials/header.html | 15 +++++-------- webapp/app/partials/jobs/jobs.html | 22 +++++++++++++----- webapp/app/partials/login.html | 2 +- .../app/partials/projects/project_table_tree.html | 7 ------ webapp/app/partials/query/query.html | 19 ++++++++++++++++ 8 files changed, 84 insertions(+), 36 deletions(-) diff --git a/webapp/app/js/controllers/auth.js b/webapp/app/js/controllers/auth.js index 32f4ce4..31caa4f 100644 --- a/webapp/app/js/controllers/auth.js +++ b/webapp/app/js/controllers/auth.js @@ -11,6 +11,12 @@ KylinApp.controller('LoginCtrl', function ($scope, $rootScope, $location, $base6 $scope.loading = true; + //verify project + if(!$scope.project.selectedProject){ + $scope.error = "Unable to login, please select a project"; + return; + } + AuthenticationService.login({}, {}, function (data) { $scope.loading = false; $rootScope.$broadcast('event:loginConfirmed'); diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js index e2187f6..e56f272 100644 --- a/webapp/app/js/controllers/page.js +++ b/webapp/app/js/controllers/page.js @@ -1,6 +1,6 @@ 'use strict'; -KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $location, $rootScope, $routeParams, $http, UserService,ProjectService) { +KylinApp.controller('PageCtrl', function ($scope, $q, AccessService,$modal, $location, $rootScope, $routeParams, $http, UserService,ProjectService) { $scope.header = {show: true}; $scope.footer = { @@ -128,11 +128,21 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $location, }); }); -// $scope.$watch('curProject', function (newValue, oldValue) { -// if (newValue) { -// $scope.curProject = newValue; -// } -// }); + $scope.toCreateProj = function () { + $modal.open({ + templateUrl: 'project.html', + controller: projCtrl, + resolve: { + projects: function () { + return null; + }, + project: function(){ + return null; + } + } + }); + }; + }); var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService, projects, project) { @@ -175,7 +185,9 @@ var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService, console.log('error'); }); } - } + }; + + $scope.cancel = function () { $modalInstance.dismiss('cancel'); diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index 2086c13..7ffe34d 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -1,14 +1,25 @@
    - - - - - +
    +
    + Project: + + + + + + +
    +
    - Cube Name: + Cube Name: diff --git a/webapp/app/partials/header.html b/webapp/app/partials/header.html index d8941e5..f327b79 100644 --- a/webapp/app/partials/header.html +++ b/webapp/app/partials/header.html @@ -10,16 +10,7 @@ Kylin
    - -
    - -
    - +
    • @@ -61,4 +52,8 @@
    + + + +
    diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html index 55e5009..f288b53 100644 --- a/webapp/app/partials/jobs/jobs.html +++ b/webapp/app/partials/jobs/jobs.html @@ -1,13 +1,25 @@
    - - - - +
    +
    + Project: + + + + + + +
    +
    - Cube Name: + Cube Name: diff --git a/webapp/app/partials/login.html b/webapp/app/partials/login.html index db5ec4f..8a36086 100644 --- a/webapp/app/partials/login.html +++ b/webapp/app/partials/login.html @@ -29,8 +29,8 @@

    <

    diff --git a/webapp/app/partials/projects/project_table_tree.html b/webapp/app/partials/projects/project_table_tree.html index 1eb4bbb..e2d0144 100644 --- a/webapp/app/partials/projects/project_table_tree.html +++ b/webapp/app/partials/projects/project_table_tree.html @@ -1,12 +1,5 @@
    -
    -
    -
    - -
    -
    -
    diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html index e2663e8..7d81c12 100644 --- a/webapp/app/partials/query/query.html +++ b/webapp/app/partials/query/query.html @@ -1,3 +1,22 @@ +
    + + +
    + Project: + + + + + + +
    + +
    From e3ed19e8a1509f01cc889c8dc375b1312dcad99f Mon Sep 17 00:00:00 2001 From: jiazhong Date: Wed, 5 Nov 2014 11:51:49 +0800 Subject: [PATCH 03/26] update loading display script --- webapp/app/js/controllers/auth.js | 1 + webapp/app/js/controllers/cubes.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/webapp/app/js/controllers/auth.js b/webapp/app/js/controllers/auth.js index 31caa4f..9a21f68 100644 --- a/webapp/app/js/controllers/auth.js +++ b/webapp/app/js/controllers/auth.js @@ -13,6 +13,7 @@ KylinApp.controller('LoginCtrl', function ($scope, $rootScope, $location, $base6 //verify project if(!$scope.project.selectedProject){ + $scope.loading = false; $scope.error = "Unable to login, please select a project"; return; } diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index bc6d038..33d6aab 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -65,10 +65,10 @@ KylinApp return defer.promise; } - $scope.$watch('project.selectedProject', function (newValue, oldValue) { - $scope.cubes=[]; - $scope.list(); - }); +// $scope.$watch('project.selectedProject', function (newValue, oldValue) { +// $scope.cubes=[]; +// $scope.list(); +// }); $scope.reload = function () { // trigger reload action in pagination directive $scope.action.reload = !$scope.action.reload; From 1ec45831cdf47247bc5eb63d99fbcc01e477e3dd Mon Sep 17 00:00:00 2001 From: jiazhong Date: Wed, 5 Nov 2014 21:00:35 +0800 Subject: [PATCH 04/26] add select project to login page v3 --- webapp/app/js/controllers/cubes.js | 44 +++++++++++------------ webapp/app/js/controllers/job.js | 3 +- webapp/app/js/controllers/projectMeta.js | 10 +++--- webapp/app/js/controllers/query.js | 10 ++---- webapp/app/partials/cubes/cubes.html | 2 +- webapp/app/partials/jobs/jobs.html | 2 +- webapp/app/partials/login.html | 2 +- webapp/app/partials/query/query.html | 4 +-- webapp/app/partials/tables/source_metadata.html | 20 +++++++++++ webapp/app/partials/tables/source_table_tree.html | 2 +- 10 files changed, 59 insertions(+), 40 deletions(-) diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 33d6aab..e7a957d 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -57,22 +57,23 @@ KylinApp $scope.loadDetail(cube); } }); + $scope.cubes=[]; $scope.cubes = $scope.cubes.concat(cubes); $scope.loading = false; defer.resolve(cubes.length); }); return defer.promise; - } + }; -// $scope.$watch('project.selectedProject', function (newValue, oldValue) { -// $scope.cubes=[]; -// $scope.list(); -// }); + $scope.$watch('project.selectedProject', function (newValue, oldValue) { + $scope.cubes=[]; + $scope.list(); + }); $scope.reload = function () { // trigger reload action in pagination directive $scope.action.reload = !$scope.action.reload; - } + }; $scope.toCreateProj = function () { $modal.open({ @@ -87,7 +88,7 @@ KylinApp } } }); - } + }; $scope.loadDetail = function (cube) { if (!cube.detail) { @@ -98,7 +99,7 @@ KylinApp }, function () { }); } - } + }; $scope.getTotalSize = function (cubes) { var size = 0; @@ -111,7 +112,7 @@ KylinApp } return $scope.dataSize(size*1024); } - } + }; $scope.enable = function (cube) { if (confirm("Are you sure to enable the cube? Please note: if cube schema is changed in the disabled period, all segments of the cube will be discarded due to data and schema mismatch.")) { @@ -120,7 +121,7 @@ KylinApp MessageService.sendMsg('Enable job was submitted successfully', 'success', {}); }); } - } + }; $scope.disable = function (cube) { if (confirm("Are you sure to disable the cube?")) { @@ -129,7 +130,7 @@ KylinApp MessageService.sendMsg('Disable job was submitted successfully', 'success', {}); }); } - } + }; $scope.dropCube = function (cube) { if (confirm("Are you sure to drop the cube? Once it's dropped, all the jobs and data will be cleaned up.")) { @@ -141,7 +142,7 @@ KylinApp MessageService.sendMsg('Cube drop is done successfully', 'success', {}); }); } - } + }; $scope.startJobSubmit = function (cube) { CubeDescService.get({cube_name: cube.name}, {}, function (detail) { @@ -186,7 +187,7 @@ KylinApp } } }); - } + }; $scope.startRefresh = function (cube) { $scope.loadDetail(cube); @@ -203,7 +204,7 @@ KylinApp } } }); - } + }; $scope.startMerge = function (cube) { $scope.loadDetail(cube); @@ -257,7 +258,7 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic }); }); } - } + }; // used by cube segment refresh $scope.segmentSelected = function (selectedSegment) { @@ -271,7 +272,7 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic if (selectedSegment.date_range_end) { $scope.jobBuildRequest.endTime = selectedSegment.date_range_end; } - } + }; // used by cube segments merge $scope.mergeStartSelected = function (mergeStartSeg) { @@ -280,7 +281,7 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic if (mergeStartSeg.date_range_start) { $scope.jobBuildRequest.startTime = mergeStartSeg.date_range_start; } - } + }; $scope.mergeEndSelected = function (mergeEndSeg) { $scope.jobBuildRequest.endTime = 0; @@ -288,7 +289,7 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic if (mergeEndSeg.date_range_end) { $scope.jobBuildRequest.endTime = mergeEndSeg.date_range_end; } - } + }; $scope.updateDate = function() { if ($scope.cube.detail.cube_partition_desc.cube_partition_type=='UPDATE_INSERT') @@ -296,17 +297,16 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic $scope.jobBuildRequest.startTime=$scope.formatDate($scope.jobBuildRequest.startTime); } $scope.jobBuildRequest.endTime=$scope.formatDate($scope.jobBuildRequest.endTime); - } + }; $scope.formatDate = function(timestemp) { var dateStart = new Date(timestemp); dateStart = (dateStart.getFullYear() + "-" + (dateStart.getMonth() + 1) + "-" + dateStart.getDate()); //switch selected time to utc timestamp return new Date(moment.utc(dateStart, "YYYY-MM-DD").format()).getTime(); - } - + }; $scope.cancel = function () { $modalInstance.dismiss('cancel'); - } + }; }; diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js index ab522a7..8c23717 100644 --- a/webapp/app/js/controllers/job.js +++ b/webapp/app/js/controllers/job.js @@ -80,9 +80,10 @@ KylinApp $scope.action.reload = !$scope.action.reload; }; + $scope.$watch('project.selectedProject', function (newValue, oldValue) { $scope.jobs={}; - $scope.state.projectName = $scope.project.selectedProject; + $scope.state.projectName = newValue; $scope.list(); }); $scope.resume = function (job) { diff --git a/webapp/app/js/controllers/projectMeta.js b/webapp/app/js/controllers/projectMeta.js index 45d5d75..cf7c5b0 100644 --- a/webapp/app/js/controllers/projectMeta.js +++ b/webapp/app/js/controllers/projectMeta.js @@ -46,7 +46,12 @@ KylinApp defer.resolve(); }); return defer.promise; - } + }; + + + $scope.$watch('project.selectedProject', function (newValue, oldValue) { + $scope.projectMetaLoad(); + }); $scope.trimType = function(typeName){ if (typeName.match(/VARCHAR/i)) @@ -57,8 +62,5 @@ KylinApp return typeName.trim().toLowerCase(); } - $scope.$watch('project.selectedProject', function (newValue, oldValue) { - $scope.projectMetaLoad(); - }); }); diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js index 1e0be22..157ed6a 100644 --- a/webapp/app/js/controllers/query.js +++ b/webapp/app/js/controllers/query.js @@ -67,7 +67,7 @@ KylinApp var query = { originSql: sql, sql: sql, - project: (!!project)? project:$scope.state.selectedProject, + project: (!!project)? project:$scope.peoject.selectedProject, status: 'executing', acceptPartial: true, result: { @@ -113,12 +113,6 @@ KylinApp } } - $scope.$watch('state.selectedProject', function (newValue, oldValue) { - if (newValue) { - $scope.curProject = newValue; - } - }); - $scope.checkLimit = function () { if (!$scope.rowsPerPage) { $scope.rowsPerPage = 50000; @@ -407,6 +401,8 @@ KylinApp } } }); + + }) .controller('QueryResultCtrl', function ($scope, storage, $base64, $q, $location, $anchorScroll, $routeParams, QueryService, GraphService) { $scope.buildGraphMetadata = function (query) { diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index 7ffe34d..4f109f8 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -3,7 +3,7 @@
    Project: - <
    -

    - Project: {{curProject}} + Project: {{project.selectedProject}}

    diff --git a/webapp/app/partials/tables/source_metadata.html b/webapp/app/partials/tables/source_metadata.html index 6b33b52..cc3e2b2 100644 --- a/webapp/app/partials/tables/source_metadata.html +++ b/webapp/app/partials/tables/source_metadata.html @@ -1,3 +1,23 @@ +
    + + +
    + Project: + + + + + + +
    + +
    +
    diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html index b6fa133..2c05f7c 100644 --- a/webapp/app/partials/tables/source_table_tree.html +++ b/webapp/app/partials/tables/source_table_tree.html @@ -3,7 +3,7 @@

    Source Tables

    - From 304a1f664a87b0409da20aa88c1d0295f92acabe Mon Sep 17 00:00:00 2001 From: jiazhong Date: Thu, 6 Nov 2014 15:02:14 +0800 Subject: [PATCH 05/26] add style for build cube step at dimension --- webapp/app/less/component.less | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/webapp/app/less/component.less b/webapp/app/less/component.less index cbbe8f4..39d576b 100644 --- a/webapp/app/less/component.less +++ b/webapp/app/less/component.less @@ -821,3 +821,14 @@ span.input-icon { min-height: 150px; } } + +//style fix chosen bug +#derived .localytics-chosen,#derived .chosen-container{ + width:85% !important; +} +#hierarchy .localytics-chosen,#hierarchy .chosen-container { + width: 100% !important; +} +#joinon .localytics-chosen,#joinon .chosen-container { + width: 45% !important; +} \ No newline at end of file From a7f62581bc0e53d56590f6deb3ba4d5beb730870 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Thu, 6 Nov 2014 19:16:06 +0800 Subject: [PATCH 06/26] lookup hive table by project v1 --- .../com/kylinolap/rest/controller/TableController.java | 5 +++-- webapp/app/js/controllers/projectMeta.js | 10 ++++++++++ webapp/app/js/controllers/sourceMeta.js | 17 +++++++++++++++-- webapp/app/partials/tables/source_table_tree.html | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/com/kylinolap/rest/controller/TableController.java b/server/src/main/java/com/kylinolap/rest/controller/TableController.java index 581b17a..59a4644 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/TableController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/TableController.java @@ -65,9 +65,10 @@ @RequestMapping(value = "", method = { RequestMethod.GET }) @ResponseBody @Metered(name = "listSourceTables") - public List getHiveTables(@RequestParam(value = "ext", required = false) boolean withExt) { + public List getHiveTables(@RequestParam(value = "ext", required = false) boolean withExt,@RequestParam(value = "project", required = false) String project ) { long start = System.currentTimeMillis(); - List tables = cubeMgmtService.getMetadataManager().listAllTables(); +// List tables = cubeMgmtService.getMetadataManager().listAllTables(); + List tables = cubeMgmtService.getProjectManager().listExposedTables(project); if (withExt) { tables = cloneTableDesc(tables); diff --git a/webapp/app/js/controllers/projectMeta.js b/webapp/app/js/controllers/projectMeta.js index cf7c5b0..07f37b2 100644 --- a/webapp/app/js/controllers/projectMeta.js +++ b/webapp/app/js/controllers/projectMeta.js @@ -3,6 +3,7 @@ KylinApp .controller('ProjectMetaCtrl', function ($scope, $q, ProjectService, QueryService) { $scope.selectedSrcDb = []; + $scope.selectedSrcTable = {}; $scope.treeOptions = { nodeChildren: "columns", injectClasses: { @@ -17,6 +18,15 @@ KylinApp } }; + $scope.showSelected = function (table) { + if (table.uuid) { + $scope.selectedSrcTable = table; + } + else { + $scope.selectedSrcTable.selectedSrcColumn = table; + } + } + $scope.projectMetaLoad = function () { var defer = $q.defer(); $scope.selectedSrcDb = []; diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js index 6612bab..ef287cd 100644 --- a/webapp/app/js/controllers/sourceMeta.js +++ b/webapp/app/js/controllers/sourceMeta.js @@ -26,10 +26,17 @@ KylinApp }; $scope.aceSrcTbLoaded = function (forceLoad) { + $scope.srcTables = {}; + $scope.selectedSrcDb = {}; + $scope.selectedSrcTable = {}; + $scope.srcAva = false; var defer = $q.defer(); $scope.loading = true; - var param = {ext: true}; + var param = { + ext: true, + project:$scope.project.selectedProject + }; if (forceLoad) { param.timestamp = new Date().getTime(); @@ -38,6 +45,7 @@ KylinApp angular.forEach(tables, function (table) { if (!$scope.srcTables[table.database]) { $scope.srcTables[table.database] = []; + $scope.srcAva = true; } angular.forEach(table.columns, function (column) { if(table.cardinality[column.name]) { @@ -65,7 +73,12 @@ KylinApp return defer.promise; } - $scope.aceSrcTbLoaded(); + $scope.$watch('project.selectedProject', function (newValue, oldValue) { + $scope.aceSrcTbLoaded(); + }); + + +// $scope.aceSrcTbLoaded(); $scope.showSelected = function (table) { if (table.uuid) { diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html index 2c05f7c..b66242e 100644 --- a/webapp/app/partials/tables/source_table_tree.html +++ b/webapp/app/partials/tables/source_table_tree.html @@ -19,7 +19,7 @@

    Source Tables

    - Date: Fri, 7 Nov 2014 16:31:50 +0800 Subject: [PATCH 07/26] project scope extent to global page V3 --- webapp/app/js/controllers/cubes.js | 1 + webapp/app/js/controllers/sourceMeta.js | 15 +++++++++------ webapp/app/partials/projects/project_table_tree.html | 4 +++- webapp/app/partials/tables/source_table_tree.html | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index e7a957d..f51cbd0 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -69,6 +69,7 @@ KylinApp $scope.$watch('project.selectedProject', function (newValue, oldValue) { $scope.cubes=[]; $scope.list(); + $scope.reload(); }); $scope.reload = function () { // trigger reload action in pagination directive diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js index ef287cd..153ec41 100644 --- a/webapp/app/js/controllers/sourceMeta.js +++ b/webapp/app/js/controllers/sourceMeta.js @@ -28,8 +28,8 @@ KylinApp $scope.aceSrcTbLoaded = function (forceLoad) { $scope.srcTables = {}; $scope.selectedSrcDb = {}; + delete $scope.selectedSrcTable; $scope.selectedSrcTable = {}; - $scope.srcAva = false; var defer = $q.defer(); $scope.loading = true; @@ -45,7 +45,7 @@ KylinApp angular.forEach(tables, function (table) { if (!$scope.srcTables[table.database]) { $scope.srcTables[table.database] = []; - $scope.srcAva = true; +// $scope.srcAva = true; } angular.forEach(table.columns, function (column) { if(table.cardinality[column.name]) { @@ -65,7 +65,13 @@ KylinApp obj.sort(innerSort); } - $scope.selectedSrcDb = $scope.srcTables['DEFAULT']; + for (var key in $scope.srcTables) { + $scope.selectedSrcDb = $scope.srcTables['DEFAULT']; + if(!$scope.selectedSrcDb){ + $scope.selectedSrcDb = $scope.srcTables[key]; + } + break; + } $scope.loading = false; defer.resolve(); }); @@ -77,9 +83,6 @@ KylinApp $scope.aceSrcTbLoaded(); }); - -// $scope.aceSrcTbLoaded(); - $scope.showSelected = function (table) { if (table.uuid) { $scope.selectedSrcTable = table; diff --git a/webapp/app/partials/projects/project_table_tree.html b/webapp/app/partials/projects/project_table_tree.html index e2d0144..0687eb2 100644 --- a/webapp/app/partials/projects/project_table_tree.html +++ b/webapp/app/partials/projects/project_table_tree.html @@ -6,7 +6,9 @@ + options="treeOptions" + on-selection="showSelected(node)" + selected-node="selectedSrcTable"> {{node.name}} {{!!(node.type_NAME)?'(' + trimType(node.type_NAME) + ')' : ''}}
    diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html index b66242e..2c05f7c 100644 --- a/webapp/app/partials/tables/source_table_tree.html +++ b/webapp/app/partials/tables/source_table_tree.html @@ -19,7 +19,7 @@

    Source Tables

    - Date: Fri, 7 Nov 2014 16:54:02 +0800 Subject: [PATCH 08/26] new icon for load hive table --- webapp/app/partials/tables/source_table_tree.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html index 2c05f7c..8e3874e 100644 --- a/webapp/app/partials/tables/source_table_tree.html +++ b/webapp/app/partials/tables/source_table_tree.html @@ -11,8 +11,8 @@

    Source Tables

    - - + +
    From e07bf6b8ac196ea64c1fb395cb79a31042528714 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Mon, 10 Nov 2014 17:00:34 +0800 Subject: [PATCH 09/26] add filter to resize pie chart --- webapp/app/js/controllers/query.js | 2 +- webapp/app/js/filters/filter.js | 8 +++++++- webapp/app/partials/query/query_detail.html | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js index 157ed6a..db00ebd 100644 --- a/webapp/app/js/controllers/query.js +++ b/webapp/app/js/controllers/query.js @@ -67,7 +67,7 @@ KylinApp var query = { originSql: sql, sql: sql, - project: (!!project)? project:$scope.peoject.selectedProject, + project: (!!project)? project:$scope.project.selectedProject, status: 'executing', acceptPartial: true, result: { diff --git a/webapp/app/js/filters/filter.js b/webapp/app/js/filters/filter.js index 1629979..cc30d20 100644 --- a/webapp/app/js/filters/filter.js +++ b/webapp/app/js/filters/filter.js @@ -54,7 +54,6 @@ KylinApp } } }) - .filter('range', function () { return function (input, total) { total = parseInt(total); @@ -78,4 +77,11 @@ KylinApp number = Math.floor(Math.log(bytes) / Math.log(1024)); return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) + ' ' + units[number]; } + }).filter('resizePieHeight',function(){ + return function(item){ + if(item<150){ + return 1300; + } + return 1300; + } }); diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html index 3c90b72..6eb73cd 100644 --- a/webapp/app/partials/query/query_detail.html +++ b/webapp/app/partials/query/query_detail.html @@ -192,7 +192,7 @@
    Date: Wed, 12 Nov 2014 19:05:33 +0800 Subject: [PATCH 10/26] update table to project when sync --- .../kylinolap/cube/project/ProjectInstance.java | 33 +++++++++++++++++ .../com/kylinolap/cube/project/ProjectManager.java | 41 ++++++++++++++++++++++ .../kylinolap/rest/controller/TableController.java | 6 ++-- .../com/kylinolap/rest/service/CubeService.java | 12 ++++++- webapp/app/js/controllers/sourceMeta.js | 3 +- 5 files changed, 90 insertions(+), 5 deletions(-) diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java index 896475e..0df4e35 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java @@ -38,6 +38,10 @@ @JsonProperty("cubes") private List cubes; + @JsonProperty("tables") + private List tables; + + @JsonProperty("owner") private String owner; @@ -152,8 +156,36 @@ public void addCube(String cubeName) { return cubes; } + public void setCubes(List cubes) { this.cubes = cubes; + } + + public void setTables(List tables) { + this.tables = tables; + } + + public boolean containsTable(String tableName) { + tableName = tableName.toUpperCase(); + return tables.contains(tableName); + } + + public void removeTable(String tableName) { + tableName = tableName.toUpperCase(); + tables.remove(tableName); + } + + public int getTablesCount() { + return cubes.size(); + } + + public void addTable(String tableName) { + tableName = tableName.toUpperCase(); + this.tables.add(tableName); + } + + public List getTables() { + return tables; } public String getOwner() { @@ -175,6 +207,7 @@ public void setLastUpdateTime(String lastUpdateTime) { public void recordUpdateTime(long timeMillis) { this.lastUpdateTime = formatTime(timeMillis); } + public void init() { if (name == null) diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java index 7d5ed9a..a3d78f4 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java @@ -186,7 +186,25 @@ public ProjectInstance updateCubeToProject(String cubeName, String newProjectNam return addCubeToProject(cubeName, newProjectName, owner); } + + public boolean isTableInProject(String projectName, CubeInstance cube) { + return this.listAllCubes(projectName).contains(cube); + } + + public ProjectInstance updateTableToProject(String tableName, String newProjectName, String owner) throws IOException { + removeTableFromProjects(tableName); + return addTableToProject(tableName, newProjectName, owner); + } + + public void removeTableFromProjects(String tableName) throws IOException { + for (ProjectInstance projectInstance : findProjects(tableName)) { + projectInstance.removeTable(tableName); + saveResource(projectInstance); + } + } + + public void removeCubeFromProjects(String cubeName) throws IOException { for (ProjectInstance projectInstance : findProjects(cubeName)) { projectInstance.removeCube(cubeName); @@ -254,6 +272,7 @@ public boolean isExposedColumn(String project, String table, String col) { return new ArrayList(ret); } + public List getCubesByTable(String project, String tableName) { project = ProjectInstance.getNormalizedProjectName(project); @@ -420,6 +439,28 @@ private ProjectInstance addCubeToProject(String cubeName, String project, String return newProject; } + + private ProjectInstance addTableToProject(String tables, String project, String user) throws IOException { + String newProjectName = ProjectInstance.getNormalizedProjectName(project); + ProjectInstance newProject = getProject(newProjectName); +// if (newProject == null) { +// newProject = this.createProject(newProjectName, user, "This is a project automatically added when adding table" + tableName); +// } +// + String[] tokens = StringUtils.split(tables, ","); + StringBuffer buff = new StringBuffer(); + for (int i = 0; i < tokens.length; i++) { + String token = tokens[i].trim(); + if (StringUtils.isNotEmpty(token)) { + buff.append(";"); + buff.append("show table extended like " + token); + } + newProject.addTable(token); + } + saveResource(newProject); + + return newProject; + } private void saveResource(ProjectInstance proj) throws IOException { ResourceStore store = getStore(); diff --git a/server/src/main/java/com/kylinolap/rest/controller/TableController.java b/server/src/main/java/com/kylinolap/rest/controller/TableController.java index 59a4644..358d5d7 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/TableController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/TableController.java @@ -111,10 +111,10 @@ public String reloadSourceTable() { return "ok"; } - @RequestMapping(value = "/{tables}", method = { RequestMethod.POST }) + @RequestMapping(value = "/{tables}/{project}", method = { RequestMethod.POST }) @ResponseBody - public Map loadHiveTable(@PathVariable String tables) { - String[] arr = cubeMgmtService.reloadHiveTable(tables); + public Map loadHiveTable(@PathVariable String tables,@PathVariable String project) { + String[] arr = cubeMgmtService.reloadHiveTable(tables,project); Map result = new HashMap(); result.put("result", arr); return result; diff --git a/server/src/main/java/com/kylinolap/rest/service/CubeService.java b/server/src/main/java/com/kylinolap/rest/service/CubeService.java index 7c65c76..8d1deee 100644 --- a/server/src/main/java/com/kylinolap/rest/service/CubeService.java +++ b/server/src/main/java/com/kylinolap/rest/service/CubeService.java @@ -560,7 +560,7 @@ private void releaseAllSegments(CubeInstance cube) throws IOException, JobExcept } @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN) - public String[] reloadHiveTable(String tables) { + public String[] reloadHiveTable(String tables,String project) { String tableMetaDir = HiveSourceTableMgmt.reloadHiveTable(tables); // Reload @@ -574,6 +574,16 @@ private void releaseAllSegments(CubeInstance cube) throws IOException, JobExcept return tableDir.list(); } } + //TO-DO check is table in project + String owner = SecurityContextHolder.getContext().getAuthentication().getName(); + try { + ProjectInstance newProject = getProjectManager().updateTableToProject(tables, project, owner); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } +// accessService.inherit(cube, newProject); + return new String[0]; } diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js index 153ec41..74184ca 100644 --- a/webapp/app/js/controllers/sourceMeta.js +++ b/webapp/app/js/controllers/sourceMeta.js @@ -135,9 +135,10 @@ KylinApp $modalInstance.dismiss('cancel'); }; $scope.add = function () { + console.log($scope.project.selectedProject); $modalInstance.dismiss(); MessageService.sendMsg('A sync task has been submitted, it might take 20 - 60 seconds', 'success', {}); - TableService.loadHiveTable({tableName: $scope.tableNames}, {}, function (result) { + TableService.loadHiveTable({tableName: $scope.tableNames,action:$scope.project.selectedProject}, {}, function (result) { MessageService.sendMsg('Below tables were synced successfully: ' + result['result'].join() + ', Click Refresh button ...', 'success', {}); }); } From aa71b6afc810c48336481596770fca95bcad9482 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Thu, 13 Nov 2014 13:17:35 +0800 Subject: [PATCH 11/26] sync table to project v1 --- .../com/kylinolap/cube/project/ProjectManager.java | 9 +++---- .../kylinolap/rest/controller/TableController.java | 5 ++-- .../com/kylinolap/rest/service/CubeService.java | 28 +++++++++++++--------- webapp/app/js/controllers/sourceMeta.js | 9 ++++--- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java index a3d78f4..2ae0e5d 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java @@ -191,10 +191,11 @@ public boolean isTableInProject(String projectName, CubeInstance cube) { return this.listAllCubes(projectName).contains(cube); } - public ProjectInstance updateTableToProject(String tableName, String newProjectName, String owner) throws IOException { - removeTableFromProjects(tableName); - - return addTableToProject(tableName, newProjectName, owner); + public ProjectInstance updateTableToProject(String tables, String newProjectName, String owner) throws IOException { + +// removeTableFromProjects(tables); + + return addTableToProject(tables, newProjectName, owner); } public void removeTableFromProjects(String tableName) throws IOException { diff --git a/server/src/main/java/com/kylinolap/rest/controller/TableController.java b/server/src/main/java/com/kylinolap/rest/controller/TableController.java index 358d5d7..f93b448 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/TableController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/TableController.java @@ -114,9 +114,10 @@ public String reloadSourceTable() { @RequestMapping(value = "/{tables}/{project}", method = { RequestMethod.POST }) @ResponseBody public Map loadHiveTable(@PathVariable String tables,@PathVariable String project) { - String[] arr = cubeMgmtService.reloadHiveTable(tables,project); +// String[] arr = cubeMgmtService.reloadHiveTable(tables); + cubeMgmtService.syncTableToProject(tables, project); Map result = new HashMap(); - result.put("result", arr); +// result.put("result", arr); return result; } diff --git a/server/src/main/java/com/kylinolap/rest/service/CubeService.java b/server/src/main/java/com/kylinolap/rest/service/CubeService.java index 8d1deee..9c3251d 100644 --- a/server/src/main/java/com/kylinolap/rest/service/CubeService.java +++ b/server/src/main/java/com/kylinolap/rest/service/CubeService.java @@ -560,7 +560,7 @@ private void releaseAllSegments(CubeInstance cube) throws IOException, JobExcept } @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN) - public String[] reloadHiveTable(String tables,String project) { + public String[] reloadHiveTable(String tables) { String tableMetaDir = HiveSourceTableMgmt.reloadHiveTable(tables); // Reload @@ -574,17 +574,23 @@ private void releaseAllSegments(CubeInstance cube) throws IOException, JobExcept return tableDir.list(); } } - //TO-DO check is table in project - String owner = SecurityContextHolder.getContext().getAuthentication().getName(); - try { - ProjectInstance newProject = getProjectManager().updateTableToProject(tables, project, owner); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } -// accessService.inherit(cube, newProject); - return new String[0]; } + + @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN) + public void syncTableToProject(String tables,String project){ + +// if (!getProjectManager().isCubeInProject(newProjectName, cube)) { + String owner = SecurityContextHolder.getContext().getAuthentication().getName(); + try { + ProjectInstance newProject = getProjectManager().updateTableToProject(tables, project, owner); + } catch (IOException e) { + // TODO Auto-generated catch block + throw new InternalErrorException("Failed to deal with the request.", e); + } +// accessService.inherit(cube, newProject); +// } + + } } diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js index 74184ca..8c0f969 100644 --- a/webapp/app/js/controllers/sourceMeta.js +++ b/webapp/app/js/controllers/sourceMeta.js @@ -122,6 +122,9 @@ KylinApp tableNames: function () { return $scope.tableNames; }, + projectName:function(){ + return $scope.project.selectedProject; + }, scope: function () { return $scope; } @@ -129,16 +132,16 @@ KylinApp }); } - var ModalInstanceCtrl = function ($scope, $modalInstance, tableNames, MessageService) { + var ModalInstanceCtrl = function ($scope, $modalInstance, tableNames, MessageService,projectName) { $scope.tableNames = ""; $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; $scope.add = function () { - console.log($scope.project.selectedProject); + console.log(projectName); $modalInstance.dismiss(); MessageService.sendMsg('A sync task has been submitted, it might take 20 - 60 seconds', 'success', {}); - TableService.loadHiveTable({tableName: $scope.tableNames,action:$scope.project.selectedProject}, {}, function (result) { + TableService.loadHiveTable({tableName: $scope.tableNames,action:projectName}, {}, function (result) { MessageService.sendMsg('Below tables were synced successfully: ' + result['result'].join() + ', Click Refresh button ...', 'success', {}); }); } From ef14a6e15175c23e1ccf4e2387e66d41eae1c7db Mon Sep 17 00:00:00 2001 From: jiazhong Date: Thu, 13 Nov 2014 17:15:03 +0800 Subject: [PATCH 12/26] add load hive table for windows --- .../kylinolap/cube/project/ProjectInstance.java | 6 +- .../com/kylinolap/cube/project/ProjectManager.java | 1 + .../metadata/tool/HiveSourceTableMgmt.java | 69 +++++++++++++++------- .../kylinolap/rest/controller/TableController.java | 4 +- 4 files changed, 57 insertions(+), 23 deletions(-) diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java index 0df4e35..5a672be 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java @@ -181,10 +181,14 @@ public int getTablesCount() { public void addTable(String tableName) { tableName = tableName.toUpperCase(); - this.tables.add(tableName); + this.getTables().add(tableName); } + //will return new list for null public List getTables() { + if(tables==null){ + tables = new ArrayList(); + } return tables; } diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java index 2ae0e5d..a9e2e81 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java @@ -444,6 +444,7 @@ private ProjectInstance addCubeToProject(String cubeName, String project, String private ProjectInstance addTableToProject(String tables, String project, String user) throws IOException { String newProjectName = ProjectInstance.getNormalizedProjectName(project); ProjectInstance newProject = getProject(newProjectName); + // if (newProject == null) { // newProject = this.createProject(newProjectName, user, "This is a project automatically added when adding table" + tableName); // } diff --git a/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java b/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java index 80091e0..cf014ad 100644 --- a/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java +++ b/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -39,6 +40,8 @@ import com.kylinolap.common.KylinConfig; import com.kylinolap.common.persistence.ResourceTool; import com.kylinolap.common.util.JsonUtil; +import com.kylinolap.common.util.SSHClient; +import com.kylinolap.common.util.SSHClientOutput; import com.kylinolap.metadata.model.schema.ColumnDesc; import com.kylinolap.metadata.model.schema.TableDesc; @@ -345,31 +348,57 @@ private static String callGenerateCommand(String hiveCommd) throws IOException { ProcessBuilder pb = null; if (osName.startsWith("Windows")) { - pb = new ProcessBuilder(cmd[0], cmd[1], "ssh root@sandbox 'hive -e \"" + hiveCommd + "\"' > " + hiveOutputPath); +// pb = new ProcessBuilder(cmd[0], cmd[1], "ssh root@sandbox 'hive -e \"" + hiveCommd + "\"' > " + hiveOutputPath); + SSHClient client = new SSHClient("sandbox", "root", "hadoop", null); + SSHClientOutput output = null; + try { + output = client.execCommand("hive -e \"" + hiveCommd + "\""); + } catch (Exception e) { + // TODO Auto-generated catch block + logger.error("Failed to execute hive cmd", e); + e.printStackTrace(); + } + + FileWriter fw = null; + try { + fw = new FileWriter(hiveOutputPath); + fw.write(output.getText()); + } catch (Exception ex) { + ex.printStackTrace(); + } finally { + if (fw != null) { + fw.close(); + fw = null; + } + } + } else { pb = new ProcessBuilder(cmd[0], cmd[1], "hive -e \"" + hiveCommd + "\" > " + hiveOutputPath); - } + // Run hive + pb.directory(new File(tempDir)); + pb.redirectErrorStream(true); + Process p = pb.start(); + InputStream is = p.getInputStream(); + InputStreamReader isr = new InputStreamReader(is); + BufferedReader br = null; - // Run hive - pb.directory(new File(tempDir)); - pb.redirectErrorStream(true); - Process p = pb.start(); - InputStream is = p.getInputStream(); - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = null; - - try { - br = new BufferedReader(isr); - String line = null; - logger.info("Execute : " + pb.command().get(0)); - while ((line = br.readLine()) != null) { - logger.info(line); - } - } finally { - if (null != br) { - br.close(); + try { + br = new BufferedReader(isr); + String line = null; + logger.info("Execute : " + pb.command().get(0)); + while ((line = br.readLine()) != null) { + logger.info(line); + } + } finally { + if (null != br) { + br.close(); + } } + + } + + logger.info("Hive execution completed!"); HiveSourceTableMgmt rssMgmt = new HiveSourceTableMgmt(); diff --git a/server/src/main/java/com/kylinolap/rest/controller/TableController.java b/server/src/main/java/com/kylinolap/rest/controller/TableController.java index f93b448..a15eaa2 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/TableController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/TableController.java @@ -114,10 +114,10 @@ public String reloadSourceTable() { @RequestMapping(value = "/{tables}/{project}", method = { RequestMethod.POST }) @ResponseBody public Map loadHiveTable(@PathVariable String tables,@PathVariable String project) { -// String[] arr = cubeMgmtService.reloadHiveTable(tables); + String[] arr = cubeMgmtService.reloadHiveTable(tables); cubeMgmtService.syncTableToProject(tables, project); Map result = new HashMap(); -// result.put("result", arr); + result.put("result", arr); return result; } From 4e7e46f65bb3b416a2feec99df8cf197227696df Mon Sep 17 00:00:00 2001 From: "Li, Yang" Date: Fri, 14 Nov 2014 10:45:51 +0800 Subject: [PATCH 13/26] drop lzo dependency --- job/pom.xml | 10 ---------- pom.xml | 7 ------- server/pom.xml | 10 ---------- .../java/com/kylinolap/rest/controller/CubeController.java | 1 - .../java/com/kylinolap/rest/service/AccessServiceTest.java | 3 +-- server/src/test/java/com/kylinolap/rest/service/TestBase.java | 7 ------- 6 files changed, 1 insertion(+), 37 deletions(-) diff --git a/job/pom.xml b/job/pom.xml index 938bf9f..90eb233 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -90,16 +90,6 @@ - org.anarres.lzo - lzo-hadoop - - - org.apache.hadoop - hadoop-core - - - - org.apache.commons commons-email 1.1 diff --git a/pom.xml b/pom.xml index 84edc94..5a4e5e8 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ 0.98.0-hadoop2 3.4.5 0.13.0 - 1.0.0 3.4 @@ -323,12 +322,6 @@ - org.anarres.lzo - lzo-hadoop - ${lzo.version} - - - org.apache.curator curator-framework ${curator.version} diff --git a/server/pom.xml b/server/pom.xml index f278eec..523a123 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -325,16 +325,6 @@ - - org.anarres.lzo - lzo-hadoop - - - org.apache.hadoop - hadoop-core - - - diff --git a/server/src/main/java/com/kylinolap/rest/controller/CubeController.java b/server/src/main/java/com/kylinolap/rest/controller/CubeController.java index 5ea9df2..0b71b8c 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/CubeController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/CubeController.java @@ -24,7 +24,6 @@ import java.util.UUID; import org.apache.commons.lang.StringUtils; -import org.quartz.SchedulerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/server/src/test/java/com/kylinolap/rest/service/AccessServiceTest.java b/server/src/test/java/com/kylinolap/rest/service/AccessServiceTest.java index d4e6767..05a3a9f 100644 --- a/server/src/test/java/com/kylinolap/rest/service/AccessServiceTest.java +++ b/server/src/test/java/com/kylinolap/rest/service/AccessServiceTest.java @@ -18,7 +18,6 @@ import org.junit.Assert; import org.junit.Test; -import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.acls.domain.PrincipalSid; import org.springframework.security.acls.model.AccessControlEntry; @@ -41,7 +40,7 @@ AccessService accessService; @Test - public void testBasics() throws JsonProcessingException, SchedulerException { + public void testBasics() throws JsonProcessingException { Sid adminSid = accessService.getSid("ADMIN", true); Assert.assertNotNull(adminSid); Assert.assertNotNull(AclPermissionFactory.getPermissions()); diff --git a/server/src/test/java/com/kylinolap/rest/service/TestBase.java b/server/src/test/java/com/kylinolap/rest/service/TestBase.java index 3e6441f..e763d26 100644 --- a/server/src/test/java/com/kylinolap/rest/service/TestBase.java +++ b/server/src/test/java/com/kylinolap/rest/service/TestBase.java @@ -16,14 +16,10 @@ package com.kylinolap.rest.service; -import java.io.IOException; - import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Test; import org.junit.runner.RunWith; -import org.quartz.SchedulerException; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -75,7 +71,4 @@ public void after() throws Exception { this.cleanupTestMetadata(); } - @Test - public void test() throws SchedulerException, IOException { - } } From 22aa9cdba57b1e063bc01358c3bc6c6a5ff0ebdd Mon Sep 17 00:00:00 2001 From: "Li, Yang" Date: Fri, 14 Nov 2014 14:38:15 +0800 Subject: [PATCH 14/26] comment format change --- .../src/main/java/com/kylinolap/storage/filter/CompareTupleFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/storage/src/main/java/com/kylinolap/storage/filter/CompareTupleFilter.java b/storage/src/main/java/com/kylinolap/storage/filter/CompareTupleFilter.java index 0837f64..e0c9216 100644 --- a/storage/src/main/java/com/kylinolap/storage/filter/CompareTupleFilter.java +++ b/storage/src/main/java/com/kylinolap/storage/filter/CompareTupleFilter.java @@ -64,8 +64,7 @@ public void addChild(TupleFilter child) { throw new IllegalStateException("Duplicate columns! old is " + column.getName() + " and new is " + columnFilter.getColumn().getName()); } this.column = columnFilter.getColumn(); - // if value is before column, we need to reverse the operator. e.g. - // "1 >= c1" => "c1 <= 1" + // if value is before column, we need to reverse the operator. e.g. "1 >= c1" => "c1 <= 1" if (!this.conditionValues.isEmpty() && needSwapOperator()) { this.operator = SWAP_OP_MAP.get(this.operator); } From 8f19660b2df9c8077e8501d6b1bfd253928f7d31 Mon Sep 17 00:00:00 2001 From: honma Date: Fri, 14 Nov 2014 15:31:14 +0800 Subject: [PATCH 15/26] clean logic back to normal: only clean hbase that belongs to it self --- .../kylinolap/job/hadoop/cube/StorageCleanupJob.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/job/src/main/java/com/kylinolap/job/hadoop/cube/StorageCleanupJob.java b/job/src/main/java/com/kylinolap/job/hadoop/cube/StorageCleanupJob.java index 9e9738b..a87f05c 100644 --- a/job/src/main/java/com/kylinolap/job/hadoop/cube/StorageCleanupJob.java +++ b/job/src/main/java/com/kylinolap/job/hadoop/cube/StorageCleanupJob.java @@ -18,16 +18,11 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; import java.util.List; -import com.kylinolap.common.util.StringUtil; import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -108,23 +103,13 @@ private void cleanUnusedHBaseTables(Configuration conf) throws MasterNotRunningE HBaseAdmin hbaseAdmin = new HBaseAdmin(conf); String tableNamePrefix = CubeManager.getHBaseStorageLocationPrefix(); HTableDescriptor[] tableDescriptors = hbaseAdmin.listTables(tableNamePrefix + ".*"); - - int count = 0; List allTablesNeedToBeDropped = new ArrayList(); for (HTableDescriptor desc : tableDescriptors) { String host = desc.getValue(CubeManager.getHtableMetadataKey()); - - if (StringUtils.isEmpty(host)) { + if (KylinConfig.getInstanceFromEnv().getMetadataUrlPrefix().equalsIgnoreCase(host)) { + //only take care htables that belongs to self allTablesNeedToBeDropped.add(desc.getTableName().getNameAsString()); - } else { - System.out.println("Htable " + desc.getTableName() + " is excluded because its host is " + host + " id is " + (++count)); } - - -// if (KylinConfig.getInstanceFromEnv().getMetadataUrlPrefix().equalsIgnoreCase(host)) { -// //only take care htables that belongs to self -// allTablesNeedToBeDropped.add(desc.getTableName().getNameAsString()); -// } } // remove every segment htable from drop list From d3abf3f100d0877a924885f5246a5660f23ebcef Mon Sep 17 00:00:00 2001 From: honma Date: Fri, 14 Nov 2014 18:03:32 +0800 Subject: [PATCH 16/26] by default kylin.properties disables lzo --- examples/test_case_data/hadoop_job_conf.xml | 41 ++++++++++++++++------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/examples/test_case_data/hadoop_job_conf.xml b/examples/test_case_data/hadoop_job_conf.xml index 0a60831..f62ce55 100644 --- a/examples/test_case_data/hadoop_job_conf.xml +++ b/examples/test_case_data/hadoop_job_conf.xml @@ -1,13 +1,16 @@ - - mapreduce.job.split.metainfo.maxsize - -1 - The maximum permissible size of the split metainfo file. - The JobTracker won't attempt to read split metainfo files bigger than - the configured value. No limits if set to -1. - + + mapreduce.job.split.metainfo.maxsize + -1 + The maximum permissible size of the split metainfo file. + The JobTracker won't attempt to read split metainfo files bigger than + the configured value. No limits if set to -1. + + + + + + + mapreduce.job.max.split.locations + 2000 + No description + + + + dfs.replication + 2 + Block replication + \ No newline at end of file From a1910146262a201e65101825fa0e463f9364cc4e Mon Sep 17 00:00:00 2001 From: "Li, Yang" Date: Fri, 14 Nov 2014 18:33:45 +0800 Subject: [PATCH 17/26] disable lzo on master for now --- examples/test_case_data/hadoop_job_conf.xml | 41 ++++++++++++++++------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/examples/test_case_data/hadoop_job_conf.xml b/examples/test_case_data/hadoop_job_conf.xml index 0a60831..f62ce55 100644 --- a/examples/test_case_data/hadoop_job_conf.xml +++ b/examples/test_case_data/hadoop_job_conf.xml @@ -1,13 +1,16 @@ - - mapreduce.job.split.metainfo.maxsize - -1 - The maximum permissible size of the split metainfo file. - The JobTracker won't attempt to read split metainfo files bigger than - the configured value. No limits if set to -1. - + + mapreduce.job.split.metainfo.maxsize + -1 + The maximum permissible size of the split metainfo file. + The JobTracker won't attempt to read split metainfo files bigger than + the configured value. No limits if set to -1. + + + + + + + mapreduce.job.max.split.locations + 2000 + No description + + + + dfs.replication + 2 + Block replication + \ No newline at end of file From 40056a7b204cfd386a37c7cb3333faf44d14e380 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Fri, 14 Nov 2014 20:36:12 +0800 Subject: [PATCH 18/26] load hive source table stable version --- .../kylinolap/cube/project/ProjectInstance.java | 15 ++-- .../com/kylinolap/cube/project/ProjectManager.java | 76 +++++++++++---------- .../metadata/tool/HiveSourceTableMgmt.java | 12 +--- .../kylinolap/rest/controller/TableController.java | 10 ++- .../com/kylinolap/rest/service/CubeService.java | 8 +-- webapp/app/image/ajax-loader.gif | Bin 0 -> 847 bytes webapp/app/js/controllers/auth.js | 1 + webapp/app/js/controllers/sourceMeta.js | 31 +++++++-- webapp/app/partials/tables/source_metadata.html | 5 +- webapp/app/partials/tables/source_table_tree.html | 10 ++- 10 files changed, 95 insertions(+), 73 deletions(-) create mode 100644 webapp/app/image/ajax-loader.gif diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java index 5a672be..781fc6c 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectInstance.java @@ -17,6 +17,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.Set; +import java.util.TreeSet; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; @@ -39,7 +41,7 @@ private List cubes; @JsonProperty("tables") - private List tables; + private Set tables; @JsonProperty("owner") @@ -161,7 +163,7 @@ public void setCubes(List cubes) { this.cubes = cubes; } - public void setTables(List tables) { + public void setTables(Set tables) { this.tables = tables; } @@ -184,12 +186,9 @@ public void addTable(String tableName) { this.getTables().add(tableName); } - //will return new list for null - public List getTables() { - if(tables==null){ - tables = new ArrayList(); - } - return tables; + //will return new Set for null + public Set getTables() { + return tables==null?new TreeSet():tables; } public String getOwner() { diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java index a9e2e81..fc176e4 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java @@ -190,21 +190,26 @@ public ProjectInstance updateCubeToProject(String cubeName, String newProjectNam public boolean isTableInProject(String projectName, CubeInstance cube) { return this.listAllCubes(projectName).contains(cube); } - - public ProjectInstance updateTableToProject(String tables, String newProjectName, String owner) throws IOException { - -// removeTableFromProjects(tables); - - return addTableToProject(tables, newProjectName, owner); - } - public void removeTableFromProjects(String tableName) throws IOException { - for (ProjectInstance projectInstance : findProjects(tableName)) { - projectInstance.removeTable(tableName); - saveResource(projectInstance); + public ProjectInstance updateTableToProject(String tables,String projectName) throws IOException { + ProjectInstance projectInstance = getProject(projectName); + String[] tokens = StringUtils.split(tables, ","); + for (int i = 0; i < tokens.length; i++) { + String token = tokens[i].trim(); + if (StringUtils.isNotEmpty(token)) { + projectInstance.addTable(token); + } + } + + List exposedTables = listExposedTables(projectName); + for(TableDesc table : exposedTables){ + projectInstance.addTable(table.getName()); } + + saveResource(projectInstance); + return projectInstance; } - + public void removeCubeFromProjects(String cubeName) throws IOException { for (ProjectInstance projectInstance : findProjects(cubeName)) { @@ -228,6 +233,30 @@ public void removeCubeFromProjects(String cubeName) throws IOException { return tables; } + + + public List listDefinedTablesInProject(String project) throws IOException { + project = ProjectInstance.getNormalizedProjectName(project); + ProjectInstance projectInstance = getProject(project); + + //sync exposed table to project when list + List exposedTables = listExposedTables(project); + for(TableDesc table : exposedTables){ + projectInstance.addTable(table.getName()); + } + saveResource(projectInstance); + + List tables = Lists.newArrayList(); + for (String table : projectInstance.getTables()) { + TableDesc tableDesc = getMetadataManager().getTableDesc(table); + if (tableDesc != null) { + tables.add(tableDesc); + } + } + + return tables; + } + public List listExposedColumns(String project, String table) { project = ProjectInstance.getNormalizedProjectName(project); @@ -441,29 +470,6 @@ private ProjectInstance addCubeToProject(String cubeName, String project, String return newProject; } - private ProjectInstance addTableToProject(String tables, String project, String user) throws IOException { - String newProjectName = ProjectInstance.getNormalizedProjectName(project); - ProjectInstance newProject = getProject(newProjectName); - -// if (newProject == null) { -// newProject = this.createProject(newProjectName, user, "This is a project automatically added when adding table" + tableName); -// } -// - String[] tokens = StringUtils.split(tables, ","); - StringBuffer buff = new StringBuffer(); - for (int i = 0; i < tokens.length; i++) { - String token = tokens[i].trim(); - if (StringUtils.isNotEmpty(token)) { - buff.append(";"); - buff.append("show table extended like " + token); - } - newProject.addTable(token); - } - saveResource(newProject); - - return newProject; - } - private void saveResource(ProjectInstance proj) throws IOException { ResourceStore store = getStore(); store.putResource(proj.getResourcePath(), proj, PROJECT_SERIALIZER); diff --git a/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java b/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java index cf014ad..8736156 100644 --- a/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java +++ b/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableMgmt.java @@ -334,7 +334,6 @@ private static String callGenerateCommand(String hiveCommd) throws IOException { cmd[0] = "/bin/bash"; cmd[1] = "-c"; } - // hive command output // String hiveOutputPath = tempDir + File.separator + // "tmp_kylin_output"; @@ -344,15 +343,13 @@ private static String callGenerateCommand(String hiveCommd) throws IOException { dir.delete(); dir.mkdir(); String tableMetaOutcomeDir = dir.getAbsolutePath(); - - ProcessBuilder pb = null; - + if (osName.startsWith("Windows")) { // pb = new ProcessBuilder(cmd[0], cmd[1], "ssh root@sandbox 'hive -e \"" + hiveCommd + "\"' > " + hiveOutputPath); SSHClient client = new SSHClient("sandbox", "root", "hadoop", null); SSHClientOutput output = null; try { - output = client.execCommand("hive -e \"" + hiveCommd + "\""); + output = client.execCommand("hive -e \"" + hiveCommd + "\" 2>/dev/null"); } catch (Exception e) { // TODO Auto-generated catch block logger.error("Failed to execute hive cmd", e); @@ -373,6 +370,7 @@ private static String callGenerateCommand(String hiveCommd) throws IOException { } } else { + ProcessBuilder pb = null; pb = new ProcessBuilder(cmd[0], cmd[1], "hive -e \"" + hiveCommd + "\" > " + hiveOutputPath); // Run hive pb.directory(new File(tempDir)); @@ -394,13 +392,9 @@ private static String callGenerateCommand(String hiveCommd) throws IOException { br.close(); } } - - } - logger.info("Hive execution completed!"); - HiveSourceTableMgmt rssMgmt = new HiveSourceTableMgmt(); rssMgmt.extractTableDescFromFile(hiveOutputPath, tableMetaOutcomeDir); return tableMetaOutcomeDir; diff --git a/server/src/main/java/com/kylinolap/rest/controller/TableController.java b/server/src/main/java/com/kylinolap/rest/controller/TableController.java index a15eaa2..520377c 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/TableController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/TableController.java @@ -40,6 +40,7 @@ import com.kylinolap.metadata.MetadataConstances; import com.kylinolap.metadata.model.schema.ColumnDesc; import com.kylinolap.metadata.model.schema.TableDesc; +import com.kylinolap.rest.exception.InternalErrorException; import com.kylinolap.rest.request.CardinalityRequest; import com.kylinolap.rest.response.TableDescResponse; import com.kylinolap.rest.service.CubeService; @@ -67,8 +68,13 @@ @Metered(name = "listSourceTables") public List getHiveTables(@RequestParam(value = "ext", required = false) boolean withExt,@RequestParam(value = "project", required = false) String project ) { long start = System.currentTimeMillis(); -// List tables = cubeMgmtService.getMetadataManager().listAllTables(); - List tables = cubeMgmtService.getProjectManager().listExposedTables(project); + List tables = null; + try { + tables = cubeMgmtService.getProjectManager().listDefinedTablesInProject(project); + } catch (Exception e) { + logger.error("Failed to deal with the request.", e); + throw new InternalErrorException(e.getLocalizedMessage()); + } if (withExt) { tables = cloneTableDesc(tables); diff --git a/server/src/main/java/com/kylinolap/rest/service/CubeService.java b/server/src/main/java/com/kylinolap/rest/service/CubeService.java index 9c3251d..36308c0 100644 --- a/server/src/main/java/com/kylinolap/rest/service/CubeService.java +++ b/server/src/main/java/com/kylinolap/rest/service/CubeService.java @@ -562,10 +562,8 @@ private void releaseAllSegments(CubeInstance cube) throws IOException, JobExcept @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN) public String[] reloadHiveTable(String tables) { String tableMetaDir = HiveSourceTableMgmt.reloadHiveTable(tables); - // Reload getMetadataManager().reload(); - File metaDir = new File(tableMetaDir); if (metaDir.exists()) { File tableDir = new File(metaDir, HiveSourceTableMgmt.TABLE_FOLDER_NAME); @@ -581,16 +579,12 @@ private void releaseAllSegments(CubeInstance cube) throws IOException, JobExcept @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN) public void syncTableToProject(String tables,String project){ -// if (!getProjectManager().isCubeInProject(newProjectName, cube)) { String owner = SecurityContextHolder.getContext().getAuthentication().getName(); try { - ProjectInstance newProject = getProjectManager().updateTableToProject(tables, project, owner); + ProjectInstance newProject = getProjectManager().updateTableToProject(tables, project); } catch (IOException e) { - // TODO Auto-generated catch block throw new InternalErrorException("Failed to deal with the request.", e); } -// accessService.inherit(cube, newProject); -// } } } diff --git a/webapp/app/image/ajax-loader.gif b/webapp/app/image/ajax-loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..e192ca895cd00d6b752ec84619b787188f30ee41 GIT binary patch literal 847 zcmZ?wbhEHb6krfw_`<;O|Nnmm28JI$eppyow6wIav9YPCsa?BvZN-WeVq#)tWo2n; zX-}R!nK5I=v17+PJUqg}!hq_D2a5l>{aizWogD*Qjr0td8G$+#|4BI)r6!i7rYMwW zmSiX-W+hhSNI#p{aB=u^kJ9BqzM)+D@@g7D>_ZH z6>Nk>K2^#dec$hd&5{fSg)a9?JsDb3M<1+M;h^GLd*HyqYe$(ldZsj_W{3#!96X@l zAjsu&py5MupnEfu)0U^(0!(Kp*sL-QO$pql{X%Kq;`Av7E5z0lI$B?E`RzKdsAZ)9=nHHN!5+~JF4SY+VADb}iE(C2i8t1nx?>)BhL zPS>_TA<--6ZN7=uLx=rfr*28JR#UU9l!(BR!@3s} qR&*pBVEQRw*vTQWVY)*bLIMx~ literal 0 HcmV?d00001 diff --git a/webapp/app/js/controllers/auth.js b/webapp/app/js/controllers/auth.js index 9a21f68..f16ffca 100644 --- a/webapp/app/js/controllers/auth.js +++ b/webapp/app/js/controllers/auth.js @@ -18,6 +18,7 @@ KylinApp.controller('LoginCtrl', function ($scope, $rootScope, $location, $base6 return; } + $scope.username = $scope.username.toUpperCase(); AuthenticationService.login({}, {}, function (data) { $scope.loading = false; $rootScope.$broadcast('event:loginConfirmed'); diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js index 8c0f969..6a070d0 100644 --- a/webapp/app/js/controllers/sourceMeta.js +++ b/webapp/app/js/controllers/sourceMeta.js @@ -1,12 +1,15 @@ 'use strict'; KylinApp - .controller('SourceMetaCtrl', function ($scope, $q, $window, $routeParams, CubeService, $modal, TableService) { + .controller('SourceMetaCtrl', function ($scope, $q, $window, $routeParams, CubeService, $modal, TableService,$route) { $scope.srcTables = {}; $scope.srcDbs = []; $scope.selectedSrcDb = {}; $scope.selectedSrcTable = {}; $scope.window = 0.68 * $window.innerHeight; + $scope.hiveTbLoad = { + status:'init' + }; $scope.theaditems = [ {attr: 'id', name: 'ID'}, {attr: 'name', name: 'Name'}, @@ -45,7 +48,6 @@ KylinApp angular.forEach(tables, function (table) { if (!$scope.srcTables[table.database]) { $scope.srcTables[table.database] = []; -// $scope.srcAva = true; } angular.forEach(table.columns, function (column) { if(table.cardinality[column.name]) { @@ -80,7 +82,16 @@ KylinApp } $scope.$watch('project.selectedProject', function (newValue, oldValue) { - $scope.aceSrcTbLoaded(); + if(newValue){ + $scope.aceSrcTbLoaded(); + } + + }); + $scope.$watch('hiveTbLoad.status', function (newValue, oldValue) { + if(newValue=="success"){ + $scope.aceSrcTbLoaded(true); + } + }); $scope.showSelected = function (table) { @@ -120,11 +131,14 @@ KylinApp controller: ModalInstanceCtrl, resolve: { tableNames: function () { - return $scope.tableNames; + return $scope.tableNames; }, projectName:function(){ return $scope.project.selectedProject; }, + hiveTbLoad:function(){ + return $scope.hiveTbLoad; + }, scope: function () { return $scope; } @@ -132,16 +146,19 @@ KylinApp }); } - var ModalInstanceCtrl = function ($scope, $modalInstance, tableNames, MessageService,projectName) { + var ModalInstanceCtrl = function ($scope,$location, $modalInstance, tableNames, MessageService,projectName,hiveTbLoad) { + hiveTbLoad.status = "init"; $scope.tableNames = ""; + $scope.projectName = projectName; $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; $scope.add = function () { - console.log(projectName); - $modalInstance.dismiss(); + hiveTbLoad.status="loading"; MessageService.sendMsg('A sync task has been submitted, it might take 20 - 60 seconds', 'success', {}); + $scope.cancel(); TableService.loadHiveTable({tableName: $scope.tableNames,action:projectName}, {}, function (result) { + hiveTbLoad.status = "success"; MessageService.sendMsg('Below tables were synced successfully: ' + result['result'].join() + ', Click Refresh button ...', 'success', {}); }); } diff --git a/webapp/app/partials/tables/source_metadata.html b/webapp/app/partials/tables/source_metadata.html index cc3e2b2..d27cfb5 100644 --- a/webapp/app/partials/tables/source_metadata.html +++ b/webapp/app/partials/tables/source_metadata.html @@ -25,7 +25,7 @@
    -

    Table Schema: {{ selectedSrcTable.name}}

    +

    Table Schema:{{ selectedSrcTable.name}}

    • @@ -151,7 +151,8 @@

      Table Schema: {{ selectedSrcTable.name}}

      Load Hive Table Metadata

    - + Project: {{ $parent.projectName }} +
    diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html index 8e3874e..dc7d550 100644 --- a/webapp/app/partials/tables/source_table_tree.html +++ b/webapp/app/partials/tables/source_table_tree.html @@ -7,14 +7,18 @@

    Source Tables

    ng-model="selectedSrcDb" ng-options="tables as srcDb for (srcDb, tables) in srcTables"> +
    + -
    +
    + Loading...
    - - + +
    +
    From 488881f8e4fed354d449567cf9b8d75d9111e1e5 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Mon, 17 Nov 2014 14:04:01 +0800 Subject: [PATCH 19/26] fix cube's lastBuildTime bug --- webapp/app/js/controllers/cubes.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 708815f..eeb3dce 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -48,9 +48,16 @@ KylinApp angular.forEach(cubes, function (cube, index) { $scope.listAccess(cube, 'CubeInstance'); if (cube.segments && cube.segments.length > 0) { - cube.last_build_time = cube.segments[cube.segments.length - 1].last_build_time; + for(var i= cube.segments.length-1;i>=0;i--){ + if(cube.segments[i].status==="READY"){ + cube.last_build_time = cube.segments[i].last_build_time; + break; + }else if(i===0){ + cube.last_build_time = cube.create_time; + } + } } else { - cube.last_build_time = 0; + cube.last_build_time = cube.create_time; } if($routeParams.showDetail == 'true'){ cube.showDetail = true; From 13a277cce79c34d37c2e425aa635a4263d11fcc6 Mon Sep 17 00:00:00 2001 From: honma Date: Mon, 17 Nov 2014 14:31:20 +0800 Subject: [PATCH 20/26] replace jdbc:optiq:model with jdbc:calcite:model --- server/src/main/java/com/kylinolap/rest/service/BasicService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/kylinolap/rest/service/BasicService.java b/server/src/main/java/com/kylinolap/rest/service/BasicService.java index 3e1a345..812c6aa 100644 --- a/server/src/main/java/com/kylinolap/rest/service/BasicService.java +++ b/server/src/main/java/com/kylinolap/rest/service/BasicService.java @@ -104,7 +104,7 @@ public DataSource getOLAPDataSource(String project) { props.setProperty(OLAPQuery.PROP_SCAN_THRESHOLD, String.valueOf(KylinConfig.getInstanceFromEnv().getScanThreshold())); ds.setConnectionProperties(props); ds.setDriverClassName("net.hydromatic.optiq.jdbc.Driver"); - ds.setUrl("jdbc:optiq:model=" + modelJson.getAbsolutePath()); + ds.setUrl("jdbc:calcite:model=" + modelJson.getAbsolutePath()); ret = olapDataSources.putIfAbsent(project, ds); if (ret == null) { From 0cf0dfec21d0b8590386a1221bef1a723c8f5a20 Mon Sep 17 00:00:00 2001 From: honma Date: Mon, 17 Nov 2014 18:03:28 +0800 Subject: [PATCH 21/26] fix CI test cases --- jdbc/src/test/java/com/kylinolap/jdbc/DummyDriver.java | 2 +- .../com/kylinolap/job/hadoop/hive/JoinedFlatTableTest.java | 3 ++- .../src/test/java/com/kylinolap/rest/service/TestBase.java | 14 +++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/jdbc/src/test/java/com/kylinolap/jdbc/DummyDriver.java b/jdbc/src/test/java/com/kylinolap/jdbc/DummyDriver.java index 04b8593..75e6e0f 100644 --- a/jdbc/src/test/java/com/kylinolap/jdbc/DummyDriver.java +++ b/jdbc/src/test/java/com/kylinolap/jdbc/DummyDriver.java @@ -10,7 +10,7 @@ @Override protected String getFactoryClassName(JdbcVersion jdbcVersion) { - return "com.kylinolap.kylin.jdbc.DummyJdbc41Factory"; + return "com.kylinolap.jdbc.DummyJdbc41Factory"; } } diff --git a/job/src/test/java/com/kylinolap/job/hadoop/hive/JoinedFlatTableTest.java b/job/src/test/java/com/kylinolap/job/hadoop/hive/JoinedFlatTableTest.java index dee678e..2b44aed 100644 --- a/job/src/test/java/com/kylinolap/job/hadoop/hive/JoinedFlatTableTest.java +++ b/job/src/test/java/com/kylinolap/job/hadoop/hive/JoinedFlatTableTest.java @@ -74,7 +74,8 @@ public void testGenerateInsertSql() throws IOException { String sql = JoinedFlatTable.generateInsertDataStatement(intermediateTableDesc, fakeJobUUID, new JobEngineConfig(KylinConfig.getInstanceFromEnv())); System.out.println(sql); - assertEquals(1501, sql.length()); + assertEquals(1239, sql.length()); } + } diff --git a/server/src/test/java/com/kylinolap/rest/service/TestBase.java b/server/src/test/java/com/kylinolap/rest/service/TestBase.java index e763d26..5c21089 100644 --- a/server/src/test/java/com/kylinolap/rest/service/TestBase.java +++ b/server/src/test/java/com/kylinolap/rest/service/TestBase.java @@ -19,6 +19,7 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; @@ -35,18 +36,18 @@ /** * @author xduo - * */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { "classpath:applicationContext.xml", "classpath:kylinSecurity.xml" }) @ActiveProfiles("testing") public class TestBase extends HBaseMetadataTestCase { + @BeforeClass public static void setupResource() throws Exception { - + staticCreateTestMetadata(); - + Authentication authentication = new TestingAuthenticationToken("ADMIN", "ADMIN", "ROLE_ADMIN"); SecurityContextHolder.getContext().setAuthentication(authentication); } @@ -71,4 +72,11 @@ public void after() throws Exception { this.cleanupTestMetadata(); } + /** + * better keep this method, otherwise cause error + * com.kylinolap.rest.service.TestBase.initializationError + */ + @Test + public void test() { + } } From 50c511b06129278c9f345566c1e0e8d3991096c2 Mon Sep 17 00:00:00 2001 From: honma Date: Tue, 18 Nov 2014 09:20:29 +0800 Subject: [PATCH 22/26] prevent TestBase to re-install metadata store --- server/src/test/java/com/kylinolap/rest/service/TestBase.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/src/test/java/com/kylinolap/rest/service/TestBase.java b/server/src/test/java/com/kylinolap/rest/service/TestBase.java index 5c21089..ca569c0 100644 --- a/server/src/test/java/com/kylinolap/rest/service/TestBase.java +++ b/server/src/test/java/com/kylinolap/rest/service/TestBase.java @@ -56,11 +56,12 @@ public static void setupResource() throws Exception { public void setUp() { KylinConfig.destoryInstance(); this.createTestMetadata(); - try { - this.installMetadataToHBase(); - } catch (Exception e) { - e.printStackTrace(); - } + +// try { +// this.installMetadataToHBase(); +// } catch (Exception e) { +// e.printStackTrace(); +// } MetadataManager.removeInstance(getTestConfig()); CubeManager.removeInstance(this.getTestConfig()); From 6639804c75ce012be736ade7c571ba967d6f0c44 Mon Sep 17 00:00:00 2001 From: jiazhong Date: Tue, 18 Nov 2014 13:21:15 +0800 Subject: [PATCH 23/26] rm unsed code --- cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java | 4 ---- .../main/java/com/kylinolap/rest/controller/QueryController.java | 8 ++++---- server/src/main/java/com/kylinolap/rest/service/CubeService.java | 2 -- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java index fc176e4..bff14ef 100644 --- a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java +++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java @@ -187,10 +187,6 @@ public ProjectInstance updateCubeToProject(String cubeName, String newProjectNam return addCubeToProject(cubeName, newProjectName, owner); } - public boolean isTableInProject(String projectName, CubeInstance cube) { - return this.listAllCubes(projectName).contains(cube); - } - public ProjectInstance updateTableToProject(String tables,String projectName) throws IOException { ProjectInstance projectInstance = getProject(projectName); String[] tokens = StringUtils.split(tables, ","); diff --git a/server/src/main/java/com/kylinolap/rest/controller/QueryController.java b/server/src/main/java/com/kylinolap/rest/controller/QueryController.java index 409e4b1..e080aff 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/QueryController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/QueryController.java @@ -119,17 +119,17 @@ public SQLResponse prepareQuery(@RequestBody PrepareSqlRequest sqlRequest) { @RequestMapping(value = "/saved_queries", method = RequestMethod.POST) @ResponseBody @Timed(name = "saveQuery") - public void saveQuery(@RequestBody SaveSqlRequest sqlRequest) { + public void saveQuery(@RequestBody SaveSqlRequest sqlRequest) throws IOException { String creator = SecurityContextHolder.getContext().getAuthentication().getName(); Query newQuery = new Query(sqlRequest.getName(), sqlRequest.getProject(), sqlRequest.getSql(), sqlRequest.getDescription()); - + queryService.saveQuery(creator, newQuery); } @RequestMapping(value = "/saved_queries/{id}", method = RequestMethod.DELETE) @ResponseBody @Timed(name = "removeQuery") - public void removeQuery(@PathVariable String id) { + public void removeQuery(@PathVariable String id) throws IOException { String creator = SecurityContextHolder.getContext().getAuthentication().getName(); queryService.removeQuery(creator, id); } @@ -137,7 +137,7 @@ public void removeQuery(@PathVariable String id) { @RequestMapping(value = "/saved_queries", method = RequestMethod.GET) @ResponseBody @Timed(name = "getQueries") - public List getQueries() { + public List getQueries() throws IOException { String creator = SecurityContextHolder.getContext().getAuthentication().getName(); return queryService.getQueries(creator); } diff --git a/server/src/main/java/com/kylinolap/rest/service/CubeService.java b/server/src/main/java/com/kylinolap/rest/service/CubeService.java index 36308c0..3ee310d 100644 --- a/server/src/main/java/com/kylinolap/rest/service/CubeService.java +++ b/server/src/main/java/com/kylinolap/rest/service/CubeService.java @@ -578,8 +578,6 @@ private void releaseAllSegments(CubeInstance cube) throws IOException, JobExcept @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN) public void syncTableToProject(String tables,String project){ - - String owner = SecurityContextHolder.getContext().getAuthentication().getName(); try { ProjectInstance newProject = getProjectManager().updateTableToProject(tables, project); } catch (IOException e) { From f79f7fcfea6f23b8c61c95b90e6d19584666474a Mon Sep 17 00:00:00 2001 From: honma Date: Tue, 18 Nov 2014 13:49:16 +0800 Subject: [PATCH 24/26] add debug info for production merge issue --- dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java | 1 + job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java | 1 + 2 files changed, 2 insertions(+) diff --git a/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java b/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java index 73bc9d9..a027b13 100644 --- a/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java +++ b/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java @@ -79,6 +79,7 @@ private DictionaryManager(KylinConfig config) { } public Dictionary getDictionary(String resourcePath) throws IOException { + logger.info("Getting dictionary: " + resourcePath); DictionaryInfo dictInfo = getDictionaryInfo(resourcePath); return dictInfo == null ? null : dictInfo.getDictionaryObject(); } diff --git a/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java b/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java index 10c6456..c6f4301 100644 --- a/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java +++ b/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java @@ -135,6 +135,7 @@ public void map(Text key, Text value, Context context) throws IOException, Inter TblColRef col = cuboid.getColumns().get(i); if (this.checkNeedMerging(col)) { + System.out.println("The col is " + col); // if dictionary on fact table column, needs rewrite DictionaryManager dictMgr = DictionaryManager.getInstance(config); Dictionary sourceDict = dictMgr.getDictionary(sourceCubeSegment.getDictResPath(col)); From 6cc294028c585ff033b05e601eb98a03e65863d5 Mon Sep 17 00:00:00 2001 From: honma Date: Tue, 18 Nov 2014 14:37:35 +0800 Subject: [PATCH 25/26] Revert "add debug info for production merge issue" This reverts commit f79f7fcfea6f23b8c61c95b90e6d19584666474a. --- dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java | 1 - job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java | 1 - 2 files changed, 2 deletions(-) diff --git a/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java b/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java index a027b13..73bc9d9 100644 --- a/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java +++ b/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java @@ -79,7 +79,6 @@ private DictionaryManager(KylinConfig config) { } public Dictionary getDictionary(String resourcePath) throws IOException { - logger.info("Getting dictionary: " + resourcePath); DictionaryInfo dictInfo = getDictionaryInfo(resourcePath); return dictInfo == null ? null : dictInfo.getDictionaryObject(); } diff --git a/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java b/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java index c6f4301..10c6456 100644 --- a/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java +++ b/job/src/main/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapper.java @@ -135,7 +135,6 @@ public void map(Text key, Text value, Context context) throws IOException, Inter TblColRef col = cuboid.getColumns().get(i); if (this.checkNeedMerging(col)) { - System.out.println("The col is " + col); // if dictionary on fact table column, needs rewrite DictionaryManager dictMgr = DictionaryManager.getInstance(config); Dictionary sourceDict = dictMgr.getDictionary(sourceCubeSegment.getDictResPath(col)); From b0a59e73f11a3c44f7ac25004911ef2817560d6d Mon Sep 17 00:00:00 2001 From: jiazhong Date: Tue, 18 Nov 2014 16:07:21 +0800 Subject: [PATCH 26/26] merge from master --- .../main/java/com/kylinolap/job/JobInstance.java | 2 +- .../kylinolap/rest/controller/TableController.java | 2 +- webapp/app/js/controllers/cubeEdit.js | 24 +++++++---- webapp/app/js/controllers/query.js | 48 ++++++++++++---------- webapp/app/partials/cubeDesigner/dimensions.html | 4 +- webapp/app/partials/cubes/cubes.html | 18 +------- 6 files changed, 48 insertions(+), 50 deletions(-) diff --git a/job/src/main/java/com/kylinolap/job/JobInstance.java b/job/src/main/java/com/kylinolap/job/JobInstance.java index 7f270f4..808bc67 100644 --- a/job/src/main/java/com/kylinolap/job/JobInstance.java +++ b/job/src/main/java/com/kylinolap/job/JobInstance.java @@ -224,7 +224,7 @@ public void setMrWaiting(long mrWaiting) { this.mrWaiting = mrWaiting; } - List getSteps() { + public List getSteps() { if (steps == null) { steps = Lists.newArrayList(); } diff --git a/server/src/main/java/com/kylinolap/rest/controller/TableController.java b/server/src/main/java/com/kylinolap/rest/controller/TableController.java index 520377c..6661c9e 100644 --- a/server/src/main/java/com/kylinolap/rest/controller/TableController.java +++ b/server/src/main/java/com/kylinolap/rest/controller/TableController.java @@ -70,7 +70,7 @@ long start = System.currentTimeMillis(); List tables = null; try { - tables = cubeMgmtService.getProjectManager().listDefinedTablesInProject(project); + tables = cubeMgmtService.getProjectManager().listDefinedTablesInProject(project); } catch (Exception e) { logger.error("Failed to deal with the request.", e); throw new InternalErrorException(e.getLocalizedMessage()); diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 66d6689..80264d8 100644 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -47,7 +47,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio $scope.dictionaries = ['date(yyyy-mm-dd)', 'string']; $scope.srcTables = []; - + $scope.srcTablesInProject = []; $scope.getColumnsByTable = function (name) { var temp = null; @@ -138,12 +138,6 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio $scope.state.cubeSchema = angular.toJson($scope.cubeMetaFrame, true); } - TableService.list({ext: true}, function (tables) { - angular.forEach(tables, function (table) { - $scope.srcTables.push(table); - }); - }); - // ~ public methods $scope.aceChanged = function () { } @@ -346,4 +340,20 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio } }); } + + $scope.$watch('cubeMetaFrame.project', function (newValue, oldValue) { + $scope.srcTablesInProject=[]; + var param = { + ext: true, + project:newValue + }; + if(newValue){ + TableService.list(param, function (tables) { + angular.forEach(tables, function (table) { + $scope.srcTablesInProject.push(table); + }); + }); + } + }); + }); diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js index db00ebd..b46742c 100644 --- a/webapp/app/js/controllers/query.js +++ b/webapp/app/js/controllers/query.js @@ -39,28 +39,32 @@ KylinApp $scope.state = { selectedProject: null }; - - TableService.list({}, function (tables) { - $scope.srcTables = []; - $scope.srcColumns = []; - angular.forEach(tables, function (table) { - $scope.srcTables.push({ - meta: 'table', - name: table.name, - score: 0, - value: table.name - }); - - angular.forEach(table.columns, function (column) { - $scope.srcColumns.push({ - meta: 'column', - name: table.name + '.' + column.name, - score: 0, - value: table.name + '.' + column.name - }); - }); - }); - }); +// var param = { +// ext: true, +// quertTb:true, +// project:'onlyinner' +// }; +// TableService.list(param, function (tables) { +// $scope.srcTables = []; +// $scope.srcColumns = []; +// angular.forEach(tables, function (table) { +// $scope.srcTables.push({ +// meta: 'table', +// name: table.name, +// score: 0, +// value: table.name +// }); +// +// angular.forEach(table.columns, function (column) { +// $scope.srcColumns.push({ +// meta: 'column', +// name: table.name + '.' + column.name, +// score: 0, +// value: table.name + '.' + column.name +// }); +// }); +// }); +// }); var Query = { createNew: function (sql, project) { diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html index f801c7e..5c6da48 100644 --- a/webapp/app/partials/cubeDesigner/dimensions.html +++ b/webapp/app/partials/cubeDesigner/dimensions.html @@ -5,7 +5,7 @@ Fact Table
    - {{cubeMetaFrame.fact_table}}
    @@ -137,7 +137,7 @@

    Edit Dimension

    -
    diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index 8c53f6e..2a00e8d 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -1,6 +1,5 @@
    -<<<<<<< HEAD
    Project: @@ -12,26 +11,11 @@ - +
    -======= - - Project: - - - - - - ->>>>>>> 5a19293e191a7ee2b8a4c6aed5013d90ea64725b