You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2019/08/26 08:24:10 UTC
[flink] branch master updated (13b1b40 -> ac1b8db)
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 13b1b40 [hotfix][travis] Remove duplicate mvn logging options for mvn verify
new a55dc42 [hotfix][docs] Correct method name in KeyedStateReaderFunction example
new 2c6441b [hotfix][JavaDocs] Correct comment in KeyedStream
new 9bda229 [hotfix][table api] Fix logger arguments in CatalogManager
new b1c2e21 [FLINK-13728][docs] Fix wrong closing tag order in sidenav
new e670293 [FLINK-13724][docs] Remove unnecessary whitespace from the generated pages
new ac375e4 [FLINK-13723][docs] Use liquid-c for faster doc generation
new ef74a61 [FLINK-13729][docs] Update website generation dependencies
new 065de4b [FLINK-13725][docs] use sassc for faster doc generation
new f802e16 [hotfix][docs] Temporarily disable liveserve
new ac1b8db [FLINK-13726][docs] Build docs with jekyll 4.0.0.pre.beta1
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/.gitignore | 3 +-
docs/Gemfile | 20 ++-
docs/Gemfile.lock | 91 +++++-----
docs/README.md | 3 +-
docs/_includes/sidenav.html | 184 ++++++++++-----------
docs/_layouts/base.html | 6 +-
docs/_layouts/plain.html | 50 +++---
docs/build_docs.sh | 2 +-
docs/dev/libs/state_processor_api.md | 2 +-
docs/dev/libs/state_processor_api.zh.md | 2 +-
.../streaming/api/datastream/KeyedStream.java | 2 +-
.../apache/flink/table/catalog/CatalogManager.java | 4 +-
12 files changed, 190 insertions(+), 179 deletions(-)
[flink] 07/10: [FLINK-13729][docs] Update website generation
dependencies
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ef74a61f54f190926a8388f46db7919e0e94420b
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 16:57:14 2019 +0200
[FLINK-13729][docs] Update website generation dependencies
This seems to come with a much nicer code highlighting.
This closes #9442
---
docs/Gemfile | 8 +++----
docs/Gemfile.lock | 62 ++++++++++++++++++++++++++++---------------------------
2 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/docs/Gemfile b/docs/Gemfile
index b519eb9..eb307fd 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -21,10 +21,10 @@ source 'https://rubygems.org'
ruby '>= 2.1.0'
gem 'jekyll', '3.7.2'
-gem 'addressable', '2.4.0'
-gem 'octokit', '~> 4.3.0'
-gem 'therubyracer', '0.12.2'
-gem 'json', '2.0.4'
+gem 'addressable', '2.6.0'
+gem 'octokit', '4.14.0'
+gem 'therubyracer', '0.12.3'
+gem 'json', '2.2.0'
gem 'jekyll-multiple-languages', '2.0.3'
gem 'jekyll-paginate', '1.1.0'
gem 'liquid-c', '4.0.0' # speed-up site generation
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 09b02e8..68e66d3 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,22 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.4.0)
+ addressable (2.6.0)
+ public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
- concurrent-ruby (1.0.5)
+ concurrent-ruby (1.1.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
- eventmachine (1.2.5)
- faraday (0.9.2)
+ eventmachine (1.2.7)
+ faraday (0.15.4)
multipart-post (>= 1.2, < 3)
- ffi (1.9.18)
+ ffi (1.11.1)
forwardable-extended (2.6.0)
hawkins (2.0.5)
em-websocket (~> 0.5)
jekyll (~> 3.1)
http_parser.rb (0.6.0)
- i18n (0.9.3)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.2)
addressable (~> 2.4)
@@ -33,14 +34,14 @@ GEM
safe_yaml (~> 1.0)
jekyll-multiple-languages (2.0.3)
jekyll-paginate (1.1.0)
- jekyll-sass-converter (1.5.1)
+ jekyll-sass-converter (1.5.2)
sass (~> 3.4)
- jekyll-watch (2.0.0)
+ jekyll-watch (2.2.1)
listen (~> 3.0)
- json (2.0.4)
- kramdown (1.16.2)
+ json (2.2.0)
+ kramdown (1.17.0)
libv8 (3.16.14.19)
- liquid (4.0.0)
+ liquid (4.0.3)
liquid-c (4.0.0)
liquid (>= 3.0.0)
listen (3.1.5)
@@ -48,43 +49,44 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
- multipart-post (2.0.0)
- octokit (4.3.0)
- sawyer (~> 0.7.0, >= 0.5.3)
- pathutil (0.16.1)
+ multipart-post (2.1.1)
+ octokit (4.14.0)
+ sawyer (~> 0.8.0, >= 0.5.3)
+ pathutil (0.16.2)
forwardable-extended (~> 2.6)
- rb-fsevent (0.10.2)
- rb-inotify (0.9.10)
- ffi (>= 0.5.0, < 2)
+ public_suffix (3.1.1)
+ rb-fsevent (0.10.3)
+ rb-inotify (0.10.0)
+ ffi (~> 1.0)
ref (2.0.0)
- rouge (3.1.1)
+ rouge (3.8.0)
ruby_dep (1.5.0)
- safe_yaml (1.0.4)
- sass (3.5.5)
+ safe_yaml (1.0.5)
+ sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
- sawyer (0.7.0)
- addressable (>= 2.3.5, < 2.5)
- faraday (~> 0.8, < 0.10)
- therubyracer (0.12.2)
- libv8 (~> 3.16.14.0)
+ sawyer (0.8.2)
+ addressable (>= 2.3.5)
+ faraday (> 0.8, < 2.0)
+ therubyracer (0.12.3)
+ libv8 (~> 3.16.14.15)
ref
PLATFORMS
ruby
DEPENDENCIES
- addressable (= 2.4.0)
+ addressable (= 2.6.0)
hawkins
jekyll (= 3.7.2)
jekyll-multiple-languages (= 2.0.3)
jekyll-paginate (= 1.1.0)
- json (= 2.0.4)
+ json (= 2.2.0)
liquid-c (= 4.0.0)
- octokit (~> 4.3.0)
- therubyracer (= 0.12.2)
+ octokit (= 4.14.0)
+ therubyracer (= 0.12.3)
RUBY VERSION
ruby 2.3.1p112
[flink] 06/10: [FLINK-13723][docs] Use liquid-c for faster doc
generation
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ac375e4f94c0d4def84a4016bf9055c6a9f7314c
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 15:20:28 2019 +0200
[FLINK-13723][docs] Use liquid-c for faster doc generation
Jekyll requires liquid and only optionally uses liquid-c if available. The
latter uses natively-compiled code and reduces generation time by ~5% for me.
This closes #9441
---
docs/Gemfile | 1 +
docs/Gemfile.lock | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/Gemfile b/docs/Gemfile
index 1ddc989..b519eb9 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -27,6 +27,7 @@ gem 'therubyracer', '0.12.2'
gem 'json', '2.0.4'
gem 'jekyll-multiple-languages', '2.0.3'
gem 'jekyll-paginate', '1.1.0'
+gem 'liquid-c', '4.0.0' # speed-up site generation
group :jekyll_plugins do
gem 'hawkins'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index fa5d20b..09b02e8 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -41,6 +41,8 @@ GEM
kramdown (1.16.2)
libv8 (3.16.14.19)
liquid (4.0.0)
+ liquid-c (4.0.0)
+ liquid (>= 3.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
@@ -80,6 +82,7 @@ DEPENDENCIES
jekyll-multiple-languages (= 2.0.3)
jekyll-paginate (= 1.1.0)
json (= 2.0.4)
+ liquid-c (= 4.0.0)
octokit (~> 4.3.0)
therubyracer (= 0.12.2)
@@ -87,4 +90,4 @@ RUBY VERSION
ruby 2.3.1p112
BUNDLED WITH
- 1.16.1
+ 1.17.2
[flink] 08/10: [FLINK-13725][docs] use sassc for faster doc
generation
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 065de4b573a05b0c3436ff2d3af3e0c16589a1a7
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 17:29:43 2019 +0200
[FLINK-13725][docs] use sassc for faster doc generation
Jekyll requires sass but can optionally also use a C-based implementation
provided by sassc. Although we do not use sass directly, there may be some
indirect use inside jekyll. It doesn't seem to hurt to upgrade here.
This closes #9443
---
docs/Gemfile | 1 +
docs/Gemfile.lock | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/docs/Gemfile b/docs/Gemfile
index eb307fd..70bd4df 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -28,6 +28,7 @@ gem 'json', '2.2.0'
gem 'jekyll-multiple-languages', '2.0.3'
gem 'jekyll-paginate', '1.1.0'
gem 'liquid-c', '4.0.0' # speed-up site generation
+gem 'sassc', '2.0.1' # speed-up site generation
group :jekyll_plugins do
gem 'hawkins'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 68e66d3..d8bd82e 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -55,6 +55,7 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
+ rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
@@ -67,6 +68,9 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
+ sassc (2.0.1)
+ ffi (~> 1.9)
+ rake
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@@ -86,6 +90,7 @@ DEPENDENCIES
json (= 2.2.0)
liquid-c (= 4.0.0)
octokit (= 4.14.0)
+ sassc (= 2.0.1)
therubyracer (= 0.12.3)
RUBY VERSION
[flink] 03/10: [hotfix][table api] Fix logger arguments in
CatalogManager
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 9bda229dd362091c9889c026fb77928451faa7c7
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Fri Aug 9 14:42:58 2019 +0800
[hotfix][table api] Fix logger arguments in CatalogManager
This closes #9401
---
.../src/main/java/org/apache/flink/table/catalog/CatalogManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogManager.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogManager.java
index 839d5a9..5647709 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogManager.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogManager.java
@@ -182,8 +182,8 @@ public class CatalogManager {
LOG.info(
"Set the current default database as [{}] in the current default catalog [{}].",
- currentCatalogName,
- currentDatabaseName);
+ currentDatabaseName,
+ currentCatalogName);
}
}
[flink] 01/10: [hotfix][docs] Correct method name in
KeyedStateReaderFunction example
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit a55dc42e6762e3e74ed36129a9dd6fc4c51f646f
Author: David Anderson <da...@alpinegizmo.com>
AuthorDate: Fri Aug 23 10:29:23 2019 +0200
[hotfix][docs] Correct method name in KeyedStateReaderFunction example
This closes #9520
---
docs/dev/libs/state_processor_api.md | 2 +-
docs/dev/libs/state_processor_api.zh.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/dev/libs/state_processor_api.md b/docs/dev/libs/state_processor_api.md
index 676ac49..75a6f12 100644
--- a/docs/dev/libs/state_processor_api.md
+++ b/docs/dev/libs/state_processor_api.md
@@ -290,7 +290,7 @@ class ReaderFunction extends KeyedStateReaderFunction<Integer, KeyedState> {
}
@Override
- public void processKey(
+ public void readKey(
Integer key,
Context ctx,
Collector<KeyedState> out) throws Exception {
diff --git a/docs/dev/libs/state_processor_api.zh.md b/docs/dev/libs/state_processor_api.zh.md
index 676ac49..75a6f12 100644
--- a/docs/dev/libs/state_processor_api.zh.md
+++ b/docs/dev/libs/state_processor_api.zh.md
@@ -290,7 +290,7 @@ class ReaderFunction extends KeyedStateReaderFunction<Integer, KeyedState> {
}
@Override
- public void processKey(
+ public void readKey(
Integer key,
Context ctx,
Collector<KeyedState> out) throws Exception {
[flink] 04/10: [FLINK-13728][docs] Fix wrong closing tag order in
sidenav
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit b1c2e213302cd68758761c60a1ccff85c5c67203
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 15:59:50 2019 +0200
[FLINK-13728][docs] Fix wrong closing tag order in sidenav
This closes #9439
---
docs/_includes/sidenav.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index 73edab1..cc787d9 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -88,7 +88,7 @@ level is determined by 'nav-pos'.
{% else %}
{% assign elementsPos = elementsPosStack | last %}
{% assign pos = posStack | last %}
-</li></ul></div>
+</ul></div></li>
{% assign elementsPosStack = elementsPosStack | pop %}
{% assign posStack = posStack | pop %}
{% endif %}
[flink] 02/10: [hotfix][JavaDocs] Correct comment in KeyedStream
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 2c6441bbbe67f063b8d5c202b56e78083cb40eee
Author: stayhsfLee <yu...@gmail.com>
AuthorDate: Thu Aug 8 21:42:46 2019 +0800
[hotfix][JavaDocs] Correct comment in KeyedStream
This closes #9395
---
.../java/org/apache/flink/streaming/api/datastream/KeyedStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
index 84df716..8c7937d 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/KeyedStream.java
@@ -793,7 +793,7 @@ public class KeyedStream<T, KEY> extends DataStream<T> {
* per key.
*
* @param positionToMax
- * The field position in the data points to minimize. This is applicable to
+ * The field position in the data points to maximize. This is applicable to
* Tuple types, Scala case classes, and primitive types (which is considered
* as having one field).
* @return The transformed DataStream.
[flink] 05/10: [FLINK-13724][docs] Remove unnecessary whitespace
from the generated pages
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit e670293f90f70a5b2b72b33b48b08e414ef3fd5d
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 16:18:06 2019 +0200
[FLINK-13724][docs] Remove unnecessary whitespace from the generated pages
Starting command tags with "{%-" will drop all whitespace to the left and ending
with "-%}" will drop all whitespace to the right (including newlines!).
Code like the following would otherwise create quite some unnecessary
whitespace:
{% if parent_id %}
{% assign parent_id = current[0].nav-parent_id %}
{% else %}
{% break %}
{% endif %}
This closes #9440
---
docs/_includes/sidenav.html | 182 ++++++++++++++++++++++----------------------
docs/_layouts/base.html | 6 +-
docs/_layouts/plain.html | 50 ++++++------
3 files changed, 119 insertions(+), 119 deletions(-)
diff --git a/docs/_includes/sidenav.html b/docs/_includes/sidenav.html
index cc787d9..1073d99 100644
--- a/docs/_includes/sidenav.html
+++ b/docs/_includes/sidenav.html
@@ -17,36 +17,36 @@ specific language governing permissions and limitations
under the License.
-->
-{% comment %}
+{%- comment -%}
==============================================================================
Extract the active nav IDs.
==============================================================================
-{% endcomment %}
-
-{% assign active_nav_ids = site.array %}
-{% assign parent_id = page.nav-parent_id %}
-
-{% for i in (1..10) %}
- {% if parent_id %}
- {% assign active_nav_ids = active_nav_ids | push: parent_id %}
- {% assign current = (site.pages_by_language[page.language] | where: "nav-id" , parent_id | sort: "nav-pos") %}
- {% if current.size > 0 %}
- {% assign parent_id = current[0].nav-parent_id %}
- {% else %}
- {% break %}
- {% endif %}
- {% else %}
- {% break %}
- {% endif %}
-{% endfor %}
-
-{% if page.language == "en" %}
- {% capture baseurl_i18n %}{{ site.baseurl }}{% endcapture %}
-{% else if page.language == "zh" %}
- {% capture baseurl_i18n %}{{ site.baseurl }}/{{ page.language }}{% endcapture %}
-{% endif %}
-
-{% comment %}
+{%- endcomment -%}
+
+{%- assign active_nav_ids = site.array -%}
+{%- assign parent_id = page.nav-parent_id -%}
+
+{%- for i in (1..10) -%}
+ {%- if parent_id -%}
+ {%- assign active_nav_ids = active_nav_ids | push: parent_id -%}
+ {%- assign current = (site.pages_by_language[page.language] | where: "nav-id" , parent_id | sort: "nav-pos") -%}
+ {%- if current.size > 0 -%}
+ {%- assign parent_id = current[0].nav-parent_id -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+{%- endfor -%}
+
+{%- if page.language == "en" -%}
+ {%- capture baseurl_i18n -%}{{ site.baseurl }}{%- endcapture -%}
+{%- else if page.language == "zh" -%}
+ {%- capture baseurl_i18n -%}{{ site.baseurl }}/{{ page.language }}{%- endcapture -%}
+{%- endif -%}
+
+{%- comment -%}
==============================================================================
Build the nested list from nav-id and nav-parent_id relations.
==============================================================================
@@ -63,77 +63,77 @@ Level 0 is made up of all pages, which have nav-parent_id set to 'root'.
The 'title' of the page is used as the default link text. You can
override this via 'nav-title'. The relative position per navigational
level is determined by 'nav-pos'.
-{% endcomment %}
+{%- endcomment -%}
-{% assign elementsPosStack = site.array %}
-{% assign posStack = site.array %}
+{%- assign elementsPosStack = site.array -%}
+{%- assign posStack = site.array -%}
-{% assign elements = site.array %}
-{% assign children = (site.pages_by_language[page.language] | where: "nav-parent_id" , "root" | sort: "nav-pos") %}
-{% if children.size > 0 %}
- {% assign elements = elements | push: children %}
-{% endif %}
+{%- assign elements = site.array -%}
+{%- assign children = (site.pages_by_language[page.language] | where: "nav-parent_id" , "root" | sort: "nav-pos") -%}
+{%- if children.size > 0 -%}
+ {%- assign elements = elements | push: children -%}
+{%- endif -%}
-{% assign elementsPos = 0 %}
-{% assign pos = 0 %}
+{%- assign elementsPos = 0 -%}
+{%- assign pos = 0 -%}
<div class="sidenav-logo">
<p><a href="{{ baseurl_i18n }}"><img class="bottom" alt="Apache Flink" src="{{ site.baseurl }}/page/img/navbar-brand-logo.jpg"></a> v{{ site.version_title }}</p>
</div>
<ul id="sidenav">
-{% for i in (1..10000) %}
- {% if pos >= elements[elementsPos].size %}
- {% if elementsPos == 0 %}
- {% break %}
- {% else %}
- {% assign elementsPos = elementsPosStack | last %}
- {% assign pos = posStack | last %}
+{%- for i in (1..10000) -%}
+ {%- if pos >= elements[elementsPos].size -%}
+ {%- if elementsPos == 0 -%}
+ {%- break -%}
+ {%- else -%}
+ {%- assign elementsPos = elementsPosStack | last -%}
+ {%- assign pos = posStack | last %}
</ul></div></li>
- {% assign elementsPosStack = elementsPosStack | pop %}
- {% assign posStack = posStack | pop %}
- {% endif %}
- {% else %}
- {% assign this = elements[elementsPos][pos] %}
-
- {% if this.url == page.url %}
- {% assign active = true %}
- {% elsif this.nav-id and active_nav_ids contains this.nav-id %}
- {% assign active = true %}
- {% else %}
- {% assign active = false %}
- {% endif %}
-
- {% capture title %}{% if this.nav-title %}{{ this.nav-title }}{% else %}{{ this.title }}{% endif %}{% endcapture %}
- {% capture target %}"{{ site.baseurl }}{{ this.url }}"{% if active %} class="active"{% endif %}{% endcapture %}
- {% capture overview_target %}"{{ site.baseurl }}{{ this.url }}"{% if this.url == page.url %} class="active"{% endif %}{% endcapture %}
+ {%- assign elementsPosStack = elementsPosStack | pop -%}
+ {%- assign posStack = posStack | pop -%}
+ {%- endif -%}
+ {%- else -%}
+ {%- assign this = elements[elementsPos][pos] -%}
+
+ {%- if this.url == page.url -%}
+ {%- assign active = true -%}
+ {%- elsif this.nav-id and active_nav_ids contains this.nav-id -%}
+ {%- assign active = true -%}
+ {%- else -%}
+ {%- assign active = false -%}
+ {%- endif -%}
+
+ {%- capture title -%}{%- if this.nav-title -%}{{ this.nav-title }}{%- else -%}{{ this.title }}{%- endif -%}{%- endcapture -%}
+ {%- capture target -%}"{{ site.baseurl }}{{ this.url }}"{%- if active %} class="active"{%- endif -%}{%- endcapture -%}
+ {%- capture overview_target -%}"{{ site.baseurl }}{{ this.url }}"{%- if this.url == page.url -%} class="active"{%- endif -%}{%- endcapture -%}
{% if this.section-break %}<hr class="section-break"></hr>{% endif %}
- {% assign pos = pos | plus: 1 %}
- {% if this.nav-id %}
- {% assign children = (site.pages_by_language[page.language] | where: "nav-parent_id" , this.nav-id | sort: "nav-pos") %}
- {% if children.size > 0 %}
- {% capture collapse_target %}"#collapse-{{ i }}" data-toggle="collapse"{% if active %} class="active"{% endif %}{% endcapture %}
- {% capture expand %}{% unless active %} <i class="fa fa-caret-down pull-right" aria-hidden="true" style="padding-top: 4px"></i>{% endunless %}{% endcapture %}
+ {%- assign pos = pos | plus: 1 -%}
+ {%- if this.nav-id -%}
+ {%- assign children = (site.pages_by_language[page.language] | where: "nav-parent_id" , this.nav-id | sort: "nav-pos") -%}
+ {%- if children.size > 0 -%}
+ {%- capture collapse_target -%}"#collapse-{{ i }}" data-toggle="collapse"{%- if active -%} class="active"{%- endif -%}{%- endcapture -%}
+ {%- capture expand -%}{%- unless active -%} <i class="fa fa-caret-down pull-right" aria-hidden="true" style="padding-top: 4px"></i>{%- endunless -%}{%- endcapture %}
<li><a href={{ collapse_target }}>{{ title }}{{ expand }}</a><div class="collapse{% if active %} in{% endif %}" id="collapse-{{ i }}"><ul>
- {% if this.nav-show_overview %}
- <li><a href={{ overview_target }}>
- {% if page.is_default_language %}Overview{% else %}概览{% endif %}</a></li>
- {% endif %}
- {% assign elements = elements | push: children %}
- {% assign elementsPosStack = elementsPosStack | push: elementsPos %}
- {% assign posStack = posStack | push: pos %}
-
- {% assign elementsPos = elements.size | minus: 1 %}
- {% assign pos = 0 %}
- {% else %}
+ {%- if this.nav-show_overview %}
+<li><a href={{ overview_target }}>
+ {%- if page.is_default_language %}Overview{% else %}概览{% endif %}</a></li>
+ {%- endif -%}
+ {%- assign elements = elements | push: children -%}
+ {%- assign elementsPosStack = elementsPosStack | push: elementsPos -%}
+ {%- assign posStack = posStack | push: pos -%}
+
+ {%- assign elementsPos = elements.size | minus: 1 -%}
+ {%- assign pos = 0 -%}
+ {%- else %}
<li><a href={{ target }}>{{ title }}</a></li>
- {% endif %}
- {% else %}
+ {%- endif -%}
+ {%- else %}
<li><a href={{ target }}>{{ title }}</a></li>
- {% endif %}
- {% endif %}
-{% endfor %}
+ {%- endif -%}
+ {%- endif -%}
+{%- endfor %}
<li class="divider"></li>
<li><a href="{{ site.javadocs_baseurl }}/api/java"><i class="fa fa-external-link title" aria-hidden="true"></i> Javadocs</a></li>
<li><a href="{{ site.javadocs_baseurl }}/api/scala/index.html#org.apache.flink.api.scala.package"><i class="fa fa-external-link title" aria-hidden="true"></i> Scaladocs</a></li>
@@ -153,29 +153,29 @@ level is determined by 'nav-pos'.
<div class="sidenav-versions">
<div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
- {% if page.is_default_language %}
+ {%- if page.is_default_language -%}
Pick Docs Version
- {% else %}
+ {%- else -%}
选择文档版本
- {% endif %}
+ {%- endif -%}
<span class="caret"></span></button>
<ul class="dropdown-menu">
- {% for d in site.previous_docs %}
+ {%- for d in site.previous_docs %}
<li><a href="{{ d[1] }}">v{{ d[0] }}</a></li>
- {% endfor %}
+ {%- endfor %}
</ul>
</div>
</div>
<div class="sidenav-languages">
- {% if page.is_default_language %}
+ {%- if page.is_default_language -%}
<!-- link to the Chinese home page when current is blog page -->
<a href="{{ site.baseurl }}/zh{{ page.url }}">
<button type="submit" class="btn btn-default">中文版</button>
</a>
- {% else %}
+ {%- else -%}
<a href="{{ site.baseurl }}{{ page.url | remove_first: 'zh/' }}">
<button type="submit" class="btn btn-default">English</button>
</a>
- {% endif %}
+ {%- endif %}
</div>
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index b823961..512838a 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -76,9 +76,9 @@ under the License.
{% include sidenav.html %}
</div>
<div class="col-lg-9 content" id="contentcol">
- {% if page.mathjax %}
- {% include latex_commands.html %}
- {% endif %}
+ {%- if page.mathjax -%}
+ {%- include latex_commands.html -%}
+ {%- endif %}
{{ content }}
</div>
diff --git a/docs/_layouts/plain.html b/docs/_layouts/plain.html
index 10c5993..3f28fdf 100644
--- a/docs/_layouts/plain.html
+++ b/docs/_layouts/plain.html
@@ -20,48 +20,48 @@ specific language governing permissions and limitations
under the License.
-->
-{% assign active_pages = site.array %}
-{% assign active = page %}
+{%- assign active_pages = site.array -%}
+{%- assign active = page -%}
-{% for i in (1..10) %}
- {% assign active_pages = active_pages | push: active %}
- {% if active.nav-parent_id %}
- {% assign next = site.pages_by_language[page.language] | where: "nav-id" , active.nav-parent_id %}
- {% if next.size > 0 %}
- {% assign active = next[0] %}
- {% else %}
- {% break %}
- {% endif %}
- {% else %}
- {% break %}
- {% endif %}
-{% endfor %}
+{%- for i in (1..10) -%}
+ {%- assign active_pages = active_pages | push: active -%}
+ {%- if active.nav-parent_id -%}
+ {%- assign next = site.pages_by_language[page.language] | where: "nav-id" , active.nav-parent_id -%}
+ {%- if next.size > 0 -%}
+ {%- assign active = next[0] -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+ {%- else -%}
+ {%- break -%}
+ {%- endif -%}
+{%- endfor -%}
{% assign active_pages = active_pages | reverse %}
<ol class="breadcrumb">
-{% for p in active_pages %}
+{%- for p in active_pages %}
{% capture title %}{% if p.nav-title %}{{ p.nav-title }}{% else %}{{ p.title }}{% endif %}{% endcapture %}
- {% if forloop.last == true %}
+ {%- if forloop.last == true %}
<li class="active">{{ title }}</li>
- {% elsif p.nav-show_overview %}
+ {%- elsif p.nav-show_overview %}
<li><a href="{{ site.baseurl }}{{ p.url }}">{{ title }}</a></li>
- {% else %}
+ {%- else %}
<li>{{ title }}</li>
- {% endif %}
-{% endfor %}
+ {%- endif -%}
+{%- endfor %}
</ol>
<h1>{{ page.title }}{% if page.is_beta %} <span class="beta">Beta</span>{% endif %}</h1>
{% if site.show_outdated_warning %}
<div class="alert alert-danger" role="alert">
- {% if page.language == "en" %}
+ {%- if page.language == "en" %}
<strong>This documentation is for an out-of-date version of Apache Flink. We recommend you use <a href="https://ci.apache.org/projects/flink/flink-docs-stable/">the latest stable version</a>.</strong>
- {% else if page.language == "zh" %}
+ {%- else if page.language == "zh" %}
<strong>本文档是 Apache Flink 的旧版本。建议访问 <a href="https://ci.apache.org/projects/flink/flink-docs-stable/zh">最新的稳定版本</a>。</strong>
- {% endif %}
+ {%- endif %}
</div>
-{% endif %}
+{%- endif %}
{{ content }}
[flink] 09/10: [hotfix][docs] Temporarily disable liveserve
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit f802e16b06b0c3a3682af7f9017f9c0a69e5d4de
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 23:00:09 2019 +0200
[hotfix][docs] Temporarily disable liveserve
./build_docs.sh -i previously did not only enable incremental documentation
building while serving the docs, it also enabled a 'liveserve' mode that
automatically reloaded pages in the browser when they changed. This is based
on the 'hawkins' module which is not (yet) compatible with jekyll 4.0 which we
need to (significantly) improve build times.
This disables the liveserve mode and remove the hawkins module until a new
version is available.
---
docs/Gemfile | 6 +++---
docs/Gemfile.lock | 4 ----
docs/build_docs.sh | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/docs/Gemfile b/docs/Gemfile
index 70bd4df..ef5086e 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -30,6 +30,6 @@ gem 'jekyll-paginate', '1.1.0'
gem 'liquid-c', '4.0.0' # speed-up site generation
gem 'sassc', '2.0.1' # speed-up site generation
-group :jekyll_plugins do
- gem 'hawkins'
-end
+# group :jekyll_plugins do
+# gem 'hawkins'
+# end
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index d8bd82e..f6aedee 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -13,9 +13,6 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
forwardable-extended (2.6.0)
- hawkins (2.0.5)
- em-websocket (~> 0.5)
- jekyll (~> 3.1)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
@@ -83,7 +80,6 @@ PLATFORMS
DEPENDENCIES
addressable (= 2.6.0)
- hawkins
jekyll (= 3.7.2)
jekyll-multiple-languages (= 2.0.3)
jekyll-paginate (= 1.1.0)
diff --git a/docs/build_docs.sh b/docs/build_docs.sh
index 1ab46f1..aecac83 100755
--- a/docs/build_docs.sh
+++ b/docs/build_docs.sh
@@ -64,7 +64,7 @@ while getopts "piez" opt; do
;;
i)
[[ `${RUBY} -v` =~ 'ruby 1' ]] && echo "Error: building the docs with the incremental option requires at least ruby 2.0" && exit 1
- JEKYLL_CMD="liveserve --baseurl= --watch --incremental"
+ JEKYLL_CMD="serve --baseurl= --watch --incremental"
;;
e)
JEKYLL_CONFIG="--config _config.yml,_config_dev_en.yml"
[flink] 10/10: [FLINK-13726][docs] Build docs with jekyll
4.0.0.pre.beta1
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ac1b8dbf15c405d0646671a138a53c9953153165
Author: Nico Kruber <ni...@ververica.com>
AuthorDate: Wed Aug 14 23:05:00 2019 +0200
[FLINK-13726][docs] Build docs with jekyll 4.0.0.pre.beta1
This significantly reduces the build times, on my machine from 140s to 47s!
This closes #9444
---
docs/.gitignore | 3 ++-
docs/Gemfile | 4 ++--
docs/Gemfile.lock | 19 +++++++++++--------
docs/README.md | 3 +--
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/docs/.gitignore b/docs/.gitignore
index 98b6f6b..6b3ce42 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,6 +1,7 @@
.bundle/
.jekyll-metadata
+.jekyll-cache/
.rubydeps/
content/
ruby2/.bundle/
-ruby2/.rubydeps/
\ No newline at end of file
+ruby2/.rubydeps/
diff --git a/docs/Gemfile b/docs/Gemfile
index ef5086e..f7ff66a 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -18,9 +18,9 @@
source 'https://rubygems.org'
-ruby '>= 2.1.0'
+ruby '>= 2.4.0'
-gem 'jekyll', '3.7.2'
+gem 'jekyll', '4.0.0.pre.beta1'
gem 'addressable', '2.6.0'
gem 'octokit', '4.14.0'
gem 'therubyracer', '0.12.3'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index f6aedee..185af92 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -14,20 +14,21 @@ GEM
ffi (1.11.1)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
- i18n (0.9.5)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
- jekyll (3.7.2)
+ jekyll (4.0.0.pre.beta1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
- i18n (~> 0.7)
+ i18n (>= 0.9.5, < 2)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
- kramdown (~> 1.14)
+ kramdown (~> 2.1)
+ kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
- rouge (>= 1.7, < 4)
+ rouge (~> 3.0)
safe_yaml (~> 1.0)
jekyll-multiple-languages (2.0.3)
jekyll-paginate (1.1.0)
@@ -36,7 +37,9 @@ GEM
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.2.0)
- kramdown (1.17.0)
+ kramdown (2.1.0)
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
libv8 (3.16.14.19)
liquid (4.0.3)
liquid-c (4.0.0)
@@ -80,7 +83,7 @@ PLATFORMS
DEPENDENCIES
addressable (= 2.6.0)
- jekyll (= 3.7.2)
+ jekyll (= 4.0.0.pre.beta1)
jekyll-multiple-languages (= 2.0.3)
jekyll-paginate (= 1.1.0)
json (= 2.2.0)
@@ -90,7 +93,7 @@ DEPENDENCIES
therubyracer (= 0.12.3)
RUBY VERSION
- ruby 2.3.1p112
+ ruby 2.6.3p62
BUNDLED WITH
1.17.2
diff --git a/docs/README.md b/docs/README.md
index 924fcba..c3d5f63 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -42,8 +42,7 @@ If you call the script with the preview flag `build_docs.sh -p`, Jekyll will
start a web server at `localhost:4000` and watch the docs directory for
updates. Use this mode to preview changes locally.
-If you have ruby 2.0 or greater,
-you can call the script with the incremental flag `build_docs.sh -i`.
+You can call the script with the incremental flag `build_docs.sh -i`.
Jekyll will then serve a live preview at `localhost:4000`,
and it will be much faster because it will only rebuild the pages corresponding
to files that are modified. Note that if you are making changes that affect