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/03/28 01:05:03 UTC
[12/19] incubator-kylin git commit: merge conflict
merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b6a85cfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b6a85cfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b6a85cfc
Branch: refs/heads/staging
Commit: b6a85cfcb29eebe9cc3e7c0b065fabec5c935d9f
Parents: a74b911 f9e3a6a
Author: lukehan <lu...@apache.org>
Authored: Tue Mar 24 18:14:58 2015 -0700
Committer: lukehan <lu...@apache.org>
Committed: Tue Mar 24 18:14:58 2015 -0700
----------------------------------------------------------------------
README.md | 88 +-
bin/kylin.sh | 16 +-
bin/setenv.sh | 36 +
.../common/util/HBaseMiniclusterHelper.java | 2 +-
.../java/org/apache/kylin/cube/CubeManager.java | 50 +-
.../org/apache/kylin/cube/model/CubeDesc.java | 4 +
...requently Asked Questions on Installation.md | 26 -
...equently Asked Questions on Installation.pdf | Bin 52261 -> 0 bytes
docs/Installation/Hadoop Environment.md | 21 +
.../How to generate install binaries.md | 6 +
docs/Installation/Installation.md | 38 +
.../Installation/Multiple Kylin REST servers.md | 9 +
...f Hadoop CLI Installation (Dev Env Setup).md | 76 -
... Hadoop CLI Installation (Dev Env Setup).pdf | Bin 44909 -> 0 bytes
.../Installation/Off Hadoop CLI Installation.md | 67 +
docs/Installation/On Hadoop CLI installation.md | 106 +-
.../Installation/On Hadoop CLI installation.pdf | Bin 704398 -> 0 bytes
...On Hadoop Kylin installation using Docker.md | 2 +-
...n Hadoop Kylin installation using Docker.pdf | Bin 40098 -> 0 bytes
docs/Installation/install_and_run.md | 83 -
docs/Installation/off_cli_install_scene.png | Bin 0 -> 72567 bytes
docs/Installation/on_cli_install_scene.png | Bin 0 -> 53722 bytes
docs/JobEngine/Design.md | 2 +-
.../MISC/FAQ on Kylin Installation and Usage.md | 43 +
docs/MISC/How to Contribute.md | 42 +
docs/MISC/Kylin Document Conventions.md | 9 +
.../Advanced settings of Kylin environment.md | 28 +
docs/Operations/Export Kylin HBase data.md | 19 +
docs/Operations/Kylin Metadata Store.md | 31 +
docs/README.md | 0
docs/REST/Build Cube with Restful API.md | 51 +
...w to consume Kylin REST API in javascript.md | 42 +
docs/REST/Kylin Restful API List.md | 2020 ++++++++++++++++++
.../TechInside/New meta data model structure.md | 18 +
...n Kylin test case with HBase Mini Cluster.md | 15 +
.../How to use kylin remote jdbc driver.md | 87 +
...in Cube Build and Job Monitoring Tutorial.md | 10 +-
...n Cube Build and Job Monitoring Tutorial.pdf | Bin 1054988 -> 0 bytes
docs/Tutorial/Kylin Cube Creation Tutorial.md | 9 +-
docs/Tutorial/Kylin Cube Creation Tutorial.pdf | Bin 1488946 -> 0 bytes
.../Kylin Cube Permission Grant Tutorial.pdf | Bin 358047 -> 0 bytes
docs/Tutorial/Kylin ODBC Driver Tutorial.md | 6 +
docs/Tutorial/Kylin ODBC Driver Tutorial.pdf | Bin 34429 -> 0 bytes
docs/Tutorial/Kylin Web Tutorial.md | 8 +-
docs/Tutorial/Kylin Web Tutorial.pdf | Bin 1714951 -> 0 bytes
docs/Tutorial/Kylin and Excel Tutorial.md | 3 +
docs/Tutorial/Kylin and Tableau Tutorial.md | 6 +-
docs/Tutorial/Kylin and Tableau Tutorial.pdf | Bin 1246553 -> 0 bytes
docs/Tutorial/Quick play with a sample cube.md | 20 +
docs/website/_includes/head.cn.html | 10 +-
docs/website/_includes/head.html | 9 +-
.../minicluster/b-kylin/kylin.properties | 2 +-
.../minicluster/b-kylin/meta/kylin.properties | 2 +-
.../test_case_data/minicluster/kylin.properties | 2 +-
.../org/apache/kylin/jdbc/stub/KylinClient.java | 8 +-
.../org/apache/kylin/job/JoinedFlatTable.java | 46 +-
.../kylin/job/hadoop/AbstractHadoopJob.java | 3 +-
.../hadoop/hive/CubeJoinedFlatTableDesc.java | 29 -
.../job/hadoop/hive/IIJoinedFlatTableDesc.java | 20 -
.../job/hadoop/hive/IJoinedFlatTableDesc.java | 5 -
.../kylin/job/tools/CubeMigrationCLI.java | 4 +-
.../job/hadoop/cube/BaseCuboidJobTest.java | 3 +
.../job/hadoop/cube/MergeCuboidJobTest.java | 4 +-
.../kylin/job/hadoop/cube/NDCuboidJobTest.java | 4 +-
.../cube/RangeKeyDistributionJobTest.java | 4 +-
.../kylin/metadata/project/ProjectL2Cache.java | 27 +-
pom.xml | 4 +
query/src/test/resources/query/sql/query78.sql | 4 +
.../apache/kylin/rest/service/JobService.java | 110 +-
.../kylin/storage/hbase/CubeStorageEngine.java | 15 +-
webapp/app/js/controllers/cubes.js | 2 +-
webapp/app/partials/query/query_detail.html | 2 +-
72 files changed, 2886 insertions(+), 532 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b6a85cfc/bin/kylin.sh
----------------------------------------------------------------------
diff --cc bin/kylin.sh
index f8db9e5,232feef..bffe37f
--- a/bin/kylin.sh
+++ b/bin/kylin.sh
@@@ -35,9 -34,9 +34,10 @@@ the
export HBASE_CLASSPATH_PREFIX=${tomcat_root}/bin/bootstrap.jar:${tomcat_root}/bin/tomcat-juli.jar:${tomcat_root}/lib/*:$HBASE_CLASSPATH_PREFIX
export HBASE_CLASSPATH=$hive_dependency:${HBASE_CLASSPATH}
+ export JAVA_OPTS="-Xms2048M -Xmx2048M"
- hbase ${JAVA_OPTS} -Djava.util.logging.config.file=${tomcat_root}/conf/logging.properties \
+ hbase ${KYLIN_EXTRA_START_OPTS} \
+ -Djava.util.logging.config.file=${tomcat_root}/conf/logging.properties \
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true \
-Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true \