diff --git a/content/docs-lite/en/docs/DataBaseReference/gs_db_privileges.md b/content/docs-lite/en/docs/DataBaseReference/gs_db_privileges.md index f5ad71734af980742ade0688e20a509588932d5c..5370345fdb3429958d74090a7c2d019aa2ca73c4 100644 --- a/content/docs-lite/en/docs/DataBaseReference/gs_db_privileges.md +++ b/content/docs-lite/en/docs/DataBaseReference/gs_db_privileges.md @@ -24,7 +24,7 @@

text

-

ANY permission of a user. For details about the value, see Table 1.

+

ANY permission of a user. For details about the value, see Table 1.

admin_option

diff --git a/content/docs-lite/en/docs/DataBaseReference/pg_proc.md b/content/docs-lite/en/docs/DataBaseReference/pg_proc.md index 3314ca1bb2d0e37d405ba9da694f35897aabf916..003f5f179b30c27df6e29b3e16f361679df488da 100644 --- a/content/docs-lite/en/docs/DataBaseReference/pg_proc.md +++ b/content/docs-lite/en/docs/DataBaseReference/pg_proc.md @@ -213,7 +213,7 @@

aclitem[]

-

Access permissions. For details, see GRANT and REVOKE.

+

Access permissions. For details, see GRANT and REVOKE.

prodefaultargpos

diff --git a/content/en/docs/DatabaseReference/pg_auth_history.md b/content/en/docs/DatabaseReference/pg_auth_history.md index 4d787ca5f84fb04bff28e3c116beb8020070603c..51a9f70729ecd97a580d6f856174a8fa5dc543a1 100644 --- a/content/en/docs/DatabaseReference/pg_auth_history.md +++ b/content/en/docs/DatabaseReference/pg_auth_history.md @@ -38,7 +38,7 @@

text

-

Ciphertext of the role password. The encryption mode is determined by the GUC parameter password_encryption_type.

+

Ciphertext of the role password. The encryption mode is determined by the GUC parameter password_encryption_type.

diff --git a/content/en/docs/DatabaseReference/security-and-authentication_postgresql-conf.md b/content/en/docs/DatabaseReference/security-and-authentication_postgresql-conf.md index 94d68e9f404c4840bba210a04032845070c9f092..0307415f5fe07ece497b866c131a74b45dcdaf2d 100644 --- a/content/en/docs/DatabaseReference/security-and-authentication_postgresql-conf.md +++ b/content/en/docs/DatabaseReference/security-and-authentication_postgresql-conf.md @@ -96,7 +96,7 @@ This parameter is a SIGHUP parameter. Set it based on instructions provided in This parameter is a POSTMASTER parameter. Set it based on instructions provided in [Table 1](../DatabaseAdministrationGuide/resetting-parameters.md#en-us_topic_0283137176_en-us_topic_0237121562_en-us_topic_0059777490_t91a6f212010f4503b24d7943aed6d846). -**Value range**: a string. Separate multiple encryption algorithms by semicolons \(;\). For details about supported encryption algorithms, see [Establishing Secure TCP/IP Connections in SSL Mode](en-us_topic_0289900924.md). +**Value range**: a string. Separate multiple encryption algorithms by semicolons \(;\). For details about supported encryption algorithms, see [Establishing Secure TCP/IP Connections in SSL Mode](../DatabaseAdministrationGuide/establishing-secure-tcp-ip-connections-in-ssl-mode.md). **Default value**: **ALL** @@ -165,7 +165,7 @@ This parameter is a SIGHUP parameter. Set it based on instructions provided in ## krb\_srvname -**Parameter description**: Specifies the Kerberos service name. For details, see [Configuring Client Access Authentication](en-us_topic_0289900238.md). +**Parameter description**: Specifies the Kerberos service name. For details, see [Configuring Client Access Authentication](../DatabaseAdministrationGuide/configuring-client-access-authentication.md). This parameter is a SIGHUP parameter. Set it based on instructions provided in [Table 1](../DatabaseAdministrationGuide/resetting-parameters.md#en-us_topic_0283137176_en-us_topic_0237121562_en-us_topic_0059777490_t91a6f212010f4503b24d7943aed6d846). diff --git a/content/en/docs/DatabaseReference/statement_history_system-catalogs.md b/content/en/docs/DatabaseReference/statement_history_system-catalogs.md index 743130088bdde6ddcb2551fba049b241baf1be2b..832ba09339a104a96e79fe3915f4871f5869d1e4 100644 --- a/content/en/docs/DatabaseReference/statement_history_system-catalogs.md +++ b/content/en/docs/DatabaseReference/statement_history_system-catalogs.md @@ -466,7 +466,7 @@ The constraints on the query of this system catalog are as follows:

bytea

-

List of wait events and statement lock events.

When the value of the record level is L0, the wait events starts to be recorded to the list. Statistics about the wait event of the current statement are displayed. For details about events, see Waiting status list, List of wait events corresponding to lightweight locks, List of wait events corresponding to I/Os, and List of wait events corresponding to transaction locks. For details about the impact of each transaction lock on services, see LOCK.

When the record level is L2, the statement lock events starts to be recorded to the list. The events are recorded in time sequence. The number of records is affected by the track\_stmt\_details\_size parameter.

+

List of wait events and statement lock events.

When the value of the record level is L0, the wait events starts to be recorded to the list. Statistics about the wait event of the current statement are displayed. For details about events, see Waiting status list, List of wait events corresponding to lightweight locks, List of wait events corresponding to I/Os, and List of wait events corresponding to transaction locks. For details about the impact of each transaction lock on services, see LOCK.

When the record level is L2, the statement lock events starts to be recorded to the list. The events are recorded in time sequence. The number of records is affected by the track\_stmt\_details\_size parameter.

Events include:

diff --git a/content/en/docs/DatabaseReference/wait-events.md b/content/en/docs/DatabaseReference/wait-events.md index e145bbe5bf24620b04367604ea97e9d8646ce841..79fcdde8d60e88580da7dff223ca851d57e65503 100644 --- a/content/en/docs/DatabaseReference/wait-events.md +++ b/content/en/docs/DatabaseReference/wait-events.md @@ -6,7 +6,7 @@ In the x86-based centralized deployment scenario, the hardware configuration specifications are 32-core CPU and 256 GB memory. When the Benchmark SQL 5.0 tool is used to test performance, the performance fluctuates by about 1.4% by enabling or disabling this parameter. -This parameter is a SIGHUP parameter. Set it based on instructions provided in [Table 1](resetting-parameters.md#en-us_topic_0283137176_en-us_topic_0237121562_en-us_topic_0059777490_t91a6f212010f4503b24d7943aed6d846). +This parameter is a SIGHUP parameter. Set it based on instructions provided in [Table 1](../DatabaseAdministrationGuide/resetting-parameters.md#en-us_topic_0283137176_en-us_topic_0237121562_en-us_topic_0059777490_t91a6f212010f4503b24d7943aed6d846). **Value range**: Boolean diff --git a/content/en/docs/DeveloperGuide/pqprepare.md b/content/en/docs/DeveloperGuide/pqprepare.md index 5ab916df13760ff6dce374374107f4baae7232a9..0041bd559120fecd518ec2b1fd9bcc250aca8b3b 100644 --- a/content/en/docs/DeveloperGuide/pqprepare.md +++ b/content/en/docs/DeveloperGuide/pqprepare.md @@ -67,5 +67,5 @@ PGresult *PQprepare(PGconn *conn, ## Example -For details, see [Example](example-3.md). +For details, see [Example](example-libpq.md). diff --git a/content/en/docs/ExtensionReference/dolphin-drop-database.md b/content/en/docs/ExtensionReference/dolphin-drop-database.md index e4fcef9fba80a3964e4f80ca05b39815f7f27f54..15d405c4f9431a2b5b94aa76dcac173798a4b87c 100644 --- a/content/en/docs/ExtensionReference/dolphin-drop-database.md +++ b/content/en/docs/ExtensionReference/dolphin-drop-database.md @@ -39,4 +39,4 @@ See [Examples](dolphin-create-database.md#en-us_topic_0283137050_en-us_topic_023 ## Helpful Links -[CREATE DATABASE](dolphin-CREATE-DATABASE.md), [DROP DATABASE](dolphin-DROP-DATABASE.md) +[CREATE DATABASE](dolphin-CREATE-DATABASE.md), [DROP DATABASE](dolphin-drop-database.md) diff --git a/content/en/docs/PerformanceTuningGuide/figures/zh-cn_image_0000001156347657.png b/content/en/docs/PerformanceTuningGuide/figures/zh-cn_image_0000001156347657.png new file mode 100644 index 0000000000000000000000000000000000000000..13a4dd9fb1a8b97996d614dc810524708c684e77 Binary files /dev/null and b/content/en/docs/PerformanceTuningGuide/figures/zh-cn_image_0000001156347657.png differ diff --git a/content/en/docs/PerformanceTuningGuide/resource-load-management.md b/content/en/docs/PerformanceTuningGuide/resource-load-management.md index e9d60f4d8b4c4239b42739d9389a68197775f7a6..7dda3d2876d94d7eb3b8e7dab596b115deb0fa94 100644 --- a/content/en/docs/PerformanceTuningGuide/resource-load-management.md +++ b/content/en/docs/PerformanceTuningGuide/resource-load-management.md @@ -1,6 +1,6 @@ # Resource Load Management -- **[Overview](overview-30.md)** +- **[Overview](resource-load-management-overview.md)** - **[Resource Management Preparation](resource-management-preparation.md)** diff --git a/content/en/docs/PerformanceTuningGuide/smp.md b/content/en/docs/PerformanceTuningGuide/smp.md index ca9648632f55287768bc15560c4c89b9a532388d..fae136d5f29b1eb601dfdd5e2f5b4b0f91ab30d4 100644 --- a/content/en/docs/PerformanceTuningGuide/smp.md +++ b/content/en/docs/PerformanceTuningGuide/smp.md @@ -22,7 +22,7 @@ The SMP feature improves the performance through operator parallelism and occupi - The following uses the **TPCH Q1** parallel plan as an example. - ![](figures/en-us_image_0000001234211585.png) + ![](figures/zh-cn_image_0000001156347657.png) In this plan, the Scan and HashAgg operators are processed in parallel, and the Local Gather operator is added for data exchange. Operator 3 is a Local Gather operator. "dop: 1/4" indicates that the degree of parallelism of the sender thread is 4 and the degree of parallelism of the receiver thread is 1. That is, the lower-layer HashAggregate operator 4 is executed based on the degree of parallelism 4, the upper-layer operators 1 and 2 are executed in serial mode, and operator 3 aggregates data of parallel threads within the instance. diff --git a/content/en/docs/SQLReference/information-schema.md b/content/en/docs/SQLReference/information-schema.md index ff78da1cf9a7ea3adc60033dea7abb32d98472d7..3333567fe31b9019556e7cdf635edbd48a755ce1 100644 --- a/content/en/docs/SQLReference/information-schema.md +++ b/content/en/docs/SQLReference/information-schema.md @@ -4,7 +4,7 @@ An information schema named **INFORMATION\_SCHEMA** automatically exists in al Information schemas are inherited from the open-source PGXC and PG. For details, visit the following links to see the official PGXC and PG documents: -http://postgres-xc.sourceforge.net/docs/1\_1/information-schema.html +http://postgres-xc.sourceforge.net/docs/1_1/information-schema.html https://www.postgresql.org/docs/9.2/information-schema.html diff --git a/content/en/docs/SQLReference/statement_history-25.md b/content/en/docs/SQLReference/statement_history-25.md index 743130088bdde6ddcb2551fba049b241baf1be2b..eee32ae86ea6dfbb224efa1fb9524a1e84f0b881 100644 --- a/content/en/docs/SQLReference/statement_history-25.md +++ b/content/en/docs/SQLReference/statement_history-25.md @@ -466,7 +466,7 @@ The constraints on the query of this system catalog are as follows:

bytea

-

List of wait events and statement lock events.

When the value of the record level is L0, the wait events starts to be recorded to the list. Statistics about the wait event of the current statement are displayed. For details about events, see Waiting status list, List of wait events corresponding to lightweight locks, List of wait events corresponding to I/Os, and List of wait events corresponding to transaction locks. For details about the impact of each transaction lock on services, see LOCK.

When the record level is L2, the statement lock events starts to be recorded to the list. The events are recorded in time sequence. The number of records is affected by the track\_stmt\_details\_size parameter.

+

List of wait events and statement lock events.

When the value of the record level is L0, the wait events starts to be recorded to the list. Statistics about the wait event of the current statement are displayed. For details about events, see Waiting status list, List of wait events corresponding to lightweight locks, List of wait events corresponding to I/Os, and List of wait events corresponding to transaction locks. For details about the impact of each transaction lock on services, see LOCK.

When the record level is L2, the statement lock events starts to be recorded to the list. The events are recorded in time sequence. The number of records is affected by the track\_stmt\_details\_size parameter.

Events include:

diff --git a/content/en/docs/ToolandCommandReference/cm-parameters.md b/content/en/docs/ToolandCommandReference/cm-parameters.md index 054f7379c2ccb3b4df159bcaa097c6aee69840be..605b799cb4e13073580482da4bb977434dee17e8 100644 --- a/content/en/docs/ToolandCommandReference/cm-parameters.md +++ b/content/en/docs/ToolandCommandReference/cm-parameters.md @@ -1,6 +1,6 @@ # CM Parameters -Modifying CM parameters affects the running mechanism of GaussDB Kernel. You are advised to ask GaussDB Kernel engineers to do it for you. For details about how to modify the CM parameters, see method 1 in [Table 2](resetting-parameters.md#en-us_topic_0283137176_en-us_topic_0237121562_en-us_topic_0059777490_t290c8f15953843db8d8e53d867cd893d). +Modifying CM parameters affects the running mechanism of GaussDB Kernel. You are advised to ask GaussDB Kernel engineers to do it for you. For details about how to modify the CM parameters, see method 1 in [Table 2](../DatabaseAdministrationGuide/resetting-parameters.md#en-us_topic_0283137176_en-us_topic_0237121562_en-us_topic_0059777490_t290c8f15953843db8d8e53d867cd893d). - **[Parameters Related to cm\_agent](parameters-related-to-cm_agent.md)** diff --git "a/content/zh/docs/DeveloperGuide/ODBC\345\214\205\345\217\212\344\276\235\350\265\226\347\232\204\345\272\223\345\222\214\345\244\264\346\226\207\344\273\266.md" "b/content/zh/docs/DeveloperGuide/ODBC\345\214\205\345\217\212\344\276\235\350\265\226\347\232\204\345\272\223\345\222\214\345\244\264\346\226\207\344\273\266.md" index 8b8d130889fea9fb68e121f0e1d2e26aeff2e9e7..d6498120b95e6e4b12cbb8ef6cadb79159e606ee 100644 --- "a/content/zh/docs/DeveloperGuide/ODBC\345\214\205\345\217\212\344\276\235\350\265\226\347\232\204\345\272\223\345\222\214\345\244\264\346\226\207\344\273\266.md" +++ "b/content/zh/docs/DeveloperGuide/ODBC\345\214\205\345\217\212\344\276\235\350\265\226\347\232\204\345\272\223\345\222\214\345\244\264\346\226\207\344\273\266.md" @@ -4,3 +4,6 @@ 从发布包中获取，包名为openGauss-x.x.x-ODBC.tar.gz。Linux环境下，开发应用程序要用到unixODBC提供的头文件（sql.h、sqlext.h等）和库libodbc.so。这些头文件和库可从unixODBC-2.3.0的安装包中获得。 +## Windows下的ODBC包 + +从发布包中获取，包名为openGauss-x.x.x-ODBC-windows.tar.gz。 \ No newline at end of file diff --git "a/content/zh/docs/DeveloperGuide/\345\237\272\344\272\216ODBC\345\274\200\345\217\221.md" "b/content/zh/docs/DeveloperGuide/\345\237\272\344\272\216ODBC\345\274\200\345\217\221.md" index 9372c5ebeb4043982a9d36a2970d5eee752416d5..e4ba761e38f542448567919567461e64db8f2e91 100644 --- "a/content/zh/docs/DeveloperGuide/\345\237\272\344\272\216ODBC\345\274\200\345\217\221.md" +++ "b/content/zh/docs/DeveloperGuide/\345\237\272\344\272\216ODBC\345\274\200\345\217\221.md" @@ -50,12 +50,17 @@ openGauss目前在以下环境中提供对ODBC3.5的支持。

ARM64位

+

windows 7/8/10

+ +

x86_32位

+ + UNIX/Linux系统下的驱动程序管理器主要有unixODBC和iODBC，在这选择驱动管理器unixODBC-2.3.0作为连接数据库的组件。 -Windows系统自带ODBC驱动程序管理器，在控制面板-\>管理工具中可以找到数据源（ODBC）选项。 +Windows系统自带ODBC驱动程序管理器，在控制面板-\>管理工具中可以找到数据源（ODBC）选项，可以参考[odbc文档](https://gitee.com/opengauss/openGauss-connector-odbc/blob/master/windows/odbc-%E6%B5%8B%E8%AF%95.md)。 >![](public_sys-resources/icon-note.png) **说明：** >当前数据库ODBC驱动基于开源版本，对于tinyint、smalldatetime、nvarchar、nvarchar2类型，在获取数据类型的时候，可能会出现不兼容。