You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/02/12 06:43:32 UTC
[42/50] incubator-kylin git commit: Merge branch 'inverted-index' of
https://github.com/KylinOLAP/Kylin into inverted-index
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/47263143
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/47263143
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/47263143
Branch: refs/heads/inverted-index
Commit: 47263143a3b577b8989fe8e6dd847d265eee6dfe
Parents: 56ba513 d5a185e
Author: qianhao.zhou <qi...@ebay.com>
Authored: Thu Feb 12 10:35:55 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Thu Feb 12 10:35:55 2015 +0800
----------------------------------------------------------------------
.gitignore | 0
bin/check-env.sh | 0
bin/start-kylin.sh | 0
bin/stop-kylin.sh | 0
.../common/hll/HyperLogLogPlusCounter.java | 80 +------------------
conf/kylin.properties | 0
.../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
.../sandbox-hdp21/kylin.properties | 0
.../test_case_data/sandbox/kylin.properties | 0
script/package.sh | 0
.../kylin/rest/service/ProjectService.java | 2 +-
webapp/app/css/AdminLTE-fonts.css | 0
webapp/app/css/AdminLTE.css | 0
...1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 | Bin
...t5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 | Bin
webapp/app/index.html | 2 +
webapp/app/js/controllers/cubeAdvanceSetting.js | 0
webapp/app/js/controllers/cubeDimensions.js | 0
webapp/app/js/controllers/cubeEdit.js | 0
webapp/app/js/controllers/cubeFilter.js | 0
webapp/app/js/controllers/cubeModel.js | 0
webapp/app/js/controllers/cubeRefresh.js | 0
webapp/app/js/controllers/cubeSchema.js | 0
webapp/app/js/controllers/cubes.js | 51 ++++--------
webapp/app/js/controllers/job.js | 41 ++++------
webapp/app/js/controllers/page.js | 0
webapp/app/js/controllers/projects.js | 0
webapp/app/js/controllers/sourceMeta.js | 0
webapp/app/js/filters/filter.js | 0
webapp/app/js/model/cubeConfig.js | 0
webapp/app/js/model/cubeListModel.js | 65 +++++++++++++++
webapp/app/js/model/cubesManager.js | 0
webapp/app/js/model/jobConfig.js | 0
webapp/app/js/model/jobListModel.js | 61 ++++++++++++++
webapp/app/js/model/metaModel.js | 0
webapp/app/js/model/projectConfig.js | 0
webapp/app/js/model/projectModel.js | 0
webapp/app/js/model/tableConfig.js | 0
webapp/app/js/model/tableModel.js | 0
webapp/app/partials/common/access.html | 8 +-
.../cubeDesigner/advanced_settings.html | 3 +
.../app/partials/cubeDesigner/data_model.html | 1 +
.../app/partials/cubeDesigner/dimensions.html | 3 +
.../app/partials/cubeDesigner/incremental.html | 1 +
webapp/app/partials/cubeDesigner/measures.html | 2 +
webapp/app/partials/cubes/cube_json_edit.html | 0
webapp/app/partials/cubes/cubes.html | 14 ++--
webapp/app/partials/jobs/job_submit.html | 1 -
webapp/app/partials/jobs/jobs.html | 14 ++--
webapp/app/partials/projects/projects.html | 0
webapp/app/partials/tables/source_metadata.html | 0
webapp/bower.json | 0
webapp/grunt.json | 0
81 files changed, 191 insertions(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47263143/conf/kylin.properties
----------------------------------------------------------------------
diff --cc conf/kylin.properties
index f607dca,bf86a26..f607dca
mode 100755,100644..100644
--- a/conf/kylin.properties
+++ b/conf/kylin.properties
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47263143/examples/test_case_data/sandbox-hdp21/kylin.properties
----------------------------------------------------------------------
diff --cc examples/test_case_data/sandbox-hdp21/kylin.properties
index 3e2f97a,7474283..3e2f97a
mode 100755,100644..100644
--- a/examples/test_case_data/sandbox-hdp21/kylin.properties
+++ b/examples/test_case_data/sandbox-hdp21/kylin.properties
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47263143/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --cc examples/test_case_data/sandbox/kylin.properties
index cd5d02c,adc0dda..cd5d02c
mode 100755,100644..100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties