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/21 01:27:31 UTC
[26/50] [abbrv] incubator-kylin git commit: Merge remote-tracking
branch 'origin/staging' into streaming-localdict
Merge remote-tracking branch 'origin/staging' into streaming-localdict
Conflicts:
bin/kylin.sh
docs/Installation/install_and_run.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/696a6736
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/696a6736
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/696a6736
Branch: refs/heads/streaming-localdict
Commit: 696a6736698083b59bd12905da57e7c284696301
Parents: 84ec8e0 f22582d
Author: qianhao.zhou <qi...@ebay.com>
Authored: Fri Mar 20 10:21:03 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Fri Mar 20 10:21:03 2015 +0800
----------------------------------------------------------------------
README.md | 71 ++-----------
bin/kylin.sh | 18 ++--
bin/setenv.sh | 36 +++++++
...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/off_cli_install_scene.png | Bin 0 -> 72567 bytes
docs/Installation/on_cli_install_scene.png | Bin 0 -> 53722 bytes
docs/README.md | 0
...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 | 4 +-
docs/Tutorial/Kylin and Tableau Tutorial.pdf | Bin 1246553 -> 0 bytes
docs/Tutorial/Quick play with a sample cube.md | 20 ++++
.../job/hadoop/cube/BaseCuboidJobTest.java | 3 +
.../job/hadoop/cube/MergeCuboidJobTest.java | 4 +-
.../kylin/job/hadoop/cube/NDCuboidJobTest.java | 4 +-
.../cube/RangeKeyDistributionJobTest.java | 4 +-
old_README.md | 94 ++++++++++++++++
pom.xml | 4 +
query/src/test/resources/query/sql/query78.sql | 4 +
.../kylin/storage/hbase/CubeStorageEngine.java | 15 ++-
39 files changed, 387 insertions(+), 255 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/696a6736/bin/kylin.sh
----------------------------------------------------------------------
diff --cc bin/kylin.sh
index 7d85368,232feef..179fa47
--- a/bin/kylin.sh
+++ b/bin/kylin.sh
@@@ -37,9 -34,9 +36,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"
++ 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 \
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/696a6736/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/696a6736/storage/src/main/java/org/apache/kylin/storage/hbase/CubeStorageEngine.java
----------------------------------------------------------------------