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/285bd563 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/285bd563 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/285bd563 Branch: refs/heads/inverted-index Commit: 285bd563fd2d7cb8e0bab0cad689450fa7860450 Parents: 59411d9 8245337 Author: jiazhong <jiazh...@ebay.com> Authored: Wed Feb 11 19:18:56 2015 +0800 Committer: jiazhong <jiazh...@ebay.com> Committed: Wed Feb 11 19:18:56 2015 +0800 ---------------------------------------------------------------------- bin/start-kylin.sh | 5 +- bin/stop-kylin.sh | 18 +++- .../common/hll/HyperLogLogPlusCounter.java | 92 +------------------ .../64ac4f82-f2af-476e-85b9-f0805001014e.dict | Bin 554 -> 0 bytes .../f5e85644-db92-42b5-9ad5-240ab227d7b0.dict | Bin 554 -> 0 bytes .../16d8185c-ee6b-4f8c-a919-756d9809f937.dict | Bin 2515 -> 2630 bytes .../c12ae49d-9dbe-4a58-b169-19afac317696.dict | Bin 2515 -> 2630 bytes .../eaed91b0-4182-4ee5-a733-1047a622ee29.dict | Bin 2515 -> 2630 bytes .../ec83ebce-7534-4e62-ac6d-7445ee141ab4.dict | Bin 2515 -> 2630 bytes .../7228fad8-a764-4bd4-8934-50e0d7cbcb19.dict | Bin 2940 -> 3105 bytes .../8f92faa4-7d2d-455c-8623-6e1d1b272afe.dict | Bin 2940 -> 3105 bytes .../ad09f2d5-054a-4e1b-a776-7cc07399a6c1.dict | Bin 2940 -> 3105 bytes .../eacccee7-d120-4f4d-97d0-c99a5b83ec32.dict | Bin 2940 -> 3105 bytes .../2602386c-debb-4968-8d2f-b52b8215e385.dict | Bin 1841 -> 2000 bytes .../4243889f-bc81-4807-a975-7041bbbf35e7.dict | Bin 1841 -> 2000 bytes .../494683c1-52d1-4d9a-a3f7-8c53b30fd898.dict | Bin 1841 -> 2000 bytes .../8b4b1c06-fb74-486b-a2ad-74420afebcda.dict | Bin 1841 -> 2000 bytes .../ac520edd-f9d2-419f-a7de-587bfb97dc81.dict | Bin 1841 -> 2000 bytes .../0410d2c4-4686-40bc-ba14-170042a2de94.dict | Bin 1498 -> 1537 bytes .../51ff5e6c-22b3-444e-9915-d376a10f20cb.dict | Bin 1498 -> 1537 bytes .../a4e57e55-48fc-4f25-a9c8-485deed25925.dict | Bin 1498 -> 1537 bytes .../aceae914-4246-4251-a0c2-692fe7a300df.dict | Bin 1498 -> 1537 bytes .../b298089f-9656-4693-b9b2-8fea46f06dd5.dict | Bin 1498 -> 1537 bytes .../c2af25cf-6c79-45e6-a6f6-6d2a8ecc6592.dict | Bin 1498 -> 1537 bytes .../0c5d77ec-316b-47e0-ba9a-0616be890ad6.dict | Bin 661 -> 640 bytes .../14fe66b3-5956-498c-bd93-40182cac5510.dict | Bin 661 -> 640 bytes .../1d383a36-81b9-4177-a822-04eab3683e5b.dict | Bin 661 -> 640 bytes .../c6bf9b51-6e90-4337-8082-4e2fdf78307f.dict | Bin 661 -> 640 bytes .../0bec6bb3-1b0d-469c-8289-b8c4ca5d5001.dict | Bin 2189 -> 2264 bytes .../31edf35b-ffca-4f24-8229-f87dc34e3087.dict | Bin 2189 -> 2264 bytes .../652bd393-678a-4f16-a504-fd8ce1229355.dict | Bin 2189 -> 2264 bytes .../792eb972-d046-48e6-9428-f6a3aed92fad.dict | Bin 2189 -> 2264 bytes .../914536f8-1e14-43e9-b8ef-525bb5bdb3b2.dict | Bin 2189 -> 2264 bytes .../d25e554e-deac-4e4a-9289-96f0d121d8fc.dict | Bin 2189 -> 2264 bytes jdbc/pom.xml | 5 - .../kylin/job/hadoop/hbase/TestHbaseClient.java | 2 +- pom.xml | 15 --- script/compress.sh | 8 +- script/package.sh | 2 +- script/prepare.sh | 4 +- .../kylin/rest/service/ProjectService.java | 2 +- 41 files changed, 31 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/285bd563/bin/start-kylin.sh ---------------------------------------------------------------------- diff --cc bin/start-kylin.sh index 735de53,b2544a5..b2544a5 mode 100644,100755..100644 --- a/bin/start-kylin.sh +++ b/bin/start-kylin.sh http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/285bd563/bin/stop-kylin.sh ---------------------------------------------------------------------- diff --cc bin/stop-kylin.sh index 806513b,c7a61b2..c7a61b2 mode 100644,100755..100644 --- a/bin/stop-kylin.sh +++ b/bin/stop-kylin.sh http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/285bd563/script/package.sh ---------------------------------------------------------------------- diff --cc script/package.sh index 018491e,556467a..556467a mode 100644,100755..100644 --- a/script/package.sh +++ b/script/package.sh
