From a9dfaa30f1e1e3d2122acd5d91b8b610e93e132d Mon Sep 17 00:00:00 2001 From: JiaoShuntian Date: Wed, 26 Nov 2025 17:12:10 +0800 Subject: [PATCH] fix some errors --- CN/modules/ROOT/pages/v5.0/1.adoc | 5 ++--- CN/modules/ROOT/pages/v5.0/4.1.adoc | 2 +- CN/modules/ROOT/pages/v5.0/6.3.12.adoc | 2 +- EN/modules/ROOT/pages/v5.0/1.adoc | 11 +++++------ EN/modules/ROOT/pages/v5.0/4.1.adoc | 2 +- EN/modules/ROOT/pages/v5.0/6.3.12.adoc | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CN/modules/ROOT/pages/v5.0/1.adoc b/CN/modules/ROOT/pages/v5.0/1.adoc index 3eecf7d..54488ba 100644 --- a/CN/modules/ROOT/pages/v5.0/1.adoc +++ b/CN/modules/ROOT/pages/v5.0/1.adoc @@ -100,8 +100,8 @@ IvorySQL 5.0 基于 PostgreSQL 18.0 全面升级：Oracle 兼容性再突破， === 云原生与容器化 -- 容器化部署支持（Docker Compose & Docker Swarm）： - 支持在 Docker Swarm 与 Docker Compose 中部署单实例数据库与高可用集群。 +- 容器化部署支持（Docker Compose & podman & Docker Swarm）： + 支持在 Docker Compose 、 podman 和 Docker Swarm 环境中部署单机版 IvorySQL 数据库及高可用集群。 - 容器化部署支持（Kubernetes 基础版）： 使用 Helm 在 Kubernetes（K8S）中部署单实例数据库与高可用集群。 @@ -149,7 +149,6 @@ IvorySQL 5.0 基于 PostgreSQL 18.0 全面升级：Oracle 兼容性再突破， - 修复 `unused_oids` 与 `duplicate_oids` 目录工具，使头文件扫描能准确检测冲突且无误报：Issue https://github.com/IvorySQL/IvorySQL/issues/841[#841] - 为 `libpq/ivytest` 产物新增 `.gitignore`，避免生成的二进制与日志污染开发树：Issue https://github.com/IvorySQL/IvorySQL/issues/843[#843] - 扩展 GitHub 工作流回归测试，覆盖 `--with-libnuma` 配置，防止未来在启用 NUMA 的主机上出问题：Issue https://github.com/IvorySQL/IvorySQL/issues/869[#869] -- 让 `psql` 用户可以通过 `\h create package` 获取 CREATE PACKAGE 语法帮助，补齐 PL/iSQL 包的 CLI 文档：Issue https://github.com/IvorySQL/IvorySQL/issues/936[#936] - 排除 MainLoop 悬空指针引发的并发压力下间歇性段错误：Issue https://github.com/IvorySQL/IvorySQL/issues/898[#898] - 修复 `oracle_test/modules/*/sql` 的测试框架假设，让 Oracle 兼容测试套件再次端到端运行：Issue https://github.com/IvorySQL/IvorySQL/issues/897[#897] - 更新 `README.md` 与 `README_CN.md`，同步 IvorySQL v5 特性、打包与快速上手信息：Issue https://github.com/IvorySQL/IvorySQL/issues/896[#896] diff --git a/CN/modules/ROOT/pages/v5.0/4.1.adoc b/CN/modules/ROOT/pages/v5.0/4.1.adoc index ff44f07..67a579d 100644 --- a/CN/modules/ROOT/pages/v5.0/4.1.adoc +++ b/CN/modules/ROOT/pages/v5.0/4.1.adoc @@ -89,7 +89,7 @@ $ sudo yum --disablerepo=* localinstall *.rpm == 源码安装 ** 安装依赖 ``` -$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel +$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel uuid-devel $ sudo dnf groupinstall -y 'Development Tools' ``` ** 获取IvorySQL源代码 diff --git a/CN/modules/ROOT/pages/v5.0/6.3.12.adoc b/CN/modules/ROOT/pages/v5.0/6.3.12.adoc index 96d405b..a0d55c9 100644 --- a/CN/modules/ROOT/pages/v5.0/6.3.12.adoc +++ b/CN/modules/ROOT/pages/v5.0/6.3.12.adoc @@ -129,7 +129,7 @@ typedef enum IvyStmtType { IVY_STMT_UNKNOW, IVY_STMT_DO, - IVY_STMT_DOFROMCALL, /* new statementt type */ + IVY_STMT_DOFROMCALL, /* new statement type */ IVY_STMT_DOHANDLED, IVY_STMT_OTHERS } IvyStmtType; diff --git a/EN/modules/ROOT/pages/v5.0/1.adoc b/EN/modules/ROOT/pages/v5.0/1.adoc index 703c86b..4b23cba 100644 --- a/EN/modules/ROOT/pages/v5.0/1.adoc +++ b/EN/modules/ROOT/pages/v5.0/1.adoc @@ -100,8 +100,8 @@ For further details, visit https://www.postgresql.org/docs/release/18.0/[Postgre === Cloud-Native & Containerized -- Containerized Deployment Support (Docker Compose & Docker Swarm): - Supports deployment of standalone IvorySQL databases and high-availability clusters in Docker Swarm and Docker Compose environments. +- Containerized Deployment Support (Docker Compose & podman & Docker Swarm): + Supports deployment of standalone IvorySQL databases and high-availability clusters in Docker Compose , podman and Docker Swarm environments. - Containerized Deployment Support (Kubernetes): 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 - 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] - 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] - 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] -- 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] - Eliminated the MainLoop dangling-pointer scenario that triggered intermittent segmentation faults under concurrency stress: Issue https://github.com/IvorySQL/IvorySQL/issues/898[#898] - 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] - 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 * Grant Zhou * Imran Zaheer * jerome-peng -* Jiaoshun Tian * luss * Martin Gerhardy * Mingran Feng * omstack +* Oreo Yang * otegami * Ruike Sun * rophy * Shaolin Chu * Shawn Yan -* Shihua Yang -* Shiji Niu * Shuisen Tong +* Shuntian Jiao * shlei6067 * sjw1933 +* Steven Niu * Xiangyu Liang * Xiaohui Liu * Xinjie Lv diff --git a/EN/modules/ROOT/pages/v5.0/4.1.adoc b/EN/modules/ROOT/pages/v5.0/4.1.adoc index f211e0a..c4f1277 100644 --- a/EN/modules/ROOT/pages/v5.0/4.1.adoc +++ b/EN/modules/ROOT/pages/v5.0/4.1.adoc @@ -90,7 +90,7 @@ IvorySQL then will be installed in the /usr/ivory-5/ directory. == Source code installation ** Installing dependencies ``` -$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel +$ sudo dnf install -y bison readline-devel zlib-devel openssl-devel uuid-devel $ sudo dnf groupinstall -y 'Development Tools' ``` ** Getting source code diff --git a/EN/modules/ROOT/pages/v5.0/6.3.12.adoc b/EN/modules/ROOT/pages/v5.0/6.3.12.adoc index 6ee5244..125a151 100644 --- a/EN/modules/ROOT/pages/v5.0/6.3.12.adoc +++ b/EN/modules/ROOT/pages/v5.0/6.3.12.adoc @@ -136,7 +136,7 @@ typedef enum IvyStmtType { IVY_STMT_UNKNOW, IVY_STMT_DO, - IVY_STMT_DOFROMCALL, /* new statementt type */ + IVY_STMT_DOFROMCALL, /* new statement type */ IVY_STMT_DOHANDLED, IVY_STMT_OTHERS } IvyStmtType;