Keep no-match rows when pulling up a correlated aggregate subquery

.asf.yaml

@@ -72,9 +72,9 @@ github:
     # Enable rebase merging for linear history
     rebase: true
 
-  # Branch protection rules for the main branch
+  # Branch protection rules for the REL_2_STABLE release branch
   protected_branches:
-    main:
+    REL_2_STABLE:
       # Require status checks to pass before merging
       required_status_checks:
         # Require branches to be up to date before merging
@@ -122,18 +122,6 @@ github:
       # Require conversation threads to be resolved
       required_conversation_resolution: true
 
-    # Branch protection for REL_2_STABLE release branch
-    REL_2_STABLE:
-      # Pull request review requirements
-      required_pull_request_reviews:
-        # Require new reviews when new commits are pushed
-        dismiss_stale_reviews: false
-        # Require at least 2 approving reviews
-        required_approving_review_count: 2
-
-      # Require conversation threads to be resolved
-      required_conversation_resolution: true
-
   # Branch cleanup settings
   # Don't automatically delete branches after merging
   del_branch_on_merge: true

.github/workflows/apache-rat-audit.yml

@@ -32,9 +32,9 @@ name: Apache Rat License Check
 
 on:
   push:
-    branches: [main, REL_2_STABLE]
+    branches: [REL_2_STABLE]
   pull_request:
-    branches: [main, REL_2_STABLE]
+    branches: [REL_2_STABLE]
     types: [opened, synchronize, reopened, edited]
   workflow_dispatch:
 

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

@@ -104,8 +104,9 @@ jobs:
           # Exclude RC versions: X.Y.Z-incubating-rcN
           echo "Finding latest release tag..."
 
-          # Get all tags matching the incubating pattern, sort by version, filter out RC versions
-          TAG_INFO=$(git ls-remote --tags --refs origin '*-incubating' 2>/dev/null \
+          # Get all tags matching the incubating pattern from open-gpdb,
+          # sort by version, filter out RC versions.
+          TAG_INFO=$(git ls-remote --tags --refs https://github.com/open-gpdb/cloudberry.git '*-incubating' 2>/dev/null \
             | grep -v '\-rc[0-9]*$' \
             | sort -t'/' -k3 -V \
             | tail -1 || echo "")
@@ -164,14 +165,15 @@ jobs:
       - name: Checkout Baseline Code
         uses: actions/checkout@v4
         with:
+          repository: open-gpdb/cloudberry
           ref: ${{ needs.resolve-baseline.outputs.baseline_version }}
           fetch-depth: 1
           submodules: recursive
 
       - name: Checkout Build Tools
         uses: actions/checkout@v4
         with:
-          ref: main
+          ref: REL_2_STABLE
           path: build_tools
           sparse-checkout: |
             devops
@@ -181,7 +183,7 @@ jobs:
         run: |
           # Copy devops scripts to baseline source if they don't exist
           if [ ! -d "devops" ]; then
-            echo "Injecting devops scripts from main branch..."
+            echo "Injecting devops scripts from REL_2_STABLE branch..."
             cp -r build_tools/devops .
           fi
 
@@ -316,7 +318,7 @@ jobs:
       - name: Checkout Build Tools
         uses: actions/checkout@v4
         with:
-          ref: main
+          ref: REL_2_STABLE
           path: build_tools
           sparse-checkout: |
             devops
@@ -326,7 +328,7 @@ jobs:
         run: |
           # Copy devops scripts to current source if they don't exist
           if [ ! -d "devops" ]; then
-            echo "Injecting devops scripts from main branch..."
+            echo "Injecting devops scripts from REL_2_STABLE branch..."
             cp -r build_tools/devops .
           fi
 

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

@@ -103,12 +103,12 @@ name: Apache Cloudberry Build (Rocky 8)
 
 on:
   push:
-    branches: [main, REL_2_STABLE]
+    branches: [REL_2_STABLE]
   pull_request:
     paths:
       - '.github/workflows/build-cloudberry-rocky8.yml'
     # We can enable the PR test when needed
-    # branches: [main, REL_2_STABLE]
+    # branches: [REL_2_STABLE]
     # types: [opened, synchronize, reopened, edited]
   schedule:
     # Run every Monday at 02:00 UTC
@@ -310,15 +310,28 @@ jobs:
                                "contrib/pgcrypto:installcheck",
                                "contrib/pgstattuple:installcheck",
                                "contrib/tablefunc:installcheck",
+                               "contrib/try_convert:installcheck",
                                "contrib/passwordcheck:installcheck",
+                               "contrib/pg_aux_catalog:installcheck",
                                "contrib/pg_buffercache:installcheck",
                                "contrib/sslinfo:installcheck"]
               },
               {"test":"ic-gpcontrib",
                "make_configs":["gpcontrib/orafce:installcheck",
                                "gpcontrib/zstd:installcheck",
                                "gpcontrib/gp_sparse_vector:installcheck",
-                               "gpcontrib/gp_toolkit:installcheck"]
+                               "gpcontrib/gp_toolkit:installcheck",
+                               "gpcontrib/gp_url_tools:installcheck",
+                               "gpcontrib/uuid_cb:installcheck"]
+              },
+              {"test":"gpcontrib-gp-relaccess-stats",
+               "make_configs":["gpcontrib/gp_relaccess_stats:installcheck"],
+               "extension":"gp_relaccess_stats",
+               "shared_preload_libraries":"gp_relaccess_stats"
+              },
+              {"test":"gpcontrib-gp-stats-collector",
+               "make_configs":["gpcontrib/gp_stats_collector:installcheck"],
+               "extension":"gp_stats_collector"
               },
               {"test":"ic-fixme",
                "make_configs":["src/test/regress:installcheck-fixme"],
@@ -339,6 +352,10 @@ jobs:
               },
               {"test":"ic-cbdb-parallel",
                "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
+              },
+              {"test":"ic-recovery",
+               "make_configs":["src/test/recovery:installcheck"],
+               "enable_core_check":false
               }
             ]
           }'
@@ -1396,6 +1413,7 @@ jobs:
         if: success() && needs.check-skip.outputs.should_skip != 'true'
         env:
           SRC_DIR: ${{ github.workspace }}
+          BUILD_DESTINATION: /usr/local/cloudberry-db
         shell: bash {0}
         run: |
           set -o pipefail
@@ -1419,6 +1437,44 @@ jobs:
           # 2. Follow the same pattern as optimizer
           # 3. Update matrix entries to include the new setting
 
+          # Create extension if required
+          if [[ "${{ matrix.extension != '' }}" == "true" ]]; then
+            case "${{ matrix.extension }}" in
+              gp_stats_collector)
+                if ! su - gpadmin -c "source ${BUILD_DESTINATION}/cloudberry-env.sh && \
+                  source ${SRC_DIR}/gpAux/gpdemo/gpdemo-env.sh && \
+                  gpconfig -c shared_preload_libraries -v 'gp_stats_collector' && \
+                  gpstop -ra && \
+                  echo 'CREATE EXTENSION IF NOT EXISTS gp_stats_collector; \
+                        SHOW shared_preload_libraries; \
+                        TABLE pg_extension;' | \
+                    psql postgres"
+                then
+                    echo "Error creating gp_stats_collector extension"
+                    exit 1
+                fi
+                ;;
+              gp_relaccess_stats)
+                if ! su - gpadmin -c "source ${BUILD_DESTINATION}/cloudberry-env.sh && \
+                  source ${SRC_DIR}/gpAux/gpdemo/gpdemo-env.sh && \
+                  gpconfig -c shared_preload_libraries -v 'gp_relaccess_stats' && \
+                  gpstop -ra && \
+                  echo 'CREATE EXTENSION IF NOT EXISTS gp_relaccess_stats; \
+                        SHOW shared_preload_libraries; \
+                        TABLE pg_extension;' | \
+                    psql postgres"
+                then
+                    echo "Error creating gp_relaccess_stats extension"
+                    exit 1
+                fi
+                ;;
+              *)
+                echo "Unknown extension: ${{ matrix.extension }}"
+                exit 1
+                ;;
+            esac
+          fi
+
           # Set PostgreSQL options if defined
           PG_OPTS=""
           if [[ "${{ matrix.pg_settings.optimizer != '' }}" == "true" ]]; then
@@ -1643,6 +1699,7 @@ jobs:
 
       - name: Check and Display Regression Diffs
         if: always()
+        shell: bash {0}
         run: |
           # Search for regression.diffs recursively
           found_file=$(find . -type f -name "regression.diffs" | head -n 1)

.github/workflows/build-cloudberry.yml

@@ -102,9 +102,9 @@ name: Apache Cloudberry Build
 
 on:
   push:
-    branches: [main, REL_2_STABLE]
+    branches: [REL_2_STABLE]
   pull_request:
-    branches: [main, REL_2_STABLE]
+    branches: [REL_2_STABLE]
     types: [opened, synchronize, reopened, edited]
   workflow_dispatch:
     inputs:
@@ -271,6 +271,15 @@ jobs:
                 },
                 "enable_core_check":false
               },
+              {"test":"gpcontrib-gp-relaccess-stats",
+               "make_configs":["gpcontrib/gp_relaccess_stats:installcheck"],
+               "extension":"gp_relaccess_stats",
+               "shared_preload_libraries":"gp_relaccess_stats"
+              },
+              {"test":"gpcontrib-gp-stats-collector",
+               "make_configs":["gpcontrib/gp_stats_collector:installcheck"],
+               "extension":"gp_stats_collector"
+              },
               {"test":"ic-expandshrink",
                "make_configs":["src/test/isolation2:installcheck-expandshrink"]
               },
@@ -298,12 +307,15 @@ jobs:
                                "contrib/formatter_fixedwidth:installcheck",
                                "contrib/hstore:installcheck",
                                "contrib/indexscan:installcheck",
+                               "contrib/interconnect:installcheck",
                                "contrib/pg_trgm:installcheck",
                                "contrib/indexscan:installcheck",
                                "contrib/pgcrypto:installcheck",
                                "contrib/pgstattuple:installcheck",
                                "contrib/tablefunc:installcheck",
+                               "contrib/try_convert:installcheck",
                                "contrib/passwordcheck:installcheck",
+                               "contrib/pg_aux_catalog:installcheck",
                                "contrib/pg_buffercache:installcheck",
                                "contrib/sslinfo:installcheck"]
               },
@@ -312,7 +324,10 @@ jobs:
                                "gpcontrib/zstd:installcheck",
                                "gpcontrib/gp_sparse_vector:installcheck",
                                "gpcontrib/gp_toolkit:installcheck",
-                               "gpcontrib/gp_exttable_fdw:installcheck"]
+                               "gpcontrib/gp_exttable_fdw:installcheck",
+                               "gpcontrib/gp_internal_tools:installcheck",
+                               "gpcontrib/gp_url_tools:installcheck",
+                               "gpcontrib/uuid_cb:installcheck"]
               },
               {"test":"ic-diskquota",
                "make_configs":["gpcontrib/diskquota:installcheck"],
@@ -337,6 +352,9 @@ jobs:
               },
               {"test":"ic-cbdb-parallel",
                "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
+              },
+              {"test":"ic-orca-parallel",
+               "make_configs":["src/test/regress:installcheck-orca-parallel"]
               }
             ]
           }'
@@ -1402,6 +1420,7 @@ jobs:
         if: success() && needs.check-skip.outputs.should_skip != 'true'
         env:
           SRC_DIR: ${{ github.workspace }}
+          BUILD_DESTINATION: /usr/local/cloudberry-db
         shell: bash {0}
         run: |
           set -o pipefail
@@ -1431,6 +1450,44 @@ jobs:
             PG_OPTS="$PG_OPTS -c optimizer=${{ matrix.pg_settings.optimizer }}"
           fi
 
+          # Create extension if required
+          if [[ "${{ matrix.extension != '' }}" == "true" ]]; then
+            case "${{ matrix.extension }}" in
+              gp_stats_collector)
+                if ! su - gpadmin -c "source ${BUILD_DESTINATION}/cloudberry-env.sh && \
+                  source ${SRC_DIR}/gpAux/gpdemo/gpdemo-env.sh && \
+                  gpconfig -c shared_preload_libraries -v 'gp_stats_collector' && \
+                  gpstop -ra && \
+                  echo 'CREATE EXTENSION IF NOT EXISTS gp_stats_collector; \
+                        SHOW shared_preload_libraries; \
+                        TABLE pg_extension;' | \
+                    psql postgres"
+                then
+                    echo "Error creating gp_stats_collector extension"
+                    exit 1
+                fi
+                ;;
+              gp_relaccess_stats)
+                if ! su - gpadmin -c "source ${BUILD_DESTINATION}/cloudberry-env.sh && \
+                  source ${SRC_DIR}/gpAux/gpdemo/gpdemo-env.sh && \
+                  gpconfig -c shared_preload_libraries -v 'gp_relaccess_stats' && \
+                  gpstop -ra && \
+                  echo 'CREATE EXTENSION IF NOT EXISTS gp_relaccess_stats; \
+                        SHOW shared_preload_libraries; \
+                        TABLE pg_extension;' | \
+                    psql postgres"
+                then
+                    echo "Error creating gp_relaccess_stats extension"
+                    exit 1
+                fi
+                ;;
+              *)
+                echo "Unknown extension: ${{ matrix.extension }}"
+                exit 1
+                ;;
+            esac
+          fi
+
           if [[ "${{ matrix.pg_settings.default_table_access_method != '' }}" == "true" ]]; then
             PG_OPTS="$PG_OPTS -c default_table_access_method=${{ matrix.pg_settings.default_table_access_method }}"
           fi
@@ -1649,6 +1706,7 @@ jobs:
 
       - name: Check and Display Regression Diffs
         if: always()
+        shell: bash {0}
         run: |
           # Search for regression.diffs recursively
           found_file=$(find . -type f -name "regression.diffs" | head -n 1)

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

@@ -102,9 +102,9 @@ name: Apache Cloudberry Build Debug
 
 on:
   push:
-    branches: [main, REL_2_STABLE]
+    branches: [REL_2_STABLE]
   pull_request:
-    branches: [main, REL_2_STABLE]
+    branches: [REL_2_STABLE]
     types: [opened, synchronize, reopened, edited]
   workflow_dispatch:
     inputs: