diff --git a/product/en/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md b/product/en/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md
index e1bb605ec48a3d8b854f2014d193621d6ac0fd90..dfcd9a086bb0b1108b178ffb6a9e33cb6b74515e 100644
--- a/product/en/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md
+++ b/product/en/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md
@@ -1,17 +1,17 @@
---
-title: MogDB 2.1.0 Release Notes
-summary: MogDB 2.1.0 Release Notes
+title: MogDB 2.1 Release Notes
+summary: MogDB 2.1 Release Notes
author: Guo Huan
date: 2021-12-06
---
-# MogDB 2.1.0 Release Notes
+# MogDB 2.1 Release Notes
## 1. Version Description
-MogDB version 2.1.0 is further enhanced based on MogDB version 2.0.0 and incorporates the new features of openGauss 2.1.0.
+MogDB version 2.1 is further enhanced based on MogDB version 2.0 and incorporates the new features of openGauss 2.1.0.
-> Note: MogDB 2.1.0 is the Preview version, and the life cycle of this version is half a year.
+> Note: MogDB 2.1 is the Preview version, and the life cycle of this version is half a year.
## 2. New Features
@@ -331,6 +331,16 @@ Backup and restore of subpartition are supported.
- The output of **raise** inside nested stored procedures in MogDB is too detailed
+### MogDB 2.1.1 Modified Defects
+
+MogDB 2.1.1 is the patch version of MogDB 2.1.0, released on 2022.03.22. Based on MogDB 2.1.0, the following fixes are made:
+
+- Fixed the defect of coredump caused by parameter overflow in **pg_encoding_to_char()** function
+
+- Fixed the defect of coredump generated when **connect by** statement is used as query clause
+
+- Fixed the bug that the order of query data in the connect by statement order by level is inconsistent on the x86 platform
+
## 4. Compatibility
This version supports the following operating system and CPU architecture combinations.
diff --git a/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md b/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md
index cb8a1e0bc780935b3ebbdecbe73e645be6365782..9464e7f1128c56530ddf672e97f858240148046b 100644
--- a/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md
+++ b/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md
@@ -79,7 +79,7 @@ To install compat-tools, please download the tool of the latest version from [ht
```sql
[omm@mogdb-kernel-0005 ~]$ gsql -d mogdb -p 26000
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md b/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md
index d9e87a9f83fc6750e4d59bb16e8395f4407932d9..382d743f63b23e5710a1ff8a44270b6cb6ce7f98 100644
--- a/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md
+++ b/product/en/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md
@@ -63,7 +63,7 @@ Visit [MogDB official website download page](https://www.mogdb.io/en/downloads/m
## Instructions for Use
-mog_xlogdump is a tool for parsing and displaying MogDB-2.1.0 Wal logs. Auxiliary tool designed to help DBAs analyze and debug database problems.
+mog_xlogdump is a tool for parsing and displaying MogDB-2.1 Wal logs. Auxiliary tool designed to help DBAs analyze and debug database problems.
The mog_xlogdump parsing tool currently does not support column table. (The research found that the column-stored table will generate two corresponding CUDesc and delta tables in cstore mode. CUDesc is the metadata of the column-stored table, and delta is the temporary table of the column-stored table, which is a row-stored table. These two tables (CUDesc, delta) will be written in the wal log. Although the wal log can parse the corresponding delta table, the table is controlled by the table attribute threshold deltarow_threshold. The default is 100, that is, less than 100 pieces of data will be written in the delta table. Write directly to the cu file)
diff --git a/product/en/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md b/product/en/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md
index 7f961d4d2cfe523f58bc563464c3cdbfc2024f63..b8f94a31ff72cbb402220878a7dffd47d496cbcb 100644
--- a/product/en/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md
+++ b/product/en/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md
@@ -12,7 +12,7 @@ Flashback restoration is a part of the database recovery technology. It can be u
**Flashback supports two restoration modes:**
- MVCC-based multi-version data restoration (only Ustore is supported): It is suitable for query and restoration of data deleted, updated and inserted by mistake. Users can configure the retention time of the old version and execute the corresponding query or restore command to query or restore data to Specified point in time or CSN point.
-- Restoration based on the type windows system recycle bin (only Astore is supported): It is suitable for the restoration of tables that are DROP and TRUNCATE by mistake. By configuring the recycle bin switch and executing the corresponding restore command, the user can retrieve the tables that were erroneously DROP and TRUNCATE.
+- Restoration based on database recycle bin (only Astore is supported): It is suitable for the restoration of tables that are DROP and TRUNCATE by mistake. By configuring the recycle bin switch and executing the corresponding restore command, the user can retrieve the tables that were erroneously DROP and TRUNCATE.
**Related parameters:**
@@ -46,8 +46,8 @@ Flashback query enables you to query a snapshot of a table at a certain time poi
### Syntax
-```sql
-{[ ONLY ] table_name [ * ] [ partition_clause ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+```ebnf+diagram
+FlashBack ::= {[ ONLY ] table_name [ * ] [ partition_clause ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
[ TABLESAMPLE sampling_method ( argument [, ...] ) [ REPEATABLE ( seed ) ] ]
[TIMECAPSULE { TIMESTAMP | CSN } expression ]
|( select ) [ AS ] alias [ ( column_alias [, ...] ) ]
@@ -100,8 +100,8 @@ Flashback table enables you to restore a table to a specific point in time. When
### Syntax
-```sql
-TIMECAPSULE TABLE table_name TO { TIMESTAMP | CSN } expression
+```ebnf+diagram
+FlashBack ::= TIMECAPSULE TABLE table_name TO { TIMESTAMP | CSN } expression
```
### Examples
@@ -128,14 +128,14 @@ Flashback truncate enables you to restore tables that are truncated by mistake a
- Drop a table.
- ```sql
- DROP TABLE table_name [PURGE]
+ ```ebnf+diagram
+ DropTable ::= DROP TABLE table_name [PURGE]
```
- Purge objects in the recycle bin.
- ```sql
- PURGE { TABLE { table_name }
+ ```ebnf+diagram
+ PurgeRecyclebin ::= PURGE { TABLE { table_name }
| INDEX { index_name }
| RECYCLEBIN
}
@@ -143,20 +143,20 @@ Flashback truncate enables you to restore tables that are truncated by mistake a
- Flash back a dropped table.
- ```sql
- TIMECAPSULE TABLE { table_name } TO BEFORE DROP [RENAME TO new_tablename]
+ ```ebnf+diagram
+ TimecapsuleTable ::= TIMECAPSULE TABLE { table_name } TO BEFORE DROP [RENAME TO new_tablename]
```
- Truncate a table.
- ```sql
- TRUNCATE TABLE { table_name } [ PURGE ]
+ ```ebnf+diagram
+ TruncateTable ::= TRUNCATE TABLE { table_name } [ PURGE ]
```
- Flash back a truncated table.
- ```sql
- TIMECAPSULE TABLE { table_name } TO BEFORE TRUNCATE
+ ```ebnf+diagram
+ TimecapsuleTable ::= TIMECAPSULE TABLE { table_name } TO BEFORE TRUNCATE
```
### Parameter Description
diff --git a/product/en/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md b/product/en/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md
index 532c54f5d3b3cd655b1d1e98c91e287851676793..576040d27756e5093bcc9e5219c04b53d950d6af 100644
--- a/product/en/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md
+++ b/product/en/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md
@@ -134,7 +134,7 @@ human_resource=# select * from hr.staffs;
$ gsql -d human_resource -p 8000
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -221,7 +221,7 @@ total time: 23472 ms
$ gsql -d backupdb -p 8000 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -248,7 +248,7 @@ total time: 554 ms
$ gsql -d backupdb -p 8000 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md b/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md
index c84a32d531e490bee6ee132ca51e0134cad0f428..f5f77f016e8644dfe1729ae93bf5b9de1bab1ba8 100644
--- a/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md
+++ b/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md
@@ -24,7 +24,7 @@ If the number of connections between applications and the database exceeds the m
If information similar to the following is displayed, the connection succeeds:
```
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md b/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md
index 1ee36b9cc9d984b63521ef52b99f4b4bed4609c2..b63da74edcbfb683a7104550b704f18daa6eb249 100644
--- a/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md
+++ b/product/en/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md
@@ -61,7 +61,7 @@ On the host, upload the client tool package and configure environment variables
mkdir /opt/mogdb/tools
```
-3. Obtain the file **MogDB-2.1.0-openEuler-64bit-tools.tar.gz** from the software installation package and upload it to the **/opt/mogdb/tools** directory.
+3. Obtain the file **MogDB-x.x.x-openEuler-64bit-tools.tar.gz** from the software installation package and upload it to the **/opt/mogdb/tools** directory.
>  **NOTE:**
>
@@ -72,7 +72,7 @@ On the host, upload the client tool package and configure environment variables
```bash
cd /opt/mogdb/tools
- tar -zxvf MogDB-2.1.0-openEuler-64bit-tools.tar.gz
+ tar -zxvf MogDB-x.x.x-openEuler-64bit-tools.tar.gz
```
5. Set environment variables.
@@ -127,7 +127,7 @@ On the host, upload the client tool package and configure environment variables
If information similar to the following is displayed, the connection succeeds:
```sql
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md b/product/en/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md
index 997802a3be3cc0caedf3a750b226dafa19dd6bce..dc4723a4acbc71e541a21e60531699231307ad60 100644
--- a/product/en/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md
+++ b/product/en/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md
@@ -7,7 +7,7 @@ date: 2022-03-18
# PKG_SERVICE API
-MogDB 2.1.0 provides the following PKG_SERVICE API to manage scheduled jobs.
+MogDB 2.1 provides the following PKG_SERVICE API to manage scheduled jobs.
diff --git a/product/en/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md b/product/en/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md
index 48bc2e64020bb6fefd515450c94b7cea7229ab77..d8db9da2611f45253b3a09213d5cec8c2e096744 100644
--- a/product/en/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md
+++ b/product/en/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md
@@ -169,6 +169,8 @@ Ports 26000, 26001, 26003, 26004, and 26005 need to be enabled.
* MogDB 2.1.0
+* MogDB 2.1.1
+
* MogDB single node
The solution in this document is for the x86 architecture.
diff --git a/product/en/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md b/product/en/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md
index d439da4c438d07e189b82be7ced0bc3dbbe0d573..b9234ac7d74df03e2a9b07c39561eeed03f87b1f 100644
--- a/product/en/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md
+++ b/product/en/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md
@@ -35,19 +35,13 @@ Docker Desktop download address: Note: MogDB image supports x86 and ARM architectures, and the system will automatically download the corresponding image according to the server architecture that initiates the command, no need to specify manually.
3. Run the following command to create a running directory for MogDB, using **mogdb** as an example below.
@@ -58,7 +52,7 @@ Docker Desktop download address: Note:
@@ -96,7 +90,7 @@ After the installation is complete and enter the container, switch to omm user b
```
root@384ac97543bd:/# su - omm
omm@384ac97543bd:~$ gsql -d postgres
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -162,7 +156,7 @@ To implement primary/standby installation in a MogDB container, please complete
--env GS_PASSWORD=Enmo@1234 \
--env NODE_NAME=mogdb_master \
--env REPL_CONN_INFO="replconninfo1 = 'localhost=172.18.0.10 localport=6439 localservice=6432 remotehost=172.18.0.11 remoteport=6439 remoteservice=6432 '\n" \
- swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd -M primary
+ swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1 -M primary
```

@@ -178,7 +172,7 @@ To implement primary/standby installation in a MogDB container, please complete
--env GS_PASSWORD=Enmotech@1234 \
--env NODE_NAME=mogdb_slave_one \
--env REPL_CONN_INFO="replconninfo1 = 'localhost=172.18.0.11 localport=6439 localservice=6432 remotehost=172.18.0.10 remoteport=6439 remoteservice=6432 '\n" \
- enmotech/mogdb:2.1.0_amd -M standby
+ enmotech/mogdb:2.1.1 -M standby
```

@@ -285,19 +279,19 @@ As you can see, the original standby database is writable after being switched a
## Kubernetes-based Deployment
-MogDB 2.1.0 and later supports Kubernetes-based deployment.
+MogDB 2.1 and later supports Kubernetes-based deployment.
- x86
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_amd.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_amd.yaml
pod/mogdb created
```
- arm
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_arm.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_arm.yaml
pod/mogdb created
```
@@ -309,7 +303,7 @@ MogDB 2.1.0 and later supports Kubernetes-based deployment.
$ kubectl exec -it mogdb -- bash
root@mogdb:/# su - omm
omm@mogdb:~$ gsql -d postgres
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md b/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md
index 77260c6c8742e5ff4ca9fc71b2881ddd99c92bea..3620daee92d548d7142fcc05bbf2d240ccdf55fd 100644
--- a/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md
+++ b/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md
@@ -22,17 +22,17 @@ This section takes the openEuler OS as an example to describe how to obtain the
1. Upload the downloaded standard installation package and decompress it to obtain the single-node installation package.
```bash
- tar -xvf MogDB-2.1.0-openEuler-arm_64.tar
+ tar -xvf MogDB-x.x.x-openEuler-arm_64.tar
```
> Note:
>
- > + The MogDB website provides the standard installation package **MogDB-2.1.0-openEuler-arm_64.tar**. You need to decompress it to obtain the single-node installation package **MogDB-2.1.0-openEuler-64bit.tar.bz2**.
+ > + The MogDB website provides the standard installation package **MogDB-x.x.x-openEuler-arm_64.tar**. You need to decompress it to obtain the single-node installation package **MogDB-x.x.x-openEuler-64bit.tar.bz2**.
>
> + In environments that allow access to external networks, the standard installation package can be downloaded directly via the wget command.
>
> ```bash
- > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.0/MogDB-2.1.0-openEuler-arm_64.tar
+ > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.1/MogDB-2.1.1-openEuler-arm_64.tar
> ```
>
> Then you can run the **tar** command to decompress it.
@@ -42,7 +42,7 @@ This section takes the openEuler OS as an example to describe how to obtain the
Decompress the installation package and check whether the installation directory and files are complete. Run the following commands in the directory where the installation package is stored:
```bash
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2
ls -1b
```
@@ -55,7 +55,7 @@ This section takes the openEuler OS as an example to describe how to obtain the
drwx------ 3 root root 4096 Mar 31 21:18 include
drwx------ 4 root root 4096 Mar 31 21:18 jre
drwx------ 5 root root 4096 Mar 31 21:18 lib
- -rw------- 1 root root 92427499 Apr 1 09:43 MogDB-2.1.0-openEuler-64bit.tar.bz2
+ -rw------- 1 root root 92427499 Apr 1 09:43 MogDB-x.x.x-openEuler-64bit.tar.bz2
drwx------ 5 root root 4096 Mar 31 21:18 share
drwx------ 2 root root 4096 Mar 31 21:18 simpleInstall
-rw------- 1 root root 32 Mar 31 21:18 version.cfg
diff --git a/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md b/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md
index 4306617632e3d48b1f50a0cf4a3910f976a1e364..3c7af0973dabc004f3788a9bc9d9829f6c3816ee 100644
--- a/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md
+++ b/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md
@@ -24,7 +24,7 @@ This section takes openEuler system as an example to introduce how to install Mo
```
su - omm
cd /opt/software/mogdb/
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
```
3. Go to the **simpleInstall** directory.
@@ -89,7 +89,7 @@ source ~/.bash_profile
-- Login to MogDB
gsql -d postgres -p 5432 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md b/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md
index 2aacad380de57744921a3e3afc2d475b2cb3b8fc..4e226d5dbd21e1a1b167a683d837f982461a6fa2 100644
--- a/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md
+++ b/product/en/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md
@@ -23,7 +23,7 @@ This section takes openEuler system as an example to introduce how to install Mo
```
su - omm
cd /opt/software/mogdb/
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
```
3. Go to the **simpleInstall** directory.
@@ -107,7 +107,7 @@ source ~/.bash_profile
-- Login to MogDB
gsql -d postgres -p 5432 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md b/product/en/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md
index 512288c7189c7ce9d8dcfe9ef44302a476ddad02..e051a04a9ec06e09106a699fb96d194aed11d557 100644
--- a/product/en/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md
+++ b/product/en/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md
@@ -247,13 +247,13 @@ Before installation, you can visit [MogDB download page](https://www.mogdb.io/en
| **Package** | **Function** |
| ------------------------------------- | ------------------------------------------------------------ |
-| MogDB-2.1.0-CentOS-x86_64.tar | Contains all files of all installation packages |
-| MogDB-2.1.0-CentOS-64bit.tar.bz2 | (Primary/Standby) MogDB primary/standby (Datanode).
Stores business data, performs data query tasks, and returns execution results to the client.
MogDB instances include primary instance and standby instance, currently supports at most one primary node and eight standby nodes. It is recommended to deploy the primary and standby MogDB instances on different physical servers. |
-| MogDB-2.1.0-CentOS-64bit.sha256 | Hash value of sha256 of MogDB-2.1.0-CentOS-64bit.tar.bz2 |
-| MogDB-2.1.0-CentOS-64bit-Libpq.tar.gz | Driver for C program to access MogDB database |
-| MogDB-2.1.0-CentOS-64bit-om.tar.gz | Operation and maintenance management module (Operation Manager).
Provides management interfaces and tools for daily database operation and maintenance and configuration management. |
-| MogDB-2.1.0-CentOS-64bit-om.sha256 | Hash value of sha256 of MogDB-2.1.0-CentOS-64bit-om.tar.gz |
-| MogDB-2.1.0-CentOS-64bit-tools.tar.gz | Client Driver.
Receives the access request from the application and returns the execution result to the application.
The client driver is used for communicating with the MogDB instance, sending application SQL commands, and receiving the execution results of the MogDB instance. |
+| MogDB-x.x.x-CentOS-x86_64.tar | Contains all files of all installation packages |
+| MogDB-x.x.x-CentOS-64bit.tar.bz2 | (Primary/Standby) MogDB primary/standby (Datanode).
Stores business data, performs data query tasks, and returns execution results to the client.
MogDB instances include primary instance and standby instance, currently supports at most one primary node and eight standby nodes. It is recommended to deploy the primary and standby MogDB instances on different physical servers. |
+| MogDB-x.x.x-CentOS-64bit.sha256 | Hash value of sha256 of MogDB-x.x.x-CentOS-64bit.tar.bz2 |
+| MogDB-x.x.x-CentOS-64bit-Libpq.tar.gz | Driver for C program to access MogDB database |
+| MogDB-x.x.x-CentOS-64bit-om.tar.gz | Operation and maintenance management module (Operation Manager).
Provides management interfaces and tools for daily database operation and maintenance and configuration management. |
+| MogDB-x.x.x-CentOS-64bit-om.sha256 | Hash value of sha256 of MogDB-x.x.x-CentOS-64bit-om.tar.gz |
+| MogDB-x.x.x-CentOS-64bit-tools.tar.gz | Client Driver.
Receives the access request from the application and returns the execution result to the application.
The client driver is used for communicating with the MogDB instance, sending application SQL commands, and receiving the execution results of the MogDB instance. |
| upgrade_sql.tar.gz | SQL commands required for the upgrade |
| upgrade_sql.sha256 | Hash value of sha256 of upgrade_sql.tar.gz |
@@ -278,7 +278,7 @@ This section takes the CentOS OS as an example to describe the environment initi
chmod 755 -R /opt/software
```
-3. Upload the software package **MogDB-2.1.0-CentOS-x86_64.tar** and the configuration file **clusterconfig.xml** to the created directory. If the configuration file is not created, run the `vi clusterconfig.xml` command to create and edit the configuration file.
+3. Upload the software package **MogDB-x.x.x-CentOS-x86_64.tar** and the configuration file **clusterconfig.xml** to the created directory. If the configuration file is not created, run the `vi clusterconfig.xml` command to create and edit the configuration file.
```
cd /opt/software/mogdb
@@ -288,14 +288,14 @@ This section takes the CentOS OS as an example to describe the environment initi
> In environments that allow access to external networks, the installation package can be downloaded directly via the `wget` command. For example:
>
> ```
- > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.0/MogDB-2.1.0-CentOS-x86_64.tar
+ > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.1/MogDB-2.1.1-CentOS-x86_64.tar
> ```
4. Go to the directory for storing the uploaded software package and decompress the following packages in sequence.
```
- tar -xvf MogDB-2.1.0-CentOS-x86_64.tar
- tar -xvf MogDB-2.1.0-CentOS-64bit-om.tar.gz
+ tar -xvf MogDB-x.x.x-CentOS-x86_64.tar
+ tar -xvf MogDB-x.x.x-CentOS-64bit-om.tar.gz
```
5. Go to the directory for storing tool scripts.
@@ -467,7 +467,7 @@ After installation, you can connect to MogDB by running **gsql -d postgres -p 26
```sql
[omm@ecs-saving-0006 ~]$ gsql -d postgres -p 26000 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md b/product/en/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md
index 4255bba13871d625a21e6487e3d787023265685e..f4ff60e28f3d1de7e06cecd40dd1059843961908 100644
--- a/product/en/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md
+++ b/product/en/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md
@@ -30,7 +30,7 @@ This section introduces the TPCC tesing method of the MogDB database and key sys
## Software Environment
-* Database: MogDB 2.1.0
+* Database: MogDB 2.1.1
* TPCC client: Use TiDB-optimized BenchmarkSQL 5.0 ([https://github.com/pingcap/benchmarksql](https://github.com/pingcap/benchmarksql))
diff --git a/product/en/docs-mogdb/v2.1/quick-start/container-based-installation.md b/product/en/docs-mogdb/v2.1/quick-start/container-based-installation.md
index e1a654b8c2b80cdf0404750e1b5cec89e933e56c..87c7aeef39d1a1c87e63f8cf7d6f66c42cca32ff 100644
--- a/product/en/docs-mogdb/v2.1/quick-start/container-based-installation.md
+++ b/product/en/docs-mogdb/v2.1/quick-start/container-based-installation.md
@@ -35,19 +35,13 @@ Docker Desktop download address: Note: MogDB image supports x86 and ARM architectures, and the system will automatically download the corresponding image according to the server architecture that initiates the command, no need to specify manually.
3. Run the following command to create a running directory for MogDB, using **mogdb** as an example below.
@@ -58,7 +52,7 @@ Docker Desktop download address: Note:
@@ -98,7 +92,7 @@ After the installation is complete and enter the container, switch to omm user b
```bash
root@384ac97543bd:/# su - omm
omm@384ac97543bd:~$ gsql -d postgres
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -135,19 +129,19 @@ Specifies the database port. The default value is **5432**.
## Kubernetes-based Deployment
-MogDB 2.1.0 and later supports Kubernetes-based deployment.
+MogDB 2.1 and later supports Kubernetes-based deployment.
- x86
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_amd.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_amd.yaml
pod/mogdb created
```
- arm
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_arm.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_arm.yaml
pod/mogdb created
```
@@ -159,7 +153,7 @@ MogDB 2.1.0 and later supports Kubernetes-based deployment.
$ kubectl exec -it mogdb -- bash
root@mogdb:/# su - omm
omm@mogdb:~$ gsql -d postgres
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -177,7 +171,7 @@ After the installation is complete and enter the container, switch to omm user b
```sql
root@07456ed8f523:/# su - omm
omm@07456ed8f523:~$ gsql -d mogila
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md b/product/en/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md
index d3ba905630d6805f427a821f640041768369e15f..31647411b41cb60f8dc75ce6f9ca9f349ef52f7d 100644
--- a/product/en/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md
+++ b/product/en/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md
@@ -86,7 +86,7 @@ This article introduces the installation process of MogDB Simplified version, wh
```
su - omm
cd /opt/software/mogdb/
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
```
3. Go to the **simpleInstall** directory.
@@ -122,7 +122,7 @@ source ~/.bash_profile
## Login to MogDB
gsql -d postgres -p 5432 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md b/product/en/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md
index 5b6669c6c727b148298777400a9c490674cfb812..23403a5547d573458fdae3cdc4b2ea14f9237a17 100644
--- a/product/en/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md
+++ b/product/en/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md
@@ -65,7 +65,7 @@ On the host, upload the client tool package and configure environment variables
mkdir /opt/mogdb/tools
```
-3. Obtain the file **MogDB-2.1.0-openEuler-64bit-tools.tar.gz** from the software installation package and upload it to the **/opt/mogdb/tools** directory.
+3. Obtain the file **MogDB-x.x.x-openEuler-64bit-tools.tar.gz** from the software installation package and upload it to the **/opt/mogdb/tools** directory.
>  **NOTE:**
>
@@ -76,7 +76,7 @@ On the host, upload the client tool package and configure environment variables
```bash
cd /opt/mogdb/tools
- tar -zxvf MogDB-2.1.0-openEuler-64bit-tools.tar.gz
+ tar -zxvf MogDB-x.x.x-openEuler-64bit-tools.tar.gz
```
5. Set environment variables.
@@ -131,7 +131,7 @@ On the host, upload the client tool package and configure environment variables
If information similar to the following is displayed, the connection succeeds:
```sql
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/quick-start/mogdb-playground.md b/product/en/docs-mogdb/v2.1/quick-start/mogdb-playground.md
index 96295f0d679eef38d3c2871f3e0793f09b1a8e47..be106d349fbc18df14083939af7f687dd2600836 100644
--- a/product/en/docs-mogdb/v2.1/quick-start/mogdb-playground.md
+++ b/product/en/docs-mogdb/v2.1/quick-start/mogdb-playground.md
@@ -7,102 +7,40 @@ date: 2022-03-18
# MogDB Playground
-MogDB Playground is an online learning and hands-on training platform for MogDB database provided by [modb](https://www.modb.pro/), which also provides Oracle/MySQL compatible packages and HR learning examples. You can connect to the database with one click through the command line terminal of your browser, and experience the functions of MogDB conveniently and quickly, without the need to provide your own environment for installation.
+MogDB Playground is an online learning and hands-on training platform for MogDB database provided by [modb](https://www.modb.pro/), which also provides Oracle/MySQL compatible packages and Mogila dataset. You can connect to the database with one click through the command line terminal of your browser, and experience the functions of MogDB conveniently and quickly, without the need to provide your own environment for installation.
-## Purchase Resource
+## Enter the Hands-on Training Environment
-### Select Resource
+Visit [MogDB Playground](https://www.modb.pro/terminal). After entering, the relevant operation documents will be displayed on the left side, and the operation platform will be displayed on the right side. At this time, it is not yet connected, and you need to click **Click to enter the hands-on training environment**. Then register or log in to your modb account in the pop-up window to use MogDB Playground for free.
-Visit [MogDB Playground](https://www.modb.pro/market/162869) and click "Buy Now".
+
-
+
-### Online Payment
-
-You can choose to use Alipay or WeChat when purchasing.
-
-
-
-### Purchase Success
-
-After successful purchase, users can view **My Orders** and click to view order details.
-
-
-
-### View Purchase Resources
-
-Click the service item title to jump to **My Database**, or you can directly click [My Database](https://www.modb.pro/databaseInfo) to view it.
-
-
-
-
-
-## Online Hands-on Training
-
-### Connect to database
-
-The list of [My Database](https://www.modb.pro/databaseInfo) will show all the resources you have purchased, showing the specific information of the database resources. If users want to enter the hands-on training environment, click the **Connect Database** button to enter.
-
-
-
-### Enter the Hands-on Training Environment
-
-After entering, the relevant operation documents will be displayed on the left side, and the operation platform will be displayed on the right side. At this time, it is not yet connected, and you need to click **Click to enter the hands-on training environment**.
-
-
-
-### Start Using
+## Start Using
After a successful connection, the official operation starts, and it is time to perform the relevant operations.
-
+
-### Reference Document
+## Reference Document
When operating, you can operate according to the operation document on the left side, while the operation document on the left side can be collapsed.
-
+
-### Shutdown Environment
+## Shutdown Environment
If you want to quit the database, you can click the close button at the bottom right corner to close it, but the data created before will be cleared after closing, and it will be a new environment when you connect again, so please operate carefully.
-
-
-### Remove Environment
+
-Database status is closed by default, open database resources will show **In Progress**, while the purchased resources will have an expiration date, after the expiration date of the resources will show **Expired**, the expired database resources can be removed.
+## FAQ
-
-
-## FAQs
-
-### What if I exit the page in the middle?
+**What if I exit the page in the middle?**
Users who close the current page directly, the fact that the database resources are still running, as long as you re-enter within 30 minutes, the previously created data will not be deleted (refresh the current page is the same), and exit the current page in the middle, there will be a relevant prompt to determine whether to leave.
-
-
-### Is it possible to have two hands-on training sessions at the same time?
-
-Not available. If you want to go to another database operation page, you need to close the currently running database.
-
-
-
-### What should I do if I get a black screen when I enter the training page?
-
-**【Event】**
-I cannot connect to the database when I enter the training page.
-
-
-
-**【Reason】**
-Service creation may fail due to server network fluctuations.
-
-**【Solution】**
-(1)Closes the current window.
-(2)Go to [My database](https://www.modb.pro/databaseInfo), click `Close database`, and then click `Connect to database` to re-enter it.
-
-
+
diff --git a/product/en/docs-mogdb/v2.1/quick-start/mogila.md b/product/en/docs-mogdb/v2.1/quick-start/mogila.md
index 7a97b35b2f8dce66a4ca225ae09ccf24ba54a72c..1c8b0558d0e3deeab23fb341b8af12c88635178a 100644
--- a/product/en/docs-mogdb/v2.1/quick-start/mogila.md
+++ b/product/en/docs-mogdb/v2.1/quick-start/mogila.md
@@ -13,7 +13,7 @@ MogDB provides a sample dataset Mogila, which is a port of the [Sakila example d
Mogila is a database representing a DVD rental store, containing information about films (like title, category, actresses), rental stores (like address, staff members, customers) and rentals.
-Mogila works against MogDB 2.1.0 and above.
+Mogila works against MogDB 2.1 and above.
@@ -36,7 +36,7 @@ The Mogila sample dataset has been built into the MogDB Container Edition, and n
```
docker exec -it mogdb bash
omm@eb7aef3f860f:~$ gsql -d mogila -p5432
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -77,7 +77,7 @@ The Mogila sample dataset has been built into the MogDB Container Edition, and n
[root@test ~]# su - omm
# Log in to the postgres database and enter the port number according to the actual situation
[omm@test ~]$ gsql -d postgres -p5432 -r
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
MogDB=#create database mogila DBCOMPATIBILITY='PG';
@@ -116,7 +116,7 @@ The Mogila sample dataset has been built into the MogDB Container Edition, and n
```
[omm@test ~]$ gsql -d mogila -p5432 -r
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md b/product/en/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md
index 956083177452a8aeeb285bef5465568f70fb7cb4..965c9d4a4f2f96f655242505c7eadf252cf8226a 100644
--- a/product/en/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md
+++ b/product/en/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md
@@ -183,7 +183,7 @@ This parameter is a USERSET parameter used for O&M. You are advised not to chang
> - The following is an example of the concatenated value of **connection_info**:
>
> ```
-> {"driver_name":"ODBC","driver_version": "(MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr","driver_path":"/usr/local/lib/psqlodbcw.so","os_user":"omm"}
+> {"driver_name":"ODBC","driver_version": "(MogDB 2.1.1 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr","driver_path":"/usr/local/lib/psqlodbcw.so","os_user":"omm"}
> ```
>
> **driver_name** and **driver_version** are displayed by default. Whether **driver_path** and **os_user** are displayed is determined by users.
diff --git a/product/en/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md b/product/en/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md
index 1bd3e4998293f0c799fbdb5876d503c2771d9abe..0a5de8f6de264096dcd2b8abd2c13ca9e9ed7df2 100644
--- a/product/en/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md
+++ b/product/en/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md
@@ -26,7 +26,7 @@ CreateView ::= CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW view_name [ ( col
>  **NOTE:**
>
> - You can use **WITH (security_barriers)** to create a relatively secure view. This prevents attackers from printing hidden base table data by using the **RAISE** statement of low-cost functions.
-> - In MogDB old version, when a view is created by executing `create or replace` statement, if there are views with the same name, you cannot modify or delete column information when replacing it. You can only add columns. Since version 2.1.0, MogDB supports REPLACE VIEW syntax to update or delete column information.
+> - In MogDB old version, when a view is created by executing `create or replace` statement, if there are views with the same name, you cannot modify or delete column information when replacing it. You can only add columns. Since version 2.1, MogDB supports REPLACE VIEW syntax to update or delete column information.
## Parameter Description
diff --git a/product/en/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md b/product/en/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md
index 430e4a37b6fa1ede4db033967dddaa1be81e9646..45f9d637ece5b6fb3f7e599a35ed282d9bfc1622 100644
--- a/product/en/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md
+++ b/product/en/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md
@@ -441,7 +441,7 @@ omm@[local] mogdb=#
If information similar to the following is displayed, the connection succeeds:
```sql
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/en/docs-mogdb/v2.1/toc.md b/product/en/docs-mogdb/v2.1/toc.md
index ea7afec843255ce4b5fa352f4ded814bb499fc34..ed6c3028d0a63e10cab25de1b4e506b9c140935a 100644
--- a/product/en/docs-mogdb/v2.1/toc.md
+++ b/product/en/docs-mogdb/v2.1/toc.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Documentation List
diff --git a/product/en/docs-mogdb/v2.1/toc_about.md b/product/en/docs-mogdb/v2.1/toc_about.md
index 15ff5b33222477ef23007ffbac267a4c3728bbdf..34c9954d1f2c2c992ca57e107998b85b2d09fb78 100644
--- a/product/en/docs-mogdb/v2.1/toc_about.md
+++ b/product/en/docs-mogdb/v2.1/toc_about.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## About MogDB
diff --git a/product/en/docs-mogdb/v2.1/toc_datatypes-and-sql.md b/product/en/docs-mogdb/v2.1/toc_datatypes-and-sql.md
index 2f530a0a0942044726c6dda199159dd7df99fe84..29aaf1e600af4a3e8482b2c18c4780f5f77bc4fa 100644
--- a/product/en/docs-mogdb/v2.1/toc_datatypes-and-sql.md
+++ b/product/en/docs-mogdb/v2.1/toc_datatypes-and-sql.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Data Types and SQL
diff --git a/product/en/docs-mogdb/v2.1/toc_dev.md b/product/en/docs-mogdb/v2.1/toc_dev.md
index 177b8ccbdb7722fcc0210c1cb1b93bbb170fda86..8ff0517b583ce86c83b2daa7773ed135da522abb 100644
--- a/product/en/docs-mogdb/v2.1/toc_dev.md
+++ b/product/en/docs-mogdb/v2.1/toc_dev.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Developer Guide
diff --git a/product/en/docs-mogdb/v2.1/toc_error.md b/product/en/docs-mogdb/v2.1/toc_error.md
index 96fb4954490b42fcac7c8e1cb72d629004022f68..a34d85740e10840cc638477f6dcdfd0153104863 100644
--- a/product/en/docs-mogdb/v2.1/toc_error.md
+++ b/product/en/docs-mogdb/v2.1/toc_error.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Error Messages
diff --git a/product/en/docs-mogdb/v2.1/toc_extension-referecne.md b/product/en/docs-mogdb/v2.1/toc_extension-referecne.md
index 2bc08c4f9038d3a9ca8fd91208fc7194e6061e35..e1de706750e5aaec3cdd6b05b840d3a6184577b0 100644
--- a/product/en/docs-mogdb/v2.1/toc_extension-referecne.md
+++ b/product/en/docs-mogdb/v2.1/toc_extension-referecne.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Extension Reference
diff --git a/product/en/docs-mogdb/v2.1/toc_faqs.md b/product/en/docs-mogdb/v2.1/toc_faqs.md
index 03980d87df38756f17f67c4c16cfa5ae541d9800..4bf03e3d985af4384aea318c34a65d2424db5404 100644
--- a/product/en/docs-mogdb/v2.1/toc_faqs.md
+++ b/product/en/docs-mogdb/v2.1/toc_faqs.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## FAQs
diff --git a/product/en/docs-mogdb/v2.1/toc_glossary.md b/product/en/docs-mogdb/v2.1/toc_glossary.md
index 81812046c62979477aca3bae0642c9d12bc13254..fdaa433d7f3ffa04e77c587bb207bbc4f69d5240 100644
--- a/product/en/docs-mogdb/v2.1/toc_glossary.md
+++ b/product/en/docs-mogdb/v2.1/toc_glossary.md
@@ -1,4 +1,4 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Glossary
diff --git a/product/en/docs-mogdb/v2.1/toc_install.md b/product/en/docs-mogdb/v2.1/toc_install.md
index 154869e5698c568247e6754c8cfeffddcccba095..c000e6f0cc599aa1e615da46abf6c666729757ed 100644
--- a/product/en/docs-mogdb/v2.1/toc_install.md
+++ b/product/en/docs-mogdb/v2.1/toc_install.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Installation Guide
diff --git a/product/en/docs-mogdb/v2.1/toc_manage.md b/product/en/docs-mogdb/v2.1/toc_manage.md
index ce3f0fda8b7721b76f9c70af6a183598b7490382..48536771566838b2f8364c4697952fc4ab70d742 100644
--- a/product/en/docs-mogdb/v2.1/toc_manage.md
+++ b/product/en/docs-mogdb/v2.1/toc_manage.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Administrator Guide
diff --git a/product/en/docs-mogdb/v2.1/toc_parameters-and-tools.md b/product/en/docs-mogdb/v2.1/toc_parameters-and-tools.md
index 2b7083c6c62c7d81307c5723f9a9c35b9e6486d5..6173531c398bb3448ef3785c927b94e9dd290501 100644
--- a/product/en/docs-mogdb/v2.1/toc_parameters-and-tools.md
+++ b/product/en/docs-mogdb/v2.1/toc_parameters-and-tools.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Parameters and Tools
diff --git a/product/en/docs-mogdb/v2.1/toc_performance.md b/product/en/docs-mogdb/v2.1/toc_performance.md
index 2ba59d8b3c8935a62313ef96fd2ba9cb4b48e361..89ddbbee1c67d05f60e0f2c8476dbe633236f237 100644
--- a/product/en/docs-mogdb/v2.1/toc_performance.md
+++ b/product/en/docs-mogdb/v2.1/toc_performance.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Performance Tuning
diff --git a/product/en/docs-mogdb/v2.1/toc_quickstart.md b/product/en/docs-mogdb/v2.1/toc_quickstart.md
index c2dc8283b312d6d8ae74eabe08bc3028191cff95..06b491ceeb83b5fd865da2678f419e57cbfa0045 100644
--- a/product/en/docs-mogdb/v2.1/toc_quickstart.md
+++ b/product/en/docs-mogdb/v2.1/toc_quickstart.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Quick Start
diff --git a/product/en/docs-mogdb/v2.1/toc_secure.md b/product/en/docs-mogdb/v2.1/toc_secure.md
index dbaf1be9922c544002726d50248e7568e8985587..c1843ac5a727ad39e9eeacd5ff813b1cfeb69f43 100644
--- a/product/en/docs-mogdb/v2.1/toc_secure.md
+++ b/product/en/docs-mogdb/v2.1/toc_secure.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Security Guide
diff --git a/product/en/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md b/product/en/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md
index feeb53391c4b0805a30a01e5a522b340347b9d5f..eab0b33c1b2c2f5e02f07086b91c2db8522f8785 100644
--- a/product/en/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md
+++ b/product/en/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## System Catalogs and Functions
diff --git a/product/zh/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md b/product/zh/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md
index b57325ea87b736206f4718374de18f37b8767764..48345360b3e4d241944c1083865a7c11bac73c54 100644
--- a/product/zh/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md
+++ b/product/zh/docs-mogdb/v2.1/about-mogdb/mogdb-release-notes.md
@@ -1,17 +1,17 @@
---
-title: MogDB 2.1.0 发行说明
-summary: MogDB 2.1.0 发行说明
+title: MogDB 2.1 发行说明
+summary: MogDB 2.1 发行说明
author: Guo Huan
date: 2021-12-06
---
-# MogDB 2.1.0 发行说明
+# MogDB 2.1 发行说明
## 1. 版本说明
-MogDB 2.1.0版本基于MogDB 2.0.0版本进一步增强,并合入了openGauss 2.1.0版本的新增特性。
+MogDB 2.1版本基于MogDB 2.0版本进一步增强,并合入了openGauss 2.1.0版本的新增特性。
-> 说明:MogDB 2.1.0是Preview版本,该版本生命周期为半年。
+> 说明:MogDB 2.1是Preview版本,该版本生命周期为半年。
## 2. 新增特性
@@ -325,6 +325,14 @@ Update操作时,支持数据跨分区移动(不支持Partition/SubPartition
- 在开启sha256验证以后原先md5加密的用户仍然可以通过md5验证成功登陆
- MogDB中嵌套存储过程内部的raise输出过于细节
+### 3.3 MogDB 2.1.1版本修复缺陷
+
+MogDB 2.1.1是MogDB 2.1.0的补丁版本,于2022年3月22日发布,在MogDB 2.1.0的基础上修复如下内容:
+
+- 修复pg_encoding_to_char()函数由于参数溢出导致的coredump的缺陷
+- 修复connect by语句作为查询子句时产生的coredump的缺陷
+- 修复在x86平台上connect by语句order by level查询数据顺序不一致的缺陷
+
## 4. 兼容性
本版本支持以下操作系统及CPU架构组合:
diff --git a/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md b/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md
index 616e5123813cddfa7b66b9b0f29647dcbbde7adf..e04639d1cc050c9e3a5148f7e4ef5564b1efaa4c 100644
--- a/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md
+++ b/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/DBMS-RANDOM.md
@@ -80,7 +80,7 @@ compat-tools是一个兼容工具集合,旨在为从其他异构数据库,
```sql
[omm@mogdb-kernel-0005 ~]$ gsql -d mogdb -p 26000
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md b/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md
index 012d5bd8acd302aedc6afd5fe3c95bc0b20d55fc..5a2c7b22a77da810df075ededae00b951c3feb75 100644
--- a/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md
+++ b/product/zh/docs-mogdb/v2.1/about-mogdb/open-source-components/mog_xlogdump.md
@@ -63,7 +63,7 @@ bool、bytea、char、name、int8、int2、int、text、oid、tid、xid、cid、
## 使用说明
-mog_xlogdump是用于解析并显示MogDB-2.1.0版本的Wal日志的工具。旨在帮助DBA分析与Debugging数据库问题的辅助工具。
+mog_xlogdump是用于解析并显示MogDB-2.1版本的Wal日志的工具。旨在帮助DBA分析与Debugging数据库问题的辅助工具。
mog_xlogdump解析工具暂时不支持列存表。(研究发现列存表会在cstore模式下生成两张对应的CUDesc和delta表,CUDesc是列存表的元数据,delta是列存表的临时表,是张行存表,这两张表(CUDesc,delta)都会写在wal日志中,虽然wal日志能解析出对应的delta表,但该表受表属性阈值deltarow_threshold控制 ,默认100,即小于100条数据才会写在delta表中,大于阈值就会直接写到cu文件里)
diff --git a/product/zh/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md b/product/zh/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md
index 258df2ba1fdeeec21fa9dba6317243651c08a925..bb64ec144bc2bcf10d9b8385b34339bef6917ebe 100644
--- a/product/zh/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md
+++ b/product/zh/docs-mogdb/v2.1/administrator-guide/br/1-4-br.md
@@ -12,7 +12,7 @@ date: 2021-10-12
**闪回支持两种恢复模式:**
- 基于MVCC多版本的数据恢复(仅支持Ustore):适用于误删除、误更新、误插入数据的查询和恢复,用户通过配置旧版本保留时间,并执行相应的查询或恢复命令,查询或恢复到指定的时间点或CSN点。
-- 基于类型windows系统回收站的恢复(仅支持Astore):适用于误DROP、误TRUNCATE的表的恢复。用户通过配置回收站开关,并执行相应的恢复命令,可以将误DROP、误TRUNCATE的表找回。
+- 基于数据库回收站的恢复(仅支持Astore):适用于误DROP、误TRUNCATE的表的恢复。用户通过配置回收站开关,并执行相应的恢复命令,可以将误DROP、误TRUNCATE的表找回。
**相关参数:**
@@ -46,8 +46,8 @@ date: 2021-10-12
### 语法
-```sql
-{[ ONLY ] table_name [ * ] [ partition_clause ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
+```ebnf+diagram
+FlashBack ::= {[ ONLY ] table_name [ * ] [ partition_clause ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]
[ TABLESAMPLE sampling_method ( argument [, ...] ) [ REPEATABLE ( seed ) ] ]
[TIMECAPSULE { TIMESTAMP | CSN } expression ]
|( select ) [ AS ] alias [ ( column_alias [, ...] ) ]
@@ -100,8 +100,8 @@ date: 2021-10-12
### 语法
-```sql
-TIMECAPSULE TABLE table_name TO { TIMESTAMP | CSN } expression
+```ebnf+diagram
+FlashBack ::= TIMECAPSULE TABLE table_name TO { TIMESTAMP | CSN } expression
```
### 使用示例
@@ -128,14 +128,14 @@ TIMECAPSULE TABLE t1 TO CSN 9617;
- 删除表
- ```sql
- DROP TABLE table_name [PURGE]
+ ```ebnf+diagram
+ DropTable ::= DROP TABLE table_name [PURGE]
```
- 清理回收站对象
- ```sql
- PURGE { TABLE { table_name }
+ ```ebnf+diagram
+ PurgeRecyclebin ::= PURGE { TABLE { table_name }
| INDEX { index_name }
| RECYCLEBIN
}
@@ -143,20 +143,20 @@ TIMECAPSULE TABLE t1 TO CSN 9617;
- 闪回被删除的表
- ```sql
- TIMECAPSULE TABLE { table_name } TO BEFORE DROP [RENAME TO new_tablename]
+ ```ebnf+diagram
+ TimecapsuleTable ::= TIMECAPSULE TABLE { table_name } TO BEFORE DROP [RENAME TO new_tablename]
```
- 截断表
- ```sql
- TRUNCATE TABLE { table_name } [ PURGE ]
+ ```ebnf+diagram
+ TruncateTable ::= TRUNCATE TABLE { table_name } [ PURGE ]
```
- 闪回截断的表
- ```sql
- TIMECAPSULE TABLE { table_name } TO BEFORE TRUNCATE
+ ```ebnf+diagram
+ TimecapsuleTable ::= TIMECAPSULE TABLE { table_name } TO BEFORE TRUNCATE
```
### 参数说明
diff --git a/product/zh/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md b/product/zh/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md
index ce17d3f9d28775410042f9f0510a89f52e98ea67..ee68bc06ee74c6e487baabb4c8a1c4c028f9d6ec 100644
--- a/product/zh/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md
+++ b/product/zh/docs-mogdb/v2.1/administrator-guide/importing-and-exporting-data/importing-data/5-using-gs_restore-to-import-data.md
@@ -138,7 +138,7 @@ human_resource=# select * from hr.staffs;
$ gsql -d human_resource -p 8000
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -230,7 +230,7 @@ total time: 23472 ms
$ gsql -d backupdb -p 8000 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -257,7 +257,7 @@ total time: 554 ms
$ gsql -d backupdb -p 8000 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md b/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md
index e9e0ea31fd16de5d9a7cd51c0a637e99fdad9ea2..68b6fd9d692054f398f3938dec7537027e91e56f 100644
--- a/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md
+++ b/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/7-checking-the-number-of-application-connections.md
@@ -24,7 +24,7 @@ date: 2021-03-04
连接成功后,系统显示类似如下信息:
```bash
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md b/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md
index dbe08614a2c8fb795ebca45fb684b87eb0e6f80e..d64a7beaf6cdfce8107d451db8f7c871b2bcfc14 100644
--- a/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md
+++ b/product/zh/docs-mogdb/v2.1/administrator-guide/routine-maintenance/using-the-gsql-client-for-connection.md
@@ -61,7 +61,7 @@ date: 2021-12-2
mkdir /opt/mogdb/tools
```
-3. 获取软件安装包中的"MogDB-2.1.0-openEuler-64bit-tools.tar.gz"上传到"/opt/mogdb/tools"路径下。
+3. 获取软件安装包中的"MogDB-x.x.x-openEuler-64bit-tools.tar.gz"上传到"/opt/mogdb/tools"路径下。
>  **说明:**
>
@@ -72,7 +72,7 @@ date: 2021-12-2
```bash
cd /opt/mogdb/tools
- tar -zxvf MogDB-2.1.0-openEuler-64bit-tools.tar.gz
+ tar -zxvf MogDB-x.x.x-openEuler-64bit-tools.tar.gz
```
5. 设置环境变量。
@@ -127,7 +127,7 @@ date: 2021-12-2
连接成功后,系统显示类似如下信息:
```sql
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md b/product/zh/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md
index e9ee88ad27f3c33bafecc38f718f3c2ba7b6dc87..1e9d32c16fba801e6029d7db903eeb5ca1937e79 100644
--- a/product/zh/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md
+++ b/product/zh/docs-mogdb/v2.1/developer-guide/scheduled-jobs/pkg-service.md
@@ -7,7 +7,7 @@ date: 2022-03-18
# PKG_SERVICE接口
-MogDB 2.1.0版本提供了以下PKG_SERVICE接口来实现定时任务管理。
+MogDB 2.1版本提供了以下PKG_SERVICE接口来实现定时任务管理。
diff --git a/product/zh/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md b/product/zh/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md
index 69439c601690ba41d1c85551bfc86c90cd2fa499..c5b699c3e4cdc949cc2d6ecffeb30679fdb9a34d 100644
--- a/product/zh/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md
+++ b/product/zh/docs-mogdb/v2.1/faqs/deployment-and-maintenance-faqs.md
@@ -171,6 +171,8 @@ Checking directory.
* MogDB 2.1.0
+* MogDB 2.1.1
+
* MogDB 单机数据库
本文档中的信息适用于x86平台。
diff --git a/product/zh/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md b/product/zh/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md
index 915885b2b7716eb6e534d1b39a15659773f9d818..717a9cc3d8697b20563b65ebeccf9644673b7a7b 100644
--- a/product/zh/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md
+++ b/product/zh/docs-mogdb/v2.1/installation-guide/docker-installation/docker-installation.md
@@ -36,19 +36,13 @@ Docker Desktop下载地址:
1. 启动Docker服务。
-2. 根据您的系统架构输入以下命令之一获取最新版MogDB镜像文件:
-
- x86-64架构的机器:
-
- ```bash
- docker pull swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
- ```
-
- ARM64架构的机器:
+2. 输入以下命令获取最新版MogDB镜像文件:
```bash
- docker pull swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_arm
+ docker pull swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
+
+ > 说明:MogDB镜像支持运行在x86和ARM架构中,会根据发起命令的服务器架构自动下载相应的镜像,无需手工指定。
3. 输入以下命令为 MogDB 创建运行目录,下文以“mogdb”为例:
@@ -59,7 +53,7 @@ Docker Desktop下载地址:
4. 继续输入以下命令创建一个新的容器,将容器命名为“mogdb”,以启动 MogDB 实例:
```bash
- docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v /mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
+ docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v /mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
对于Windows系统而言:
@@ -69,13 +63,13 @@ Docker Desktop下载地址:
```bash
docker volume create mogdata
- docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v mogdata:/var/lib/opengauss -p 15453:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
+ docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v mogdata:/var/lib/opengauss -p 15453:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
- 如果Docker启用WSL 2做引擎,请执行以下命令创建容器:
```bash
- docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v C:\mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
+ docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v C:\mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
> 注意:
@@ -100,7 +94,7 @@ Docker Desktop下载地址:
```
root@384ac97543bd:/# su - omm
omm@384ac97543bd:~$ gsql -d postgres
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -166,7 +160,7 @@ MogDB的密码有复杂度要求,密码长度8个字符以上,必须同时
--env GS_PASSWORD=Enmo@1234 \
--env NODE_NAME=mogdb_master \
--env REPL_CONN_INFO="replconninfo1 = 'localhost=172.18.0.10 localport=6439 localservice=6432 remotehost=172.18.0.11 remoteport=6439 remoteservice=6432 '\n" \
- swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd -M primary
+ swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1 -M primary
```

@@ -182,7 +176,7 @@ MogDB的密码有复杂度要求,密码长度8个字符以上,必须同时
--env GS_PASSWORD=Enmotech@1234 \
--env NODE_NAME=mogdb_slave_one \
--env REPL_CONN_INFO="replconninfo1 = 'localhost=172.18.0.11 localport=6439 localservice=6432 remotehost=172.18.0.10 remoteport=6439 remoteservice=6432 '\n" \
- enmotech/mogdb:2.1.0_amd -M standby
+ enmotech/mogdb:2.1.1 -M standby
```

@@ -289,19 +283,19 @@ delete from test;
## Kubernetes部署
-MogDB 2.1.0版本以后支持Kubernetes部署。
+MogDB 2.1版本以后支持Kubernetes部署。
- x86
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_amd.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_amd.yaml
pod/mogdb created
```
- arm
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_arm.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_arm.yaml
pod/mogdb created
```
@@ -313,7 +307,7 @@ MogDB 2.1.0版本以后支持Kubernetes部署。
$ kubectl exec -it mogdb -- bash
root@mogdb:/# su - omm
omm@mogdb:~$ gsql -d postgres
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md b/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md
index ac365fea873b9e5159b823c22e3bfd487062dd8d..a9673a0ca6150adb27a341845ac5185a7ff19270 100644
--- a/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md
+++ b/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/1-installation-preparation.md
@@ -22,17 +22,17 @@ date: 2021-06-11
1. 上传下载好的标准安装包,并解压以获得极简安装包。
```bash
- tar -xvf MogDB-2.1.0-openEuler-arm_64.tar
+ tar -xvf MogDB-x.x.x-openEuler-arm_64.tar
```
> 说明:
>
- > + 网站上提供标准安装包MogDB-2.1.0-openEuler-arm_64.tar,解压标准安装包后得到的MogDB-2.1.0-openEuler-64bit.tar.bz2即为极简安装包。
+ > + 网站上提供标准安装包MogDB-x.x.x-openEuler-arm_64.tar,解压标准安装包后得到的MogDB-x.x.x-openEuler-64bit.tar.bz2即为极简安装包。
>
> + 在允许访问外网的环境中可通过wget命令直接下载标准安装包:
>
> ```bash
- > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.0/MogDB-2.1.0-openEuler-arm_64.tar
+ > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.1/MogDB-2.1.1-openEuler-arm_64.tar
> ```
>
> 然后执行tar命令解压即可。
@@ -42,7 +42,7 @@ date: 2021-06-11
解压安装包,检查安装目录及文件是否齐全。在安装包所在目录执行以下命令:
```bash
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2
ls -1b
```
@@ -55,7 +55,7 @@ date: 2021-06-11
drwx------ 3 root root 4096 Mar 31 21:18 include
drwx------ 4 root root 4096 Mar 31 21:18 jre
drwx------ 5 root root 4096 Mar 31 21:18 lib
- -rw------- 1 root root 92427499 Apr 1 09:43 MogDB-2.1.0-openEuler-64bit.tar.bz2
+ -rw------- 1 root root 92427499 Apr 1 09:43 MogDB-x.x.x-openEuler-64bit.tar.bz2
drwx------ 5 root root 4096 Mar 31 21:18 share
drwx------ 2 root root 4096 Mar 31 21:18 simpleInstall
-rw------- 1 root root 32 Mar 31 21:18 version.cfg
diff --git a/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md b/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md
index c75bf975b892bf2ca5a1007dc341bedca19ec18c..fdbfe16856bcdb26d235ada06084286dad806724 100644
--- a/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md
+++ b/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/2-installation-on-a-single-node.md
@@ -23,7 +23,7 @@ date: 2021-06-11
```
su - omm
cd /opt/software/mogdb/
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
```
3. 进入解压后目录下的simpleInstall。
@@ -88,7 +88,7 @@ date: 2021-06-11
-- 登录数据库
gsql -d postgres -p 5432 -r
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md b/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md
index bb20dc28b7fa459b7544eaba699ef4dd5ce76ae2..e9f2ec8382480262e53574a4ba137ee60074df83 100644
--- a/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md
+++ b/product/zh/docs-mogdb/v2.1/installation-guide/simplified-installation-process/3-installation-on-primary-standby-nodes.md
@@ -23,7 +23,7 @@ date: 2021-06-11
```
su - omm
cd /opt/software/mogdb/
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
```
3. 进入解压后目录下的simpleInstall。
@@ -107,7 +107,7 @@ date: 2021-06-11
-- 登录数据库
gsql -d postgres -p 5432 -r
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md b/product/zh/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md
index 4413bc16f254b917a3d03739608f5f19a9722f6b..a8562acf5692d186c114adcc853175c1a57ccbfb 100644
--- a/product/zh/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md
+++ b/product/zh/docs-mogdb/v2.1/installation-guide/standard-installation/4-installing-mogdb.md
@@ -233,13 +233,13 @@ date: 2021-04-2
| **安装包** | **功能** |
| ------------------------------------- | ------------------------------------------------------------ |
-| MogDB-2.1.0-CentOS-x86_64.tar | 包含所有安装包所有文件 |
-| MogDB-2.1.0-CentOS-64bit.tar.bz2 | (主备)MogDB主备(Datanode)。负责存储业务数据、执行数据查询任务以及向客户端返回执行结果。MogDB实例包含主、备两种类型,支持一主多备。建议将主、备MogDB实例分散部署在不同的物理节点中。 |
-| MogDB-2.1.0-CentOS-64bit.sha256 | MogDB-2.1.0-CentOS-64bit.tar.bz2的sha256的hash值 |
-| MogDB-2.1.0-CentOS-64bit-Libpq.tar.gz | C程序访问MogDB数据库的驱动 |
-| MogDB-2.1.0-CentOS-64bit-om.tar.gz | 运维管理模块(Operation Manager)。提供数据库日常运维、配置管理的管理接口、工具。 |
-| MogDB-2.1.0-CentOS-64bit-om.sha256 | MogDB-2.1.0-CentOS-64bit-om.tar.gz的sha256的hash值 |
-| MogDB-2.1.0-CentOS-64bit-tools.tar.gz | 客户端驱动(Client Driver)。负责接收来自应用的访问请求,并向应用返回执行结果。客户端驱动负责与MogDB实例通信,发送应用的SQL命令,接收MogDB实例的执行结果 |
+| MogDB-x.x.x-CentOS-x86_64.tar | 包含所有安装包所有文件 |
+| MogDB-x.x.x-CentOS-64bit.tar.bz2 | (主备)MogDB主备(Datanode)。负责存储业务数据、执行数据查询任务以及向客户端返回执行结果。MogDB实例包含主、备两种类型,支持一主多备。建议将主、备MogDB实例分散部署在不同的物理节点中。 |
+| MogDB-x.x.x-CentOS-64bit.sha256 | MogDB-x.x.x-CentOS-64bit.tar.bz2的sha256的hash值 |
+| MogDB-x.x.x-CentOS-64bit-Libpq.tar.gz | C程序访问MogDB数据库的驱动 |
+| MogDB-x.x.x-CentOS-64bit-om.tar.gz | 运维管理模块(Operation Manager)。提供数据库日常运维、配置管理的管理接口、工具。 |
+| MogDB-x.x.x-CentOS-64bit-om.sha256 | MogDB-x.x.x-CentOS-64bit-om.tar.gz的sha256的hash值 |
+| MogDB-x.x.x-CentOS-64bit-tools.tar.gz | 客户端驱动(Client Driver)。负责接收来自应用的访问请求,并向应用返回执行结果。客户端驱动负责与MogDB实例通信,发送应用的SQL命令,接收MogDB实例的执行结果 |
| upgrade_sql.tar.gz | 升级所需要的SQL |
| upgrade_sql.sha256 | upgrade_sql.tar.gz的sha256的hash值 |
@@ -274,14 +274,14 @@ date: 2021-04-2
> 在允许访问外网的环境中,可通过`wget`命令直接下载适用于当前操作系统和CPU的安装包:
>
> ```
- > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.0/MogDB-2.1.0-CentOS-x86_64.tar
+ > wget -c https://cdn-mogdb.enmotech.com/mogdb-media/2.1.1/MogDB-2.1.1-CentOS-x86_64.tar
> ```
4. 在安装包所在的目录下,依次解压安装包。
```
- tar -xvf MogDB-2.1.0-CentOS-x86_64.tar
- tar -xvf MogDB-2.1.0-CentOS-64bit-om.tar.gz
+ tar -xvf MogDB-x.x.x-CentOS-x86_64.tar
+ tar -xvf MogDB-x.x.x-CentOS-64bit-om.tar.gz
```
5. 进入到工具脚本存放目录下。
@@ -464,7 +464,7 @@ Successfully installed application.
```sql
[omm@ecs-saving-0006 ~]$ gsql -d postgres -p 26000 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -486,6 +486,6 @@ Copyright (c) Yunhe Enmo (Beijing) Information Technology Co., Ltd. Copyright ©
dn_6002值比较特殊,其值为固定值,主库为dn_6001,备库1为dn_6002,备库2为dn_6003,依次顺延。
-'dn_6002,dn_6003' 表示备库1,2为同步节点。
+'dn_6002,dn_6003'表示备库1,2为同步节点。
-请替换相应的数据存储路径。
+请替换相应的数据存储路径。
\ No newline at end of file
diff --git a/product/zh/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md b/product/zh/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md
index 2bd664026227441715b252575466d64d6fc9efe5..af454271fca9be634df612620ee0b6724b0435c4 100644
--- a/product/zh/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md
+++ b/product/zh/docs-mogdb/v2.1/performance-tuning/TPCC-performance-tuning-guide.md
@@ -30,7 +30,7 @@ date: 2021-08-03
## 软件环境
-* 数据库:MogDB 2.1.0
+* 数据库:MogDB 2.1.1
* TPCC客户端:使用tidb优化过的BenchmarkSQL 5.0([https://github.com/pingcap/benchmarksql](https://github.com/pingcap/benchmarksql))
diff --git a/product/zh/docs-mogdb/v2.1/quick-start/container-based-installation.md b/product/zh/docs-mogdb/v2.1/quick-start/container-based-installation.md
index 23c3f5ca971e9b8cc3bd6e7c27c8751bc1bb7463..a2b491203d279655df4fd08ef0d4579f912e772b 100644
--- a/product/zh/docs-mogdb/v2.1/quick-start/container-based-installation.md
+++ b/product/zh/docs-mogdb/v2.1/quick-start/container-based-installation.md
@@ -30,19 +30,13 @@ Docker Desktop下载地址:
1. 启动Docker服务。
-2. 根据您的系统架构输入以下命令之一获取最新版MogDB镜像文件:
-
- x86-64架构的机器:
-
- ```bash
- docker pull swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
- ```
-
- ARM64架构的机器:
+2. 输入以下命令获取最新版MogDB镜像文件:
```bash
- docker pull swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_arm
+ docker pull swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
+
+ > 说明:MogDB镜像支持运行在x86和ARM架构中,会根据发起命令的服务器架构自动下载相应的镜像,无需手工指定。
3. 输入以下命令为MogDB创建运行目录,下文以“mogdb”为例:
@@ -53,7 +47,7 @@ Docker Desktop下载地址:
4. 继续输入以下命令创建一个新的容器,将容器命名为“mogdb”,以启动MogDB实例:
```bash
- docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v /mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
+ docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v /mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
对于Windows系统而言:
@@ -63,13 +57,13 @@ Docker Desktop下载地址:
```bash
docker volume create mogdata
- docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v mogdata:/var/lib/opengauss -p 15453:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
+ docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v mogdata:/var/lib/opengauss -p 15453:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
- 如果Docker启用WSL 2做引擎,请执行以下命令创建容器:
```bash
- docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v C:\mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.0_amd
+ docker run --name mogdb --privileged=true -d -e GS_PASSWORD=Secretpassword@123 -v C:\mogdb:/var/lib/opengauss -p 15432:5432 swr.cn-north-4.myhuaweicloud.com/mogdb/mogdb:2.1.1
```
> 注意:
@@ -94,7 +88,7 @@ Docker Desktop下载地址:
```bash
root@384ac97543bd:/# su - omm
omm@384ac97543bd:~$ gsql -d postgres
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -131,19 +125,19 @@ MogDB的密码有复杂度要求,密码长度8个字符以上,必须同时
## Kubernetes部署
-MogDB 2.1.0版本以后支持Kubernetes部署。
+MogDB 2.1版本以后支持Kubernetes部署。
- x86
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_amd.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_amd.yaml
pod/mogdb created
```
- arm
```
- $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.0/k8s_arm.yaml
+ $ kubectl apply -f https://gitee.com/enmotech/enmotech-docker-mogdb/raw/master/2.1.1/k8s_arm.yaml
pod/mogdb created
```
@@ -155,7 +149,7 @@ MogDB 2.1.0版本以后支持Kubernetes部署。
$ kubectl exec -it mogdb -- bash
root@mogdb:/# su - omm
omm@mogdb:~$ gsql -d postgres
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -173,7 +167,7 @@ MogDB容器版内置了一个样本数据库mogila,该数据库是一个关于
```sql
root@07456ed8f523:/# su - omm
omm@07456ed8f523:~$ gsql -d mogila
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md b/product/zh/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md
index feffb8f37337512c13a3b0fd7b95fba6785d962b..35e16b1660ddb1af2afd191a79e8dc91a50b3364 100644
--- a/product/zh/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md
+++ b/product/zh/docs-mogdb/v2.1/quick-start/installation-on-a-single-node.md
@@ -86,7 +86,7 @@ date: 2021-04-2
```
su - omm
cd /opt/software/mogdb/
- tar -jxf MogDB-2.1.0-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
+ tar -jxf MogDB-x.x.x-openEuler-64bit.tar.bz2 -C /opt/software/mogdb/
```
3. 进入解压后目录下的simpleInstall。
@@ -122,7 +122,7 @@ source ~/.bash_profile
## 登录数据库
gsql -d postgres -p 5432 -r
-gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md b/product/zh/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md
index b279496c0cf2d514c7955d65e737fe3380282019..15cc3397fbcd13678860a055a7c6708b0240de31 100644
--- a/product/zh/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md
+++ b/product/zh/docs-mogdb/v2.1/quick-start/mogdb-access/use-cli-to-access-mogdb/gsql.md
@@ -65,7 +65,7 @@ gsql是MogDB提供的在命令行下运行的数据库连接工具。此工具
mkdir /opt/mogdb/tools
```
-3. 获取软件安装包中的"MogDB-2.1.0-openEuler-64bit-tools.tar.gz"上传到"/opt/mogdb/tools"路径下。
+3. 获取软件安装包中的"MogDB-x.x.x-openEuler-64bit-tools.tar.gz"上传到"/opt/mogdb/tools"路径下。
>  **说明:**
>
@@ -76,7 +76,7 @@ gsql是MogDB提供的在命令行下运行的数据库连接工具。此工具
```bash
cd /opt/mogdb/tools
- tar -zxvf MogDB-2.1.0-openEuler-64bit-tools.tar.gz
+ tar -zxvf MogDB-x.x.x-openEuler-64bit-tools.tar.gz
```
5. 设置环境变量。
@@ -131,7 +131,7 @@ gsql是MogDB提供的在命令行下运行的数据库连接工具。此工具
连接成功后,系统显示类似如下信息:
```sql
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/quick-start/mogdb-playground.md b/product/zh/docs-mogdb/v2.1/quick-start/mogdb-playground.md
index 79e156665d662d1dcc044bd1bf8fbbbf13eaeb2c..1fe7f142188aad3e0717b519c9ef225dc1b23309 100644
--- a/product/zh/docs-mogdb/v2.1/quick-start/mogdb-playground.md
+++ b/product/zh/docs-mogdb/v2.1/quick-start/mogdb-playground.md
@@ -7,102 +7,40 @@ date: 2022-03-18
# MogDB实训环境
-MogDB实训环境是由[墨天轮](https://www.modb.pro/)提供的MogDB数据库线上学习与实训平台,同时提供Oracle/MySQL兼容包,以及HR学习示例。您可以通过浏览器的命令行终端一键连接数据库,方便快速地体验MogDB的各项功能,无需自备环境进行安装。
+MogDB实训环境是由[墨天轮](https://www.modb.pro/)提供的MogDB数据库线上学习与实训平台,同时提供Oracle/MySQL兼容包,以及Mogila样本数据集。您可以通过浏览器的命令行终端一键连接数据库,方便快速地体验MogDB的各项功能,无需自备环境进行安装。
-## 购买资源
+## 进入实训环境
-### 选择资源
+访问[MogDB在线实训环境](https://www.modb.pro/terminal),进入后,左侧会显示相关操作文档,右侧会显示操作平台,此时还未连接上,需要点击【点击进入实训环境】,随后在弹出窗口中注册或登录墨天轮账号即可免费使用。
-访问[MogDB在线实训环境](https://www.modb.pro/market/162869)页面,点击“立即购买”。
+
-
+
-### 在线支付
-
-购买时可以选择使用支付宝或者微信购买。
-
-
-
-### 购买成功
-
-购买成功后,用户可以查看我的订单,点击查看订单详情。
-
-
-
-### 查看购买资源
-
-点击服务项目标题,可以跳转到【我的数据库】,也可直接点击[我的数据库](https://www.modb.pro/databaseInfo)查看。
-
-
-
-
-
-## 在线实训
-
-### 连接数据库
-
-在[我的数据库](https://www.modb.pro/databaseInfo)列表会显示所有您购买的资源,显示数据库资源的具体信息,用户如果想要进入实训,点击【连接数据库】按钮进入。
-
-
-
-### 进入实训环境
-
-进入后,左侧会显示相关操作文档,右侧会显示操作平台,此时还未连接上,需要点击【点击进入实训环境】。
-
-
-
-### 开始学习
+## 开始学习
连接成功后,开始正式运行,这时候就可以执行相关操作了。
-
+
-### 参考文档
+## 参考文档
操作时,可以根据左侧的操作文档进行操作,同时左侧的操作文档可以进行折叠。
-
+
-### 关闭环境
+## 关闭环境
想要关闭数据库可以点击右下角的关闭按钮进行关闭,不过关闭后之前创建的数据库数据则被清空,再次连接则是一个新的环境,请谨慎操作。
-
-
-### 删除环境
-
-数据库状态是默认已关闭的,开启的数据库资源会显示进行中,同时购买的资源会有有效期,过了有效期的资源会显示【已过期】,已过期的数据库资源可以删除。
-
-
+
## 常见问题
-### 如果中途退出页面怎么办?
+**如果中途退出页面怎么办?**
用户如果直接关闭当前页面,事实上数据库资源还在运行中,只要在30分钟内再进入,之前创建的数据不会被删除(刷新当前页面也是一样的),并且中途退出当前页面,会有相关提示确定是否离开。
-
-
-### 可以同时开两个实训吗?
-
-不可以。如果要进入另一个数据库操作页面,则需要关闭当前运行的数据库。
-
-
-
-### 进入实训页面黑屏怎么办?
-
-**【现象】**
-进入实训页面,无法连接到数据库。
-
-
-
-**【原因】**
-可能因为服务器网络波动导致服务创建失败。
-
-**【解决方案】**
-(1)关闭当前窗口。
-(2)到[我的数据库](https://www.modb.pro/databaseInfo)页面,点击`关闭数据库`,再点击`连接数据库`重新进入即可。
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/product/zh/docs-mogdb/v2.1/quick-start/mogila.md b/product/zh/docs-mogdb/v2.1/quick-start/mogila.md
index 99c48798a55c5293dcd44f2954e4d3f4852b9244..f8d379d9ba0db08221ea60f830d663ac9068af41 100644
--- a/product/zh/docs-mogdb/v2.1/quick-start/mogila.md
+++ b/product/zh/docs-mogdb/v2.1/quick-start/mogila.md
@@ -13,7 +13,7 @@ MogDB提供了一个样本数据集Mogila,本数据集借鉴了适用于MySQL
Mogila数据集是一个关于DVD出租店信息的数据库,包含有关电影(如标题、类别、女演员)、出租店(如地址、工作人员、客户)和出租的信息。您可以使用Mogila数据库进行各种功能测试。
-Mogila适用于MogDB 2.1.0及更高版本。
+Mogila适用于MogDB 2.1及更高版本。
@@ -36,7 +36,7 @@ MogDB容器版本已经内置了Mogila样本数据库,无需额外安装。
```
docker exec -it mogdb bash
omm@eb7aef3f860f:~$ gsql -d mogila -p5432
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
@@ -77,7 +77,7 @@ MogDB容器版本已经内置了Mogila样本数据库,无需额外安装。
[root@test ~]# su - omm
# 登录postgres数据库,根据实际情况填写端口号
[omm@test ~]$ gsql -d postgres -p5432 -r
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
MogDB=#create database mogila DBCOMPATIBILITY='PG';
@@ -116,7 +116,7 @@ MogDB容器版本已经内置了Mogila样本数据库,无需额外安装。
```
[omm@test ~]$ gsql -d mogila -p5432 -r
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md b/product/zh/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md
index b22b3ccd186d3f758d59619c8b4240b0f3289678..c255db0b7231e2bdcfe26ba88d9deb296f1bd9a9 100644
--- a/product/zh/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md
+++ b/product/zh/docs-mogdb/v2.1/reference-guide/guc-parameters/3-connection-and-authentication/1-connection-settings.md
@@ -192,7 +192,7 @@ Unix域套接字使用普通的Unix文件系统权限集。这个参数的值应
> - 驱动连接数据库的时候自行拼接的connection_info参数格式如下:
>
> ```sql
-> {"driver_name":"ODBC","driver_version": "(MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr","driver_path":"/usr/local/lib/psqlodbcw.so","os_user":"omm"}
+> {"driver_name":"ODBC","driver_version": "(MogDB 2.1.1 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr","driver_path":"/usr/local/lib/psqlodbcw.so","os_user":"omm"}
> ```
>
> 默认显示driver_name和driver_version,driver_path和os_user的显示由用户控制。
diff --git a/product/zh/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md b/product/zh/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md
index f7b3e56fa5fcb0cd0de3cbcf76b7bd4b1630a1cb..b282c8eaa6ea5eb89f1ca4e2b03e50d305c8e772 100644
--- a/product/zh/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md
+++ b/product/zh/docs-mogdb/v2.1/reference-guide/sql-syntax/70-CREATE-VIEW.md
@@ -26,7 +26,7 @@ CreateView ::= CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW view_name [ ( col
>  **说明:**
>
> - 创建视图时使用WITH(security_barriers)可以创建一个相对安全的视图,避免攻击者利用低成本函数的RAISE语句打印出隐藏的基表数据。
-> - 旧版MogDB在create or replace创建视图的时候,如果存在同名视图,则replace时不可以更改列信息或者删除列,只能追加列。2.1.0版之后的MogDB支持REPLACE VIEW语法更新或者删除列信息。
+> - 旧版MogDB在create or replace创建视图的时候,如果存在同名视图,则replace时不可以更改列信息或者删除列,只能追加列。2.1版之后的MogDB支持REPLACE VIEW语法更新或者删除列信息。
## 参数说明
diff --git a/product/zh/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md b/product/zh/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md
index 8a0743fbb73632e3bbbac5cf201c7aa0260c23ee..a222e142d56cf8239f968ec32453960dc5e0d2b5 100644
--- a/product/zh/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md
+++ b/product/zh/docs-mogdb/v2.1/reference-guide/tool-reference/client-tool.md
@@ -441,7 +441,7 @@ omm@[local] mogdb=#
连接成功后,系统显示类似如下信息:
```sql
- gsql ((MogDB 2.1.0 build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
+ gsql ((MogDB x.x.x build 56189e20) compiled at 2022-01-07 18:47:53 commit 0 last mr )
Non-SSL connection (SSL connection is recommended when requiring high-security)
Type "help" for help.
diff --git a/product/zh/docs-mogdb/v2.1/toc.md b/product/zh/docs-mogdb/v2.1/toc.md
index c10e4dbb33c03f69803931f55f62e7c120cdafb5..3a60ee0d15618d626aa8536998e1eabd0bed36c2 100644
--- a/product/zh/docs-mogdb/v2.1/toc.md
+++ b/product/zh/docs-mogdb/v2.1/toc.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## Documentation List
@@ -12,8 +12,8 @@
+ [高可用测试](/about-mogdb/test-report/ha/MogDB-ha-test-report.md)
+ 性能测试
+ [性能测试简述](/about-mogdb/test-report/performance/1-performance-test-overview.md)
- + [MogDB on 鲲鹏性能测试](/about-mogdb/test-report/performance/2-mogdb-on-kunpeng-performance-test-report.md)
- + [MogDB on x86性能测试](/about-mogdb/test-report/performance/3-mogdb-on-x86-performance-test-report.md)
+ + [MogDB on 鲲鹏性能测试](/about-mogdb/test-report/performance/2-mogdb-on-kunpeng-performance-test-report.md)
+ + [MogDB on x86性能测试](/about-mogdb/test-report/performance/3-mogdb-on-x86-performance-test-report.md)
+ 开源组件
+ [容器版本的MogDB](/about-mogdb/open-source-components/2-docker-based-mogdb.md)
+ [compat-tools](/about-mogdb/open-source-components/compat-tools.md)
diff --git a/product/zh/docs-mogdb/v2.1/toc_about.md b/product/zh/docs-mogdb/v2.1/toc_about.md
index e4762ca5169a22b4d7f8fdcc88d8eeb0de74aba3..ce96fa1bc29295f1e0da233e31138b91fa03fc78 100644
--- a/product/zh/docs-mogdb/v2.1/toc_about.md
+++ b/product/zh/docs-mogdb/v2.1/toc_about.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 关于MogDB
@@ -11,8 +11,8 @@
+ [高可用测试](/about-mogdb/test-report/ha/MogDB-ha-test-report.md)
+ 性能测试
+ [性能测试简述](/about-mogdb/test-report/performance/1-performance-test-overview.md)
- + [MogDB on 鲲鹏性能测试](/about-mogdb/test-report/performance/2-mogdb-on-kunpeng-performance-test-report.md)
- + [MogDB on x86性能测试](/about-mogdb/test-report/performance/3-mogdb-on-x86-performance-test-report.md)
+ + [MogDB on 鲲鹏性能测试](/about-mogdb/test-report/performance/2-mogdb-on-kunpeng-performance-test-report.md)
+ + [MogDB on x86性能测试](/about-mogdb/test-report/performance/3-mogdb-on-x86-performance-test-report.md)
+ 开源组件
+ [容器版本的MogDB](/about-mogdb/open-source-components/2-docker-based-mogdb.md)
+ [compat-tools](/about-mogdb/open-source-components/compat-tools.md)
diff --git a/product/zh/docs-mogdb/v2.1/toc_datatypes-and-sql.md b/product/zh/docs-mogdb/v2.1/toc_datatypes-and-sql.md
index 089a8be45acb388e7b9617db5765199721f864df..64614f5c236e38ad611b953c47b30b460a96903d 100644
--- a/product/zh/docs-mogdb/v2.1/toc_datatypes-and-sql.md
+++ b/product/zh/docs-mogdb/v2.1/toc_datatypes-and-sql.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 数据类型及SQL
diff --git a/product/zh/docs-mogdb/v2.1/toc_dev.md b/product/zh/docs-mogdb/v2.1/toc_dev.md
index 14e3613ab5e54a7d5ff35f280eba096dd0daabb5..723b6975b47bbbdd9d5cd80b4f42cbcb2a7be4ce 100644
--- a/product/zh/docs-mogdb/v2.1/toc_dev.md
+++ b/product/zh/docs-mogdb/v2.1/toc_dev.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 开发者指南
diff --git a/product/zh/docs-mogdb/v2.1/toc_error.md b/product/zh/docs-mogdb/v2.1/toc_error.md
index 6fede016cf0a5b5bccab3b7061664fde9c19b642..b2d7d0fc4032df6e489b4c2397123a05c208ac61 100644
--- a/product/zh/docs-mogdb/v2.1/toc_error.md
+++ b/product/zh/docs-mogdb/v2.1/toc_error.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 数据库报错信息
diff --git a/product/zh/docs-mogdb/v2.1/toc_extension-referecne.md b/product/zh/docs-mogdb/v2.1/toc_extension-referecne.md
index 42eda5e1cd8ce110a925fadd6a45eee2a36dc525..9652ed4b2452953932ac6d140f480cc5b3ac05a5 100644
--- a/product/zh/docs-mogdb/v2.1/toc_extension-referecne.md
+++ b/product/zh/docs-mogdb/v2.1/toc_extension-referecne.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 插件指南
diff --git a/product/zh/docs-mogdb/v2.1/toc_faqs.md b/product/zh/docs-mogdb/v2.1/toc_faqs.md
index e94b134859fc345c5601ac7f8fa69dc30f2a1997..eec4a44b6ab7a2bb3233f24eaada3e389b16a561 100644
--- a/product/zh/docs-mogdb/v2.1/toc_faqs.md
+++ b/product/zh/docs-mogdb/v2.1/toc_faqs.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 常见问题解答 (FAQs)
diff --git a/product/zh/docs-mogdb/v2.1/toc_glossary.md b/product/zh/docs-mogdb/v2.1/toc_glossary.md
index 7107d5415ed4b3cd10e687f19487b8ff39180541..7854177c0f35a6e1795199936b4ed5c938748058 100644
--- a/product/zh/docs-mogdb/v2.1/toc_glossary.md
+++ b/product/zh/docs-mogdb/v2.1/toc_glossary.md
@@ -1,4 +1,4 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 术语表
diff --git a/product/zh/docs-mogdb/v2.1/toc_install.md b/product/zh/docs-mogdb/v2.1/toc_install.md
index 31146050093d4fd6710162162ec4a26c93622400..0422103f0e089ac3b3755d3f371fa12153dd8153 100644
--- a/product/zh/docs-mogdb/v2.1/toc_install.md
+++ b/product/zh/docs-mogdb/v2.1/toc_install.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 安装指南
diff --git a/product/zh/docs-mogdb/v2.1/toc_manage.md b/product/zh/docs-mogdb/v2.1/toc_manage.md
index bdfd86395d9157399691a20120600ee525cead31..2058b96f6efedaea3f8bbfdfe1266ad3eba57b99 100644
--- a/product/zh/docs-mogdb/v2.1/toc_manage.md
+++ b/product/zh/docs-mogdb/v2.1/toc_manage.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 管理指南
diff --git a/product/zh/docs-mogdb/v2.1/toc_parameters-and-tools.md b/product/zh/docs-mogdb/v2.1/toc_parameters-and-tools.md
index bff72429c08162608b0436ebdd4c943bf8b16d5b..1e8574ee1a51f84d415bfe096e5825dfd77f21ca 100644
--- a/product/zh/docs-mogdb/v2.1/toc_parameters-and-tools.md
+++ b/product/zh/docs-mogdb/v2.1/toc_parameters-and-tools.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 参数及工具
diff --git a/product/zh/docs-mogdb/v2.1/toc_performance.md b/product/zh/docs-mogdb/v2.1/toc_performance.md
index 0ab9c2c8ae43647520c443f048b0d363c7bbd92b..094a3029238dadab4d99652d14bf56d8ef37f6ec 100644
--- a/product/zh/docs-mogdb/v2.1/toc_performance.md
+++ b/product/zh/docs-mogdb/v2.1/toc_performance.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 性能优化指南
diff --git a/product/zh/docs-mogdb/v2.1/toc_quickstart.md b/product/zh/docs-mogdb/v2.1/toc_quickstart.md
index dcc352343719c6350fde11c0b20e98560274a492..6195352c8a5fe3e16153b249b9a4ffdc9a491d51 100644
--- a/product/zh/docs-mogdb/v2.1/toc_quickstart.md
+++ b/product/zh/docs-mogdb/v2.1/toc_quickstart.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 快速入门
diff --git a/product/zh/docs-mogdb/v2.1/toc_secure.md b/product/zh/docs-mogdb/v2.1/toc_secure.md
index 3bda106b3c2db697f17d06d84c01c6565fc2ab45..fd232962e6bc698cd8ee4ff1f006601177d079a4 100644
--- a/product/zh/docs-mogdb/v2.1/toc_secure.md
+++ b/product/zh/docs-mogdb/v2.1/toc_secure.md
@@ -1,6 +1,6 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 安全指南
diff --git a/product/zh/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md b/product/zh/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md
index 21500e886f22d628fcf2eb0204f94bf4402b1dd4..bf3b0cd245531b277c664280ac869cd464300096 100644
--- a/product/zh/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md
+++ b/product/zh/docs-mogdb/v2.1/toc_system-catalogs-and-functions.md
@@ -1,7 +1,7 @@
-# MogDB Documentation 2.1.0
+# MogDB Documentation 2.1
## 系统表及函数