Skip to content

Commit 889f746

Browse files
yuanyl630yuanyl630
authored
Merge branch 'master' into yuanyl630-master
2 parents e32a28a + c95a0a7 commit 889f746

File tree

2 files changed

+105
-96
lines changed

2 files changed

+105
-96
lines changed

‎CN/modules/ROOT/nav.adoc‎

Lines changed: 68 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,68 @@
1-
* IvorySQL
1+
* xref:master/about_ivorysql.adoc[关于IvorySQL]
22
** xref:master/welcome.adoc[欢迎]
33
** xref:master/release_notes.adoc[发行说明]
4-
** xref:master/about_ivorysql.adoc[关于IvorySQL]
5-
** IvorySQL入门
6-
*** xref:master/getting-started/quick_start.adoc[快速开始]
7-
*** xref:master/getting-started/daily_monitoring.adoc[日常监控]
8-
*** xref:master/getting-started/daily_maintenance.adoc[日常维护]
9-
** IvorySQL高级
10-
*** xref:master/installation_guide.adoc[安装指南]
11-
*** xref:master/cluster_setup.adoc[集群搭建]
12-
*** xref:master/migration_guide.adoc[迁移指南]
13-
*** xref:master/developer_guide.adoc[开发者指南]
14-
*** 容器化指南
15-
**** xref:master/containerization/k8s_deployment.adoc[K8S部署]
16-
**** xref:master/containerization/operator_deployment.adoc[Operator部署]
17-
**** xref:master/containerization/docker_podman_deployment.adoc[Docker & Podman部署]
18-
**** xref:master/containerization/docker_swarm_compose_deployment.adoc[Docker Swarm & Docker Compose部署]
19-
*** xref:master/operation_guide.adoc[运维管理指南]
20-
*** 云服务平台指南
21-
**** xref:master/cloud_platform/ivorysql_cloud_installation.adoc[IvorySQL Cloud安装]
22-
**** xref:master/cloud_platform/ivorysql_cloud_usage.adoc[IvorySQL Cloud使用]
23-
** IvorySQL生态
24-
*** xref:master/cpu_os_adaptation/cpu_architecture_adaptation.adoc[芯片架构适配]
25-
*** xref:master/cpu_os_adaptation/os_architecture_adaptation.adoc[操作系统适配]
26-
*** 生态组件适配
27-
**** xref:master/ecosystem_components/ecosystem_overview.adoc[概述]
28-
**** xref:master/ecosystem_components/postgis.adoc[postgis]
29-
**** xref:master/ecosystem_components/pgvector.adoc[pgvector]
30-
**** xref:master/ecosystem_components/pgddl.adoc[pgddl(DDL Extractor)]
31-
**** xref:master/ecosystem_components/pg_cron.adoc[pg_cron]
32-
**** xref:master/ecosystem_components/pgsql_http.adoc[pgsql-http]
33-
**** xref:master/ecosystem_components/plpgsql_check.adoc[plpgsql_check]
34-
**** xref:master/ecosystem_components/pg_ai_query.adoc[pg_ai_query]
35-
**** xref:master/ecosystem_components/pgroonga.adoc[pgroonga]
36-
**** xref:master/ecosystem_components/pgaudit.adoc[pgaudit]
37-
**** xref:master/ecosystem_components/pgrouting.adoc[pgrouting]
38-
**** xref:master/ecosystem_components/system_stats.adoc[system_stats]
39-
**** xref:master/ecosystem_components/wal2json.adoc[wal2json]
40-
**** xref:master/ecosystem_components/pg_stat_monitor.adoc[pg_stat_monitor]
41-
**** xref:master/ecosystem_components/pg_curl.adoc[pg_curl]
4+
* 快速上手
5+
** xref:master/getting-started/quick_start.adoc[快速开始]
6+
* 安装部署
7+
** xref:master/installation_guide.adoc[安装指南]
8+
** xref:master/cluster_setup.adoc[集群搭建]
9+
* Oracle兼容功能
10+
** xref:master/oracle_compatibility/compat_case_conversion.adoc[1、大小写转换]
11+
** xref:master/oracle_compatibility/compat_like_operator.adoc[2、LIKE操作符]
12+
** xref:master/oracle_compatibility/anonymous_block.adoc[3、匿名块]
13+
** xref:master/oracle_compatibility/compat_function_procedure.adoc[4、函数与存储过程]
14+
** xref:master/oracle_compatibility/builtin_types_functions.adoc[5、内置数据类型与内置函数]
15+
** xref:master/oracle_compatibility/port_ip.adoc[6、端口与IP]
16+
** xref:master/oracle_compatibility/xml_functions.adoc[7、XML函数]
17+
** xref:master/oracle_compatibility/sequence.adoc[8、sequence]
18+
** xref:master/oracle_compatibility/package.adoc[9、包]
19+
** xref:master/oracle_compatibility/invisible_column.adoc[10、不可见列]
20+
** xref:master/oracle_compatibility/compat_rowid.adoc[11、RowID]
21+
** xref:master/oracle_compatibility/compat_out_parameter.adoc[12、OUT 参数]
22+
** xref:master/oracle_compatibility/compat_type_rowtype.adoc[13、%TYPE、%ROWTYPE]
23+
** xref:master/oracle_compatibility/compat_nls_parameter.adoc[14、NLS 参数]
24+
** xref:master/oracle_compatibility/compat_force_view.adoc[15、Force View]
25+
** xref:master/oracle_compatibility/compat_nested_function.adoc[16、嵌套子函数]
26+
** xref:master/oracle_compatibility/compat_sys_guid.adoc[17、sys_guid 函数]
27+
** xref:master/oracle_compatibility/compat_empty_string_to_null.adoc[18、空字符串转null]
28+
** xref:master/oracle_compatibility/compat_call_into.adoc[19、CALL INTO]
29+
* 容器化与云服务
30+
** 容器化指南
31+
*** xref:master/containerization/k8s_deployment.adoc[K8S部署]
32+
*** xref:master/containerization/operator_deployment.adoc[Operator部署]
33+
*** xref:master/containerization/docker_podman_deployment.adoc[Docker & Podman部署]
34+
*** xref:master/containerization/docker_swarm_compose_deployment.adoc[Docker Swarm & Docker Compose部署]
35+
** 云服务平台指南
36+
*** xref:master/cloud_platform/ivorysql_cloud_installation.adoc[IvorySQL Cloud安装]
37+
*** xref:master/cloud_platform/ivorysql_cloud_usage.adoc[IvorySQL Cloud使用]
38+
* IvorySQL生态
39+
** xref:master/cpu_os_adaptation/cpu_architecture_adaptation.adoc[芯片架构适配]
40+
** xref:master/cpu_os_adaptation/os_architecture_adaptation.adoc[操作系统适配]
41+
** 生态组件适配
42+
*** xref:master/ecosystem_components/ecosystem_overview.adoc[概述]
43+
*** xref:master/ecosystem_components/postgis.adoc[postgis]
44+
*** xref:master/ecosystem_components/pgvector.adoc[pgvector]
45+
*** xref:master/ecosystem_components/pgddl.adoc[pgddl(DDL Extractor)]
46+
*** xref:master/ecosystem_components/pg_cron.adoc[pg_cron]
47+
*** xref:master/ecosystem_components/pgsql_http.adoc[pgsql-http]
48+
*** xref:master/ecosystem_components/plpgsql_check.adoc[plpgsql_check]
49+
*** xref:master/ecosystem_components/pgroonga.adoc[pgroonga]
50+
*** xref:master/ecosystem_components/pgaudit.adoc[pgaudit]
51+
*** xref:master/ecosystem_components/pgrouting.adoc[pgrouting]
52+
*** xref:master/ecosystem_components/system_stats.adoc[system_stats]
53+
*** xref:master/ecosystem_components/wal2json.adoc[wal2json]
54+
*** xref:master/ecosystem_components/pg_stat_monitor.adoc[pg_stat_monitor]
55+
*** xref:master/ecosystem_components/pg_ai_query.adoc[pg_ai_query]
56+
*** xref:master/ecosystem_components/pg_curl.adoc[pg_curl]
57+
* 监控运维
58+
** xref:master/getting-started/daily_monitoring.adoc[日常监控]
59+
** xref:master/getting-started/daily_maintenance.adoc[日常维护]
60+
** xref:master/operation_guide.adoc[运维管理指南]
61+
* 数据迁移
62+
** xref:master/migration_guide.adoc[迁移指南]
63+
* IvorySQL开发者
64+
** xref:master/contribution/community_contribution_guide.adoc[社区贡献指南]
65+
** xref:master/developer_guide.adoc[开发者指南]
4266
** IvorySQL架构设计
4367
*** 查询处理
4468
**** xref:master/architecture/dual_parser.adoc[双parser]
@@ -64,31 +88,11 @@
6488
**** xref:master/oracle_builtin_functions/sys_context.adoc[sys_context]
6589
**** xref:master/oracle_builtin_functions/userenv.adoc[userenv]
6690
*** xref:master/gb18030.adoc[国标GB18030]
67-
** Oracle兼容功能列表
68-
*** xref:master/oracle_compatibility/compat_case_conversion.adoc[1、大小写转换]
69-
*** xref:master/oracle_compatibility/compat_like_operator.adoc[2、LIKE操作符]
70-
*** xref:master/oracle_compatibility/anonymous_block.adoc[3、匿名块]
71-
*** xref:master/oracle_compatibility/compat_function_procedure.adoc[4、函数与存储过程]
72-
*** xref:master/oracle_compatibility/builtin_types_functions.adoc[5、内置数据类型与内置函数]
73-
*** xref:master/oracle_compatibility/port_ip.adoc[6、端口与IP]
74-
*** xref:master/oracle_compatibility/xml_functions.adoc[7、XML函数]
75-
*** xref:master/oracle_compatibility/sequence.adoc[8、sequence]
76-
*** xref:master/oracle_compatibility/package.adoc[9、包]
77-
*** xref:master/oracle_compatibility/invisible_column.adoc[10、不可见列]
78-
*** xref:master/oracle_compatibility/compat_rowid.adoc[11、RowID]
79-
*** xref:master/oracle_compatibility/compat_out_parameter.adoc[12、OUT 参数]
80-
*** xref:master/oracle_compatibility/compat_type_rowtype.adoc[13、%TYPE、%ROWTYPE]
81-
*** xref:master/oracle_compatibility/compat_nls_parameter.adoc[14、NLS 参数]
82-
*** xref:master/oracle_compatibility/compat_force_view.adoc[15、Force View]
83-
*** xref:master/oracle_compatibility/compat_nested_function.adoc[16、嵌套子函数]
84-
*** xref:master/oracle_compatibility/compat_sys_guid.adoc[17、sys_guid 函数]
85-
*** xref:master/oracle_compatibility/compat_empty_string_to_null.adoc[18、空字符串转null]
86-
*** xref:master/oracle_compatibility/compat_call_into.adoc[19、CALL INTO]
87-
** IvorySQL贡献指南
88-
*** xref:master/contribution/community_contribution_guide.adoc[社区贡献指南]
89-
*** xref:master/contribution/asciidoc_syntax_reference.adoc[asciidoc语法快速参考]
91+
* 参考指南
9092
** xref:master/tools_reference.adoc[工具参考]
91-
** xref:master/contribution/faq.adoc[FAQ]
92-
* PostgreSQL
93+
** xref:master/contribution/asciidoc_syntax_reference.adoc[asciidoc语法快速参考]
9394
** xref:master/pg_reference/pg_parameters_reference.adoc[PG参数参考手册]
9495
** xref:master/pg_reference/pg_functions_reference.adoc[PG函数参考手册]
96+
* 常见问题解答
97+
** xref:master/contribution/faq.adoc[FAQ]
98+

‎EN/modules/ROOT/nav.adoc‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,37 @@
1-
* xref:master/welcome.adoc[Welcome]
2-
* xref:master/release_notes.adoc[Release]
31
* xref:master/about_ivorysql.adoc[About]
4-
* Getting Started with IvorySQL
2+
** xref:master/welcome.adoc[Welcome]
3+
** xref:master/release_notes.adoc[Release]
4+
* Get Started
55
** xref:master/getting-started/quick_start.adoc[Quick Start]
6-
** xref:master/getting-started/daily_monitoring.adoc[Monitoring]
7-
** xref:master/getting-started/daily_maintenance.adoc[Maintenance]
8-
* IvorySQL Advanced Feature
6+
* Deploy
97
** xref:master/installation_guide.adoc[Installation]
108
** xref:master/cluster_setup.adoc[Cluster]
11-
** xref:master/migration_guide.adoc[Migration]
12-
** xref:master/developer_guide.adoc[Developer]
9+
* Oracle Compatibility
10+
** xref:master/oracle_compatibility/compat_case_conversion.adoc[1、Case conversion]
11+
** xref:master/oracle_compatibility/compat_like_operator.adoc[2、LIKE operator]
12+
** xref:master/oracle_compatibility/anonymous_block.adoc[3、anonymous block]
13+
** xref:master/oracle_compatibility/compat_function_procedure.adoc[4、functions and stored procedures]
14+
** xref:master/oracle_compatibility/builtin_types_functions.adoc[5、Built-in data types and built-in functions]
15+
** xref:master/oracle_compatibility/port_ip.adoc[6、ports and IP]
16+
** xref:master/oracle_compatibility/xml_functions.adoc[7、XML Function]
17+
** xref:master/oracle_compatibility/sequence.adoc[8、sequence]
18+
** xref:master/oracle_compatibility/package.adoc[9、Package]
19+
** xref:master/oracle_compatibility/invisible_column.adoc[10、Invisible Columns]
20+
** xref:master/oracle_compatibility/compat_rowid.adoc[11、RowID Column]
21+
** xref:master/oracle_compatibility/compat_out_parameter.adoc[12、OUT Parameter]
22+
** xref:master/oracle_compatibility/compat_type_rowtype.adoc[13、%Type & %Rowtype]
23+
** xref:master/oracle_compatibility/compat_nls_parameter.adoc[14、NLS Parameters]
24+
** xref:master/oracle_compatibility/compat_force_view.adoc[15、Force View]
25+
** xref:master/oracle_compatibility/compat_nested_function.adoc[16、Nested Subfunctions]
26+
** xref:master/oracle_compatibility/compat_sys_guid.adoc[17、sys_guid Function]
27+
** xref:master/oracle_compatibility/compat_empty_string_to_null.adoc[18、Empty String to NULL]
28+
** xref:master/oracle_compatibility/compat_call_into.adoc[19、CALL INTO]
29+
* Containerization and Cloud Service
1330
** Containerization
1431
*** xref:master/containerization/k8s_deployment.adoc[K8S deployment]
1532
*** xref:master/containerization/operator_deployment.adoc[Operator deployment]
1633
*** xref:master/containerization/docker_podman_deployment.adoc[Docker & Podman deployment]
1734
*** xref:master/containerization/docker_swarm_compose_deployment.adoc[Docker Swarm & Docker Compose deployment]
18-
** xref:master/operation_guide.adoc[Operation Management]
1935
** Cloud Service Platform
2036
*** xref:master/cloud_platform/ivorysql_cloud_installation.adoc[IvorySQL Cloud Installation]
2137
*** xref:master/cloud_platform/ivorysql_cloud_usage.adoc[IvorySQL Cloud Usage]
@@ -30,14 +46,23 @@
3046
*** xref:master/ecosystem_components/pg_cron.adoc[pg_cron]
3147
*** xref:master/ecosystem_components/pgsql_http.adoc[pgsql-http]
3248
*** xref:master/ecosystem_components/plpgsql_check.adoc[plpgsql_check]
33-
*** xref:master/ecosystem_components/pg_ai_query.adoc[pg_ai_query]
3449
*** xref:master/ecosystem_components/pgroonga.adoc[pgroonga]
3550
*** xref:master/ecosystem_components/pgaudit.adoc[pgaudit]
3651
*** xref:master/ecosystem_components/pgrouting.adoc[pgrouting]
3752
*** xref:master/ecosystem_components/system_stats.adoc[system_stats]
53+
*** xref:master/ecosystem_components/pg_ai_query.adoc[pg_ai_query]
3854
*** xref:master/ecosystem_components/wal2json.adoc[wal2json]
3955
*** xref:master/ecosystem_components/pg_stat_monitor.adoc[pg_stat_monitor]
4056
*** xref:master/ecosystem_components/pg_curl.adoc[pg_curl]
57+
* Monitor and O&M
58+
** xref:master/getting-started/daily_monitoring.adoc[Monitoring]
59+
** xref:master/getting-started/daily_maintenance.adoc[Maintenance]
60+
** xref:master/operation_guide.adoc[Operation Management]
61+
* Data Migration
62+
** xref:master/migration_guide.adoc[Migration]
63+
* IvorySQL Developers
64+
** xref:master/developer_guide.adoc[Developer]
65+
** xref:master/contribution/community_contribution_guide.adoc[Community contribution]
4166
* IvorySQL Architecture Design
4267
** Query Processing
4368
*** xref:master/architecture/dual_parser.adoc[Dual Parser]
@@ -63,26 +88,6 @@
6388
*** xref:master/oracle_builtin_functions/sys_context.adoc[sys_context]
6489
*** xref:master/oracle_builtin_functions/userenv.adoc[userenv]
6590
** xref:master/gb18030.adoc[GB18030 Character Set]
66-
* List of Oracle compatible features
67-
** xref:master/oracle_compatibility/compat_case_conversion.adoc[1、Case conversion]
68-
** xref:master/oracle_compatibility/compat_like_operator.adoc[2、LIKE operator]
69-
** xref:master/oracle_compatibility/anonymous_block.adoc[3、anonymous block]
70-
** xref:master/oracle_compatibility/compat_function_procedure.adoc[4、functions and stored procedures]
71-
** xref:master/oracle_compatibility/builtin_types_functions.adoc[5、Built-in data types and built-in functions]
72-
** xref:master/oracle_compatibility/port_ip.adoc[6、ports and IP]
73-
** xref:master/oracle_compatibility/xml_functions.adoc[7、XML Function]
74-
** xref:master/oracle_compatibility/sequence.adoc[8、sequence]
75-
** xref:master/oracle_compatibility/package.adoc[9、Package]
76-
** xref:master/oracle_compatibility/invisible_column.adoc[10、Invisible Columns]
77-
** xref:master/oracle_compatibility/compat_rowid.adoc[11、RowID Column]
78-
** xref:master/oracle_compatibility/compat_out_parameter.adoc[12、OUT Parameter]
79-
** xref:master/oracle_compatibility/compat_type_rowtype.adoc[13、%Type & %Rowtype]
80-
** xref:master/oracle_compatibility/compat_nls_parameter.adoc[14、NLS Parameters]
81-
** xref:master/oracle_compatibility/compat_force_view.adoc[15、Force View]
82-
** xref:master/oracle_compatibility/compat_nested_function.adoc[16、Nested Subfunctions]
83-
** xref:master/oracle_compatibility/compat_sys_guid.adoc[17、sys_guid Function]
84-
** xref:master/oracle_compatibility/compat_empty_string_to_null.adoc[18、Empty String to NULL]
85-
** xref:master/oracle_compatibility/compat_call_into.adoc[19、CALL INTO]
86-
* xref:master/contribution/community_contribution_guide.adoc[Community contribution]
87-
* xref:master/tools_reference.adoc[Tool Reference]
91+
* Reference
92+
** xref:master/tools_reference.adoc[Tool Reference]
8893
* xref:master/contribution/faq.adoc[FAQ]

0 commit comments

Comments
 (0)