diff --git a/content/en/docs/Administratorguide/backup-and-restoration.md b/content/en/docs/Administratorguide/backup-and-restoration.md index 2e651f8469fe300e4b20a17c8a2ab23d03164efc..f7d4e93c70782241263e829e503d075e2ee93842 100644 --- a/content/en/docs/Administratorguide/backup-and-restoration.md +++ b/content/en/docs/Administratorguide/backup-and-restoration.md @@ -10,13 +10,13 @@ ## Overview -For database security purposes, openGauss provides three backup types, multiple backup and restoration solutions, and data reliability assurance mechanisms. +For database security purposes, openGauss provides three backup and restoration types, multiple backup and restoration solutions, and data reliability assurance mechanisms during backup and restoration. Backup and restoration can be classified into logical backup and restoration, physical backup and restoration, and flashback. - Logical backup and restoration: backs up data by logically exporting data. This method can dump data that is backed up at a certain time point, and restore data only to this backup point. A logical backup does not back up data processed between failure occurrence and the last backup. It applies to scenarios where data rarely changes. Such data damaged due to misoperation can be quickly restored using a logical backup. To restore all the data in a database through logical backup, rebuild a database and import the backup data. Logical backup is not recommended for databases requiring high data availability because it takes a long time for data restoration. Logical backup is a major approach to migrate and transfer data because it can be performed on any platform. -- Physical backup and restoration: copies physical files in the unit of disk blocks from the primary node to the standby node to back up a database. A database can be restored using backup files, such as data files and archive log files. Physical backup is usually used for full backup, quickly backing up and restoring data at a low cost if properly planned. +- Physical backup and restoration: copies physical file in the unit of disk blocks from the primary node to the standby node to back up a database. A database can be restored using backup files such as data files and archive log files. A physical backup is useful when you need to quickly back up and restore the complete database within a short period of time. Backup and restoration can be implemented at low costs through proper planning. - Flashback: This function is used to restore dropped tables from the recycle bin. Like in a Window OS, dropped table information is stored in the recycle bin of databases. The MVCC mechanism is used to restore data to a specified point in time or change sequence number \(CSN\). @@ -51,7 +51,7 @@ Backup and restoration can be classified into logical backup and restoration, ph

gs_dump

-

It takes a long time to restore data in plain-text format. It takes a long time to restore data in archive format.

+

It takes a long time to restore data in plain-text format. It takes a moderate time to restore data in archive format./p>

This tool is used to export database information. Users can export a database or its objects (such as schemas, tables, and views). The database can be the default postgres database or a user-specified database. The exported file can be in plain-text format or archive format. Data in plain-text format can be restored only by using gsql, which takes a long time. Data in archive format can be restored only by using gs_restore. The restoration time is shorter than that of the plain-text format.

@@ -97,7 +97,7 @@ Backup and restoration can be classified into logical backup and restoration, ph

None

-

You can restore a table to the status at a specified time point or before the table structure is deleted within a short period of time.

+

You can restore a table to the status at a specified time point or before the table structure is deleted.The restoration takes a short time.

Flashback can selectively and efficiently undo the impact of a committed transaction and recover from a human error. Before the flashback technology is used, the committed database modification can be retrieved only by means of restoring backup or PITR. The restoration takes several minutes or even hours. After the flashback technology is used, it takes only seconds to restore the committed data before the database is modified. The restoration time is irrelevant to the database size.

Flashback supports two recovery modes:

@@ -328,7 +328,8 @@ If a database is faulty, restore it from backup files. **gs\_basebackup** back ![](public_sys-resources/icon-note.gif) **NOTE:** - If the current database instance is running, a port conflict may occur when you start the database from the backup file. In this case, you need to modify the port parameter in the configuration file or specify a port when starting the database. -- If the current backup file is a primary/standby database, you may need to modify the replication connections between the master and slave databases. That is, **replconninfo1** and **replconninfo2** in the **postgresql.conf** file. +- If the current backup file is a primary/standby database, you may need to modify the replication connections between the master and slave databases, such as, **replconninfo1** and **replconninfo2** in the **postgresql.conf** file. +- If the data_directory parameter in the postgresql.conf configuration filež is enabled and configurd and the backup directory is used to start the database, the database fails to be started because the value of data_directory isdifferent from the backup directory. You can change the value of data_directory to a new data directory or comment out this parameter. To restore the original database, perform the following steps: @@ -358,6 +359,7 @@ To restore the original database, perform the following steps: - The openGauss database can be connected. - To use PTRACK incremental backup, manually add **enable\_cbm\_tracking = on** to **postgresql.conf**. +- To prevent Xlogs from being cleared before the transmission is complete,increase the value of wal_keep_segments in the postgresql.conf file. #### Important Notes @@ -1868,6 +1870,7 @@ gs_dump [OPTION]... [DBNAME] _DBNAME_ does not follow a short or long option. It specifies the database to be connected. For example: Specify _DBNAME_ without a **-d** option preceding it. + ``` gs_dump -p port_number postgres -f dump1.sql ``` diff --git a/content/en/docs/Administratorguide/generating-configuration-files.md b/content/en/docs/Administratorguide/generating-configuration-files.md index 67bb43507ece1288d27dc9317dd2577967732d28..2e2f4a3fa943518fb45487048aaf558b77fa9acf 100644 --- a/content/en/docs/Administratorguide/generating-configuration-files.md +++ b/content/en/docs/Administratorguide/generating-configuration-files.md @@ -11,17 +11,17 @@ None ## Procedure 1. Log in as the OS user **omm** to the primary node of the database. -2. Run the following command to generate configuration files in a specified directory on the current host: +2. Run the following command to generate configuration files in a specified directory on the current host: - ``` - gs_om -t generateconf -X /opt/software/openGauss/clusterconfig.xml --distribute - ``` + ``` + gs_om -t generateconf -X /opt/software/openGauss/clusterconfig.xml --distribute + ``` - **/opt/software/openGauss/clusterconfig.xml** is the XML configuration files during the openGauss installation. + **/opt/software/openGauss/clusterconfig.xml** is the XML configuration files during the openGauss installation. - >![](public_sys-resources/icon-note.gif) **NOTE:** - >1. After the command is executed, the new configuration file storage directory is displayed in the log information. Take a one-primary dual-standby environment as an example. This directory contains three configuration files named by host names. You need to replace the configuration files of corresponding hosts with the three files respectively. - >2. If **--distribute** is not specified, perform [3](#en-us_topic_0237088792_en-us_topic_0059777801_lc1ce55d572e44beea3e47b1b427fae3e) to distribute static configuration files to their corresponding hosts. If **--distribute** is specified, the static configuration files are automatically distributed and you do not need to perform [3](#en-us_topic_0237088792_en-us_topic_0059777801_lc1ce55d572e44beea3e47b1b427fae3e). + >![](public_sys-resources/icon-note.gif) **NOTE:** + >1. After the command is executed, the new configuration file storage directory is displayed in the log information. Take a one-primary two-standby environment as an example. This directory contains three configuration files named by host names. You need to replace the configuration files of corresponding hosts with the three files respectively. + >2. If **--distribute** is not specified, perform [3](#en-us_topic_0237088792_en-us_topic_0059777801_lc1ce55d572e44beea3e47b1b427fae3e) to distribute static configuration files to their corresponding hosts. If **--distribute** is specified, the static configuration files are automatically distributed and you do not need to perform [3](#en-us_topic_0237088792_en-us_topic_0059777801_lc1ce55d572e44beea3e47b1b427fae3e). 3. \(Optional\) Replace the damaged static configuration files of the three hosts in the **/opt/gaussdb/app/bin** directory. diff --git a/content/en/docs/Administratorguide/risky-operations.md b/content/en/docs/Administratorguide/risky-operations.md index f5ea911de89610e40e103f548f3c8dc8ddd96630..5a804e962236bb87d6ec7d62c3510400a6faafc8 100644 --- a/content/en/docs/Administratorguide/risky-operations.md +++ b/content/en/docs/Administratorguide/risky-operations.md @@ -1,29 +1,29 @@ # Risky Operations -Perform operations strictly following instructions provided in the guide. Do not perform the following risky operations. +Strictly follow the operation guide and avoid the following risky operations: [Table 1](#en-us_topic_0237088894_en-us_topic_0059777750_t725e2ece7f7a4d5f962b2c314e7e836b) describes forbidden operations during routine O&M. **Table 1** Forbidden operations - - - - - - - - - - - +

Forbidden Operation

-

Risk

-

Modify the file name, permission, or content, or delete any content in the data directory.

-

Serious errors occur on DNs and cannot be fixed.

-

Delete database system catalogs or their data.

-

Service operations cannot be properly performed.

-
+ + + + + + + + + +

Forbidden Operation

+

Risk

+

Modify the file name, permission, or content, or delete any content in the data directory.

+

Serious errors occur on DNs and cannot be fixed.

+

Delete database system catalogs or their data.

+

Service operations cannot be properly performed.

+
[Table 2](#en-us_topic_0237088894_en-us_topic_0059777750_tf7f1e2a0747f496baffa365814127a3c) describes risky operations during routine O&M. @@ -31,68 +31,68 @@ Perform operations strictly following instructions provided in the guide. Do not **Table 2** Risky operations - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

Category

-

Risky Operation

-

Risk

-

Risk Level

-

Preventive Measure

-

Check Item

-

Database

-

Open a configuration file and manually modify the port number.

-

The database fails to be started or connected.

-

▲▲▲▲▲

-

Use the required tool to modify the port number.

-

None

-

Incautiously modify the content of the pg_hba.conf file.

-

The client fails to be connected.

-

▲▲▲▲▲

-

Strictly follow the instructions provided in product documentation while you modify this file.

-

None

-

Manually modify the pg_xlog file.

-

Database startup fails and data becomes inconsistent.

-

▲▲▲▲▲

-

Use the required tool to modify this file.

-

None

-

Job

-

Run the kill -9 command to terminate a job process.

-

System resources occupied by this job cannot be released.

-

▲▲▲

-

Log in to the database and use the pg_terminate_backend or pg_cancel_backend function to terminate the job, or press Ctrl+C to terminate the job process.

-

Resource usage

-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Category

+

Risky Operation

+

Risk

+

Risk Level

+

Preventive Measure

+

Check Item

+

Database

+

Open a configuration file and manually modify the port number.

+

The database fails to be started or connected.

+

▲▲▲▲▲

+

Use the required tool to modify the port number.

+

None

+

Incautiously modify the content of the pg_hba.conf file.

+

The client fails to be connected.

+

▲▲▲▲▲

+

Strictly follow the instructions provided in product documentation while you modify this file.

+

None

+

Manually modify the pg_xlog file.

+

Database startup fails and data becomes inconsistent.

+

▲▲▲▲▲

+

Use the required tool to modify this file.

+

None

+

Job

+

Run the kill -9 command to terminate a job process.

+

System resources occupied by this job cannot be released.

+

▲▲▲

+

Log in to the database and use the pg_terminate_backend or pg_cancel_backend function to terminate the job, or press Ctrl+C to terminate the job process.

+

Resource usage

+
diff --git a/content/en/docs/Administratorguide/routine-maintenance.md b/content/en/docs/Administratorguide/routine-maintenance.md index f6c94c0f9be7ea5ed31fdcf5956bdef0a15fae06..dcf2e3786dd45bee7a1d7e70efda7a3481abec7e 100644 --- a/content/en/docs/Administratorguide/routine-maintenance.md +++ b/content/en/docs/Administratorguide/routine-maintenance.md @@ -198,14 +198,15 @@ Use the **gs\_checkos** tool provided by openGauss to check the OS status. **Procedure** -1. Log in to a server as user **root**. +1. Log in to a server as user **root**. + 2. Run the following command to check OS parameters of servers where the openGauss nodes are deployed: ``` gs_checkos -i A ``` - Check the OS parameters to ensure that openGauss has passed the pre-installation check and can efficiently operate after it is installed. For details about the check items, see "Server Tools \> gs\_checkos" in the _openGauss Tool Reference_. + The purpose of checking the OS parameters is to ensure that openGauss is preinstalled properly and can žffic²žnìÃy operate after it is installed. For details about the check items, see "Server Tools > gs_checkos" in the Tool Reference. **Examples** @@ -1642,10 +1643,8 @@ The database supports B-tree indexes. Recreating a B-tree index routinely helps Use either of the following two methods to recreate an index: -- Run the **DROP INDEX** statement to delete the index and run the **CREATE INDEX** statement to create an index. - - When you delete an index, a temporary exclusive lock is added in the parent table to block related read/write operations. During index creation, the write operation is locked, whereas the read operation is not locked and can use only sequential scans. - +- Run the **DROP INDEX** statement to delete the index and then run the **CREATE INDEX** statement to create an index. +- When you delete an index, a temporary exclusive lock is added in the parent table to block related read/write operations. During index creation, the write operation is locked, whereas the read operation is not locked and can use only sequential scans. - Run **REINDEX** to recreate an index. - When you run the **REINDEX TABLE** statement to recreate an index, an exclusive lock is added to block related read/write operations. - When you run the **REINDEX INTERNAL TABLE** statement to recreate an index for a **desc** table \(such as column-store **cudesc** table\), an exclusive lock is added to block related read/write operations on the table. @@ -1711,8 +1710,9 @@ You are advised to plan routine physical backup and store backup files in a reli >![](public_sys-resources/icon-note.gif) **NOTE:** >The log level **log\_min\_messages** is set to **DEBUG**_x_ \(_x_ indicates the debug level and the value ranges from 1 to 5\). The information recorded in debug logs may contain personal data. -- Delete personal data before sending system logs to others for analysis. If the execution of a SQL statement fails, the error SQL statement will be recorded in a system log by default. SQL statements may contain personal data. -- Set **log\_min\_error\_statement** to **PANIC** to prevent error SQL statements from being recorded in system logs. However, once the function is disabled, it is difficult to locate fault causes if faults occur. +- Delete personal data before sending system logs to others for analysis. If the execution of a SQL statement fails, the error SQL statement will be recorded in a system log by default. SQL statements may contain personal data. + +- Set **log\_min\_error\_statement** to **PANIC** to prevent error SQL statements from being recorded in system logs. If this function is disabled, it is difficult to locate fault causes when a fault occurs. ## Slow SQL Diagnosis diff --git a/content/en/docs/Developerguide/date-and-time-processing-functions-and-operators.md b/content/en/docs/Developerguide/date-and-time-processing-functions-and-operators.md index ddec353291c3855bd08081b2f334d2b44a71e5f3..1d2c46597074eb897ed9a8a525be4e5f14bdc8a9 100644 --- a/content/en/docs/Developerguide/date-and-time-processing-functions-and-operators.md +++ b/content/en/docs/Developerguide/date-and-time-processing-functions-and-operators.md @@ -694,7 +694,7 @@ ``` -- tinterval\(abstime, abstime \) +- tinterval\(abstime, abstime\) Description: Creates a time interval with two pieces of absolute time. @@ -706,7 +706,7 @@ openGauss=# call tinterval(abstime 'May 10, 1947 23:59:12', abstime 'Mon May 1 00:30:30 1995'); tinterval ----------------------------------------------------- - ["1947-05-10 23:59:12+08" "1995-05-01 00:30:30+08"] + ["1947-05-10 23:59:12+09" "1995-05-01 00:30:30+08"] (1 row) ``` diff --git a/content/en/docs/Toolreference/gs_basebackup.md b/content/en/docs/Toolreference/gs_basebackup.md index 90d20edfd1a994cf6f65653671980cc57940f8d4..bf45689e7d7b8f9076adae0b917c4ab8c69045e3 100644 --- a/content/en/docs/Toolreference/gs_basebackup.md +++ b/content/en/docs/Toolreference/gs_basebackup.md @@ -148,8 +148,8 @@ If a database is faulty, restore it from backup files. **gs\_basebackup** back >![](public_sys-resources/icon-note.gif) **NOTE:** >- If the current database instance is running, a port conflict may occur when you start the database from the backup file. In this case, you need to modify the port parameter in the configuration file or specify a port when starting the database. ->- If the current backup file is a primary/standby database, you may need to modify the replication connections between the primary and standby databases. That is, **replconninfo1** and **replconninfo2** in the **postgre.conf** file. ->- If the parameter data_directory of the configuration file postgresql.conf is opened and configured, when the database is started using the backup directory, the difference between the data_directory and the backup directory will cause the startup to fail. You can modify the value of data_directory to the new data directory, or comment out this parameter. +>- If the current backup file is a primary/standby database, you may need to modify the replication connections between the primary and standby databases, such as, **replconninfo1** and **replconninfo2** in the **postgre.conf** file. +>- If the data_directory parameter in the postgresql.conf configuration filež is enabled and configurd and the backup directory is used to start the database, the database fails to be started because the value of data_directory isdifferent from the backup directory. You can change the value of data_directory to a new data directory or comment out this parameter. To restore the original database, perform the following steps: diff --git a/content/en/docs/Toolreference/gs_probackup.md b/content/en/docs/Toolreference/gs_probackup.md index b7c017ac42f310732ec204ca72c158fb871b3439..cc097c760c169fb926fd7e04f506e101be5fd9cb 100644 --- a/content/en/docs/Toolreference/gs_probackup.md +++ b/content/en/docs/Toolreference/gs_probackup.md @@ -14,6 +14,7 @@ - The openGauss database can be connected. - To use PTRACK incremental backup, manually add **enable\_cbm\_tracking = on** to **postgresql.conf**. - In order to prevent the xlog from being cleaned up before the end of the transfer, please increase the value of wal_keep_segements in the postgresql.conf file appropriately. +- To prevent Xlogs from being cleared before the transmission is complete,increase the value of wal_keep_segments in the postgresql.conf file. ## Important Notes diff --git a/content/en/docs/Toolreference/gs_upgradectl.md b/content/en/docs/Toolreference/gs_upgradectl.md index c357614d834e45641774172acabb377a3a1b2c4c..5f41f331a6c2d9c2ab08431f5ff861d87217c930 100644 --- a/content/en/docs/Toolreference/gs_upgradectl.md +++ b/content/en/docs/Toolreference/gs_upgradectl.md @@ -212,7 +212,7 @@ Once the check done, please execute following command to commit upgrade: Example 3: Execute the **gs\_upgradectl** script to perform automatic rollback on the upgrade. ``` -gs_upgradectl -t rollback -X /data/xml/3node_3c3d_1m2s_etcd.xml +gs_upgradectl -t auto-rollback -X /data/xml/3node_3c3d_1m2s_etcd.xml Static configuration matched with old static configuration files. Performing inplace rollback. Checking static configuration files. diff --git a/content/en/docs/installation/creating-an-xml-configuration-file.md b/content/en/docs/installation/creating-an-xml-configuration-file.md index f09f23895474fe8f77702e6841033f800196e004..717b1fab78b544526d3bf21cf5b5de85279580ad 100644 --- a/content/en/docs/installation/creating-an-xml-configuration-file.md +++ b/content/en/docs/installation/creating-an-xml-configuration-file.md @@ -49,11 +49,11 @@ Obtain the XML file template from **script/gspylib/etc/conf/cluster\_config\_te >![](public_sys-resources/icon-notice.gif) **NOTICE:** > ->- The **/opt/huawei/install/om** directory is used to store tools for mutual trust. To avoid permission problems, do not store instance data in the directory. +>- The **/opt/huawei/install/om** directory is used to store tools such ar mutual trust. To avoid permission problems, do not store instance data in the directory. >- The installation and data directories must be empty or do not exist. Otherwise, the installation may fail. >- When configuring database instances, ensure that the configured directories are not coupled with each other. This means that the configured directories must not be associated with each other. If any directory is deleted, the other directories will not be deleted accordingly. For example, **gaussdbAppPath** is **/opt/huawei/install/app** and **gaussdbLogPath** is **/opt/huawei/install/app/omm**. If the directory specified by **gaussdbAppPath** is deleted, that specified by **gaussdbLogPath** will also be deleted, causing unexpected problems. >- If the installation script is required to automatically create installation users, ensure that the configured directories are not coupled with the default user directories created by the system. ->- The openGauss and instance paths cannot contain double backslashes \(\\\\\) or the following characters: |;&$<\>\`'\\"\{\}\(\)\[\]\~\*? +>- The openGauss and instance paths cannot contain double backslashes \(\\\\\) or the following characters: "|",";","&","$","<",">","`","\\","'","\"","{","}","(",")","[","]","~","*", and "?". >- When configuring the database node name, run the **hostname** command to obtain the host name of the database node and replace **node1\_hostname** and **node2\_hostname** in the example with the obtained host name. **Table 1** Parameter description diff --git a/content/en/docs/installation/initializing-the-installation-environment.md b/content/en/docs/installation/initializing-the-installation-environment.md index 580f31a2db9a2fe88dc07079bfba6c8ba0c2f042..7b6e2ee34e5c8e80cbac8067c2c50f22f8ba4d69 100644 --- a/content/en/docs/installation/initializing-the-installation-environment.md +++ b/content/en/docs/installation/initializing-the-installation-environment.md @@ -103,7 +103,7 @@ Executing the **gs\_preinstall** script enables the system to automatically co ``` ![](public_sys-resources/icon-note.gif) **NOTE:** - - In this mode, ensure that mutual trust has been established between the root users of all nodes and between the openGauss users of the cluster before performing.In this mode, ensure that mutual trust has been established between users **root** and between openGauss users on each node before executing **gs\_preinstall**. + - In this mode, ensure that mutual trust has been established between users **root** and between openGauss users on each node before executing **gs\_preinstall**. - The mutual trust established between users **root** may incur security risks. You are advised to delete the mutual trust between users **root** immediately after the installation is complete. diff --git "a/content/zh/docs/Administratorguide/\344\276\213\350\241\214\347\273\264\346\212\244.md" "b/content/zh/docs/Administratorguide/\344\276\213\350\241\214\347\273\264\346\212\244.md" index 5b182a6319ac6dc0b945ddbddc1aa9dfd24f8030..43ccdd6432f98d70e9d5df040d31c7d111a8ad97 100644 --- "a/content/zh/docs/Administratorguide/\344\276\213\350\241\214\347\273\264\346\212\244.md" +++ "b/content/zh/docs/Administratorguide/\344\276\213\350\241\214\347\273\264\346\212\244.md" @@ -91,7 +91,7 @@ SQL语句长时间运行会占用大量系统资源，用户可以通过查看 openGauss=# SELECT count(*) FROM pg_stat_activity; ``` -- 系统级统计信息 +- 查询系统级统计信息 查询当前使用内存最多的会话信息。 @@ -252,7 +252,7 @@ Total numbers:6. Abnormal numbers:0. Warning number:0. ### 异常处理 -使用gs\_checkos检查或设置状态为Abnormal，可以使用如下命令查看详细的错误信息。 +使用gs\_checkos检查openGauss状态，可以使用如下命令查看详细的错误信息。 ``` gs_checkos -i A --detail @@ -1624,7 +1624,7 @@ vim /var/log/messages 重建索引有以下两种方式： -- 先删除索引（DROP INDEX），再创建索引（CREATE INDEX）。 +- 先运行DROP INDEX语句删除索引，再运行CREATE INDEX语句创建索引。 在删除索引过程中，会在父表上增加一个短暂的排他锁，阻止相关读写操作。在创建索引过程中，会锁住写操作但是不会锁住读操作，此时读操作只能使用顺序扫描。 @@ -1693,8 +1693,9 @@ vim /var/log/messages >![](public_sys-resources/icon-note.gif) **说明：** >因为日志级别（log\_min\_messages）设置为DEBUGx（x为DEBUG级别，取值范围为1\~5）时，调试日志中记录的信息可能包含用户的个人数据。 -- 将系统日志发给其他人进行分析前，请删除个人数据。因为在默认配置下，当SQL语句执行错误时，日志中会记录出错的SQL语句，而这些SQL语句中可能包含用户个人数据。 -- 将log\_min\_error\_statement参数的值设置为PANIC可以避免在系统日志中记录出错的SQL语句，但是关闭此功能将导致发生错误时难以定位。 +- 将系统日志发给其他人进行分析前，请删除个人数据。因为在默认配置下，当SQL语句执行错误时，日志中会记录出错的SQL语句，而这些SQL语句中可能包含用户个人数据。 + +- 将log_min_error_statement参数的值设置为PANIC，可以避免将出错的SQL语句记录在系统日志中。若禁用该功能，当出现故障时，很难定位故障原因。 ## 慢SQL诊断 diff --git "a/content/zh/docs/Administratorguide/\345\244\207\344\273\275\344\270\216\346\201\242\345\244\215.md" "b/content/zh/docs/Administratorguide/\345\244\207\344\273\275\344\270\216\346\201\242\345\244\215.md" index ae3567bb98b4f8b7a9329156ba2f3994dad1de0c..a22bc25dedd1c784042f79d3ee218543b3377600 100644 --- "a/content/zh/docs/Administratorguide/\345\244\207\344\273\275\344\270\216\346\201\242\345\244\215.md" +++ "b/content/zh/docs/Administratorguide/\345\244\207\344\273\275\344\270\216\346\201\242\345\244\215.md" @@ -1233,9 +1233,9 @@ gs_dump [OPTION]... [DBNAME] ``` >![](public_sys-resources/icon-note.gif) **说明:** ->“dbname”前面不需要加短或长选项。“dbname”指定要连接的数据库。 +>“DBNAME”前面不需要加短或长选项。“DBNAME”指定要连接的数据库。 >例如： ->不需要-d，直接指定“dbname”。 +>不需要-d，直接指定“DBNAME”。 > >``` >gs_dump -p port_number postgres -f dump1.sql @@ -2209,7 +2209,7 @@ gs_restore [OPTION]... FILE - -x, --no-privileges/--no-acl - 防止导入访问权限（grant/revoke命令）。 + 防止导入访问权限（GRANT/REVOKE命令）。 - -1, --single-transaction diff --git "a/content/zh/docs/Administratorguide/\351\253\230\345\215\261\346\223\215\344\275\234\344\270\200\350\247\210\350\241\250.md" "b/content/zh/docs/Administratorguide/\351\253\230\345\215\261\346\223\215\344\275\234\344\270\200\350\247\210\350\241\250.md" index 03cb26010ccd2224408d02fe3b6068b2c93a835e..05ecfbb484ae720915b8ed9a3a3ed5a4c4c4f1e9 100644 --- "a/content/zh/docs/Administratorguide/\351\253\230\345\215\261\346\223\215\344\275\234\344\270\200\350\247\210\350\241\250.md" +++ "b/content/zh/docs/Administratorguide/\351\253\230\345\215\261\346\223\215\344\275\234\344\270\200\350\247\210\350\241\250.md" @@ -1,6 +1,6 @@ # 高危操作一览表 -各项操作请严格遵守指导书操作，同时如下高危操作禁止随意执行。 +各项操作请严格遵守指导书操作，同时避免执行如下高危操作。 [表1](#zh-cn_topic_0237088894_zh-cn_topic_0059777750_t725e2ece7f7a4d5f962b2c314e7e836b)中描述在产品的操作与维护阶段，进行日常操作时应注意的严禁操作。 @@ -47,7 +47,7 @@

数据库

-

不能直接在配置文件中手动修改端口号。

+

直接在配置文件中手动修改端口号。

导致数据库启动不了或者连接不上。

@@ -58,7 +58,7 @@

无。

-

不能随意修改pg_hba.conf配置文件中的内容。

+

随意修改pg_hba.conf配置文件中的内容。

导致客户端连接不上。

@@ -69,7 +69,7 @@

无。

-

不能手动修改pg_xlog的内容。

+

手动修改pg_xlog的内容。

导致数据库无法启动，数据不一致。

@@ -96,3 +96,4 @@ + diff --git "a/content/zh/docs/Developerguide/\346\225\260\347\273\204\350\241\250\350\276\276\345\274\217.md" "b/content/zh/docs/Developerguide/\346\225\260\347\273\204\350\241\250\350\276\276\345\274\217.md" index a9d217622f8a0ed9a2a9455b2c6f4885193c5ec5..13da994648b1f6cb2049de1c329e2eb44137a8c3 100644 --- "a/content/zh/docs/Developerguide/\346\225\260\347\273\204\350\241\250\350\276\276\345\274\217.md" +++ "b/content/zh/docs/Developerguide/\346\225\260\347\273\204\350\241\250\350\276\276\345\274\217.md" @@ -2,7 +2,7 @@ ## IN -_expression _**IN **_\(value \[, ...\]\)_ +_expression **IN**_ \(value \[, ...\]\) 右侧括号中的是一个表达式列表。左侧表达式的结果与表达式列表的内容进行比较。如果列表中的内容符合左侧表达式的结果，则IN的结果为true。如果没有相符的结果，则IN的结果为false。 @@ -20,7 +20,7 @@ openGauss=# SELECT 8000+500 IN (10000, 9000) AS RESULT; ## NOT IN -_expression _**NOT IN**_ \(value \[, ...\]\)_ +_expression NOT IN**_ \(value \[, ...\]\) 右侧括号中的是一个表达式列表。左侧表达式的结果与表达式列表的内容进行比较。如果在列表中的内容没有符合左侧表达式结果的内容，则NOT IN的结果为true。如果有符合的内容，则NOT IN的结果为false。 @@ -42,9 +42,9 @@ openGauss=# SELECT 8000+500 NOT IN (10000, 9000) AS RESULT; ## ANY/SOME \(array\) -_expression operator _**ANY **_\(array expression\)_ +_expression operator **ANY **_\(array expression\) -_expression operator _**SOME **_\(array expression\)_ +_expression operator **SOME **_\(array expression\) ``` openGauss=# SELECT 8000+500 < SOME (array[10000,9000]) AS RESULT; @@ -75,7 +75,7 @@ openGauss=# SELECT 8000+500 < ANY (array[10000,9000]) AS RESULT; ## ALL \(array\) -_expression operator _**ALL **_\(array expression\)_ +_expression operator **ALL **_\(array expression\) 右侧括号中的是一个数组表达式，它必须产生一个数组值。左侧表达式的结果使用操作符对数组表达式的每一行结果都进行计算和比较，比较结果必须是布尔值。 diff --git "a/content/zh/docs/Developerguide/\346\227\266\351\227\264\345\222\214\346\227\245\346\234\237\345\244\204\347\220\206\345\207\275\346\225\260\345\222\214\346\223\215\344\275\234\347\254\246.md" "b/content/zh/docs/Developerguide/\346\227\266\351\227\264\345\222\214\346\227\245\346\234\237\345\244\204\347\220\206\345\207\275\346\225\260\345\222\214\346\223\215\344\275\234\347\254\246.md" index a70cab32aefe954e3d113f3364d6d122ace04e17..7c6fd4c5f350997d8f50b7a9da85238d7590f3eb 100644 --- "a/content/zh/docs/Developerguide/\346\227\266\351\227\264\345\222\214\346\227\245\346\234\237\345\244\204\347\220\206\345\207\275\346\225\260\345\222\214\346\223\215\344\275\234\347\254\246.md" +++ "b/content/zh/docs/Developerguide/\346\227\266\351\227\264\345\222\214\346\227\245\346\234\237\345\244\204\347\220\206\345\207\275\346\225\260\345\222\214\346\223\215\344\275\234\347\254\246.md" @@ -4,15 +4,13 @@ ![](public_sys-resources/icon-warning.gif) **警告：** -用户在使用时间和日期操作符时，对应的操作数请使用明确的类型前缀修饰，以确保数据库在解析操作数的时候能够与用户预期一致，不会产生用户非预期的结果。比如下面示例没有明确数据类型就会出现异常错误。 +用户在使用时间和日期操作符时，对应的操作数请使用明确的类型前缀修饰，以确保数据库在解析操作数的时候能够与用户预期一致，不会产生用户非预期的结果。比如下面示例没有明确数据类型就会出现异常错误。 ``` -SELECT date '2001-10-01' - '7' AS RESULT; + SELECT date '2001-10-01' - '7' AS RESULT; ``` - - -## **表 1** 时间和日期操作符 +**表 1** 时间和日期操作符 @@ -699,7 +697,7 @@ SELECT date '2001-10-01' - '7' AS RESULT; ``` -- tinterval\(abstime, abstime \) +- tinterval\(abstime, abstime\) 描述：用两个绝对时间创建时间间隔。 @@ -711,7 +709,7 @@ SELECT date '2001-10-01' - '7' AS RESULT; openGauss=# call tinterval(abstime 'May 10, 1947 23:59:12', abstime 'Mon May 1 00:30:30 1995'); tinterval ----------------------------------------------------- - ["1947-05-10 23:59:12+08" "1995-05-01 00:30:30+08"] + ["1947-05-10 23:59:12+09" "1995-05-01 00:30:30+08"] (1 row) ``` @@ -1058,7 +1056,7 @@ timestampdiff函数是计算两个日期时间之间\(timestamp\_expr2-timestamp ## EXTRACT -- **EXTRACT\(**_field _**FROM **_source_**\)** +- **EXTRACT\(**_field _**FROM **_source**\)** extract函数从日期或时间的数值里抽取子域，比如年、小时等。source必须是一个timestamp、time或interval类型的值表达式（类型为date的表达式转换为timestamp，因此也可以用）。field是一个标识符或者字符串，它指定从源数据中抽取的域。extract函数返回类型为double precision的数值。field的取值范围如下所示。 diff --git "a/content/zh/docs/Developerguide/\347\256\200\345\215\225\350\241\250\350\276\276\345\274\217.md" "b/content/zh/docs/Developerguide/\347\256\200\345\215\225\350\241\250\350\276\276\345\274\217.md" index dcd91fcc8bc3687c65b224b93cab0d36b0b0807d..e18f91af51d2f8a0e9291764a0332455327c4eb8 100644 --- "a/content/zh/docs/Developerguide/\347\256\200\345\215\225\350\241\250\350\276\276\345\274\217.md" +++ "b/content/zh/docs/Developerguide/\347\256\200\345\215\225\350\241\250\350\276\276\345\274\217.md" @@ -12,19 +12,19 @@ - BETWEEN操作符 - a BETWEEN x_ _ AND y等效于a \>= x AND a <= y + a BETWEEN x AND y等效于a \>= x AND a <= y - a NOT BETWEEN_ _ x AND y等效于a < x OR a \> y + a NOT BETWEEN x AND y等效于a < x OR a \> y - 检查一个值是不是null，可使用： - expression_ _IS NULL + expression IS NULL expression IS NOT NULL 或者与之等价的句式结构，但不是标准的： - expression_ _ ISNULL + expression ISNULL expression NOTNULL diff --git a/content/zh/docs/Toolreference/gs_dump.md b/content/zh/docs/Toolreference/gs_dump.md index 259440c671d1222c9a008ef9425d055f76fe1012..222119df0b9e001613018a841c62291168fac6dd 100644 --- a/content/zh/docs/Toolreference/gs_dump.md +++ b/content/zh/docs/Toolreference/gs_dump.md @@ -97,9 +97,9 @@ gs_dump [OPTION]... [DBNAME] ``` ![](public_sys-resources/icon-note.gif) **说明：** -“dbname”前面不需要加短或长选项。“dbname”指定要连接的数据库。 +“DBNAME”前面不需要加短或长选项。“DBNAME”指定要连接的数据库。 例如： -不需要-d，直接指定“dbname”。 +不需要-d，直接指定“DBNAME”。 ``` gs_dump -p port_number postgres -f dump1.sql diff --git a/content/zh/docs/Toolreference/gs_restore.md b/content/zh/docs/Toolreference/gs_restore.md index 7daa676f55589d3ad5dbec490749b500a9c8a1a3..378b99910762575c0728ff3c5b74e4ff3948e964 100644 --- a/content/zh/docs/Toolreference/gs_restore.md +++ b/content/zh/docs/Toolreference/gs_restore.md @@ -202,7 +202,7 @@ gs_restore [OPTION]... FILE - -x, --no-privileges/--no-acl - 防止导入访问权限（grant/revoke命令）。 + 防止导入访问权限（GRANT/REVOKE命令）。 - -1, --single-transaction diff --git a/content/zh/docs/Toolreference/gs_upgradectl.md b/content/zh/docs/Toolreference/gs_upgradectl.md index e4294f5cd25d9ced2c3b2f88989776280305de77..fa3060c4f3ce1d35a3d5b82de712e8b17f2b9330 100644 --- a/content/zh/docs/Toolreference/gs_upgradectl.md +++ b/content/zh/docs/Toolreference/gs_upgradectl.md @@ -211,7 +211,7 @@ Once the check done, please execute following command to commit upgrade: **示例三：**使用gs\_upgradectl脚本执行自动回滚，撤销已经成功/失败的升级操作（升级回滚）。 ``` -gs_upgradectl -t rollback -X /data/xml/3node_3c3d_1m2s_etcd.xml +gs_upgradectl -t auto-rollback -X /data/xml/3node_3c3d_1m2s_etcd.xml Static configuration matched with old static configuration files. Performing inplace rollback. Checking static configuration files. diff --git "a/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\203.md" "b/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\203.md" index 8a95f7a7e321d6b2e33f7faa8ef8cf3d28823450..d6aae39f7f7d3d9ff50cc9ca88988033ee3b22ff 100644 --- "a/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\203.md" +++ "b/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\203.md" @@ -103,7 +103,7 @@ ### 软件依赖要求 -openGauss的软件依赖要求如[表3 软件依赖要求](#table1212531681911)所示。 +openGauss的软件依赖要求如[表3](#table1212531681911)所示。 建议使用上述操作系统安装光盘或者源中，下列依赖软件的默认安装包，若不存在下列软件，可参看软件对应的建议版本。 @@ -174,7 +174,7 @@ openGauss的软件依赖要求如[表3 软件依赖要求](#table1212531681911) 为了在防火墙开启的状态下，确保openGauss的正常使用。用户需要将同openGauss相关的服务、协议、IP以及端口添加到openGauss各主机的防火墙白名单中。 -以openEuler操作系统为例，假设openGauss信息如[表4 openGauss信息](#zh-cn_topic_0241802566_zh-cn_topic_0085434636_zh-cn_topic_0059782018_table4312170510523)所示。 +以openEuler操作系统为例，假设openGauss信息如[表4](#zh-cn_topic_0241802566_zh-cn_topic_0085434636_zh-cn_topic_0059782018_table4312170510523)所示。 **表 4** openGauss信息 diff --git "a/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\2031.md" "b/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\2031.md" index c2ce3e090fe586c9c4fe17b0e4ef7a6e56bdb3a2..97c098a09e1b000e9c860df62f66dc297c96f5bf 100644 --- "a/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\2031.md" +++ "b/content/zh/docs/installation/\345\207\206\345\244\207\350\275\257\347\241\254\344\273\266\345\256\211\350\243\205\347\216\257\345\242\2031.md" @@ -8,7 +8,7 @@ **硬件环境要求** -[表1 硬件环境要求](#zh-cn_topic_0283136474_zh-cn_topic_0241802565_zh-cn_topic_0085434629_zh-cn_topic_0059782022_t62cd0eed17004265b1b8ad98f302a4bc)列出了openGauss服务器应具备的最低硬件要求。在实际产品中，硬件配置的规划需考虑数据规模及所期望的数据库响应速度。请根据实际情况进行规划。 +[表1 ](#zh-cn_topic_0283136474_zh-cn_topic_0241802565_zh-cn_topic_0085434629_zh-cn_topic_0059782022_t62cd0eed17004265b1b8ad98f302a4bc)列出了openGauss服务器应具备的最低硬件要求。在实际产品中，硬件配置的规划需考虑数据规模及所期望的数据库响应速度。请根据实际情况进行规划。 **表 1** 硬件环境要求 @@ -89,7 +89,7 @@ **软件依赖要求** -openGauss的软件依赖要求如[表3 软件依赖要求](#zh-cn_topic_0283136474_table1212531681911)所示。 +openGauss的软件依赖要求如[表3 ](#zh-cn_topic_0283136474_table1212531681911)所示。 建议使用上述操作系统安装光盘或者源中，下列依赖软件的默认安装包，若不存在下列软件，可参看软件对应的建议版本。 @@ -157,7 +157,7 @@ openGauss的软件依赖要求如[表3 软件依赖要求](#zh-cn_topic_02831364 为了在防火墙开启的状态下，确保openGauss的正常使用，用户需要将同openGauss相关的服务、协议、IP以及端口添加到openGauss主机的防火墙白名单中。 -以openEuler操作系统为例，假设openGauss信息如[表4 openGauss信息](#zh-cn_topic_0283136490_zh-cn_topic_0241802566_zh-cn_topic_0085434636_zh-cn_topic_0059782018_table4312170510523)所示。 +以openEuler操作系统为例，假设openGauss信息如[表4](#zh-cn_topic_0283136490_zh-cn_topic_0241802566_zh-cn_topic_0085434636_zh-cn_topic_0059782018_table4312170510523)所示。 **表 4** openGauss信息