Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert "release 3.0.1"" #1569

Merged
merged 1 commit into from
Mar 15, 2022
Merged

Revert "Revert "release 3.0.1"" #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish docs via GitHub Pages
on:
push:
branches:
- v3.0.0
- v3.0.1

jobs:
deploy:
Expand Down Expand Up @@ -35,19 +35,19 @@ jobs:
- name: mike list delete
run: |
mike list
- name: Mike Deploy 3.0.0
- name: Mike Deploy 3.0.1
run: |
#mike delete v3.0.0 -p
mike deploy 3.0.0 -p --rebase
mike set-default 3.0.0 -p --rebase
#mike delete v3.0.1 -p
mike deploy 3.0.1 -p --rebase
mike set-default 3.0.1 -p --rebase
mike list
- name: show git branch
run: |
git branch
git checkout gh-pages
- name: Compress
run: |
tar -vczf nebula-docs.tar.gz 3.0.0 versions.json *.html
tar -vczf nebula-docs.tar.gz 3.0.1 versions.json *.html

- name: Transfer
# uses: garygrossgarten/github-action-scp@release
Expand All @@ -71,7 +71,7 @@ jobs:
mkdir -p /usr/web/nebula-docs/
tar -xzf /usr/web/nebula-docs.tar.gz -C /usr/web/nebula-docs/
mkdir -p /usr/web/nebula-docs/site/pdf/
cp -f /usr/web/nebula-docs/3.0.0/pdf/NebulaGraph-CN.pdf /usr/web/nebula-docs/site/pdf/NebulaGraph-book.pdf
cp -f /usr/web/nebula-docs/3.0.1/pdf/NebulaGraph-CN.pdf /usr/web/nebula-docs/site/pdf/NebulaGraph-book.pdf

# pip3 install --upgrade pip
# pip3 install -r /usr/web/nebula-docs/requirement.txt
Expand Down
12 changes: 6 additions & 6 deletions docs-2.0/2.quick-start/4.nebula-graph-crud.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ nebula> SHOW HOSTS;
+------------------+------+----------+--------------+----------------------+------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+------------------+------+----------+--------------+----------------------+------------------------+---------+
| "192.168.10.100" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.101" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.102" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.100" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "192.168.10.101" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "192.168.10.102" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
+------------------+------+----------+--------------+----------------------+------------------------+---------+
```

Expand Down Expand Up @@ -141,9 +141,9 @@ nebula> SHOW HOSTS;
+-------------+-----------+-----------+--------------+----------------------------------+------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+-------------+-----------+-----------+--------------+----------------------------------+------------------------+---------+
| "storaged0" | 9779 | "ONLINE" | 5 | "basketballplayer:5" | "basketballplayer:5" | "3.0.0" |
| "storaged1" | 9779 | "ONLINE" | 5 | "basketballplayer:5" | "basketballplayer:5" | "3.0.0" |
| "storaged2" | 9779 | "ONLINE" | 5 | "basketballplayer:5" | "basketballplayer:5" | "3.0.0" |
| "storaged0" | 9779 | "ONLINE" | 5 | "basketballplayer:5" | "basketballplayer:5" | "3.0.1" |
| "storaged1" | 9779 | "ONLINE" | 5 | "basketballplayer:5" | "basketballplayer:5" | "3.0.1" |
| "storaged2" | 9779 | "ONLINE" | 5 | "basketballplayer:5" | "basketballplayer:5" | "3.0.1" |
+-------------+-----------+-----------+--------------+----------------------------------+------------------------+---------+
```

Expand Down
24 changes: 12 additions & 12 deletions docs-2.0/3.ngql-guide/7.general-query-statements/6.show/6.show-hosts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,35 @@ nebula> SHOW HOSTS;
+-------------+-------+----------+--------------+----------------------------------+------------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+-------------+-------+----------+--------------+----------------------------------+------------------------------+---------+
| "storaged0" | 9779 | "ONLINE" | 8 | "docs:5, basketballplayer:3" | "docs:5, basketballplayer:3" | "3.0.0" |
| "storaged1" | 9779 | "ONLINE" | 9 | "basketballplayer:4, docs:5" | "docs:5, basketballplayer:4" | "3.0.0" |
| "storaged2" | 9779 | "ONLINE" | 8 | "basketballplayer:3, docs:5" | "docs:5, basketballplayer:3" | "3.0.0" |
| "storaged0" | 9779 | "ONLINE" | 8 | "docs:5, basketballplayer:3" | "docs:5, basketballplayer:3" | "3.0.1" |
| "storaged1" | 9779 | "ONLINE" | 9 | "basketballplayer:4, docs:5" | "docs:5, basketballplayer:4" | "3.0.1" |
| "storaged2" | 9779 | "ONLINE" | 8 | "basketballplayer:3, docs:5" | "docs:5, basketballplayer:3" | "3.0.1" |
+-------------+-------+----------+--------------+----------------------------------+------------------------------+---------+

nebula> SHOW HOSTS GRAPH;
+-----------+------+----------+---------+--------------+---------+
| Host | Port | Status | Role | Git Info Sha | Version |
+-----------+------+----------+---------+--------------+---------+
| "graphd" | 9669 | "ONLINE" | "GRAPH" | "3ba41bd" | "3.0.0" |
| "graphd1" | 9669 | "ONLINE" | "GRAPH" | "3ba41bd" | "3.0.0" |
| "graphd2" | 9669 | "ONLINE" | "GRAPH" | "3ba41bd" | "3.0.0" |
| "graphd" | 9669 | "ONLINE" | "GRAPH" | "3ba41bd" | "3.0.1" |
| "graphd1" | 9669 | "ONLINE" | "GRAPH" | "3ba41bd" | "3.0.1" |
| "graphd2" | 9669 | "ONLINE" | "GRAPH" | "3ba41bd" | "3.0.1" |
+-----------+------+----------+---------+--------------+---------+

nebula> SHOW HOSTS STORAGE;
+-------------+------+----------+-----------+--------------+---------+
| Host | Port | Status | Role | Git Info Sha | Version |
+-------------+------+----------+-----------+--------------+---------+
| "storaged0" | 9779 | "ONLINE" | "STORAGE" | "3ba41bd" | "3.0.0" |
| "storaged1" | 9779 | "ONLINE" | "STORAGE" | "3ba41bd" | "3.0.0" |
| "storaged2" | 9779 | "ONLINE" | "STORAGE" | "3ba41bd" | "3.0.0" |
| "storaged0" | 9779 | "ONLINE" | "STORAGE" | "3ba41bd" | "3.0.1" |
| "storaged1" | 9779 | "ONLINE" | "STORAGE" | "3ba41bd" | "3.0.1" |
| "storaged2" | 9779 | "ONLINE" | "STORAGE" | "3ba41bd" | "3.0.1" |
+-------------+------+----------+-----------+--------------+---------+

nebula> SHOW HOSTS META;
+----------+------+----------+--------+--------------+---------+
| Host | Port | Status | Role | Git Info Sha | Version |
+----------+------+----------+--------+--------------+---------+
| "metad2" | 9559 | "ONLINE" | "META" | "3ba41bd" | "3.0.0" |
| "metad0" | 9559 | "ONLINE" | "META" | "3ba41bd" | "3.0.0" |
| "metad1" | 9559 | "ONLINE" | "META" | "3ba41bd" | "3.0.0" |
| "metad2" | 9559 | "ONLINE" | "META" | "3ba41bd" | "3.0.1" |
| "metad0" | 9559 | "ONLINE" | "META" | "3ba41bd" | "3.0.1" |
| "metad1" | 9559 | "ONLINE" | "META" | "3ba41bd" | "3.0.1" |
+----------+------+----------+--------+--------------+---------+
```
12 changes: 6 additions & 6 deletions docs-2.0/3.ngql-guide/9.space-statements/1.create-space.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ nebula> SHOW HOSTS;
+-------------+------+----------+--------------+--------------------------------+--------------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+-------------+------+----------+--------------+--------------------------------+--------------------------------+---------+
| "storaged0" | 9779 | "ONLINE" | 8 | "basketballplayer:3, test:5" | "basketballplayer:10, test:10" | "3.0.0" |
| "storaged1" | 9779 | "ONLINE" | 9 | "basketballplayer:4, test:5" | "basketballplayer:10, test:10" | "3.0.0" |
| "storaged2" | 9779 | "ONLINE" | 3 | "basketballplayer:3" | "basketballplayer:10, test:10" | "3.0.0" |
| "storaged0" | 9779 | "ONLINE" | 8 | "basketballplayer:3, test:5" | "basketballplayer:10, test:10" | "3.0.1" |
| "storaged1" | 9779 | "ONLINE" | 9 | "basketballplayer:4, test:5" | "basketballplayer:10, test:10" | "3.0.1" |
| "storaged2" | 9779 | "ONLINE" | 3 | "basketballplayer:3" | "basketballplayer:10, test:10" | "3.0.1" |
+-------------+------+----------+--------------+--------------------------------+--------------------------------+---------+
```

Expand All @@ -112,8 +112,8 @@ nebula> SHOW HOSTS;
+-------------+------+----------+--------------+--------------------------------+--------------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+-------------+------+----------+--------------+--------------------------------+--------------------------------+---------+
| "storaged0" | 9779 | "ONLINE" | 7 | "basketballplayer:3, test:4" | "basketballplayer:10, test:10" | "3.0.0" |
| "storaged1" | 9779 | "ONLINE" | 7 | "basketballplayer:4, test:3" | "basketballplayer:10, test:10" | "3.0.0" |
| "storaged2" | 9779 | "ONLINE" | 6 | "basketballplayer:3, test:3" | "basketballplayer:10, test:10" | "3.0.0" |
| "storaged0" | 9779 | "ONLINE" | 7 | "basketballplayer:3, test:4" | "basketballplayer:10, test:10" | "3.0.1" |
| "storaged1" | 9779 | "ONLINE" | 7 | "basketballplayer:4, test:3" | "basketballplayer:10, test:10" | "3.0.1" |
| "storaged2" | 9779 | "ONLINE" | 6 | "basketballplayer:3, test:3" | "basketballplayer:10, test:10" | "3.0.1" |
+-------------+------+----------+--------------+--------------------------------+--------------------------------+---------+
```
6 changes: 3 additions & 3 deletions ...2.compile-and-install-nebula-graph/3.deploy-nebula-graph-with-docker-compose.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@
+-------------+------+----------+--------------+----------------------+------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+-------------+------+----------+--------------+----------------------+------------------------+---------+
| "storaged0" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "storaged1" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "storaged2" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "storaged0" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "storaged1" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "storaged2" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
+-------------+------+----------+--------------+----------------------+------------------------+---------+
```
!!! Note
Expand Down
10 changes: 5 additions & 5 deletions ...-installation/2.compile-and-install-nebula-graph/deploy-nebula-graph-cluster.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ Welcome to Nebula Graph!
+------------------+------+----------+--------------+----------------------+------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+------------------+------+----------+--------------+----------------------+------------------------+---------+
| "192.168.10.111" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.112" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.113" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.114" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.115" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.0" |
| "192.168.10.111" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "192.168.10.112" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "192.168.10.113" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "192.168.10.114" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
| "192.168.10.115" | 9779 | "ONLINE" | 0 | "No valid partition" | "No valid partition" | "3.0.1" |
+------------------+------+----------+--------------+----------------------+------------------------+---------+
```
12 changes: 6 additions & 6 deletions docs-2.0/8.service-tuning/load-balance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ nebula> SHOW HOSTS;
+------------------+------+----------+--------------+-----------------------------------+------------------------+---------+
| Host | Port | Status | Leader count | Leader distribution | Partition distribution | Version |
+------------------+------+----------+--------------+-----------------------------------+------------------------+---------+
| "192.168.10.100" | 9779 | "ONLINE" | 4 | "basketballplayer:3" | "basketballplayer:8" | "3.0.0" |
| "192.168.10.101" | 9779 | "ONLINE" | 8 | "basketballplayer:3" | "basketballplayer:8" | "3.0.0" |
| "192.168.10.102" | 9779 | "ONLINE" | 3 | "basketballplayer:3" | "basketballplayer:8" | "3.0.0" |
| "192.168.10.103" | 9779 | "ONLINE" | 0 | "basketballplayer:2" | "basketballplayer:7" | "3.0.0" |
| "192.168.10.104" | 9779 | "ONLINE" | 0 | "basketballplayer:2" | "basketballplayer:7" | "3.0.0" |
| "192.168.10.105" | 9779 | "ONLINE" | 0 | "basketballplayer:2" | "basketballplayer:7" | "3.0.0" |
| "192.168.10.100" | 9779 | "ONLINE" | 4 | "basketballplayer:3" | "basketballplayer:8" | "3.0.1" |
| "192.168.10.101" | 9779 | "ONLINE" | 8 | "basketballplayer:3" | "basketballplayer:8" | "3.0.1" |
| "192.168.10.102" | 9779 | "ONLINE" | 3 | "basketballplayer:3" | "basketballplayer:8" | "3.0.1" |
| "192.168.10.103" | 9779 | "ONLINE" | 0 | "basketballplayer:2" | "basketballplayer:7" | "3.0.1" |
| "192.168.10.104" | 9779 | "ONLINE" | 0 | "basketballplayer:2" | "basketballplayer:7" | "3.0.1" |
| "192.168.10.105" | 9779 | "ONLINE" | 0 | "basketballplayer:2" | "basketballplayer:7" | "3.0.1" |
+------------------+------+----------+--------------+-----------------------------------+------------------------+---------+
```

Expand Down
2 changes: 1 addition & 1 deletion docs-2.0/nebula-dashboard-ent/1.what-is-dashboard-ent.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Nebula Graph 的版本和 Dashboard 企业版的版本对应关系如下。

|Nebula Graph 版本|Dashboard 版本|
|:---|:---|
|2.5.1~3.0.0|1.1.0|
|2.5.1~3.0.1|1.1.0|
|2.0.1~2.6.1|1.0.2|
|2.0.1~2.6.1|1.0.1|
|2.0.1~2.6.1|1.0.0|
2 changes: 1 addition & 1 deletion docs-2.0/nebula-dashboard/1.what-is-dashboard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Nebula Graph 的版本和 Dashboard 社区版的版本对应关系如下。

|Nebula Graph 版本|Dashboard 版本|
|:---|:---|
|2.5.1~3.0.0|1.1.0|
|2.5.1~3.0.1|1.1.0|
|2.0.1~2.5.1|1.0.2|
|2.0.1~2.5.1|1.0.1|

Expand Down
2 changes: 1 addition & 1 deletion docs-2.0/nebula-dashboard/2.deploy-dashboard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

| Dashboard 安装包 | Nebula Graph 版本 |
| :----- | :----- |
| [nebula-dashboard-{{ dashboard.release }}.x86_64.tar.gz](https://oss-cdn.nebula-graph.com.cn/nebula-graph-dashboard/{{ dashboard.release }}/nebula-dashboard-{{ dashboard.release }}.x86_64.tar.gz) | 2.5.1~3.0.0 |
| [nebula-dashboard-{{ dashboard.release }}.x86_64.tar.gz](https://oss-cdn.nebula-graph.com.cn/nebula-graph-dashboard/{{ dashboard.release }}/nebula-dashboard-{{ dashboard.release }}.x86_64.tar.gz) | 2.5.1~3.0.1 |

## 目录结构说明

Expand Down
2 changes: 1 addition & 1 deletion docs-2.0/nebula-explorer/deploy-connect/ex-ug-deploy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

| Nebula Graph 版本 | Explorer 版本 |
| --- | --- |
| 2.5.x ~ 3.0.0| 2.2.0|
| 2.5.x ~ 3.0.1| 2.2.0|
| 2.6.x | 2.1.0 |
| 2.5.x | 2.0.0 |

Expand Down
2 changes: 1 addition & 1 deletion docs-2.0/nebula-studio/about-studio/st-ug-limitations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
| 2.0 & 2.0.1 | 2.x |
| 2.5.x | 3.0.0 |
| 2.6.x | 3.1.0 |
| 3.0.0 | 3.2.0 |
| 3.0.x | 3.2.0 |

## 系统架构

Expand Down
2 changes: 1 addition & 1 deletion docs-2.0/nebula-studio/about-studio/st-ug-release-note.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
## v3.2.0(2022.02.15)

- 功能增强：
- 适配 Nebula 3.0.0，优化用户体验。
- 适配 Nebula 3.0.x，优化用户体验。
- 新增 DEB 部署并启动 Studio。
- 导入：
- 导入时需要输入密码确认，以增强安全性。
Expand Down
4 changes: 2 additions & 2 deletions docs-2.0/stylesheets/extra.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

/* nebula 白天主题色 */
[data-md-color-scheme="nebula"]{
--md-primary-fg-color: #002FA7; /* 导航栏页面颜色 */
--md-accent-fg-color: #00FFFF; /* 选中/悬浮颜色 */
--md-primary-fg-color: #E23620; /* 导航栏页面颜色 */
--md-accent-fg-color: #03afaf; /* 选中/悬浮颜色 */

--md-code-fg-color: rgb(12, 21, 26); /* 代码段字体色 */
--md-code-bg-color: #eaebec;/* 代码段背景色 */
Expand Down
8 changes: 4 additions & 4 deletions mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ site_name: Nebula Graph Database 手册
site_description: Documentation for Nebula Graph Database
site_author: Nebula Graph
site_url: https://docs.nebula-graph.com.cn/
edit_uri: 'edit/v3.0.0/docs-2.0/'
edit_uri: 'edit/v3.0.1/docs-2.0/'
docs_dir: docs-2.0

# repository
Expand Down Expand Up @@ -43,12 +43,12 @@ extra:
provider: google
property: UA-60523578-15
nebula:
release: 3.0.0
release: 3.0.1
nightly: nightly
master: master
base20: 2.0
base200: 2.0.0
branch: v3.0.0
branch: v3.0.1
version:
method: mike
social:
Expand Down Expand Up @@ -566,7 +566,7 @@ plugins:

- with-pdf:
copyright: 2022 vesoft Inc.
cover_subtitle: v3.0.0
cover_subtitle: v3.0.1
author: 吴敏，周瑶，梁振亚，杨怡璇，黄凤仙
cover: true
back_cover: true
Expand Down