Cherry-pick gpcontrib/diskqouta and other recent main changes.

.github/workflows/build-cloudberry.yml

@@ -314,6 +314,10 @@ jobs:
                                "gpcontrib/gp_toolkit:installcheck",
                                "gpcontrib/gp_exttable_fdw:installcheck"]
               },
+              {"test":"ic-diskquota",
+               "make_configs":["gpcontrib/diskquota:installcheck"],
+               "shared_preload_libraries":"diskquota-2.3"
+              },
               {"test":"ic-fixme",
                "make_configs":["src/test/regress:installcheck-fixme"],
                "enable_core_check":false
@@ -1379,7 +1383,15 @@ jobs:
 
           {
             chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
-            if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
+
+            # Build BLDWRAP_POSTGRES_CONF_ADDONS for shared_preload_libraries if specified
+            EXTRA_CONF=""
+            if [[ -n "${{ matrix.shared_preload_libraries }}" ]]; then
+              EXTRA_CONF="shared_preload_libraries='${{ matrix.shared_preload_libraries }}'"
+              echo "Adding shared_preload_libraries: ${{ matrix.shared_preload_libraries }}"
+            fi
+
+            if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' BLDWRAP_POSTGRES_CONF_ADDONS=\"${EXTRA_CONF}\" SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
               echo "::error::Demo cluster creation failed"
               exit 1
             fi

.github/workflows/build-deb-cloudberry.yml

@@ -1322,7 +1322,15 @@ jobs:
 
           {
             chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
-            if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
+
+            # Build BLDWRAP_POSTGRES_CONF_ADDONS for shared_preload_libraries if specified
+            EXTRA_CONF=""
+            if [[ -n "${{ matrix.shared_preload_libraries }}" ]]; then
+              EXTRA_CONF="shared_preload_libraries='${{ matrix.shared_preload_libraries }}'"
+              echo "Adding shared_preload_libraries: ${{ matrix.shared_preload_libraries }}"
+            fi
+
+            if ! time su - gpadmin -c "cd ${SRC_DIR} && NUM_PRIMARY_MIRROR_PAIRS='${{ matrix.num_primary_mirror_pairs }}' BLDWRAP_POSTGRES_CONF_ADDONS=\"${EXTRA_CONF}\" SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
               echo "::error::Demo cluster creation failed"
               exit 1
             fi

.github/workflows/docker-cbdb-build-containers.yml

@@ -61,6 +61,7 @@ on:
       - 'devops/deploy/docker/build/rocky8/**'
       - 'devops/deploy/docker/build/rocky9/**'
       - 'devops/deploy/docker/build/ubuntu22.04/**'
+      - 'devops/deploy/docker/build/ubuntu24.04/**'
   pull_request:
     paths:
       - 'devops/deploy/docker/build/**'
@@ -77,10 +78,10 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
 
-    # Matrix strategy to build for both Rocky Linux 8 and 9, Ubuntu 22.04
+    # Matrix strategy to build for both Rocky Linux 8 and 9, Ubuntu 22.04 and 24.04
     strategy:
       matrix:
-        platform: ['rocky8', 'rocky9', 'ubuntu22.04']
+        platform: ['rocky8', 'rocky9', 'ubuntu22.04', 'ubuntu24.04']
 
     steps:
       # Checkout repository code with full history
@@ -109,6 +110,8 @@ jobs:
               - 'devops/deploy/docker/build/rocky9/**'
             ubuntu22.04:
               - 'devops/deploy/docker/build/ubuntu22.04/**'
+            ubuntu24.04:
+              - 'devops/deploy/docker/build/ubuntu24.04/**'
 
       # Set up QEMU for multi-architecture support
       # This allows building ARM64 images on AMD64 infrastructure and vice versa

.github/workflows/docker-cbdb-test-containers.yml

@@ -50,6 +50,7 @@ on:
       - 'devops/deploy/docker/test/rocky8/**'
       - 'devops/deploy/docker/test/rocky9/**'
       - 'devops/deploy/docker/test/ubuntu22.04/**'
+      - 'devops/deploy/docker/test/ubuntu24.04/**'
   pull_request:
     paths:
       - 'devops/deploy/docker/test/**'
@@ -66,8 +67,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # Build for both Rocky Linux 8 and 9, Ubuntu 22.04
-        platform: ['rocky8', 'rocky9', 'ubuntu22.04']
+        # Build for Rocky Linux 8 and 9, Ubuntu 22.04 and 24.04
+        platform: ['rocky8', 'rocky9', 'ubuntu22.04', 'ubuntu24.04']
 
     steps:
       # Checkout repository code
@@ -93,6 +94,8 @@ jobs:
               - 'devops/deploy/docker/test/rocky9/**'
             ubuntu22.04:
               - 'devops/deploy/docker/test/ubuntu22.04/**'
+            ubuntu24.04:
+              - 'devops/deploy/docker/test/ubuntu24.04/**'
 
       # Skip if no changes for current platform
       - name: Skip if not relevant

LICENSE

@@ -311,12 +311,18 @@ The Greenplum Database software includes:
       gpcontrib/orafce/*
       see licenses/LICENSE-orafce.txt
 
- ----------------------------
+----------------------------
    BSD 3 Clause License
 
       gpcontrib/gpcloud/test/googletest
       see licenses/LICENSE-googletest.txt
 
+----------------------------
+   PostgreSQL License
+
+      gpcontrib/diskquota/*
+      see licenses/LICENSE-diskquota.txt
+
 ================================================================================
 Apache Cloudberry includes codes from
 

README.md

@@ -94,7 +94,7 @@ feedback, and chat:
 | New ideas / Feature Requests | Share ideas for new features, visit [GitHub Discussions - Ideas](https://github.com/apache/cloudberry/discussions/categories/ideas-feature-requests).  |
 | Report bugs | Problems and issues in Apache Cloudberry core. If you find bugs, welcome to submit them [here](https://github.com/apache/cloudberry/issues).  |
 | Report a security vulnerability | View our [security policy](https://github.com/apache/cloudberry/security/policy) to learn how to report and contact us.  |
-| Community events | Including meetups, webinars, conferences, and more events, visit the [Events page](https://cloudberry.apache.org/community/events) and subscribe events calendar.  |
+| Community events | Including meetups, webinars, conferences, and more events, visit the [Events page](https://cloudberry.apache.org/community/events) and subscribe to the events calendar.  |
 | Documentation | [Official documentation](https://cloudberry.apache.org/docs/) for Cloudberry. You can explore it to discover more details about us. |
 
 ## Contribution

configure

@@ -24845,4 +24845,11 @@ fi
 # The configure args contain '-Wl,-rpath,\$$ORIGIN`, when it falls
 # as a C literal string, it's invalid, so converting `\` to `\\`
 # to be correct for C program.
-sed -i '/define CONFIGURE_ARGS/s,\([^\\]\)\\\$\$,\1\\\\$$,g' src/include/pg_config.h
+case $build_os in
+darwin*)
+  sed -i '' '/define CONFIGURE_ARGS/s,\([^\\]\)\\\$\$,\1\\\\$$,g' src/include/pg_config.h
+  ;;
+*)
+  sed -i '/define CONFIGURE_ARGS/s,\([^\\]\)\\\$\$,\1\\\\$$,g' src/include/pg_config.h
+  ;;
+esac

contrib/pax_storage/src/cpp/cmake/pax.cmake

@@ -223,14 +223,14 @@ add_custom_command(TARGET pax POST_BUILD
 
 if (BUILD_GTEST)
   add_subdirectory(contrib/googletest)
-  ADD_DEFINITIONS(-DRUN_GTEST)
   file(GLOB test_case_sources
     pax_gtest_helper.cc
     pax_gtest.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/*/*_test.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/*/*/*_test.cc)
 
   add_executable(test_main ${pax_target_src} ${test_case_sources})
+  target_compile_definitions(test_main PRIVATE RUN_GTEST)
   add_dependencies(test_main ${pax_target_dependencies} gtest gmock)
   target_include_directories(test_main PUBLIC ${pax_target_include} ${CMAKE_CURRENT_SOURCE_DIR} ${gtest_SOURCE_DIR}/include contrib/cpp-stub/src/ contrib/cpp-stub/src_linux/)
 
@@ -240,13 +240,13 @@ endif(BUILD_GTEST)
 
 if(BUILD_GBENCH)
   add_subdirectory(contrib/googlebench)
-  ADD_DEFINITIONS(-DRUN_GBENCH)
   file(GLOB bench_sources
       pax_gbench.cc
       ${CMAKE_CURRENT_SOURCE_DIR}/*/*_bench.cc
       ${CMAKE_CURRENT_SOURCE_DIR}/*/*/*_bench.cc)
 
     add_executable(bench_main ${pax_target_src} ${bench_sources})
+    target_compile_definitions(bench_main PRIVATE RUN_GBENCH)
     add_dependencies(bench_main ${pax_target_dependencies} gtest gmock)
     target_include_directories(bench_main PUBLIC ${pax_target_include} ${CMAKE_CURRENT_SOURCE_DIR} contrib/googlebench/include contrib/cpp-stub/src/ contrib/cpp-stub/src_linux/)
     link_directories(contrib/googlebench/src)

contrib/pax_storage/src/cpp/comm/guc.cc

@@ -134,11 +134,11 @@ void DefineGUCs() {
                            "enable pax filter, contains min/max and bloom "
                            "filters for sparse filtering",
                            NULL, &pax::pax_enable_sparse_filter, true,
-                           PGC_USERSET, 0, NULL, NULL, NULL);
+                           PGC_USERSET, GUC_GPDB_NEED_SYNC, NULL, NULL, NULL);
 
   DefineCustomBoolVariable("pax.enable_row_filter", "enable pax row filter",
                            NULL, &pax::pax_enable_row_filter, false,
-                           PGC_USERSET, 0, NULL, NULL, NULL);
+                           PGC_USERSET, GUC_GPDB_NEED_SYNC, NULL, NULL, NULL);
 
   DefineCustomIntVariable(
       "pax.scan_reuse_buffer_size", "set the reuse buffer size", NULL,