Author: lidong
Date: Tue Aug 18 14:08:14 2020
New Revision: 1880966
URL: http://svn.apache.org/viewvc?rev=1880966&view=rev
Log:
Optimize pushdown document
Modified:
kylin/site/cn/development/howto_docs.html
kylin/site/cn/docs/tutorial/query_pushdown.html
kylin/site/development/howto_docs.html
kylin/site/docs/tutorial/query_pushdown.html
kylin/site/feed.xml
Modified: kylin/site/cn/development/howto_docs.html
URL:
http://svn.apache.org/viewvc/kylin/site/cn/development/howto_docs.html?rev=1880966&r1=1880965&r2=1880966&view=diff
==============================================================================
--- kylin/site/cn/development/howto_docs.html (original)
+++ kylin/site/cn/development/howto_docs.html Tue Aug 18 14:08:14 2020
@@ -183,6 +183,15 @@ var _hmt = _hmt || [];
<h2 id="section">å·¥ä½å</h2>
+<p>卿¨æ·»å
æä¿®æ¹ææ¡£åï¼è¯·é¨ç½²ææ¡£ç¼è¯æéçç¯å¢ï¼æä»¬æä¾ä»¥ä¸ä¸¤ç§æ¹æ³ï¼</p>
+
+<ul>
+ <li><a
href="#æ¬å°é¨ç½²ææ¡£ç¼è¯ç¯å¢">æ¬å°é¨ç½²ææ¡£ç¼è¯ç¯å¢</a></li>
+ <li><a href="#ä½¿ç¨ Docker é¨ç½²ææ¡£ç¼è¯ç¯å¢">ä½¿ç¨ Docker
é¨ç½²ææ¡£ç¼è¯ç¯å¢ï¼æ¨èï¼</a></li>
+</ul>
+
+<h3 id="span-idspan"><span
id="æ¬å°é¨ç½²ææ¡£ç¼è¯ç¯å¢">æ¬å°é¨ç½²ææ¡£ç¼è¯ç¯å¢</span></h3>
+
<p>卿¨æ·»å æä¿®æ¹ææ¡£å请å®è£
以ä¸å·¥å
·ï¼</p>
<ol>
@@ -196,11 +205,8 @@ var _hmt = _hmt || [];
<li>ç¶åï¼å®è£
<a
href="http://jekyllrb.com">Jekyll</a>ï¼ä»¥åéè¦çæä»¶
<ul>
<li><code class="highlighter-rouge">gem install jekyll
jekyll-multiple-languages kramdown rouge</code></li>
- <li><strong>注æ</strong>ï¼ä¸äºç¹å®ç jekyll å
jekyll-multiple-languages çæ¬ä¸è½ä¸èµ·ä½¿ç¨ï¼ä½¿ç¨ jekyll 3.0.1 å
jekyll-multiple-languages 2.0.3 æ¶æéå°ä¸ä¸ª âundefined methodâ
é误)ãè¿ç§æ
åµä¸ï¼<code class="highlighter-rouge">jekyll 2.5.3</code>
å <code class="highlighter-rouge">jekyll-multiple-languages 1.0.8</code>
æ¯å·²ç¥å¯è¿è¡ççæ¬ã
- <ul>
- <li>ä¾å¦. ä½¿ç¨ <code class="highlighter-rouge">gem install
jekyll --version "=2.5.3"</code> æ¥å®è£
å
·ä½ççæ¬ã</li>
- </ul>
- </li>
+ <li><strong>注æ</strong>ï¼ä¸äºç¹å®ç jekyll å
jekyll-multiple-languages çæ¬ä¸è½ä¸èµ·ä½¿ç¨ï¼ä½¿ç¨ jekyll 3.0.1 å
jekyll-multiple-languages 2.0.3 æ¶æéå°ä¸ä¸ª âundefined methodâ
é误)ãè¿ç§æ
åµä¸ï¼<code class="highlighter-rouge">jekyll 2.5.3</code>
å <code class="highlighter-rouge">jekyll-multiple-languages 1.0.8</code>
æ¯å·²ç¥å¯è¿è¡ççæ¬ã</li>
+ <li>ä¾å¦ï¼ä½¿ç¨ <code class="highlighter-rouge">gem install jekyll
--version "=2.5.3"</code> æ¥å®è£
å
·ä½ççæ¬ã</li>
<li><strong>注æ</strong>ï¼å¯¹äº Mac ç¨æ·ï¼å¦æ gem å®è£
æ¶éå°ç±»ä¼¼è¿æ ·çé误 âERROR: While executing gem â¦
(Gem::FilePermissionError)âãæ¨å¯ä»¥ä½¿ç¨ âbrew install rubyâ
çæ¹å¼è§£å³è¿ä¸ªé®é¢ï¼ç¶åé坿¨çç»ç«¯ã</li>
</ul>
</li>
@@ -227,7 +233,7 @@ rouge (1.10.1)
</code></pre>
</div>
-<h2 id="docker-">ä½¿ç¨ Docker ä¸ºææ¡£ç¼è¯</h2>
+<h3 id="span-id-docker--docker-span"><span id="ä½¿ç¨ Docker
é¨ç½²ææ¡£ç¼è¯ç¯å¢">ä½¿ç¨ Docker é¨ç½²ææ¡£ç¼è¯ç¯å¢</span></h3>
<p>ææ°çç kylin å叿ä¾äº
dockerfileï¼æ¥åå°æå»ºå¤ææ§ä½¿ç¨ docker å Makefile è½è°ç¨
docker å½ä»¤ã</p>
@@ -265,7 +271,7 @@ Configuration file: /srv/jekyll/_config.
<p>è¦èæä¸æçææ¡£æç¿»è¯ç°æææ¡£ï¼åªéæ·»å
æå¤å¶è¯¥ææ¡£ï¼å称以 .cn.md ä½ä¸ºåç¼ãå®å°å¨ /cn
æä»¶å¤¹ä¸çæä¸ html ååçæä»¶ã<br />
è¦æ·»å å
¶ä»è¯è¨ï¼è¯·æ´æ° _config.yml
å¹¶éµå¾ªä¸ä¸æçç¸åçæ¨¡å¼ã</p>
-<h1 id="kylin-">Kylin ææ¡£ç»æä»¥å导èªèå</h1>
+<h2 id="kylin-">Kylin ææ¡£ç»æä»¥å导èªèå</h2>
<p><a href="https://github.com/apache/kylin/tree/document/website">ä½ä¸º
Jekyll æºç Kylin ç½ç«</a>æ¯å¨ <code
class="highlighter-rouge">doucment</code> 忝ä¸ç»´æ¤çã</p>
@@ -309,7 +315,7 @@ since: v0.7.2
</code></pre>
</div>
-<h1 id="section-1">å¦ä½ç¼åææ¡£</h1>
+<h2 id="section-1">å¦ä½ç¼åææ¡£</h2>
<p>使ç¨ä»»ä½ markdown ç¼è¾å¨æå¼ææ¡£ï¼èæå
容并卿¬å°é¢è§ã</p>
<p>æ ·ä¾ææ¡£ï¼</p>
@@ -325,35 +331,31 @@ since: v0.7.2
## This is example doc
The quick brown fox jump over the lazy dog.
-
</code></pre>
</div>
-<h1 id="section-2">å¦ä½æ·»å å¾ç</h1>
+<h2 id="section-2">å¦ä½æ·»å å¾ç</h2>
<p>ææçå¾ç请æ¾å° <em>images</em> æä»¶å¤¹ä¸ï¼å¨ä½
çæä»¶ä¸ï¼è¯·ä½¿ç¨ä»¥ä¸æ ·å¼å¼å
¥å¾çï¼</p>
<div class="highlighter-rouge"><pre
class="highlight"><code>
-
</code></pre>
</div>
-<h1 id="section-3">å¦ä½æ·»å è¿æ¥</h1>
+<h2 id="section-3">å¦ä½æ·»å è¿æ¥</h2>
<p>使ç¨ç«ç¹é¾æ¥çç¸å¯¹è·¯å¾ï¼ä¾å¦</p>
<div class="highlighter-rouge"><pre class="highlight"><code>[REST
API](docs/development/rest_api.html).
-
</code></pre>
</div>
-<h1 id="section-4">å¦ä½æ·»å 代ç é«äº®</h1>
+<h2 id="section-4">å¦ä½æ·»å 代ç é«äº®</h2>
<p>æä»¬ä½¿ç¨ <a href="https://github.com/jneen/rouge">Rouge</a>
çªåºæ¾ç¤ºä»£ç è¯æ³ã<br />
æ¥çæ¤ doc çæºä»£ç 以è·åæ´å¤è¯¦ç»ä¿¡æ¯ç¤ºä¾ã</p>
-<h1 id="section-5">å¦ä½å¨æ¬å°é¢è§</h1>
+<h2 id="section-5">å¦ä½å¨æ¬å°é¢è§</h2>
<p>æ¨å¯ä»¥å¨ markdown ç¼è¾å¨ä¸é¢è§ï¼è¦æ£æ¥ç½ç«ä¸çç¡®åå
容ï¼è¯·ä» <code class="highlighter-rouge">website</code> æä»¶å¤¹ä¸è¿è¡
Jekyllï¼</p>
<div class="highlighter-rouge"><pre class="highlight"><code>jekyll server
-
</code></pre>
</div>
<p>ç¶å卿µè§å¨ä¸è®¿é® http://127.0.0.1:4000ã</p>
Modified: kylin/site/cn/docs/tutorial/query_pushdown.html
URL:
http://svn.apache.org/viewvc/kylin/site/cn/docs/tutorial/query_pushdown.html?rev=1880966&r1=1880965&r2=1880966&view=diff
==============================================================================
--- kylin/site/cn/docs/tutorial/query_pushdown.html (original)
+++ kylin/site/cn/docs/tutorial/query_pushdown.html Tue Aug 18 14:08:14 2020
@@ -189,7 +189,8 @@ var _hmt = _hmt || [];
<ol>
<li>
- <p>ä¿®æ¹é
ç½®æä»¶<code
class="highlighter-rouge">kylin.properties</code>æå¼Query
Pushdown注éæçé
置项<code
class="highlighter-rouge">kylin.query.pushdown.runner-class-name</code>ï¼è®¾ç½®ä¸º<code
class="highlighter-rouge">org.apache.kylin.query.adhoc.PushDownRunnerJdbcImpl</code></p>
+ <p>ä¿®æ¹é
ç½®æä»¶<code
class="highlighter-rouge">kylin.properties</code>æå¼Query
Pushdown注éæçé
置项<code
class="highlighter-rouge">kylin.query.pushdown.runner-class-name</code>ï¼è®¾ç½®ä¸º<code
class="highlighter-rouge">org.apache.kylin.query.adhoc.PushDownRunnerJdbcImpl</code>ï¼<br
/>
+å¦æä½ éè¦å°æ¥è¯¢ä¸åå°prestoï¼è¯·å°è¿é¡¹é
置设置为<code
class="highlighter-rouge">org.apache.kylin.query.pushdown.PushdownRunnerSDKImpl</code>ï¼å
¶ä½é
ç½®åè§æ¬é¡µæ«å°¾ç<a href="#pushdown-to-presto">Pushdown to
Presto</a>ä¸çä»ç»ã</p>
</li>
<li>
<p>å¨é
ç½®æä»¶<code
class="highlighter-rouge">kylin.properties</code>æ·»å å¦ä¸é
置项ãè¥ä¸è®¾ç½®ï¼å°ä½¿ç¨é»è®¤é
置项ã请ä¸è¦å¿è®°å°âhiveserverâåâ10000âæ¿æ¢æç¯å¢ä¸Hiveè¿è¡ç主æºå端å£ã</p>
@@ -224,7 +225,11 @@ var _hmt = _hmt || [];
<div class="highlight"><pre><code class="language-groff"
data-lang="groff">kylin.query.pushdown.runner-class-name=org.apache.kylin.query.adhoc.PushDownRunnerJdbcImpl
kylin.query.pushdown.jdbc.url=jdbc:hive2://hiveserver:10000/default
kylin.query.pushdown.jdbc.driver=org.apache.hive.jdbc.HiveDriver
kylin.query.pushdown.jdbc.username=hive kylin.query.pushdown.jdbc.password=
kylin.query.pushdown.jdbc.pool-max-total=8
kylin.query.pushdown.jdbc.pool-max-idle=8
kylin.query.pushdown.jdbc.pool-min-idle=0</code></pre></div>
-<p>ç¶åï¼éå¯Kylin</p>
+<ol>
+ <li>å½ Pushdown å°çæ¥è¯¢å¼æä¸æ¯<code
class="highlighter-rouge">Hive</code> æ¶ï¼è¯·å°å¯¹åºæ¥è¯¢å¼æç JDBC
驱卿¾å¨ $KYLIN_HOME/ext
ç®å½ä¸ï¼æ²¡ææ¤ç®å½æ¶è¯·èªè¡å建ã</li>
+</ol>
+
+<p>ç¶åï¼éå¯Kylinã</p>
<h4 id="section-2">ä¸åè³å¤ä¸ªå¼æ</h4>
<p>èª v3.0.0
èµ·ï¼å¼å§æ¯æéè¿JDBCä¸åè³å¤ä¸ªå¼æè¿è¡æ¥è¯¢ã<br />
@@ -276,6 +281,7 @@ kylin.query.pushdown.jdbc.driver=com.fac
kylin.query.pushdown.jdbc.username={USER_NAME}
kylin.query.pushdown.jdbc.password={PASSWORD}</code></pre></div>
+<p>å¹¶ä¸ï¼è¯·èªè¡ä¸è½½ Presto ç JDBC é©±å¨ presto-jdbc-xxx.jar
æ¾ç½®å¨ $KYLIN_HOME/ext ç®å½ä¸ï¼æ²¡ææ¤ç®å½æ¶è¯·èªè¡å建ã</p>
</article>
</div>
Modified: kylin/site/development/howto_docs.html
URL:
http://svn.apache.org/viewvc/kylin/site/development/howto_docs.html?rev=1880966&r1=1880965&r2=1880966&view=diff
==============================================================================
--- kylin/site/development/howto_docs.html (original)
+++ kylin/site/development/howto_docs.html Tue Aug 18 14:08:14 2020
@@ -8403,6 +8403,15 @@ var _hmt = _hmt || [];
<h2 id="before-your-work">Before your work</h2>
+<p>Before you add or edit documentation, please deploy the document
compilation environment. We provide two ways:</p>
+
+<ul>
+ <li><a href="#Deploy a local document compilation environment">Deploy a
local document compilation environment</a></li>
+ <li><a href="#Use Docker to deploy document compilation environment">Use
Docker to deploy document compilation environment</a></li>
+</ul>
+
+<h3
id="span-iddeploy-a-local-document-compilation-environmentdeploy-a-local-document-compilation-environmentspan"><span
id="Deploy a local document compilation environment">Deploy a local document
compilation environment</span></h3>
+
<p>Install following tools before you add or edit documentation:</p>
<ol>
@@ -8447,7 +8456,7 @@ rouge (1.10.1)
</code></pre>
</div>
-<h2 id="use-docker-for-document-compile">Use Docker for document compile</h2>
+<h3
id="span-iduse-docker-to-deploy-document-compilation-environmentuse-docker-to-deploy-document-compilation-environmentspan"><span
id="Use Docker to deploy document compilation environment">Use Docker to
deploy document compilation environment</span></h3>
<p>The latest kylin release provides dockerfile, to reduce build complexity
using docker and Makefile can call docker command.</p>
@@ -8485,7 +8494,7 @@ Configuration file: /srv/jekyll/_config.
<p>To draft Chinese version document or translate existing one, just add or
copy that doc and name with .cn.md as sufffix. It will generate under /cn
folder with same name as html file. <br />
To add other language, please update _config.yml and follow the same pattern
as Chinese version.</p>
-<h1 id="kylin-document-structure-and-navigation-menu">Kylin document structure
and navigation menu</h1>
+<h2 id="kylin-document-structure-and-navigation-menu">Kylin document structure
and navigation menu</h2>
<p>The Kylin <a
href="https://github.com/apache/kylin/tree/document/website">website as the
Jekyll source</a> is maintained under the <code
class="highlighter-rouge">doucment</code> branch.</p>
@@ -8529,7 +8538,7 @@ Then add item to docs.yml like:</p>
</code></pre>
</div>
-<h1 id="how-to-edit-document">How to edit document</h1>
+<h2 id="how-to-edit-document">How to edit document</h2>
<p>Open doc with any markdown editor, draft content and preview in local.</p>
<p>Sample Doc:</p>
@@ -8545,35 +8554,31 @@ since: v0.7.2
## This is example doc
The quick brown fox jump over the lazy dog.
-
</code></pre>
</div>
-<h1 id="how-to-add-image">How to add image</h1>
+<h2 id="how-to-add-image">How to add image</h2>
<p>All impage please put under <em>images</em> folder, in your document,
please using below sample to include image:</p>
<div class="highlighter-rouge"><pre
class="highlight"><code>
-
</code></pre>
</div>
-<h1 id="how-to-add-link">How to add link</h1>
+<h2 id="how-to-add-link">How to add link</h2>
<p>Using relative path for site links, for example:</p>
<div class="highlighter-rouge"><pre class="highlight"><code>[REST
API](docs/development/rest_api.html).
-
</code></pre>
</div>
-<h1 id="how-to-add-code-highlight">How to add code highlight</h1>
+<h2 id="how-to-add-code-highlight">How to add code highlight</h2>
<p>We are using <a href="https://github.com/jneen/rouge">Rouge</a> to
highlight code syntax.<br />
check this docâs source code for more detail sample.</p>
-<h1 id="how-to-preview-in-your-local">How to preview in your local</h1>
+<h2 id="how-to-preview-in-your-local">How to preview in your local</h2>
<p>You can preview in your markdown editor, to check exactly what it will
looks like on website, please run Jekyll from <code
class="highlighter-rouge">website</code> folder:</p>
<div class="highlighter-rouge"><pre class="highlight"><code>jekyll server
-
</code></pre>
</div>
<p>Then access http://127.0.0.1:4000 in your browser.</p>
Modified: kylin/site/docs/tutorial/query_pushdown.html
URL:
http://svn.apache.org/viewvc/kylin/site/docs/tutorial/query_pushdown.html?rev=1880966&r1=1880965&r2=1880966&view=diff
==============================================================================
--- kylin/site/docs/tutorial/query_pushdown.html (original)
+++ kylin/site/docs/tutorial/query_pushdown.html Tue Aug 18 14:08:14 2020
@@ -8407,9 +8407,12 @@ var _hmt = _hmt || [];
<h3 id="query-pushdown-config">Query Pushdown config</h3>
<h4 id="pushdown-to-single-engine">Pushdown to single engine</h4>
+<p>Take hive as an example to explain the opening steps:</p>
+
<ol>
<li>
- <p>In Kylinâs installation directory, uncomment configuration item <code
class="highlighter-rouge">kylin.query.pushdown.runner-class-name</code> of
config file <code class="highlighter-rouge">kylin.properties</code>, and set it
to <code
class="highlighter-rouge">org.apache.kylin.query.adhoc.PushDownRunnerJdbcImpl</code></p>
+ <p>In Kylinâs installation directory, uncomment configuration item <code
class="highlighter-rouge">kylin.query.pushdown.runner-class-name</code> of
config file <code class="highlighter-rouge">kylin.properties</code>, and set it
to <code
class="highlighter-rouge">org.apache.kylin.query.adhoc.PushDownRunnerJdbcImpl</code>,<br
/>
+If you need to pushdown the query to presto, please set this configuration to
<code
class="highlighter-rouge">org.apache.kylin.query.pushdown.PushdownRunnerSDKImpl</code>.
For other configurations, please refer to <a
href="#pushdown-to-presto">Pushdown to Presto</a> at the end of this page.</p>
</li>
<li>
<p>Add configuration items below in config file <code
class="highlighter-rouge">kylin.properties</code>.</p>
@@ -8442,6 +8445,10 @@ var _hmt = _hmt || [];
<p>Here is a sample configuration; remember to change host âhiveserverâ
and port â10000â with your cluster configuraitons.</p>
+<ol>
+ <li>When the query engine pushdown to is not <code
class="highlighter-rouge">Hive</code>, please put the jdbc driver of the
corresponding query engine in $KYLIN_HOME/ext directory, if there is no such
directory, please create it yourself.</li>
+</ol>
+
<p>Then, restart Kylin.</p>
<div class="highlight"><pre><code class="language-groff"
data-lang="groff">kylin.query.pushdown.runner-class-name=org.apache.kylin.query.adhoc.PushDownRunnerJdbcImpl
@@ -8503,6 +8510,7 @@ kylin.query.pushdown.jdbc.driver=com.fac
kylin.query.pushdown.jdbc.username={USER_NAME}
kylin.query.pushdown.jdbc.password={PASSWORD}</code></pre></div>
+<p>In addition, please download Presto jdbc driver presto-jdbc-xxx.jar and put
it in $KYLIN_HOME/ext directory, if there is no such directory, please create
it yourself.</p>
</article>
</div>
Modified: kylin/site/feed.xml
URL:
http://svn.apache.org/viewvc/kylin/site/feed.xml?rev=1880966&r1=1880965&r2=1880966&view=diff
==============================================================================
--- kylin/site/feed.xml (original)
+++ kylin/site/feed.xml Tue Aug 18 14:08:14 2020
@@ -19,8 +19,8 @@
<description>Apache Kylin Home</description>
<link>http://kylin.apache.org/</link>
<atom:link href="http://kylin.apache.org/feed.xml" rel="self"
type="application/rss+xml"/>
- <pubDate>Fri, 07 Aug 2020 06:59:12 -0700</pubDate>
- <lastBuildDate>Fri, 07 Aug 2020 06:59:12 -0700</lastBuildDate>
+ <pubDate>Tue, 18 Aug 2020 06:59:14 -0700</pubDate>
+ <lastBuildDate>Tue, 18 Aug 2020 06:59:14 -0700</lastBuildDate>
<generator>Jekyll v2.5.3</generator>
<item>