Merge branch 'inverted-index' of https://github.com/KylinOLAP/Kylin into inverted-index
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/5386ccd6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/5386ccd6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/5386ccd6 Branch: refs/heads/inverted-index Commit: 5386ccd6912494ac185d60d30c29291272e9f581 Parents: 376941b 9154543 Author: qianhao.zhou <qianz...@ebay.com> Authored: Tue Feb 10 17:49:58 2015 +0800 Committer: qianhao.zhou <qianz...@ebay.com> Committed: Tue Feb 10 17:49:58 2015 +0800 ---------------------------------------------------------------------- .../kylin/rest/controller/CacheController.java | 13 ++- .../kylin/rest/controller/CubeController.java | 115 +++++++++---------- .../kylin/rest/controller/ModelController.java | 6 +- .../kylin/rest/controller/TableController.java | 46 ++++---- .../apache/kylin/rest/service/CubeService.java | 79 ++++++------- .../rest/controller/CacheControllerTest.java | 57 +++++++++ .../rest/controller/CubeControllerTest.java | 47 ++++++-- .../rest/controller/TableControllerTest.java | 74 ++++++++++++ .../kylin/rest/service/ServiceTestBase.java | 22 ++-- 9 files changed, 305 insertions(+), 154 deletions(-) ----------------------------------------------------------------------
