Merge branch 'master' into feat/implicit-for

Author: OreoYang

.devcontainer/Dockerfile

@@ -0,0 +1,59 @@
+# IvorySQL Build and Test Container - Modern Ubuntu
+# Alternative to CentOS with same capabilities
+
+FROM ubuntu:22.04
+
+# Prevent interactive prompts
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install build dependencies matching the workflow requirements
+RUN apt-get update && apt-get install -y \
+    # Build tools
+    build-essential git lcov bison flex pkg-config cppcheck \
+    # Core dependencies
+    libkrb5-dev libssl-dev libldap-dev libpam-dev \
+    libxml2-dev libxslt-dev libreadline-dev libedit-dev \
+    zlib1g-dev uuid-dev libossp-uuid-dev libuuid1 e2fsprogs \
+    # ICU support
+    libicu-dev \
+    # Language support
+    python3-dev tcl-dev libperl-dev gettext \
+    # Perl test modules
+    libipc-run-perl libtime-hires-perl libtest-simple-perl \
+    # LLVM/Clang
+    llvm clang \
+    # LZ4 compression
+    liblz4-dev \
+    # System libraries
+    libselinux1-dev libsystemd-dev \
+    # GSSAPI
+    libgssapi-krb5-2 \
+    # Locale support
+    locales \
+    # For dev containers
+    sudo tini \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set up locale
+RUN locale-gen en_US.UTF-8
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8
+
+# Create ivorysql user with matching host UID/GID (1000:1000)
+# and grant sudo privileges without password
+ARG USER_UID=1000
+ARG USER_GID=1000
+RUN groupadd -g ${USER_GID} ivorysql || true && \
+    useradd -m -u ${USER_UID} -g ${USER_GID} -d /home/ivorysql -s /bin/bash ivorysql && \
+    echo "ivorysql ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+# Set working directory
+WORKDIR /home/ivorysql/IvorySQL
+
+# Switch to ivorysql user for builds
+USER ivorysql
+
+# Default command
+ENTRYPOINT ["/usr/bin/tini", "--"]
+CMD ["/bin/bash"]

.devcontainer/devcontainer.json

@@ -0,0 +1,22 @@
+{
+  "name": "IvorySQL Dev",
+  "dockerComposeFile": "../docker-compose.yaml",
+  "service": "dev",
+  "workspaceFolder": "/home/ivorysql/IvorySQL",
+  "remoteUser": "ivorysql",
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "C_Cpp.default.configurationProvider": "ms-vscode.makefile-tools"
+      },
+      "extensions": [
+        "ms-vscode.cpptools",
+        "ms-vscode.makefile-tools",
+        "twxs.cmake",
+        "mhutchie.git-graph",
+        "eamodio.gitlens"
+      ]
+    }
+  }
+}

.github/workflows/build.yml

@@ -19,6 +19,9 @@ jobs:
       if: ${{ matrix.os == 'ubuntu-latest' }}
       run: |
         sudo apt-get update
+        sudo apt-get install -y gcc-14 g++-14
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
         sudo apt-get install -y build-essential git lcov bison flex \
               libkrb5-dev libssl-dev libldap-dev libpam-dev python3-dev \
               tcl-dev libperl-dev gettext libxml2-dev libxslt-dev \
@@ -35,4 +38,4 @@ jobs:
             --with-ossp-uuid  --with-libxml --with-libxslt  --with-perl \
             --with-icu --with-libnuma --enable-injection-points
     - name: compile
-      run: make
+      run: make CFLAGS="$CFLAGS  -Wshadow=compatible-local -Werror=missing-variable-declarations -Werror=maybe-uninitialized -Werror=unused-value -Werror=unused-but-set-variable -Werror=missing-prototypes -Werror=unused-variable"

README.md

@@ -23,13 +23,44 @@ We are committed to abiding by the principles of [open-source ways](https://open
 </br>
 
 ## Installation
-We recommend following our [Quick Start](https://docs.ivorysql.org/en/ivorysql-doc/v5.0/v5.0/3.1#quick-installation) for how to install and running IvorySQL.
+We recommend following our [Quick Start](https://docs.ivorysql.org/en/ivorysql-doc/v5.1/v5.1/3.1#quick-installation) for how to install and running IvorySQL.
 
-Furthermore, for more detailed installation instructions, please refer to the [Installation Docs](https://docs.ivorysql.org/en/ivorysql-doc/v5.0/v5.0/4.1#introduction). We provide four installation methods for IvorySQL, as outlined below:
-- [Yum installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.0/v5.0/4.1#Yum-installation)
-- [Docker installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.0/v5.0/4.1#Docker-installation)
-- [Rpm installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.0/v5.0/4.1#Rpm-installation)
-- [Source code installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.0/v5.0/4.1#Source-code-installation)
+Furthermore, for more detailed installation instructions, please refer to the [Installation Docs](https://docs.ivorysql.org/en/ivorysql-doc/v5.1/v5.1/4.1#introduction). We provide four installation methods for IvorySQL, as outlined below:
+- [Yum installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.1/v5.1/4.1#Yum-installation)
+- [Docker installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.1/v5.1/4.1#Docker-installation)
+- [Rpm installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.1/v5.1/4.1#Rpm-installation)
+- [Source code installation](https://docs.ivorysql.org/en/ivorysql-doc/v5.1/v5.1/4.1#Source-code-installation)
+
+## Development with Docker
+
+For a consistent development environment, we provide a Docker-based setup that includes all build dependencies.
+
+### Quick Start
+
+```bash
+# Start the development containers
+docker compose up -d
+
+# Enter the development container
+docker compose exec dev bash
+
+# Configure and build IvorySQL
+./configure --prefix=/home/ivorysql/ivorysql \
+    --enable-debug --enable-cassert \
+    --with-uuid=e2fs --with-libxml
+
+make -j$(nproc)
+make install
+
+# Initialize database in Oracle mode
+initdb -D data_ora -m oracle
+
+# Start the server
+pg_ctl -D data_ora start
+
+# Run tests
+make oracle-check
+```
 
 ## Developer Formatting hooks and CI:
 - A pre-commit formatting hook is provided at `.githooks/pre-commit`. Enable it with `git config core.hooksPath .githooks`, or run `make code-format` (equivalently `bash tools/enable-git-hooks.sh`).

README_CN.md

@@ -27,13 +27,13 @@ IvorySQL 项目采用 Apache 2.0 许可协议发布，并鼓励各种形式的
 </br>
 
 ## 安装
-建议参考[快速入门](https://docs.ivorysql.org/cn/ivorysql-doc/v5.0/v5.0/3.1#quick-installation)了解如何安装和运行IvorySQL。
+建议参考[快速入门](https://docs.ivorysql.org/cn/ivorysql-doc/v5.1/v5.1/3.1#quick-installation)了解如何安装和运行IvorySQL。
 
-此外，关于更详细的安装说明，请参阅[安装文档](https://docs.ivorysql.org/cn/ivorysql-doc/v5.0/v5.0/4.1#introduction)。我们提供以下四种 IvorySQL 的安装方法：
-- [Yum 安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.0/v5.0/4.1#yum源安装)
-- [Docker 安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.0/v5.0/4.1#docker安装)
-- [RPM 安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.0/v5.0/4.1#rpm安装)
-- [源代码安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.0/v5.0/4.1#源码安装)
+此外，关于更详细的安装说明，请参阅[安装文档](https://docs.ivorysql.org/cn/ivorysql-doc/v5.1/v5.1/4.1#introduction)。我们提供以下四种 IvorySQL 的安装方法：
+- [Yum 安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.1/v5.1/4.1#yum源安装)
+- [Docker 安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.1/v5.1/4.1#docker安装)
+- [RPM 安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.1/v5.1/4.1#rpm安装)
+- [源代码安装](https://docs.ivorysql.org/cn/ivorysql-doc/v5.1/v5.1/4.1#源码安装)
 
 
 

contrib/gb18030_2022/utf8_and_gb18030_2022.c

@@ -22,8 +22,8 @@
 
 PG_MODULE_MAGIC;
 
-gb18030_2022_to_utf8_hook_type pre_gb18030_2022_to_utf8_hook = NULL;
-utf8_to_gb18030_2022_hook_type pre_utf8_to_gb18030_2022_hook = NULL;
+static gb18030_2022_to_utf8_hook_type pre_gb18030_2022_to_utf8_hook = NULL;
+static utf8_to_gb18030_2022_hook_type pre_utf8_to_gb18030_2022_hook = NULL;
 
 int gb18030_2022_to_utf8(const unsigned char *iso, int len,
 								unsigned char *utf, bool noError);

contrib/ivorysql_ora/src/builtin_functions/datetime_datatype_functions.c

@@ -153,7 +153,7 @@ static const int month_days[] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
-const char *const ora_days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
+static const char *const ora_days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
 "Thursday", "Friday", "Saturday", NULL};
 
 #define CASE_fmt_YYYY	case 0: case 1: case 2: case 3: case 4: case 5: case 6:
@@ -169,7 +169,7 @@ const char *const ora_days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
 #define CASE_fmt_HH	case 27: case 28: case 29:
 #define CASE_fmt_MI	case 30:
 
-const char *const date_fmt[] =
+static const char *const date_fmt[] =
 {
 	"Y", "Yy", "Yyy", "Yyyy", "Year", "Syyyy", "syear",
 	"I", "Iy", "Iyy", "Iyyy",
@@ -195,7 +195,7 @@ const char *const date_fmt[] =
 #define CASE_timezone_10	case 15: case 16:
 #define CASE_timezone_11	case 17:
 
-const char *const date_timezone[] =
+static const char *const date_timezone[] =
 {
 	"GMT", "ADT", "NST", "AST", "EDT", "CDT",
 	"EST", "CST", "MDT", "MST", "PDT", "PST",

contrib/uuid-ossp/uuid-ossp.c

@@ -562,12 +562,20 @@ Datum
 ora_sys_guid(PG_FUNCTION_ARGS)
 {
     bytea *result;
+#ifdef HAVE_UUID_OSSP
+    uuid_t      *uuid;
+    uuid_rc_t   rc;
+#elif defined(HAVE_UUID_E2FS)
+	uuid_t uu;
+#else	/* BSD */
+	int i;
+	unsigned char byte_array[SYS_GUID_LENGTH];
+#endif
+
     result = (bytea *)palloc(VARHDRSZ + SYS_GUID_LENGTH);
     SET_VARSIZE(result, VARHDRSZ + SYS_GUID_LENGTH);
 
 #ifdef HAVE_UUID_OSSP
-    uuid_t      *uuid;
-    uuid_rc_t   rc;
     uuid = get_cached_uuid_t(0);
     rc = uuid_make(uuid, UUID_MAKE_V4, NULL, NULL);
     if (rc != UUID_RC_OK) {
@@ -576,17 +584,14 @@ ora_sys_guid(PG_FUNCTION_ARGS)
     memcpy(VARDATA(result), (unsigned char *)uuid, SYS_GUID_LENGTH);
 
 #elif defined(HAVE_UUID_E2FS)
-    uuid_t uu;
     uuid_generate_random(uu);
     memcpy(VARDATA(result), uu, SYS_GUID_LENGTH);
 
 #else	/* BSD */
-	int i;
-    unsigned char byte_array[SYS_GUID_LENGTH];
     for (i = 0; i < SYS_GUID_LENGTH; i++) {
         byte_array[i] = (unsigned char)arc4random();
     }
     memcpy(VARDATA(result), byte_array, SYS_GUID_LENGTH);
 #endif
     PG_RETURN_BYTEA_P(result);
-}
+}

docker-compose.yaml

@@ -0,0 +1,18 @@
+services:
+  dev:
+    build:
+      context: .
+      dockerfile: .devcontainer/Dockerfile
+    image: ivorysql-dev
+    container_name: ivorysql-dev
+    volumes:
+      - .:/home/ivorysql/IvorySQL:rw
+    working_dir: /home/ivorysql/IvorySQL
+    command: ["sleep", "infinity"]
+ 
+  # docker compose --profile ora up -d
+  oracle:
+    profiles: [ora]
+    image: container-registry.oracle.com/database/free:23.26.0.0-lite
+    environment:
+      ORACLE_PWD: orapwd

src/backend/access/transam/xlog.c

@@ -108,7 +108,7 @@
 #include "utils/memutils.h"
 #endif
 
-extern int       bootstrap_database_mode;
+
 /* timeline ID to be used when bootstrapping */
 #define BootstrapTimeLineID		1