REL_2_STABLE: Fix binary swap test failure on PG version bump (#1634)

Author: tuhaihe

.github/workflows/binary-swap-check.yml

@@ -565,6 +565,11 @@ jobs:
           echo "$CATALOG_VERSION"
           echo "BASELINE_CATALOG_VERSION=$CATALOG_VERSION" >> "$GITHUB_ENV"
 
+          echo "Baseline PostgreSQL Kernel Version:"
+          PG_VERSION=$("${BASELINE_INSTALL_DIR}/bin/pg_config" --version 2>/dev/null || echo "N/A")
+          echo "$PG_VERSION"
+          echo "BASELINE_PG_VERSION=$PG_VERSION" >> "$GITHUB_ENV"
+
           ls -la "${BASELINE_INSTALL_DIR}"
 
       - name: Install Current RPM
@@ -611,6 +616,11 @@ jobs:
           echo "$CATALOG_VERSION"
           echo "CURRENT_CATALOG_VERSION=$CATALOG_VERSION" >> "$GITHUB_ENV"
 
+          echo "Current PostgreSQL Kernel Version:"
+          PG_VERSION=$("${CURRENT_INSTALL_DIR}/bin/pg_config" --version 2>/dev/null || echo "N/A")
+          echo "$PG_VERSION"
+          echo "CURRENT_PG_VERSION=$PG_VERSION" >> "$GITHUB_ENV"
+
           ls -la "${CURRENT_INSTALL_DIR}"
 
       - name: Setup pg_regress
@@ -712,15 +722,18 @@ jobs:
             echo "No regression diffs found - test passed"
           fi
 
-      - name: Final Catalog Version Summary
+      - name: Final Version Summary
         if: always()
         run: |
           echo "=== Catalog Version Comparison ==="
           echo "Baseline Catalog Version: ${BASELINE_CATALOG_VERSION:-N/A}"
           echo "Current Catalog Version:  ${CURRENT_CATALOG_VERSION:-N/A}"
-          echo ""
           echo "Catalog Status: $([[ "$BASELINE_CATALOG_VERSION" == "$CURRENT_CATALOG_VERSION" ]] && echo "✅ IDENTICAL" || echo "🔍 DIFFERENT")"
-          echo "=== Comparison completed ==="
+          echo ""
+          echo "=== PostgreSQL Kernel Version Comparison ==="
+          echo "Baseline PG Version: ${BASELINE_PG_VERSION:-N/A}"
+          echo "Current PG Version:  ${CURRENT_PG_VERSION:-N/A}"
+          echo "PG Kernel Status: $([[ "$BASELINE_PG_VERSION" == "$CURRENT_PG_VERSION" ]] && echo "✅ IDENTICAL" || echo "🔍 DIFFERENT")"
 
       - name: Generate Report
         if: always()
@@ -749,6 +762,10 @@ jobs:
           **Baseline Catalog Version**: ${BASELINE_CATALOG_VERSION}
           **Current Catalog Version**: ${CURRENT_CATALOG_VERSION}
 
+          ## PostgreSQL Kernel Version
+          **Baseline PG Version**: ${BASELINE_PG_VERSION}
+          **Current PG Version**: ${CURRENT_PG_VERSION}
+
           ${MESSAGE}
           
           EOF

configure

@@ -2920,7 +2920,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-PG_PACKAGE_VERSION=14.4
+PG_PACKAGE_VERSION=14.5
 
 
 

configure.ac

@@ -21,7 +21,7 @@ dnl The PACKAGE_VERSION from upstream PostgreSQL is maintained in the
 dnl PG_PACKAGE_VERSION variable, when merging make sure to update this
 dnl variable with the merge conflict from the AC_INIT() statement.
 AC_INIT([Apache Cloudberry], [2.1.0-incubating], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/])
-[PG_PACKAGE_VERSION=14.4]
+[PG_PACKAGE_VERSION=14.5]
 AC_SUBST(PG_PACKAGE_VERSION)
 
 dnl m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.

src/test/binary_swap/expected/diff_dumps.out

@@ -1 +1 @@
-\! diff dump_other.sql dump_current.sql
+\! diff -I '^-- Dumped from database version' dump_other.sql dump_current.sql

src/test/binary_swap/sql/diff_dumps.sql

@@ -1 +1 @@
-\! diff dump_other.sql dump_current.sql
+\! diff -I '^-- Dumped from database version' dump_other.sql dump_current.sql