You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/10/26 10:08:31 UTC

[45/45] incubator-kylin git commit: Merge tag 'kylin-1.1-incubating'

Merge tag 'kylin-1.1-incubating'

[maven-release-plugin] copy for tag kylin-1.1-incubating


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9c9fdfa9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9c9fdfa9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9c9fdfa9

Branch: refs/heads/master
Commit: 9c9fdfa95d8c226f391fe687c208d0a7e1ec089f
Parents: 43f1197 bac74fb
Author: shaofengshi <sh...@apache.org>
Authored: Mon Oct 26 17:06:17 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Oct 26 17:06:17 2015 +0800

----------------------------------------------------------------------
 KEYS                                            |   58 +
 atopcalcite/pom.xml                             |    2 +-
 .../adapter/enumerable/EnumerableJoin.java      |  146 --
 .../apache/calcite/runtime/SqlFunctions.java    | 1315 ------------------
 .../calcite/sql2rel/SqlToRelConverter.java      |  253 +---
 bin/kylin.sh                                    |   59 +-
 common/pom.xml                                  |    2 +-
 .../org/apache/kylin/common/KylinConfig.java    |   42 +-
 .../apache/kylin/common/util/StringUtil.java    |    8 +-
 .../src/main/resources/kylin-log4j.properties   |   28 +
 common/src/main/resources/kylinlog4j.properties |   27 -
 common/src/main/resources/log4j.properties      |   25 -
 conf/kylin.properties                           |    6 +-
 cube/pom.xml                                    |    8 +-
 .../org/apache/kylin/cube/cuboid/Cuboid.java    |  113 +-
 .../org/apache/kylin/cube/cuboid/CuboidCLI.java |    8 +-
 .../org/apache/kylin/cube/model/CubeDesc.java   |   11 +
 dictionary/pom.xml                              |    2 +-
 .../test_case_data/sandbox/kylin.properties     |  277 ++--
 invertedindex/pom.xml                           |   10 +-
 .../invertedindex/index/BitMapContainer.java    |  504 ++++---
 .../index/ColumnValueContainer.java             |   86 +-
 .../index/CompressedValueContainer.java         |  358 ++---
 .../apache/kylin/invertedindex/index/Slice.java |   18 +-
 jdbc/pom.xml                                    |    2 +-
 .../java/org/apache/kylin/jdbc/KylinMeta.java   |    9 +-
 jdbc/src/main/resources/log4j.properties        |   31 -
 job/pom.xml                                     |    6 +-
 .../org/apache/kylin/job/cube/CubingJob.java    |    5 +-
 .../apache/kylin/job/cube/CubingJobBuilder.java |   29 +-
 .../kylin/job/cube/GarbageCollectionStep.java   |   23 +-
 .../kylin/job/BuildCubeWithEngineTest.java      |    6 +-
 .../apache/kylin/job/BuildIIWithEngineTest.java |    4 +-
 metadata/pom.xml                                |    2 +-
 .../metadata/filter/LogicalTupleFilter.java     |   22 +-
 .../metadata/tool/SandboxMetastoreCLI.java      |    4 +-
 monitor/pom.xml                                 |    2 +-
 .../org/apache/kylin/monitor/ConfigUtils.java   |    6 +-
 .../org/apache/kylin/monitor/DebugClient.java   |    2 +-
 .../apache/kylin/monitor/HiveJdbcClient.java    |    2 +-
 monitor/src/main/resources/log4j.properties     |   31 -
 pom.xml                                         |   26 +-
 query/pom.xml                                   |    2 +-
 .../apache/kylin/query/relnode/OLAPJoinRel.java |   24 +-
 .../kylin/query/relnode/OLAPTableScan.java      |   13 +-
 query/src/test/resources/query/sql/query81.sql  |   28 +
 server/pom.xml                                  |   13 +-
 .../java/org/apache/kylin/rest/DebugTomcat.java |    7 +-
 .../kylin/rest/controller/CubeController.java   |    8 +-
 .../kylin/rest/service/BadQueryDetector.java    |   37 +-
 .../apache/kylin/rest/service/QueryService.java |   21 +-
 .../org/apache/kylin/rest/util/HiveReroute.java |  142 ++
 .../kylin/rest/util/Log4jConfigListener.java    |   46 +
 .../resources/kylin-server-log4j.properties     |   51 +
 server/src/main/resources/log4j.properties      |   55 -
 server/src/main/webapp/WEB-INF/web.xml          |    6 +-
 .../rest/service/BadQueryDetectorTest.java      |    6 +-
 src/main/config/assemblies/source-assembly.xml  |   11 +-
 storage/pom.xml                                 |    9 +-
 .../storage/filter/BitMapFilterEvaluator.java   |  486 +++----
 .../hbase/coprocessor/CoprocessorFilter.java    |    8 +-
 .../hbase/coprocessor/endpoint/IIEndpoint.java  |    6 +-
 .../endpoint/SliceBitMapProvider.java           |    4 +-
 .../coprocessor/endpoint/protobuf/II.proto      |   17 +
 .../coprocessor/observer/ObserverEnabler.java   |    8 +-
 .../filter/BitMapFilterEvaluatorTest.java       |  478 +++----
 webapp/app/js/controllers/cubeEdit.js           |    8 +-
 webapp/app/js/controllers/job.js                |    7 -
 webapp/app/js/controllers/sourceMeta.js         |    6 -
 .../app/partials/tables/source_table_tree.html  |    3 +-
 website/_data/contributors.yml                  |    5 +
 website/_dev/dev_env.md                         |    5 +-
 website/_dev/howto_contribute.md                |   11 +-
 website/_docs/gettingstarted/terminology.md     |    5 +-
 website/_docs/index.md                          |    4 +-
 website/_includes/docs_nav.html                 |    2 +-
 website/_includes/docs_ul.cn.html               |    2 +-
 website/_includes/docs_ul.html                  |    2 +-
 website/_layouts/docs-cn.html                   |    2 +
 website/_layouts/docs.html                      |    5 +-
 website/_posts/blog/2015-09-22-hybrid-model.md  |  136 ++
 website/assets/css/animate.css                  |   17 -
 website/assets/css/docs.css                     |   31 +-
 website/assets/css/styles.css                   |   17 -
 website/assets/fonts/fontawesome-webfont.svg    |   17 -
 website/assets/fonts/helveticaneue-webfont.css  |   17 -
 website/assets/fonts/helveticaneue-webfont.svg  |   17 -
 website/assets/fonts/helveticaneue_lt.css       |   17 -
 website/assets/fonts/helveticaneue_lt.svg       |   17 -
 website/assets/fonts/opensans-light-webfont.svg |   17 -
 .../assets/fonts/opensans-regular-webfont.svg   |   17 -
 website/community/poweredby.md                  |   18 +
 website/css/main.scss                           |   17 -
 website/images/blog/hybrid-model.png            |  Bin 0 -> 118183 bytes
 94 files changed, 2193 insertions(+), 3293 deletions(-)
----------------------------------------------------------------------