This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch document
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/document by this push:
new 0730312 Add Kylin Configuration and update docs URL for 3.0
0730312 is described below
commit 073031214c8a86fbf9c3ee31ae33ef0eaa433e1e
Author: GinaZhai <[email protected]>
AuthorDate: Fri Apr 12 10:39:12 2019 +0800
Add Kylin Configuration and update docs URL for 3.0
---
website/_docs30/gettingstarted/best_practices.md | 2 +-
website/_docs30/gettingstarted/concepts.md | 2 +-
website/_docs30/gettingstarted/events.md | 2 +-
website/_docs30/gettingstarted/faq.cn.md | 2 +-
website/_docs30/gettingstarted/faq.md | 2 +-
website/_docs30/gettingstarted/terminology.md | 2 +-
website/_docs30/howto/howto_backup_metadata.cn.md | 2 +-
website/_docs30/howto/howto_backup_metadata.md | 2 +-
.../howto/howto_build_cube_with_restapi.cn.md | 2 +-
.../_docs30/howto/howto_build_cube_with_restapi.md | 2 +-
website/_docs30/howto/howto_cleanup_storage.cn.md | 2 +-
website/_docs30/howto/howto_cleanup_storage.md | 2 +-
.../_docs30/howto/howto_enable_zookeeper_acl.md | 2 +-
.../howto/howto_install_ranger_kylin_plugin.md | 2 +-
website/_docs30/howto/howto_jdbc.cn.md | 2 +-
website/_docs30/howto/howto_jdbc.md | 2 +-
website/_docs30/howto/howto_ldap_and_sso.md | 2 +-
website/_docs30/howto/howto_optimize_build.cn.md | 2 +-
website/_docs30/howto/howto_optimize_build.md | 2 +-
website/_docs30/howto/howto_optimize_cubes.cn.md | 2 +-
website/_docs30/howto/howto_optimize_cubes.md | 2 +-
website/_docs30/howto/howto_update_coprocessor.md | 2 +-
website/_docs30/howto/howto_upgrade.md | 2 +-
website/_docs30/howto/howto_use_beeline.md | 2 +-
website/_docs30/howto/howto_use_cli.cn.md | 2 +-
website/_docs30/howto/howto_use_cli.md | 2 +-
.../howto/howto_use_distributed_scheduler.md | 2 +-
website/_docs30/howto/howto_use_restapi.cn.md | 2 +-
website/_docs30/howto/howto_use_restapi.md | 2 +-
website/_docs30/howto/howto_use_restapi_in_js.md | 2 +-
website/_docs30/index.cn.md | 2 +-
website/_docs30/index.md | 2 +-
website/_docs30/install/advance_settings.cn.md | 2 +-
website/_docs30/install/advance_settings.md | 2 +-
website/_docs30/install/configuration.cn.md | 67 +++++++++++++++++++++-
website/_docs30/install/configuration.md | 65 ++++++++++++++++++++-
website/_docs30/install/index.cn.md | 2 +-
website/_docs30/install/index.md | 2 +-
website/_docs30/install/kylin_aws_emr.cn.md | 2 +-
website/_docs30/install/kylin_aws_emr.md | 2 +-
website/_docs30/install/kylin_cluster.cn.md | 2 +-
website/_docs30/install/kylin_cluster.md | 2 +-
website/_docs30/install/kylin_docker.cn.md | 2 +-
website/_docs30/install/kylin_docker.md | 2 +-
website/_docs30/release_notes.md | 2 +-
website/_docs30/tutorial/Qlik.cn.md | 2 +-
website/_docs30/tutorial/Qlik.md | 2 +-
website/_docs30/tutorial/acl.cn.md | 2 +-
website/_docs30/tutorial/acl.md | 2 +-
website/_docs30/tutorial/create_cube.cn.md | 2 +-
website/_docs30/tutorial/create_cube.md | 2 +-
website/_docs30/tutorial/cube_build_job.cn.md | 2 +-
website/_docs30/tutorial/cube_build_job.md | 2 +-
.../_docs30/tutorial/cube_build_performance.cn.md | 2 +-
website/_docs30/tutorial/cube_build_performance.md | 2 +-
website/_docs30/tutorial/cube_spark.cn.md | 2 +-
website/_docs30/tutorial/cube_spark.md | 2 +-
website/_docs30/tutorial/cube_streaming.cn.md | 2 +-
website/_docs30/tutorial/cube_streaming.md | 2 +-
website/_docs30/tutorial/flink.md | 2 +-
website/_docs30/tutorial/hue.md | 2 +-
website/_docs30/tutorial/hybrid.cn.md | 2 +-
website/_docs30/tutorial/hybrid.md | 2 +-
website/_docs30/tutorial/jdbc.cn.md | 2 +-
website/_docs30/tutorial/jdbc.md | 2 +-
website/_docs30/tutorial/kylin_client_tool.cn.md | 2 +-
website/_docs30/tutorial/kylin_client_tool.md | 2 +-
website/_docs30/tutorial/kylin_sample.cn.md | 2 +-
website/_docs30/tutorial/kylin_sample.md | 2 +-
website/_docs30/tutorial/microstrategy.md | 2 +-
website/_docs30/tutorial/mysql_metastore.cn.md | 2 +-
website/_docs30/tutorial/mysql_metastore.md | 2 +-
website/_docs30/tutorial/odbc.cn.md | 2 +-
website/_docs30/tutorial/odbc.md | 2 +-
website/_docs30/tutorial/powerbi.cn.md | 2 +-
website/_docs30/tutorial/powerbi.md | 2 +-
website/_docs30/tutorial/project_level_acl.cn.md | 2 +-
website/_docs30/tutorial/project_level_acl.md | 2 +-
website/_docs30/tutorial/query_pushdown.cn.md | 2 +-
website/_docs30/tutorial/query_pushdown.md | 2 +-
.../_docs30/tutorial/setup_jdbc_datasource.cn.md | 2 +-
website/_docs30/tutorial/setup_jdbc_datasource.md | 2 +-
website/_docs30/tutorial/setup_systemcube.cn.md | 2 +-
website/_docs30/tutorial/setup_systemcube.md | 2 +-
website/_docs30/tutorial/spark.cn.md | 2 +-
website/_docs30/tutorial/spark.md | 2 +-
website/_docs30/tutorial/sql_reference.cn.md | 2 +-
website/_docs30/tutorial/sql_reference.md | 2 +-
website/_docs30/tutorial/squirrel.cn.md | 2 +-
website/_docs30/tutorial/squirrel.md | 2 +-
website/_docs30/tutorial/superset.cn.md | 2 +-
website/_docs30/tutorial/superset.md | 2 +-
website/_docs30/tutorial/tableau.cn.md | 2 +-
website/_docs30/tutorial/tableau.md | 2 +-
website/_docs30/tutorial/tableau_91.cn.md | 2 +-
website/_docs30/tutorial/tableau_91.md | 2 +-
website/_docs30/tutorial/use_cube_planner.cn.md | 2 +-
website/_docs30/tutorial/use_cube_planner.md | 2 +-
website/_docs30/tutorial/use_dashboard.cn.md | 2 +-
website/_docs30/tutorial/use_dashboard.md | 2 +-
website/_docs30/tutorial/web.cn.md | 2 +-
website/_docs30/tutorial/web.md | 2 +-
102 files changed, 228 insertions(+), 104 deletions(-)
diff --git a/website/_docs30/gettingstarted/best_practices.md
b/website/_docs30/gettingstarted/best_practices.md
index 118a388..82bc3ac 100644
--- a/website/_docs30/gettingstarted/best_practices.md
+++ b/website/_docs30/gettingstarted/best_practices.md
@@ -2,7 +2,7 @@
layout: docs
title: "Community Best Practices"
categories: gettingstarted
-permalink: /docs/gettingstarted/best_practices.html
+permalink: /docs30/gettingstarted/best_practices.html
since: v1.3.x
---
diff --git a/website/_docs30/gettingstarted/concepts.md
b/website/_docs30/gettingstarted/concepts.md
index b93cbf9..66df244 100644
--- a/website/_docs30/gettingstarted/concepts.md
+++ b/website/_docs30/gettingstarted/concepts.md
@@ -2,7 +2,7 @@
layout: docs
title: "Technical Concepts"
categories: gettingstarted
-permalink: /docs/gettingstarted/concepts.html
+permalink: /docs30/gettingstarted/concepts.html
since: v1.2
---
diff --git a/website/_docs30/gettingstarted/events.md
b/website/_docs30/gettingstarted/events.md
index ffe6107..186a6d3 100644
--- a/website/_docs30/gettingstarted/events.md
+++ b/website/_docs30/gettingstarted/events.md
@@ -2,7 +2,7 @@
layout: docs
title: "Events and Conferences"
categories: gettingstarted
-permalink: /docs/gettingstarted/events.html
+permalink: /docs30/gettingstarted/events.html
---
__Conferences__
diff --git a/website/_docs30/gettingstarted/faq.cn.md
b/website/_docs30/gettingstarted/faq.cn.md
index 2dfe630..32d5b99 100644
--- a/website/_docs30/gettingstarted/faq.cn.md
+++ b/website/_docs30/gettingstarted/faq.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 常见问题
categories: 开始
-permalink: /cn/docs/gettingstarted/faq.html
+permalink: /cn/docs30/gettingstarted/faq.html
since: v0.6.x
---
diff --git a/website/_docs30/gettingstarted/faq.md
b/website/_docs30/gettingstarted/faq.md
index dfaf5af..1d6d4da 100644
--- a/website/_docs30/gettingstarted/faq.md
+++ b/website/_docs30/gettingstarted/faq.md
@@ -2,7 +2,7 @@
layout: docs
title: "FAQ"
categories: gettingstarted
-permalink: /docs/gettingstarted/faq.html
+permalink: /docs30/gettingstarted/faq.html
since: v0.6.x
---
diff --git a/website/_docs30/gettingstarted/terminology.md
b/website/_docs30/gettingstarted/terminology.md
index 2d998b3..7354899 100644
--- a/website/_docs30/gettingstarted/terminology.md
+++ b/website/_docs30/gettingstarted/terminology.md
@@ -2,7 +2,7 @@
layout: docs
title: "Terminology"
categories: gettingstarted
-permalink: /docs/gettingstarted/terminology.html
+permalink: /docs30/gettingstarted/terminology.html
since: v0.5.x
---
diff --git a/website/_docs30/howto/howto_backup_metadata.cn.md
b/website/_docs30/howto/howto_backup_metadata.cn.md
index 387efb6..2dd1557 100644
--- a/website/_docs30/howto/howto_backup_metadata.cn.md
+++ b/website/_docs30/howto/howto_backup_metadata.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 备份元数据
categories: 帮助
-permalink: /cn/docs/howto/howto_backup_metadata.html
+permalink: /cn/docs30/howto/howto_backup_metadata.html
---
Kylin将它全部的元数据（包括cube描述和实例、项目、倒排索引描述和实例、任务、表和字典）组织成层级文件系统的形式。然而，Kylin 使用 HBase
来存储元数据，而不是一个普通的文件系统。如果你查看过Kylin的配置文件（kylin.properties），你会发现这样一行：
diff --git a/website/_docs30/howto/howto_backup_metadata.md
b/website/_docs30/howto/howto_backup_metadata.md
index 0df0aab..8224ff3 100644
--- a/website/_docs30/howto/howto_backup_metadata.md
+++ b/website/_docs30/howto/howto_backup_metadata.md
@@ -2,7 +2,7 @@
layout: docs
title: Backup Metadata
categories: howto
-permalink: /docs/howto/howto_backup_metadata.html
+permalink: /docs30/howto/howto_backup_metadata.html
---
Kylin organizes all of its metadata (including cube descriptions and
instances, projects, inverted index description and instances, jobs, tables and
dictionaries) as a hierarchy file system. However, Kylin uses hbase to store
it, rather than normal file system. If you check your kylin configuration
file(kylin.properties) you will find such a line:
diff --git a/website/_docs30/howto/howto_build_cube_with_restapi.cn.md
b/website/_docs30/howto/howto_build_cube_with_restapi.cn.md
index 9d51627..e216b97 100644
--- a/website/_docs30/howto/howto_build_cube_with_restapi.cn.md
+++ b/website/_docs30/howto/howto_build_cube_with_restapi.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 用 API 构建 Cube
categories: 帮助
-permalink: /cn/docs/howto/howto_build_cube_with_restapi.html
+permalink: /cn/docs30/howto/howto_build_cube_with_restapi.html
---
### 1. 认证
diff --git a/website/_docs30/howto/howto_build_cube_with_restapi.md
b/website/_docs30/howto/howto_build_cube_with_restapi.md
index bb06f8f..8996fd8 100644
--- a/website/_docs30/howto/howto_build_cube_with_restapi.md
+++ b/website/_docs30/howto/howto_build_cube_with_restapi.md
@@ -2,7 +2,7 @@
layout: docs
title: Build Cube with API
categories: howto
-permalink: /docs/howto/howto_build_cube_with_restapi.html
+permalink: /docs30/howto/howto_build_cube_with_restapi.html
---
### 1. Authentication
diff --git a/website/_docs30/howto/howto_cleanup_storage.cn.md
b/website/_docs30/howto/howto_cleanup_storage.cn.md
index 2dbd1d6..96661b4 100644
--- a/website/_docs30/howto/howto_cleanup_storage.cn.md
+++ b/website/_docs30/howto/howto_cleanup_storage.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 清理存储
categories: 帮助
-permalink: /cn/docs/howto/howto_cleanup_storage.html
+permalink: /cn/docs30/howto/howto_cleanup_storage.html
---
Kylin 在构建 cube 期间会在 HDFS 上生成中间文件；除此之外，当清理/删除/合并 cube 时，一些 HBase 表可能被遗留在 HBase
却以后再也不会被查询；虽然 Kylin 已经开始做自动化的垃圾回收，但不一定能覆盖到所有的情况；你可以定期做离线的存储清理：
diff --git a/website/_docs30/howto/howto_cleanup_storage.md
b/website/_docs30/howto/howto_cleanup_storage.md
index 043116a..01c9713 100644
--- a/website/_docs30/howto/howto_cleanup_storage.md
+++ b/website/_docs30/howto/howto_cleanup_storage.md
@@ -2,7 +2,7 @@
layout: docs
title: Cleanup Storage
categories: howto
-permalink: /docs/howto/howto_cleanup_storage.html
+permalink: /docs30/howto/howto_cleanup_storage.html
---
Kylin will generate intermediate files in HDFS during the cube building;
Besides, when purge/drop/merge cubes, some HBase tables may be left in HBase
and will no longer be queried; Although Kylin has started to do some
diff --git a/website/_docs30/howto/howto_enable_zookeeper_acl.md
b/website/_docs30/howto/howto_enable_zookeeper_acl.md
index 36a1047..a2b035d 100644
--- a/website/_docs30/howto/howto_enable_zookeeper_acl.md
+++ b/website/_docs30/howto/howto_enable_zookeeper_acl.md
@@ -2,7 +2,7 @@
layout: docs
title: Enable Zookeeper ACL
categories: howto
-permalink: /docs/howto/howto_enable_zookeeper_acl.html
+permalink: /docs30/howto/howto_enable_zookeeper_acl.html
---
Edit $KYLIN_HOME/conf/kylin.properties to add following configuration item:
diff --git a/website/_docs30/howto/howto_install_ranger_kylin_plugin.md
b/website/_docs30/howto/howto_install_ranger_kylin_plugin.md
index 2b3de39..538a385 100644
--- a/website/_docs30/howto/howto_install_ranger_kylin_plugin.md
+++ b/website/_docs30/howto/howto_install_ranger_kylin_plugin.md
@@ -2,7 +2,7 @@
layout: docs
title: Install Ranger Plugin
categories: howto
-permalink: /docs/howto/howto_install_ranger_kylin_plugin.html
+permalink: /docs30/howto/howto_install_ranger_kylin_plugin.html
---
Please refer to
[https://cwiki.apache.org/confluence/display/RANGER/Kylin+Plugin](https://cwiki.apache.org/confluence/display/RANGER/Kylin+Plugin).
diff --git a/website/_docs30/howto/howto_jdbc.cn.md
b/website/_docs30/howto/howto_jdbc.cn.md
index d36bc09..ebe5496 100644
--- a/website/_docs30/howto/howto_jdbc.cn.md
+++ b/website/_docs30/howto/howto_jdbc.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Kylin JDBC Driver
categories: 帮助
-permalink: /cn/docs/howto/howto_jdbc.html
+permalink: /cn/docs30/howto/howto_jdbc.html
---
### 认证
diff --git a/website/_docs30/howto/howto_jdbc.md
b/website/_docs30/howto/howto_jdbc.md
index ffd6279..7a84bc7 100644
--- a/website/_docs30/howto/howto_jdbc.md
+++ b/website/_docs30/howto/howto_jdbc.md
@@ -2,7 +2,7 @@
layout: docs
title: JDBC Driver
categories: howto
-permalink: /docs/howto/howto_jdbc.html
+permalink: /docs30/howto/howto_jdbc.html
---
### Authentication
diff --git a/website/_docs30/howto/howto_ldap_and_sso.md
b/website/_docs30/howto/howto_ldap_and_sso.md
index 8e0a3aa..facb65d 100644
--- a/website/_docs30/howto/howto_ldap_and_sso.md
+++ b/website/_docs30/howto/howto_ldap_and_sso.md
@@ -2,7 +2,7 @@
layout: docs
title: Secure with LDAP and SSO
categories: howto
-permalink: /docs/howto/howto_ldap_and_sso.html
+permalink: /docs30/howto/howto_ldap_and_sso.html
---
## Enable LDAP authentication
diff --git a/website/_docs30/howto/howto_optimize_build.cn.md
b/website/_docs30/howto/howto_optimize_build.cn.md
index 85448c6..3d5028b 100644
--- a/website/_docs30/howto/howto_optimize_build.cn.md
+++ b/website/_docs30/howto/howto_optimize_build.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 优化 Cube 构建
categories: 帮助
-permalink: /cn/docs/howto/howto_optimize_build.html
+permalink: /cn/docs30/howto/howto_optimize_build.html
---
Kylin将Cube构建任务分解为几个依次执行的步骤，这些步骤包括Hive操作、MapReduce操作和其他类型的操作。如果你有很多Cube构建任务需要每天运行，那么你肯定想要减少其中消耗的时间。下文按照Cube构建步骤顺序提供了一些优化经验。
diff --git a/website/_docs30/howto/howto_optimize_build.md
b/website/_docs30/howto/howto_optimize_build.md
index 0f68740..231fe34 100644
--- a/website/_docs30/howto/howto_optimize_build.md
+++ b/website/_docs30/howto/howto_optimize_build.md
@@ -2,7 +2,7 @@
layout: docs
title: Optimize Cube Build
categories: howto
-permalink: /docs/howto/howto_optimize_build.html
+permalink: /docs30/howto/howto_optimize_build.html
---
Kylin decomposes a Cube build task into several steps and then executes them
in sequence. These steps include Hive operations, MapReduce jobs, and other
types job. When you have many Cubes to build daily, then you definitely want to
speed up this process. Here are some practices that you probably want to know,
and they are organized in the same order as the steps sequence.
diff --git a/website/_docs30/howto/howto_optimize_cubes.cn.md
b/website/_docs30/howto/howto_optimize_cubes.cn.md
index 6cd201d..c40ad67 100644
--- a/website/_docs30/howto/howto_optimize_cubes.cn.md
+++ b/website/_docs30/howto/howto_optimize_cubes.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 优化 Cube 设计
categories: howto
-permalink: /cn/docs/howto/howto_optimize_cubes.html
+permalink: /cn/docs30/howto/howto_optimize_cubes.html
---
## Hierarchies:
diff --git a/website/_docs30/howto/howto_optimize_cubes.md
b/website/_docs30/howto/howto_optimize_cubes.md
index 4e4ae54..1cd2742 100644
--- a/website/_docs30/howto/howto_optimize_cubes.md
+++ b/website/_docs30/howto/howto_optimize_cubes.md
@@ -2,7 +2,7 @@
layout: docs
title: Optimize Cube Design
categories: howto
-permalink: /docs/howto/howto_optimize_cubes.html
+permalink: /docs30/howto/howto_optimize_cubes.html
---
## Hierarchies:
diff --git a/website/_docs30/howto/howto_update_coprocessor.md
b/website/_docs30/howto/howto_update_coprocessor.md
index bf989c0..7b880fd 100644
--- a/website/_docs30/howto/howto_update_coprocessor.md
+++ b/website/_docs30/howto/howto_update_coprocessor.md
@@ -2,7 +2,7 @@
layout: docs
title: Update Coprocessor
categories: howto
-permalink: /docs/howto/howto_update_coprocessor.html
+permalink: /docs30/howto/howto_update_coprocessor.html
---
Kylin leverages HBase coprocessor to optimize query performance. After new
versions released, the RPC protocol may get changed, so user need to redeploy
coprocessor to HTable.
diff --git a/website/_docs30/howto/howto_upgrade.md
b/website/_docs30/howto/howto_upgrade.md
index 1bac9c0..ba25b98 100644
--- a/website/_docs30/howto/howto_upgrade.md
+++ b/website/_docs30/howto/howto_upgrade.md
@@ -2,7 +2,7 @@
layout: docs
title: Upgrade From Old Versions
categories: howto
-permalink: /docs/howto/howto_upgrade.html
+permalink: /docs30/howto/howto_upgrade.html
since: v1.5.1
---
diff --git a/website/_docs30/howto/howto_use_beeline.md
b/website/_docs30/howto/howto_use_beeline.md
index 599d9e9..854e8ab 100644
--- a/website/_docs30/howto/howto_use_beeline.md
+++ b/website/_docs30/howto/howto_use_beeline.md
@@ -2,7 +2,7 @@
layout: docs
title: Use Beeline for Hive
categories: howto
-permalink: /docs/howto/howto_use_beeline.html
+permalink: /docs30/howto/howto_use_beeline.html
---
Beeline(https://cwiki.apache.org/confluence/display/Hive/HiveServer2+Clients)
is recommended by many venders to replace Hive CLI. By default Kylin uses Hive
CLI to synchronize Hive tables, create flatten intermediate tables, etc. By
simple configuration changes you can set Kylin to use Beeline instead.
diff --git a/website/_docs30/howto/howto_use_cli.cn.md
b/website/_docs30/howto/howto_use_cli.cn.md
index fd18a49..fa66e40 100644
--- a/website/_docs30/howto/howto_use_cli.cn.md
+++ b/website/_docs30/howto/howto_use_cli.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "实用 CLI 工具"
categories: howto
-permalink: /cn/docs/howto/howto_use_cli.html
+permalink: /cn/docs30/howto/howto_use_cli.html
---
Kylin
提供一些方便实用的工具类。这篇文档会介绍以下几个工具类：KylinConfigCLI.java，CubeMetaExtractor.java，CubeMetaIngester.java，CubeMigrationCLI.java
和 CubeMigrationCheckCLI.java。在使用这些工具类前，首先要切换到 KYLIN_HOME 目录下。
diff --git a/website/_docs30/howto/howto_use_cli.md
b/website/_docs30/howto/howto_use_cli.md
index 1024295..56310da 100644
--- a/website/_docs30/howto/howto_use_cli.md
+++ b/website/_docs30/howto/howto_use_cli.md
@@ -2,7 +2,7 @@
layout: docs
title: Use Utility CLIs
categories: howto
-permalink: /docs/howto/howto_use_cli.html
+permalink: /docs30/howto/howto_use_cli.html
---
Kylin has some client utility tools. This document will introduce the
following class: KylinConfigCLI.java, CubeMetaExtractor.java,
CubeMetaIngester.java, CubeMigrationCLI.java and CubeMigrationCheckCLI.java.
Before using these tools, you have to switch to the KYLIN_HOME directory.
diff --git a/website/_docs30/howto/howto_use_distributed_scheduler.md
b/website/_docs30/howto/howto_use_distributed_scheduler.md
index 1baac27..89af65e 100644
--- a/website/_docs30/howto/howto_use_distributed_scheduler.md
+++ b/website/_docs30/howto/howto_use_distributed_scheduler.md
@@ -2,7 +2,7 @@
layout: docs
title: Use distributed job scheduler
categories: howto
-permalink: /docs/howto/howto_use_distributed_scheduler.html
+permalink: /docs30/howto/howto_use_distributed_scheduler.html
---
Since Kylin 2.0, Kylin support distributed job scheduler.
diff --git a/website/_docs30/howto/howto_use_restapi.cn.md
b/website/_docs30/howto/howto_use_restapi.cn.md
index 8312888..52f6587 100644
--- a/website/_docs30/howto/howto_use_restapi.cn.md
+++ b/website/_docs30/howto/howto_use_restapi.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: RESTful API
categories: howto
-permalink: /cn/docs/howto/howto_use_restapi.html
+permalink: /cn/docs30/howto/howto_use_restapi.html
since: v0.7.1
---
diff --git a/website/_docs30/howto/howto_use_restapi.md
b/website/_docs30/howto/howto_use_restapi.md
index 1479c93..f924ca0 100644
--- a/website/_docs30/howto/howto_use_restapi.md
+++ b/website/_docs30/howto/howto_use_restapi.md
@@ -2,7 +2,7 @@
layout: docs
title: Use RESTful API
categories: howto
-permalink: /docs/howto/howto_use_restapi.html
+permalink: /docs30/howto/howto_use_restapi.html
since: v0.7.1
---
diff --git a/website/_docs30/howto/howto_use_restapi_in_js.md
b/website/_docs30/howto/howto_use_restapi_in_js.md
index 137a919..d38670f 100644
--- a/website/_docs30/howto/howto_use_restapi_in_js.md
+++ b/website/_docs30/howto/howto_use_restapi_in_js.md
@@ -2,7 +2,7 @@
layout: docs
title: Use RESTful API in Javascript
categories: howto
-permalink: /docs/howto/howto_use_restapi_in_js.html
+permalink: /docs30/howto/howto_use_restapi_in_js.html
---
Kylin security is based on basic access authorization, if you want to use API
in your javascript, you need to add authorization info in http headers.
diff --git a/website/_docs30/index.cn.md b/website/_docs30/index.cn.md
index 02dcefb..4a1e1ea 100644
--- a/website/_docs30/index.cn.md
+++ b/website/_docs30/index.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 概述
categories: docs
-permalink: /cn/docs/index.html
+permalink: /cn/docs30/index.html
---
欢迎来到 Apache Kylin™
diff --git a/website/_docs30/index.md b/website/_docs30/index.md
index bb6cd8e..2e65a32 100644
--- a/website/_docs30/index.md
+++ b/website/_docs30/index.md
@@ -2,7 +2,7 @@
layout: docs
title: Overview
categories: docs
-permalink: /docs/index.html
+permalink: /docs30/index.html
---
diff --git a/website/_docs30/install/advance_settings.cn.md
b/website/_docs30/install/advance_settings.cn.md
index 7c11c57..0adc4f0 100644
--- a/website/_docs30/install/advance_settings.cn.md
+++ b/website/_docs30/install/advance_settings.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "高级设置"
categories: install
-permalink: /cn/docs/install/advance_settings.html
+permalink: /cn/docs30/install/advance_settings.html
---
## 在 Cube 级别重写默认的 kylin.properties
diff --git a/website/_docs30/install/advance_settings.md
b/website/_docs30/install/advance_settings.md
index 08b49ac..f86328d 100644
--- a/website/_docs30/install/advance_settings.md
+++ b/website/_docs30/install/advance_settings.md
@@ -2,7 +2,7 @@
layout: docs
title: "Advanced Settings"
categories: install
-permalink: /docs/install/advance_settings.html
+permalink: /docs30/install/advance_settings.html
---
## Overwrite default kylin.properties at Cube level
diff --git a/website/_docs30/install/configuration.cn.md
b/website/_docs30/install/configuration.cn.md
index 37a1295..499d685 100644
--- a/website/_docs30/install/configuration.cn.md
+++ b/website/_docs30/install/configuration.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "Kylin 配置"
categories: install
-permalink: /cn/docs/install/configuration.html
+permalink: /cn/docs30/install/configuration.html
---
@@ -37,12 +37,16 @@ permalink: /cn/docs/install/configuration.html
- [字典相关](#dict-config)
- [超高基维度的处理](#uhc-config)
- [Spark 构建引擎](#spark-cubing)
+ - [通过 Livy 提交 Spark 任务](#livy-submit-spark-job)
- [Spark 资源动态分配](#dynamic-allocation)
- [任务相关](#job-config)
- [启用邮件通知](#email-notification)
- [启用 Cube Planner](#cube-planner)
- [HBase 存储](#hbase-config)
- [启用压缩](#compress-config)
+ - [实时 OLAP](#realtime-olap)
+- [清理存储配置](#storage-clean-up-configuration)
+ - [存储清理相关](#storage-clean-up-config)
- [查询配置](#kylin-query)
- [查询相关](#query-config)
- [模糊查询](#fuzzy)
@@ -350,6 +354,7 @@ Kylin 和 HBase 都在写入磁盘时使用压缩，因此，Kylin 将在其原
- `kylin.engine.mr.max-cuboid-stats-calculator-number`：用于计算 Cube
统计数据的线程数量，默认值为 1
- `kylin.engine.mr.build-dict-in-reducer`：是否在构建任务 **Extract Fact Table
Distinct Columns** 的 Reduce 阶段构建字典，默认值为 TRUE
- `kylin.engine.mr.yarn-check-interval-seconds`：构建引擎间隔多久检查 Hadoop 任务的状态，默认值为
10（s）
+- `kylin.engine.mr.use-local-classpath`: 是否使用本地 mapreduce 应用的 classpath。默认值为
TRUE
@@ -363,7 +368,7 @@ Kylin 和 HBase 都在写入磁盘时使用压缩，因此，Kylin 将在其原
- `kylin.dictionary.append-max-versions`：默认值为 3
- `kylin.dictionary.append-version-ttl`：默认值为 259200000
- `kylin.dictionary.resuable`：是否重用字典，默认值为 FALSE
-- `kylin.dictionary.shrunken-from-global-enabled`：是否缩小全局字典，默认值为 FALSE
+- `kylin.dictionary.shrunken-from-global-enabled`：是否缩小全局字典，默认值为 TRUE
@@ -401,6 +406,17 @@ Cube 构建默认在 **Extract Fact Table Distinct Column** 这一步为每一
+### 通过 Livy 提交 Spark 任务 {#livy-submit-spark-job}
+
+- `kylin.engine.livy-conf.livy-enabled`：是否开启 Livy 进行 Spark 任务的提交。默认值为 *FALSE*
+- `kylin.engine.livy-conf.livy-url`：指定了 Livy 的 URL。例如 *http://127.0.0.1:8998*
+- `kylin.engine.livy-conf.livy-key.*`：指定了 Livy 的 name-key 配置。例如
*kylin.engine.livy-conf.livy-key.name=kylin-livy-1*
+- `kylin.engine.livy-conf.livy-arr.*`：指定了 Livy 数组类型的配置。以逗号分隔。例如
*kylin.engine.livy-conf.livy-arr.jars=hdfs://your_self_path/hbase-common-1.4.8.jar,hdfs://your_self_path/hbase-server-1.4.8.jar,hdfs://your_self_path/hbase-client-1.4.8.jar*
+- `kylin.engine.livy-conf.livy-map.*`：指定了 Spark 配置。例如
*kylin.engine.livy-conf.livy-map.spark.executor.instances=10*
+
+> 提示：更多信息请参考 [Apache Livy Rest
API](http://livy.incubator.apache.org/docs/latest/rest-api.html)。
+
+
### Spark 资源动态分配 {#dynamic-allocation}
- `kylin.engine.spark-conf.spark.shuffle.service.enabled`：是否开启 shuffle service
@@ -420,6 +436,7 @@ Cube 构建默认在 **Extract Fact Table Distinct Column** 这一步为每一
- `kylin.job.allow-empty-segment`：是否容忍数据源为空，默认值为 TRUE
- `kylin.job.max-concurrent-jobs`：最大构建并发数，默认值为 10
- `kylin.job.retry`：构建任务失败后的重试次数，默认值为 0
+- `kylin.job.retry-interval`: 每次重试的间隔毫秒数。默认值为 30000
- `kylin.job.scheduler.priority-considered`：是否考虑任务优先级，默认值为 FALSE
- `kylin.job.scheduler.priority-bar-fetch-from-queue`：指定从优先级队列中获取任务的时间间隔，默认值为
20(s)
- `kylin.job.scheduler.poll-interval-second`：从队列中获取任务的时间间隔，默认值为 30(s)
@@ -540,6 +557,51 @@ Kylin 可以使用三种类型的压缩，分别是 HBase 表压缩，Hive 输
+### 实时 OLAP {#realtime-olap}
+- `kylin.stream.job.dfs.block.size`：指定了流式构建 Base Cuboid 任务所需 HDFS 块的大小。默认值为
*16M*。
+- `kylin.stream.index.path`：指定了本地 segment 缓存的位置。默认值为 *stream_index*。
+- `kylin.stream.cube-num-of-consumer-tasks`：指定了共享同一个 topic 分区的 replica set
数量，影响着不同 replica set 分配的分区数量。默认值为 *3*。
+- `kylin.stream.cube.window`：指定了每个 segment 的持续时长，以秒为单位。默认值为 *3600*。
+- `kylin.stream.cube.duration`：指定了 segment 从 active 状态变为 IMMUTABLE
状态的等待时间，以秒为单位。默认值为 *7200*。
+- `kylin.stream.cube.duration.max`：segment 的 active 状态的最长持续时间，以秒为单位。默认值为
*43200*。
+- `kylin.stream.checkpoint.file.max.num`：指定了每个 Cube 包含的 checkpoint
文件数的最大值。默认值为 *5*。
+- `kylin.stream.index.checkpoint.intervals`：指定了两个 checkpoint 设置的时间间隔。默认值为
*300*。
+- `kylin.stream.index.maxrows`：指定了缓存在堆/内存中的事件数的最大值。默认值为 *50000*。
+- `kylin.stream.immutable.segments.max.num`：指定了当前 receiver 里每个 Cube 中状态为
IMMUTABLE 的 segment 的最大数值，如果超过最大值，当前 topic 的消费将会被暂停。默认值为 *100*。
+- `kylin.stream.consume.offsets.latest`：是否从最近的偏移量开始消费。默认值为 *true*。
+- `kylin.stream.node`：指定了 coordinator/receiver 的节点。形如 host:port。默认值为 *null*。
+- `kylin.stream.metadata.store.type`：指定了元数据存储的位置。默认值为 *zk*。
+- `kylin.stream.segment.retention.policy`：指定了当 segment 变为 IMMUTABLE 状态时，本地
segment 缓存的处理策略。参数值可选 `purge` 和 `fullBuild`。`purge` 意味着当 segment 的状态变为
IMMUTABLE，本地缓存的 segment 数据将被删除。`fullBuild` 意味着当 segment 的状态变为 IMMUTABLE，本地缓存的
segment 数据将被上传到 HDFS。默认值为 *fullBuild*。
+- `kylin.stream.assigner`：指定了用于将 topic 分区分配给不同 replica set 的实现类。该类实现了
`org.apache.kylin.stream.coordinator.assign.Assigner` 类。默认值为 *DefaultAssigner*。
+- `kylin.stream.coordinator.client.timeout.millsecond`：指定了连接 coordinator
客户端的超时时间。默认值为 *5000*。
+- `kylin.stream.receiver.client.timeout.millsecond`：指定了连接 receiver
客户端的超时时间。默认值为 *5000*。
+- `kylin.stream.receiver.http.max.threads`：指定了连接 receiver 的最大线程数。默认值为 *200*。
+- `kylin.stream.receiver.http.min.threads`：指定了连接 receiver 的最小线程数。默认值为 *10*。
+- `kylin.stream.receiver.query-core-threads`：指定了当前 receiver 用于查询的线程数。默认值为 *50*。
+- `kylin.stream.receiver.query-max-threads`：指定了当前 receiver 用于查询的最大线程数。默认值为
*200*。
+- `kylin.stream.receiver.use-threads-per-query`：指定了每个查询使用的线程数。默认值为 *8*。
+- `kylin.stream.build.additional.cuboids`：是否构建除 Base Cuboid 外的 cuboids。除 Base
Cuboid 外的 cuboids 指的是在 Cube 的 Advanced Setting 页面选择的强制维度的聚合。默认值为 *false*。默认只构建
Base Cuboid。
+- `kylin.stream.segment-max-fragments`：指定了每个 segment 保存的最大 fragment 数。默认值为
*50*。
+- `kylin.stream.segment-min-fragments`：指定了每个 segment 保存的最小 fragment 数。默认值为
*15*。
+- `kylin.stream.max-fragment-size-mb`：指定了每个 fragment 文件的最大尺寸。默认值为 *300*。
+- `kylin.stream.fragments-auto-merge-enable`：是否开启 fragment 文件自动合并的功能。默认值为
*true*。
+
+> 提示：更多信息请参考 [Real-time
OLAP](http://kylin.apache.org/docs30/tutorial/real_time_olap.html)。
+
+
+
+### 存储清理配置 {#storage-clean-up-configuration}
+
+本小节介绍 Kylin 存储清理有关的配置。
+
+
+
+### 存储清理相关 {#storage-clean-up-config}
+
+- `kylin.storage.clean-after-delete-operation`: 是否清理 HBase 和 HDFS 中的 segment
数据。默认值为 FALSE。
+
+
+
### 查询配置 {#kylin-query}
本小节介绍 Kylin 查询有关的配置。
@@ -623,6 +685,7 @@ Kylin 可以使用三种类型的压缩，分别是 HBase 表压缩，Hive 输
- `kylin.query.force-limit`：该参数通过为 select * 语句强制添加 LIMIT
分句，达到缩短数据返回时间的目的，该参数默认值为 -1，将该参数值设置为正整数，如 1000，该值会被应用到 LIMIT 分句，查询语句最终会被转化成
select * from fact_table limit 1000
- `kylin.storage.limit-push-down-enabled`: 默认值为 *TRUE*，设置为 *FALSE* 意味着关闭存储层的
limit-pushdown
+- `kylin.query.flat-filter-max-children`：指定打平 filter 时 filter 的最大值。默认值为 500000
diff --git a/website/_docs30/install/configuration.md
b/website/_docs30/install/configuration.md
index 152da8b..e03f531 100644
--- a/website/_docs30/install/configuration.md
+++ b/website/_docs30/install/configuration.md
@@ -2,7 +2,7 @@
layout: docs
title: "Kylin Configuration"
categories: install
-permalink: /docs/install/configuration.html
+permalink: /docs30/install/configuration.html
---
@@ -36,12 +36,16 @@ permalink: /docs/install/configuration.html
- [Dictionary-related](#dict-config)
- [Deal with Ultra-High-Cardinality Columns](#uhc-config)
- [Spark as Build Engine](#spark-cubing)
+ - [Submit Spark jobs via Livy](#livy-submit-spark-job)
- [Spark Dynamic Allocation](#dynamic-allocation)
- [Job-related](#job-config)
- [Enable Email Notification](#email-notification)
- [Enable Cube Planner](#cube-planner)
- [HBase Storage](#hbase-config)
- [Enable Compression](#compress-config)
+ - [Real-time OLAP](#realtime-olap)
+- [Storage Clean up Configuration](#storage-clean-up-configuration)
+ - [Storage-clean-up-related](#storage-clean-up-config)
- [Query Configuration](#kylin-query)
- [Query-related](#query-config)
- [Fuzzy Query](#fuzzy)
@@ -350,6 +354,7 @@ Both Kylin and HBase use compression when writing to disk,
so Kylin will multipl
- `kylin.engine.mr.max-cuboid-stats-calculator-number`: specifies the number
of threads used to calculate Cube statistics. The default value is 1
- `kylin.engine.mr.build-dict-in-reducer`: whether to build the dictionary in
the Reduce phase of the build job *Extract Fact Table Distinct Columns*. The
default value is `TRUE`
- `kylin.engine.mr.yarn-check-interval-seconds`: How often the build engine is
checked for the status of the Hadoop job. The default value is 10(s)
+- `kylin.engine.mr.use-local-classpath`: whether to use local mapreduce
application classpath. The default value is TRUE
@@ -363,7 +368,7 @@ Both Kylin and HBase use compression when writing to disk,
so Kylin will multipl
- `kylin.dictionary.append-max-versions`: The default value is 3
- `kylin.dictionary.append-version-ttl`: The default value is 259200000
- `kylin.dictionary.resuable`: whether to reuse the dictionary. The default
value is FALSE
-- `kylin.dictionary.shrunken-from-global-enabled`: whether to reduce the size
of global dictionary. The default value is *FALSE*
+- `kylin.dictionary.shrunken-from-global-enabled`: whether to reduce the size
of global dictionary. The default value is *TRUE*
@@ -400,6 +405,17 @@ Both Kylin and HBase use compression when writing to disk,
so Kylin will multipl
+### Submit Spark jobs via Livy {#livy-submit-spark-job}
+
+- `kylin.engine.livy-conf.livy-enabled`: whether to enable Livy as submit
Spark job service. The default value is *FALSE*
+- `kylin.engine.livy-conf.livy-url`: specifies the URL of Livy. Such as
*http://127.0.0.1:8998*
+- `kylin.engine.livy-conf.livy-key.*`: specifies the name-key configuration of
Livy. Such as *kylin.engine.livy-conf.livy-key.name=kylin-livy-1*
+- `kylin.engine.livy-conf.livy-arr.*`: specifies the array type configuration
of Livy. Separated by commas. Such as
*kylin.engine.livy-conf.livy-arr.jars=hdfs://your_self_path/hbase-common-1.4.8.jar,hdfs://your_self_path/hbase-server-1.4.8.jar,hdfs://your_self_path/hbase-client-1.4.8.jar*
+- `kylin.engine.livy-conf.livy-map.*`: specifies the Spark configuration
properties. Such as
*kylin.engine.livy-conf.livy-map.spark.executor.instances=10*
+
+> Note: For more information, please refer to [Apache Livy Rest
API](http://livy.incubator.apache.org/docs/latest/rest-api.html).
+
+
### Spark Dynamic Allocation {#dynamic-allocation}
- `kylin.engine.spark-conf.spark.shuffle.service.enabled`: whether to enable
shuffle service
@@ -419,6 +435,7 @@ Both Kylin and HBase use compression when writing to disk,
so Kylin will multipl
- `kylin.job.allow-empty-segment`: whether tolerant data source is empty. The
default value is *TRUE*
- `kylin.job.max-concurrent-jobs`: specifies maximum build concurrency,
default is 10
- `kylin.job.retry`: specifies retry times after the job is failed. The
default value is 0
+- `kylin.job.retry-interval`: specifies retry interval in milliseconds. The
default value is 30000
- `kylin.job.scheduler.priority-considered`: whether to consider the job
priority. The default value is FALSE
- `kylin.job.scheduler.priority-bar-fetch-from-queue`: specifies the time
interval for getting jobs from the priority queue. The default value is 20(s)
- `kylin.job.scheduler.poll-interval-second`: The time interval for getting
the job from the queue. The default value is 30(s)
@@ -538,6 +555,49 @@ This compression is configured via `kylin_job_conf.xml`
and `kylin_job_conf_inme
+### Real-time OLAP {#realtime-olap}
+- `kylin.stream.job.dfs.block.size`: specifies the HDFS block size of the
streaming Base Cuboid job using. The default value is *16M*.
+- `kylin.stream.index.path`: specifies the path to store local segment cache.
The default value is *stream_index*.
+- `kylin.stream.cube-num-of-consumer-tasks`: specifies the number of replica
sets that share the whole topic partition. It affects how many partitions will
be assigned to different replica sets. The default value is *3*.
+- `kylin.stream.cube.window`: specifies the length of duration of each
segment, value in seconds. The default value is *3600*.
+- `kylin.stream.cube.duration`: specifies the wait time that a segment's
status changes from active to IMMUTABLE, value in seconds. The default value is
*7200*.
+- `kylin.stream.cube.duration.max`: specifies the maximum duration that
segment can keep active, value in seconds. The default value is *43200*.
+- `kylin.stream.checkpoint.file.max.num`: specifies the maximum number of
checkpoint file for each cube. The default value is *5*.
+- `kylin.stream.index.checkpoint.intervals`: specifies the time interval
between setting two checkpoints. The default value is *300*.
+- `kylin.stream.index.maxrows`: specifies the maximum number of the entered
event be cached in heap/memory. The default value is *50000*.
+- `kylin.stream.immutable.segments.max.num`: specifies the maximum number of
the IMMUTABLE segment in each Cube of the current streaming receiver, if
exceed, consumption of current topic will be paused. The default value is *100*.
+- `kylin.stream.consume.offsets.latest`: whether to consume from the latest
offset. The default value is *true*.
+- `kylin.stream.node`: specifies the node of coordinator/receiver. Such as
host:port. The default value is *null*.
+- `kylin.stream.metadata.store.type`: specifies the position of metadata
store. The default value is *zk*.
+- `kylin.stream.segment.retention.policy`: specifies the strategy to process
local segment cache when segment become IMMUTABLE. Optional values include
`purge` and `fullBuild`. `purge` means when the segment become IMMUTABLE, it
will be dropped. `fullBuild` means when the segment become IMMUTABLE, it will
be uploaded to HDFS. The default value is *fullBuild*.
+- `kylin.stream.assigner`: specifies the implementation class which used to
assign the topic partition to different replica sets. The class should be the
implementation class of `org.apache.kylin.stream.coordinator.assign.Assigner`.
The default value is *DefaultAssigner*.
+- `kylin.stream.coordinator.client.timeout.millsecond`: specifies the
connection timeout of the coordinator client. The default value is *5000*.
+- `kylin.stream.receiver.client.timeout.millsecond`: specifies the connection
timeout of the receiver client. The default value is *5000*.
+- `kylin.stream.receiver.http.max.threads`: specifies the maximum connection
threads of the receiver. The default value is *200*.
+- `kylin.stream.receiver.http.min.threads`: specifies the minimum connection
threads of the receiver. The default value is *10*.
+- `kylin.stream.receiver.query-core-threads`: specifies the number of query
threads be used for the current streaming receiver. The default value is *50*.
+- `kylin.stream.receiver.query-max-threads`: specifies the maximum number of
query threads be used for the current streaming receiver. The default value is
*200*.
+- `kylin.stream.receiver.use-threads-per-query`: specifies the threads number
that each query use. The default value is *8*.
+- `kylin.stream.build.additional.cuboids`: whether to build additional
Cuboids. The additional Cuboids mean the aggregation of Mandatory Dimensions
that chosen in Cube Advanced Setting page. The default value is *false*. Only
build Base Cuboid by default.
+- `kylin.stream.segment-max-fragments`: specifies the maximum number of
fragments that each segment keep. The default value is *50*.
+- `kylin.stream.segment-min-fragments`: specifies the minimum number of
fragments that each segment keep. The default value is *15*.
+- `kylin.stream.max-fragment-size-mb`: specifies the maximum size of each
fragment. The default value is *300*.
+- `kylin.stream.fragments-auto-merge-enable`: whether to enable fragments auto
merge. The default value is *true*.
+
+> Note: For more information, please refer to the [Real-time
OLAP](http://kylin.apache.org/docs30/tutorial/real_time_olap.html).
+
+### Storage Clean up Configuration {#storage-clean-up-configuration}
+
+This section introduces Kylin storage clean up related configuration.
+
+
+
+### Storage-clean-up-related {#storage-clean-up-config}
+
+- `kylin.storage.clean-after-delete-operation`: whether to clean segment data
in HBase and HDFS. The default value is FALSE.
+
+
+
### Query Configuration {#kylin-query}
This section introduces Kylin query related configuration.
@@ -619,6 +679,7 @@ The value of `kylin.query.timeout-seconds` is greater than
60 or equals 0, the m
- `kylin.query.force-limit`: this parameter achieves the purpose of shortening
the query duration by forcing a LIMIT clause for the select * statement. The
default value is *-1*, and the parameter value is set to a positive integer,
such as 1000, the value will be applied to the LIMIT clause, and the query will
eventually be converted to select * from fact_table limit 1000
- `kylin.storage.limit-push-down-enabled`: the default value is *TRUE*, set to
*FALSE* to close the limit-pushdown of storage layer
+- `kylin.query.flat-filter-max-children`: specifies the maximum number of
filters when flatting filter. The default value is 500000
diff --git a/website/_docs30/install/index.cn.md
b/website/_docs30/install/index.cn.md
index c3fc261..6db36bb 100644
--- a/website/_docs30/install/index.cn.md
+++ b/website/_docs30/install/index.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "安装指南"
categories: install
-permalink: /cn/docs/install/index.html
+permalink: /cn/docs30/install/index.html
---
### 软件要求
diff --git a/website/_docs30/install/index.md b/website/_docs30/install/index.md
index e2c8fb9..5b81fb5 100644
--- a/website/_docs30/install/index.md
+++ b/website/_docs30/install/index.md
@@ -2,7 +2,7 @@
layout: docs
title: "Installation Guide"
categories: install
-permalink: /docs/install/index.html
+permalink: /docs30/install/index.html
---
### Software Requirements
diff --git a/website/_docs30/install/kylin_aws_emr.cn.md
b/website/_docs30/install/kylin_aws_emr.cn.md
index f95d744..1839f98 100644
--- a/website/_docs30/install/kylin_aws_emr.cn.md
+++ b/website/_docs30/install/kylin_aws_emr.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "在 AWS EMR 上安装 Kylin"
categories: install
-permalink: /cn/docs/install/kylin_aws_emr.html
+permalink: /cn/docs30/install/kylin_aws_emr.html
---
本文档介绍了在 EMR 上如何运行 Kylin。
diff --git a/website/_docs30/install/kylin_aws_emr.md
b/website/_docs30/install/kylin_aws_emr.md
index 7d59969..eff20da 100644
--- a/website/_docs30/install/kylin_aws_emr.md
+++ b/website/_docs30/install/kylin_aws_emr.md
@@ -2,7 +2,7 @@
layout: docs
title: "Install Kylin on AWS EMR"
categories: install
-permalink: /docs/install/kylin_aws_emr.html
+permalink: /docs30/install/kylin_aws_emr.html
---
This document introduces how to run Kylin on EMR.
diff --git a/website/_docs30/install/kylin_cluster.cn.md
b/website/_docs30/install/kylin_cluster.cn.md
index 6213aeb..62219c0 100644
--- a/website/_docs30/install/kylin_cluster.cn.md
+++ b/website/_docs30/install/kylin_cluster.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "集群模式部署"
categories: install
-permalink: /cn/docs/install/kylin_cluster.html
+permalink: /cn/docs30/install/kylin_cluster.html
---
Kylin 实例是无状态的服务，运行时的状态信息存储在 HBase metastore 中。 出于负载均衡的考虑，您可以启用多个共享一个 metastore
的 Kylin 实例，使得各个节点分担查询压力且互为备份，从而提高服务的可用性。下图描绘了 Kylin 集群模式部署的一个典型场景：
diff --git a/website/_docs30/install/kylin_cluster.md
b/website/_docs30/install/kylin_cluster.md
index 9bd029c..1363c18 100644
--- a/website/_docs30/install/kylin_cluster.md
+++ b/website/_docs30/install/kylin_cluster.md
@@ -2,7 +2,7 @@
layout: docs
title: "Deploy in Cluster Mode"
categories: install
-permalink: /docs/install/kylin_cluster.html
+permalink: /docs30/install/kylin_cluster.html
---
diff --git a/website/_docs30/install/kylin_docker.cn.md
b/website/_docs30/install/kylin_docker.cn.md
index e1b9e4d..5939bd6 100644
--- a/website/_docs30/install/kylin_docker.cn.md
+++ b/website/_docs30/install/kylin_docker.cn.md
@@ -2,7 +2,7 @@
layout: docs
title: "用 Docker 运行 Kylin"
categories: install
-permalink: /cn/docs/install/kylin_docker.html
+permalink: /cn/docs30/install/kylin_docker.html
version: v1.5.3
since: v1.5.2
---
diff --git a/website/_docs30/install/kylin_docker.md
b/website/_docs30/install/kylin_docker.md
index 7aa9ba6..6a3c7c6 100644
--- a/website/_docs30/install/kylin_docker.md
+++ b/website/_docs30/install/kylin_docker.md
@@ -2,7 +2,7 @@
layout: docs
title: "Run Kylin with Docker"
categories: install
-permalink: /docs/install/kylin_docker.html
+permalink: /docs30/install/kylin_docker.html
version: v1.5.3
since: v1.5.2
---
diff --git a/website/_docs30/release_notes.md b/website/_docs30/release_notes.md
index 5dc774c..441cf15 100644
--- a/website/_docs30/release_notes.md
+++ b/website/_docs30/release_notes.md
@@ -2,7 +2,7 @@
layout: docs
title: Release Notes
categories: gettingstarted
-permalink: /docs/release_notes.html
+permalink: /docs30/release_notes.html
---
To download latest release, please visit:
[http://kylin.apache.org/download/](http://kylin.apache.org/download/),
diff --git a/website/_docs30/tutorial/Qlik.cn.md
b/website/_docs30/tutorial/Qlik.cn.md
index 80be87b..c6fef70 100644
--- a/website/_docs30/tutorial/Qlik.cn.md
+++ b/website/_docs30/tutorial/Qlik.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Qlik Sense 集成
categories: tutorial
-permalink: /cn/docs/tutorial/Qlik.html
+permalink: /cn/docs30/tutorial/Qlik.html
since: v2.2
---
diff --git a/website/_docs30/tutorial/Qlik.md b/website/_docs30/tutorial/Qlik.md
index b01d49c..3163ef2 100644
--- a/website/_docs30/tutorial/Qlik.md
+++ b/website/_docs30/tutorial/Qlik.md
@@ -2,7 +2,7 @@
layout: docs
title: Qlik Sense
categories: tutorial
-permalink: /docs/tutorial/Qlik.html
+permalink: /docs30/tutorial/Qlik.html
---
Qlik Sense delivers intuitive platform solutions for self-service data
visualization, guided analytics applications, embedded analytics, and
reporting. It is a new player in the Business Intelligence (BI) tools world,
with a high growth since 2013. It has connectors with Hadoop Database (Hive and
Impala). Now it can be integrated with Apache Kylin. This article will guide
you to connect Apache Kylin with Qlik Sense.
diff --git a/website/_docs30/tutorial/acl.cn.md
b/website/_docs30/tutorial/acl.cn.md
index 4633ba0..3730d6e 100644
--- a/website/_docs30/tutorial/acl.cn.md
+++ b/website/_docs30/tutorial/acl.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Cube 权限授予(v2.1)
categories: 教程
-permalink: /cn/docs/tutorial/acl.html
+permalink: /cn/docs30/tutorial/acl.html
version: v1.2
since: v0.7.1
---
diff --git a/website/_docs30/tutorial/acl.md b/website/_docs30/tutorial/acl.md
index 248b950..c1792e2 100644
--- a/website/_docs30/tutorial/acl.md
+++ b/website/_docs30/tutorial/acl.md
@@ -2,7 +2,7 @@
layout: docs
title: Cube Permission (v2.1)
categories: tutorial
-permalink: /docs/tutorial/acl.html
+permalink: /docs30/tutorial/acl.html
since: v0.7.1
---
diff --git a/website/_docs30/tutorial/create_cube.cn.md
b/website/_docs30/tutorial/create_cube.cn.md
index 43a62d3..e0d3e8a 100644
--- a/website/_docs30/tutorial/create_cube.cn.md
+++ b/website/_docs30/tutorial/create_cube.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Cube 创建
categories: 教程
-permalink: /cn/docs/tutorial/create_cube.html
+permalink: /cn/docs30/tutorial/create_cube.html
version: v1.2
since: v0.7.1
---
diff --git a/website/_docs30/tutorial/create_cube.md
b/website/_docs30/tutorial/create_cube.md
index 5ec7365..f78c1b9 100644
--- a/website/_docs30/tutorial/create_cube.md
+++ b/website/_docs30/tutorial/create_cube.md
@@ -2,7 +2,7 @@
layout: docs
title: Cube Wizard
categories: tutorial
-permalink: /docs/tutorial/create_cube.html
+permalink: /docs30/tutorial/create_cube.html
---
This tutorial will guide you to create a cube. It need you have at least 1
sample table in Hive. If you don't have, you can follow this to create some
data.
diff --git a/website/_docs30/tutorial/cube_build_job.cn.md
b/website/_docs30/tutorial/cube_build_job.cn.md
index c1b1be1..54ac43c 100644
--- a/website/_docs30/tutorial/cube_build_job.cn.md
+++ b/website/_docs30/tutorial/cube_build_job.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "Cube 构建和 Job 监控"
categories: 教程
-permalink: /cn/docs/tutorial/cube_build_job.html
+permalink: /cn/docs30/tutorial/cube_build_job.html
version: v1.2
since: v0.7.1
---
diff --git a/website/_docs30/tutorial/cube_build_job.md
b/website/_docs30/tutorial/cube_build_job.md
index d15251d..791a2a3 100644
--- a/website/_docs30/tutorial/cube_build_job.md
+++ b/website/_docs30/tutorial/cube_build_job.md
@@ -2,7 +2,7 @@
layout: docs
title: Cube Build and Job Monitoring
categories: tutorial
-permalink: /docs/tutorial/cube_build_job.html
+permalink: /docs30/tutorial/cube_build_job.html
---
### Cube Build
diff --git a/website/_docs30/tutorial/cube_build_performance.cn.md
b/website/_docs30/tutorial/cube_build_performance.cn.md
index b9e770c..e5a13d2 100644
--- a/website/_docs30/tutorial/cube_build_performance.cn.md
+++ b/website/_docs30/tutorial/cube_build_performance.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "优化 Cube 构建"
categories: tutorial
-permalink: /cn/docs/tutorial/cube_build_performance.html
+permalink: /cn/docs30/tutorial/cube_build_performance.html
---
*本教程是关于如何一步步优化 cube build 的样例。*
diff --git a/website/_docs30/tutorial/cube_build_performance.md
b/website/_docs30/tutorial/cube_build_performance.md
index fbe8b51..7cbfdb2 100755
--- a/website/_docs30/tutorial/cube_build_performance.md
+++ b/website/_docs30/tutorial/cube_build_performance.md
@@ -2,7 +2,7 @@
layout: docs
title: Cube Build Tuning
categories: tutorial
-permalink: /docs/tutorial/cube_build_performance.html
+permalink: /docs30/tutorial/cube_build_performance.html
---
*This tutorial is an example step by step about how to optimize build of
cube.*
diff --git a/website/_docs30/tutorial/cube_spark.cn.md
b/website/_docs30/tutorial/cube_spark.cn.md
index 0bc7dee..2a95367 100644
--- a/website/_docs30/tutorial/cube_spark.cn.md
+++ b/website/_docs30/tutorial/cube_spark.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "用 Spark 构建 Cube"
categories: tutorial
-permalink: /cn/docs/tutorial/cube_spark.html
+permalink: /cn/docs30/tutorial/cube_spark.html
---
Kylin v2.0 介绍了 Spark cube engine，在 build cube 步骤中使用 Apache Spark 代替
MapReduce；您可以通过查看 [这篇博客](/blog/2017/02/23/by-layer-spark-cubing/)
的图片了解整体情况。当前的文档使用样例 cube 对如何尝试 new engine 进行了演示。
diff --git a/website/_docs30/tutorial/cube_spark.md
b/website/_docs30/tutorial/cube_spark.md
index 2ac27d7..44ea19c 100644
--- a/website/_docs30/tutorial/cube_spark.md
+++ b/website/_docs30/tutorial/cube_spark.md
@@ -2,7 +2,7 @@
layout: docs
title: Build Cube with Spark
categories: tutorial
-permalink: /docs/tutorial/cube_spark.html
+permalink: /docs30/tutorial/cube_spark.html
---
Kylin v2.0 introduces the Spark cube engine, it uses Apache Spark to replace
MapReduce in the build cube step; You can check [this
blog](/blog/2017/02/23/by-layer-spark-cubing/) for an overall picture. The
current document uses the sample cube to demo how to try the new engine.
diff --git a/website/_docs30/tutorial/cube_streaming.cn.md
b/website/_docs30/tutorial/cube_streaming.cn.md
index cdd6c1c..e76b310 100644
--- a/website/_docs30/tutorial/cube_streaming.cn.md
+++ b/website/_docs30/tutorial/cube_streaming.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "从 Kafka 流构建 Cube"
categories: tutorial
-permalink: /cn/docs/tutorial/cube_streaming.html
+permalink: /cn/docs30/tutorial/cube_streaming.html
---
Kylin v1.6 发布了可扩展的 streaming cubing 功能，它利用 Hadoop 消费 Kafka 数据的方式构建 cube，您可以查看
[这篇博客](/blog/2016/10/18/new-nrt-streaming/) 以进行高级别的设计。本文档是一步接一步的阐述如何创建和构建样例
cube 的教程;
diff --git a/website/_docs30/tutorial/cube_streaming.md
b/website/_docs30/tutorial/cube_streaming.md
index 5778449..1b79c6e 100644
--- a/website/_docs30/tutorial/cube_streaming.md
+++ b/website/_docs30/tutorial/cube_streaming.md
@@ -2,7 +2,7 @@
layout: docs
title: Scalable Cubing from Kafka
categories: tutorial
-permalink: /docs/tutorial/cube_streaming.html
+permalink: /docs30/tutorial/cube_streaming.html
---
Kylin v1.6 releases the scalable streaming cubing function, it leverages
Hadoop to consume the data from Kafka to build the cube, you can check [this
blog](/blog/2016/10/18/new-nrt-streaming/) for the high level design. This doc
is a step by step tutorial, illustrating how to create and build a sample cube;
diff --git a/website/_docs30/tutorial/flink.md
b/website/_docs30/tutorial/flink.md
index 4ddfbf3..9002c0b 100644
--- a/website/_docs30/tutorial/flink.md
+++ b/website/_docs30/tutorial/flink.md
@@ -2,7 +2,7 @@
layout: docs
title: Apache Flink
categories: tutorial
-permalink: /docs/tutorial/flink.html
+permalink: /docs30/tutorial/flink.html
---
diff --git a/website/_docs30/tutorial/hue.md b/website/_docs30/tutorial/hue.md
index 7c0c216..1ebd624 100755
--- a/website/_docs30/tutorial/hue.md
+++ b/website/_docs30/tutorial/hue.md
@@ -2,7 +2,7 @@
layout: docs
title: Hue
categories: tutorial
-permalink: /docs/tutorial/hue.html
+permalink: /docs30/tutorial/hue.html
---
### Introduction
In [Hue-2745](https://issues.cloudera.org/browse/HUE-2745) v3.10, add JDBC
support like Phoenix, Kylin, Redshift, Solr Parallel SQL, …
diff --git a/website/_docs30/tutorial/hybrid.cn.md
b/website/_docs30/tutorial/hybrid.cn.md
index b812bb8..4836531 100644
--- a/website/_docs30/tutorial/hybrid.cn.md
+++ b/website/_docs30/tutorial/hybrid.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Hybrid 模型
categories: 教程
-permalink: /cn/docs/tutorial/hybrid.html
+permalink: /cn/docs30/tutorial/hybrid.html
version: v1.2
since: v2.5.0
---
diff --git a/website/_docs30/tutorial/hybrid.md
b/website/_docs30/tutorial/hybrid.md
index 83ac594..1767318 100644
--- a/website/_docs30/tutorial/hybrid.md
+++ b/website/_docs30/tutorial/hybrid.md
@@ -2,7 +2,7 @@
layout: docs
title: Hybrid Model
categories: tutorial
-permalink: /docs/tutorial/hybrid.html
+permalink: /docs30/tutorial/hybrid.html
since: v2.5.0
---
diff --git a/website/_docs30/tutorial/jdbc.cn.md
b/website/_docs30/tutorial/jdbc.cn.md
index 0feaa3b..3687e18 100644
--- a/website/_docs30/tutorial/jdbc.cn.md
+++ b/website/_docs30/tutorial/jdbc.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "JDBC 驱动"
categories: 教程
-permalink: /cn/docs/tutorial/jdbc.html
+permalink: /cn/docs30/tutorial/jdbc.html
---
### 认证
diff --git a/website/_docs30/tutorial/jdbc.md b/website/_docs30/tutorial/jdbc.md
index 2ff11e1..436eec1 100644
--- a/website/_docs30/tutorial/jdbc.md
+++ b/website/_docs30/tutorial/jdbc.md
@@ -2,7 +2,7 @@
layout: docs
title: Kylin JDBC Driver
categories: tutorial
-permalink: /docs/tutorial/jdbc.html
+permalink: /docs30/tutorial/jdbc.html
---
### Authentication
diff --git a/website/_docs30/tutorial/kylin_client_tool.cn.md
b/website/_docs30/tutorial/kylin_client_tool.cn.md
index d991044..9b39310 100644
--- a/website/_docs30/tutorial/kylin_client_tool.cn.md
+++ b/website/_docs30/tutorial/kylin_client_tool.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "Python 客户端"
categories: 教程
-permalink: /cn/docs/tutorial/kylin_client_tool.html
+permalink: /cn/docs30/tutorial/kylin_client_tool.html
---
Apache Kylin Python 客户端工具库是基于Python可访问Kylin的客户端. 此工具库包含两个可使用组件.
diff --git a/website/_docs30/tutorial/kylin_client_tool.md
b/website/_docs30/tutorial/kylin_client_tool.md
index ce51a75..6a4eb3d 100644
--- a/website/_docs30/tutorial/kylin_client_tool.md
+++ b/website/_docs30/tutorial/kylin_client_tool.md
@@ -2,7 +2,7 @@
layout: docs
title: Kylin Python Client
categories: tutorial
-permalink: /docs/tutorial/kylin_client_tool.html
+permalink: /docs30/tutorial/kylin_client_tool.html
---
Apache Kylin Python Client Library is a python-based Apache Kylin client.
There are two components in Apache Kylin Python Client Library:
diff --git a/website/_docs30/tutorial/kylin_sample.cn.md
b/website/_docs30/tutorial/kylin_sample.cn.md
index 1cd64d5..474ba56 100644
--- a/website/_docs30/tutorial/kylin_sample.cn.md
+++ b/website/_docs30/tutorial/kylin_sample.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "样例 Cube 快速入门"
categories: tutorial
-permalink: /cn/docs/tutorial/kylin_sample.html
+permalink: /cn/docs30/tutorial/kylin_sample.html
---
Kylin 提供了一个创建样例 Cube 脚本；脚本会创建五个样例 Hive 表:
diff --git a/website/_docs30/tutorial/kylin_sample.md
b/website/_docs30/tutorial/kylin_sample.md
index c34d993..c31f0be 100644
--- a/website/_docs30/tutorial/kylin_sample.md
+++ b/website/_docs30/tutorial/kylin_sample.md
@@ -2,7 +2,7 @@
layout: docs
title: Quick Start with Sample Cube
categories: tutorial
-permalink: /docs/tutorial/kylin_sample.html
+permalink: /docs30/tutorial/kylin_sample.html
---
Kylin provides a script for you to create a sample Cube; the script will also
create five sample Hive tables:
diff --git a/website/_docs30/tutorial/microstrategy.md
b/website/_docs30/tutorial/microstrategy.md
index 49f8a5c..eee6e84 100644
--- a/website/_docs30/tutorial/microstrategy.md
+++ b/website/_docs30/tutorial/microstrategy.md
@@ -2,7 +2,7 @@
layout: docs
title: MicroStrategy
categories: tutorial
-permalink: /docs/tutorial/microstrategy.html
+permalink: /docs30/tutorial/microstrategy.html
---
### Install ODBC Driver
diff --git a/website/_docs30/tutorial/mysql_metastore.cn.md
b/website/_docs30/tutorial/mysql_metastore.cn.md
index 53b9da8..6901396 100644
--- a/website/_docs30/tutorial/mysql_metastore.cn.md
+++ b/website/_docs30/tutorial/mysql_metastore.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 基于 MySQL 的 Metastore 配置
categories: 教程
-permalink: /cn/docs/tutorial/mysql_metastore.html
+permalink: /cn/docs30/tutorial/mysql_metastore.html
since: v2.5.0
---
diff --git a/website/_docs30/tutorial/mysql_metastore.md
b/website/_docs30/tutorial/mysql_metastore.md
index a88df4b..7a26000 100644
--- a/website/_docs30/tutorial/mysql_metastore.md
+++ b/website/_docs30/tutorial/mysql_metastore.md
@@ -2,7 +2,7 @@
layout: docs
title: Use MySQL as Metastore
categories: tutorial
-permalink: /docs/tutorial/mysql_metastore.html
+permalink: /docs30/tutorial/mysql_metastore.html
since: v2.5.0
---
diff --git a/website/_docs30/tutorial/odbc.cn.md
b/website/_docs30/tutorial/odbc.cn.md
index 084c29f..4539d07 100644
--- a/website/_docs30/tutorial/odbc.cn.md
+++ b/website/_docs30/tutorial/odbc.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "ODBC 驱动"
categories: 教程
-permalink: /cn/docs/tutorial/odbc.html
+permalink: /cn/docs30/tutorial/odbc.html
version: v1.2
since: v0.7.1
---
diff --git a/website/_docs30/tutorial/odbc.md b/website/_docs30/tutorial/odbc.md
index d170854..1972c70 100644
--- a/website/_docs30/tutorial/odbc.md
+++ b/website/_docs30/tutorial/odbc.md
@@ -2,7 +2,7 @@
layout: docs
title: Kylin ODBC Driver
categories: tutorial
-permalink: /docs/tutorial/odbc.html
+permalink: /docs30/tutorial/odbc.html
since: v0.7.1
---
diff --git a/website/_docs30/tutorial/powerbi.cn.md
b/website/_docs30/tutorial/powerbi.cn.md
index f43a6f5..5c4da7e 100644
--- a/website/_docs30/tutorial/powerbi.cn.md
+++ b/website/_docs30/tutorial/powerbi.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "Excel 及 Power BI 教程"
categories: tutorial
-permalink: /cn/docs/tutorial/powerbi.html
+permalink: /cn/docs30/tutorial/powerbi.html
version: v1.2
since: v1.2
---
diff --git a/website/_docs30/tutorial/powerbi.md
b/website/_docs30/tutorial/powerbi.md
index fb924cd..1bfa6b4 100644
--- a/website/_docs30/tutorial/powerbi.md
+++ b/website/_docs30/tutorial/powerbi.md
@@ -2,7 +2,7 @@
layout: docs
title: MS Excel and Power BI
categories: tutorial
-permalink: /docs/tutorial/powerbi.html
+permalink: /docs30/tutorial/powerbi.html
since: v1.2
---
diff --git a/website/_docs30/tutorial/project_level_acl.cn.md
b/website/_docs30/tutorial/project_level_acl.cn.md
index e33b706..002c1b9 100644
--- a/website/_docs30/tutorial/project_level_acl.cn.md
+++ b/website/_docs30/tutorial/project_level_acl.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Project Level ACL
categories: tutorial
-permalink: /cn/docs/tutorial/project_level_acl.html
+permalink: /cn/docs30/tutorial/project_level_acl.html
since: v2.1.0
---
diff --git a/website/_docs30/tutorial/project_level_acl.md
b/website/_docs30/tutorial/project_level_acl.md
index f2d6528..bf73961 100644
--- a/website/_docs30/tutorial/project_level_acl.md
+++ b/website/_docs30/tutorial/project_level_acl.md
@@ -2,7 +2,7 @@
layout: docs
title: Project Level ACL
categories: tutorial
-permalink: /docs/tutorial/project_level_acl.html
+permalink: /docs30/tutorial/project_level_acl.html
since: v2.1.0
---
diff --git a/website/_docs30/tutorial/query_pushdown.cn.md
b/website/_docs30/tutorial/query_pushdown.cn.md
index 3189c67..57903c4 100644
--- a/website/_docs30/tutorial/query_pushdown.cn.md
+++ b/website/_docs30/tutorial/query_pushdown.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 查询下压
categories: tutorial
-permalink: /cn/docs/tutorial/query_pushdown.html
+permalink: /cn/docs30/tutorial/query_pushdown.html
since: v2.1
---
diff --git a/website/_docs30/tutorial/query_pushdown.md
b/website/_docs30/tutorial/query_pushdown.md
index e427bf1..28ac2d6 100644
--- a/website/_docs30/tutorial/query_pushdown.md
+++ b/website/_docs30/tutorial/query_pushdown.md
@@ -2,7 +2,7 @@
layout: docs
title: Enable Query Pushdown
categories: tutorial
-permalink: /docs/tutorial/query_pushdown.html
+permalink: /docs30/tutorial/query_pushdown.html
since: v2.1
---
diff --git a/website/_docs30/tutorial/setup_jdbc_datasource.cn.md
b/website/_docs30/tutorial/setup_jdbc_datasource.cn.md
index 380bff7..c902515 100644
--- a/website/_docs30/tutorial/setup_jdbc_datasource.cn.md
+++ b/website/_docs30/tutorial/setup_jdbc_datasource.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 建立 JDBC 数据源
categories: howto
-permalink: /cn/docs/tutorial/setup_jdbc_datasource.html
+permalink: /cn/docs30/tutorial/setup_jdbc_datasource.html
---
> 自 Apache Kylin v2.3.x 起有效
diff --git a/website/_docs30/tutorial/setup_jdbc_datasource.md
b/website/_docs30/tutorial/setup_jdbc_datasource.md
index d044825..575e968 100644
--- a/website/_docs30/tutorial/setup_jdbc_datasource.md
+++ b/website/_docs30/tutorial/setup_jdbc_datasource.md
@@ -2,7 +2,7 @@
layout: docs
title: Setup JDBC Data Source
categories: howto
-permalink: /docs/tutorial/setup_jdbc_datasource.html
+permalink: /docs30/tutorial/setup_jdbc_datasource.html
---
> Available since Apache Kylin v2.3.x
diff --git a/website/_docs30/tutorial/setup_systemcube.cn.md
b/website/_docs30/tutorial/setup_systemcube.cn.md
index ab0a5ef..6ff4b21 100644
--- a/website/_docs30/tutorial/setup_systemcube.cn.md
+++ b/website/_docs30/tutorial/setup_systemcube.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 建立系统 Cube
categories: tutorial
-permalink: /cn/docs/tutorial/setup_systemcube.html
+permalink: /cn/docs30/tutorial/setup_systemcube.html
---
> 自 Apache Kylin v2.3.0 起有效
diff --git a/website/_docs30/tutorial/setup_systemcube.md
b/website/_docs30/tutorial/setup_systemcube.md
index de9cd33..0670556 100644
--- a/website/_docs30/tutorial/setup_systemcube.md
+++ b/website/_docs30/tutorial/setup_systemcube.md
@@ -2,7 +2,7 @@
layout: docs
title: Set Up System Cube
categories: tutorial
-permalink: /docs/tutorial/setup_systemcube.html
+permalink: /docs30/tutorial/setup_systemcube.html
---
> Available since Apache Kylin v2.3.0
diff --git a/website/_docs30/tutorial/spark.cn.md
b/website/_docs30/tutorial/spark.cn.md
index ae4ddb4..755f977 100644
--- a/website/_docs30/tutorial/spark.cn.md
+++ b/website/_docs30/tutorial/spark.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Apache Spark
categories: tutorial
-permalink: /cn/docs/tutorial/spark.html
+permalink: /cn/docs30/tutorial/spark.html
---
diff --git a/website/_docs30/tutorial/spark.md
b/website/_docs30/tutorial/spark.md
index 13ca26a..0da34c3 100644
--- a/website/_docs30/tutorial/spark.md
+++ b/website/_docs30/tutorial/spark.md
@@ -2,7 +2,7 @@
layout: docs
title: Apache Spark
categories: tutorial
-permalink: /docs/tutorial/spark.html
+permalink: /docs30/tutorial/spark.html
---
diff --git a/website/_docs30/tutorial/sql_reference.cn.md
b/website/_docs30/tutorial/sql_reference.cn.md
index d645fff..162493a 100644
--- a/website/_docs30/tutorial/sql_reference.cn.md
+++ b/website/_docs30/tutorial/sql_reference.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "SQL 快速参考"
categories: tutorial
-permalink: /cn/docs/tutorial/sql_reference.html
+permalink: /cn/docs30/tutorial/sql_reference.html
---
Apache Kylin 使用 Apache Calcite 做 SQL 解析和优化。作为一款 OLAP 引擎, Kylin 支持 `SELECT`
操作，而不支持其它操作例如 `INSERT`，`UPDATE` 和 `DELETE`，因此 Kylin 的 SQL 语法是 Apache Calcite
支持语法的一个子集。本文列举了 Kylin 支持的 SQL 语法、函数以及数据类型，但可能并不完整。您可以查看 [Calcite SQL
reference](https://calcite.apache.org/docs/reference.html) 以了解更多内容。
diff --git a/website/_docs30/tutorial/sql_reference.md
b/website/_docs30/tutorial/sql_reference.md
index d352773..96516f2 100644
--- a/website/_docs30/tutorial/sql_reference.md
+++ b/website/_docs30/tutorial/sql_reference.md
@@ -2,7 +2,7 @@
layout: docs
title: SQL Reference
categories: tutorial
-permalink: /docs/tutorial/sql_reference.html
+permalink: /docs30/tutorial/sql_reference.html
---
Apache Kylin relies on Apache Calcite to parse and optimize the SQL
statements. As an OLAP engine, Kylin supports `SELECT` statements, while
doesn't support others like `INSERT`, `UPDATE` and `DELETE` operations in SQL,
so Kylin's SQL grammer is a subset of Apache Calcite. This page lists the SQL
grammar, the functions and the basic data types that Kylin supports. You can
also check [Calcite SQL
reference](https://calcite.apache.org/docs/reference.html) for more detailed
info.
diff --git a/website/_docs30/tutorial/squirrel.cn.md
b/website/_docs30/tutorial/squirrel.cn.md
index 67bbdba..fc015ef 100644
--- a/website/_docs30/tutorial/squirrel.cn.md
+++ b/website/_docs30/tutorial/squirrel.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: SQuirreL
categories: tutorial
-permalink: /cn/docs/tutorial/squirrel.html
+permalink: /cn/docs30/tutorial/squirrel.html
---
### Introduction
diff --git a/website/_docs30/tutorial/squirrel.md
b/website/_docs30/tutorial/squirrel.md
index 654ebdc..2acb7e7 100644
--- a/website/_docs30/tutorial/squirrel.md
+++ b/website/_docs30/tutorial/squirrel.md
@@ -2,7 +2,7 @@
layout: docs
title: SQuirreL
categories: tutorial
-permalink: /docs/tutorial/squirrel.html
+permalink: /docs30/tutorial/squirrel.html
---
### Introduction
diff --git a/website/_docs30/tutorial/superset.cn.md
b/website/_docs30/tutorial/superset.cn.md
index da75530..334fb8d 100644
--- a/website/_docs30/tutorial/superset.cn.md
+++ b/website/_docs30/tutorial/superset.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: "Superset"
categories: tutorial
-permalink: /cn/docs/tutorial/superset.html
+permalink: /cn/docs30/tutorial/superset.html
---
### Apache Kylin 与 Apache Superset 的集成
diff --git a/website/_docs30/tutorial/superset.md
b/website/_docs30/tutorial/superset.md
index 12eeed6..0738350 100644
--- a/website/_docs30/tutorial/superset.md
+++ b/website/_docs30/tutorial/superset.md
@@ -2,7 +2,7 @@
layout: docs
title: "Superset"
categories: tutorial
-permalink: /docs/tutorial/superset.html
+permalink: /docs30/tutorial/superset.html
---
### Integrate Apache Kylin and Apache Superset
diff --git a/website/_docs30/tutorial/tableau.cn.md
b/website/_docs30/tutorial/tableau.cn.md
index e1dc579..bf4f070 100644
--- a/website/_docs30/tutorial/tableau.cn.md
+++ b/website/_docs30/tutorial/tableau.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Tableau 8
categories: 教程
-permalink: /cn/docs/tutorial/tableau.html
+permalink: /cn/docs30/tutorial/tableau.html
version: v1.2
since: v0.7.1
---
diff --git a/website/_docs30/tutorial/tableau.md
b/website/_docs30/tutorial/tableau.md
index 1cf961e..c2870a4 100644
--- a/website/_docs30/tutorial/tableau.md
+++ b/website/_docs30/tutorial/tableau.md
@@ -2,7 +2,7 @@
layout: docs
title: Tableau 8
categories: tutorial
-permalink: /docs/tutorial/tableau.html
+permalink: /docs30/tutorial/tableau.html
---
> There are some limitations of Kylin ODBC driver with Tableau, please read
> carefully this instruction before you try it.
diff --git a/website/_docs30/tutorial/tableau_91.cn.md
b/website/_docs30/tutorial/tableau_91.cn.md
index 25ea701..7180142 100644
--- a/website/_docs30/tutorial/tableau_91.cn.md
+++ b/website/_docs30/tutorial/tableau_91.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Tableau 9
categories: tutorial
-permalink: /cn/docs/tutorial/tableau_91.html
+permalink: /cn/docs30/tutorial/tableau_91.html
version: v1.2
since: v1.2
---
diff --git a/website/_docs30/tutorial/tableau_91.md
b/website/_docs30/tutorial/tableau_91.md
index 7c35ac0..de5750b 100644
--- a/website/_docs30/tutorial/tableau_91.md
+++ b/website/_docs30/tutorial/tableau_91.md
@@ -2,7 +2,7 @@
layout: docs
title: Tableau 9
categories: tutorial
-permalink: /docs/tutorial/tableau_91.html
+permalink: /docs30/tutorial/tableau_91.html
---
Tableau 9.x has been released a while, there are many users are asking about
support this version with Apache Kylin. With updated Kylin ODBC Driver, now
user could interactive with Kylin service through Tableau 9.x.
diff --git a/website/_docs30/tutorial/use_cube_planner.cn.md
b/website/_docs30/tutorial/use_cube_planner.cn.md
index 12b15a1..bc1eae1 100644
--- a/website/_docs30/tutorial/use_cube_planner.cn.md
+++ b/website/_docs30/tutorial/use_cube_planner.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 使用 Cube Planner
categories: tutorial
-permalink: /cn/docs/tutorial/use_cube_planner.html
+permalink: /cn/docs30/tutorial/use_cube_planner.html
---
> 自 Apache Kylin v2.3.0 起使用
diff --git a/website/_docs30/tutorial/use_cube_planner.md
b/website/_docs30/tutorial/use_cube_planner.md
index 29a0253..dfe135f 100644
--- a/website/_docs30/tutorial/use_cube_planner.md
+++ b/website/_docs30/tutorial/use_cube_planner.md
@@ -2,7 +2,7 @@
layout: docs
title: Use Cube Planner
categories: tutorial
-permalink: /docs/tutorial/use_cube_planner.html
+permalink: /docs30/tutorial/use_cube_planner.html
---
> Available since Apache Kylin v2.3.0
diff --git a/website/_docs30/tutorial/use_dashboard.cn.md
b/website/_docs30/tutorial/use_dashboard.cn.md
index 03463ea..a4cc37e 100644
--- a/website/_docs30/tutorial/use_dashboard.cn.md
+++ b/website/_docs30/tutorial/use_dashboard.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: 使用 Dashboard
categories: tutorial
-permalink: /cn/docs/tutorial/use_dashboard.html
+permalink: /cn/docs30/tutorial/use_dashboard.html
---
> 自 Apache Kylin v2.3.0 起使用
diff --git a/website/_docs30/tutorial/use_dashboard.md
b/website/_docs30/tutorial/use_dashboard.md
index 2062fb2..988830a 100644
--- a/website/_docs30/tutorial/use_dashboard.md
+++ b/website/_docs30/tutorial/use_dashboard.md
@@ -2,7 +2,7 @@
layout: docs
title: Use Dashboard
categories: tutorial
-permalink: /docs/tutorial/use_dashboard.html
+permalink: /docs30/tutorial/use_dashboard.html
---
> Available since Apache Kylin v2.3.0
diff --git a/website/_docs30/tutorial/web.cn.md
b/website/_docs30/tutorial/web.cn.md
index 2aecc1b..df5877f 100644
--- a/website/_docs30/tutorial/web.cn.md
+++ b/website/_docs30/tutorial/web.cn.md
@@ -2,7 +2,7 @@
layout: docs-cn
title: Web 界面
categories: 教程
-permalink: /cn/docs/tutorial/web.html
+permalink: /cn/docs30/tutorial/web.html
version: v1.2
---
diff --git a/website/_docs30/tutorial/web.md b/website/_docs30/tutorial/web.md
index d41ef4c..d66d4fb 100644
--- a/website/_docs30/tutorial/web.md
+++ b/website/_docs30/tutorial/web.md
@@ -2,7 +2,7 @@
layout: docs
title: Web Interface
categories: tutorial
-permalink: /docs/tutorial/web.html
+permalink: /docs30/tutorial/web.html
---
> **Supported Browsers**
