Release: update version to 2.2.0-incubating

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Apache Cloudberry 2.1.0-incubating.
+# Generated by GNU Autoconf 2.69 for Apache Cloudberry 2.2.0-incubating.
 #
 # Report bugs to <dev@cloudberry.apache.org>.
 #
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Apache Cloudberry'
 PACKAGE_TARNAME='apache-cloudberry'
-PACKAGE_VERSION='2.1.0-incubating'
-PACKAGE_STRING='Apache Cloudberry 2.1.0-incubating'
+PACKAGE_VERSION='2.2.0-incubating'
+PACKAGE_STRING='Apache Cloudberry 2.2.0-incubating'
 PACKAGE_BUGREPORT='dev@cloudberry.apache.org'
 PACKAGE_URL='https://cloudberry.apache.org/'
 
@@ -1536,7 +1536,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Apache Cloudberry 2.1.0-incubating to adapt to many kinds of systems.
+\`configure' configures Apache Cloudberry 2.2.0-incubating to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1602,7 +1602,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Apache Cloudberry 2.1.0-incubating:";;
+     short | recursive ) echo "Configuration of Apache Cloudberry 2.2.0-incubating:";;
    esac
   cat <<\_ACEOF
 
@@ -1819,7 +1819,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Apache Cloudberry configure 2.1.0-incubating
+Apache Cloudberry configure 2.2.0-incubating
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2572,7 +2572,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Apache Cloudberry $as_me 2.1.0-incubating, which was
+It was created by Apache Cloudberry $as_me 2.2.0-incubating, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -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.8
+PG_PACKAGE_VERSION=14.9
 
 
 
@@ -9567,8 +9567,13 @@ $as_echo "#define HAVE_ZSTD 1" >>confdefs.h
 
 fi
 
-  # Check liburing
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_uring_queue_init in -luring" >&5
+  # Check liburing. liburing is Linux-only (io_uring kernel iface, 5.1+).
+  # On Linux it is required as before; on non-Linux hosts (macOS / *BSD)
+  # PAX falls back to pread-based SyncFastIO and the IOUringFastIO path
+  # is conditionally compiled — see contrib/pax_storage/src/cpp/comm/fast_io.*
+  case $host_os in
+    linux*)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_uring_queue_init in -luring" >&5
 $as_echo_n "checking for io_uring_queue_init in -luring... " >&6; }
 if ${ac_cv_lib_uring_io_uring_queue_init+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -9612,18 +9617,58 @@ _ACEOF
   LIBS="-luring $LIBS"
 
 else
-  # liburing is required on Linux (io_uring is a Linux 5.1+ kernel iface);
-  # on non-Linux hosts PAX falls back to pread-based SyncFastIO.
-  case $host_os in
-    linux*)
-      as_fn_error $? "library 'uring' is required for PAX support on Linux" "$LINENO" 5
+  as_fn_error $? "library 'uring' is required for PAX support on Linux" "$LINENO" 5
+fi
+
       ;;
     *)
-      :
-      ;;
-  esac
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_uring_queue_init in -luring" >&5
+$as_echo_n "checking for io_uring_queue_init in -luring... " >&6; }
+if ${ac_cv_lib_uring_io_uring_queue_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luring  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char io_uring_queue_init ();
+int
+main ()
+{
+return io_uring_queue_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_uring_io_uring_queue_init=yes
+else
+  ac_cv_lib_uring_io_uring_queue_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uring_io_uring_queue_init" >&5
+$as_echo "$ac_cv_lib_uring_io_uring_queue_init" >&6; }
+if test "x$ac_cv_lib_uring_io_uring_queue_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBURING 1
+_ACEOF
 
+  LIBS="-luring $LIBS"
+
+fi
+
+      ;;
+  esac
 
   # Check cmake >= 3.11.0 using AX_COMPARE_VERSION
   # Extract the first word of "cmake", so it can be a program name with args.
@@ -24700,7 +24745,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Apache Cloudberry $as_me 2.1.0-incubating, which was
+This file was extended by Apache Cloudberry $as_me 2.2.0-incubating, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24771,7 +24816,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Apache Cloudberry config.status 2.1.0-incubating
+Apache Cloudberry config.status 2.2.0-incubating
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -20,8 +20,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 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.8]
+AC_INIT([Apache Cloudberry], [2.2.0-incubating], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/])
+[PG_PACKAGE_VERSION=14.9]
 AC_SUBST(PG_PACKAGE_VERSION)
 
 dnl m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.

pom.xml

@@ -37,7 +37,7 @@ code or new licensing patterns.
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cloudberry</groupId>
   <artifactId>apache-cloudberry-incubating</artifactId>
-  <version>2.1.0-incubating</version>
+  <version>2.2.0-incubating</version>
   <packaging>pom</packaging>
 
   <build>