You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/01/15 13:26:52 UTC
[36/50] [abbrv] incubator-kylin git commit: Merge branch 'staging'
Merge branch '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/7913967a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7913967a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7913967a
Branch: refs/heads/master
Commit: 7913967a6a185cb5e7589e9551704e86b06c987a
Parents: 8ee64b5 6c8dacc
Author: Luke Han <lu...@gmail.com>
Authored: Wed Jan 14 20:02:44 2015 +0800
Committer: Luke Han <lu...@gmail.com>
Committed: Wed Jan 14 20:02:44 2015 +0800
----------------------------------------------------------------------
.../.settings/org.eclipse.core.resources.prefs | 1 -
.../hydromatic/optiq/runtime/SqlFunctions.java | 2 +-
.../eigenbase/sql2rel/SqlToRelConverter.java | 17 +-
.../java/com/kylinolap/common/KylinConfig.java | 9 +-
.../common/util/CliCommandExecutor.java | 6 +-
.../kylinolap/common/util/MailServiceTest.java | 2 +-
.../kylinolap/cube/common/BytesSplitter.java | 51 +-
deploy/healthmon.sh | 33 +
deploy/install.sh | 2 +-
.../com/kylinolap/dict/DictionaryGenerator.java | 8 +-
.../kylinolap/dict/lookup/SnapshotManager.java | 3 +-
docs/Design Cube in Kylin.pdf | Bin 0 -> 339155 bytes
...requently Asked Questions on Installation.md | 26 +
...equently Asked Questions on Installation.pdf | Bin 0 -> 52261 bytes
...f Hadoop CLI Installation (Dev Env Setup).md | 76 +
... Hadoop CLI Installation (Dev Env Setup).pdf | Bin 0 -> 44909 bytes
docs/Installation/On Hadoop CLI installation.md | 102 ++
.../Installation/On Hadoop CLI installation.pdf | Bin 0 -> 704398 bytes
...On Hadoop Kylin installation using Docker.md | 40 +
...n Hadoop Kylin installation using Docker.pdf | Bin 0 -> 40098 bytes
...in Cube Build and Job Monitoring Tutorial.md | 60 +
...n Cube Build and Job Monitoring Tutorial.pdf | Bin 0 -> 1054988 bytes
docs/Tutorial/Kylin Cube Creation Tutorial.md | 122 ++
docs/Tutorial/Kylin Cube Creation Tutorial.pdf | Bin 0 -> 1488946 bytes
.../Kylin Cube Permission Grant Tutorial.md | 27 +
.../Kylin Cube Permission Grant Tutorial.pdf | Bin 0 -> 358047 bytes
docs/Tutorial/Kylin ODBC Driver Tutorial.md | 30 +
docs/Tutorial/Kylin ODBC Driver Tutorial.pdf | Bin 0 -> 34429 bytes
docs/Tutorial/Kylin Web Tutorial.md | 133 ++
docs/Tutorial/Kylin Web Tutorial.pdf | Bin 0 -> 1714951 bytes
docs/Tutorial/Kylin and Tableau Tutorial.md | 106 ++
docs/Tutorial/Kylin and Tableau Tutorial.pdf | Bin 0 -> 1246553 bytes
.../java/com/kylinolap/job/JobInstance.java | 2 +-
.../java/com/kylinolap/job/cmd/ShellCmd.java | 2 +-
.../kylinolap/job/constant/BatchConstants.java | 2 +-
.../job/hadoop/cube/BaseCuboidMapper.java | 21 +-
.../hadoop/cube/FactDistinctColumnsMapper.java | 42 +-
.../cube/RangeKeyDistributionReducer.java | 8 +-
.../job/hadoop/hive/JoinedFlatTableDesc.java | 22 +-
.../com/kylinolap/metadata/MetadataManager.java | 4 -
pom.xml | 2 +-
.../query/optrule/OLAPProjectRule.java | 3 +-
.../query/relnode/OLAPAggregateRel.java | 3 +-
.../kylinolap/query/relnode/OLAPTableScan.java | 4 +
.../resources/query/sql_tableau/query27.sql | 4 +-
server/pom.xml | 5 +
.../rest/controller/BasicController.java | 3 +-
.../rest/controller/CubeController.java | 7 +-
.../rest/controller/QueryController.java | 59 +-
.../rest/security/CrossDomainFilter.java | 2 +-
.../kylinolap/rest/service/QueryService.java | 1 +
server/src/main/webapp/WEB-INF/web.xml | 29 +-
.../components/angular-ui-sortable/.travis.yml | 5 +
.../components/angular-ui-sortable/bower.json | 9 +
.../angular-ui-sortable/jquery-ui.min.js | 7 +
.../components/angular-ui-sortable/sortable.js | 315 ++++
.../angular-ui-sortable/sortable.min.js | 1 +
.../components/angular-underscore/.bower.json | 23 +
.../app/components/angular-underscore/README.md | 95 ++
.../angular-underscore/angular-underscore.js | 157 ++
.../angular-underscore.min.js | 1 +
.../components/angular-underscore/bower.json | 12 +
.../components/angular-underscore/package.json | 11 +
webapp/app/components/underscore/.bower.json | 32 +
webapp/app/components/underscore/.eslintrc | 35 +
webapp/app/components/underscore/.gitignore | 2 +
webapp/app/components/underscore/LICENSE | 23 +
webapp/app/components/underscore/README.md | 22 +
webapp/app/components/underscore/bower.json | 7 +
webapp/app/components/underscore/component.json | 10 +
webapp/app/components/underscore/package.json | 41 +
.../app/components/underscore/underscore-min.js | 6 +
.../components/underscore/underscore-min.map | 1 +
webapp/app/components/underscore/underscore.js | 1415 ++++++++++++++++++
webapp/app/index.html | 7 +
webapp/app/js/app.js | 2 +-
webapp/app/js/controllers/auth.js | 2 -
webapp/app/js/controllers/cubeDimensions.js | 435 ++++++
webapp/app/js/controllers/cubeEdit.js | 35 +-
webapp/app/js/controllers/cubeModel.js | 145 ++
webapp/app/js/controllers/cubeSchema.js | 149 +-
webapp/app/js/controllers/cubes.js | 18 +-
webapp/app/js/controllers/job.js | 24 +-
webapp/app/js/controllers/page.js | 37 +-
webapp/app/js/controllers/projects.js | 2 +-
webapp/app/js/controllers/sourceMeta.js | 22 +-
webapp/app/less/animation.less | 29 +
webapp/app/less/app.less | 57 +-
webapp/app/less/build.less | 1 +
.../cubeDesigner/advanced_settings.html | 25 +
.../app/partials/cubeDesigner/data_model.html | 184 +++
.../app/partials/cubeDesigner/dimensions.html | 485 +++---
webapp/app/partials/cubeDesigner/filter.html | 26 +-
.../app/partials/cubeDesigner/incremental.html | 31 -
webapp/app/partials/cubeDesigner/overview.html | 2 +-
webapp/app/partials/cubes/cube_edit.html | 2 +-
webapp/app/partials/cubes/cube_json_edit.html | 2 +-
webapp/app/partials/cubes/cubes.html | 5 +-
webapp/app/partials/jobs/job_steps.html | 266 ++--
webapp/app/partials/jobs/job_submit.html | 4 +-
webapp/app/partials/jobs/jobs.html | 5 +-
webapp/app/partials/login.html | 2 +-
.../partials/projects/project_table_tree.html | 34 +-
webapp/app/partials/query/query.html | 1 +
webapp/app/partials/query/query_detail.html | 6 +-
webapp/app/partials/tables/source_metadata.html | 34 +-
.../app/partials/tables/source_table_tree.html | 49 +-
webapp/bower.json | 5 +-
webapp/grunt.json | 5 +
109 files changed, 4616 insertions(+), 833 deletions(-)
----------------------------------------------------------------------