Skip to content

Commit dbf7426

Browse files
jiaoshuntianjiaoshuntian
committed
Framework adjustments, content additions, and bug fixes related to the 5.0 release
1 parent 8ac4d88 commit dbf7426

11 files changed

Lines changed: 216 additions & 74 deletions

File tree

‎CN/modules/ROOT/nav.adoc‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
*** 查询处理
4040
**** xref:master/6.1.1.adoc[双parser]
4141
*** 兼容框架
42+
**** xref:master/7.1.adoc[框架设计]
43+
**** xref:master/7.2.adoc[GUC框架]
4244
**** xref:master/6.2.1.adoc[initdb过程]
4345
*** 兼容特性
4446
**** xref:master/6.3.1.adoc[like]
@@ -58,28 +60,26 @@
5860
**** xref:master/6.4.2.adoc[userenv]
5961
*** xref:master/6.5.adoc[国标GB18030]
6062
** Oracle兼容功能列表
61-
*** xref:master/7.1.adoc[1、框架设计]
62-
*** xref:master/7.2.adoc[2、GUC框架]
63-
*** xref:master/7.3.adoc[3、大小写转换]
64-
*** xref:master/7.4.adoc[4、双模式设计]
65-
*** xref:master/7.5.adoc[5、兼容Oracle like]
66-
*** xref:master/7.6.adoc[6、兼容Oracle匿名块]
67-
*** xref:master/7.7.adoc[7、兼容Oracle函数与存储过程]
68-
*** xref:master/7.8.adoc[8、内置数据类型与内置函数]
69-
*** xref:master/7.9.adoc[9、新增Oracle兼容模式的端口与IP]
70-
*** xref:master/7.10.adoc[10、XML函数]
71-
*** xref:master/7.11.adoc[11、兼容Oracle sequence]
72-
*** xref:master/7.12.adoc[12、包]
73-
*** xref:master/7.13.adoc[13、不可见列]
74-
*** xref:master/7.14.adoc[14、RowID]
75-
*** xref:master/7.15.adoc[15、OUT 参数]
76-
*** xref:master/7.16.adoc[16、%TYPE、%ROWTYPE]
77-
*** xref:master/7.17.adoc[17、NLS 参数]
78-
*** xref:master/7.18.adoc[18、Force View]
79-
*** xref:master/7.19.adoc[19、嵌套子函数]
80-
*** xref:master/7.20.adoc[20、sys_guid 函数]
81-
*** xref:master/7.21.adoc[21、空字符串转null]
82-
*** xref:master/7.22.adoc[22、CALL INTO]
63+
*** xref:master/7.3.adoc[1、大小写转换]
64+
*** xref:master/7.4.adoc[2、双模式设计]
65+
*** xref:master/7.5.adoc[3、LIKE操作符]
66+
*** xref:master/7.6.adoc[4、匿名块]
67+
*** xref:master/7.7.adoc[5、函数与存储过程]
68+
*** xref:master/7.8.adoc[6、内置数据类型与内置函数]
69+
*** xref:master/7.9.adoc[7、端口与IP]
70+
*** xref:master/7.10.adoc[8、XML函数]
71+
*** xref:master/7.11.adoc[9、sequence]
72+
*** xref:master/7.12.adoc[10、包]
73+
*** xref:master/7.13.adoc[11、不可见列]
74+
*** xref:master/7.14.adoc[12、RowID]
75+
*** xref:master/7.15.adoc[13、OUT 参数]
76+
*** xref:master/7.16.adoc[14、%TYPE、%ROWTYPE]
77+
*** xref:master/7.17.adoc[15、NLS 参数]
78+
*** xref:master/7.18.adoc[16、Force View]
79+
*** xref:master/7.19.adoc[17、嵌套子函数]
80+
*** xref:master/7.20.adoc[18、sys_guid 函数]
81+
*** xref:master/7.21.adoc[10、空字符串转null]
82+
*** xref:master/7.22.adoc[20、CALL INTO]
8383
** IvorySQL贡献指南
8484
*** xref:master/8.1.adoc[社区贡献指南]
8585
*** xref:master/8.2.adoc[asciidoc语法快速参考]

‎CN/modules/ROOT/pages/master/2.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ IvorySQL基于PostgreSQL，具有完整的SQL、坚如磐石的可靠性和庞
4141

4242
=== 核心应用场景
4343

44-
Ivory数据库的主要应用场景：
44+
IvorySQL数据库的主要应用场景：
4545

4646
* 企业数据库
4747

‎CN/modules/ROOT/pages/master/4.6.4.adoc‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
2+
:sectnums:
3+
:sectnumlevels: 5
4+
5+
= Docker & Podman 部署IvorySQL
6+
7+
== docker方式运行
8+
9+
** 从Docker Hub上获取IvorySQL镜像
10+
```
11+
$ docker pull ivorysql/ivorysql:5.0-ubi8
12+
```
13+
14+
** 运行IvorySQL
15+
```
16+
$ docker run --name ivorysql -p 5434:5432 -e IVORYSQL_PASSWORD=your_password -d ivorysql/ivorysql:5.0-ubi8
17+
```
18+
19+
** 查看IvorySQL容器运行是否成功
20+
```
21+
$ docker ps | grep ivorysql
22+
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
23+
6faa2d0ed705 ivorysql:5.0-ubi8 "docker-entrypoint.s…" 50 seconds ago Up 49 seconds 5866/tcp, 0.0.0.0:5434->5432/tcp ivorysql
24+
```
25+
26+
== podman方式运行
27+
28+
** 从Docker Hub上获取IvorySQL镜像
29+
```
30+
[highgo@manager-node1 ~]$ podman pull ivorysql/ivorysql:5.0-ubi8
31+
✔ docker.io/ivorysql/ivorysql:5.0-ubi8
32+
Trying to pull docker.io/ivorysql/ivorysql:5.0-ubi8...
33+
Getting image source signatures
34+
Copying blob 5885448c5c88 done |
35+
Copying blob 6c502b378234 done |
36+
Copying blob 8b4f2b90d6b6 done |
37+
Copying blob 9b000f2935f6 done |
38+
Copying blob 806f782da874 done |
39+
Copying blob e4c51845a9eb done |
40+
Copying blob dcb1e9a04275 done |
41+
Copying blob 285a279173f8 done |
42+
Copying blob 1f6f247b9ae0 done |
43+
Copying blob 3cc81bed8614 done |
44+
Copying blob 863c87bf25eb done |
45+
Copying blob 4f4fb700ef54 done |
46+
Copying config 88e1bbeda8 done |
47+
Writing manifest to image destination
48+
88e1bbeda81c51d88e12cbd2b19730498f1343d1c64bb3dddc8ffcb08a1f965f
49+
```
50+
51+
** 运行IvorySQL
52+
```
53+
$ podman run --name ivorysql -p 5434:5432 -e IVORYSQL_PASSWORD=123456 -d ivorysql/ivorysql:5.0-ubi8
54+
```
55+
56+
** 查看IvorySQL容器运行是否成功
57+
```
58+
[highgo@manager-node1 ~]$ podman ps | grep ivorysql
59+
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
60+
368dee58d5ef docker.io/ivorysql/ivorysql:5.0-ubi8 postgres 20 seconds ago Up 20 seconds 0.0.0.0:5434->5432/tcp, 1521/tcp, 5866/tcp ivorysql
61+
62+
[highgo@manager-node1 ~]$ podman exec -it ivorysql /bin/bash
63+
[root@8cc631eb413d /]#
64+
ivorysql=# select version();
65+
version
66+
------------------------------------------------------------------------------------------------------------------------
67+
PostgreSQL 18.0 (IvorySQL 5.0) on x86_64-pc-linux-gnu, compiled by gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-28), 64-bit
68+
(1 row)
69+
70+
ivorysql=#
71+
```

‎CN/modules/ROOT/pages/master/5.0.adoc‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77

88
IvorySQL 作为一款兼容 Oracle 且基于 PostgreSQL 的高级开源数据库，具备强大的扩展能力，支持丰富的生态系统插件。这些插件可以帮助用户在不同场景下增强数据库功能，包括地理信息处理、向量检索、全文搜索、数据定义提取和路径规划等。以下是当前 IvorySQL 官方兼容和支持的主要插件列表：
99

10-
+
1110

12-
[cols="2,1,3,3"]
11+
[cols="1,2,1,3,3"]
1312
|====
14-
|*插件名称*|*版本*|*功能描述*|*适用场景*
15-
| xref:master/5.1.adoc[postgis] | 3.5.4 | 为 IvorySQL 提供地理空间数据支持，包括空间索引、空间函数和地理对象存储 | 地理信息系统（GIS）、地图服务、位置数据分析
16-
| xref:master/5.2.adoc[pgvector] | 0.8.1 | 支持向量相似性搜索，可用于存储和检索高维向量数据| AI 应用、图像检索、推荐系统、语义搜索
17-
| xref:master/5.3.adoc[pgddl (DDL Extractor)] | 0.31 | 提取数据库中的 DDL（数据定义语言）语句，便于版本管理和迁移 | 数据库版本控制、CI/CD 集成、结构比对与同步
18-
| xref:master/5.4.adoc[pg_cron]​ | 1.6.0 | 提供数据库内部的定时任务调度功能，支持定期执行SQL语句 | 数据清理、定期统计、自动化维护任务
19-
| xref:master/5.5.adoc[pgsql-http]​ | 1.7.0 | 允许在SQL中发起HTTP请求，与外部Web服务进行交互 | 数据采集、API集成、微服务调用
20-
| xref:master/5.6.adoc[plpgsql_check] | 2.8 | 提供PL/pgSQL代码的静态分析功能，可在开发阶段发现潜在错误 | 存储过程开发、代码质量检查、调试优化
21-
| xref:master/5.7.adoc[pgroonga] | 4.0.4 | 提供​非英语语言全文搜索功能，满足高性能应用的需求 | 中日韩等语言的全文搜索功能
22-
| xref:master/5.8.adoc[pgaudit] | 18.0 | 提供细粒度的审计功能，记录数据库操作日志，便于安全审计和合规性检查 | 数据库安全审计、合规性检查、审计报告生成
23-
| xref:master/5.9.adoc[pgrouting] | 3.8.0 | 提供地理空间数据的路由计算功能，支持多种算法和数据格式 | 地理空间分析、路径规划、物流优化
24-
| xref:master/5.10.adoc[system_stats] | 3.2 | 提供用于访问系统级统计信息的函数 | 系统监控
13+
|*序号*|*插件名称*|*版本*|*功能描述*|*适用场景*
14+
| 1 | xref:master/5.1.adoc[postgis] | 3.5.4 | 为 IvorySQL 提供地理空间数据支持，包括空间索引、空间函数和地理对象存储 | 地理信息系统（GIS）、地图服务、位置数据分析
15+
| 2 | xref:master/5.2.adoc[pgvector] | 0.8.1 | 支持向量相似性搜索，可用于存储和检索高维向量数据| AI 应用、图像检索、推荐系统、语义搜索
16+
| 3 | xref:master/5.3.adoc[pgddl (DDL Extractor)] | 0.31 | 提取数据库中的 DDL（数据定义语言）语句，便于版本管理和迁移 | 数据库版本控制、CI/CD 集成、结构比对与同步
17+
| 4 | xref:master/5.4.adoc[pg_cron]​ | 1.6.0 | 提供数据库内部的定时任务调度功能，支持定期执行SQL语句 | 数据清理、定期统计、自动化维护任务
18+
| 5 | xref:master/5.5.adoc[pgsql-http]​ | 1.7.0 | 允许在SQL中发起HTTP请求，与外部Web服务进行交互 | 数据采集、API集成、微服务调用
19+
| 6 | xref:master/5.6.adoc[plpgsql_check] | 2.8 | 提供PL/pgSQL代码的静态分析功能，可在开发阶段发现潜在错误 | 存储过程开发、代码质量检查、调试优化
20+
| 7 | xref:master/5.7.adoc[pgroonga] | 4.0.4 | 提供​非英语语言全文搜索功能，满足高性能应用的需求 | 中日韩等语言的全文搜索功能
21+
| 8 | xref:master/5.8.adoc[pgaudit] | 18.0 | 提供细粒度的审计功能，记录数据库操作日志，便于安全审计和合规性检查 | 数据库安全审计、合规性检查、审计报告生成
22+
| 9 | xref:master/5.9.adoc[pgrouting] | 3.8.0 | 提供地理空间数据的路由计算功能，支持多种算法和数据格式 | 地理空间分析、路径规划、物流优化
23+
| 10 | xref:master/5.10.adoc[system_stats] | 3.2 | 提供用于访问系统级统计信息的函数 | 系统监控
2524
|====
2625

2726
这些插件均经过 IvorySQL 团队的测试和适配，确保在 IvorySQL 环境下稳定运行。用户可以根据业务需求选择合适的插件，进一步提升数据库系统的能力和灵活性。

‎CN/modules/ROOT/pages/master/5.1.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sudo apt install \
4141
$ wget https://download.osgeo.org/postgis/source/postgis-3.5.4.tar.gz
4242
$ tar xvf postgis-3.5.4.tar.gz
4343
$ cd postgis-3.5.4
44-
$ ./configure --with-pgconfig=/path/to/pg_config eg: /opt/IvorySQL-5/bin/pg_config，如果ivorysql安装目录在/opt/IvorySQL-5.
44+
$ ./configure --with-pgconfig=/path/to/pg_config eg: /usr/ivory-5/bin/pg_config，如果ivorysql安装目录在/usr/ivory-5.
4545
$ make
4646
$ sudo make install
4747
----

‎CN/modules/ROOT/pages/master/cpu_arch_adp.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
= **芯片架构适配**
66

7-
IvorySQL适配如下CPU架构：
7+
IvorySQL适配认证如下CPU架构：
88
[cols="8h,~,~,~"]
99
|====
1010
| 序号 | 架构名称 | 厂商名称 | 全平台介质包下载

‎CN/modules/ROOT/pages/master/os_arch_adp.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
= **操作系统适配**
88

9-
IvorySQL适配如下操作系统：
9+
IvorySQL适配认证如下操作系统：
1010
[cols="8h,16h,~,~"]
1111
|====
1212
| 序号 | 操作系统名称 | 操作系统简介 | 证书查看

‎EN/modules/ROOT/nav.adoc‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
** Containerization
1414
*** xref:master/4.6.1.adoc[K8S deployment]
1515
*** xref:master/4.6.2.adoc[Operator deployment]
16+
*** xref:master/4.6.4.adoc[Docker & Podman deployment]
1617
*** xref:master/4.6.3.adoc[Docker Swarm & Docker Compose deployment]
1718
** xref:master/4.4.adoc[Operation Management]
1819
** Cloud Service Platform
@@ -37,6 +38,8 @@
3738
** Query Processing
3839
*** xref:master/6.1.1.adoc[Dual Parser]
3940
** Compatibility Framework
41+
*** xref:master/7.1.adoc[Ivorysql frame design]
42+
*** xref:master/7.2.adoc[GUC Framework]
4043
*** xref:master/6.2.1.adoc[initdb Process]
4144
** Compatibility Features
4245
*** xref:master/6.3.1.adoc[like]
@@ -56,28 +59,26 @@
5659
*** xref:master/6.4.2.adoc[userenv]
5760
** xref:master/6.5.adoc[GB18030 Character Set]
5861
* List of Oracle compatible features
59-
** xref:master/7.1.adoc[1、Ivorysql frame design]
60-
** xref:master/7.2.adoc[2、GUC Framework]
61-
** xref:master/7.3.adoc[3、Case conversion]
62-
** xref:master/7.4.adoc[4、Dual-mode design]
63-
** xref:master/7.5.adoc[5、Compatible with Oracle like]
64-
** xref:master/7.6.adoc[6、Compatible with Oracle anonymous block]
65-
** xref:master/7.7.adoc[7、Compatible with Oracle functions and stored procedures]
66-
** xref:master/7.8.adoc[8、Built-in data types and built-in functions]
67-
** xref:master/7.9.adoc[9、Added Oracle compatibility mode ports and IP]
68-
** xref:master/7.10.adoc[10、XML Function]
69-
** xref:master/7.11.adoc[11、Compatible with Oracle sequence]
70-
** xref:master/7.12.adoc[12、Package]
71-
** xref:master/7.13.adoc[13、Invisible Columns]
72-
** xref:master/7.14.adoc[14、RowID Column]
73-
** xref:master/7.15.adoc[15、OUT Parameter]
74-
** xref:master/7.16.adoc[16、%Type & %Rowtype]
75-
** xref:master/7.17.adoc[17、NLS Parameters]
76-
** xref:master/7.18.adoc[18、Force View]
77-
** xref:master/7.19.adoc[19、Nested Subfunctions]
78-
** xref:master/7.20.adoc[20、sys_guid Function]
79-
** xref:master/7.21.adoc[21、Empty String to NULL]
80-
** xref:master/7.22.adoc[22、CALL INTO]
62+
** xref:master/7.3.adoc[1、Case conversion]
63+
** xref:master/7.4.adoc[2、Dual-mode design]
64+
** xref:master/7.5.adoc[3、LIKE operator]
65+
** xref:master/7.6.adoc[4、anonymous block]
66+
** xref:master/7.7.adoc[5、functions and stored procedures]
67+
** xref:master/7.8.adoc[6、Built-in data types and built-in functions]
68+
** xref:master/7.9.adoc[7、ports and IP]
69+
** xref:master/7.10.adoc[8、XML Function]
70+
** xref:master/7.11.adoc[9、sequence]
71+
** xref:master/7.12.adoc[10、Package]
72+
** xref:master/7.13.adoc[11、Invisible Columns]
73+
** xref:master/7.14.adoc[12、RowID Column]
74+
** xref:master/7.15.adoc[13、OUT Parameter]
75+
** xref:master/7.16.adoc[14、%Type & %Rowtype]
76+
** xref:master/7.17.adoc[15、NLS Parameters]
77+
** xref:master/7.18.adoc[16、Force View]
78+
** xref:master/7.19.adoc[17、Nested Subfunctions]
79+
** xref:master/7.20.adoc[18、sys_guid Function]
80+
** xref:master/7.21.adoc[19、Empty String to NULL]
81+
** xref:master/7.22.adoc[20、CALL INTO]
8182
* xref:master/8.adoc[Community contribution]
8283
* xref:master/9.adoc[Tool Reference]
8384
* xref:master/10.adoc[FAQ]

‎EN/modules/ROOT/pages/master/4.6.4.adoc‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
2+
:sectnums:
3+
:sectnumlevels: 5
4+
5+
= Docker & Podman deployment IvorySQL
6+
7+
== Running IvorySQL in docker
8+
9+
** Get IvorySQL image from Docker Hub
10+
```
11+
$ docker pull ivorysql/ivorysql:5.0-ubi8
12+
```
13+
14+
** Running IvorySQL
15+
```
16+
$ docker run --name ivorysql -p 5434:5432 -e IVORYSQL_PASSWORD=your_password -d ivorysql/ivorysql:5.0-ubi8
17+
```
18+
19+
** Check if the IvorySQL container is running successfully
20+
```
21+
$ docker ps | grep ivorysql
22+
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
23+
6faa2d0ed705 ivorysql:5.0-ubi8 "docker-entrypoint.s…" 50 seconds ago Up 49 seconds 5866/tcp, 0.0.0.0:5434->5432/tcp ivorysql
24+
```
25+
26+
== Running with Podman
27+
28+
** Pull IvorySQL Image from Docker Hub
29+
```
30+
[highgo@manager-node1 ~]$ podman pull ivorysql/ivorysql:5.0-ubi8
31+
✔ docker.io/ivorysql/ivorysql:5.0-ubi8
32+
Trying to pull docker.io/ivorysql/ivorysql:5.0-ubi8...
33+
Getting image source signatures
34+
Copying blob 5885448c5c88 done |
35+
Copying blob 6c502b378234 done |
36+
Copying blob 8b4f2b90d6b6 done |
37+
Copying blob 9b000f2935f6 done |
38+
Copying blob 806f782da874 done |
39+
Copying blob e4c51845a9eb done |
40+
Copying blob dcb1e9a04275 done |
41+
Copying blob 285a279173f8 done |
42+
Copying blob 1f6f247b9ae0 done |
43+
Copying blob 3cc81bed8614 done |
44+
Copying blob 863c87bf25eb done |
45+
Copying blob 4f4fb700ef54 done |
46+
Copying config 88e1bbeda8 done |
47+
Writing manifest to image destination
48+
88e1bbeda81c51d88e12cbd2b19730498f1343d1c64bb3dddc8ffcb08a1f965f
49+
```
50+
51+
** Run IvorySQL Container
52+
```
53+
$ podman run --name ivorysql -p 5434:5432 -e IVORYSQL_PASSWORD=123456 -d ivorysql/ivorysql:5.0-ubi8
54+
```
55+
56+
** Check if IvorySQL Container is Running Successfully
57+
```
58+
[highgo@manager-node1 ~]$ podman ps | grep ivorysql
59+
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
60+
368dee58d5ef docker.io/ivorysql/ivorysql:5.0-ubi8 postgres 20 seconds ago Up 20 seconds 0.0.0.0:5434->5432/tcp, 1521/tcp, 5866/tcp ivorysql
61+
62+
[highgo@manager-node1 ~]$ podman exec -it ivorysql /bin/bash
63+
[root@8cc631eb413d /]#
64+
ivorysql=# select version();
65+
version
66+
------------------------------------------------------------------------------------------------------------------------
67+
PostgreSQL 18.0 (IvorySQL 5.0) on x86_64-pc-linux-gnu, compiled by gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-28), 64-bit
68+
(1 row)
69+
70+
ivorysql=#
71+
```

0 commit comments

Comments
 (0)