Skip to content

Commit 5a240f2

Browse files
authored
Merge pull request #198 from jiaoshuntian/5.0dev
fix some errors
2 parents 9b172e7 + a9dfaa3 commit 5a240f2

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

CN/modules/ROOT/pages/v5.0/1.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ IvorySQL 5.0 基于 PostgreSQL 18.0 全面升级:Oracle 兼容性再突破,
100100

101101
=== 云原生与容器化
102102

103-
- 容器化部署支持(Docker Compose & Docker Swarm):
104-
支持在 Docker Swarm 与 Docker Compose 中部署单实例数据库与高可用集群
103+
- 容器化部署支持(Docker Compose & podman & Docker Swarm):
104+
支持在 Docker Compose 、 podman 和 Docker Swarm 环境中部署单机版 IvorySQL 数据库及高可用集群
105105

106106
- 容器化部署支持(Kubernetes 基础版):
107107
使用 Helm 在 Kubernetes(K8S)中部署单实例数据库与高可用集群。
@@ -149,7 +149,6 @@ IvorySQL 5.0 基于 PostgreSQL 18.0 全面升级:Oracle 兼容性再突破,
149149
- 修复 `unused_oids` 与 `duplicate_oids` 目录工具,使头文件扫描能准确检测冲突且无误报:Issue https://github.com/IvorySQL/IvorySQL/issues/841[#841]
150150
- 为 `libpq/ivytest` 产物新增 `.gitignore`,避免生成的二进制与日志污染开发树:Issue https://github.com/IvorySQL/IvorySQL/issues/843[#843]
151151
- 扩展 GitHub 工作流回归测试,覆盖 `--with-libnuma` 配置,防止未来在启用 NUMA 的主机上出问题:Issue https://github.com/IvorySQL/IvorySQL/issues/869[#869]
152-
- 让 `psql` 用户可以通过 `\h create package` 获取 CREATE PACKAGE 语法帮助,补齐 PL/iSQL 包的 CLI 文档:Issue https://github.com/IvorySQL/IvorySQL/issues/936[#936]
153152
- 排除 MainLoop 悬空指针引发的并发压力下间歇性段错误:Issue https://github.com/IvorySQL/IvorySQL/issues/898[#898]
154153
- 修复 `oracle_test/modules/*/sql` 的测试框架假设,让 Oracle 兼容测试套件再次端到端运行:Issue https://github.com/IvorySQL/IvorySQL/issues/897[#897]
155154
- 更新 `README.md` 与 `README_CN.md`,同步 IvorySQL v5 特性、打包与快速上手信息:Issue https://github.com/IvorySQL/IvorySQL/issues/896[#896]

CN/modules/ROOT/pages/v5.0/4.1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ $ sudo yum --disablerepo=* localinstall *.rpm
8989
== 源码安装
9090
** 安装依赖
9191
```
92-
$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel
92+
$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel uuid-devel
9393
$ sudo dnf groupinstall -y 'Development Tools'
9494
```
9595
** 获取IvorySQL源代码

CN/modules/ROOT/pages/v5.0/6.3.12.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ typedef enum IvyStmtType
129129
{
130130
IVY_STMT_UNKNOW,
131131
IVY_STMT_DO,
132-
IVY_STMT_DOFROMCALL, /* new statementt type */
132+
IVY_STMT_DOFROMCALL, /* new statement type */
133133
IVY_STMT_DOHANDLED,
134134
IVY_STMT_OTHERS
135135
} IvyStmtType;

EN/modules/ROOT/pages/v5.0/1.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ For further details, visit https://www.postgresql.org/docs/release/18.0/[Postgre
100100

101101
=== Cloud-Native & Containerized
102102

103-
- Containerized Deployment Support (Docker Compose & Docker Swarm):
104-
Supports deployment of standalone IvorySQL databases and high-availability clusters in Docker Swarm and Docker Compose environments.
103+
- Containerized Deployment Support (Docker Compose & podman & Docker Swarm):
104+
Supports deployment of standalone IvorySQL databases and high-availability clusters in Docker Compose , podman and Docker Swarm environments.
105105

106106
- Containerized Deployment Support (Kubernetes):
107107
Supports deployment of standalone IvorySQL databases and high-availability clusters on Kubernetes (K8S) using Helm.
@@ -149,7 +149,6 @@ For further details, visit https://www.postgresql.org/docs/release/18.0/[Postgre
149149
- Repaired `unused_oids` and `duplicate_oids` catalog tooling so header scans correctly detect conflicts without false positives: Issue https://github.com/IvorySQL/IvorySQL/issues/841[#841]
150150
- Added `.gitignore` coverage for `libpq/ivytest` artifacts to prevent generated binaries and logs from polluting developer trees: Issue https://github.com/IvorySQL/IvorySQL/issues/843[#843]
151151
- Extended GitHub workflow regression runs to cover builds configured with `--with-libnuma`, preventing future breakages on NUMA-enabled hosts: Issue https://github.com/IvorySQL/IvorySQL/issues/869[#869]
152-
- Enabled `psql` users to access CREATE PACKAGE syntax help via `\h create package`, closing the CLI documentation gap for PL/iSQL packages: Issue https://github.com/IvorySQL/IvorySQL/issues/936[#936]
153152
- Eliminated the MainLoop dangling-pointer scenario that triggered intermittent segmentation faults under concurrency stress: Issue https://github.com/IvorySQL/IvorySQL/issues/898[#898]
154153
- Re-enabled `oracle_test/modules/*/sql` cases by fixing harness assumptions so Oracle-compatibility suites execute end-to-end again: Issue https://github.com/IvorySQL/IvorySQL/issues/897[#897]
155154
- Updated `README.md` and `README_CN.md` to reflect IvorySQL v5 feature set, packaging, and onboarding instructions: Issue https://github.com/IvorySQL/IvorySQL/issues/896[#896]
@@ -177,21 +176,21 @@ The following individuals (in alphabetical order) have contributed to this relea
177176
* Grant Zhou
178177
* Imran Zaheer
179178
* jerome-peng
180-
* Jiaoshun Tian
181179
* luss
182180
* Martin Gerhardy
183181
* Mingran Feng
184182
* omstack
183+
* Oreo Yang
185184
* otegami
186185
* Ruike Sun
187186
* rophy
188187
* Shaolin Chu
189188
* Shawn Yan
190-
* Shihua Yang
191-
* Shiji Niu
192189
* Shuisen Tong
190+
* Shuntian Jiao
193191
* shlei6067
194192
* sjw1933
193+
* Steven Niu
195194
* Xiangyu Liang
196195
* Xiaohui Liu
197196
* Xinjie Lv

EN/modules/ROOT/pages/v5.0/4.1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ IvorySQL then will be installed in the /usr/ivory-5/ directory.
9090
== Source code installation
9191
** Installing dependencies
9292
```
93-
$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel
93+
$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel uuid-devel
9494
$ sudo dnf groupinstall -y 'Development Tools'
9595
```
9696
** Getting source code

EN/modules/ROOT/pages/v5.0/6.3.12.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ typedef enum IvyStmtType
136136
{
137137
IVY_STMT_UNKNOW,
138138
IVY_STMT_DO,
139-
IVY_STMT_DOFROMCALL, /* new statementt type */
139+
IVY_STMT_DOFROMCALL, /* new statement type */
140140
IVY_STMT_DOHANDLED,
141141
IVY_STMT_OTHERS
142142
} IvyStmtType;

0 commit comments

Comments
 (0)