From cc2b1cb2d99543aa7d8c14918e91d2c9afc03be9 Mon Sep 17 00:00:00 2001 From: Luke Han Date: Sat, 13 Dec 2014 11:13:57 -0800 Subject: [PATCH 1/3] Update docker relative update docker relative content and add sequenceiq web site link --- README.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d792030..cec9de7 100644 --- a/README.md +++ b/README.md @@ -38,21 +38,10 @@ Installation ------------ It is very easy to install Kylin for exploration/development. There are 3 supported options: -1. Quick Start (Docker) -2. Sandbox (HDP or CDH sandbox) -3. Dev Environment (IDE + Sandbox) - -#### Quick Start (using Docker) #### -This is the easiest option to try Kylin. We have created docker container for Kylin (along with Hadoop, HBase and Hive) with help of SequenceIQ. The only thing you will need to do is to pull the container from the official Docker repository to be up and running in few minutes. - -Features: - -- Size - Light weight compared to downloading and setting up HDP or CDH sandbox. -- Cluster support - Supports multi node installation. -- Fully Automated - No manual steps. One command does it all - -For a hands-on tutorial please visit [Kylin Docker installation](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-Kylin-installation-using-Docker). +1. Sandbox (HDP or CDH sandbox) +2. Dev Environment (IDE + Sandbox) +3. Docker container (Docker) #### Sandbox (On-Hadoop-CLI installation) #### @@ -76,6 +65,18 @@ Applications does not necessarily mean Kylin Web, it can also be any test cases For a hands-on tutorial please visit [Off-Hadoop-CLI installation](https://github.com/KylinOLAP/Kylin/wiki/Off-Hadoop-CLI-Installation-(Dev-Env-Setup)) +#### Docker Container #### +With help from [SequenceIQ](http://sequenceiq.com/), there's docker container for Kylin (along with Hadoop, HBase and Hive) avaliable now. The only thing you will need to do is to pull the container from the official Docker repository to be up and running in few minutes. + +Features: + +- Size - Light weight compared to downloading and setting up HDP or CDH sandbox. +- Cluster support - Supports multi node installation. +- Fully Automated - No manual steps. One command does it all + +For a hands-on tutorial please visit [Kylin Docker installation](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-Kylin-installation-using-Docker). + + ### Resources ### From 431230fc419deec09746d6291237e7d687524520 Mon Sep 17 00:00:00 2001 From: Luke Han Date: Sat, 13 Dec 2014 11:21:24 -0800 Subject: [PATCH 2/3] update docker container link add original Kylin Docker container link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cec9de7..44f6859 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Applications does not necessarily mean Kylin Web, it can also be any test cases For a hands-on tutorial please visit [Off-Hadoop-CLI installation](https://github.com/KylinOLAP/Kylin/wiki/Off-Hadoop-CLI-Installation-(Dev-Env-Setup)) #### Docker Container #### -With help from [SequenceIQ](http://sequenceiq.com/), there's docker container for Kylin (along with Hadoop, HBase and Hive) avaliable now. The only thing you will need to do is to pull the container from the official Docker repository to be up and running in few minutes. +With help from [SequenceIQ](http://sequenceiq.com/), there's docker container for Kylin (along with Hadoop, HBase and Hive) available now:[sequenceiq/docker-kylin](https://github.com/sequenceiq/docker-kylin). The only thing you will need to do is to pull the container from the official Docker repository to be up and running in few minutes. Features: From 22bfadb6a1a3680df57014db22b2e748d4cf7cba Mon Sep 17 00:00:00 2001 From: "qianhao.zhou" Date: Mon, 22 Dec 2014 17:44:42 +0800 Subject: [PATCH 3/3] fix table json file duplicate name issue --- .../main/java/com/kylinolap/metadata/tool/HiveSourceTableLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableLoader.java b/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableLoader.java index e0937f1..caa6927 100644 --- a/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableLoader.java +++ b/metadata/src/main/java/com/kylinolap/metadata/tool/HiveSourceTableLoader.java @@ -149,7 +149,7 @@ } for (Map tableAttrs : tableAttrsList) { - File file = new File(tableExdDir, tableAttrs.get("tableName").toUpperCase() + "." + OUTPUT_SURFIX); + File file = new File(tableExdDir, (database + "." + tableAttrs.get("tableName")).toUpperCase() + "." + OUTPUT_SURFIX); JsonUtil.writeValueIndent(new FileOutputStream(file), tableAttrs); } return loadedTables;