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/01/31 12:57:51 UTC
[53/53] [abbrv] incubator-kylin git commit: Merge branch
'origin/staging'
Merge branch 'origin/staging'
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6b45f43e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6b45f43e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6b45f43e
Branch: refs/heads/master
Commit: 6b45f43e999b94a20dcb03244aa08565ee714651
Parents: 7e351cb f175233
Author: honma <ho...@ebay.com>
Authored: Fri Jan 30 10:08:55 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri Jan 30 10:08:55 2015 +0800
----------------------------------------------------------------------
.../.settings/org.eclipse.core.resources.prefs | 11 +-
.../java/com/kylinolap/common/KylinConfig.java | 18 -
.../com/kylinolap/common/mr/KylinMapper.java | 15 +
.../com/kylinolap/common/mr/KylinReducer.java | 14 +
.../common/persistence/HBaseResourceStore.java | 4 +-
.../com/kylinolap/common/util/HadoopUtil.java | 49 +-
.../persistence/HBaseResourceStoreTest.java | 2 +-
.../java/com/kylinolap/cube/CubeInstance.java | 5 +
.../cube/invertedindex/InvertedIndexCLI.java | 2 +-
deploy/server.xml | 8 -
deploy/web.xml | 4618 ----------------
.../kylinolap/dict/lookup/FileTableReader.java | 2 +-
.../_base.scssc | Bin 0 -> 33622 bytes
.../_layout.scssc | Bin 0 -> 42995 bytes
.../_syntax-highlighting.scssc | Bin 0 -> 40029 bytes
docs/website/BingSiteAuth.xml | 4 +
docs/website/CNAME | 1 +
docs/website/LICENSE | 202 +
docs/website/README.md | 2 +
docs/website/_config-prod.yml | 3 +
docs/website/_config.yml | 25 +
docs/website/_includes/footer.html | 25 +
docs/website/_includes/head.cn.html | 42 +
docs/website/_includes/head.html | 42 +
docs/website/_includes/header.cn.html | 40 +
docs/website/_includes/header.html | 40 +
docs/website/_layouts/default-cn.html | 23 +
docs/website/_layouts/default.html | 23 +
docs/website/_layouts/page.html | 14 +
docs/website/_layouts/post.html | 20 +
docs/website/_sass/_base.scss | 204 +
docs/website/_sass/_layout.scss | 236 +
docs/website/_sass/_syntax-highlighting.scss | 67 +
docs/website/_site/BingSiteAuth.xml | 4 +
docs/website/_site/CNAME | 1 +
docs/website/_site/LICENSE | 202 +
docs/website/_site/README.md | 2 +
docs/website/_site/about/index.html | 229 +
docs/website/_site/assets/css/animate.css | 2744 ++++++++++
docs/website/_site/assets/css/bootstrap.min.css | 5083 ++++++++++++++++++
.../_site/assets/css/font-awesome.min.css | 4 +
docs/website/_site/assets/css/styles.css | 643 +++
docs/website/_site/assets/fonts/FontAwesome.otf | Bin 0 -> 85908 bytes
.../_site/assets/fonts/fontawesome-webfont.eot | Bin 0 -> 56006 bytes
.../_site/assets/fonts/fontawesome-webfont.svg | 520 ++
.../_site/assets/fonts/fontawesome-webfont.ttf | Bin 0 -> 112160 bytes
.../_site/assets/fonts/fontawesome-webfont.woff | Bin 0 -> 65452 bytes
.../assets/fonts/helveticaneue-webfont.css | 8 +
.../assets/fonts/helveticaneue-webfont.eot | Bin 0 -> 50668 bytes
.../assets/fonts/helveticaneue-webfont.svg | 693 +++
.../assets/fonts/helveticaneue-webfont.ttf | Bin 0 -> 50456 bytes
.../assets/fonts/helveticaneue-webfont.woff | Bin 0 -> 26140 bytes
.../_site/assets/fonts/helveticaneue_lt.css | 8 +
.../_site/assets/fonts/helveticaneue_lt.eot | Bin 0 -> 35346 bytes
.../_site/assets/fonts/helveticaneue_lt.svg | 573 ++
.../_site/assets/fonts/helveticaneue_lt.ttf | Bin 0 -> 35092 bytes
.../_site/assets/fonts/helveticaneue_lt.woff | Bin 0 -> 18208 bytes
.../assets/fonts/opensans-light-webfont.eot | Bin 0 -> 20556 bytes
.../assets/fonts/opensans-light-webfont.svg | 1824 +++++++
.../assets/fonts/opensans-light-webfont.ttf | Bin 0 -> 44484 bytes
.../assets/fonts/opensans-light-webfont.woff | Bin 0 -> 24100 bytes
.../assets/fonts/opensans-regular-webfont.eot | Bin 0 -> 21103 bytes
.../assets/fonts/opensans-regular-webfont.svg | 1824 +++++++
.../assets/fonts/opensans-regular-webfont.ttf | Bin 0 -> 45112 bytes
.../assets/fonts/opensans-regular-webfont.woff | Bin 0 -> 24736 bytes
docs/website/_site/assets/images/core.png | Bin 0 -> 70377 bytes
docs/website/_site/assets/images/data.png | Bin 0 -> 913990 bytes
.../_site/assets/images/kylin_diagram.png | Bin 0 -> 441427 bytes
docs/website/_site/assets/images/kylin_logo.jpg | Bin 0 -> 120174 bytes
docs/website/_site/assets/js/bootstrap.min.js | 6 +
.../website/_site/assets/js/jquery-1.9.1.min.js | 5 +
docs/website/_site/assets/js/main.js | 78 +
docs/website/_site/blog/index.html | 165 +
docs/website/_site/cn/index.html | 239 +
docs/website/_site/community/index.html | 183 +
docs/website/_site/css/main.css | 449 ++
docs/website/_site/docs/index.html | 215 +
.../_site/docs/installation-content/index.html | 140 +
.../website/_site/docs/intro-content/index.html | 178 +
docs/website/_site/fav.png | Bin 0 -> 9450 bytes
docs/website/_site/favicon.ico | Bin 0 -> 1150 bytes
docs/website/_site/feed.xml | 61 +
docs/website/_site/google0f781a4ad9402c21.html | 1 +
docs/website/_site/index.html | 239 +
docs/website/about/index.md | 105 +
docs/website/assets/css/animate.css | 2744 ++++++++++
docs/website/assets/css/bootstrap.min.css | 5083 ++++++++++++++++++
docs/website/assets/css/font-awesome.min.css | 4 +
docs/website/assets/css/styles.css | 643 +++
docs/website/assets/fonts/FontAwesome.otf | Bin 0 -> 85908 bytes
.../assets/fonts/fontawesome-webfont.eot | Bin 0 -> 56006 bytes
.../assets/fonts/fontawesome-webfont.svg | 520 ++
.../assets/fonts/fontawesome-webfont.ttf | Bin 0 -> 112160 bytes
.../assets/fonts/fontawesome-webfont.woff | Bin 0 -> 65452 bytes
.../assets/fonts/helveticaneue-webfont.css | 8 +
.../assets/fonts/helveticaneue-webfont.eot | Bin 0 -> 50668 bytes
.../assets/fonts/helveticaneue-webfont.svg | 693 +++
.../assets/fonts/helveticaneue-webfont.ttf | Bin 0 -> 50456 bytes
.../assets/fonts/helveticaneue-webfont.woff | Bin 0 -> 26140 bytes
docs/website/assets/fonts/helveticaneue_lt.css | 8 +
docs/website/assets/fonts/helveticaneue_lt.eot | Bin 0 -> 35346 bytes
docs/website/assets/fonts/helveticaneue_lt.svg | 573 ++
docs/website/assets/fonts/helveticaneue_lt.ttf | Bin 0 -> 35092 bytes
docs/website/assets/fonts/helveticaneue_lt.woff | Bin 0 -> 18208 bytes
.../assets/fonts/opensans-light-webfont.eot | Bin 0 -> 20556 bytes
.../assets/fonts/opensans-light-webfont.svg | 1824 +++++++
.../assets/fonts/opensans-light-webfont.ttf | Bin 0 -> 44484 bytes
.../assets/fonts/opensans-light-webfont.woff | Bin 0 -> 24100 bytes
.../assets/fonts/opensans-regular-webfont.eot | Bin 0 -> 21103 bytes
.../assets/fonts/opensans-regular-webfont.svg | 1824 +++++++
.../assets/fonts/opensans-regular-webfont.ttf | Bin 0 -> 45112 bytes
.../assets/fonts/opensans-regular-webfont.woff | Bin 0 -> 24736 bytes
docs/website/assets/images/core.png | Bin 0 -> 70377 bytes
docs/website/assets/images/data.png | Bin 0 -> 913990 bytes
docs/website/assets/images/kylin_diagram.png | Bin 0 -> 441427 bytes
docs/website/assets/images/kylin_logo.jpg | Bin 0 -> 120174 bytes
docs/website/assets/js/bootstrap.min.js | 6 +
docs/website/assets/js/jquery-1.9.1.min.js | 5 +
docs/website/assets/js/main.js | 78 +
docs/website/blog/index.html | 42 +
docs/website/community/index.html | 60 +
docs/website/css/main.scss | 52 +
docs/website/docs/index.html | 93 +
docs/website/docs/installation-content.html | 16 +
docs/website/docs/intro-content.html | 54 +
docs/website/fav.png | Bin 0 -> 9450 bytes
docs/website/favicon.ico | Bin 0 -> 1150 bytes
docs/website/feed.xml | 30 +
docs/website/google0f781a4ad9402c21.html | 1 +
docs/website/index.cn.md | 116 +
docs/website/index.md | 116 +
...t_kylin_cube_without_slr_left_join_desc.json | 6 +-
.../test_case_data/localmeta/kylin.properties | 4 +-
examples/test_case_data/sandbox/hdfs-site.xml | 2 +-
.../test_case_data/sandbox/kylin.properties | 18 +-
.../sandbox/kylin_job_conf.lzo_disabled.xml | 60 -
.../sandbox/kylin_job_conf.lzo_enabled.xml | 60 -
job/dependency-reduced-pom.xml | 576 ++
job/pom.xml | 23 +-
job/src/main/assembly/job.xml | 22 -
job/src/main/java/com/kylinolap/job/JobDAO.java | 2 +-
.../com/kylinolap/job/cmd/JavaHadoopCmd.java | 6 +-
.../com/kylinolap/job/engine/JobEngine.java | 20 +-
.../kylinolap/job/engine/JobEngineConfig.java | 7 -
.../kylinolap/job/hadoop/AbstractHadoopJob.java | 38 +-
.../cardinality/ColumnCardinalityMapper.java | 9 +-
.../cardinality/ColumnCardinalityReducer.java | 16 +-
.../job/hadoop/cube/BaseCuboidMapper.java | 12 +-
.../job/hadoop/cube/CubeHFileMapper.java | 5 +-
.../job/hadoop/cube/CuboidReducer.java | 5 +-
.../cube/FactDistinctColumnsCombiner.java | 5 +-
.../job/hadoop/cube/FactDistinctColumnsJob.java | 1 +
.../hadoop/cube/FactDistinctColumnsMapper.java | 6 +-
.../hadoop/cube/FactDistinctColumnsReducer.java | 6 +-
.../job/hadoop/cube/KeyDistributionMapper.java | 4 +-
.../job/hadoop/cube/KeyDistributionReducer.java | 4 +-
.../job/hadoop/cube/MergeCuboidMapper.java | 6 +-
.../job/hadoop/cube/NDCuboidMapper.java | 6 +-
.../job/hadoop/cube/NewBaseCuboidMapper.java | 21 +-
.../hadoop/cube/RangeKeyDistributionMapper.java | 9 +-
.../cube/RangeKeyDistributionReducer.java | 68 +-
.../cube/RowKeyDistributionCheckerMapper.java | 13 +-
.../cube/RowKeyDistributionCheckerReducer.java | 10 +-
.../job/hadoop/hbase/CreateHTableJob.java | 30 +-
.../invertedindex/IICreateHFileMapper.java | 6 +-
.../IIDistinctColumnsCombiner.java | 6 +-
.../invertedindex/IIDistinctColumnsMapper.java | 6 +-
.../invertedindex/IIDistinctColumnsReducer.java | 6 +-
.../invertedindex/InvertedIndexMapper.java | 6 +-
.../invertedindex/InvertedIndexReducer.java | 5 +-
.../RandomKeyDistributionMapper.java | 6 +-
.../RandomKeyDistributionReducer.java | 7 +-
.../job/tools/LZOSupportnessChecker.java | 4 +
.../kylinolap/job/BuildCubeWithEngineTest.java | 1 -
.../test/java/com/kylinolap/job/DeployUtil.java | 35 +-
.../com/kylinolap/job/SampleCubeSetupTest.java | 4 -
.../cube/RangeKeyDistributionReducerTest.java | 60 +-
kylin.sh | 41 +
.../kylinolap/metadata/model/cube/CubeDesc.java | 8 +-
package.sh | 14 +-
pom.xml | 10 +-
sandbox_deploy.sh | 126 +-
.../java/com/kylinolap/rest/DebugTomcat.java | 9 +-
server/src/main/webapp/WEB-INF/web.xml | 5 +
webapp/app/index.html | 3 +-
webapp/app/js/controllers/admin.js | 394 +-
webapp/app/js/controllers/cubeEdit.js | 2 +-
webapp/app/js/controllers/cubeSchema.js | 8 +
webapp/app/js/controllers/page.js | 509 +-
webapp/app/js/services/kylinProperties.js | 39 +
webapp/app/js/services/ngLoading.js | 4 +-
webapp/app/partials/cubeDesigner/info.html | 2 +-
webapp/app/partials/cubes/cube_schema.html | 4 +-
webapp/app/partials/cubes/cubes.html | 12 +-
webapp/app/partials/header.html | 14 +-
webapp/app/partials/home.html | 8 +-
webapp/app/partials/jobs/jobs.html | 2 +-
webapp/app/partials/projects/projects.html | 2 +-
webapp/app/partials/query/query.html | 4 +-
webapp/app/partials/tables/source_metadata.html | 4 +-
200 files changed, 33598 insertions(+), 5638 deletions(-)
----------------------------------------------------------------------