diff --git a/.abi-check/7.1.0/postgres.symbols.ignore b/.abi-check/7.1.0/postgres.symbols.ignore
index 848dbf2841d..d42d77c4039 100644
--- a/.abi-check/7.1.0/postgres.symbols.ignore
+++ b/.abi-check/7.1.0/postgres.symbols.ignore
@@ -1 +1,12 @@
 pgarch_start
+ConfigureNamesInt_gp
+child_triggers
+has_update_triggers
+ConfigureNamesBool_gp
+aocs_beginscan
+AppendOnlyBlockDirectory_GetEntry
+ConfigureNamesString_gp
+gp_pause_on_restore_point_replay
+ConfigureNamesReal_gp
+TableAmRoutine
+MainLWLockNames
diff --git a/.asf.yaml b/.asf.yaml
index 06a1287b3ca..01188659355 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -85,6 +85,7 @@ github:
         # Actions workflows. They do not include the workflow name as a
         # prefix
         contexts:
+          - rat-check
           - check-skip
           - Build Apache Cloudberry RPM
           - RPM Install Test Apache Cloudberry
@@ -121,6 +122,18 @@ 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
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
new file mode 100644
index 00000000000..ae1651742e0
--- /dev/null
+++ b/.github/workflows/README.md
@@ -0,0 +1,258 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+# GitHub Actions Workflows
+
+This directory contains GitHub Actions workflows for Apache Cloudberry CI/CD.
+
+## Table of Contents
+
+- [Available Workflows](#available-workflows)
+- [Manual Workflow Triggers](#manual-workflow-triggers)
+- [Artifact Reuse for Faster Testing](#artifact-reuse-for-faster-testing)
+- [Running Workflows in Forked Repositories](#running-workflows-in-forked-repositories)
+
+## Available Workflows
+
+| Workflow | Purpose | Trigger |
+|----------|---------|---------|
+| `build-cloudberry.yml` | Main CI: build, test, create RPMs | Push, PR, Manual |
+| `build-dbg-cloudberry.yml` | Debug build with assertions enabled | Push, PR, Manual |
+| `apache-rat-audit.yml` | License header compliance check | Push, PR |
+| `coverity.yml` | Static code analysis with Coverity | Weekly, Manual |
+| `sonarqube.yml` | Code quality analysis with SonarQube | Push to main |
+| `docker-cbdb-build-containers.yml` | Build Docker images for CI | Manual |
+| `docker-cbdb-test-containers.yml` | Build test Docker images | Manual |
+
+## Manual Workflow Triggers
+
+Many workflows support manual triggering via `workflow_dispatch`, allowing developers to run CI jobs on-demand.
+
+### How to Manually Trigger a Workflow
+
+1. Navigate to the **Actions** tab in GitHub
+2. Select the workflow from the left sidebar (e.g., "Build and Test Cloudberry")
+3. Click **Run workflow** button (top right)
+4. Select your branch
+5. Configure input parameters (if available)
+6. Click **Run workflow**
+
+### Workflow Input Parameters
+
+#### `build-cloudberry.yml` - Main CI
+
+| Parameter | Description | Default | Example |
+|-----------|-------------|---------|---------|
+| `test_selection` | Comma-separated list of tests to run, or "all" | `all` | `ic-good-opt-off,ic-contrib` |
+| `reuse_artifacts_from_run_id` | Run ID to reuse build artifacts from (see below) | _(empty)_ | `12345678901` |
+
+**Available test selections:**
+- `all` - Run all test suites
+- `ic-good-opt-off` - Installcheck with optimizer off
+- `ic-good-opt-on` - Installcheck with optimizer on
+- `ic-contrib` - Contrib extension tests
+- `ic-resgroup` - Resource group tests
+- `ic-resgroup-v2` - Resource group v2 tests
+- `ic-resgroup-v2-memory-accounting` - Resource group memory tests
+- `ic-singlenode` - Single-node mode tests
+- `make-installcheck-world` - Full test suite
+- And more... (see workflow for complete list)
+
+## Artifact Reuse for Faster Testing
+
+When debugging test failures, rebuilding Cloudberry (~50-70 minutes) on every iteration is inefficient. The artifact reuse feature allows you to reuse build artifacts from a previous successful run.
+
+### How It Works
+
+1. Build artifacts (RPMs, source tarballs) from a previous workflow run are downloaded
+2. Build job is skipped (saves ~45-60 minutes)
+3. RPM installation test is skipped (saves ~5-10 minutes)
+4. Test jobs run with the reused artifacts
+5. You can iterate on test configurations without rebuilding
+
+### Step-by-Step Guide
+
+#### 1. Find the Run ID
+
+After a successful build (even if tests failed), get the run ID:
+
+**Option A: From GitHub Actions UI**
+- Go to **Actions** tab → Click on a completed workflow run
+- The URL will be: `https://github.com/apache/cloudberry/actions/runs/12345678901`
+- The run ID is `12345678901`
+
+**Option B: From GitHub API**
+```bash
+# List recent workflow runs
+gh run list --workflow=build-cloudberry.yml --limit 5
+
+# Get run ID from specific branch
+gh run list --workflow=build-cloudberry.yml --branch=my-feature --limit 1
+```
+
+#### 2. Trigger New Run with Artifact Reuse
+
+**Via GitHub UI:**
+1. Go to **Actions** → **Build and Test Cloudberry**
+2. Click **Run workflow**
+3. Enter the run ID in **"Reuse build artifacts from a previous run ID"**
+4. Optionally customize **test_selection**
+5. Click **Run workflow**
+
+**Via GitHub CLI:**
+```bash
+# Reuse artifacts from run 12345678901, run only specific tests
+gh workflow run build-cloudberry.yml \
+  --field reuse_artifacts_from_run_id=12345678901 \
+  --field test_selection=ic-good-opt-off
+```
+
+#### 3. Monitor Test Execution
+
+- Build job will be skipped (shows as "Skipped" in Actions UI)
+- RPM Install Test will be skipped
+- Test jobs will run with artifacts from the specified run ID
+- Total time: ~15-30 minutes (vs ~65-100 minutes for full build+test)
+
+### Use Cases
+
+**Debugging a specific test failure:**
+```bash
+# Run 1: Full build + all tests (finds test failure in ic-good-opt-off)
+gh workflow run build-cloudberry.yml
+
+# Get the run ID from output
+RUN_ID=$(gh run list --workflow=build-cloudberry.yml --limit 1 --json databaseId --jq '.[0].databaseId')
+
+# Run 2: Reuse artifacts, run only failing test
+gh workflow run build-cloudberry.yml \
+  --field reuse_artifacts_from_run_id=$RUN_ID \
+  --field test_selection=ic-good-opt-off
+```
+
+**Testing different configurations:**
+```bash
+# Test with optimizer off, then on, using same build
+gh workflow run build-cloudberry.yml \
+  --field reuse_artifacts_from_run_id=$RUN_ID \
+  --field test_selection=ic-good-opt-off
+
+gh workflow run build-cloudberry.yml \
+  --field reuse_artifacts_from_run_id=$RUN_ID \
+  --field test_selection=ic-good-opt-on
+```
+
+### Limitations
+
+- Artifacts expire after 90 days (GitHub default retention)
+- Run ID must be from the same repository (or accessible fork)
+- Artifacts must include both RPM and source build artifacts
+- Cannot reuse artifacts across different OS/architecture combinations
+- Changes to source code require a fresh build
+
+## Running Workflows in Forked Repositories
+
+GitHub Actions workflows are enabled in forks, allowing you to validate changes before submitting a Pull Request.
+
+### Initial Setup (One-Time)
+
+1. **Fork the repository** to your GitHub account
+
+2. **Enable GitHub Actions** in your fork:
+   - Go to your fork's **Actions** tab
+   - Click **"I understand my workflows, go ahead and enable them"**
+
+**Secrets Configuration:**
+
+No manual secret configuration is required for the main build and test workflows.
+
+- `GITHUB_TOKEN` is automatically provided by GitHub and used when downloading artifacts from previous runs (artifact reuse feature)
+- DockerHub secrets (`DOCKERHUB_USER`, `DOCKERHUB_TOKEN`) are only required for building custom container images (advanced/maintainer use case, not needed for typical development)
+
+### Workflow Behavior in Forks
+
+- ✅ **Automated triggers work**: Push and PR events trigger workflows
+- ✅ **Manual triggers work**: `workflow_dispatch` is fully functional
+- ✅ **Artifact reuse works**: Can reuse artifacts from previous runs in your fork
+- ⚠️ **Cross-fork artifact reuse**: Not supported (security restriction)
+- ⚠️ **Some features may be limited**: Certain features requiring organization-level secrets may not work
+
+### Best Practices for Fork Development
+
+1. **Test locally first** when possible (faster iteration)
+2. **Use manual triggers** to avoid burning GitHub Actions minutes unnecessarily
+3. **Use artifact reuse** to iterate on test failures efficiently
+4. **Push to feature branches** to trigger automated CI
+5. **Review Actions tab** to ensure workflows completed successfully before opening PR
+
+### Example Fork Workflow
+
+```bash
+# 1. Create feature branch in fork
+git checkout -b fix-test-failure
+
+# 2. Make changes and push to fork
+git commit -am "Fix test failure"
+git push origin fix-test-failure
+
+# 3. CI runs automatically on push
+
+# 4. If tests fail, iterate using artifact reuse
+# Get run ID from your fork's Actions tab
+gh workflow run build-cloudberry.yml \
+  --field reuse_artifacts_from_run_id=12345678901 \
+  --field test_selection=ic-good-opt-off
+
+# 5. Once tests pass, open PR to upstream
+gh pr create --web
+```
+
+## Troubleshooting
+
+### "Build job was skipped but tests failed to start"
+
+**Cause:** Artifacts from specified run ID not found or expired
+
+**Solution:**
+- Verify the run ID is correct
+- Check that run completed successfully (built artifacts)
+- Run a fresh build if artifacts expired (>90 days)
+
+### "Workflow not found in fork"
+
+**Cause:** GitHub Actions not enabled in fork
+
+**Solution:**
+- Go to fork's **Actions** tab
+- Click to enable workflows
+
+### "Resource not accessible by integration"
+
+**Cause:** Workflow trying to access artifacts from different repository
+
+**Solution:**
+- Can only reuse artifacts from same repository
+- Run a fresh build in your fork first, then reuse those artifacts
+
+## Additional Resources
+
+- [GitHub Actions Documentation](https://docs.github.com/en/actions)
+- [Cloudberry Contributing Guide](../../CONTRIBUTING.md)
+- [Cloudberry Build Guide](../../deploy/build/README.md)
+- [DevOps Scripts](../../devops/README.md)
diff --git a/.github/workflows/apache-rat-audit.yml b/.github/workflows/apache-rat-audit.yml
new file mode 100644
index 00000000000..4826fc89228
--- /dev/null
+++ b/.github/workflows/apache-rat-audit.yml
@@ -0,0 +1,347 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# Apache Cloudberry (Incubating) Compliance Workflow
+#
+# Comprehensive compliance checks for Apache Cloudberry:
+# 1. Apache RAT license header validation
+# 2. Copyright year verification (NOTICE and psql help.c)
+# 3. Binary file presence detection with approved allowlist
+#
+# Based on Apache Rat tool, run locally with:
+# `mvn clean verify -Drat.consoleOutput=true`
+# --------------------------------------------------------------------
+
+name: Apache Rat License Check
+
+on:
+  push:
+    branches: [main, REL_2_STABLE]
+  pull_request:
+    branches: [main, REL_2_STABLE]
+    types: [opened, synchronize, reopened, edited]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  rat-check:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set up Java and Maven
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+          cache: maven
+
+      - name: Run Apache Rat check
+        run: |
+          echo "Running Apache Rat license check..."
+          mvn clean verify -Drat.consoleOutput=true | tee rat-output.log
+          
+          # Check for build failure
+          if grep -q "\[INFO\] BUILD FAILURE" rat-output.log; then
+            echo "::error::Apache Rat check failed - build failure detected"
+            echo "RAT_CHECK=fail" >> $GITHUB_ENV
+          else
+            echo "RAT_CHECK=pass" >> $GITHUB_ENV
+            echo "Apache Rat check passed successfully"
+          fi
+
+      - name: Check copyright years are up-to-date
+        run: |
+          echo "Checking copyright years..."
+          current_year=$(date -u +"%Y")
+          echo "CURRENT_YEAR=$current_year" >> $GITHUB_ENV
+
+          # Initialize to pass, will be updated if checks fail
+          echo "NOTICE_CHECK=pass" >> $GITHUB_ENV
+          echo "PSQL_HELP_CHECK=pass" >> $GITHUB_ENV
+
+          # Check NOTICE file
+          echo "Checking NOTICE file..."
+          if ! grep -q "Copyright 2024-$current_year The Apache Software Foundation" NOTICE; then
+            echo "::error::NOTICE file does not contain the current year ($current_year)"
+            echo "NOTICE_CHECK=fail" >> $GITHUB_ENV
+          else
+            echo "PASS: NOTICE file contains the current year ($current_year)"
+          fi
+          
+          # Check psql help.c file
+          echo "Checking src/bin/psql/help.c..."
+          if ! grep -q "Copyright 2024-$current_year The Apache Software Foundation" src/bin/psql/help.c; then
+            echo "::error::src/bin/psql/help.c does not contain the current year ($current_year)"
+            echo "PSQL_HELP_CHECK=fail" >> $GITHUB_ENV
+          else
+            echo "PASS: src/bin/psql/help.c contains the current year ($current_year)"
+          fi
+          
+          # Continue execution even if checks fail
+          if [ "$NOTICE_CHECK" = "pass" ] && [ "$PSQL_HELP_CHECK" = "pass" ]; then
+            echo "All copyright year checks passed"
+          else
+            echo "Copyright year checks completed with errors"
+          fi
+
+      - name: Check for binary files
+        run: |
+          echo "Checking for binary files..."
+          echo "Checking extensions: class, jar, tar, tgz, zip, exe, dll, so, gz, bz2"
+          echo "----------------------------------------------------------------------"
+          
+          # Binary file allowlist, see README.apache.md
+          ALLOWLIST=(
+            "contrib/formatter_fixedwidth/data/fixedwidth_small_correct.tbl.gz"
+            "gpMgmt/demo/gppkg/sample-sources.tar.gz"
+            "src/bin/gpfdist/regress/data/exttab1/nation.tbl.gz"
+            "src/bin/gpfdist/regress/data/gpfdist2/gz_multi_chunk.tbl.gz"
+            "src/bin/gpfdist/regress/data/gpfdist2/gz_multi_chunk_2.tbl.gz"
+            "src/bin/gpfdist/regress/data/gpfdist2/lineitem.tbl.bz2"
+            "src/bin/gpfdist/regress/data/gpfdist2/lineitem.tbl.gz"
+          )
+          
+          # Check for specific binary file extensions
+          binary_extensions="class jar tar tgz zip exe dll so gz bz2"
+          echo "BINARY_EXTENSIONS=${binary_extensions}" >> $GITHUB_ENV
+          binary_results=""
+          binaryfiles_found=false
+          
+          for extension in ${binary_extensions}; do
+            printf "Checking *.%-4s files..." "${extension}"
+            found=$(find . -name "*.${extension}" -type f || true)
+            
+            # Filter out allowed files
+            if [ -n "$found" ]; then
+              filtered_found=""
+              while IFS= read -r file; do
+                is_allowed=false
+                for allowlist_file in "${ALLOWLIST[@]}"; do
+                  if [ "$file" = "./$allowlist_file" ]; then
+                    is_allowed=true
+                    echo "Allowed: $file" >> binary_allowlist.txt
+                    break
+                  fi
+                done
+                if [ "$is_allowed" = false ]; then
+                  filtered_found+="$file"$'\n'
+                fi
+              done <<< "$found"
+              
+              filtered_found=$(echo "$filtered_found" | sed '/^$/d')
+              
+              if [ -n "$filtered_found" ]; then
+                echo "FOUND"
+                echo "::error::${extension} files should not exist"
+                echo "For ASF compatibility: the source tree should not contain"
+                echo "binary files as users have a hard time verifying their contents."
+                echo "Found files:"
+                echo "$filtered_found" | sed 's/^/  /'
+                echo "${extension}:${filtered_found}" >> binary_results.txt
+                binaryfiles_found=true
+              else
+                echo "NONE (all allowed)"
+                echo "${extension}:none" >> binary_results.txt
+              fi
+            else
+              echo "NONE"
+              echo "${extension}:none" >> binary_results.txt
+            fi
+          done
+          
+          echo "----------------------------------------------------------------------"
+          if [ "$binaryfiles_found" = true ]; then
+            echo "ERROR: Non-allowed binary files were found in the source tree"
+            echo "BINARY_CHECK=fail" >> $GITHUB_ENV
+          else
+            echo "PASS: No non-allowed binary files found"
+            echo "BINARY_CHECK=pass" >> $GITHUB_ENV
+          fi
+          
+          # Show allowlist summary if any allowed files were found
+          if [ -f binary_allowlist.txt ]; then
+            echo ""
+            echo "Allowed binary files (approved):"
+            cat binary_allowlist.txt | sed 's/^/  /'
+          fi
+
+      - name: Upload Rat check results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: rat-check-results
+          path: rat-output.log
+          retention-days: 7
+
+      - name: Generate Job Summary
+        if: always()
+        run: |
+          {
+            echo "## Apache Cloudberry Compliance Audit Results"
+            echo "- Run Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+            echo ""
+            
+            # Copyright Year Check Summary
+            echo "### Copyright Year Checks"
+            echo "**NOTICE file:**"
+            if [ "$NOTICE_CHECK" = "pass" ]; then
+              echo "PASS: Contains current year ($CURRENT_YEAR)"
+            else
+              echo "ERROR: Does not contain current year ($CURRENT_YEAR)"
+            fi
+            echo ""
+            echo "**psql help.c:**"
+            if [ "$PSQL_HELP_CHECK" = "pass" ]; then
+              echo "PASS: Contains current year ($CURRENT_YEAR)"
+            else
+              echo "ERROR: Does not contain current year ($CURRENT_YEAR)"
+            fi
+            echo ""
+
+            # Binary Files Check Summary
+            echo "### Binary Files Check"
+            echo "Checked extensions: \`${BINARY_EXTENSIONS}\`"
+            echo ""
+            echo "Results:"
+            echo "\`\`\`"
+            if [ -f binary_results.txt ]; then
+              while IFS=: read -r ext files; do
+                if [ "$files" = "none" ]; then
+                  echo "PASS: No .${ext} files found"
+                else
+                  echo "ERROR: Found .${ext} files:"
+                  echo "$files" | sed 's/^/  /'
+                fi
+              done < binary_results.txt
+            fi
+            echo "\`\`\`"
+            echo ""
+            
+            # Allowlist summary
+            if [ -f binary_allowlist.txt ]; then
+              echo "### Allowed Binary Files"
+              echo "The following binary files are approved for testing purposes:"
+              echo "You can see [README.apache.md](https://github.com/apache/cloudberry/blob/main/README.apache.md) for details."
+              echo "\`\`\`"
+              cat binary_allowlist.txt | sed 's/Allowed: //'
+              echo "\`\`\`"
+              echo ""
+            fi
+
+            # Rat check summary
+            if [[ -f rat-output.log ]]; then
+              # First extract and display summary statistics (only once)
+              if grep -q "Rat check: Summary over all files" rat-output.log; then
+                echo "### License Header Check"
+                summary_line=$(grep "Rat check: Summary over all files" rat-output.log)
+                echo "\`\`\`"
+                echo "$summary_line"
+                echo "\`\`\`"
+                echo ""
+              fi
+
+              # Then determine the result status
+              if [ "$RAT_CHECK" = "fail" ]; then
+                echo "#### Check Failed - License Compliance Issues Detected"
+                echo ""
+
+                # Extract and display files with unapproved licenses
+                if grep -q "Files with unapproved licenses:" rat-output.log; then
+                  echo "##### Files with Unapproved Licenses"
+                  echo "\`\`\`"
+                  # Get the line with "Files with unapproved licenses:" and all following lines until the dashed line
+                  sed -n '/Files with unapproved licenses:/,/\[INFO\] ------------------------------------------------------------------------/p' rat-output.log | \
+                    grep -v "\[INFO\] ------------------------------------------------------------------------" | \
+                    grep -v "^$" | \
+                    head -20
+                  echo "\`\`\`"
+                  echo ""
+                fi
+
+                echo "**How to fix:**"
+                echo ""
+                echo "**For new original files you created:**"
+                echo "- Add the standard Apache License header to each file"
+                echo ""
+                echo "**For third-party files with different licenses:**"
+                echo "- Add the file to exclusion list in \`pom.xml\` under the rat-maven-plugin configuration"
+                echo "- Ensure the license is compatible with Apache License 2.0"
+                echo "- Avoid introducing components with incompatible licenses"
+                echo ""
+                echo "**Need help?**"
+                echo "- Run \`mvn clean verify -Drat.consoleOutput=true\` locally for the full report"
+                echo "- Email dev@cloudberry.apache.org if you have questions about license compatibility"
+
+              elif [ "$RAT_CHECK" = "pass" ]; then
+                echo "#### Check Passed - All Files Comply with Apache License Requirements"
+              fi
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Report Status
+        if: always()
+        shell: bash {0}
+        run: |
+          # Check overall status of all checks
+          overall_status=0
+          
+          # Check Apache RAT status
+          if [ "$RAT_CHECK" = "fail" ]; then
+            echo "ERROR: Apache Rat check failed"
+            overall_status=1
+          elif [ "$RAT_CHECK" = "pass" ]; then
+            echo "Apache Rat check passed"
+          fi
+          
+          # Check copyright year status
+          if [ -n "$NOTICE_CHECK" ] && [ "$NOTICE_CHECK" = "fail" ]; then
+            echo "ERROR: NOTICE file copyright year check failed"
+            overall_status=1
+          fi
+          if [ -n "$PSQL_HELP_CHECK" ] && [ "$PSQL_HELP_CHECK" = "fail" ]; then
+            echo "ERROR: psql help.c copyright year check failed"
+            overall_status=1
+          fi
+          
+          # Check binary files status (if this variable exists)
+          if [ -n "$BINARY_CHECK" ] && [ "$BINARY_CHECK" = "fail" ]; then
+            echo "ERROR: Binary files check failed"
+            overall_status=1
+          fi
+          
+          # Exit with appropriate status
+          if [ $overall_status -eq 0 ]; then
+            echo "SUCCESS: All checks passed"
+            exit 0
+          else
+            echo "FAILURE: One or more checks failed"
+            exit 1
+          fi
\ No newline at end of file
diff --git a/.github/workflows/build-cloudberry.yml b/.github/workflows/build-cloudberry.yml
index a6e659596b5..9d44d06bbdc 100644
--- a/.github/workflows/build-cloudberry.yml
+++ b/.github/workflows/build-cloudberry.yml
@@ -102,9 +102,9 @@ name: Apache Cloudberry Build
 
 on:
   push:
-    branches: [main]
+    branches: [main, REL_2_STABLE]
   pull_request:
-    branches: [main]
+    branches: [main, REL_2_STABLE]
     types: [opened, synchronize, reopened, edited]
   workflow_dispatch:
     inputs:
@@ -113,6 +113,11 @@ on:
         required: false
         default: 'all'
         type: string
+      reuse_artifacts_from_run_id:
+        description: 'Reuse build artifacts from a previous run ID (leave empty to build fresh)'
+        required: false
+        default: ''
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -281,18 +286,25 @@ jobs:
               },
               {"test":"ic-contrib",
                "make_configs":["contrib/auto_explain:installcheck",
+                               "contrib/amcheck:installcheck",
                                "contrib/citext:installcheck",
                                "contrib/btree_gin:installcheck",
+                               "contrib/btree_gist:installcheck",
+                               "contrib/dblink:installcheck",
+                               "contrib/dict_int:installcheck",
+                               "contrib/dict_xsyn:installcheck",
+                               "contrib/extprotocol:installcheck",
                                "contrib/file_fdw:installcheck",
                                "contrib/formatter_fixedwidth:installcheck",
-                               "contrib/extprotocol:installcheck",
-                               "contrib/dblink:installcheck",
+                               "contrib/hstore:installcheck",
+                               "contrib/indexscan:installcheck",
                                "contrib/pg_trgm:installcheck",
                                "contrib/indexscan:installcheck",
-                               "contrib/hstore:installcheck",
                                "contrib/pgcrypto:installcheck",
+                               "contrib/pgstattuple:installcheck",
                                "contrib/tablefunc:installcheck",
                                "contrib/passwordcheck:installcheck",
+                               "contrib/pg_buffercache:installcheck",
                                "contrib/sslinfo:installcheck"]
               },
               {"test":"ic-gpcontrib",
@@ -309,12 +321,18 @@ jobs:
               {"test":"ic-isolation2",
                "make_configs":["src/test/isolation2:installcheck-isolation2"]
               },
+              {"test":"ic-isolation2-hot-standby",
+               "make_configs":["src/test/isolation2:installcheck-hot-standby"]
+              },
               {"test":"ic-isolation2-crash",
                "make_configs":["src/test/isolation2:installcheck-isolation2-crash"],
                "enable_core_check":false
               },
               {"test":"ic-parallel-retrieve-cursor",
                "make_configs":["src/test/isolation2:installcheck-parallel-retrieve-cursor"]
+              },
+              {"test":"ic-cbdb-parallel",
+               "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
               }
             ]
           }'
@@ -406,6 +424,7 @@ jobs:
     needs: [check-skip]
     runs-on: ubuntu-22.04
     timeout-minutes: 120
+    if: github.event.inputs.reuse_artifacts_from_run_id == ''
     outputs:
       build_timestamp: ${{ steps.set_timestamp.outputs.timestamp }}
 
@@ -414,8 +433,33 @@ jobs:
       options: >-
         --user root
         -h cdw
+        -v /usr/share:/host_usr_share
+        -v /usr/local:/host_usr_local
+        -v /opt:/host_opt
 
     steps:
+      - name: Free Disk Space
+        if: needs.check-skip.outputs.should_skip != 'true'
+        run: |
+          echo "=== Disk space before cleanup ==="
+          df -h /
+
+          # Remove pre-installed tools from host to free disk space
+          rm -rf /host_opt/hostedtoolcache || true   # GitHub Actions tool cache
+          rm -rf /host_usr_local/lib/android || true # Android SDK
+          rm -rf /host_usr_share/dotnet || true      # .NET SDK
+          rm -rf /host_opt/ghc || true               # Haskell GHC
+          rm -rf /host_usr_local/.ghcup || true      # Haskell GHCup
+          rm -rf /host_usr_share/swift || true       # Swift
+          rm -rf /host_usr_local/share/powershell || true  # PowerShell
+          rm -rf /host_usr_local/share/chromium || true    # Chromium
+          rm -rf /host_usr_share/miniconda || true   # Miniconda
+          rm -rf /host_opt/az || true                # Azure CLI
+          rm -rf /host_usr_share/sbt || true         # Scala Build Tool
+
+          echo "=== Disk space after cleanup ==="
+          df -h /
+
       - name: Skip Check
         if: needs.check-skip.outputs.should_skip == 'true'
         run: |
@@ -437,24 +481,6 @@ jobs:
           fetch-depth: 1
           submodules: true
 
-      - name: Checkout CI Build/Test Scripts
-        if: needs.check-skip.outputs.should_skip != 'true'
-        uses: actions/checkout@v4
-        with:
-          repository: apache/cloudberry-devops-release
-          ref: main
-          path: cloudberry-devops-release
-          fetch-depth: 1
-
-      - name: Move cloudberry-devops-release directory
-        if: needs.check-skip.outputs.should_skip != 'true'
-        run: |
-          set -eo pipefail
-          if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
-            echo "::error::Container initialization failed"
-            exit 1
-          fi
-
       - name: Cloudberry Environment Initialization
         if: needs.check-skip.outputs.should_skip != 'true'
         env:
@@ -506,8 +532,8 @@ jobs:
           SRC_DIR: ${{ github.workspace }}
         run: |
           set -eo pipefail
-          chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh
-          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh"; then
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh"; then
             echo "::error::Configure script failed"
             exit 1
           fi
@@ -519,8 +545,8 @@ jobs:
         run: |
           set -eo pipefail
 
-          chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh
-          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh"; then
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/build-cloudberry.sh"; then
             echo "::error::Build script failed"
             exit 1
           fi
@@ -602,7 +628,7 @@ jobs:
             # Create RPM
             echo "Creating RPM package..."
             rpmdev-setuptree
-            ln -s "${SRC_DIR}"/../cloudberry-devops-release/packaging/rpm/el/SPECS/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
+            ln -s "${SRC_DIR}"/devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
             cp "${SRC_DIR}"/LICENSE /usr/local/cloudberry-db
 
             DEBUG_RPMBUILD_OPT=""
@@ -612,7 +638,7 @@ jobs:
                DEBUG_IDENTIFIER=".debug"
             fi
 
-            "${SRC_DIR}"/../cloudberry-devops-release/scripts/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
+            "${SRC_DIR}"/devops/build/packaging/rpm/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
 
             # Get OS version and move RPM
             os_version=$(grep -oP '(?<=^VERSION_ID=")[0-9]' /etc/os-release)
@@ -649,8 +675,8 @@ jobs:
           SRC_DIR: ${{ github.workspace }}
         run: |
           set -eo pipefail
-          chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh
-          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh"; then
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh"; then
             echo "::error::Unittest script failed"
             exit 1
           fi
@@ -699,6 +725,10 @@ jobs:
   rpm-install-test:
     name: RPM Install Test Apache Cloudberry
     needs: [check-skip, build]
+    if: |
+      !cancelled() &&
+      (needs.build.result == 'success' || needs.build.result == 'skipped') &&
+      github.event.inputs.reuse_artifacts_from_run_id == ''
     runs-on: ubuntu-22.04
     timeout-minutes: 120
 
@@ -707,8 +737,33 @@ jobs:
       options: >-
         --user root
         -h cdw
+        -v /usr/share:/host_usr_share
+        -v /usr/local:/host_usr_local
+        -v /opt:/host_opt
 
     steps:
+      - name: Free Disk Space
+        if: needs.check-skip.outputs.should_skip != 'true'
+        run: |
+          echo "=== Disk space before cleanup ==="
+          df -h /
+
+          # Remove pre-installed tools from host to free disk space
+          rm -rf /host_opt/hostedtoolcache || true   # GitHub Actions tool cache
+          rm -rf /host_usr_local/lib/android || true # Android SDK
+          rm -rf /host_usr_share/dotnet || true      # .NET SDK
+          rm -rf /host_opt/ghc || true               # Haskell GHC
+          rm -rf /host_usr_local/.ghcup || true      # Haskell GHCup
+          rm -rf /host_usr_share/swift || true       # Swift
+          rm -rf /host_usr_local/share/powershell || true  # PowerShell
+          rm -rf /host_usr_local/share/chromium || true    # Chromium
+          rm -rf /host_usr_share/miniconda || true   # Miniconda
+          rm -rf /host_opt/az || true                # Azure CLI
+          rm -rf /host_usr_share/sbt || true         # Scala Build Tool
+
+          echo "=== Disk space after cleanup ==="
+          df -h /
+
       - name: Skip Check
         if: needs.check-skip.outputs.should_skip == 'true'
         run: |
@@ -722,6 +777,8 @@ jobs:
           name: apache-cloudberry-db-incubating-rpm-build-artifacts
           path: ${{ github.workspace }}/rpm_build_artifacts
           merge-multiple: false
+          run-id: ${{ github.event.inputs.reuse_artifacts_from_run_id || github.run_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Cloudberry Environment Initialization
         if: needs.check-skip.outputs.should_skip != 'true'
@@ -826,12 +883,18 @@ jobs:
             echo "Version: ${RPM_VERSION}"
             echo "Release: ${RPM_RELEASE}"
 
+            # Refresh repository metadata to avoid mirror issues
+            echo "Refreshing repository metadata..."
+            dnf clean all
+            dnf makecache --refresh || dnf makecache
+
             # Clean install location
             rm -rf /usr/local/cloudberry-db
 
-            # Install RPM
+            # Install RPM with retry logic for mirror issues
+            # Use --releasever=9 to pin to stable Rocky Linux 9 repos (not bleeding-edge 9.6)
             echo "Starting installation..."
-            if ! time dnf install -y "${RPM_FILE}"; then
+            if ! time dnf install -y --setopt=retries=10 --releasever=9 "${RPM_FILE}"; then
               echo "::error::RPM installation failed"
               exit 1
             fi
@@ -870,6 +933,9 @@ jobs:
   test:
     name: ${{ matrix.test }}
     needs: [check-skip, build, prepare-test-matrix]
+    if: |
+      !cancelled() &&
+      (needs.build.result == 'success' || needs.build.result == 'skipped')
     runs-on: ubuntu-22.04
     timeout-minutes: 120
     # actionlint-allow matrix[*].pg_settings
@@ -887,8 +953,33 @@ jobs:
         --ulimit core=-1
         --cgroupns=host
         -v /sys/fs/cgroup:/sys/fs/cgroup:rw
+        -v /usr/share:/host_usr_share
+        -v /usr/local:/host_usr_local
+        -v /opt:/host_opt
 
     steps:
+      - name: Free Disk Space
+        if: needs.check-skip.outputs.should_skip != 'true'
+        run: |
+          echo "=== Disk space before cleanup ==="
+          df -h /
+
+          # Remove pre-installed tools from host to free disk space
+          rm -rf /host_opt/hostedtoolcache || true   # GitHub Actions tool cache
+          rm -rf /host_usr_local/lib/android || true # Android SDK
+          rm -rf /host_usr_share/dotnet || true      # .NET SDK
+          rm -rf /host_opt/ghc || true               # Haskell GHC
+          rm -rf /host_usr_local/.ghcup || true      # Haskell GHCup
+          rm -rf /host_usr_share/swift || true       # Swift
+          rm -rf /host_usr_local/share/powershell || true  # PowerShell
+          rm -rf /host_usr_local/share/chromium || true    # Chromium
+          rm -rf /host_usr_share/miniconda || true   # Miniconda
+          rm -rf /host_opt/az || true                # Azure CLI
+          rm -rf /host_usr_share/sbt || true         # Scala Build Tool
+
+          echo "=== Disk space after cleanup ==="
+          df -h /
+
       - name: Skip Check
         if: needs.check-skip.outputs.should_skip == 'true'
         run: |
@@ -900,24 +991,6 @@ jobs:
         run: |
           echo "Timestamp from output: ${{ needs.build.outputs.build_timestamp }}"
 
-      - name: Checkout CI Build/Test Scripts
-        if: needs.check-skip.outputs.should_skip != 'true'
-        uses: actions/checkout@v4
-        with:
-          repository: apache/cloudberry-devops-release
-          ref: main
-          path: cloudberry-devops-release
-          fetch-depth: 1
-
-      - name: Move cloudberry-devops-release directory
-        if: needs.check-skip.outputs.should_skip != 'true'
-        run: |
-          set -eo pipefail
-          if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
-            echo "::error::Container initialization failed"
-            exit 1
-          fi
-
       - name: Cloudberry Environment Initialization
         env:
           LOGS_DIR: build-logs
@@ -1117,6 +1190,8 @@ jobs:
           name: apache-cloudberry-db-incubating-rpm-build-artifacts
           path: ${{ github.workspace }}/rpm_build_artifacts
           merge-multiple: false
+          run-id: ${{ github.event.inputs.reuse_artifacts_from_run_id || github.run_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download Cloudberry Source build artifacts
         if: needs.check-skip.outputs.should_skip != 'true'
@@ -1125,6 +1200,8 @@ jobs:
           name: apache-cloudberry-db-incubating-source-build-artifacts
           path: ${{ github.workspace }}/source_build_artifacts
           merge-multiple: false
+          run-id: ${{ github.event.inputs.reuse_artifacts_from_run_id || github.run_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Verify downloaded artifacts
         if: needs.check-skip.outputs.should_skip != 'true'
@@ -1216,12 +1293,18 @@ jobs:
             echo "Version: ${RPM_VERSION}"
             echo "Release: ${RPM_RELEASE}"
 
+            # Refresh repository metadata to avoid mirror issues
+            echo "Refreshing repository metadata..."
+            dnf clean all
+            dnf makecache --refresh || dnf makecache
+
             # Clean install location
             rm -rf /usr/local/cloudberry-db
 
-            # Install RPM
+            # Install RPM with retry logic for mirror issues
+            # Use --releasever=9 to pin to stable Rocky Linux 9 repos (not bleeding-edge 9.6)
             echo "Starting installation..."
-            if ! time dnf install -y "${RPM_FILE}"; then
+            if ! time dnf install -y --setopt=retries=10 --releasever=9 "${RPM_FILE}"; then
               echo "::error::RPM installation failed"
               exit 1
             fi
@@ -1230,6 +1313,22 @@ jobs:
             rpm -qi apache-cloudberry-db-incubating
           } 2>&1 | tee -a build-logs/details/rpm-installation.log
 
+          # Clean up downloaded RPM artifacts to free disk space
+          echo "=== Disk space before RPM cleanup ==="
+          echo "Human readable:"
+          df -kh /
+          echo "Exact KB:"
+          df -k /
+          echo "RPM artifacts size:"
+          du -sh "${GITHUB_WORKSPACE}"/rpm_build_artifacts || true
+          echo "Cleaning up RPM artifacts to free disk space..."
+          rm -rf "${GITHUB_WORKSPACE}"/rpm_build_artifacts
+          echo "=== Disk space after RPM cleanup ==="
+          echo "Human readable:"
+          df -kh /
+          echo "Exact KB:"
+          df -k /
+
       - name: Extract source tarball
         if: success() && needs.check-skip.outputs.should_skip != 'true'
         env:
@@ -1255,6 +1354,22 @@ jobs:
             du -sh "${SRC_DIR}/../cloudberry"
           } 2>&1 | tee -a build-logs/details/source-extraction.log
 
+          # Clean up source tarball to free disk space
+          echo "=== Disk space before source tarball cleanup ==="
+          echo "Human readable:"
+          df -kh /
+          echo "Exact KB:"
+          df -k /
+          echo "Source tarball artifacts size:"
+          du -sh "${GITHUB_WORKSPACE}"/source_build_artifacts || true
+          echo "Cleaning up source tarball to free disk space..."
+          rm -rf "${GITHUB_WORKSPACE}"/source_build_artifacts
+          echo "=== Disk space after source tarball cleanup ==="
+          echo "Human readable:"
+          df -kh /
+          echo "Exact KB:"
+          df -k /
+
       - name: Create Apache Cloudberry demo cluster
         if: success() && needs.check-skip.outputs.should_skip != 'true'
         env:
@@ -1263,8 +1378,8 @@ jobs:
           set -eo pipefail
 
           {
-            chmod +x "${SRC_DIR}"/../cloudberry-devops-release/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}/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
+            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
               echo "::error::Demo cluster creation failed"
               exit 1
             fi
@@ -1339,7 +1454,7 @@ jobs:
                  MAKE_DIRECTORY='-C $dir' \
                  PGOPTIONS='${PG_OPTS}' \
                  SRC_DIR='${SRC_DIR}' \
-                 ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/test-cloudberry.sh" \
+                 ${SRC_DIR}/devops/build/automation/cloudberry/scripts/test-cloudberry.sh" \
                  2>&1 | tee "$config_log"; then
               echo "::warning::Test execution failed for configuration $((i+1)): make -C $dir $target"
               overall_status=1
@@ -1372,7 +1487,7 @@ jobs:
             ls -Rl "/tmp/cloudberry-cores"
             echo "-----------------------------------------"
 
-            "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
+            "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
             core_analysis_rc=$?
             case "$core_analysis_rc" in
               0) echo "No core dumps found for this configuration" ;;
@@ -1448,7 +1563,7 @@ jobs:
             # Parse this configuration's results
 
             MAKE_NAME="${{ matrix.test }}-config$i" \
-            "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/parse-test-results.sh "$config_log"
+            "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/parse-test-results.sh "$config_log"
             status_code=$?
 
             {
diff --git a/.github/workflows/build-dbg-cloudberry.yml b/.github/workflows/build-dbg-cloudberry.yml
index 998242efcd7..967fc259f0b 100644
--- a/.github/workflows/build-dbg-cloudberry.yml
+++ b/.github/workflows/build-dbg-cloudberry.yml
@@ -102,9 +102,9 @@ name: Apache Cloudberry Build Debug
 
 on:
   push:
-    branches: [main]
+    branches: [main, REL_2_STABLE]
   pull_request:
-    branches: [main]
+    branches: [main, REL_2_STABLE]
     types: [opened, synchronize, reopened, edited]
   workflow_dispatch:
     inputs:
@@ -222,9 +222,6 @@ jobs:
           # Define base test configurations
           ALL_TESTS='{
             "include": [
-              {"test":"ic-cbdb-parallel",
-               "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
-              }
             ]
           }'
 
@@ -346,24 +343,6 @@ jobs:
           fetch-depth: 1
           submodules: true
 
-      - name: Checkout CI Build/Test Scripts
-        if: needs.check-skip.outputs.should_skip != 'true'
-        uses: actions/checkout@v4
-        with:
-          repository: apache/cloudberry-devops-release
-          ref: main
-          path: cloudberry-devops-release
-          fetch-depth: 1
-
-      - name: Move cloudberry-devops-release directory
-        if: needs.check-skip.outputs.should_skip != 'true'
-        run: |
-          set -eo pipefail
-          if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
-            echo "::error::Container initialization failed"
-            exit 1
-          fi
-
       - name: Cloudberry Environment Initialization
         if: needs.check-skip.outputs.should_skip != 'true'
         env:
@@ -415,8 +394,8 @@ jobs:
           SRC_DIR: ${{ github.workspace }}
         run: |
           set -eo pipefail
-          chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh
-          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/configure-cloudberry.sh"; then
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh"; then
             echo "::error::Configure script failed"
             exit 1
           fi
@@ -428,8 +407,8 @@ jobs:
         run: |
           set -eo pipefail
 
-          chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh
-          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/build-cloudberry.sh"; then
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/build-cloudberry.sh"; then
             echo "::error::Build script failed"
             exit 1
           fi
@@ -511,7 +490,7 @@ jobs:
             # Create RPM
             echo "Creating RPM package..."
             rpmdev-setuptree
-            ln -s "${SRC_DIR}"/../cloudberry-devops-release/packaging/rpm/el/SPECS/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
+            ln -s "${SRC_DIR}"/devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec "${HOME}"/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
             cp "${SRC_DIR}"/LICENSE /usr/local/cloudberry-db
 
             DEBUG_RPMBUILD_OPT=""
@@ -521,7 +500,7 @@ jobs:
                DEBUG_IDENTIFIER=".debug"
             fi
 
-            "${SRC_DIR}"/../cloudberry-devops-release/scripts/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
+            "${SRC_DIR}"/devops/build/packaging/rpm/build-rpm.sh --version "${CBDB_VERSION}" --release "${BUILD_NUMBER}" "${DEBUG_RPMBUILD_OPT}"
 
             # Get OS version and move RPM
             os_version=$(grep -oP '(?<=^VERSION_ID=")[0-9]' /etc/os-release)
@@ -556,8 +535,8 @@ jobs:
           SRC_DIR: ${{ github.workspace }}
         run: |
           set -eo pipefail
-          chmod +x "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh
-          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/unittest-cloudberry.sh"; then
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh"; then
             echo "::error::Unittest script failed"
             exit 1
           fi
@@ -807,24 +786,6 @@ jobs:
         run: |
           echo "Timestamp from output: ${{ needs.build.outputs.build_timestamp }}"
 
-      - name: Checkout CI Build/Test Scripts
-        if: needs.check-skip.outputs.should_skip != 'true'
-        uses: actions/checkout@v4
-        with:
-          repository: apache/cloudberry-devops-release
-          ref: main
-          path: cloudberry-devops-release
-          fetch-depth: 1
-
-      - name: Move cloudberry-devops-release directory
-        if: needs.check-skip.outputs.should_skip != 'true'
-        run: |
-          set -eo pipefail
-          if ! mv "${GITHUB_WORKSPACE}"/cloudberry-devops-release "${GITHUB_WORKSPACE}"/..; then
-            echo "::error::Container initialization failed"
-            exit 1
-          fi
-
       - name: Cloudberry Environment Initialization
         env:
           LOGS_DIR: build-logs
@@ -1170,8 +1131,8 @@ jobs:
           set -eo pipefail
 
           {
-            chmod +x "${SRC_DIR}"/../cloudberry-devops-release/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}/../cloudberry-devops-release/build_automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"; then
+            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
               echo "::error::Demo cluster creation failed"
               exit 1
             fi
@@ -1242,7 +1203,7 @@ jobs:
                  MAKE_DIRECTORY='-C $dir' \
                  PGOPTIONS='${PG_OPTS}' \
                  SRC_DIR='${SRC_DIR}' \
-                 ${SRC_DIR}/../cloudberry-devops-release/build_automation/cloudberry/scripts/test-cloudberry.sh" \
+                 ${SRC_DIR}/devops/build/automation/cloudberry/scripts/test-cloudberry.sh" \
                  2>&1 | tee "$config_log"; then
               echo "::warning::Test execution failed for configuration $((i+1)): make -C $dir $target"
               overall_status=1
@@ -1275,7 +1236,7 @@ jobs:
             ls -Rl "/tmp/cloudberry-cores"
             echo "-----------------------------------------"
 
-            "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
+            "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
             core_analysis_rc=$?
             case "$core_analysis_rc" in
               0) echo "No core dumps found for this configuration" ;;
@@ -1351,7 +1312,7 @@ jobs:
             # Parse this configuration's results
 
             MAKE_NAME="${{ matrix.test }}-config$i" \
-            "${SRC_DIR}"/../cloudberry-devops-release/build_automation/cloudberry/scripts/parse-test-results.sh "$config_log"
+            "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/parse-test-results.sh "$config_log"
             status_code=$?
 
             {
diff --git a/.github/workflows/build-deb-cloudberry.yml b/.github/workflows/build-deb-cloudberry.yml
new file mode 100644
index 00000000000..be28fff9e77
--- /dev/null
+++ b/.github/workflows/build-deb-cloudberry.yml
@@ -0,0 +1,1841 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# GitHub Actions Workflow: Apache Cloudberry Build Pipeline
+# --------------------------------------------------------------------
+# Description:
+#
+#   This workflow builds, tests, and packages Apache Cloudberry on
+#   Ubuntu 22.04. It ensures artifact integrity and performs installation
+#   tests.
+#
+# Workflow Overview:
+# 1. **Build Job**:
+#    - Configures and builds Apache Cloudberry.
+#    - Supports debug build configuration via ENABLE_DEBUG flag.
+#    - Runs unit tests and verifies build artifacts.
+#    - Creates DEB packages (regular and debug), source tarball
+#    and additional files for dupload utility.
+#    - **Key Artifacts**: DEB package, source tarball, changes and dsc files, build logs.
+#
+# 2. **DEB Install Test Job**:
+#    - Verifies DEB integrity and installs Cloudberry.
+#    - Validates successful installation.
+#    - **Key Artifacts**: Installation logs, verification results.
+#
+# 3. **Report Job**:
+#    - Aggregates job results into a final report.
+#    - Sends failure notifications if any step fails.
+#
+# Execution Environment:
+# - **Runs On**: ubuntu-22.04 with ubuntu-22.04 containers.
+# - **Resource Requirements**:
+#   - Disk: Minimum 20GB free space.
+#   - Memory: Minimum 8GB RAM.
+#   - CPU: Recommended 4+ cores.
+#
+# Triggers:
+# - Push to `main` branch.
+# - Pull requests to `main` branch.
+# - Manual workflow dispatch.
+#
+# Container Images:
+# - **Build**: `apache/incubator-cloudberry:cbdb-build-ubuntu22.04-latest`
+# - **Test**: `apache/incubator-cloudberry:cbdb-test-ubuntu22.04-latest`
+#
+# Artifacts:
+# - DEB Package           (retention: ${{ env.LOG_RETENTION_DAYS }} days).
+# - Changes and DSC files (retention: ${{ env.LOG_RETENTION_DAYS }} days).
+# - Source Tarball        (retention: ${{ env.LOG_RETENTION_DAYS }} days).
+# - Logs and Test Results (retention: ${{ env.LOG_RETENTION_DAYS }} days).
+#
+# Notes:
+# - Supports concurrent job execution.
+# - Supports debug builds with preserved symbols.
+# --------------------------------------------------------------------
+
+name: Apache Cloudberry Debian Build
+
+on:
+  push:
+    branches: [main, REL_2_STABLE]
+  pull_request:
+    branches: [main, REL_2_STABLE]
+    types: [opened, synchronize, reopened, edited]
+  workflow_dispatch:  # Manual trigger
+    inputs:
+      test_selection:
+        description: 'Select tests to run (comma-separated). Examples: ic-good-opt-off,ic-contrib'
+        required: false
+        default: 'all'
+        type: string
+      reuse_artifacts_from_run_id:
+        description: 'Reuse build artifacts from a previous run ID (leave empty to build fresh)'
+        required: false
+        default: ''
+        type: string
+
+# Note: Step details, logs, and artifacts require users to be logged into GitHub
+# even for public repositories. This is a GitHub security feature and cannot
+# be overridden by permissions.
+
+permissions:
+  # READ permissions allow viewing repository contents
+  contents: read      # Required for checking out code and reading repository files
+
+  # READ permissions for packages (Container registry, etc)
+  packages: read      # Allows reading from GitHub package registry
+
+  # WRITE permissions for actions includes read access to:
+  # - Workflow runs
+  # - Artifacts (requires GitHub login)
+  # - Logs (requires GitHub login)
+  actions: write
+
+  # READ permissions for checks API:
+  # - Step details visibility (requires GitHub login)
+  # - Check run status and details
+  checks: read
+
+  # READ permissions for pull request metadata:
+  # - PR status
+  # - Associated checks
+  # - Review states
+  pull-requests: read
+
+env:
+  LOG_RETENTION_DAYS: 7
+  ENABLE_DEBUG: false
+
+jobs:
+
+  ## ======================================================================
+  ## Job: check-skip
+  ## ======================================================================
+
+  check-skip:
+    runs-on: ubuntu-22.04
+    outputs:
+      should_skip: ${{ steps.skip-check.outputs.should_skip }}
+    steps:
+      - id: skip-check
+        shell: bash
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          PR_TITLE: ${{ github.event.pull_request.title || '' }}
+          PR_BODY: ${{ github.event.pull_request.body || '' }}
+        run: |
+          # Default to not skipping
+          echo "should_skip=false" >> "$GITHUB_OUTPUT"
+
+          # Apply skip logic only for pull_request events
+          if [[ "$EVENT_NAME" == "pull_request" ]]; then
+            # Combine PR title and body for skip check
+            MESSAGE="${PR_TITLE}\n${PR_BODY}"
+
+            # Escape special characters using printf %s
+            ESCAPED_MESSAGE=$(printf "%s" "$MESSAGE")
+
+            echo "Checking PR title and body (escaped): $ESCAPED_MESSAGE"
+
+            # Check for skip patterns
+            if echo -e "$ESCAPED_MESSAGE" | grep -qEi '\[skip[ -]ci\]|\[ci[ -]skip\]|\[no[ -]ci\]'; then
+              echo "should_skip=true" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            echo "Skip logic is not applied for $EVENT_NAME events."
+          fi
+
+      - name: Report Skip Status
+        if: steps.skip-check.outputs.should_skip == 'true'
+        run: |
+          echo "CI Skip flag detected in PR - skipping all checks."
+          exit 0
+
+  ## ======================================================================
+  ## Job: prepare-test-matrix-deb
+  ## ======================================================================
+
+  prepare-test-matrix-deb:
+    runs-on: ubuntu-22.04
+    needs: [check-skip]
+    if: needs.check-skip.outputs.should_skip != 'true'
+    outputs:
+      test-matrix: ${{ steps.set-matrix.outputs.matrix }}
+
+    steps:
+      - id: set-matrix
+        run: |
+          echo "=== Matrix Preparation Diagnostics ==="
+          echo "Event type: ${{ github.event_name }}"
+          echo "Test selection input: '${{ github.event.inputs.test_selection }}'"
+
+          # Define defaults
+          DEFAULT_NUM_PRIMARY_MIRROR_PAIRS=3
+          DEFAULT_ENABLE_CGROUPS=false
+          DEFAULT_ENABLE_CORE_CHECK=true
+          DEFAULT_PG_SETTINGS_OPTIMIZER=""
+
+          # Define base test configurations
+          ALL_TESTS='{
+            "include": [
+              {"test":"ic-deb-good-opt-off",
+               "make_configs":["src/test/regress:installcheck-good"],
+               "pg_settings":{"optimizer":"off"}
+              },
+              {"test":"ic-deb-good-opt-on",
+               "make_configs":["src/test/regress:installcheck-good"],
+               "pg_settings":{"optimizer":"on"}
+              },
+              {"test":"pax-ic-deb-good-opt-off",
+               "make_configs":[
+                "contrib/pax_storage/:pax-test",
+                "contrib/pax_storage/:regress_test"
+              ],
+               "pg_settings":{
+                 "optimizer":"off",
+                 "default_table_access_method":"pax"
+                }
+              },
+              {"test":"pax-ic-deb-good-opt-on",
+               "make_configs":[
+                "contrib/pax_storage/:pax-test",
+                "contrib/pax_storage/:regress_test"
+              ],
+               "pg_settings":{
+                 "optimizer":"on",
+                 "default_table_access_method":"pax"
+                }
+              },
+              {"test":"ic-deb-contrib",
+               "make_configs":["contrib/auto_explain:installcheck",
+                               "contrib/amcheck:installcheck",
+                               "contrib/citext:installcheck",
+                               "contrib/btree_gin:installcheck",
+                               "contrib/btree_gist:installcheck",
+                               "contrib/dblink:installcheck",
+                               "contrib/dict_int:installcheck",
+                               "contrib/dict_xsyn:installcheck",
+                               "contrib/extprotocol:installcheck",
+                               "contrib/file_fdw:installcheck",
+                               "contrib/formatter_fixedwidth:installcheck",
+                               "contrib/hstore:installcheck",
+                               "contrib/indexscan:installcheck",
+                               "contrib/pg_trgm:installcheck",
+                               "contrib/indexscan:installcheck",
+                               "contrib/pgcrypto:installcheck",
+                               "contrib/pgstattuple:installcheck",
+                               "contrib/tablefunc:installcheck",
+                               "contrib/passwordcheck:installcheck",
+                               "contrib/pg_buffercache:installcheck",
+                               "contrib/sslinfo:installcheck"]
+              },
+              {"test":"ic-deb-gpcontrib",
+               "make_configs":["gpcontrib/orafce:installcheck",
+                               "gpcontrib/pxf_fdw:installcheck",
+                               "gpcontrib/zstd:installcheck",
+                               "gpcontrib/gp_sparse_vector:installcheck",
+                               "gpcontrib/gp_toolkit:installcheck"]
+              },
+              {"test":"ic-cbdb-parallel",
+               "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
+              }
+            ]
+          }'
+
+          # Function to apply defaults
+          apply_defaults() {
+            echo "$1" | jq --arg     npm "$DEFAULT_NUM_PRIMARY_MIRROR_PAIRS" \
+                           --argjson ec  "$DEFAULT_ENABLE_CGROUPS" \
+                           --argjson ecc "$DEFAULT_ENABLE_CORE_CHECK" \
+                           --arg     opt "$DEFAULT_PG_SETTINGS_OPTIMIZER" \
+              'def get_defaults:
+                {
+                  num_primary_mirror_pairs: ($npm|tonumber),
+                  enable_cgroups: $ec,
+                  enable_core_check: $ecc,
+                  pg_settings: {
+                    optimizer: $opt
+                  }
+                };
+               get_defaults * .'
+          }
+
+          # Extract all valid test names from ALL_TESTS
+          VALID_TESTS=$(echo "$ALL_TESTS" | jq -r '.include[].test')
+
+          # Parse input test selection
+          IFS=',' read -ra SELECTED_TESTS <<< "${{ github.event.inputs.test_selection }}"
+
+          # Default to all tests if selection is empty or 'all'
+          if [[ "${SELECTED_TESTS[*]}" == "all" || -z "${SELECTED_TESTS[*]}" ]]; then
+            mapfile -t SELECTED_TESTS <<< "$VALID_TESTS"
+          fi
+
+          # Validate and filter selected tests
+          INVALID_TESTS=()
+          FILTERED_TESTS=()
+          for TEST in "${SELECTED_TESTS[@]}"; do
+            TEST=$(echo "$TEST" | tr -d '[:space:]') # Trim whitespace
+            if echo "$VALID_TESTS" | grep -qw "$TEST"; then
+              FILTERED_TESTS+=("$TEST")
+            else
+              INVALID_TESTS+=("$TEST")
+            fi
+          done
+
+          # Handle invalid tests
+          if [[ ${#INVALID_TESTS[@]} -gt 0 ]]; then
+            echo "::error::Invalid test(s) selected: ${INVALID_TESTS[*]}"
+            echo "Valid tests are: $(echo "$VALID_TESTS" | tr '\n' ', ')"
+            exit 1
+          fi
+
+          # Build result JSON with defaults applied
+          RESULT='{"include":['
+          FIRST=true
+          for TEST in "${FILTERED_TESTS[@]}"; do
+            CONFIG=$(jq -c --arg test "$TEST" '.include[] | select(.test == $test)' <<< "$ALL_TESTS")
+            FILTERED_WITH_DEFAULTS=$(apply_defaults "$CONFIG")
+            if [[ "$FIRST" == true ]]; then
+              FIRST=false
+            else
+              RESULT="${RESULT},"
+            fi
+            RESULT="${RESULT}${FILTERED_WITH_DEFAULTS}"
+          done
+          RESULT="${RESULT}]}"
+
+          # Output the matrix for GitHub Actions
+          echo "Final matrix configuration:"
+          echo "$RESULT" | jq .
+
+          # Fix: Use block redirection
+          {
+            echo "matrix<<EOF"
+            echo "$RESULT"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+          echo "=== Matrix Preparation Complete ==="
+
+  ## ======================================================================
+  ## Job: build-deb
+  ## ======================================================================
+
+  build-deb:
+    name: Build Apache Cloudberry DEB
+    env:
+      JOB_TYPE: build
+    needs: [check-skip]
+    runs-on: ubuntu-22.04
+    timeout-minutes: 120
+    if: github.event.inputs.reuse_artifacts_from_run_id == ''
+    outputs:
+      build_timestamp: ${{ steps.set_timestamp.outputs.timestamp }}
+
+    container:
+      image: apache/incubator-cloudberry:cbdb-build-ubuntu22.04-latest
+      options: >-
+        --user root
+        -h cdw
+        -v /usr/share:/host_usr_share
+        -v /usr/local:/host_usr_local
+        -v /opt:/host_opt
+
+    steps:
+      - name: Free Disk Space
+        if: needs.check-skip.outputs.should_skip != 'true'
+        run: |
+          echo "=== Disk space before cleanup ==="
+          df -h /
+
+          # Remove pre-installed tools from host to free disk space
+          rm -rf /host_opt/hostedtoolcache || true   # GitHub Actions tool cache
+          rm -rf /host_usr_local/lib/android || true # Android SDK
+          rm -rf /host_usr_share/dotnet || true      # .NET SDK
+          rm -rf /host_opt/ghc || true               # Haskell GHC
+          rm -rf /host_usr_local/.ghcup || true      # Haskell GHCup
+          rm -rf /host_usr_share/swift || true       # Swift
+          rm -rf /host_usr_local/share/powershell || true  # PowerShell
+          rm -rf /host_usr_local/share/chromium || true    # Chromium
+          rm -rf /host_usr_share/miniconda || true   # Miniconda
+          rm -rf /host_opt/az || true                # Azure CLI
+          rm -rf /host_usr_share/sbt || true         # Scala Build Tool
+
+          echo "=== Disk space after cleanup ==="
+          df -h /
+
+      - name: Skip Check
+        if: needs.check-skip.outputs.should_skip == 'true'
+        run: |
+          echo "Build skipped via CI skip flag" >> "$GITHUB_STEP_SUMMARY"
+          exit 0
+
+      - name: Set build timestamp
+        id: set_timestamp  # Add an ID to reference this step
+        run: |
+          timestamp=$(date +'%Y%m%d_%H%M%S')
+          echo "timestamp=$timestamp" | tee -a "$GITHUB_OUTPUT"  # Use GITHUB_OUTPUT for job outputs
+          echo "BUILD_TIMESTAMP=$timestamp" | tee -a "$GITHUB_ENV" # Also set as environment variable
+
+      - name: Checkout Apache Cloudberry
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          submodules: true
+
+      - name: Cloudberry Environment Initialization
+        shell: bash
+        env:
+          LOGS_DIR: build-logs
+        run: |
+          set -eo pipefail
+          if ! su - gpadmin -c "/tmp/init_system.sh"; then
+            echo "::error::Container initialization failed"
+            exit 1
+          fi
+
+          mkdir -p "${LOGS_DIR}/details"
+          chown -R gpadmin:gpadmin .
+          chmod -R 755 .
+          chmod 777 "${LOGS_DIR}"
+
+          df -kh /
+          rm -rf /__t/*
+          df -kh /
+
+          df -h | tee -a "${LOGS_DIR}/details/disk-usage.log"
+          free -h | tee -a "${LOGS_DIR}/details/memory-usage.log"
+
+          {
+            echo "=== Environment Information ==="
+            uname -a
+            df -h
+            free -h
+            env
+          } | tee -a "${LOGS_DIR}/details/environment.log"
+
+          echo "SRC_DIR=${GITHUB_WORKSPACE}" | tee -a "$GITHUB_ENV"
+
+      - name: Generate Build Job Summary Start
+        run: |
+          {
+            echo "# Build Job Summary"
+            echo "## Environment"
+            echo "- Start Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+            echo "- ENABLE_DEBUG: ${{ env.ENABLE_DEBUG }}"
+            echo "- OS Version: $(lsb_release -sd)"
+            echo "- GCC Version: $(gcc --version | head -n1)"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Run Apache Cloudberry configure script
+        shell: bash
+        env:
+          SRC_DIR: ${{ github.workspace }}
+        run: |
+          set -eo pipefail
+
+          export BUILD_DESTINATION=${SRC_DIR}/debian/build
+
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ENABLE_DEBUG=${{ env.ENABLE_DEBUG }} BUILD_DESTINATION=${BUILD_DESTINATION} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh"; then
+            echo "::error::Configure script failed"
+            exit 1
+          fi
+
+      - name: Run Apache Cloudberry build script
+        shell: bash
+        env:
+          SRC_DIR: ${{ github.workspace }}
+        run: |
+          set -eo pipefail
+
+          export BUILD_DESTINATION=${SRC_DIR}/debian/build
+
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} BUILD_DESTINATION=${BUILD_DESTINATION} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/build-cloudberry.sh"; then
+            echo "::error::Build script failed"
+            exit 1
+          fi
+
+      - name: Verify build artifacts
+        shell: bash
+        run: |
+          set -eo pipefail
+
+          export BUILD_DESTINATION=${SRC_DIR}/debian/build
+
+          echo "Verifying build artifacts..."
+          {
+            echo "=== Build Artifacts Verification ==="
+            echo "Timestamp: $(date -u)"
+
+            if [ ! -d "${BUILD_DESTINATION}" ]; then
+              echo "::error::Build artifacts directory not found"
+              exit 1
+            fi
+
+            # Verify critical binaries
+            critical_binaries=(
+              "${BUILD_DESTINATION}/bin/postgres"
+              "${BUILD_DESTINATION}/bin/psql"
+            )
+
+            echo "Checking critical binaries..."
+            for binary in "${critical_binaries[@]}"; do
+              if [ ! -f "$binary" ]; then
+                echo "::error::Critical binary missing: $binary"
+                exit 1
+              fi
+              if [ ! -x "$binary" ]; then
+                echo "::error::Binary not executable: $binary"
+                exit 1
+              fi
+              echo "Binary verified: $binary"
+              ls -l "$binary"
+            done
+
+            # Test binary execution
+            echo "Testing binary execution..."
+            if ! ${BUILD_DESTINATION}/bin/postgres --version; then
+              echo "::error::postgres binary verification failed"
+              exit 1
+            fi
+            if ! ${BUILD_DESTINATION}/bin/psql --version; then
+              echo "::error::psql binary verification failed"
+              exit 1
+            fi
+
+            echo "All build artifacts verified successfully"
+          } 2>&1 | tee -a build-logs/details/build-verification.log
+
+      - name: Create Source tarball, create DEB and verify artifacts
+        shell: bash
+        env:
+          CBDB_VERSION: 99.0.0
+          BUILD_NUMBER: 1
+          SRC_DIR: ${{ github.workspace }}
+        run: |
+          set -eo pipefail
+
+          {
+            echo "=== Artifact Creation Log ==="
+            echo "Timestamp: $(date -u)"
+
+            cp -r "${SRC_DIR}"/devops/build/packaging/deb/ubuntu22.04/* debian/
+            chown -R "$(whoami)" debian
+            chmod -x debian/*install
+
+            # replace not supported symbols in version
+            CBDB_VERSION=$(echo "$CBDB_VERSION" | sed "s/\//./g")
+            CBDB_VERSION=$(echo "$CBDB_VERSION" | sed "s/_/-/g")
+          
+            echo "We will built ${CBDB_VERSION}"
+            export BUILD_DESTINATION=${SRC_DIR}/debian/build
+
+            if ! ${SRC_DIR}/devops/build/packaging/deb/build-deb.sh -v $CBDB_VERSION; then
+              echo "::error::Build script failed"
+              exit 1
+            fi
+
+            ARCH="amd64"
+            CBDB_PKG_VERSION=${CBDB_VERSION}-${BUILD_NUMBER}-$(git --git-dir=.git rev-list HEAD --count).$(git --git-dir=.git rev-parse --short HEAD)
+
+            echo "Produced artifacts"
+            ls -l ../
+
+            echo "Copy artifacts to subdirectory for sign/upload"
+            mkdir ${SRC_DIR}/deb
+            DEB_FILE="apache-cloudberry-db-incubating_${CBDB_PKG_VERSION}"_"${ARCH}".deb
+            DBG_DEB_FILE="apache-cloudberry-db-incubating-dbgsym_${CBDB_PKG_VERSION}"_"${ARCH}".ddeb
+            CHANGES_DEB_FILE="apache-cloudberry-db-incubating_${CBDB_PKG_VERSION}"_"${ARCH}".changes
+            BUILDINFO_DEB_FILE="apache-cloudberry-db-incubating_${CBDB_PKG_VERSION}"_"${ARCH}".buildinfo
+            DSC_DEB_FILE="apache-cloudberry-db-incubating_${CBDB_PKG_VERSION}".dsc
+            SOURCE_FILE="apache-cloudberry-db-incubating_${CBDB_PKG_VERSION}".tar.xz
+            cp ../"${DEB_FILE}" "${SRC_DIR}/deb"
+            cp ../"${DBG_DEB_FILE}" "${SRC_DIR}/deb"
+            cp ../"${CHANGES_DEB_FILE}" "${SRC_DIR}/deb"
+            cp ../"${BUILDINFO_DEB_FILE}" "${SRC_DIR}/deb"
+            cp ../"${DSC_DEB_FILE}" "${SRC_DIR}/deb"
+            cp ../"${SOURCE_FILE}" "${SRC_DIR}/deb"
+            mkdir "${SRC_DIR}/deb/debian"
+            cp debian/changelog "${SRC_DIR}/deb/debian"
+
+            # Get package information
+            echo "Package Information:"
+            dpkg --info "${SRC_DIR}/deb/${DEB_FILE}"
+            dpkg --contents "${SRC_DIR}/deb/${DEB_FILE}"
+
+            # Verify critical files in DEB
+            echo "Verifying critical files in DEB..."
+            for binary in "bin/postgres" "bin/psql"; do
+              if ! dpkg --contents "${SRC_DIR}/deb/${DEB_FILE}" | grep -c "${binary}$"; then
+                echo "::error::Critical binary '${binary}' not found in DEB"
+                exit 1
+              fi
+            done
+
+            # Record checksums
+            echo "Calculating checksums..."
+            sha256sum "${SRC_DIR}/deb/${DEB_FILE}" | tee -a build-logs/details/checksums.log
+
+            echo "Artifacts created and verified successfully"
+
+
+          } 2>&1 | tee -a build-logs/details/artifact-creation.log
+
+      - name: Run Apache Cloudberry unittest script
+        if: needs.check-skip.outputs.should_skip != 'true'
+        shell: bash
+        env:
+          SRC_DIR: ${{ github.workspace }}
+        run: |
+          set -eo pipefail
+          chmod +x "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ${SRC_DIR}/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh"; then
+            echo "::error::Unittest script failed"
+            exit 1
+          fi
+
+      - name: Generate Build Job Summary End
+        run: |
+          {
+            echo "## Build Results"
+            echo "- End Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Upload build logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-logs-${{ env.BUILD_TIMESTAMP }}
+          path: |
+            build-logs/
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+
+      - name: Upload Cloudberry DEB build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: apache-cloudberry-db-incubating-deb-build-artifacts
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+          if-no-files-found: error
+          path: |
+            deb/*.deb
+            deb/*.ddeb
+
+      - name: Upload Cloudberry deb source build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: apache-cloudberry-db-incubating-deb-source-build-artifacts
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+          if-no-files-found: error
+          path: |
+            deb/*.tar.xz
+            deb/*.changes
+            deb/*.dsc
+            deb/*.buildinfo
+            deb/debian/changelog
+
+  ## ======================================================================
+  ## Job: deb-install-test
+  ## ======================================================================
+
+  deb-install-test:
+    name: DEB Install Test Apache Cloudberry
+    needs: [check-skip, build-deb]
+    if: |
+      !cancelled() &&
+      (needs.build-deb.result == 'success' || needs.build-deb.result == 'skipped') &&
+      github.event.inputs.reuse_artifacts_from_run_id == ''
+    runs-on: ubuntu-22.04
+    timeout-minutes: 120
+
+    container:
+      image: apache/incubator-cloudberry:cbdb-test-ubuntu22.04-latest
+      options: >-
+        --user root
+        -h cdw
+        -v /usr/share:/host_usr_share
+        -v /usr/local:/host_usr_local
+        -v /opt:/host_opt
+
+    steps:
+      - name: Free Disk Space
+        if: needs.check-skip.outputs.should_skip != 'true'
+        run: |
+          echo "=== Disk space before cleanup ==="
+          df -h /
+
+          # Remove pre-installed tools from host to free disk space
+          rm -rf /host_opt/hostedtoolcache || true   # GitHub Actions tool cache
+          rm -rf /host_usr_local/lib/android || true # Android SDK
+          rm -rf /host_usr_share/dotnet || true      # .NET SDK
+          rm -rf /host_opt/ghc || true               # Haskell GHC
+          rm -rf /host_usr_local/.ghcup || true      # Haskell GHCup
+          rm -rf /host_usr_share/swift || true       # Swift
+          rm -rf /host_usr_local/share/powershell || true  # PowerShell
+          rm -rf /host_usr_local/share/chromium || true    # Chromium
+          rm -rf /host_usr_share/miniconda || true   # Miniconda
+          rm -rf /host_opt/az || true                # Azure CLI
+          rm -rf /host_usr_share/sbt || true         # Scala Build Tool
+
+          echo "=== Disk space after cleanup ==="
+          df -h /
+
+      - name: Skip Check
+        if: needs.check-skip.outputs.should_skip == 'true'
+        run: |
+          echo "DEB install test skipped via CI skip flag" >> "$GITHUB_STEP_SUMMARY"
+          exit 0
+
+      - name: Download Cloudberry DEB build artifacts
+        if: needs.check-skip.outputs.should_skip != 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: apache-cloudberry-db-incubating-deb-build-artifacts
+          path: ${{ github.workspace }}/deb_build_artifacts
+          run-id: ${{ github.event.inputs.reuse_artifacts_from_run_id || github.run_id }}
+          merge-multiple: false
+
+      - name: Cloudberry Environment Initialization
+        if: needs.check-skip.outputs.should_skip != 'true'
+        shell: bash
+        env:
+          LOGS_DIR: install-logs
+        run: |
+          set -eo pipefail
+          if ! su - gpadmin -c "/tmp/init_system.sh"; then
+            echo "::error::Container initialization failed"
+            exit 1
+          fi
+
+          mkdir -p "${LOGS_DIR}/details"
+          chown -R gpadmin:gpadmin .
+          chmod -R 755 .
+          chmod 777 "${LOGS_DIR}"
+
+          df -kh /
+          rm -rf /__t/*
+          df -kh /
+
+          df -h | tee -a "${LOGS_DIR}/details/disk-usage.log"
+          free -h | tee -a "${LOGS_DIR}/details/memory-usage.log"
+
+          {
+            echo "=== Environment Information ==="
+            uname -a
+            df -h
+            free -h
+            env
+          } | tee -a "${LOGS_DIR}/details/environment.log"
+
+          echo "SRC_DIR=${GITHUB_WORKSPACE}" | tee -a "$GITHUB_ENV"
+
+      - name: Verify DEB artifacts
+        id: verify-artifacts
+        shell: bash
+        run: |
+          set -eo pipefail
+
+          DEB_FILE=$(ls "${GITHUB_WORKSPACE}"/deb_build_artifacts/*.deb)
+          if [ ! -f "${DEB_FILE}" ]; then
+            echo "::error::DEB file not found"
+            exit 1
+          fi
+
+          echo "deb_file=${DEB_FILE}" >> "$GITHUB_OUTPUT"
+
+          echo "Verifying DEB artifacts..."
+          {
+            echo "=== DEB Verification Summary ==="
+            echo "Timestamp: $(date -u)"
+            echo "DEB File: ${DEB_FILE}"
+
+            # Get DEB metadata and verify contents
+            echo "Package Information:"
+            dpkg-deb -f "${DEB_FILE}"
+
+            # Get key DEB attributes for verification
+            DEB_VERSION=$(dpkg-deb -f "${DEB_FILE}" Version | cut -d'-' -f 1)
+            DEB_RELEASE=$(dpkg-deb -f "${DEB_FILE}" Version | cut -d'-' -f 3)
+            echo "version=${DEB_VERSION}" >> "$GITHUB_OUTPUT"
+            echo "release=${DEB_RELEASE}" >> "$GITHUB_OUTPUT"
+
+            # Verify expected binaries are in the DEB
+            echo "Verifying critical files in DEB..."
+            for binary in "bin/postgres" "bin/psql"; do
+              if ! dpkg-deb -c "${DEB_FILE}" | grep "${binary}" > /dev/null; then
+                echo "::error::Critical binary '${binary}' not found in DEB"
+                exit 1
+              fi
+            done
+
+            echo "DEB Details:"
+            echo "- Version: ${DEB_VERSION}"
+            echo "- Release: ${DEB_RELEASE}"
+
+            # Calculate and store checksum
+            echo "Checksum:"
+            sha256sum "${DEB_FILE}"
+
+          } 2>&1 | tee -a install-logs/details/deb-verification.log
+
+      - name: Install Cloudberry DEB
+        shell: bash
+        env:
+          DEB_FILE: ${{ steps.verify-artifacts.outputs.deb_file }}
+          DEB_VERSION: ${{ steps.verify-artifacts.outputs.version }}
+          DEB_RELEASE: ${{ steps.verify-artifacts.outputs.release }}
+        run: |
+          set -eo pipefail
+
+          if [ -z "${DEB_FILE}" ]; then
+            echo "::error::DEB_FILE environment variable is not set"
+            exit 1
+          fi
+
+          {
+            echo "=== DEB Installation Log ==="
+            echo "Timestamp: $(date -u)"
+            echo "DEB File: ${DEB_FILE}"
+            echo "Version: ${DEB_VERSION}"
+            echo "Release: ${DEB_RELEASE}"
+
+            # Clean install location
+            rm -rf /usr/local/cloudberry-db
+
+            # Install DEB
+            echo "Starting installation..."
+            apt-get update
+            if ! apt-get -y install "${DEB_FILE}"; then
+              echo "::error::DEB installation failed"
+              exit 1
+            fi
+
+            # Change ownership back to gpadmin - it is needed for future tests
+            chown -R gpadmin:gpadmin /usr/local/cloudberry-db
+
+            echo "Installation completed successfully"
+            dpkg-query -s apache-cloudberry-db-incubating
+            echo "Installed files:"
+            dpkg-query -L apache-cloudberry-db-incubating
+          } 2>&1 | tee -a install-logs/details/deb-installation.log
+
+      - name: Upload install logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: install-logs-${{ matrix.name }}-${{ needs.build-deb.outputs.build_timestamp }}
+          path: |
+            install-logs/
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+
+      - name: Generate Install Test Job Summary End
+        if: always()
+        shell: bash {0}
+        run: |
+          {
+            echo "# Installed Package Summary"
+            echo "\`\`\`"
+
+            dpkg-query -s apache-cloudberry-db-incubating
+            echo "\`\`\`"
+          } >> "$GITHUB_STEP_SUMMARY" || true
+
+  ## ======================================================================
+  ## Job: test-deb
+  ## ======================================================================
+
+  test-deb:
+    name: ${{ matrix.test }}
+    needs: [check-skip, build-deb, prepare-test-matrix-deb]
+    if: |
+      !cancelled() &&
+      (needs.build-deb.result == 'success' || needs.build-deb.result == 'skipped')
+    runs-on: ubuntu-22.04
+    timeout-minutes: 120
+    # actionlint-allow matrix[*].pg_settings
+    strategy:
+      fail-fast: false  # Continue with other tests if one fails
+      matrix: ${{ fromJson(needs.prepare-test-matrix-deb.outputs.test-matrix) }}
+
+    container:
+      image: apache/incubator-cloudberry:cbdb-build-ubuntu22.04-latest
+      options: >-
+        --privileged
+        --user root
+        --hostname cdw
+        --shm-size=2gb
+        --ulimit core=-1
+        --cgroupns=host
+        -v /sys/fs/cgroup:/sys/fs/cgroup:rw
+        -v /usr/share:/host_usr_share
+        -v /usr/local:/host_usr_local
+        -v /opt:/host_opt
+
+    steps:
+      - name: Free Disk Space
+        if: needs.check-skip.outputs.should_skip != 'true'
+        run: |
+          echo "=== Disk space before cleanup ==="
+          df -h /
+
+          # Remove pre-installed tools from host to free disk space
+          rm -rf /host_opt/hostedtoolcache || true   # GitHub Actions tool cache
+          rm -rf /host_usr_local/lib/android || true # Android SDK
+          rm -rf /host_usr_share/dotnet || true      # .NET SDK
+          rm -rf /host_opt/ghc || true               # Haskell GHC
+          rm -rf /host_usr_local/.ghcup || true      # Haskell GHCup
+          rm -rf /host_usr_share/swift || true       # Swift
+          rm -rf /host_usr_local/share/powershell || true  # PowerShell
+          rm -rf /host_usr_local/share/chromium || true    # Chromium
+          rm -rf /host_usr_share/miniconda || true   # Miniconda
+          rm -rf /host_opt/az || true                # Azure CLI
+          rm -rf /host_usr_share/sbt || true         # Scala Build Tool
+
+          echo "=== Disk space after cleanup ==="
+          df -h /
+
+      - name: Skip Check
+        if: needs.check-skip.outputs.should_skip == 'true'
+        run: |
+          echo "Test ${{ matrix.test }} skipped via CI skip flag" >> "$GITHUB_STEP_SUMMARY"
+          exit 0
+
+      - name: Use timestamp from previous job
+        if: needs.check-skip.outputs.should_skip != 'true'
+        run: |
+          echo "Timestamp from output: ${{ needs.build-deb.outputs.build_timestamp }}"
+
+      - name: Cloudberry Environment Initialization
+        shell: bash
+        env:
+          LOGS_DIR: build-logs
+        run: |
+          set -eo pipefail
+          if ! su - gpadmin -c "/tmp/init_system.sh"; then
+            echo "::error::Container initialization failed"
+            exit 1
+          fi
+
+          mkdir -p "${LOGS_DIR}/details"
+          chown -R gpadmin:gpadmin .
+          chmod -R 755 .
+          chmod 777 "${LOGS_DIR}"
+
+          df -kh /
+          rm -rf /__t/*
+          df -kh /
+
+          df -h | tee -a "${LOGS_DIR}/details/disk-usage.log"
+          free -h | tee -a "${LOGS_DIR}/details/memory-usage.log"
+
+          {
+            echo "=== Environment Information ==="
+            uname -a
+            df -h
+            free -h
+            env
+          } | tee -a "${LOGS_DIR}/details/environment.log"
+
+          echo "SRC_DIR=${GITHUB_WORKSPACE}" | tee -a "$GITHUB_ENV"
+
+      - name: Setup cgroups
+        if: needs.check-skip.outputs.should_skip != 'true'
+        shell: bash
+        run: |
+          set -uxo pipefail
+
+          if [ "${{ matrix.enable_cgroups }}" = "true" ]; then
+
+            echo "Current mounts:"
+            mount | grep cgroup
+
+            CGROUP_BASEDIR=/sys/fs/cgroup
+
+            # 1. Basic setup with permissions
+            sudo chmod -R 777 ${CGROUP_BASEDIR}/
+            sudo mkdir -p ${CGROUP_BASEDIR}/gpdb
+            sudo chmod -R 777 ${CGROUP_BASEDIR}/gpdb
+            sudo chown -R gpadmin:gpadmin ${CGROUP_BASEDIR}/gpdb
+
+            # 2. Enable controllers
+            sudo bash -c "echo '+cpu +cpuset +memory +io' > ${CGROUP_BASEDIR}/cgroup.subtree_control" || true
+            sudo bash -c "echo '+cpu +cpuset +memory +io' > ${CGROUP_BASEDIR}/gpdb/cgroup.subtree_control" || true
+
+            # 3. CPU settings
+            sudo bash -c "echo 'max 100000' > ${CGROUP_BASEDIR}/gpdb/cpu.max" || true
+            sudo bash -c "echo '100' > ${CGROUP_BASEDIR}/gpdb/cpu.weight" || true
+            sudo bash -c "echo '0' > ${CGROUP_BASEDIR}/gpdb/cpu.weight.nice" || true
+            sudo bash -c "echo 0-$(( $(nproc) - 1 )) > ${CGROUP_BASEDIR}/gpdb/cpuset.cpus" || true
+            sudo bash -c "echo '0' > ${CGROUP_BASEDIR}/gpdb/cpuset.mems" || true
+
+            # 4. Memory settings
+            sudo bash -c "echo 'max' > ${CGROUP_BASEDIR}/gpdb/memory.max" || true
+            sudo bash -c "echo '0' > ${CGROUP_BASEDIR}/gpdb/memory.min" || true
+            sudo bash -c "echo 'max' > ${CGROUP_BASEDIR}/gpdb/memory.high" || true
+
+            # 5. IO settings
+            echo "Available block devices:"
+            lsblk
+
+            sudo bash -c "
+              if [ -f \${CGROUP_BASEDIR}/gpdb/io.stat ]; then
+                echo 'Detected IO devices:'
+                cat \${CGROUP_BASEDIR}/gpdb/io.stat
+              fi
+              echo '' > \${CGROUP_BASEDIR}/gpdb/io.max || true
+            "
+
+            # 6. Fix permissions again after all writes
+            sudo chmod -R 777 ${CGROUP_BASEDIR}/gpdb
+            sudo chown -R gpadmin:gpadmin ${CGROUP_BASEDIR}/gpdb
+
+            # 7. Check required files
+            echo "Checking required files:"
+            required_files=(
+                "cgroup.procs"
+                "cpu.max"
+                "cpu.pressure"
+                "cpu.weight"
+                "cpu.weight.nice"
+                "cpu.stat"
+                "cpuset.cpus"
+                "cpuset.mems"
+                "cpuset.cpus.effective"
+                "cpuset.mems.effective"
+                "memory.current"
+                "io.max"
+            )
+
+            for file in "${required_files[@]}"; do
+                if [ -f "${CGROUP_BASEDIR}/gpdb/$file" ]; then
+                    echo "✓ $file exists"
+                    ls -l "${CGROUP_BASEDIR}/gpdb/$file"
+                else
+                    echo "✗ $file missing"
+                fi
+            done
+
+            # 8. Test subdirectory creation
+            echo "Testing subdirectory creation..."
+            sudo -u gpadmin bash -c "
+              TEST_DIR=\${CGROUP_BASEDIR}/gpdb/test6448
+              if mkdir -p \$TEST_DIR; then
+                echo 'Created test directory'
+                sudo chmod -R 777 \$TEST_DIR
+                if echo \$\$ > \$TEST_DIR/cgroup.procs; then
+                  echo 'Successfully wrote to cgroup.procs'
+                  cat \$TEST_DIR/cgroup.procs
+                  # Move processes back to parent before cleanup
+                  echo \$\$ > \${CGROUP_BASEDIR}/gpdb/cgroup.procs
+                else
+                  echo 'Failed to write to cgroup.procs'
+                  ls -la \$TEST_DIR/cgroup.procs
+                fi
+                ls -la \$TEST_DIR/
+                rmdir \$TEST_DIR || {
+                  echo 'Moving all processes to parent before cleanup'
+                  cat \$TEST_DIR/cgroup.procs | while read pid; do
+                    echo \$pid > \${CGROUP_BASEDIR}/gpdb/cgroup.procs 2>/dev/null || true
+                  done
+                  rmdir \$TEST_DIR
+                }
+              else
+                echo 'Failed to create test directory'
+              fi
+            "
+
+            # 9. Verify setup as gpadmin user
+            echo "Testing cgroup access as gpadmin..."
+            sudo -u gpadmin bash -c "
+              echo 'Checking mounts...'
+              mount | grep cgroup
+
+              echo 'Checking /proc/self/mounts...'
+              cat /proc/self/mounts | grep cgroup
+
+              if ! grep -q cgroup2 /proc/self/mounts; then
+                  echo 'ERROR: cgroup2 mount NOT visible to gpadmin'
+                  exit 1
+              fi
+              echo 'SUCCESS: cgroup2 mount visible to gpadmin'
+
+              if ! [ -w ${CGROUP_BASEDIR}/gpdb ]; then
+                  echo 'ERROR: gpadmin cannot write to gpdb cgroup'
+                  exit 1
+              fi
+              echo 'SUCCESS: gpadmin can write to gpdb cgroup'
+
+              echo 'Verifying key files content:'
+              echo 'cpu.max:'
+              cat ${CGROUP_BASEDIR}/gpdb/cpu.max || echo 'Failed to read cpu.max'
+              echo 'cpuset.cpus:'
+              cat ${CGROUP_BASEDIR}/gpdb/cpuset.cpus || echo 'Failed to read cpuset.cpus'
+              echo 'cgroup.subtree_control:'
+              cat ${CGROUP_BASEDIR}/gpdb/cgroup.subtree_control || echo 'Failed to read cgroup.subtree_control'
+            "
+
+            # 10. Show final state
+            echo "Final cgroup state:"
+            ls -la ${CGROUP_BASEDIR}/gpdb/
+            echo "Cgroup setup completed successfully"
+          else
+            echo "Cgroup setup skipped"
+          fi
+
+      - name: "Generate Test Job Summary Start: ${{ matrix.test }}"
+        if: always()
+        run: |
+          {
+            echo "# Test Job Summary: ${{ matrix.test }}"
+            echo "## Environment"
+            echo "- Start Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+
+            if [[ "${{ needs.check-skip.outputs.should_skip }}" == "true" ]]; then
+              echo "## Skip Status"
+              echo "✓ Test execution skipped via CI skip flag"
+            else
+              echo "- OS Version: $(cat /etc/redhat-release)"
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Download Cloudberry DEB build artifacts
+        if: needs.check-skip.outputs.should_skip != 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: apache-cloudberry-db-incubating-deb-build-artifacts
+          path: ${{ github.workspace }}/deb_build_artifacts
+          merge-multiple: false
+          run-id: ${{ github.event.inputs.reuse_artifacts_from_run_id || github.run_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Download Cloudberry Source build artifacts
+        if: needs.check-skip.outputs.should_skip != 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: apache-cloudberry-db-incubating-deb-source-build-artifacts
+          path: ${{ github.workspace }}/source_build_artifacts
+          merge-multiple: false
+          run-id: ${{ github.event.inputs.reuse_artifacts_from_run_id || github.run_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Verify DEB artifacts
+        if: needs.check-skip.outputs.should_skip != 'true'
+        id: verify-artifacts
+        shell: bash
+        run: |
+          set -eo pipefail
+
+          SRC_TARBALL_FILE=$(ls "${GITHUB_WORKSPACE}"/source_build_artifacts/apache-cloudberry-db-incubating_*.tar.xz)
+          if [ ! -f "${SRC_TARBALL_FILE}" ]; then
+            echo "::error::SRC TARBALL file not found"
+            exit 1
+          fi
+
+          echo "src_tarball_file=${SRC_TARBALL_FILE}" >> "$GITHUB_OUTPUT"
+
+          echo "Verifying SRC TARBALL artifacts..."
+          {
+            echo "=== SRC TARBALL Verification Summary ==="
+            echo "Timestamp: $(date -u)"
+            echo "SRC TARBALL File: ${SRC_TARBALL_FILE}"
+
+            # Calculate and store checksum
+            echo "Checksum:"
+            sha256sum "${SRC_TARBALL_FILE}"
+
+          } 2>&1 | tee -a build-logs/details/src-tarball-verification.log
+
+          DEB_FILE=$(ls "${GITHUB_WORKSPACE}"/deb_build_artifacts/*.deb)
+          if [ ! -f "${DEB_FILE}" ]; then
+            echo "::error::DEB file not found"
+            exit 1
+          fi
+
+          echo "deb_file=${DEB_FILE}" >> "$GITHUB_OUTPUT"
+
+          echo "Verifying DEB artifacts..."
+          {
+            echo "=== DEB Verification Summary ==="
+            echo "Timestamp: $(date -u)"
+            echo "DEB File: ${DEB_FILE}"
+
+            # Get DEB metadata and verify contents
+            echo "Package Information:"
+            dpkg-deb -f "${DEB_FILE}"
+
+            # Get key DEB attributes for verification
+            DEB_VERSION=$(dpkg-deb -f "${DEB_FILE}" Version | cut -d'-' -f 1)
+            DEB_RELEASE=$(dpkg-deb -f "${DEB_FILE}" Version | cut -d'-' -f 3)
+            echo "version=${DEB_VERSION}" >> "$GITHUB_OUTPUT"
+            echo "release=${DEB_RELEASE}" >> "$GITHUB_OUTPUT"
+
+            # Verify expected binaries are in the DEB
+            echo "Verifying critical files in DEB..."
+            for binary in "bin/postgres" "bin/psql"; do
+              if ! dpkg-deb -c "${DEB_FILE}" | grep "${binary}" > /dev/null; then
+                echo "::error::Critical binary '${binary}' not found in DEB"
+                exit 1
+              fi
+            done
+
+            echo "DEB Details:"
+            echo "- Version: ${DEB_VERSION}"
+            echo "- Release: ${DEB_RELEASE}"
+
+            # Calculate and store checksum
+            echo "Checksum:"
+            sha256sum "${DEB_FILE}"
+
+          } 2>&1 | tee -a build-logs/details/deb-verification.log
+
+      - name: Install Cloudberry DEB
+        if: success() && needs.check-skip.outputs.should_skip != 'true'
+        shell: bash
+        env:
+          DEB_FILE: ${{ steps.verify-artifacts.outputs.deb_file }}
+          DEB_VERSION: ${{ steps.verify-artifacts.outputs.version }}
+          DEB_RELEASE: ${{ steps.verify-artifacts.outputs.release }}
+        run: |
+          set -eo pipefail
+
+          if [ -z "${DEB_FILE}" ]; then
+            echo "::error::DEB_FILE environment variable is not set"
+            exit 1
+          fi
+
+          {
+            echo "=== DEB Installation Log ==="
+            echo "Timestamp: $(date -u)"
+            echo "DEB File: ${DEB_FILE}"
+            echo "Version: ${DEB_VERSION}"
+            echo "Release: ${DEB_RELEASE}"
+
+            # Clean install location
+            rm -rf /usr/local/cloudberry-db
+
+            # Install DEB
+            echo "Starting installation..."
+            apt-get update
+            if ! apt-get -y install "${DEB_FILE}"; then
+              echo "::error::DEB installation failed"
+              exit 1
+            fi
+
+            # Change ownership back to gpadmin - it is needed for future tests
+            chown -R gpadmin:gpadmin /usr/local/cloudberry-db
+
+            echo "Installation completed successfully"
+            dpkg-query -s apache-cloudberry-db-incubating
+            echo "Installed files:"
+            dpkg-query -L apache-cloudberry-db-incubating
+          } 2>&1 | tee -a build-logs/details/deb-installation.log
+
+      - name: Extract source tarball
+        if: success() && needs.check-skip.outputs.should_skip != 'true'
+        shell: bash
+        env:
+          SRC_TARBALL_FILE: ${{ steps.verify-artifacts.outputs.src_tarball_file }}
+          SRC_DIR: ${{ github.workspace }}
+        run: |
+          set -eo pipefail
+
+          {
+            echo "=== Source Extraction Log ==="
+            echo "Timestamp: $(date -u)"
+
+            echo "Starting extraction..."
+            file "${SRC_TARBALL_FILE}"
+            if ! time tar xf "${SRC_TARBALL_FILE}" -C "${SRC_DIR}"/.. ; then
+              echo "::error::Source extraction failed"
+              exit 1
+            fi
+
+            echo "Extraction completed successfully"
+            echo "Extracted contents:"
+            ls -la "${SRC_DIR}/../cloudberry"
+            echo "Directory size:"
+            du -sh "${SRC_DIR}/../cloudberry"
+          } 2>&1 | tee -a build-logs/details/source-extraction.log
+
+      - name: Prepare DEB Environment
+        if: success() && needs.check-skip.outputs.should_skip != 'true'
+        shell: bash
+        env:
+          SRC_DIR: ${{ github.workspace }}
+        run: |
+          set -eo pipefail
+
+          {
+
+            # change ownership to gpadmin
+            chown -R gpadmin "${SRC_DIR}/../cloudberry"
+            touch build-logs/sections.log
+            chown gpadmin build-logs/sections.log
+            chmod 777 build-logs
+
+            # configure link lib directory to temporary location, fix it
+            rm -rf "${SRC_DIR}"/debian/build/lib
+            ln -sf /usr/cloudberry-db/lib "${SRC_DIR}"/debian/build/lib
+
+            # check if regress.so exists in src directory - it is needed for contrib/dblink tests
+            if [ ! -f ${SRC_DIR}/src/test/regress/regress.so ]; then
+                ln -sf /usr/cloudberry-db/lib/postgresql/regress.so ${SRC_DIR}/src/test/regress/regress.so
+            fi
+
+            # FIXME
+            # temporary install gdb - delete after creating new docker build/test contaners
+            apt-get update
+            apt-get -y install gdb
+
+          } 2>&1 | tee -a build-logs/details/prepare-deb-env.log
+
+      - name: Create Apache Cloudberry demo cluster
+        if: success() && needs.check-skip.outputs.should_skip != 'true'
+        shell: bash
+        env:
+          SRC_DIR: ${{ github.workspace }}
+        run: |
+          set -eo pipefail
+
+          {
+            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
+              echo "::error::Demo cluster creation failed"
+              exit 1
+            fi
+
+          } 2>&1 | tee -a build-logs/details/create-cloudberry-demo-cluster.log
+
+      - name: "Run Tests: ${{ matrix.test }}"
+        if: success() && needs.check-skip.outputs.should_skip != 'true'
+        env:
+          SRC_DIR: ${{ github.workspace }}
+        shell: bash {0}
+        run: |
+          set -o pipefail
+
+          # Initialize test status
+          overall_status=0
+
+          # Create logs directory structure
+          mkdir -p build-logs/details
+
+          # Core file config
+          mkdir -p "/tmp/cloudberry-cores"
+          chmod 1777 "/tmp/cloudberry-cores"
+          sysctl -w kernel.core_pattern="/tmp/cloudberry-cores/core-%e-%s-%u-%g-%p-%t"
+          sysctl kernel.core_pattern
+          su - gpadmin -c "ulimit -c"
+
+          # WARNING: PostgreSQL Settings
+          # When adding new pg_settings key/value pairs:
+          # 1. Add a new check below for the setting
+          # 2. Follow the same pattern as optimizer
+          # 3. Update matrix entries to include the new setting
+
+
+          # Set PostgreSQL options if defined
+          PG_OPTS=""
+          if [[ "${{ matrix.pg_settings.optimizer != '' }}" == "true" ]]; then
+            PG_OPTS="$PG_OPTS -c optimizer=${{ matrix.pg_settings.optimizer }}"
+          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
+
+          # Read configs into array
+          IFS=' ' read -r -a configs <<< "${{ join(matrix.make_configs, ' ') }}"
+
+          echo "=== Starting test execution for ${{ matrix.test }} ==="
+          echo "Number of configurations to execute: ${#configs[@]}"
+          echo ""
+
+          # Execute each config separately
+          for ((i=0; i<${#configs[@]}; i++)); do
+            config="${configs[$i]}"
+            IFS=':' read -r dir target <<< "$config"
+
+            echo "=== Executing configuration $((i+1))/${#configs[@]} ==="
+            echo "Make command: make -C $dir $target"
+            echo "Environment:"
+            echo "- PGOPTIONS: ${PG_OPTS}"
+
+            # Create unique log file for this configuration
+            config_log="build-logs/details/make-${{ matrix.test }}-config$i.log"
+
+            # Clean up any existing core files
+            echo "Cleaning up existing core files..."
+            rm -f /tmp/cloudberry-cores/core-*
+
+            # Execute test script with proper environment setup
+            if ! time su - gpadmin -c "cd ${SRC_DIR} && \
+                 MAKE_NAME='${{ matrix.test }}-config$i' \
+                 MAKE_TARGET='$target' \
+                 MAKE_DIRECTORY='-C $dir' \
+                 PGOPTIONS='${PG_OPTS}' \
+                 SRC_DIR='${SRC_DIR}' \
+                 ${SRC_DIR}/devops/build/automation/cloudberry/scripts/test-cloudberry.sh" \
+                 2>&1 | tee "$config_log"; then
+              echo "::warning::Test execution failed for configuration $((i+1)): make -C $dir $target"
+              overall_status=1
+            fi
+
+            # Check for results directory
+            results_dir="${dir}/results"
+
+            if [[ -d "$results_dir" ]]; then
+              echo "-----------------------------------------" | tee -a build-logs/details/make-${{ matrix.test }}-config$i-results.log
+              echo "Found results directory: $results_dir" | tee -a build-logs/details/make-${{ matrix.test }}-config$i-results.log
+              echo "Contents of results directory:" | tee -a build-logs/details/make-${{ matrix.test }}-config$i-results.log
+
+              find "$results_dir" -type f -ls >> "$log_file" 2>&1 | tee -a build-logs/details/make-${{ matrix.test }}-config$i-results.log
+              echo "-----------------------------------------" | tee -a build-logs/details/make-${{ matrix.test }}-config$i-results.log
+            else
+              echo "-----------------------------------------"
+              echo "Results directory $results_dir does not exit"
+              echo "-----------------------------------------"
+            fi
+
+            # Analyze any core files generated by this test configuration
+            echo "Analyzing core files for configuration ${{ matrix.test }}-config$i..."
+            test_id="${{ matrix.test }}-config$i"
+
+            # List the cores directory
+            echo "-----------------------------------------"
+            echo "Cores directory: /tmp/cloudberry-cores"
+            echo "Contents of cores directory:"
+            ls -Rl "/tmp/cloudberry-cores"
+            echo "-----------------------------------------"
+
+            "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh "$test_id"
+            core_analysis_rc=$?
+            case "$core_analysis_rc" in
+              0) echo "No core dumps found for this configuration" ;;
+              1) echo "Core dumps were found and analyzed successfully" ;;
+              2) echo "::warning::Issues encountered during core dump analysis" ;;
+              *) echo "::error::Unexpected return code from core dump analysis: $core_analysis_rc" ;;
+            esac
+
+            echo "Log file: $config_log"
+            echo "=== End configuration $((i+1)) execution ==="
+            echo ""
+          done
+
+          echo "=== Test execution completed ==="
+          echo "Log files:"
+          ls -l build-logs/details/
+
+          # Store number of configurations for parsing step
+          echo "NUM_CONFIGS=${#configs[@]}" >> "$GITHUB_ENV"
+
+          # Report overall status
+          if [ $overall_status -eq 0 ]; then
+            echo "All test executions completed successfully"
+          else
+            echo "::warning::Some test executions failed, check individual logs for details"
+          fi
+
+          exit $overall_status
+
+      - name: "Parse Test Results: ${{ matrix.test }}"
+        id: test-results
+        if: always() && needs.check-skip.outputs.should_skip != 'true'
+        env:
+          SRC_DIR: ${{ github.workspace }}
+        shell: bash {0}
+        run: |
+          set -o pipefail
+
+          overall_status=0
+
+          # Get configs array to create context for results
+          IFS=' ' read -r -a configs <<< "${{ join(matrix.make_configs, ' ') }}"
+
+          echo "=== Starting results parsing for ${{ matrix.test }} ==="
+          echo "Number of configurations to parse: ${#configs[@]}"
+          echo ""
+
+          # Parse each configuration's results independently
+          for ((i=0; i<NUM_CONFIGS; i++)); do
+            config="${configs[$i]}"
+            IFS=':' read -r dir target <<< "$config"
+
+            config_log="build-logs/details/make-${{ matrix.test }}-config$i.log"
+
+            echo "=== Parsing results for configuration $((i+1))/${NUM_CONFIGS} ==="
+            echo "Make command: make -C $dir $target"
+            echo "Log file: $config_log"
+
+            if [ ! -f "$config_log" ]; then
+              echo "::error::Log file not found: $config_log"
+              {
+                echo "MAKE_COMMAND=make -C $dir $target"
+                echo "STATUS=missing_log"
+                echo "TOTAL_TESTS=0"
+                echo "FAILED_TESTS=0"
+                echo "PASSED_TESTS=0"
+                echo "IGNORED_TESTS=0"
+              } > "test_results.$i.txt"
+              overall_status=1
+              continue
+            fi
+
+            # Parse this configuration's results
+
+            MAKE_NAME="${{ matrix.test }}-config$i" \
+            "${SRC_DIR}"/devops/build/automation/cloudberry/scripts/parse-test-results.sh "$config_log"
+            status_code=$?
+
+            {
+                echo "SUITE_NAME=${{ matrix.test }}"
+                echo "DIR=${dir}"
+                echo "TARGET=${target}"
+            } >> test_results.txt
+
+            # Process return code
+            case $status_code in
+              0)  # All tests passed
+                  echo "All tests passed successfully"
+                  if [ -f test_results.txt ]; then
+                    (echo "MAKE_COMMAND=\"make -C $dir $target\""; cat test_results.txt) | tee "test_results.${{ matrix.test }}.$i.txt"
+                    rm test_results.txt
+                  fi
+                  ;;
+              1)  # Tests failed but parsed successfully
+                  echo "Test failures detected but properly parsed"
+                  if [ -f test_results.txt ]; then
+                    (echo "MAKE_COMMAND=\"make -C $dir $target\""; cat test_results.txt) | tee "test_results.${{ matrix.test }}.$i.txt"
+                    rm test_results.txt
+                  fi
+                  overall_status=1
+                  ;;
+              2)  # Parse error or missing file
+                  echo "::warning::Could not parse test results properly for configuration $((i+1))"
+                  {
+                    echo "MAKE_COMMAND=\"make -C $dir $target\""
+                    echo "STATUS=parse_error"
+                    echo "TOTAL_TESTS=0"
+                    echo "FAILED_TESTS=0"
+                    echo "PASSED_TESTS=0"
+                    echo "IGNORED_TESTS=0"
+                  } | tee "test_results.${{ matrix.test }}.$i.txt"
+                  overall_status=1
+                  ;;
+              *)  # Unexpected error
+                  echo "::warning::Unexpected error during test results parsing for configuration $((i+1))"
+                  {
+                    echo "MAKE_COMMAND=\"make -C $dir $target\""
+                    echo "STATUS=unknown_error"
+                    echo "TOTAL_TESTS=0"
+                    echo "FAILED_TESTS=0"
+                    echo "PASSED_TESTS=0"
+                    echo "IGNORED_TESTS=0"
+                  } | tee "test_results.${{ matrix.test }}.$i.txt"
+                  overall_status=1
+                  ;;
+            esac
+
+            echo "Results stored in test_results.$i.txt"
+            echo "=== End parsing for configuration $((i+1)) ==="
+            echo ""
+          done
+
+          # Report status of results files
+          echo "=== Results file status ==="
+          echo "Generated results files:"
+          for ((i=0; i<NUM_CONFIGS; i++)); do
+            if [ -f "test_results.${{ matrix.test }}.$i.txt" ]; then
+              echo "- test_results.${{ matrix.test }}.$i.txt exists"
+              echo ""
+            else
+              echo "::error::Missing results file: test_results.${{ matrix.test }}.$i.txt"
+              overall_status=1
+            fi
+          done
+
+          exit $overall_status
+
+      - name: Check and Display Regression Diffs
+        if: always()
+        run: |
+          # Search for regression.diffs recursively
+          found_file=$(find . -type f -name "regression.diffs" | head -n 1)
+          if [[ -n "$found_file" ]]; then
+            echo "Found regression.diffs at: $found_file"
+            cat "$found_file"
+          else
+            echo "No regression.diffs file found in the hierarchy."
+          fi
+
+      - name: "Check for Core Dumps Across All Configurations: ${{ matrix.test }}"
+        if: always() && needs.check-skip.outputs.should_skip != 'true'
+        shell: bash {0}
+        run: |
+          # Look for any core analysis files from this test matrix entry
+          core_files=$(find "${SRC_DIR}/build-logs" -name "core_analysis_*.log")
+
+          if [ -n "$core_files" ]; then
+            echo "::error::Core dumps were found during test execution:"
+            echo "$core_files" | while read -r file; do
+              echo "Core analysis file: $file"
+              echo "=== Content ==="
+              cat "$file"
+              echo "=============="
+            done
+            if [ "${{ matrix.enable_core_check }}" = "true" ]; then
+              exit 1
+            else
+              echo "::warning::Special case - core checks will generate a warning"
+            fi
+          else
+            echo "No core dumps were found during test execution"
+          fi
+
+      - name: "Generate Test Job Summary End: ${{ matrix.test }}"
+        if: always()
+        shell: bash {0}
+        run: |
+          {
+            if [[ "${{ needs.check-skip.outputs.should_skip }}" == "true" ]]; then
+              echo "## Test Results - SKIPPED"
+              echo "- End Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+              exit 0
+            fi
+
+            echo "## Test Results"
+            echo "- End Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+
+            # Check if job was cancelled
+            if [[ "${{ job.status }}" == "cancelled" ]]; then
+              echo "### Test Status"
+              echo "🚫 Test execution was cancelled"
+              echo ""
+              echo "### Execution Summary"
+              echo "Test run was interrupted and did not complete. No test results are available."
+              exit 0
+            fi
+
+            # Check for core analysis files
+            core_files=$(find "${SRC_DIR}/build-logs" -name "core_analysis_*.log")
+
+            if [ -n "$core_files" ]; then
+              if [ "${{ matrix.enable_core_check }}" = "true" ]; then
+                echo "❌ Core dumps were detected"
+              else
+                echo "⚠️  Core dumps were detected - enable_core_check: false"
+              fi
+              echo ""
+              echo "#### Core Analysis Files"
+              echo "\`\`\`"
+              echo "$core_files"
+              echo "\`\`\`"
+
+              echo ""
+              echo "#### Analysis Details"
+              echo "\`\`\`"
+              while read -r file; do
+                echo "=== $file ==="
+                cat "$file"
+                echo ""
+              done <<< "$core_files"
+              echo "\`\`\`"
+            else
+              echo "✅ No core dumps detected"
+            fi
+
+            # Process results for each configuration
+            IFS=' ' read -r -a configs <<< "${{ join(matrix.make_configs, ' ') }}"
+
+            for ((i=0; i<NUM_CONFIGS; i++)); do
+              config="${configs[$i]}"
+              IFS=':' read -r dir target <<< "$config"
+
+              echo "### Configuration $((i+1)): \`make -C $dir $target\`"
+
+              if [[ ! -f "test_results.${{ matrix.test }}.$i.txt" ]]; then
+                echo "⚠️ No results file found for this configuration"
+                continue
+              fi
+
+              # Source configuration results
+              # shellcheck source=/dev/null
+              . "test_results.${{ matrix.test }}.$i.txt"
+
+              # Rest of the code remains the same...
+              # Display status with emoji
+              echo "#### Status"
+              case "${STATUS:-unknown}" in
+                passed)
+                  echo "✅ All tests passed"
+                  ;;
+                failed)
+                  echo "❌ Some tests failed"
+                  ;;
+                parse_error)
+                  echo "⚠️ Could not parse test results"
+                  ;;
+                unknown_error)
+                  echo "⚠️ Unexpected error during test execution/parsing"
+                  ;;
+                missing_log)
+                  echo "⚠️ Test log file missing"
+                  ;;
+                *)
+                  echo "⚠️ Unknown status: ${status:-unknown}"
+                  ;;
+              esac
+
+              echo ""
+              echo "#### Test Counts"
+              echo "| Metric | Count |"
+              echo "|--------|-------|"
+              echo "| Total Tests | ${TOTAL_TESTS:-0} |"
+              echo "| Passed Tests | ${PASSED_TESTS:-0} |"
+              echo "| Failed Tests | ${FAILED_TESTS:-0} |"
+              echo "| Ignored Tests | ${IGNORED_TESTS:-0} |"
+
+              # Add failed tests if any
+              if [[ -n "${FAILED_TEST_NAMES:-}" && "${FAILED_TESTS:-0}" != "0" ]]; then
+                echo ""
+                echo "#### Failed Tests"
+                echo "${FAILED_TEST_NAMES}" | tr ',' '\n' | while read -r test; do
+                  if [[ -n "$test" ]]; then
+                    echo "* \`${test}\`"
+                  fi
+                done
+              fi
+
+              # Add ignored tests if any
+              if [[ -n "${IGNORED_TEST_NAMES:-}" && "${IGNORED_TESTS:-0}" != "0" ]]; then
+                echo ""
+                echo "#### Ignored Tests"
+                echo "${IGNORED_TEST_NAMES}" | tr ',' '\n' | while read -r test; do
+                  if [[ -n "$test" ]]; then
+                    echo "* \`${test}\`"
+                  fi
+                done
+              fi
+
+              echo ""
+              echo "---"
+            done
+
+          } >> "$GITHUB_STEP_SUMMARY" || true
+
+      - name: Upload test logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-logs-${{ matrix.test }}-${{ needs.build-deb.outputs.build_timestamp }}
+          path: |
+            build-logs/
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+
+      - name: Upload Test Metadata
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-metadata-${{ matrix.test }}
+          path: |
+            test_results*.txt
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+
+      - name: Upload test results files
+        uses: actions/upload-artifact@v4
+        with:
+          name: results-${{ matrix.test }}-${{ needs.build-deb.outputs.build_timestamp }}
+          path: |
+            **/regression.out
+            **/regression.diffs
+            **/results/
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+
+      - name: Upload test regression logs
+        if: failure() || cancelled()
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-logs-${{ matrix.test }}-${{ needs.build-deb.outputs.build_timestamp }}
+          path: |
+            **/regression.out
+            **/regression.diffs
+            **/results/
+            gpAux/gpdemo/datadirs/standby/log/
+            gpAux/gpdemo/datadirs/qddir/demoDataDir-1/log/
+            gpAux/gpdemo/datadirs/dbfast1/demoDataDir0/log/
+            gpAux/gpdemo/datadirs/dbfast2/demoDataDir1/log/
+            gpAux/gpdemo/datadirs/dbfast3/demoDataDir2/log/
+            gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0/log/
+            gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1/log/
+            gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2/log/
+          retention-days: ${{ env.LOG_RETENTION_DAYS }}
+
+  ## ======================================================================
+  ## Job: report-deb
+  ## ======================================================================
+
+  report-deb:
+    name: Generate Apache Cloudberry Build Report
+    needs: [check-skip, build-deb, prepare-test-matrix-deb, deb-install-test, test-deb]
+    if: always()
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Generate Final Report
+        run: |
+          {
+            echo "# Apache Cloudberry Build Pipeline Report"
+
+            if [[ "${{ needs.check-skip.outputs.should_skip }}" == "true" ]]; then
+              echo "## CI Skip Status"
+              echo "✅ CI checks skipped via skip flag"
+              echo "- Completion Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+            else
+              echo "## Job Status"
+              echo "- Build Job: ${{ needs.build-deb.result }}"
+              echo "- Test Job: ${{ needs.test-deb.result }}"
+              echo "- Completion Time: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+
+              if [[ "${{ needs.build-deb.result }}" == "success" && "${{ needs.test-deb.result }}" == "success" ]]; then
+                echo "✅ Pipeline completed successfully"
+              else
+                echo "⚠️ Pipeline completed with failures"
+
+                if [[ "${{ needs.build-deb.result }}" != "success" ]]; then
+                  echo "### Build Job Failure"
+                  echo "Check build logs for details"
+                fi
+
+                if [[ "${{ needs.test-deb.result }}" != "success" ]]; then
+                  echo "### Test Job Failure"
+                  echo "Check test logs and regression files for details"
+                fi
+              fi
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Notify on failure
+        if: |
+          needs.check-skip.outputs.should_skip != 'true' &&
+          (needs.build-deb.result != 'success' || needs.test-deb.result != 'success')
+        run: |
+          echo "::error::Build/Test pipeline failed! Check job summaries and logs for details"
+          echo "Timestamp: $(date -u +'%Y-%m-%d %H:%M:%S UTC')"
+          echo "Build Result: ${{ needs.build-deb.result }}"
+          echo "Test Result: ${{ needs.test-deb.result }}"
diff --git a/.github/workflows/docker-cbdb-build-containers.yml b/.github/workflows/docker-cbdb-build-containers.yml
new file mode 100644
index 00000000000..1b13e9ff3f4
--- /dev/null
+++ b/.github/workflows/docker-cbdb-build-containers.yml
@@ -0,0 +1,226 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# GitHub Actions Workflow for Apache Cloudberry Build Environments
+# --------------------------------------------------------------------
+# Purpose:
+# Builds, tests, and publishes multi-architecture Docker images for
+# Apache Cloudberry DB build environments. Images are built for both
+# Rocky Linux 8 and 9, tested with TestInfra, and pushed to DockerHub.
+#
+# Multi-Architecture Support:
+# - Builds images for both AMD64 and ARM64 architectures
+# - Creates and pushes multi-arch manifests
+# - Uses QEMU for cross-platform builds
+# - Automated testing for all architectures
+#
+# Image Tags:
+# - Latest: cbdb-build-{platform}-latest
+# - Versioned: cbdb-build-{platform}-{YYYYMMDD}-{git-short-sha}
+#
+# Features:
+# - Matrix build for multiple platforms
+# - Parallel architecture builds
+# - Build caching strategy
+# - Path filtering to only build changed platforms
+# - Comprehensive build summary and metadata
+# - Container testing with TestInfra
+# - Multi-arch manifest creation
+#
+# Requirements:
+# - DockerHub credentials in GitHub secrets
+#   - DOCKERHUB_USER
+#   - DOCKERHUB_TOKEN
+# --------------------------------------------------------------------
+
+name: docker-cbdb-build-containers
+
+# Trigger workflow on pushes to main when relevant paths change
+# Also allows manual triggering via GitHub UI
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'devops/deploy/docker/build/rocky8/**'
+      - 'devops/deploy/docker/build/rocky9/**'
+      - 'devops/deploy/docker/build/ubuntu22.04/**'
+  pull_request:
+    paths:
+      - 'devops/deploy/docker/build/**'
+  workflow_dispatch:  # Manual trigger
+
+# Prevent multiple workflow runs from interfering with each other
+concurrency:
+  group: docker-build-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-and-push:
+    # Set timeout to prevent hanging builds
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+
+    # Matrix strategy to build for both Rocky Linux 8 and 9, Ubuntu 22.04
+    strategy:
+      matrix:
+        platform: ['rocky8', 'rocky9', 'ubuntu22.04']
+
+    steps:
+      # Checkout repository code with full history
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Generate version information for image tags
+      # - BUILD_DATE: Current date in YYYYMMDD format
+      # - SHA_SHORT: Short form of the git commit SHA
+      - name: Set version
+        id: version
+        run: |
+          echo "BUILD_DATE=$(date -u +'%Y%m%d')" >> $GITHUB_OUTPUT
+          echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      # Determine if the current platform's files have changed
+      # This prevents unnecessary builds if only one platform was modified
+      - name: Determine if platform changed
+        id: platform-filter
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+        with:
+          filters: |
+            rocky8:
+              - 'devops/deploy/docker/build/rocky8/**'
+            rocky9:
+              - 'devops/deploy/docker/build/rocky9/**'
+            ubuntu22.04:
+              - 'devops/deploy/docker/build/ubuntu22.04/**'
+
+      # Set up QEMU for multi-architecture support
+      # This allows building ARM64 images on AMD64 infrastructure and vice versa
+      - name: Set up QEMU
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
+        uses: docker/setup-qemu-action@v3
+
+      # Login to DockerHub for pushing images
+      # Requires DOCKERHUB_USER and DOCKERHUB_TOKEN secrets to be set
+      - name: Login to Docker Hub
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Setup Docker Buildx for efficient builds
+      # Enable debug mode for better troubleshooting
+      - name: Set up Docker Buildx
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
+        uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
+
+      # Build and test images for each architecture
+      # This ensures both AMD64 and ARM64 variants work correctly
+      - name: Build and test images
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
+        run: |
+          # Build for each platform
+          for arch in amd64 arm64; do
+            # Build the image for testing
+            docker buildx build \
+              --platform linux/$arch \
+              --load \
+              -t apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-$arch-test \
+              ./devops/deploy/docker/build/${{ matrix.platform }}
+
+            # Run tests in a container
+            docker run -d \
+              -h cdw \
+              --name cbdb-build-${{ matrix.platform }}-$arch-test \
+              apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-$arch-test \
+              bash -c "sleep 30"
+
+            # Execute TestInfra tests
+            docker exec cbdb-build-${{ matrix.platform }}-$arch-test pytest \
+              --cache-clear \
+              --disable-warnings \
+              -p no:warnings \
+              /tests/testinfra/test_cloudberry_db_env.py
+
+            # Cleanup test container
+            docker rm -f cbdb-build-${{ matrix.platform }}-$arch-test
+          done
+
+      # Build and push multi-architecture images
+      # This creates a manifest list that supports both architectures
+      - name: Build and Push Multi-arch Docker images
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        uses: docker/build-push-action@v6
+        with:
+          context: ./devops/deploy/docker/build/${{ matrix.platform }}
+          push: true
+          platforms: linux/amd64,linux/arm64
+          # Tag with both latest and version-specific tags
+          tags: |
+            apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-latest
+            apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-${{ steps.version.outputs.BUILD_DATE }}-${{ steps.version.outputs.SHA_SHORT }}
+          # Add standard Open Container Initiative (OCI) labels
+          labels: |
+            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.created=${{ steps.version.outputs.BUILD_DATE }}
+            org.opencontainers.image.version=${{ steps.version.outputs.BUILD_DATE }}-${{ steps.version.outputs.SHA_SHORT }}
+
+      # Generate a detailed build summary in GitHub Actions UI
+      # This provides quick access to build information and image usage instructions
+      - name: Build Summary
+        if: always()
+        run: |
+          # Add PR context notification
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            echo "#### ℹ️  Pull Request Build" >> $GITHUB_STEP_SUMMARY
+            echo "This is a validation build. Images are built and tested locally but **not pushed to Docker Hub** for security." >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "- ✅ Dockerfile syntax validated" >> $GITHUB_STEP_SUMMARY
+            echo "- ✅ Multi-architecture builds tested" >> $GITHUB_STEP_SUMMARY
+            echo "- ✅ TestInfra tests executed" >> $GITHUB_STEP_SUMMARY
+            echo "- ⏭️  Docker Hub push skipped (requires main branch)" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          echo "### Build Summary for ${{ matrix.platform }} 🚀" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "#### 🔍 Build Information" >> $GITHUB_STEP_SUMMARY
+          echo "- **Build Status**: ${{ job.status }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Platform**: ${{ matrix.platform }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Architectures**: amd64, arm64" >> $GITHUB_STEP_SUMMARY
+          echo "- **Commit SHA**: [\`${{ github.sha }}\`](${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }})" >> $GITHUB_STEP_SUMMARY
+          echo "- **Build Date**: ${{ steps.version.outputs.BUILD_DATE }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "#### 🐳 Docker Images" >> $GITHUB_STEP_SUMMARY
+          echo "- Latest tag: \`apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-latest\`" >> $GITHUB_STEP_SUMMARY
+          echo "- Version tag: \`apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-${{ steps.version.outputs.BUILD_DATE }}-${{ steps.version.outputs.SHA_SHORT }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "#### 📋 Quick Reference" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY
+          echo "# Pull the image (automatically selects correct architecture)" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-latest" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "# Pull specific architecture if needed" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull --platform linux/amd64 apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-latest" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull --platform linux/arm64 apache/incubator-cloudberry:cbdb-build-${{ matrix.platform }}-latest" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/docker-cbdb-test-containers.yml b/.github/workflows/docker-cbdb-test-containers.yml
new file mode 100644
index 00000000000..fcee6fa41b6
--- /dev/null
+++ b/.github/workflows/docker-cbdb-test-containers.yml
@@ -0,0 +1,199 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Purpose: Builds, tests and pushes multi-architecture Docker images for
+# Apache Cloudberry DB test environments. Images are built for both AMD64
+# and ARM64 architectures on Rocky Linux 8 and 9.
+#
+# Images are tagged with:
+# - cbdb-test-rocky8-latest
+# - cbdb-test-rocky8-{YYYYMMDD}-{git-short-sha}
+# - cbdb-test-rocky9-latest
+# - cbdb-test-rocky9-{YYYYMMDD}-{git-short-sha}
+#
+# Features:
+# - Multi-architecture support (AMD64 and ARM64)
+# - Matrix build for multiple platforms
+# - QEMU emulation for cross-platform builds
+# - Buildx for efficient multi-arch builds
+# - Path filtering to only build changed platforms
+# - Comprehensive build summary and metadata
+#
+# --------------------------------------------------------------------
+
+name: docker-cbdb-test-containers
+
+# Trigger on pushes to docker-images branch when relevant paths change
+# Also allows manual triggering via GitHub UI
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'devops/deploy/docker/test/rocky8/**'
+      - 'devops/deploy/docker/test/rocky9/**'
+      - 'devops/deploy/docker/test/ubuntu22.04/**'
+  pull_request:
+    paths:
+      - 'devops/deploy/docker/test/**'
+  workflow_dispatch:  # Manual trigger
+
+# Prevent multiple workflow runs from interfering with each other
+concurrency:
+  group: docker-test-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-and-push:
+    timeout-minutes: 60  # Prevent hanging builds
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # Build for both Rocky Linux 8 and 9, Ubuntu 22.04
+        platform: ['rocky8', 'rocky9', 'ubuntu22.04']
+
+    steps:
+      # Checkout repository code
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Generate version information for image tags
+      - name: Set version
+        id: version
+        run: |
+          echo "BUILD_DATE=$(date -u +'%Y%m%d')" >> $GITHUB_OUTPUT
+          echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      # Determine if the current platform's files have changed
+      - name: Determine if platform changed
+        id: platform-filter
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+        with:
+          filters: |
+            rocky8:
+              - 'devops/deploy/docker/test/rocky8/**'
+            rocky9:
+              - 'devops/deploy/docker/test/rocky9/**'
+            ubuntu22.04:
+              - 'devops/deploy/docker/test/ubuntu22.04/**'
+
+      # Skip if no changes for current platform
+      - name: Skip if not relevant
+        if: ${{ steps.platform-filter.outputs[matrix.platform] != 'true' }}
+        run: echo "Skipping because the changes do not affect this platform"
+
+      # Set up QEMU for multi-architecture support
+      # This allows building ARM64 images on AMD64 infrastructure and vice versa
+      - name: Set up QEMU
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
+        uses: docker/setup-qemu-action@v3
+
+      # Login to DockerHub for pushing images
+      - name: Login to Docker Hub
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Setup Docker Buildx for efficient multi-architecture builds
+      - name: Set up Docker Buildx
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
+        uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
+
+      # Build and test images for each architecture
+      # This ensures both AMD64 and ARM64 variants work correctly
+      - name: Build and test images
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
+        run: |
+          # Build for each platform
+          for arch in amd64 arm64; do
+            echo "Building for $arch architecture..."
+            docker buildx build \
+              --platform linux/$arch \
+              --load \
+              -t apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-$arch-test \
+              ./devops/deploy/docker/test/${{ matrix.platform }}
+          done
+
+      # Build and push multi-architecture images
+      # Creates a manifest list that supports both architectures
+      - name: Build and Push Multi-arch Docker images
+        if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        uses: docker/build-push-action@v6
+        with:
+          context: ./devops/deploy/docker/test/${{ matrix.platform }}
+          push: true
+          platforms: linux/amd64,linux/arm64
+          # Use caching for faster builds
+          cache-from: |
+            type=registry,ref=apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-latest
+            type=gha,scope=docker-cbdb-test-${{ matrix.platform }}
+          # Tag with both latest and version-specific tags
+          tags: |
+            apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-latest
+            apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-${{ steps.version.outputs.BUILD_DATE }}-${{ steps.version.outputs.SHA_SHORT }}
+          # Add metadata labels for better image tracking
+          labels: |
+            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.created=${{ steps.version.outputs.BUILD_DATE }}
+            org.opencontainers.image.version=${{ steps.version.outputs.BUILD_DATE }}-${{ steps.version.outputs.SHA_SHORT }}
+
+      # Generate a detailed build summary in GitHub Actions UI
+      # This provides quick access to build information and image usage instructions
+      - name: Build Summary
+        if: always()
+        run: |
+          # Add PR context notification
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            echo "#### ℹ️  Pull Request Build" >> $GITHUB_STEP_SUMMARY
+            echo "This is a validation build. Images are built and tested locally but **not pushed to Docker Hub** for security." >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "- ✅ Dockerfile syntax validated" >> $GITHUB_STEP_SUMMARY
+            echo "- ✅ Multi-architecture builds tested" >> $GITHUB_STEP_SUMMARY
+            echo "- ⏭️  Docker Hub push skipped (requires main branch)" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          echo "### Build Summary for ${{ matrix.platform }} 🚀" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "#### 🔍 Build Information" >> $GITHUB_STEP_SUMMARY
+          echo "- **Build Status**: ${{ job.status }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Platform**: ${{ matrix.platform }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Architectures**: AMD64, ARM64" >> $GITHUB_STEP_SUMMARY
+          echo "- **Commit SHA**: [\`${{ github.sha }}\`](${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }})" >> $GITHUB_STEP_SUMMARY
+          echo "- **Build Date**: ${{ steps.version.outputs.BUILD_DATE }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "#### 🐳 Docker Images" >> $GITHUB_STEP_SUMMARY
+          echo "- Latest tag: \`apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-latest\`" >> $GITHUB_STEP_SUMMARY
+          echo "- Version tag: \`apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-${{ steps.version.outputs.BUILD_DATE }}-${{ steps.version.outputs.SHA_SHORT }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "#### 📋 Quick Reference" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY
+          echo "# Pull the image (automatically selects correct architecture)" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-latest" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "# Pull specific architecture if needed" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull --platform linux/amd64 apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-latest" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull --platform linux/arm64 apache/incubator-cloudberry:cbdb-test-${{ matrix.platform }}-latest" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index 6dcbb3eae4e..e67c2d96a54 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -32,6 +32,7 @@
 # Triggers:
 # - Weekly schedule
 # - optional manual dispatch.
+# - Changes on sonarqube.yml file
 #
 # Notes:
 # - SONARCLOUD_TOKEN secret is provided by the ASF Infra team
@@ -42,6 +43,14 @@ on:
   schedule:
   - cron: "0 0 * * 1"
   workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/workflows/sonarqube.yml'
+  pull_request:
+    paths:
+      - '.github/workflows/sonarqube.yml'
 
 permissions:
   contents: read
@@ -74,7 +83,7 @@ jobs:
         fi
 
     - name: Install Build Wrapper
-      uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v5
+      uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6
 
     - name: Run Build Wrapper
       run: |
@@ -112,9 +121,10 @@ jobs:
         build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make -j$(nproc)
 
     - name: SonarQube Scan
-      uses: SonarSource/sonarqube-scan-action@v5
+      if: ${{ github.event_name != 'pull_request' }}
+      uses: SonarSource/sonarqube-scan-action@v6
       env:
         SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
       with:
         args: >
-          --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
+          --define "sonar.cfamily.compile-commands=${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
diff --git a/GNUmakefile.in b/GNUmakefile.in
index e6333e39bec..623074305ce 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -34,6 +34,9 @@ ifeq ($(with_openssl), yes)
 endif
 ifeq ($(enable_pax), yes)
 	$(MAKE) -C contrib/pax_storage all
+endif
+ifeq ($(enable_ic_udp2),yes)
+	$(MAKE) -C contrib/udp2 all
 endif
 	$(MAKE) -C gpMgmt all
 	$(MAKE) -C gpcontrib all
@@ -81,6 +84,9 @@ ifeq ($(enable_pax), yes)
 endif
 ifeq ($(with_openssl), yes)
 	$(MAKE) -C contrib/sslinfo $@
+endif
+ifeq ($(enable_ic_udp2),yes)
+	$(MAKE) -C contrib/udp2 $@
 endif
 	$(MAKE) -C gpMgmt $@
 	$(MAKE) -C gpcontrib $@
@@ -154,17 +160,17 @@ check-tests installcheck installcheck-parallel installcheck-tests: submake-gener
 	$(MAKE) -C src/test/regress $@
 
 check:
-	if [ ! -f $(prefix)/greenplum_path.sh ]; then \
+	if [ ! -f $(prefix)/cloudberry-env.sh ]; then \
 		$(MAKE) -C $(top_builddir) install; \
 	fi
-	. $(prefix)/greenplum_path.sh; \
+	. $(prefix)/cloudberry-env.sh; \
 	if pg_isready 1>/dev/null; then \
 	  $(MAKE) -C $(top_builddir) installcheck; \
 	else \
 	  if [ ! -f $(top_builddir)/gpAux/gpdemo/gpdemo-env.sh ]; then \
-	    . $(prefix)/greenplum_path.sh && $(MAKE) -C $(top_builddir) create-demo-cluster; \
+	    . $(prefix)/cloudberry-env.sh && $(MAKE) -C $(top_builddir) create-demo-cluster; \
 	  fi; \
-	  . $(prefix)/greenplum_path.sh && . $(top_builddir)/gpAux/gpdemo/gpdemo-env.sh && $(MAKE) -C $(top_builddir) installcheck; \
+	  . $(prefix)/cloudberry-env.sh && . $(top_builddir)/gpAux/gpdemo/gpdemo-env.sh && $(MAKE) -C $(top_builddir) installcheck; \
 	fi
 
 $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin gpcontrib,check)
@@ -212,6 +218,11 @@ installcheck-gpcheckcat:
 $(call recurse,installcheck-world,gpcontrib/gp_replica_check,installcheck)
 $(call recurse,installcheck-world,src/bin/pg_upgrade,check)
 
+.PHONY: installcheck-hot-standby
+installcheck-hot-standby: submake-generated-headers
+	$(MAKE) -C src/test/regress installcheck-hot-standby
+	$(MAKE) -C src/test/isolation2 installcheck-hot-standby
+
 # Run mock tests, that don't require a running server. Arguably these should
 # be part of [install]check-world, but we treat them more like part of
 # compilation than regression testing, in the CI. But they are too heavy-weight
diff --git a/NOTICE b/NOTICE
index 8003e980d0d..13e79d82ce5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Cloudberry (Incubating)
-Copyright 2024-2025 The Apache Software Foundation
+Copyright 2024-2026 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/README.apache.md b/README.apache.md
index 18772c9dbae..e99f2b2328f 100644
--- a/README.apache.md
+++ b/README.apache.md
@@ -38,3 +38,15 @@ The following entities have contributed to the Greenplum-based source code under
 - Broadcom Inc.
 
 RAT matchers are used to classify their license headers accordingly.
+
+## Compressed Files in Source
+
+The following compressed files are included in the source tree. These files are archives of text files used for testing purposes and do not contain binary executables. They are not used during the build process.
+
+- contrib/formatter_fixedwidth/data/fixedwidth_small_correct.tbl.gz
+- gpMgmt/demo/gppkg/sample-sources.tar.gz
+- src/bin/gpfdist/regress/data/exttab1/nation.tbl.gz
+- src/bin/gpfdist/regress/data/gpfdist2/gz_multi_chunk.tbl.gz
+- src/bin/gpfdist/regress/data/gpfdist2/gz_multi_chunk_2.tbl.gz
+- src/bin/gpfdist/regress/data/gpfdist2/lineitem.tbl.bz2
+- src/bin/gpfdist/regress/data/gpfdist2/lineitem.tbl.gz
diff --git a/README.md b/README.md
index 25771f24a10..a72c42fd266 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@
   <img alt="SonarQube Cloud" src="https://sonarcloud.io/images/project_badges/sonarcloud-highlight.svg" width="100px">
 </a>
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/apache/cloudberry)
+[![Apache Rat Audit](https://github.com/apache/cloudberry/actions/workflows/apache-rat-audit.yml/badge.svg)](https://github.com/apache/cloudberry/actions/workflows/apache-rat-audit.yml)
 ---------
 
 ## Introduction
@@ -61,15 +62,14 @@ also be used for large-scale analytics and AI/ML workloads.
 
 ### Build from source
 
-You can follow [these guides](./deploy/build) to build Cloudberry on
+You can follow [these guides](https://cloudberry.apache.org/docs/deployment/) to build Cloudberry on
 Linux OS (including RHEL/Rocky Linux, and Ubuntu) and macOS.
 
 ### Try out quickly
 
 Welcome to try out Cloudberry via building [one Docker-based
-Sandbox](https://github.com/apache/cloudberry-bootcamp), which is tailored to
-help you gain a basic understanding of Cloudberry's capabilities and features
-a range of materials, including tutorials, sample code, and crash courses.
+Sandbox](./devops/sandbox), which is tailored to help you gain a basic
+understanding of Cloudberry's capabilities and features.
 
 ## Repositories
 
@@ -78,10 +78,8 @@ this, there are several ecosystem repositories for Cloudberry, including the
 website, extensions, connectors, adapters, and other utilities.
 
 * [apache/cloudberry-site](https://github.com/apache/cloudberry-site): website and documentation sources.
-* [apache/cloudberry-bootcamp](https://github.com/apache/cloudberry-bootcamp): help you quickly try out Cloudberry via one Docker-based Sandbox.
-* [apache/cloudberry-gpbackup](https://github.com/apache/cloudberry-gpbackup): backup utility for Cloudberry.
+* [apache/cloudberry-backup](https://github.com/apache/cloudberry-backup): backup utility for Cloudberry.
 * [apache/cloudberry-go-libs](https://github.com/apache/cloudberry-go-libs): go-libs for Cloudberry.
-* [apache/cloudberry-gpbackup-s3-plugin](https://github.com/apache/cloudberry-gpbackup-s3-plugin): S3 plugin for use with Cloudberry backup utility.
 * [apache/cloudberry-pxf](https://github.com/apache/cloudberry-pxf): Platform Extension Framework (PXF) for Cloudberry.
 
 ## Community & Support
diff --git a/configure b/configure
index 4297c803903..ab82db7d011 100755
--- a/configure
+++ b/configure
@@ -665,6 +665,7 @@ with_ssl
 have_yaml
 YAML_LIBS
 EVENT_LIBS
+EVENT_CFLAGS
 apr_cppflags
 apr_cflags
 apr_link_ld_libs
@@ -719,7 +720,6 @@ GREP
 with_apr_config
 with_libcurl
 with_rt
-with_quicklz
 with_zstd
 with_libbz2
 LZ4_LIBS
@@ -761,9 +761,11 @@ PROTOBUF_LIBS
 PROTOBUF_CFLAGS
 enable_preload_ic_module
 enable_ic_proxy
+enable_ic_udp2
 enable_external_fts
 HAVE_CXX14
 enable_gpcloud
+enable_link_postgres_with_shared
 enable_shared_postgres_backend
 enable_mapreduce
 enable_serverless
@@ -906,8 +908,10 @@ enable_catalog_ext
 enable_serverless
 enable_mapreduce
 enable_shared_postgres_backend
+enable_link_postgres_with_shared
 enable_gpcloud
 enable_external_fts
+enable_ic_udp2
 enable_ic_proxy
 enable_preload_ic_module
 enable_pax
@@ -938,7 +942,6 @@ with_zlib
 with_lz4
 with_libbz2
 with_zstd
-with_quicklz
 with_rt
 with_libcurl
 with_apr_config
@@ -980,6 +983,8 @@ LDFLAGS_EX
 LDFLAGS_SL
 PERL
 PYTHON
+EVENT_CFLAGS
+EVENT_LIBS
 MSGFMT
 TCLSH'
 
@@ -1633,8 +1638,12 @@ Optional Features:
   --enable-mapreduce      enable Cloudberry Mapreduce support
   --disable-shared-postgres-backend
                           enable Cloudberry shared postgres backend support
+  --enable-link-postgres-with-shared
+                          build Cloudberry using the shared library
+                          libpostgres.so
   --enable-gpcloud        enable gpcloud support
   --enable-external-fts   enable external fts support
+  --enable-ic-udp2        enable interconnect udp2 implement
   --enable-ic-proxy       enable interconnect proxy mode (requires libuv
                           library)
   --disable-preload-ic-module
@@ -1692,8 +1701,6 @@ Optional Packages:
   --with-lz4              build with LZ4 support
   --without-libbz2        do not use bzip2
   --without-zstd          do not build with Zstandard
-  --with-quicklz          build with QuickLZ support (requires quicklz
-                          library)
   --without-rt            do not use Realtime Library
   --without-libcurl       do not use libcurl
   --with-apr-config=PATH  path to apr-1-config utility
@@ -1736,6 +1743,9 @@ Some influential environment variables:
   LDFLAGS_SL  extra linker flags for linking shared libraries only
   PERL        Perl program
   PYTHON      Python program
+  EVENT_CFLAGS
+              C compiler flags for EVENT, overriding pkg-config
+  EVENT_LIBS  linker flags for EVENT, overriding pkg-config
   MSGFMT      msgfmt program for NLS
   TCLSH       Tcl interpreter program (tclsh)
 
@@ -8592,6 +8602,45 @@ if test "$enable_shared_postgres_backend" = yes ; then :
 
 fi # fi
 
+#
+# --enable-link-postgres-with-shared enables linking postgres with shared library libpostgres.so
+#
+
+
+# Check whether --enable-link-postgres-with-shared was given.
+if test "${enable_link_postgres_with_shared+set}" = set; then :
+  enableval=$enable_link_postgres_with_shared;
+  case $enableval in
+    yes)
+
+$as_echo "#define USE_LINK_POSTGRES_WITH_SHARED 1" >>confdefs.h
+
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --enable-link-postgres-with-shared option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  enable_link_postgres_with_shared=no
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build Cloudberry using the shared library libpostgres.so... $enable_link_postgres_with_shared" >&5
+$as_echo "checking whether to build Cloudberry using the shared library libpostgres.so... $enable_link_postgres_with_shared" >&6; }
+
+
+# check if enable-shared-postgres-backend is yes when enable-link-postgres-with-shared is yes
+if test "$enable_link_postgres_with_shared" = yes; then
+  if test "$enable_shared_postgres_backend" = no; then
+    as_fn_error $? "--enable-link-postgres-with-shared is yes, but --enable-shared-postgres-backend is no" "$LINENO" 5
+  fi
+fi
+
 #
 # gpcloud, enabled by default
 #
@@ -9141,11 +9190,44 @@ $as_echo "checking whether to build with external-fts... $enable_external_fts" >
 
 
 if test "$enable_external_fts" = no; then
-  $as_echo "#define USE_INTERNAL_FTS 1" >>confdefs.h
+
+$as_echo "#define USE_INTERNAL_FTS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DUSE_INTERNAL_FTS=1"
 fi
 
+#
+# ic-udp2
+#
+
+
+# Check whether --enable-ic-udp2 was given.
+if test "${enable_ic_udp2+set}" = set; then :
+  enableval=$enable_ic_udp2;
+  case $enableval in
+    yes)
+
+$as_echo "#define ENABLE_IC_UDP2 1" >>confdefs.h
+
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --enable-ic-udp2 option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  enable_ic_udp2=no
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with interconnect udp2 support ... $enable_ic_udp2" >&5
+$as_echo "checking whether to build with interconnect udp2 support ... $enable_ic_udp2" >&6; }
+
+
 #
 # ic-proxy
 #
@@ -9393,6 +9475,55 @@ $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
+$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"
+
+else
+  as_fn_error $? "library 'uring' is required for PAX support" "$LINENO" 5
+fi
+
+
   # Check cmake >= 3.11.0 using AX_COMPARE_VERSION
   # Extract the first word of "cmake", so it can be a program name with args.
 set dummy cmake; ac_word=$2
@@ -11029,35 +11160,6 @@ $as_echo "yes" >&6; }
 fi
 fi
 
-#
-# quicklz
-#
-
-
-
-# Check whether --with-quicklz was given.
-if test "${with_quicklz+set}" = set; then :
-  withval=$with_quicklz;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-quicklz option" "$LINENO" 5
-      ;;
-  esac
-
-else
-  with_quicklz=no
-
-fi
-
-
-
-
 #
 # Realtime library
 #
@@ -14678,56 +14780,6 @@ fi
 
 fi
 
-if test "$with_quicklz" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qlz_compress in -lquicklz" >&5
-$as_echo_n "checking for qlz_compress in -lquicklz... " >&6; }
-if ${ac_cv_lib_quicklz_qlz_compress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lquicklz  $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 qlz_compress ();
-int
-main ()
-{
-return qlz_compress ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_quicklz_qlz_compress=yes
-else
-  ac_cv_lib_quicklz_qlz_compress=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_quicklz_qlz_compress" >&5
-$as_echo "$ac_cv_lib_quicklz_qlz_compress" >&6; }
-if test "x$ac_cv_lib_quicklz_qlz_compress" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBQUICKLZ 1
-_ACEOF
-
-  LIBS="-lquicklz $LIBS"
-
-else
-  as_fn_error $? "quicklz library not found." "$LINENO" 5
-fi
-
-fi
-
 if test "$enable_external_fts" = yes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson_version_str in -ljansson" >&5
 $as_echo_n "checking for jansson_version_str in -ljansson... " >&6; }
@@ -15059,65 +15111,78 @@ fi
   LIBS="$_LIBS"
 
   _LIBS="$LIBS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_add" >&5
-$as_echo_n "checking for library containing event_add... " >&6; }
-if ${ac_cv_search_event_add+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$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 event_add ();
-int
-main ()
-{
-return event_add ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' event; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_event_add=$ac_res
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent >= 2.0.0" >&5
+$as_echo_n "checking for libevent >= 2.0.0... " >&6; }
+
+if test -n "$EVENT_CFLAGS"; then
+    pkg_cv_EVENT_CFLAGS="$EVENT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libevent >= 2.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libevent >= 2.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EVENT_CFLAGS=`$PKG_CONFIG --cflags "libevent >= 2.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_event_add+:} false; then :
-  break
+ else
+    pkg_failed=untried
 fi
-done
-if ${ac_cv_search_event_add+:} false; then :
-
+if test -n "$EVENT_LIBS"; then
+    pkg_cv_EVENT_LIBS="$EVENT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libevent >= 2.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libevent >= 2.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EVENT_LIBS=`$PKG_CONFIG --libs "libevent >= 2.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  ac_cv_search_event_add=no
+  pkg_failed=yes
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+ else
+    pkg_failed=untried
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_event_add" >&5
-$as_echo "$ac_cv_search_event_add" >&6; }
-ac_res=$ac_cv_search_event_add
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+
+
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  as_fn_error $? "libevent is required for gpfdist" "$LINENO" 5
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        EVENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent >= 2.0.0" 2>&1`
+        else
+	        EVENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent >= 2.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$EVENT_PKG_ERRORS" >&5
 
-  EVENT_LIBS=" -levent"
+	as_fn_error $? "libevent >= 2.0.0 is required for gpfdist" "$LINENO" 5
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "libevent >= 2.0.0 is required for gpfdist" "$LINENO" 5
+else
+	EVENT_CFLAGS=$pkg_cv_EVENT_CFLAGS
+	EVENT_LIBS=$pkg_cv_EVENT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+  EVENT_LIBS="$EVENT_LIBS"
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yaml_parser_initialize" >&5
@@ -15761,7 +15826,8 @@ if test "$enable_openssl_redirect" = yes; then
     as_fn_error $? "--enable-openssl-redirect must specify --with-ssl" "$LINENO" 5
   fi
 
-  $as_echo "#define OPENSSL_ALLOW_REDIRECT 1" >>confdefs.h
+
+$as_echo "#define OPENSSL_ALLOW_REDIRECT 1" >>confdefs.h
 
 fi
 
@@ -16196,6 +16262,13 @@ fi
 
 
 
+# for contrib/pax_storage
+if test "$enable_pax" = yes; then
+  if test "$enable_shared_postgres_backend" = no; then
+    as_fn_error $? "PAX support requires --enable-shared-postgres-backend" "$LINENO" 5
+  fi
+fi
+
 # for contrib/sepgsql
 if test "$with_selinux" = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_compute_create_name in -lselinux" >&5
@@ -16975,18 +17048,6 @@ else
 fi
 
 
-fi
-
-# Check for quicklz.h
-if test "$with_quicklz" = yes; then
-  ac_fn_c_check_header_mongrel "$LINENO" "quicklz.h" "ac_cv_header_quicklz_h" "$ac_includes_default"
-if test "x$ac_cv_header_quicklz_h" = xyes; then :
-
-else
-  as_fn_error $? "header file <quicklz.h> is required for QuickLZ support" "$LINENO" 5
-fi
-
-
 fi
 
 if test "$enable_external_fts" = yes; then
diff --git a/configure.ac b/configure.ac
index 2732c728eb5..cc75aee241f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -871,7 +871,7 @@ AC_SUBST(enable_mapreduce)
 #
 PGAC_ARG_BOOL(enable, shared-postgres-backend, yes, [enable Cloudberry shared postgres backend support],
               [AC_DEFINE([USE_SHARED_POSTGRES_BACKEND], 1,
-			             [Define to 1 to build with shared postgres backend capabilities (--enable-shared-postgres-backend)])])
+			             [Define to 1 to build with shared Cloudberry backend capabilities (--enable-shared-postgres-backend)])])
 AC_MSG_RESULT([checking whether to build with Cloudberry shared postgres backend... $enable_shared_postgres_backend])
 AC_SUBST(enable_shared_postgres_backend)
 
@@ -881,6 +881,22 @@ AS_IF([test "$enable_shared_postgres_backend" = yes ],
   CXXFLAGS="$CXXFLAGS -fPIC "
 ]) # fi
 
+#
+# --enable-link-postgres-with-shared enables linking postgres with shared library libpostgres.so
+#
+PGAC_ARG_BOOL(enable, link-postgres-with-shared, no, [build Cloudberry using the shared library libpostgres.so],
+              [AC_DEFINE([USE_LINK_POSTGRES_WITH_SHARED], 1,
+			             [Define to 1 to build Cloudberry using the shared library libpostgres.so (--enable-link-postgres-with-shared)])])
+AC_MSG_RESULT([checking whether to build Cloudberry using the shared library libpostgres.so... $enable_link_postgres_with_shared])
+AC_SUBST(enable_link_postgres_with_shared)
+
+# check if enable-shared-postgres-backend is yes when enable-link-postgres-with-shared is yes
+if test "$enable_link_postgres_with_shared" = yes; then
+  if test "$enable_shared_postgres_backend" = no; then
+    AC_MSG_ERROR([--enable-link-postgres-with-shared is yes, but --enable-shared-postgres-backend is no])
+  fi
+fi
+
 #
 # gpcloud, enabled by default
 #
@@ -903,10 +919,20 @@ AC_MSG_RESULT([checking whether to build with external-fts... $enable_external_f
 AC_SUBST(enable_external_fts)
 
 if test "$enable_external_fts" = no; then
-  AC_DEFINE([USE_INTERNAL_FTS], [1])
+  AC_DEFINE([USE_INTERNAL_FTS], [1], [Define to 1 to use the internal FTS implementation.])
   CFLAGS="$CFLAGS -DUSE_INTERNAL_FTS=1"
 fi
 
+#
+# ic-udp2
+#
+PGAC_ARG_BOOL(enable, ic-udp2, no,
+              [enable interconnect udp2 implement],
+              [AC_DEFINE(ENABLE_IC_UDP2, 1,
+                         [Define to 1 to build with interconnect udp2 support (--enable-ic-udp2)])])
+AC_MSG_RESULT([checking whether to build with interconnect udp2 support ... $enable_ic_udp2])
+AC_SUBST(enable_ic_udp2)
+
 #
 # ic-proxy
 #
@@ -946,6 +972,10 @@ if test "$enable_pax" = yes; then
     [AC_MSG_ERROR([libzstd >= 1.4.0 is required for PAX support])]
   )
 
+  # Check liburing
+  AC_CHECK_LIB(uring, io_uring_queue_init, [],
+               [AC_MSG_ERROR([library 'uring' is required for PAX support])])
+
   # Check cmake >= 3.11.0 using AX_COMPARE_VERSION
   AC_PATH_PROG([CMAKE], [cmake], [no])
   if test "$CMAKE" = "no"; then
@@ -1340,13 +1370,6 @@ if test "$with_zstd" = yes; then
   PKG_CHECK_MODULES([ZSTD], [libzstd >= 1.4.0])
 fi
 
-#
-# quicklz
-#
-PGAC_ARG_BOOL(with, quicklz, no,
-              [build with QuickLZ support (requires quicklz library)])
-AC_SUBST(with_quicklz)
-
 #
 # Realtime library
 #
@@ -1597,11 +1620,6 @@ failure.  It is possible the compiler isn't looking in the proper directory.
 Use --without-zlib to disable zlib support.])])
 fi
 
-if test "$with_quicklz" = yes; then
-  AC_CHECK_LIB(quicklz, qlz_compress, [],
-               [AC_MSG_ERROR([quicklz library not found.])])
-fi
-
 if test "$enable_external_fts" = yes; then
 AC_CHECK_LIB(jansson, jansson_version_str, [],
                [AC_MSG_ERROR([jansson library not found or version is too old, version must >= 2.13])])
@@ -1651,8 +1669,8 @@ AC_DEFUN([CHECK_APR], [
 if test "$enable_gpfdist" = yes ; then
   CHECK_APR()
   _LIBS="$LIBS"
-  AC_SEARCH_LIBS(event_add, [event], [], [AC_MSG_ERROR([libevent is required for gpfdist])])
-  EVENT_LIBS=" -levent"
+  PKG_CHECK_MODULES([EVENT], [libevent >= 2.0.0], [], [AC_MSG_ERROR([libevent >= 2.0.0 is required for gpfdist])])
+  EVENT_LIBS="$EVENT_LIBS"
   AC_SUBST(EVENT_LIBS)
 
   AC_SEARCH_LIBS(yaml_parser_initialize, [yaml], [have_yaml=yes; YAML_LIBS=" -lyaml"], [AC_MSG_WARN([libyaml is not found. disabling transformations for gpfdist.])])
@@ -1738,7 +1756,7 @@ if test "$enable_openssl_redirect" = yes; then
     AC_MSG_ERROR([--enable-openssl-redirect must specify --with-ssl])
   fi
 
-  AC_DEFINE([OPENSSL_ALLOW_REDIRECT], [1])
+  AC_DEFINE([OPENSSL_ALLOW_REDIRECT], [1], [Define to 1 if you want to allow OpenSSL redirects.])
 fi
 
 # Check for curl.
@@ -1802,6 +1820,13 @@ fi
 AC_SUBST(LDAP_LIBS_FE)
 AC_SUBST(LDAP_LIBS_BE)
 
+# for contrib/pax_storage
+if test "$enable_pax" = yes; then
+  if test "$enable_shared_postgres_backend" = no; then
+    AC_MSG_ERROR([PAX support requires --enable-shared-postgres-backend])
+  fi
+fi
+
 # for contrib/sepgsql
 if test "$with_selinux" = yes; then
   AC_CHECK_LIB(selinux, security_compute_create_name, [],
@@ -1965,11 +1990,6 @@ if test "$with_libbz2" = yes ; then
   AC_CHECK_HEADER(bzlib.h, [], [AC_MSG_ERROR([header file <bzlib.h> is required for bzip2 support])], [])
 fi
 
-# Check for quicklz.h
-if test "$with_quicklz" = yes; then
-  AC_CHECK_HEADER(quicklz.h, [], [AC_MSG_ERROR([header file <quicklz.h> is required for QuickLZ support])])
-fi
-
 if test "$enable_external_fts" = yes; then
 # Check for jansson
 AC_CHECK_HEADER(jansson.h, [], [AC_MSG_ERROR([header file <jansson.h> is required for ETCD support])])
diff --git a/contrib/Makefile b/contrib/Makefile
index 2292adb88f2..b14600e3557 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -104,6 +104,12 @@ else
 ALWAYS_SUBDIRS += pax_storage
 endif
 
+ifeq ($(enable_ic_udp2),yes)
+SUBDIRS += udp2
+else
+ALWAYS_SUBDIRS += udp2
+endif
+
 # Missing:
 #		start-scripts	\ (does not have a makefile)
 
diff --git a/contrib/amcheck/expected/check_heap.out b/contrib/amcheck/expected/check_heap.out
index b6e98eaa68d..cf9ff0941d0 100644
--- a/contrib/amcheck/expected/check_heap.out
+++ b/contrib/amcheck/expected/check_heap.out
@@ -227,7 +227,7 @@ CREATE TABLE test_partitioned (a int, b text default repeat('x', 5000))
 SELECT * FROM verify_heapam('test_partitioned',
 							startblock := NULL,
 							endblock := NULL);
-ERROR:  "test_partitioned" is not a table, materialized view, or TOAST table
+ERROR:  "test_partitioned" is not a table, directory table, materialized view, or TOAST table
 CONTEXT:  SQL statement "SELECT t.blkno, t.offnum, t.attnum, t.msg
 	FROM verify_heapam_internal(relation,
 							 on_error_stop,
@@ -268,7 +268,7 @@ CREATE INDEX test_index ON test_partition (a);
 SELECT * FROM verify_heapam('test_index',
 							startblock := NULL,
 							endblock := NULL);
-ERROR:  "test_index" is not a table, materialized view, or TOAST table
+ERROR:  "test_index" is not a table, directory table, materialized view, or TOAST table
 CONTEXT:  SQL statement "SELECT t.blkno, t.offnum, t.attnum, t.msg
 	FROM verify_heapam_internal(relation,
 							 on_error_stop,
@@ -283,7 +283,7 @@ CREATE VIEW test_view AS SELECT 1;
 SELECT * FROM verify_heapam('test_view',
 							startblock := NULL,
 							endblock := NULL);
-ERROR:  "test_view" is not a table, materialized view, or TOAST table
+ERROR:  "test_view" is not a table, directory table, materialized view, or TOAST table
 CONTEXT:  SQL statement "SELECT t.blkno, t.offnum, t.attnum, t.msg
 	FROM verify_heapam_internal(relation,
 							 on_error_stop,
@@ -298,7 +298,7 @@ CREATE SEQUENCE test_sequence;
 SELECT * FROM verify_heapam('test_sequence',
 							startblock := NULL,
 							endblock := NULL);
-ERROR:  "test_sequence" is not a table, materialized view, or TOAST table
+ERROR:  "test_sequence" is not a table, directory table, materialized view, or TOAST table
 CONTEXT:  SQL statement "SELECT t.blkno, t.offnum, t.attnum, t.msg
 	FROM verify_heapam_internal(relation,
 							 on_error_stop,
@@ -315,7 +315,7 @@ CREATE FOREIGN TABLE test_foreign_table () SERVER dummy_server;
 SELECT * FROM verify_heapam('test_foreign_table',
 							startblock := NULL,
 							endblock := NULL);
-ERROR:  "test_foreign_table" is not a table, materialized view, or TOAST table
+ERROR:  "test_foreign_table" is not a table, directory table, materialized view, or TOAST table
 CONTEXT:  SQL statement "SELECT t.blkno, t.offnum, t.attnum, t.msg
 	FROM verify_heapam_internal(relation,
 							 on_error_stop,
diff --git a/contrib/amcheck/t/001_verify_heapam.pl b/contrib/amcheck/t/001_verify_heapam.pl
index 64ba64d6b41..b9dbb42a67f 100644
--- a/contrib/amcheck/t/001_verify_heapam.pl
+++ b/contrib/amcheck/t/001_verify_heapam.pl
@@ -31,18 +31,18 @@
 #
 fresh_test_table('test');
 corrupt_first_page('test');
-detects_heap_corruption("verify_heapam('test')", "plain corrupted table");
+detects_heap_corruption("verify_heapam_internal('test')", "plain corrupted table");
 detects_heap_corruption(
-	"verify_heapam('test', skip := 'all-visible')",
+	"verify_heapam_internal('test', skip := 'all-visible')",
 	"plain corrupted table skipping all-visible");
 detects_heap_corruption(
-	"verify_heapam('test', skip := 'all-frozen')",
+	"verify_heapam_internal('test', skip := 'all-frozen')",
 	"plain corrupted table skipping all-frozen");
 detects_heap_corruption(
-	"verify_heapam('test', check_toast := false)",
+	"verify_heapam_internal('test', check_toast := false)",
 	"plain corrupted table skipping toast");
 detects_heap_corruption(
-	"verify_heapam('test', startblock := 0, endblock := 0)",
+	"verify_heapam_internal('test', startblock := 0, endblock := 0)",
 	"plain corrupted table checking only block zero");
 
 #
@@ -50,13 +50,13 @@
 #
 fresh_test_table('test');
 $node->safe_psql('postgres', q(VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) test));
-detects_no_corruption("verify_heapam('test')",
+detects_no_corruption("verify_heapam_internal('test')",
 	"all-frozen not corrupted table");
 corrupt_first_page('test');
-detects_heap_corruption("verify_heapam('test')",
+detects_heap_corruption("verify_heapam_internal('test')",
 	"all-frozen corrupted table");
 detects_no_corruption(
-	"verify_heapam('test', skip := 'all-frozen')",
+	"verify_heapam_internal('test', skip := 'all-frozen')",
 	"all-frozen corrupted table skipping all-frozen");
 
 # Returns the filesystem path for the named relation.
@@ -208,7 +208,7 @@ sub check_all_options_uncorrupted
 						  . "endblock := $endblock";
 
 						detects_no_corruption(
-							"verify_heapam('$relname', $opts)",
+							"verify_heapam_internal('$relname', $opts)",
 							"$prefix: $opts");
 					}
 				}
diff --git a/contrib/amcheck/t/003_cic_2pc.pl b/contrib/amcheck/t/003_cic_2pc.pl
index 445aabaa5e9..eb4d9361955 100644
--- a/contrib/amcheck/t/003_cic_2pc.pl
+++ b/contrib/amcheck/t/003_cic_2pc.pl
@@ -9,7 +9,11 @@
 use PostgresNode;
 use TestLib;
 
-use Test::More tests => 5;
+use Test::More tests => 0 + 1;#5;
+
+SKIP:
+{
+	skip "TWO PHASE transactions are not supported in Cloudberry, skip test", 1;
 
 Test::More->builder->todo_start('filesystem bug')
   if TestLib::has_wal_read_bug;
@@ -186,3 +190,4 @@
 
 $node->stop;
 done_testing();
+}
diff --git a/contrib/btree_gin/expected/enum.out b/contrib/btree_gin/expected/enum.out
index 2b0ddf11eb3..c4ac1174ea2 100644
--- a/contrib/btree_gin/expected/enum.out
+++ b/contrib/btree_gin/expected/enum.out
@@ -1,14 +1,11 @@
 set enable_seqscan=off;
 CREATE TYPE rainbow AS ENUM ('r','o','y','g','b','i','v');
 CREATE TABLE test_enum (
-   h int,
    i rainbow
 );
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'h' as the Greenplum Database data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-INSERT INTO test_enum VALUES (1, 'v'),(2, 'y'),(3, 'r'),(4, 'g'),(5, 'o'),(6, 'i'),(7, 'b');
+INSERT INTO test_enum VALUES ('v'),('y'),('r'),('g'),('o'),('i'),('b');
 CREATE INDEX idx_enum ON test_enum USING gin (i);
-SELECT i FROM test_enum WHERE i<'g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i<'g'::rainbow ORDER BY i;
  i 
 ---
  r
@@ -16,7 +13,7 @@ SELECT i FROM test_enum WHERE i<'g'::rainbow ORDER BY i;
  y
 (3 rows)
 
-SELECT i FROM test_enum WHERE i<='g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i<='g'::rainbow ORDER BY i;
  i 
 ---
  r
@@ -25,13 +22,13 @@ SELECT i FROM test_enum WHERE i<='g'::rainbow ORDER BY i;
  g
 (4 rows)
 
-SELECT i FROM test_enum WHERE i='g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i='g'::rainbow ORDER BY i;
  i 
 ---
  g
 (1 row)
 
-SELECT i FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
  i 
 ---
  g
@@ -40,7 +37,7 @@ SELECT i FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
  v
 (4 rows)
 
-SELECT i FROM test_enum WHERE i>'g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i>'g'::rainbow ORDER BY i;
  i 
 ---
  b
@@ -48,7 +45,7 @@ SELECT i FROM test_enum WHERE i>'g'::rainbow ORDER BY i;
  v
 (3 rows)
 
-explain (costs off) SELECT i FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
+explain (costs off) SELECT * FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
                      QUERY PLAN                      
 -----------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
@@ -59,17 +56,11 @@ explain (costs off) SELECT i FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
                Recheck Cond: (i >= 'g'::rainbow)
                ->  Bitmap Index Scan on idx_enum
                      Index Cond: (i >= 'g'::rainbow)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: Postgres query optimizer
 (9 rows)
 
 -- make sure we handle the non-evenly-numbered oid case for enums
 create type e as enum ('0', '2', '3');
 alter type e add value '1' after '0';
-CREATE TABLE t (
-   h int,
-   i e
-);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'h' as the Greenplum Database data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-insert into t select j, (j % 4)::text::e from generate_series(0, 100000) as j;
-create index on t using gin (i);
+create table t as select (i % 4)::text::e from generate_series(0, 100000) as i;
+create index on t using gin (e);
diff --git a/contrib/btree_gin/sql/enum.sql b/contrib/btree_gin/sql/enum.sql
index 9876be88c85..f35162f8f58 100644
--- a/contrib/btree_gin/sql/enum.sql
+++ b/contrib/btree_gin/sql/enum.sql
@@ -1,30 +1,25 @@
 set enable_seqscan=off;
+
 CREATE TYPE rainbow AS ENUM ('r','o','y','g','b','i','v');
 
 CREATE TABLE test_enum (
-   h int,
    i rainbow
 );
 
-INSERT INTO test_enum VALUES (1, 'v'),(2, 'y'),(3, 'r'),(4, 'g'),(5, 'o'),(6, 'i'),(7, 'b');
+INSERT INTO test_enum VALUES ('v'),('y'),('r'),('g'),('o'),('i'),('b');
 
 CREATE INDEX idx_enum ON test_enum USING gin (i);
 
-SELECT i FROM test_enum WHERE i<'g'::rainbow ORDER BY i;
-SELECT i FROM test_enum WHERE i<='g'::rainbow ORDER BY i;
-SELECT i FROM test_enum WHERE i='g'::rainbow ORDER BY i;
-SELECT i FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
-SELECT i FROM test_enum WHERE i>'g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i<'g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i<='g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i='g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
+SELECT * FROM test_enum WHERE i>'g'::rainbow ORDER BY i;
 
-explain (costs off) SELECT i FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
+explain (costs off) SELECT * FROM test_enum WHERE i>='g'::rainbow ORDER BY i;
 
 -- make sure we handle the non-evenly-numbered oid case for enums
 create type e as enum ('0', '2', '3');
 alter type e add value '1' after '0';
-
-CREATE TABLE t (
-   h int,
-   i e
-);
-insert into t select j, (j % 4)::text::e from generate_series(0, 100000) as j;
-create index on t using gin (i);
+create table t as select (i % 4)::text::e from generate_series(0, 100000) as i;
+create index on t using gin (e);
diff --git a/contrib/btree_gist/expected/bit_optimizer.out b/contrib/btree_gist/expected/bit_optimizer.out
index e4eff0ede1f..16ea5206989 100644
--- a/contrib/btree_gist/expected/bit_optimizer.out
+++ b/contrib/btree_gist/expected/bit_optimizer.out
@@ -74,6 +74,6 @@ SELECT a FROM bittmp WHERE a BETWEEN '1000000' and '1000001';
    ->  Index Scan using bitidx on bittmp
          Index Cond: ((a >= '1000000'::"bit") AND (a <= '1000001'::"bit"))
          Filter: ((a >= '1000000'::"bit") AND (a <= '1000001'::"bit"))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (5 rows)
 
diff --git a/contrib/btree_gist/expected/bytea_optimizer.out b/contrib/btree_gist/expected/bytea_optimizer.out
index f5bdcf10d81..9577112dc0b 100644
--- a/contrib/btree_gist/expected/bytea_optimizer.out
+++ b/contrib/btree_gist/expected/bytea_optimizer.out
@@ -81,7 +81,7 @@ SELECT a FROM byteatmp where a > 'ffa'::bytea;
    ->  Index Scan using byteaidx on byteatmp
          Index Cond: (a > '\x666661'::bytea)
          Filter: (a > '\x666661'::bytea)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (5 rows)
 
 SELECT a FROM byteatmp where a > 'ffa'::bytea;
diff --git a/contrib/btree_gist/expected/cash_optimizer.out b/contrib/btree_gist/expected/cash_optimizer.out
index 3eaa66958ea..171dec7e511 100644
--- a/contrib/btree_gist/expected/cash_optimizer.out
+++ b/contrib/btree_gist/expected/cash_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '21472.79' FROM moneytmp ORDER BY a <-> '21472.79' LIMIT 3;
          ->  Result
                ->  Gather Motion 3:1  (slice1; segments: 3)
                      ->  Seq Scan on moneytmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '21472.79' FROM moneytmp ORDER BY a <-> '21472.79' LIMIT 3;
diff --git a/contrib/btree_gist/expected/char_optimizer.out b/contrib/btree_gist/expected/char_optimizer.out
index 2b312df8b19..694a197be22 100644
--- a/contrib/btree_gist/expected/char_optimizer.out
+++ b/contrib/btree_gist/expected/char_optimizer.out
@@ -74,7 +74,7 @@ SELECT * FROM chartmp WHERE a BETWEEN '31a' AND '31c';
    ->  Index Scan using charidx on chartmp
          Index Cond: ((a >= '31a'::bpchar) AND (a <= '31c'::bpchar))
          Filter: ((a >= '31a'::bpchar) AND (a <= '31c'::bpchar))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (5 rows)
 
 SELECT * FROM chartmp WHERE a BETWEEN '31a' AND '31c';
diff --git a/contrib/btree_gist/expected/date_optimizer.out b/contrib/btree_gist/expected/date_optimizer.out
index c634639a4bb..a77041f847f 100644
--- a/contrib/btree_gist/expected/date_optimizer.out
+++ b/contrib/btree_gist/expected/date_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '2001-02-13' FROM datetmp ORDER BY a <-> '2001-02-13' LIMIT 3;
          ->  Sort
                Sort Key: ((a <-> '02-13-2001'::date))
                ->  Seq Scan on datetmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '2001-02-13' FROM datetmp ORDER BY a <-> '2001-02-13' LIMIT 3;
diff --git a/contrib/btree_gist/expected/enum_optimizer.out b/contrib/btree_gist/expected/enum_optimizer.out
index 4f57069c301..118676d163a 100644
--- a/contrib/btree_gist/expected/enum_optimizer.out
+++ b/contrib/btree_gist/expected/enum_optimizer.out
@@ -87,6 +87,6 @@ SELECT count(*) FROM enumtmp WHERE a >= 'g'::rainbow;
          ->  Index Scan using enumidx on enumtmp
                Index Cond: (a >= 'g'::rainbow)
                Filter: (a >= 'g'::rainbow)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
diff --git a/contrib/btree_gist/expected/float4_optimizer.out b/contrib/btree_gist/expected/float4_optimizer.out
index 94e24a790b4..cc40e9bd1ae 100644
--- a/contrib/btree_gist/expected/float4_optimizer.out
+++ b/contrib/btree_gist/expected/float4_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '-179.0' FROM float4tmp ORDER BY a <-> '-179.0' LIMIT 3;
          ->  Sort
                Sort Key: ((a <-> '-179'::real))
                ->  Seq Scan on float4tmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '-179.0' FROM float4tmp ORDER BY a <-> '-179.0' LIMIT 3;
diff --git a/contrib/btree_gist/expected/float8_optimizer.out b/contrib/btree_gist/expected/float8_optimizer.out
index 0a4e25a4af4..1bd96c44d3b 100644
--- a/contrib/btree_gist/expected/float8_optimizer.out
+++ b/contrib/btree_gist/expected/float8_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '-1890.0' FROM float8tmp ORDER BY a <-> '-1890.0' LIMIT 3;
          ->  Sort
                Sort Key: ((a <-> '-1890'::double precision))
                ->  Seq Scan on float8tmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '-1890.0' FROM float8tmp ORDER BY a <-> '-1890.0' LIMIT 3;
diff --git a/contrib/btree_gist/expected/inet_optimizer.out b/contrib/btree_gist/expected/inet_optimizer.out
index c694bae65e4..e6bff65a2bf 100644
--- a/contrib/btree_gist/expected/inet_optimizer.out
+++ b/contrib/btree_gist/expected/inet_optimizer.out
@@ -75,7 +75,7 @@ SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
          ->  Index Scan using inetidx on inettmp
                Index Cond: (a = '89.225.196.191'::inet)
                Filter: (a = '89.225.196.191'::inet)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
@@ -96,7 +96,7 @@ SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
          ->  Index Scan using inettmp_a_a1_idx on inettmp
                Index Cond: (a = '89.225.196.191'::inet)
                Filter: (a = '89.225.196.191'::inet)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
diff --git a/contrib/btree_gist/expected/int2_optimizer.out b/contrib/btree_gist/expected/int2_optimizer.out
index b659ba51578..fdfc859097b 100644
--- a/contrib/btree_gist/expected/int2_optimizer.out
+++ b/contrib/btree_gist/expected/int2_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '237' FROM int2tmp ORDER BY a <-> '237' LIMIT 3;
          ->  Sort
                Sort Key: ((a <-> '237'::smallint))
                ->  Seq Scan on int2tmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '237' FROM int2tmp ORDER BY a <-> '237' LIMIT 3;
diff --git a/contrib/btree_gist/expected/int4_optimizer.out b/contrib/btree_gist/expected/int4_optimizer.out
index ab22e4b0c14..67107e63bfa 100644
--- a/contrib/btree_gist/expected/int4_optimizer.out
+++ b/contrib/btree_gist/expected/int4_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '237' FROM int4tmp ORDER BY a <-> '237' LIMIT 3;
          ->  Sort
                Sort Key: ((a <-> 237))
                ->  Seq Scan on int4tmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '237' FROM int4tmp ORDER BY a <-> '237' LIMIT 3;
diff --git a/contrib/btree_gist/expected/int8_optimizer.out b/contrib/btree_gist/expected/int8_optimizer.out
index 1dad0688e22..ba8e21135e8 100644
--- a/contrib/btree_gist/expected/int8_optimizer.out
+++ b/contrib/btree_gist/expected/int8_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '464571291354841' FROM int8tmp ORDER BY a <-> '464571291354841'
          ->  Sort
                Sort Key: ((a <-> '464571291354841'::bigint))
                ->  Seq Scan on int8tmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '464571291354841' FROM int8tmp ORDER BY a <-> '464571291354841' LIMIT 3;
diff --git a/contrib/btree_gist/expected/interval_optimizer.out b/contrib/btree_gist/expected/interval_optimizer.out
index 6f80bbb2dae..f5afd17456b 100644
--- a/contrib/btree_gist/expected/interval_optimizer.out
+++ b/contrib/btree_gist/expected/interval_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21
          ->  Sort
                Sort Key: ((a <-> '@ 199 days 21 hours 21 mins 23 secs'::interval))
                ->  Seq Scan on intervaltmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
@@ -104,7 +104,7 @@ SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21
          ->  Sort
                Sort Key: ((a <-> '@ 199 days 21 hours 21 mins 23 secs'::interval))
                ->  Seq Scan on intervaltmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '199 days 21:21:23' FROM intervaltmp ORDER BY a <-> '199 days 21:21:23' LIMIT 3;
diff --git a/contrib/btree_gist/expected/macaddr8_optimizer.out b/contrib/btree_gist/expected/macaddr8_optimizer.out
index 5b2ae8caf31..25a84f81383 100644
--- a/contrib/btree_gist/expected/macaddr8_optimizer.out
+++ b/contrib/btree_gist/expected/macaddr8_optimizer.out
@@ -74,7 +74,7 @@ SELECT * FROM macaddr8tmp WHERE a < '02:03:04:05:06:07'::macaddr8;
    ->  Index Scan using macaddr8idx on macaddr8tmp
          Index Cond: (a < '02:03:04:ff:fe:05:06:07'::macaddr8)
          Filter: (a < '02:03:04:ff:fe:05:06:07'::macaddr8)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (5 rows)
 
 SELECT * FROM macaddr8tmp WHERE a < '02:03:04:05:06:07'::macaddr8;
diff --git a/contrib/btree_gist/expected/macaddr_optimizer.out b/contrib/btree_gist/expected/macaddr_optimizer.out
index b5dff8ac830..e5f4e0602f5 100644
--- a/contrib/btree_gist/expected/macaddr_optimizer.out
+++ b/contrib/btree_gist/expected/macaddr_optimizer.out
@@ -74,7 +74,7 @@ SELECT * FROM macaddrtmp WHERE a < '02:03:04:05:06:07'::macaddr;
    ->  Index Scan using macaddridx on macaddrtmp
          Index Cond: (a < '02:03:04:05:06:07'::macaddr)
          Filter: (a < '02:03:04:05:06:07'::macaddr)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (5 rows)
 
 SELECT * FROM macaddrtmp WHERE a < '02:03:04:05:06:07'::macaddr;
diff --git a/contrib/btree_gist/expected/not_equal_optimizer.out b/contrib/btree_gist/expected/not_equal_optimizer.out
index 579f92f0982..e99a1155ea0 100644
--- a/contrib/btree_gist/expected/not_equal_optimizer.out
+++ b/contrib/btree_gist/expected/not_equal_optimizer.out
@@ -16,7 +16,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
  Gather Motion 3:1  (slice1; segments: 3)
    ->  Seq Scan on test_ne
          Filter: ((a <> 'Thu Jan 01 00:00:00 2009'::timestamp without time zone) AND (b <> 10.7))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (4 rows)
 
 SELECT * FROM test_ne WHERE a <> '2009-01-01' AND b <> 10.7;
diff --git a/contrib/btree_gist/expected/numeric_optimizer.out b/contrib/btree_gist/expected/numeric_optimizer.out
index 3edf30fee0a..41c4996c06f 100644
--- a/contrib/btree_gist/expected/numeric_optimizer.out
+++ b/contrib/btree_gist/expected/numeric_optimizer.out
@@ -199,7 +199,7 @@ SELECT * FROM numerictmp WHERE a BETWEEN 1 AND 300 ORDER BY a;
          ->  Index Scan using numericidx on numerictmp
                Index Cond: ((a >= '1'::numeric) AND (a <= '300'::numeric))
                Filter: ((a >= '1'::numeric) AND (a <= '300'::numeric))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (8 rows)
 
 SELECT * FROM numerictmp WHERE a BETWEEN 1 AND 300 ORDER BY a;
diff --git a/contrib/btree_gist/expected/text_optimizer.out b/contrib/btree_gist/expected/text_optimizer.out
index 9651b9d231d..76a2c86337b 100644
--- a/contrib/btree_gist/expected/text_optimizer.out
+++ b/contrib/btree_gist/expected/text_optimizer.out
@@ -81,7 +81,7 @@ SELECT * FROM texttmp WHERE a BETWEEN '31a' AND '31c';
    ->  Index Scan using textidx on texttmp
          Index Cond: ((a >= '31a'::text) AND (a <= '31c'::text))
          Filter: ((a >= '31a'::text) AND (a <= '31c'::text))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (5 rows)
 
 SELECT * FROM texttmp WHERE a BETWEEN '31a' AND '31c';
diff --git a/contrib/btree_gist/expected/time_optimizer.out b/contrib/btree_gist/expected/time_optimizer.out
index 2005e89bf9f..590ada880b9 100644
--- a/contrib/btree_gist/expected/time_optimizer.out
+++ b/contrib/btree_gist/expected/time_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '10:57:11' FROM timetmp ORDER BY a <-> '10:57:11' LIMIT 3;
          ->  Sort
                Sort Key: ((a <-> '10:57:11'::time without time zone))
                ->  Seq Scan on timetmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '10:57:11' FROM timetmp ORDER BY a <-> '10:57:11' LIMIT 3;
diff --git a/contrib/btree_gist/expected/timestamp_optimizer.out b/contrib/btree_gist/expected/timestamp_optimizer.out
index 296bc3e8ac8..1b8e709fe90 100644
--- a/contrib/btree_gist/expected/timestamp_optimizer.out
+++ b/contrib/btree_gist/expected/timestamp_optimizer.out
@@ -82,7 +82,7 @@ SELECT a, a <-> '2004-10-26 08:55:08' FROM timestamptmp ORDER BY a <-> '2004-10-
          ->  Sort
                Sort Key: ((a <-> 'Tue Oct 26 08:55:08 2004'::timestamp without time zone))
                ->  Seq Scan on timestamptmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '2004-10-26 08:55:08' FROM timestamptmp ORDER BY a <-> '2004-10-26 08:55:08' LIMIT 3;
diff --git a/contrib/btree_gist/expected/timestamptz_optimizer.out b/contrib/btree_gist/expected/timestamptz_optimizer.out
index e2cd3dc89cb..2173c5dca35 100644
--- a/contrib/btree_gist/expected/timestamptz_optimizer.out
+++ b/contrib/btree_gist/expected/timestamptz_optimizer.out
@@ -202,7 +202,7 @@ SELECT a, a <-> '2018-12-18 10:59:54 GMT+2' FROM timestamptztmp ORDER BY a <-> '
          ->  Sort
                Sort Key: ((a <-> 'Tue Dec 18 04:59:54 2018 PST'::timestamp with time zone))
                ->  Seq Scan on timestamptztmp
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 SELECT a, a <-> '2018-12-18 10:59:54 GMT+2' FROM timestamptztmp ORDER BY a <-> '2018-12-18 10:59:54 GMT+2' LIMIT 3;
diff --git a/contrib/btree_gist/expected/varbit_optimizer.out b/contrib/btree_gist/expected/varbit_optimizer.out
index f73f5688ab1..98727abe44c 100644
--- a/contrib/btree_gist/expected/varbit_optimizer.out
+++ b/contrib/btree_gist/expected/varbit_optimizer.out
@@ -74,6 +74,6 @@ SELECT a FROM bittmp WHERE a BETWEEN '1000000' and '1000001';
    ->  Index Scan using bitidx on bittmp
          Index Cond: ((a >= '1000000'::"bit") AND (a <= '1000001'::"bit"))
          Filter: ((a >= '1000000'::"bit") AND (a <= '1000001'::"bit"))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (5 rows)
 
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index ea990020baf..af82922522b 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -198,7 +198,7 @@ dblink_get_conn(char *conname_or_str,
 		connstr = get_connect_string(conname_or_str);
 		if (connstr == NULL)
 			connstr = conname_or_str;
-		dblink_connstr_check(connstr);
+		connstr = dblink_connstr_check(connstr);
 
 		/*
 		 * We must obey fd.c's limit on non-virtual file descriptors.  Assume
@@ -312,7 +312,6 @@ dblink_connect(PG_FUNCTION_ARGS)
 
 	/* check password in connection string if not superuser */
 	connstr = dblink_connstr_check(connstr);
-	dblink_connstr_check(connstr);
 
 	/*
 	 * We must obey fd.c's limit on non-virtual file descriptors.  Assume that
diff --git a/contrib/interconnect/ic_common.c b/contrib/interconnect/ic_common.c
index d629eb09698..7e266b69efb 100644
--- a/contrib/interconnect/ic_common.c
+++ b/contrib/interconnect/ic_common.c
@@ -541,14 +541,15 @@ GetMotionSentRecordTypmod(ChunkTransportState * transportStates,
 						   int16 motNodeID,
 						   int16 targetRoute)
 {
-	MotionConn *conn;
+	MotionConn *conn = NULL;
 	ChunkTransportStateEntry *pEntry = NULL;
 	getChunkTransportState(transportStates, motNodeID, &pEntry);
 
-	if (targetRoute == BROADCAST_SEGIDX)
-		conn = &pEntry->conns[0];
-	else
-		conn = &pEntry->conns[targetRoute];
+	if (targetRoute == BROADCAST_SEGIDX) {
+		targetRoute = 0;
+	}
+
+	getMotionConn(pEntry, targetRoute, &conn);
 
 	return &conn->sent_record_typmod;
 }
diff --git a/contrib/interconnect/ic_internal.h b/contrib/interconnect/ic_internal.h
index 77c08ee6e29..8557115cd33 100644
--- a/contrib/interconnect/ic_internal.h
+++ b/contrib/interconnect/ic_internal.h
@@ -10,6 +10,11 @@
  */
 #ifndef INTER_CONNECT_INTERNAL_H
 #define INTER_CONNECT_INTERNAL_H
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/queue.h>
+#include <pthread.h>
 
 #include "tcp/ic_tcp.h"
 #include "udp/ic_udpifc.h"
@@ -33,6 +38,27 @@ typedef enum MotionConnState
 	mcsEosSent
 }			MotionConnState;
 
+struct udp_send_vars
+{
+	/* send sequence variables */
+	uint32_t snd_una;		/* send unacknoledged */
+	uint32_t snd_wnd;		/* send window (unscaled) */
+
+	/* retransmission timeout variables */
+	uint8_t nrtx;			/* number of retransmission */
+	uint8_t max_nrtx;		/* max number of retransmission */
+	uint32_t rto;			/* retransmission timeout */
+	uint32_t ts_rto;		/* timestamp for retransmission timeout */
+
+	/* congestion control variables */
+	uint32_t cwnd;				/* congestion window */
+	uint32_t ssthresh;			/* slow start threshold */
+
+	TAILQ_ENTRY(MotionConnUDP) send_link;
+	TAILQ_ENTRY(MotionConnUDP) timer_link;		/* timer link (rto list) */
+
+};
+
 /*
  * Structure used for keeping track of a pt-to-pt connection between two
  * Cdb Entities (either QE or QD).
@@ -153,6 +179,32 @@ typedef struct MotionConnUDP
 	uint64		stat_count_resent;
 	uint64		stat_max_resent;
 	uint64		stat_count_dropped;
+
+	struct {
+			uint32_t ts_rto;
+			uint32_t rto;
+			uint32_t srtt;
+			uint32_t rttvar;
+			uint32_t snd_una;
+			uint16_t nrtx;
+			uint16_t max_nrtx;
+			uint32_t mss;
+			uint32_t cwnd;
+			uint32_t ssthresh;
+			uint32_t fss;
+			uint8_t loss_count;
+			uint32_t mdev;
+			uint32_t mdev_max;
+			uint32_t rtt_seq;		/* sequence number to update rttvar */
+			uint32_t ts_all_rto;
+			bool karn_mode;
+	} rttvar;
+	
+	uint8_t on_timewait_list;
+	int16_t on_rto_idx;
+
+	uint32_t snd_nxt;		/* send next */
+	struct udp_send_vars sndvar;
 }			MotionConnUDP;
 
 typedef struct MotionConnTCP
diff --git a/contrib/interconnect/test/ic_test_env.c b/contrib/interconnect/test/ic_test_env.c
index 5333a143de5..1c9f2d0ce05 100644
--- a/contrib/interconnect/test/ic_test_env.c
+++ b/contrib/interconnect/test/ic_test_env.c
@@ -330,6 +330,7 @@ client_side_global_var_init(MotionIPCLayer * motion_ipc_layer, pid_t *ic_proxy_p
 
 	Gp_interconnect_queue_depth = 800;
 	Gp_interconnect_snd_queue_depth = 600;
+	Gp_interconnect_mem_size = 20;
 	Gp_interconnect_timer_period = 1;
 	Gp_interconnect_timer_checking_period = 2;
 	InitializeLatchSupport();
@@ -374,6 +375,7 @@ server_side_global_var_init(MotionIPCLayer * motion_ipc_layer, pid_t *ic_proxy_p
 
 	Gp_interconnect_queue_depth = 800;
 	Gp_interconnect_snd_queue_depth = 600;
+	Gp_interconnect_mem_size = 20;
 	Gp_interconnect_timer_period = 1;
 	Gp_interconnect_timer_checking_period = 2;
 	InitializeLatchSupport();
diff --git a/contrib/interconnect/udp/ic_udpifc.c b/contrib/interconnect/udp/ic_udpifc.c
index 63e8c9301dd..d11e4577cd6 100644
--- a/contrib/interconnect/udp/ic_udpifc.c
+++ b/contrib/interconnect/udp/ic_udpifc.c
@@ -26,13 +26,17 @@
 #include "ic_udpifc.h"
 #include "ic_internal.h"
 #include "ic_common.h"
-
 #include <pthread.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/queue.h>
+#include <assert.h>
 
 #include "access/transam.h"
 #include "access/xact.h"
@@ -116,6 +120,57 @@ WSAPoll(
 #undef select
 #endif
 
+#define TIMEOUT_Z
+#define RTT_SHIFT_ALPHA (3)       /* srtt (0.125) */
+#define LOSS_THRESH (3) /* Packet loss triggers Karn */
+#define RTO_MIN (5000)   /* MIN RTO(ms) */
+#define RTO_MAX (100000) /* MAX RTO(ms) */
+#define UDP_INFINITE_SSTHRESH   0x7fffffff
+
+#define SEC_TO_USEC(t)                  ((t) * 1000000)
+#define SEC_TO_MSEC(t)                  ((t) * 1000)
+#define MSEC_TO_USEC(t)                 ((t) * 1000)
+#define USEC_TO_SEC(t)                  ((t) / 1000000)
+#define TIME_TICK (1000000/HZ)/* in us */
+
+#define UDP_INITIAL_RTO                 (MSEC_TO_USEC(200))
+#define UDP_DEFAULT_MSS 1460
+
+#define RTO_HASH (3000)
+
+#define UDP_SEQ_LT(a,b) ((int32_t)((a)-(b)) < 0)
+#define UDP_SEQ_LEQ(a,b) ((int32_t)((a)-(b)) <= 0)
+#define UDP_SEQ_GT(a,b) ((int32_t)((a)-(b)) > 0)
+#define UDP_SEQ_GEQ(a,b) ((int32_t)((a)-(b)) >= 0)
+
+#ifndef MAX
+#define MAX(a, b) ((a)>(b)?(a):(b))
+#endif
+#ifndef MIN
+#define MIN(a, b) ((a)<(b)?(a):(b))
+#endif
+
+#define UDP_RTO_MIN ((unsigned)(HZ/5))
+
+struct rto_hashstore
+{
+	uint32_t    rto_now_idx;    /* pointing the hs_table_s index */
+	uint32_t    rto_now_ts;
+
+	TAILQ_HEAD(rto_head, MotionConnUDP) rto_list[RTO_HASH + 1];
+};
+
+struct mudp_manager
+{
+	struct rto_hashstore *rto_store;     /* lists related to timeout */
+
+	int         rto_list_cnt;
+	uint32_t    cur_ts;
+};
+
+typedef struct mudp_manager* mudp_manager_t;
+static struct mudp_manager mudp;
+
 #define MAX_TRY (11)
 int
 			timeoutArray[] =
@@ -154,6 +209,7 @@ int
 #define UDPIC_FLAGS_DISORDER    		(32)
 #define UDPIC_FLAGS_DUPLICATE   		(64)
 #define UDPIC_FLAGS_CAPACITY    		(128)
+#define UDPIC_FLAGS_FULL        		(256)
 
 /*
  * ConnHtabBin
@@ -516,8 +572,10 @@ static ICGlobalControlInfo ic_control_info;
  */
 #define UNACK_QUEUE_RING_SLOTS_NUM (2000)
 #define TIMER_SPAN (Gp_interconnect_timer_period * 1000ULL)	/* default: 5ms */
-#define TIMER_CHECKING_PERIOD (Gp_interconnect_timer_checking_period)	/* default: 20ms */
+#define TIMER_SPAN_LOSS (Gp_interconnect_timer_period * 500ULL)     /* default: 5ms */
+#define TIMER_CHECKING_PERIOD Gp_interconnect_timer_checking_period	/* default: 20ms */
 #define UNACK_QUEUE_RING_LENGTH (UNACK_QUEUE_RING_SLOTS_NUM * TIMER_SPAN)
+#define UNACK_QUEUE_RING_LENGTH_LOSS (UNACK_QUEUE_RING_SLOTS_NUM * TIMER_SPAN_LOSS)
 
 #define DEFAULT_RTT (Gp_interconnect_default_rtt * 1000)	/* default: 20ms */
 #define MIN_RTT (100)			/* 0.1ms */
@@ -537,6 +595,7 @@ static ICGlobalControlInfo ic_control_info;
 
 #define MAX_SEQS_IN_DISORDER_ACK (4)
 
+#define MAX_QUEUE_SIZE (64)
 /*
  * UnackQueueRing
  *
@@ -573,12 +632,19 @@ struct UnackQueueRing
 
 	/* time slots */
 	ICBufferList slots[UNACK_QUEUE_RING_SLOTS_NUM];
+#ifdef TIMEOUT_Z
+	uint32_t retrans_count;
+	uint32_t no_retrans_count;
+	uint32_t time_difference;
+	uint32_t min;
+	uint32_t max;
+#endif
 };
 
 /*
  * All connections in a process share this unack queue ring instance.
  */
-static UnackQueueRing unack_queue_ring = {0, 0, 0};
+static UnackQueueRing unack_queue_ring = {0};
 
 static int	ICSenderSocket = -1;
 static int32 ICSenderPort = 0;
@@ -746,8 +812,8 @@ static void checkQDConnectionAlive(void);
 static void *rxThreadFunc(void *arg);
 
 static bool handleMismatch(icpkthdr *pkt, struct sockaddr_storage *peer, int peer_len);
-static void handleAckedPacket(MotionConn *ackConn, ICBuffer *buf, uint64 now);
-static bool handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChunkEntry);
+static void handleAckedPacket(MotionConn *ackConn, ICBuffer *buf, uint64 now, struct icpkthdr *pkt);
+static bool handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChunkEntry, bool need_flush);
 static void handleStopMsgs(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChunkEntry, int16 motionId);
 static void handleDisorderPacket(MotionConn *conn, int pos, uint32 tailSeq, icpkthdr *pkt);
 static bool handleDataPacket(MotionConn *conn, icpkthdr *pkt, struct sockaddr_storage *peer, socklen_t *peerlen, AckSendParam *param, bool *wakeup_mainthread);
@@ -766,9 +832,11 @@ static void initSndBufferPool();
 
 static void putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64 now);
 static void initUnackQueueRing(UnackQueueRing *uqr);
+static void initUdpManager(mudp_manager_t mptr);
+static inline void checkNetworkTimeout(ICBuffer *buf, uint64 now, bool *networkTimeoutIsLogged);
 
 static void checkExpiration(ChunkTransportState *transportStates, ChunkTransportStateEntry *pEntry, MotionConn *triggerConn, uint64 now);
-static void checkDeadlock(ChunkTransportStateEntry *pChunkEntry, MotionConn *conn);
+static void checkDeadlock(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChunkEntry, MotionConn *conn);
 
 static bool cacheFuturePacket(icpkthdr *pkt, struct sockaddr_storage *peer, int peer_len);
 static void cleanupStartupCache(void);
@@ -924,6 +992,349 @@ dumpTransProtoStats()
 
 #endif							/* TRANSFER_PROTOCOL_STATS */
 
+static struct rto_hashstore*
+initRTOHashstore()
+{
+	int i;
+	struct rto_hashstore* hs = palloc(sizeof(struct rto_hashstore));
+
+	for (i = 0; i < RTO_HASH; i++)
+		TAILQ_INIT(&hs->rto_list[i]);
+
+	TAILQ_INIT(&hs->rto_list[RTO_HASH]);
+
+	return hs;
+}
+
+static void
+initUdpManager(mudp_manager_t mudp)
+{
+	mudp->rto_store = initRTOHashstore();
+	mudp->rto_list_cnt = 0;
+	mudp->cur_ts = 0;
+}
+
+static inline void
+addtoRTOList(mudp_manager_t mudp, MotionConnUDP *cur_stream)
+{
+	if (!mudp->rto_list_cnt)
+	{
+		mudp->rto_store->rto_now_idx = 0;
+		mudp->rto_store->rto_now_ts = cur_stream->sndvar.ts_rto;
+	}
+
+	if (cur_stream->on_rto_idx < 0 )
+	{
+		if (cur_stream->on_timewait_list)
+			return;
+
+		int diff = (int32_t)(cur_stream->sndvar.ts_rto - mudp->rto_store->rto_now_ts);
+		if (diff < RTO_HASH)
+		{
+			int offset= (diff + mudp->rto_store->rto_now_idx) % RTO_HASH;
+			cur_stream->on_rto_idx = offset;
+			TAILQ_INSERT_TAIL(&(mudp->rto_store->rto_list[offset]),
+					cur_stream, sndvar.timer_link);
+		}
+		else
+		{
+			cur_stream->on_rto_idx = RTO_HASH;
+			TAILQ_INSERT_TAIL(&(mudp->rto_store->rto_list[RTO_HASH]),
+					cur_stream, sndvar.timer_link);
+		}
+		mudp->rto_list_cnt++;
+	}
+}
+
+static inline void
+removeFromRTOList(mudp_manager_t mudp,
+				MotionConnUDP *cur_stream)
+{
+	if (cur_stream->on_rto_idx < 0)
+		return;
+
+	TAILQ_REMOVE(&mudp->rto_store->rto_list[cur_stream->on_rto_idx],
+			cur_stream, sndvar.timer_link);
+	cur_stream->on_rto_idx = -1;
+
+	mudp->rto_list_cnt--;
+}
+
+static inline void
+updateRetransmissionTimer(mudp_manager_t mudp,
+				MotionConnUDP *cur_stream,
+				uint32_t cur_ts)
+{
+	cur_stream->sndvar.nrtx = 0;
+
+	/* if in rto list, remove it */
+	if (cur_stream->on_rto_idx >= 0)
+		removeFromRTOList(mudp, cur_stream);
+
+	/* Reset retransmission timeout */
+	if (UDP_SEQ_GT(cur_stream->snd_nxt, cur_stream->sndvar.snd_una))
+	{
+		/* there are packets sent but not acked */
+		/* update rto timestamp */
+		cur_stream->sndvar.ts_rto = cur_ts + cur_stream->sndvar.rto;
+		addtoRTOList(mudp, cur_stream);
+	}
+
+	if (cur_stream->on_rto_idx == -1)
+	{
+		cur_stream->sndvar.ts_rto = cur_ts + cur_stream->sndvar.rto;
+		addtoRTOList(mudp, cur_stream);
+	}
+}
+
+static int 
+handleRTO(mudp_manager_t mudp,
+				uint32_t cur_ts,
+				MotionConnUDP *cur_stream,
+				ChunkTransportState *transportStates,
+				ChunkTransportStateEntry *pEntry,
+				MotionConn *triggerConn)
+{
+	/* check for expiration */
+	int                     count = 0;
+	int                     retransmits = 0;
+	MotionConnUDP *currBuffConn = NULL;
+	uint32_t now = cur_ts;
+
+	Assert(unack_queue_ring.currentTime != 0);
+	removeFromRTOList(mudp, cur_stream);
+
+	while (now >= (unack_queue_ring.currentTime + TIMER_SPAN) && count++ < UNACK_QUEUE_RING_SLOTS_NUM)
+	{
+		/* expired, need to resend them */
+		ICBuffer   *curBuf = NULL;
+
+		while ((curBuf = icBufferListPop(&unack_queue_ring.slots[unack_queue_ring.idx])) != NULL)
+		{
+			curBuf->nRetry++;
+			putIntoUnackQueueRing(
+								&unack_queue_ring,
+								curBuf,
+								computeExpirationPeriod(curBuf->conn, curBuf->nRetry), now);
+
+#ifdef TRANSFER_PROTOCOL_STATS
+			updateStats(TPE_DATA_PKT_SEND, curBuf->conn, curBuf->pkt);
+#endif
+
+			sendOnce(transportStates, pEntry, curBuf, curBuf->conn);
+
+			currBuffConn = CONTAINER_OF(curBuf->conn, MotionConnUDP, mConn);
+
+			retransmits++;
+			ic_statistics.retransmits++;
+			currBuffConn->stat_count_resent++;
+			currBuffConn->stat_max_resent = Max(currBuffConn->stat_max_resent, currBuffConn->stat_count_resent);
+			checkNetworkTimeout(curBuf, now, &transportStates->networkTimeoutIsLogged);
+
+#ifdef AMS_VERBOSE_LOGGING
+			write_log("RESEND pkt with seq %d (retry %d, rtt " UINT64_FORMAT ") to route %d",
+				  curBuf->pkt->seq, curBuf->nRetry, curBuf->conn->rtt, curBuf->conn->route);
+			logPkt("RESEND PKT in checkExpiration", curBuf->pkt);
+#endif
+		}
+
+		unack_queue_ring.currentTime += TIMER_SPAN;
+		unack_queue_ring.idx = (unack_queue_ring.idx + 1) % (UNACK_QUEUE_RING_SLOTS_NUM);
+	}
+	return 0;
+}
+
+static inline void
+rearrangeRTOStore(mudp_manager_t mudp)
+{
+	MotionConnUDP *walk, *next;
+	struct rto_head* rto_list = &mudp->rto_store->rto_list[RTO_HASH];
+	int cnt = 0;
+
+	for (walk = TAILQ_FIRST(rto_list); walk != NULL; walk = next)
+	{
+		next = TAILQ_NEXT(walk, sndvar.timer_link);
+
+		int diff = (int32_t)(mudp->rto_store->rto_now_ts - walk->sndvar.ts_rto);
+		if (diff < RTO_HASH)
+		{
+			int offset = (diff + mudp->rto_store->rto_now_idx) % RTO_HASH;
+			TAILQ_REMOVE(&mudp->rto_store->rto_list[RTO_HASH],
+					walk, sndvar.timer_link);
+			walk->on_rto_idx = offset;
+			TAILQ_INSERT_TAIL(&(mudp->rto_store->rto_list[offset]),
+					walk, sndvar.timer_link);
+		}
+		cnt++;
+	}
+}
+
+static inline void
+checkRtmTimeout(mudp_manager_t mudp,
+				uint32_t cur_ts,
+				int thresh,
+				ChunkTransportState *transportStates,
+				ChunkTransportStateEntry *pEntry,
+				MotionConn *triggerConn)
+{
+	MotionConnUDP *walk, *next;
+	struct rto_head* rto_list;
+	int cnt;
+
+	if (!mudp->rto_list_cnt)
+		return;
+
+	cnt = 0;
+
+	while (1)
+	{
+		rto_list = &mudp->rto_store->rto_list[mudp->rto_store->rto_now_idx];
+		if ((int32_t)(cur_ts - mudp->rto_store->rto_now_ts) < 0)
+			break;
+
+		for (walk = TAILQ_FIRST(rto_list); walk != NULL; walk = next)
+		{
+			if (++cnt > thresh)
+				break;
+			next = TAILQ_NEXT(walk, sndvar.timer_link);
+
+			if (walk->on_rto_idx >= 0)
+			{
+				TAILQ_REMOVE(rto_list, walk, sndvar.timer_link);
+				mudp->rto_list_cnt--;
+				walk->on_rto_idx = -1;
+				handleRTO(mudp, cur_ts, walk, transportStates, pEntry, triggerConn);
+			}
+		}
+
+		if (cnt > thresh)
+		{
+			break;
+		}
+		else
+		{
+			mudp->rto_store->rto_now_idx = (mudp->rto_store->rto_now_idx + 1) % RTO_HASH;
+			mudp->rto_store->rto_now_ts++;
+			if (!(mudp->rto_store->rto_now_idx % 1000))
+				rearrangeRTOStore(mudp);
+		}
+
+	}
+}
+
+/*
+ * estimateRTT - Dynamically estimates the Round-Trip Time (RTT) and adjusts Retransmission Timeout (RTO)
+ * 
+ * This function implements a variant of the Jacobson/Karels algorithm for RTT estimation, adapted for UDP-based
+ * motion control connections. It updates smoothed RTT (srtt), mean deviation (mdev), and RTO values based on 
+ * newly measured RTT samples (mrtt). The RTO calculation ensures reliable data transmission over unreliable networks.
+ *
+ * Key Components:
+ *   - srtt:   Smoothed Round-Trip Time (weighted average of historical RTT samples)
+ *   - mdev:   Mean Deviation (measure of RTT variability)
+ *   - rttvar: Adaptive RTT variation bound (used to clamp RTO updates)
+ *   - rto:    Retransmission Timeout (dynamically adjusted based on srtt + rttvar)
+ *
+ * Algorithm Details:
+ *   1. For the first RTT sample:
+ *        srtt    = mrtt << 3   (scaled by 8 for fixed-point arithmetic)
+ *        mdev    = mrtt << 1   (scaled by 2)
+ *        rttvar  = max(mdev, rto_min)
+ *   2. For subsequent samples:
+ *        Delta   = mrtt - (srtt >> 3)  (difference between new sample and smoothed RTT)
+ *        srtt   += Delta               (update srtt with 1/8 weight of new sample)
+ *        Delta   = abs(Delta) - (mdev >> 2)
+ *        mdev   += Delta               (update mdev with 1/4 weight)
+ *   3. rttvar bounds the maximum RTT variation:
+ *        If mdev > mdev_max, update mdev_max and rttvar
+ *        On new ACKs (snd_una > rtt_seq), decay rttvar toward mdev_max
+ *   4. Final RTO calculation:
+ *        rto = (srtt >> 3) + rttvar   (clamped to RTO_MAX)
+ *
+ * Parameters:
+ *   @mConn:  Parent motion connection context (container of MotionConnUDP)
+ *   @mrtt:   Measured Round-Trip Time (in microseconds) for the latest packet
+ *
+ * Notes:
+ *   - Designed for non-retransmitted packets to avoid sampling bias.
+ *   - Uses fixed-point arithmetic to avoid floating-point operations.
+ *   - Minimum RTO (rto_min) is set to 20ms (HZ/5/10, assuming HZ=100).
+ *   - Critical for adaptive timeout control in UDP protocols where reliability is implemented at the application layer.
+ *   - Thread-unsafe: Must be called in a synchronized context (e.g., packet processing loop).
+ */
+
+static inline void
+estimateRTT(MotionConn *mConn , uint32_t mrtt)
+{
+	/* This function should be called for not retransmitted packets */
+	/* TODO: determine rto_min */
+	MotionConnUDP *conn = NULL;
+
+	conn = CONTAINER_OF(mConn, MotionConnUDP, mConn);
+	long m = mrtt;
+	uint32_t rto_min = UDP_RTO_MIN / 10;
+
+	if (m == 0)
+		m = 1;
+
+	/*
+	 * Special RTO optimization for high-speed networks:
+	 * When measured RTT (m) is below 100 microseconds and current RTO is under 10ms,
+	 * forcibly set RTO to half of RTO_MIN. This targets two scenarios:
+	 *   - Loopback interfaces (localhost communication)
+	 *   - Ultra-low-latency networks (e.g., InfiniBand, RDMA)
+	 */
+	if(m < 100 && conn->rttvar.rto < 10000)
+	{
+		conn->rttvar.rto = RTO_MIN / 2;
+	}
+
+	if (conn->rttvar.srtt != 0)
+	{
+		/* rtt = 7/8 rtt + 1/8 new */
+		m -= (conn->rttvar.srtt >> LOSS_THRESH);
+		conn->rttvar.srtt += m;
+		if (m < 0)
+		{
+			m = -m;
+			m -= (conn->rttvar.mdev >> RTT_SHIFT_ALPHA);
+			if (m > 0)
+				m >>= LOSS_THRESH;
+		}
+		else
+		{
+			m -= (conn->rttvar.mdev >> RTT_SHIFT_ALPHA);
+		}
+		conn->rttvar.mdev += m;
+		if (conn->rttvar.mdev > conn->rttvar.mdev_max)
+		{
+			conn->rttvar.mdev_max = conn->rttvar.mdev;
+			if (conn->rttvar.mdev_max > conn->rttvar.rttvar)
+			{
+				conn->rttvar.rttvar = conn->rttvar.mdev_max;
+			}
+		}
+		if (UDP_SEQ_GT(conn->rttvar.snd_una, conn->rttvar.rtt_seq))
+		{
+			if (conn->rttvar.mdev_max < conn->rttvar.rttvar)
+			{
+				conn->rttvar.rttvar -= (conn->rttvar.rttvar - conn->rttvar.mdev_max) >> RTT_SHIFT_ALPHA;
+			}
+			conn->rttvar.mdev_max = rto_min;
+		}
+	}
+	else
+	{
+		/* fresh measurement */
+		conn->rttvar.srtt = m << LOSS_THRESH;
+		conn->rttvar.mdev = m << 1;
+		conn->rttvar.mdev_max = conn->rttvar.rttvar = MAX(conn->rttvar.mdev, rto_min);
+	}
+
+	conn->rttvar.rto = ((conn->rttvar.srtt >> LOSS_THRESH) + conn->rttvar.rttvar) > RTO_MAX ? RTO_MAX : ((conn->rttvar.srtt >> LOSS_THRESH) + conn->rttvar.rttvar);
+}
+
+
 /*
  * initCursorICHistoryTable
  * 		Initialize cursor ic history table.
@@ -2522,6 +2933,14 @@ initUnackQueueRing(UnackQueueRing *uqr)
 	{
 		icBufferListInit(&uqr->slots[i], ICBufferListType_Secondary);
 	}
+
+#ifdef TIMEOUT_Z
+	uqr->retrans_count = 0;
+	uqr->no_retrans_count = 0;
+	uqr->time_difference = 0;
+	uqr->min = 0;
+	uqr->max = 0;
+#endif
 }
 
 /*
@@ -2556,6 +2975,9 @@ computeExpirationPeriod(MotionConn *mConn, uint32 retry)
 	else
 #endif
 	{
+		if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
+			return Min(retry > 3 ? conn->rttvar.rto * retry : conn->rttvar.rto, UNACK_QUEUE_RING_LENGTH_LOSS);
+
 		uint32		factor = (retry <= 12 ? retry : 12);
 
 		return Max(MIN_EXPIRATION_PERIOD, Min(MAX_EXPIRATION_PERIOD, (conn->rtt + (conn->dev << 2)) << (factor)));
@@ -2968,6 +3390,19 @@ setupOutgoingUDPConnection(ChunkTransportState *transportStates, ChunkTransportS
 	conn->mConn.msgSize = sizeof(conn->conn_info);
 	conn->mConn.stillActive = true;
 	conn->conn_info.seq = 1;
+	conn->rttvar.ts_rto = 0;
+	conn->rttvar.rto = UDP_INITIAL_RTO;
+	conn->rttvar.srtt = 0;
+	conn->rttvar.rttvar = 0;
+	conn->rttvar.snd_una = 0;
+	conn->rttvar.nrtx = 0;
+	conn->rttvar.max_nrtx = 0;
+	conn->rttvar.mss = UDP_DEFAULT_MSS;
+	conn->rttvar.cwnd = 2;
+	conn->rttvar.ssthresh = UDP_INFINITE_SSTHRESH;
+	conn->rttvar.loss_count = 0;
+	conn->rttvar.karn_mode = false;
+	conn->on_rto_idx = -1;
 	Assert(conn->peer.ss_family == AF_INET || conn->peer.ss_family == AF_INET6);
 
 }								/* setupOutgoingUDPConnection */
@@ -3207,6 +3642,19 @@ SetupUDPIFCInterconnect_Internal(SliceTable *sliceTable)
 				conn->conn_info.icId = sliceTable->ic_instance_id;
 				conn->conn_info.flags = UDPIC_FLAGS_RECEIVER_TO_SENDER;
 
+				conn->rttvar.ts_rto = 0;
+				conn->rttvar.rto = UDP_INITIAL_RTO;
+				conn->rttvar.srtt = 0;
+				conn->rttvar.rttvar = 0;
+				conn->rttvar.snd_una = 0;
+				conn->rttvar.nrtx = 0;
+				conn->rttvar.max_nrtx = 0;
+				conn->rttvar.mss = UDP_DEFAULT_MSS;
+				conn->rttvar.cwnd = 2;
+				conn->rttvar.ssthresh = UDP_INFINITE_SSTHRESH;
+				conn->rttvar.loss_count = 0;
+				conn->rttvar.karn_mode = false;
+				conn->on_rto_idx = -1;
 				connAddHash(&ic_control_info.connHtab, &conn->mConn);
 			}
 		}
@@ -3221,6 +3669,8 @@ SetupUDPIFCInterconnect_Internal(SliceTable *sliceTable)
 	{
 		initSndBufferPool(&snd_buffer_pool);
 		initUnackQueueRing(&unack_queue_ring);
+		if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER)
+			initUdpManager(&mudp);
 		ic_control_info.isSender = true;
 		ic_control_info.lastExpirationCheckTime = getCurrentTime();
 		ic_control_info.lastPacketSendTime = ic_control_info.lastExpirationCheckTime;
@@ -3284,6 +3734,9 @@ static inline void
 SetupUDPIFCInterconnect(EState *estate)
 {
 	ChunkTransportState *icContext = NULL;
+	int32 sliceNum = 0;
+	int32 calcQueueDepth = 0;
+	int32 calcSndDepth = 0;
 	PG_TRY();
 	{
 		/*
@@ -3291,6 +3744,39 @@ SetupUDPIFCInterconnect(EState *estate)
 		 * technically it is not part of current query, discard it directly.
 		 */
 		resetRxThreadError();
+		if (estate != NULL && estate->es_sliceTable != NULL)
+			sliceNum = estate->es_sliceTable->numSlices;
+		else
+			sliceNum = 1;
+
+		if (Gp_interconnect_mem_size > 0 &&
+			Gp_interconnect_queue_depth == 4 &&
+			Gp_interconnect_snd_queue_depth == 2)
+		{
+			int32 perQueue = Gp_interconnect_mem_size /
+				(Gp_max_packet_size * sliceNum);
+
+			calcSndDepth = Max(Gp_interconnect_snd_queue_depth, perQueue / 2);
+			calcQueueDepth = Max(Gp_interconnect_queue_depth, perQueue - calcSndDepth);
+
+			if (calcSndDepth > MAX_QUEUE_SIZE)
+				calcSndDepth = MAX_QUEUE_SIZE;
+
+			if (calcQueueDepth > MAX_QUEUE_SIZE)
+				calcQueueDepth = MAX_QUEUE_SIZE;
+
+			Gp_interconnect_snd_queue_depth = calcSndDepth;
+			Gp_interconnect_queue_depth = calcQueueDepth;
+
+			elog(DEBUG1, "SetupUDPIFCInterconnect: queue depth, "
+				     "queue_depth=%d, snd_queue_depth=%d, "
+				     "mem_size=%d, slices=%d, packet_size=%d",
+				     Gp_interconnect_queue_depth,
+				     Gp_interconnect_snd_queue_depth,
+				     Gp_interconnect_mem_size,
+				     sliceNum,
+				     Gp_max_packet_size);
+		}
 
 		icContext = SetupUDPIFCInterconnect_Internal(estate->es_sliceTable);
 
@@ -3815,7 +4301,6 @@ static TupleChunkListItem
 receiveChunksUDPIFC(ChunkTransportState *pTransportStates, ChunkTransportStateEntry *pEntry,
 					int16 motNodeID, int16 *srcRoute, MotionConn *mConn)
 {
-	bool		directed = false;
 	int 		nFds = 0;
 	int 		*waitFds = NULL;
 	int 		nevent = 0;
@@ -3832,7 +4317,6 @@ receiveChunksUDPIFC(ChunkTransportState *pTransportStates, ChunkTransportStateEn
 	if (mConn != NULL)
 	{
 		conn = CONTAINER_OF(mConn, MotionConnUDP, mConn);
-		directed = true;
 		*srcRoute = conn->route;
 		setMainThreadWaiting(&rx_control_info.mainWaitingState, motNodeID, conn->route,
 							 pTransportStates->sliceTable->ic_instance_id);
@@ -3965,7 +4449,10 @@ receiveChunksUDPIFCLoop(ChunkTransportState *pTransportStates, ChunkTransportSta
 		/* check the potential errors in rx thread. */
 		checkRxThreadError();
 
-		/* do not check interrupts when holding the lock */
+		FaultInjector_InjectFaultIfSet("interconnect_stop_recv_chunk",
+											DDLNotSpecified,
+											"" /* databaseName */ ,
+											"" /* tableName */ );
 		ML_CHECK_FOR_INTERRUPTS(pTransportStates->teardownActive);
 
 		/*
@@ -4472,7 +4959,7 @@ logPkt(char *prefix, icpkthdr *pkt)
  *	packet is retransmitted.
  */
 static void
-handleAckedPacket(MotionConn *ackMotionConn, ICBuffer *buf, uint64 now)
+handleAckedPacket(MotionConn *ackMotionConn, ICBuffer *buf, uint64 now, struct icpkthdr *pkt)
 {
 	uint64		ackTime = 0;
 	bool		bufIsHead = false; 
@@ -4485,6 +4972,39 @@ handleAckedPacket(MotionConn *ackMotionConn, ICBuffer *buf, uint64 now)
 
 	buf = icBufferListDelete(&ackConn->unackQueue, buf);
 
+	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE || Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER)
+	{
+		bufConn = CONTAINER_OF(buf->conn, MotionConnUDP, mConn);
+		buf = icBufferListDelete(&unack_queue_ring.slots[buf->unackQueueRingSlot], buf);
+		unack_queue_ring.numOutStanding--;
+		if (icBufferListLength(&ackConn->unackQueue) >= 1)
+		unack_queue_ring.numSharedOutStanding--;
+
+		ackTime = now - buf->sentTime;
+
+		if (buf->nRetry == 0)
+		{
+			/* adjust the congestion control window. */
+			if (snd_control_info.cwnd < snd_control_info.ssthresh)
+				snd_control_info.cwnd += 2;
+			else
+				snd_control_info.cwnd += 1 / snd_control_info.cwnd;
+			snd_control_info.cwnd = Min(snd_control_info.cwnd, snd_buffer_pool.maxCount);
+		}
+
+		if ((bufConn->rttvar.rto << 1) > ackTime && pkt->retry_times != Gp_interconnect_min_retries_before_timeout)
+			estimateRTT(buf->conn, (now - pkt->send_time));
+
+		if (buf->nRetry && pkt->retry_times > 0 && pkt->retry_times < Gp_interconnect_min_retries_before_timeout)
+			bufConn->rttvar.rto += (bufConn->rttvar.rto >> 4 * buf->nRetry);
+
+		if (unlikely(Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER))
+		{
+			bufConn->sndvar.ts_rto = bufConn->rttvar.rto;
+			addtoRTOList(&mudp, bufConn);
+		}
+	}
+
 	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS)
 	{
 		buf = icBufferListDelete(&unack_queue_ring.slots[buf->unackQueueRingSlot], buf);
@@ -4564,7 +5084,7 @@ handleAckedPacket(MotionConn *ackMotionConn, ICBuffer *buf, uint64 now)
  * if we receive a stop message, return true (caller will clean up).
  */
 static bool
-handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChunkEntry)
+handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChunkEntry, bool need_flush)
 {
 	ChunkTransportStateEntryUDP * pEntry = NULL;
 	bool		ret = false;
@@ -4577,7 +5097,6 @@ handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChun
 
 	struct icpkthdr *pkt = snd_control_info.ackBuffer;
 
-
 	bool		shouldSendBuffers = false;
 	SliceTable	*sliceTbl = transportStates->sliceTable;
 
@@ -4702,6 +5221,12 @@ handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChun
 					shouldSendBuffers |= (handleAckForDisorderPkt(transportStates, &pEntry->entry, &ackConn->mConn, pkt));
 					break;
 				}
+				else if (pkt->flags & UDPIC_FLAGS_FULL)
+				{
+					if (DEBUG1 >= log_min_messages)
+						write_log("Recv buff is full [seq %d] from route %d; srcpid %d dstpid %d cmd %d flags 0x%x connseq %d", pkt->seq, ackConn->route, pkt->srcPid, pkt->dstPid, pkt->icId, pkt->flags, ackConn->conn_info.seq);
+					break;
+				}
 
 				/*
 				 * don't get out of the loop if pkt->seq equals to
@@ -4751,7 +5276,7 @@ handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChun
 					while (!icBufferListIsHead(&ackConn->unackQueue, link) && buf->pkt->seq <= pkt->seq)
 					{
 						next = link->next;
-						handleAckedPacket(&ackConn->mConn, buf, now);
+						handleAckedPacket(&ackConn->mConn, buf, now, pkt);
 						shouldSendBuffers = true;
 						link = next;
 						buf = GET_ICBUFFER_FROM_PRIMARY(link);
@@ -4767,7 +5292,7 @@ handleAcks(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChun
 			 * still send here, since in STOP/EOS race case, we may have been
 			 * in EOS sending logic and will not check stop message.
 			 */
-			if (shouldSendBuffers)
+			if (shouldSendBuffers && need_flush)
 				sendBuffers(transportStates, &pEntry->entry, &ackConn->mConn);
 		}
 		else if (DEBUG1 >= log_min_messages)
@@ -5011,7 +5536,7 @@ handleStopMsgs(ChunkTransportState *transportStates, ChunkTransportStateEntry *p
 		{
 			if (pollAcks(transportStates, pEntry->txfd, 0))
 			{
-				if (handleAcks(transportStates, &pEntry->entry))
+				if (handleAcks(transportStates, &pEntry->entry, true))
 				{
 					/* more stops found, loop again. */
 					i = 0;
@@ -5053,7 +5578,7 @@ sendBuffers(ChunkTransportState *transportStates, ChunkTransportStateEntry *pEnt
 	{
 		ICBuffer   *buf = NULL;
 
-		if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS &&
+		if ((Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS || Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE) &&
 			(icBufferListLength(&conn->unackQueue) > 0 &&
 			 unack_queue_ring.numSharedOutStanding >= (snd_control_info.cwnd - snd_control_info.minCwnd)))
 			break;
@@ -5074,7 +5599,7 @@ sendBuffers(ChunkTransportState *transportStates, ChunkTransportStateEntry *pEnt
 
 		icBufferListAppend(&conn->unackQueue, buf);
 
-		if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS)
+		if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS || Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
 		{
 			unack_queue_ring.numOutStanding++;
 			if (icBufferListLength(&conn->unackQueue) > 1)
@@ -5098,6 +5623,10 @@ sendBuffers(ChunkTransportState *transportStates, ChunkTransportStateEntry *pEnt
 		updateStats(TPE_DATA_PKT_SEND, conn, buf->pkt);
 #endif
 
+		struct icpkthdr *pkt_ = buf->pkt;
+		pkt_->send_time = now;
+		pkt_->recv_time = 0;
+		pkt_->retry_times = buf->nRetry;
 		sendOnce(transportStates, pEntry, buf, &conn->mConn);
 		ic_statistics.sndPktNum++;
 
@@ -5245,7 +5774,7 @@ handleAckForDisorderPkt(ChunkTransportState *transportStates,
 
 		if (buf->pkt->seq == pkt->seq)
 		{
-			handleAckedPacket(&conn->mConn, buf, now);
+			handleAckedPacket(&conn->mConn, buf, now, pkt);
 			shouldSendBuffers = true;
 			break;
 		}
@@ -5255,7 +5784,7 @@ handleAckForDisorderPkt(ChunkTransportState *transportStates,
 			/* this is a lost packet, retransmit */
 
 			buf->nRetry++;
-			if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS)
+			if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS || Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
 			{
 				buf = icBufferListDelete(&unack_queue_ring.slots[buf->unackQueueRingSlot], buf);
 				putIntoUnackQueueRing(&unack_queue_ring, buf,
@@ -5284,7 +5813,7 @@ handleAckForDisorderPkt(ChunkTransportState *transportStates,
 			/* remove packet already received. */
 
 			next = link->next;
-			handleAckedPacket(&conn->mConn, buf, now);
+			handleAckedPacket(&conn->mConn, buf, now, pkt);
 			shouldSendBuffers = true;
 			link = next;
 			buf = GET_ICBUFFER_FROM_PRIMARY(link);
@@ -5301,7 +5830,7 @@ handleAckForDisorderPkt(ChunkTransportState *transportStates,
 			lostPktCnt--;
 		}
 	}
-	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS)
+	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS || Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
 	{
 		snd_control_info.ssthresh = Max(snd_control_info.cwnd / 2, snd_control_info.minCwnd);
 		snd_control_info.cwnd = snd_control_info.ssthresh;
@@ -5354,7 +5883,7 @@ handleAckForDuplicatePkt(MotionConn *mConn, icpkthdr *pkt)
 	while (!icBufferListIsHead(&conn->unackQueue, link) && (buf->pkt->seq <= pkt->extraSeq))
 	{
 		next = link->next;
-		handleAckedPacket(&conn->mConn, buf, now);
+		handleAckedPacket(&conn->mConn, buf, now, pkt);
 		shouldSendBuffers = true;
 		link = next;
 		buf = GET_ICBUFFER_FROM_PRIMARY(link);
@@ -5366,7 +5895,7 @@ handleAckForDuplicatePkt(MotionConn *mConn, icpkthdr *pkt)
 		next = link->next;
 		if (buf->pkt->seq == pkt->seq)
 		{
-			handleAckedPacket(&conn->mConn, buf, now);
+			handleAckedPacket(&conn->mConn, buf, now, pkt);
 			shouldSendBuffers = true;
 			break;
 		}
@@ -5448,55 +5977,230 @@ checkExpiration(ChunkTransportState *transportStates,
 				uint64 now)
 {
 	/* check for expiration */
-	int			count = 0;
-	int			retransmits = 0;
+	int	count = 0;
+	int	retransmits = 0;
 	MotionConnUDP *currBuffConn = NULL;
 
 	Assert(unack_queue_ring.currentTime != 0);
-	while (now >= (unack_queue_ring.currentTime + TIMER_SPAN) && count++ < UNACK_QUEUE_RING_SLOTS_NUM)
+
+	if (unlikely(Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER))
 	{
-		/* expired, need to resend them */
-		ICBuffer   *curBuf = NULL;
+		checkRtmTimeout(&mudp, now, 500, transportStates, pEntry, triggerConn);
+		return;
+	}
 
-		while ((curBuf = icBufferListPop(&unack_queue_ring.slots[unack_queue_ring.idx])) != NULL)
+	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
+	{
+		uint64 timer_span_time = unack_queue_ring.currentTime + TIMER_SPAN_LOSS;
+
+		while (now >= (timer_span_time + unack_queue_ring.time_difference)  && count++ < UNACK_QUEUE_RING_SLOTS_NUM)
 		{
-			curBuf->nRetry++;
-			putIntoUnackQueueRing(
-								  &unack_queue_ring,
-								  curBuf,
-								  computeExpirationPeriod(curBuf->conn, curBuf->nRetry), now);
+			/* expired, need to resend them */
+			ICBuffer   *curBuf = NULL;
+
+			while ((curBuf = icBufferListPop(&unack_queue_ring.slots[unack_queue_ring.idx])) != NULL)
+			{
+				MotionConnUDP *conn = NULL;
+				conn = CONTAINER_OF(curBuf->conn, MotionConnUDP, mConn);
+				curBuf->nRetry++;
+
+				/*
+				 * Fixed Timeout Thresholds: Traditional TCP-style Retransmission Timeout
+				 * (RTTVAR.RTO) calculations may be too rigid for networks with volatile
+				 * latency. This leads to:
+				 *   Premature Retransmissions: Unnecessary data resends during temporary
+				 *     latency spikes, wasting bandwidth.
+				 *   Delayed Recovery: Slow reaction to actual packet loss when RTO is
+				 *     overly conservative.
+				 * 
+				 * Lack of Context Awareness: Static RTO ignores real-time network behavior
+				 * patterns, reducing throughput and responsiveness.
+				 * 
+				 * Solution: Dynamic Timeout Threshold Adjustment
+				 * Implements an adaptive timeout mechanism to optimize retransmission:
+				 *   if (now < (curBuf->sentTime + conn->rttvar.rto)) {
+				 *       uint32_t diff = (curBuf->sentTime + conn->rttvar.rto) - now;
+				 *       // ... (statistical tracking and threshold adjustment)
+				 *   }
+				 *   Temporary Latency Spike: Uses max (conservative) to avoid false
+				 *     retransmits, reducing bandwidth waste (vs. traditional mistaken
+				 *     retransmissions).
+				 *   Persistent Packet Loss: Prioritizes min (aggressive) via
+				 *     weight_retrans, accelerating recovery (vs. slow fixed-RTO reaction).
+				 *   Stable Network: Balances weights for equilibrium throughput (vs.
+				 *     static RTO limitations).
+				 */
+				if (now < (curBuf->sentTime +  conn->rttvar.rto))
+				{
+#ifdef TIMEOUT_Z
+					uint32_t diff = (curBuf->sentTime +  conn->rttvar.rto) - now;
+					if(unack_queue_ring.retrans_count == 0 && unack_queue_ring.no_retrans_count == 0)
+					{
+						unack_queue_ring.min = diff;
+						unack_queue_ring.max = diff;
+					}
+
+					if (diff < unack_queue_ring.min) unack_queue_ring.min = diff;
+					if (diff > unack_queue_ring.max) unack_queue_ring.max = diff;
+
+					if (unack_queue_ring.retrans_count == 0)
+						unack_queue_ring.time_difference = unack_queue_ring.max;
+					else if (unack_queue_ring.no_retrans_count == 0 && ic_statistics.retransmits < (Gp_interconnect_min_retries_before_timeout / 4)) 
+						unack_queue_ring.time_difference = 0;
+					else
+					{
+						uint32_t total_count = unack_queue_ring.retrans_count + unack_queue_ring.no_retrans_count;
+						double weight_retrans = (double)unack_queue_ring.retrans_count / total_count;
+						double weight_no_retrans = (double)unack_queue_ring.no_retrans_count / total_count;
+						unack_queue_ring.time_difference = (uint32_t)(unack_queue_ring.max * weight_no_retrans + unack_queue_ring.min * weight_retrans);
+					}
+					
+					++unack_queue_ring.no_retrans_count;
+				}
+				else
+					++unack_queue_ring.retrans_count;
+#endif
 
 #ifdef TRANSFER_PROTOCOL_STATS
-			updateStats(TPE_DATA_PKT_SEND, curBuf->conn, curBuf->pkt);
+				updateStats(TPE_DATA_PKT_SEND, curBuf->conn, curBuf->pkt);
 #endif
+				ChunkTransportStateEntryUDP *pEntryUdp;
+				pEntryUdp = CONTAINER_OF(pEntry, ChunkTransportStateEntryUDP, entry);
+				putIntoUnackQueueRing(&unack_queue_ring,
+									  curBuf,
+									  computeExpirationPeriod(curBuf->conn, curBuf->nRetry), getCurrentTime());
+				struct icpkthdr *pkt_ = curBuf->pkt;
 
-			sendOnce(transportStates, pEntry, curBuf, curBuf->conn);
+				pkt_->send_time = getCurrentTime();
+				pkt_->recv_time = 0;
+				pkt_->retry_times = curBuf->nRetry;
 
-			currBuffConn = CONTAINER_OF(curBuf->conn, MotionConnUDP, mConn);
+				sendOnce(transportStates, pEntry, curBuf, curBuf->conn);
 
-			retransmits++;
-			ic_statistics.retransmits++;
-			currBuffConn->stat_count_resent++;
-			currBuffConn->stat_max_resent = Max(currBuffConn->stat_max_resent,
-												currBuffConn->stat_count_resent);
+				/*
+				 * Adaptive Retry Backoff with Polling for Network Asymmetry Mitigation
+				 *
+				 * This logic addresses two critical network pathologies:
+				 *  1. RTO Distortion Amplification: 
+				 *     - Packet loss in volatile networks causes RTO-based retransmission errors
+				 *     - Multiple spurious retries increase network load and congestion collapse risk
+				 *  2. Data Skew-Induced Starvation:
+				 *     - Under unbalanced workloads, low-traffic nodes experience MON (Message Order Number) delays
+				 *     - Delayed ACKs trigger false retransmissions even when packets arrive eventually
+				 *     - Unacked queue inflation worsens congestion in high-traffic nodes
+				 */
+				int32_t loop_ack = curBuf->nRetry;
+				uint32_t rto_min = UDP_RTO_MIN / 10;
+				uint32_t rtoMs = conn->rttvar.rto / 1000;
+				int32_t wait_time = rto_min > rtoMs ? rto_min : rtoMs;
+				int32_t loop = 0;
 
-			checkNetworkTimeout(curBuf, now, &transportStates->networkTimeoutIsLogged);
+				/*
+				 * To optimize performance, we need to process all the time-out file descriptors (fds)
+				 * in each batch together.
+				 */
+				if (loop_ack > 0)
+				{
+					while (loop++ < loop_ack)
+					{
+						if (pollAcks(transportStates, pEntryUdp->txfd, wait_time))
+						{
+							handleAcks(transportStates, pEntry, false);
+							curBuf->nRetry = 0;
+							break;
+						}
+
+						struct icpkthdr *pkt_ = curBuf->pkt;
+						pkt_->send_time = getCurrentTime();
+						pkt_->recv_time = 0;
+						pkt_->retry_times = curBuf->nRetry;
+
+						sendOnce(transportStates, pEntry, curBuf, curBuf->conn);
+
+						if (loop_ack < (Gp_interconnect_min_retries_before_timeout / 10))
+							wait_time += wait_time / 10;
+						else if (loop_ack > (Gp_interconnect_min_retries_before_timeout / 10) && loop_ack < (Gp_interconnect_min_retries_before_timeout / 5))
+							wait_time += RTO_MAX / 10;
+						else if (loop_ack > (Gp_interconnect_min_retries_before_timeout / 5) && loop_ack < (Gp_interconnect_min_retries_before_timeout / 2))
+							wait_time += RTO_MAX / 5;
+						else if (loop_ack < (Gp_interconnect_min_retries_before_timeout))
+							wait_time += RTO_MAX;
+					};
+				}
+
+				if (loop_ack > Gp_interconnect_min_retries_before_timeout / 5)
+					write_log("Resending packet (seq %d) to %s (pid %d cid %d) with %d retries in %lu seconds",
+							curBuf->pkt->seq, curBuf->conn->remoteHostAndPort,
+							curBuf->pkt->dstPid, curBuf->pkt->dstContentId, curBuf->nRetry,
+							(now - curBuf->sentTime) / 1000 / 1000);
+
+				currBuffConn = CONTAINER_OF(curBuf->conn, MotionConnUDP, mConn);
+
+				retransmits++;
+				ic_statistics.retransmits++;
+				currBuffConn->stat_count_resent++;
+				currBuffConn->stat_max_resent = Max(currBuffConn->stat_max_resent,
+													currBuffConn->stat_count_resent);
+
+				checkNetworkTimeout(curBuf, now, &transportStates->networkTimeoutIsLogged);
 
 #ifdef AMS_VERBOSE_LOGGING
-			write_log("RESEND pkt with seq %d (retry %d, rtt " UINT64_FORMAT ") to route %d",
-					  curBuf->pkt->seq, curBuf->nRetry, currBuffConn->rtt, currBuffConn->route);
-			logPkt("RESEND PKT in checkExpiration", curBuf->pkt);
+				write_log("RESEND pkt with seq %d (retry %d, rtt " UINT64_FORMAT ") to route %d",
+						curBuf->pkt->seq, curBuf->nRetry, currBuffConn->rtt, currBuffConn->route);
+				logPkt("RESEND PKT in checkExpiration", curBuf->pkt);
 #endif
+			}
+
+			timer_span_time += TIMER_SPAN_LOSS;
+			unack_queue_ring.idx = (unack_queue_ring.idx + 1) % (UNACK_QUEUE_RING_SLOTS_NUM);
 		}
+	}
+	else
+	{
+		while (now >= (unack_queue_ring.currentTime + TIMER_SPAN) && count++ < UNACK_QUEUE_RING_SLOTS_NUM)
+		{
+			/* expired, need to resend them */
+			ICBuffer   *curBuf = NULL;
 
-		unack_queue_ring.currentTime += TIMER_SPAN;
-		unack_queue_ring.idx = (unack_queue_ring.idx + 1) % (UNACK_QUEUE_RING_SLOTS_NUM);
+			while ((curBuf = icBufferListPop(&unack_queue_ring.slots[unack_queue_ring.idx])) != NULL)
+			{
+				curBuf->nRetry++;
+				putIntoUnackQueueRing(
+									&unack_queue_ring,
+									curBuf,
+									computeExpirationPeriod(curBuf->conn, curBuf->nRetry), now);
+
+#ifdef TRANSFER_PROTOCOL_STATS
+				updateStats(TPE_DATA_PKT_SEND, curBuf->conn, curBuf->pkt);
+#endif
+
+				sendOnce(transportStates, pEntry, curBuf, curBuf->conn);
+
+				currBuffConn = CONTAINER_OF(curBuf->conn, MotionConnUDP, mConn);
+
+				retransmits++;
+				ic_statistics.retransmits++;
+				currBuffConn->stat_count_resent++;
+				currBuffConn->stat_max_resent = Max(currBuffConn->stat_max_resent, currBuffConn->stat_count_resent);
+				checkNetworkTimeout(curBuf, now, &transportStates->networkTimeoutIsLogged);
+
+#ifdef AMS_VERBOSE_LOGGING
+				write_log("RESEND pkt with seq %d (retry %d, rtt " UINT64_FORMAT ") to route %d",
+					  curBuf->pkt->seq, curBuf->nRetry, curBuf->conn->rtt, curBuf->conn->route);
+				logPkt("RESEND PKT in checkExpiration", curBuf->pkt);
+#endif
+			}
+
+			unack_queue_ring.currentTime += TIMER_SPAN;
+			unack_queue_ring.idx = (unack_queue_ring.idx + 1) % (UNACK_QUEUE_RING_SLOTS_NUM);
+		}
+
+		/*
+		 * deal with case when there is a long time this function is not called.
+		 */
+		unack_queue_ring.currentTime = now - (now % (TIMER_SPAN));
 	}
 
-	/*
-	 * deal with case when there is a long time this function is not called.
-	 */
-	unack_queue_ring.currentTime = now - (now % TIMER_SPAN);
 	if (retransmits > 0)
 	{
 		snd_control_info.ssthresh = Max(snd_control_info.cwnd / 2, snd_control_info.minCwnd);
@@ -5524,7 +6228,7 @@ checkExpiration(ChunkTransportState *transportStates,
  *
  */
 static void
-checkDeadlock(ChunkTransportStateEntry *pChunkEntry, MotionConn *mConn)
+checkDeadlock(ChunkTransportState *transportStates, ChunkTransportStateEntry *pChunkEntry, MotionConn *mConn)
 {
 	uint64		deadlockCheckTime;
 	ChunkTransportStateEntryUDP *pEntry = NULL;
@@ -5561,17 +6265,31 @@ checkDeadlock(ChunkTransportStateEntry *pChunkEntry, MotionConn *mConn)
 			ic_control_info.lastDeadlockCheckTime = now;
 			ic_statistics.statusQueryMsgNum++;
 
+			if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE && pollAcks(transportStates, pEntry->txfd, 50))
+			{
+				handleAcks(transportStates, pChunkEntry, false);
+				conn->deadlockCheckBeginTime = now;
+			}
+
 			/* check network error. */
-			if ((now - conn->deadlockCheckBeginTime) > ((uint64) Gp_interconnect_transmit_timeout * 1000 * 1000))
+			if ((now - conn->deadlockCheckBeginTime) > ((uint64) Gp_interconnect_transmit_timeout * 100 * 1000))
 			{
-				ereport(ERROR,
-						(errcode(ERRCODE_GP_INTERCONNECTION_ERROR),
-						 errmsg("interconnect encountered a network error, please check your network"),
-						 errdetail("Did not get any response from %s (pid %d cid %d) in %d seconds.",
-								   conn->mConn.remoteHostAndPort,
-								   conn->conn_info.dstPid,
-								   conn->conn_info.dstContentId,
-								   Gp_interconnect_transmit_timeout)));
+				write_log("Did not get any response from %s (pid %d cid %d) in 600 seconds.",conn->mConn.remoteHostAndPort,
+									  conn->conn_info.dstPid,
+									  conn->conn_info.dstContentId);
+
+				if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER)
+					conn->capacity += 1;
+
+				if ((now - conn->deadlockCheckBeginTime) > ((uint64) Gp_interconnect_transmit_timeout * 1000 * 1000))
+					ereport(ERROR,
+							(errcode(ERRCODE_GP_INTERCONNECTION_ERROR),
+							errmsg("interconnect encountered a network error, please check your network"),
+							errdetail("Did not get any response from %s (pid %d cid %d) in %d seconds.",
+									conn->mConn.remoteHostAndPort,
+									conn->conn_info.dstPid,
+									conn->conn_info.dstContentId,
+									Gp_interconnect_transmit_timeout)));
 			}
 		}
 	}
@@ -5690,7 +6408,7 @@ checkExceptions(ChunkTransportState *transportStates,
 		checkExpirationCapacityFC(transportStates, pEntry, conn, timeout);
 	}
 
-	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS)
+	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS || Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
 	{
 		uint64		now = getCurrentTime();
 
@@ -5703,7 +6421,7 @@ checkExceptions(ChunkTransportState *transportStates,
 
 	if ((retry & 0x3) == 2)
 	{
-		checkDeadlock(pEntry, conn);
+		checkDeadlock(transportStates, pEntry, conn);
 		checkRxThreadError();
 		ML_CHECK_FOR_INTERRUPTS(transportStates->teardownActive);
 	}
@@ -5735,14 +6453,24 @@ static inline int
 computeTimeout(MotionConn *mConn, int retry)
 {
 	MotionConnUDP *conn = NULL;
+	uint32_t rtoMs = 0;
 
 	conn = CONTAINER_OF(mConn, MotionConnUDP, mConn);
+	rtoMs = conn->rttvar.rto / 1000;
 	if (icBufferListLength(&conn->unackQueue) == 0)
 		return TIMER_CHECKING_PERIOD;
 
 	ICBufferLink *bufLink = icBufferListFirst(&conn->unackQueue);
 	ICBuffer   *buf = GET_ICBUFFER_FROM_PRIMARY(bufLink);
 
+	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
+	{
+		if (buf->nRetry == 0 && retry == 0 && unack_queue_ring.numSharedOutStanding < (snd_control_info.cwnd - snd_control_info.minCwnd))
+			return 0;
+
+		return rtoMs > TIMER_CHECKING_PERIOD ? rtoMs: TIMER_CHECKING_PERIOD;
+	}
+
 	if (buf->nRetry == 0 && retry == 0)
 		return 0;
 
@@ -5830,7 +6558,7 @@ SendChunkUDPIFC(ChunkTransportState *transportStates,
 
 		if (pollAcks(transportStates, pEntry->txfd, timeout))
 		{
-			if (handleAcks(transportStates, &pEntry->entry))
+			if (handleAcks(transportStates, &pEntry->entry, true))
 			{
 				/*
 				 * We make sure that we deal with the stop messages only after
@@ -5843,6 +6571,9 @@ SendChunkUDPIFC(ChunkTransportState *transportStates,
 		}
 		checkExceptions(transportStates, &pEntry->entry, &conn->mConn, retry++, timeout);
 		doCheckExpiration = false;
+
+		if (!doCheckExpiration && icBufferListLength(&conn->unackQueue) == 0 && conn->capacity > 0 && icBufferListLength(&conn->sndQueue) > 0)
+			sendBuffers(transportStates, &pEntry->entry, &conn->mConn);
 	}
 
 	conn->mConn.pBuff = (uint8 *) conn->curBuff->pkt;
@@ -5987,12 +6718,15 @@ SendEOSUDPIFC(ChunkTransportState *transportStates,
 					timeout = computeTimeout(&conn->mConn, retry);
 
 					if (pollAcks(transportStates, pEntry->txfd, timeout))
-						handleAcks(transportStates, &pEntry->entry);
-
+						handleAcks(transportStates, &pEntry->entry, true);
 					checkExceptions(transportStates, &pEntry->entry, &conn->mConn, retry++, timeout);
 
 					if (retry >= MAX_TRY)
+					{
+						if (icBufferListLength(&conn->unackQueue) == 0)
+							sendBuffers(transportStates, &pEntry->entry, &conn->mConn);
 						break;
+					}
 				}
 
 				if ((!conn->mConn.cdbProc) || (icBufferListLength(&conn->unackQueue) == 0 &&
@@ -6217,24 +6951,60 @@ getCurrentTime(void)
 static void
 putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64 now)
 {
+	MotionConnUDP *buffConn = NULL;
+	buffConn = CONTAINER_OF(buf->conn, MotionConnUDP, mConn);
 	uint64		diff = 0;
 	int			idx = 0;
-
-	/* The first packet, currentTime is not initialized */
-	if (uqr->currentTime == 0)
-		uqr->currentTime = now - (now % TIMER_SPAN);
-
-	diff = now + expTime - uqr->currentTime;
-	if (diff >= UNACK_QUEUE_RING_LENGTH)
+	
+	if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
 	{
+		/* The first packet, currentTime is not initialized */
+#ifndef TIMEOUT_Z
+		if (uqr->currentTime == 0)
+			uqr->currentTime = now - (now % TIMER_SPAN_LOSS);
+#else
+		if (uqr->currentTime == 0 && buffConn->rttvar.rto == 0)
+			uqr->currentTime = now - (now % TIMER_SPAN_LOSS);
+		else
+			uqr->currentTime = now + buffConn->rttvar.rto;
+
+#endif
+		diff = expTime;
+		if (diff >= UNACK_QUEUE_RING_LENGTH_LOSS)
+		{
 #ifdef AMS_VERBOSE_LOGGING
-		write_log("putIntoUnackQueueRing:" "now " UINT64_FORMAT "expTime " UINT64_FORMAT "diff " UINT64_FORMAT "uqr-currentTime " UINT64_FORMAT, now, expTime, diff, uqr->currentTime);
+			write_log("putIntoUnackQueueRing:" "now " UINT64_FORMAT "expTime " UINT64_FORMAT "diff " UINT64_FORMAT "uqr-currentTime " UINT64_FORMAT, now, expTime, diff, uqr->currentTime);
 #endif
-		diff = UNACK_QUEUE_RING_LENGTH - 1;
+			diff = UNACK_QUEUE_RING_LENGTH_LOSS - 1;
+		}
+		else if (diff < TIMER_SPAN_LOSS)
+		{
+			diff = diff < TIMER_SPAN_LOSS ? TIMER_SPAN_LOSS : diff;
+		}
 	}
-	else if (diff < TIMER_SPAN)
+	else
 	{
-		diff = TIMER_SPAN;
+		if (uqr->currentTime == 0)
+		uqr->currentTime = now - (now % TIMER_SPAN_LOSS);
+
+		diff = now + expTime - uqr->currentTime;
+		if (diff >= UNACK_QUEUE_RING_LENGTH)
+		{
+#ifdef AMS_VERBOSE_LOGGING
+			write_log("putIntoUnackQueueRing:" "now " UINT64_FORMAT "expTime " UINT64_FORMAT "diff " UINT64_FORMAT "uqr-currentTime " UINT64_FORMAT, now, expTime, diff, uqr->currentTime);
+#endif
+			diff = UNACK_QUEUE_RING_LENGTH - 1;
+		}
+		else if (diff < TIMER_SPAN)
+		{
+			diff = TIMER_SPAN;
+		}
+
+		idx = (uqr->idx + diff / TIMER_SPAN) % UNACK_QUEUE_RING_SLOTS_NUM;
+
+#ifdef AMS_VERBOSE_LOGGING
+		write_log("PUTTW: curtime " UINT64_FORMAT " now " UINT64_FORMAT " (diff " UINT64_FORMAT ") expTime " UINT64_FORMAT " previdx %d, nowidx %d, nextidx %d", uqr->currentTime, now, diff, expTime, buf->unackQueueRingSlot, uqr->idx, idx);
+#endif
 	}
 
 	idx = (uqr->idx + diff / TIMER_SPAN) % UNACK_QUEUE_RING_SLOTS_NUM;
@@ -6397,6 +7167,30 @@ handleDataPacket(MotionConn *mConn, icpkthdr *pkt, struct sockaddr_storage *peer
 		logPkt("Interconnect error: received a packet when the queue is full ", pkt);
 		ic_statistics.disorderedPktNum++;
 		conn->stat_count_dropped++;
+
+		if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER && rx_control_info.mainWaitingState.waiting &&
+				rx_control_info.mainWaitingState.waitingNode == pkt->motNodeId &&
+				rx_control_info.mainWaitingState.waitingQuery == pkt->icId)
+		{
+				if (rx_control_info.mainWaitingState.waitingRoute == ANY_ROUTE)
+				{
+					if (rx_control_info.mainWaitingState.reachRoute == ANY_ROUTE)
+						rx_control_info.mainWaitingState.reachRoute = conn->route;
+				}
+				else if (rx_control_info.mainWaitingState.waitingRoute == conn->route)
+				{
+					if (DEBUG2 >= log_min_messages)
+						write_log("rx thread: main_waiting waking it route %d", rx_control_info.mainWaitingState.waitingRoute);
+					rx_control_info.mainWaitingState.reachRoute = conn->route;
+				}
+				/* WAKE MAIN THREAD HERE */
+				*wakeup_mainthread = true;
+		}
+
+		if (Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE)
+		{
+			setAckSendParam(param, &conn->mConn, UDPIC_FLAGS_FULL, conn->conn_info.seq - 1, conn->conn_info.extraSeq);
+		}
 		return false;
 	}
 
@@ -6681,9 +7475,25 @@ rxThreadFunc(void *arg)
 
 			if (conn != NULL)
 			{
+				uint64          now = getCurrentTime();
+				uint64 send_time = pkt->send_time;
+				uint64 recv_time = now;
+				uint64 retry_times = pkt->retry_times;
+				MotionConnUDP *connUdp = NULL;
+
+				connUdp = CONTAINER_OF(conn, MotionConnUDP, mConn);
+				bool drop_ack = pkt->seq < connUdp->conn_info.seq ? true : false;
 				/* Handling a regular packet */
 				if (handleDataPacket(conn, pkt, &peer, &peerlen, &param, &wakeup_mainthread))
 					pkt = NULL;
+				if (!pkt)
+				{
+					param.msg.send_time = send_time;
+					param.msg.recv_time = recv_time;
+					param.msg.retry_times = retry_times;
+				}
+				if (drop_ack)
+					param.msg.retry_times = Gp_interconnect_min_retries_before_timeout;
 				ic_statistics.recvPktNum++;
 			}
 			else
diff --git a/contrib/interconnect/udp/ic_udpifc.h b/contrib/interconnect/udp/ic_udpifc.h
index 76403abb3f3..af3ca72ba3b 100644
--- a/contrib/interconnect/udp/ic_udpifc.h
+++ b/contrib/interconnect/udp/ic_udpifc.h
@@ -90,6 +90,9 @@ typedef struct icpkthdr
      */
 	uint32		seq;
 	uint32		extraSeq;
+	uint64_t send_time;
+	uint64_t recv_time;
+	uint8_t retry_times;
 }			icpkthdr;
 
 typedef struct ICBuffer ICBuffer;
diff --git a/contrib/pax_storage/.gitignore b/contrib/pax_storage/.gitignore
index 51a328f84e0..87aa2a4a742 100644
--- a/contrib/pax_storage/.gitignore
+++ b/contrib/pax_storage/.gitignore
@@ -12,6 +12,7 @@
 Thumbs.db
 
 # Temp files dir
+bench_data
 .tmp/**
 build*/**
 results/**
diff --git a/contrib/pax_storage/CMakeLists.txt b/contrib/pax_storage/CMakeLists.txt
index f4c132c1bd7..e45eab560e6 100644
--- a/contrib/pax_storage/CMakeLists.txt
+++ b/contrib/pax_storage/CMakeLists.txt
@@ -21,7 +21,10 @@ set(CMAKE_CXX_STANDARD 17)
 set(TOP_DIR ${PROJECT_SOURCE_DIR}/../..)
 set(CBDB_INCLUDE_DIR ${TOP_DIR}/src/include)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-unused-function -Wno-redundant-move -Wno-error=redundant-move -Wno-error=ignored-qualifiers -Wuninitialized -Winit-self -Wstrict-aliasing -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered -Wno-sized-deallocation -g")
+# Base CXX flags
+# Note: -Wpessimizing-move is enabled by default in GCC 9+ and will be caught by -Werror
+# No need to explicitly add -Werror=pessimizing-move (which breaks GCC 8.x compatibility)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-unused-function -Wno-error=ignored-qualifiers -Wno-error=array-bounds -Wuninitialized -Winit-self -Wstrict-aliasing -Wno-missing-field-initializers -Wno-unused-parameter -Wno-clobbered -Wno-sized-deallocation -g")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-parameter -Wno-parameter-name")
 
 option(USE_MANIFEST_API "Use manifest API" OFF)
@@ -29,7 +32,7 @@ option(USE_PAX_CATALOG "Use manifest API, by pax impl" ON)
 
 # Build gtest options
 option(BUILD_GTEST "Build with google test" ON)
-option(BUILD_GBENCH "Build with google benchmark" ON)
+option(BUILD_GBENCH "Build with google benchmark" OFF)
 
 # Build pax tools
 option(BUILD_TOOLS "Build with pax tools" OFF)
diff --git a/contrib/pax_storage/doc/README.md b/contrib/pax_storage/doc/README.md
index b4561e479e5..43393f2f859 100644
--- a/contrib/pax_storage/doc/README.md
+++ b/contrib/pax_storage/doc/README.md
@@ -42,10 +42,11 @@ PAX has the following features:
 
 PAX will be built with `--enable-pax` when you build the Cloudberry. Dependency requirements are as follows:
 
-- **C/C++ Compiler**: GCC/GCC-C++ 11 or later
+- **C/C++ Compiler**: GCC/GCC-C++ 8 or later
 - **CMake**: 3.11 or later
 - **Protobuf**: 3.5.0 or later
 - **ZSTD (libzstd)**: 1.4.0 or later
+- **liburing**: 2.12 or later
 
 Also, you need to run the following command at the top level of the Cloudberry source code directory to download the submodules:
 
@@ -164,14 +165,14 @@ For AM(access methods) in Cloudberry, each AM has customized relation options. U
 
 | Name                               | Type   | Optional               | Default  | Description                                                                                                                               |
 | :-----:                            | :----: | :----                  | :----    | :----                                                                                                                                     |
-| pax_enable_sparse_filter           | bool   | `on`/`off`             | `on`     | Specifies whether to enable sparse filtering based on statistics.                                                                                                                               |
-| pax_enable_row_filter              | bool   | `on`/`off`             | `off`    | Specifies whether to enable row filtering.                                                                                                                                |
-| pax_scan_reuse_buffer_size         | int    | [1048576, 33554432]    | 8388608  | The buffer block size used during scanning.                                                                                                                                 |
-| pax_max_tuples_per_group           | int    | [5, 524288]            | 131072   | Specifies the maximum number of tuples allowed in each group.                                                                                                                                    |
-| pax_max_tuples_per_file            | int    | [131072, 8388608]      | 1310720  | Specifies the maximum number of tuples allowed in each data file.                                                                                                                                     |
-| pax_max_size_per_file              | int    | [8388608, 335544320]   | 67108864 | The maximum physical size allowed for each data file. The default value is 67108864 (64MiB). The actual file size might be slightly larger than the set size. Very large or small values might negatively impact performance. |
-| pax_enable_toast                   | bool   | `on`/`off`             | `on`     | Specifies whether to enable TOAST support.                                                                                                                                  |
-| pax_min_size_of_compress_toast     | int    | [524288, 1073741824]   | 524288   | Specifies the threshold for creating compressed TOAST tables. If the character length exceeds this threshold, Cloudberry creates compressed TOAST tables for storage.                                                   |
-| pax_min_size_of_external_toast     | int    | [10485760, 2147483647] | 10485760 | Specifies the threshold for creating external TOAST tables. If the character length exceeds this threshold, Cloudberry creates external TOAST tables for storage.                                                     |
-| pax_default_storage_format         | string | `porc`/`porc_vec`      | `porc`   | Controls the default storage format.                                                                                                                                   | 
-| pax_bloom_filter_work_memory_bytes | int    | [1024, 2147483647]     | 10240    | Controls the maximum memory allowed for bloom filter usage.                                                                                                                                    |
+| pax.enable_sparse_filter           | bool   | `on`/`off`             | `on`     | Specifies whether to enable sparse filtering based on statistics.                                                                                                                               |
+| pax.enable_row_filter              | bool   | `on`/`off`             | `off`    | Specifies whether to enable row filtering.                                                                                                                                |
+| pax.scan_reuse_buffer_size         | int    | [1048576, 33554432]    | 8388608  | The buffer block size used during scanning.                                                                                                                                 |
+| pax.max_tuples_per_group           | int    | [5, 524288]            | 131072   | Specifies the maximum number of tuples allowed in each group.                                                                                                                                    |
+| pax.max_tuples_per_file            | int    | [131072, 8388608]      | 1310720  | Specifies the maximum number of tuples allowed in each data file.                                                                                                                                     |
+| pax.max_size_per_file              | int    | [8388608, 335544320]   | 67108864 | The maximum physical size allowed for each data file. The default value is 67108864 (64MiB). The actual file size might be slightly larger than the set size. Very large or small values might negatively impact performance. |
+| pax.enable_toast                   | bool   | `on`/`off`             | `on`     | Specifies whether to enable TOAST support.                                                                                                                                  |
+| pax.min_size_of_compress_toast     | int    | [524288, 1073741824]   | 524288   | Specifies the threshold for creating compressed TOAST tables. If the character length exceeds this threshold, Cloudberry creates compressed TOAST tables for storage.                                                   |
+| pax.min_size_of_external_toast     | int    | [10485760, 2147483647] | 10485760 | Specifies the threshold for creating external TOAST tables. If the character length exceeds this threshold, Cloudberry creates external TOAST tables for storage.                                                     |
+| pax.default_storage_format         | string | `porc`/`porc_vec`      | `porc`   | Controls the default storage format.                                                                                                                                   | 
+| pax.bloom_filter_work_memory_bytes | int    | [1024, 2147483647]     | 10240    | Controls the maximum memory allowed for bloom filter usage.                                                                                                                                    |
diff --git a/contrib/pax_storage/doc/README.toast.md b/contrib/pax_storage/doc/README.toast.md
index 631680a7a9b..44fb084d5e5 100644
--- a/contrib/pax_storage/doc/README.toast.md
+++ b/contrib/pax_storage/doc/README.toast.md
@@ -60,7 +60,7 @@ Compress toast is consistent with Cloudberry compress toast.
 
 This part of the data is a varlena structure, and it is of type `varattrib_4b`, which means that it has a varlena head and the storage range is less than 1G.
 
-In addition, the lower limit of the datum length that needs to be compressed on PAX may be set to larger, and TOAST_TUPLE_THRESHOLD is no longer used as the threshold. Instead, we added a GUC(`pax_min_size_of_compress_toast`) to use.
+In addition, the lower limit of the datum length that needs to be compressed on PAX may be set to larger, and TOAST_TUPLE_THRESHOLD is no longer used as the threshold. Instead, we added a GUC(`pax.min_size_of_compress_toast`) to use.
 
 ```
 typedef union
diff --git a/contrib/pax_storage/expected/cluster.out b/contrib/pax_storage/expected/cluster.out
index 792c3503a73..c541db45bc2 100644
--- a/contrib/pax_storage/expected/cluster.out
+++ b/contrib/pax_storage/expected/cluster.out
@@ -1,4 +1,4 @@
-set pax_max_tuples_per_file to 131072;
+set pax.max_tuples_per_file to 131072;
 -- cluster table using index
 -- start_ignore
 drop table if EXISTS t_index_cluster;
@@ -135,7 +135,7 @@ select ptblockname,ptstatistics,ptisclustered from get_pax_aux_table('t_zorder_c
 
 drop table t_zorder_cluster;
 -- test cluster index
-set pax_max_tuples_per_file to 131072;
+set pax.max_tuples_per_file to 131072;
 drop table if EXISTS t_index_cluster;
 create table t_index_cluster(c1 int, c2 int) with (minmax_columns='c1,c2');
 \d+ t_index_cluster;
diff --git a/contrib/pax_storage/expected/filter.out b/contrib/pax_storage/expected/filter.out
index f182c041a31..44f38a36038 100644
--- a/contrib/pax_storage/expected/filter.out
+++ b/contrib/pax_storage/expected/filter.out
@@ -1,5 +1,5 @@
-set pax_enable_debug to on;
-set pax_enable_sparse_filter = on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter = on;
 create table pax_test.null_test_t(a int, b int, c text) using pax;
 insert into pax_test.null_test_t(a) select null from generate_series(1,2)i;
 insert into pax_test.null_test_t select 1, i, 'cc_' || i from generate_series(1,2)i;
@@ -222,4 +222,4 @@ kind group, filter rate: 0 / 1
 
 reset client_min_messages;
 drop table pax_test.in_test_t;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/expected/filter_1.out b/contrib/pax_storage/expected/filter_1.out
index 6b45c3be862..d2124c5491c 100644
--- a/contrib/pax_storage/expected/filter_1.out
+++ b/contrib/pax_storage/expected/filter_1.out
@@ -1,5 +1,5 @@
-set pax_enable_debug to on;
-set pax_enable_sparse_filter = on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter = on;
 create table pax_test.null_test_t(a int, b int, c text) using pax;
 insert into pax_test.null_test_t(a) select null from generate_series(1,2)i;
 insert into pax_test.null_test_t select 1, i, 'cc_' || i from generate_series(1,2)i;
@@ -222,4 +222,4 @@ kind group, filter rate: 0 / 1
 
 reset client_min_messages;
 drop table pax_test.in_test_t;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/expected/filter_tree.out b/contrib/pax_storage/expected/filter_tree.out
index a7115efc1e9..fabf6729d71 100644
--- a/contrib/pax_storage/expected/filter_tree.out
+++ b/contrib/pax_storage/expected/filter_tree.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create  or replace function intrc(iint int)
  returns int as $$ 
  begin return iint; end;
@@ -530,8 +530,8 @@ LOG:  statement: select count(*) from t1 where intrc(v1) + 10 > v2;
 (1 row)
 
 -- simply the filter tree
-set pax_log_filter_tree to on;
-LOG:  statement: set pax_log_filter_tree to on;
+set pax.log_filter_tree to on;
+LOG:  statement: set pax.log_filter_tree to on;
 select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  statement: select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  Origin filter tree: 
@@ -653,8 +653,8 @@ NullTestNode(flags=129)
    200
 (1 row)
 
-reset pax_log_filter_tree;
-LOG:  statement: reset pax_log_filter_tree;
+reset pax.log_filter_tree;
+LOG:  statement: reset pax.log_filter_tree;
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 -- IN && bloom filter
diff --git a/contrib/pax_storage/expected/filter_tree_1.out b/contrib/pax_storage/expected/filter_tree_1.out
index 4739ac6bb3b..3e158df074b 100644
--- a/contrib/pax_storage/expected/filter_tree_1.out
+++ b/contrib/pax_storage/expected/filter_tree_1.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create  or replace function intrc(iint int)
  returns int as $$ 
  begin return iint; end;
@@ -530,8 +530,8 @@ LOG:  statement: select count(*) from t1 where intrc(v1) + 10 > v2;
 (1 row)
 
 -- simply the filter tree
-set pax_log_filter_tree to on;
-LOG:  statement: set pax_log_filter_tree to on;
+set pax.log_filter_tree to on;
+LOG:  statement: set pax.log_filter_tree to on;
 select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  statement: select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  Origin filter tree: 
@@ -660,8 +660,8 @@ NullTestNode(flags=129)
    200
 (1 row)
 
-reset pax_log_filter_tree;
-LOG:  statement: reset pax_log_filter_tree;
+reset pax.log_filter_tree;
+LOG:  statement: reset pax.log_filter_tree;
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 -- IN && bloom filter
diff --git a/contrib/pax_storage/expected/filter_tree_arithmetic.out b/contrib/pax_storage/expected/filter_tree_arithmetic.out
index 4486c647d6d..d1c49823f9b 100644
--- a/contrib/pax_storage/expected/filter_tree_arithmetic.out
+++ b/contrib/pax_storage/expected/filter_tree_arithmetic.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create table t_arithmetic(same int, v1 int, v2 int, v3 int) using pax with (minmax_columns='v1,v2,v3');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
diff --git a/contrib/pax_storage/expected/filter_tree_arithmetic_1.out b/contrib/pax_storage/expected/filter_tree_arithmetic_1.out
index b333d2bf625..b3fb2cb8e92 100644
--- a/contrib/pax_storage/expected/filter_tree_arithmetic_1.out
+++ b/contrib/pax_storage/expected/filter_tree_arithmetic_1.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create table t_arithmetic(same int, v1 int, v2 int, v3 int) using pax with (minmax_columns='v1,v2,v3');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
diff --git a/contrib/pax_storage/expected/filter_tree_optimizer.out b/contrib/pax_storage/expected/filter_tree_optimizer.out
index 6f07519949f..437408e52b6 100644
--- a/contrib/pax_storage/expected/filter_tree_optimizer.out
+++ b/contrib/pax_storage/expected/filter_tree_optimizer.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create  or replace function intrc(iint int)
  returns int as $$ 
  begin return iint; end;
@@ -530,8 +530,8 @@ LOG:  statement: select count(*) from t1 where intrc(v1) + 10 > v2;
 (1 row)
 
 -- simply the filter tree
-set pax_log_filter_tree to on;
-LOG:  statement: set pax_log_filter_tree to on;
+set pax.log_filter_tree to on;
+LOG:  statement: set pax.log_filter_tree to on;
 select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  statement: select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  Origin filter tree: 
@@ -656,8 +656,8 @@ NullTestNode(flags=129)
    200
 (1 row)
 
-reset pax_log_filter_tree;
-LOG:  statement: reset pax_log_filter_tree;
+reset pax.log_filter_tree;
+LOG:  statement: reset pax.log_filter_tree;
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 -- IN && bloom filter
diff --git a/contrib/pax_storage/expected/filter_tree_optimizer_1.out b/contrib/pax_storage/expected/filter_tree_optimizer_1.out
index a4c4c168664..19049ca4cd8 100644
--- a/contrib/pax_storage/expected/filter_tree_optimizer_1.out
+++ b/contrib/pax_storage/expected/filter_tree_optimizer_1.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create  or replace function intrc(iint int)
  returns int as $$ 
  begin return iint; end;
@@ -530,8 +530,8 @@ LOG:  statement: select count(*) from t1 where intrc(v1) + 10 > v2;
 (1 row)
 
 -- simply the filter tree
-set pax_log_filter_tree to on;
-LOG:  statement: set pax_log_filter_tree to on;
+set pax.log_filter_tree to on;
+LOG:  statement: set pax.log_filter_tree to on;
 select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  statement: select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 LOG:  Origin filter tree: 
@@ -664,8 +664,8 @@ NullTestNode(flags=129)
    200
 (1 row)
 
-reset pax_log_filter_tree;
-LOG:  statement: reset pax_log_filter_tree;
+reset pax.log_filter_tree;
+LOG:  statement: reset pax.log_filter_tree;
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 -- IN && bloom filter
diff --git a/contrib/pax_storage/expected/filter_tree_root_quals.out b/contrib/pax_storage/expected/filter_tree_root_quals.out
index c638550cb8a..6ca467e7142 100644
--- a/contrib/pax_storage/expected/filter_tree_root_quals.out
+++ b/contrib/pax_storage/expected/filter_tree_root_quals.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create table t1(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
diff --git a/contrib/pax_storage/expected/filter_tree_root_quals_1.out b/contrib/pax_storage/expected/filter_tree_root_quals_1.out
index 434eb449b59..d473544e73b 100644
--- a/contrib/pax_storage/expected/filter_tree_root_quals_1.out
+++ b/contrib/pax_storage/expected/filter_tree_root_quals_1.out
@@ -5,8 +5,8 @@
 -- m/No sparse filter/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 create table t1(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'same' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
diff --git a/contrib/pax_storage/expected/statistics/min_max_bit_byte_types.out b/contrib/pax_storage/expected/statistics/min_max_bit_byte_types.out
index 11b333296dc..aca12f8eb6a 100644
--- a/contrib/pax_storage/expected/statistics/min_max_bit_byte_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_bit_byte_types.out
@@ -4,9 +4,9 @@
 -- m/scan key build success/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the bool min/max types support 
 -- 
@@ -609,6 +609,6 @@ kind group, filter rate: 1 / 4
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_varbit;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/min_max_float_types.out b/contrib/pax_storage/expected/statistics/min_max_float_types.out
index c820fecf38c..620f8c1b9d4 100644
--- a/contrib/pax_storage/expected/statistics/min_max_float_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_float_types.out
@@ -4,9 +4,9 @@
 -- m/scan key build success/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the float4 min/max types support 
 -- 
@@ -809,6 +809,6 @@ LOG:  kind file, filter rate: 0 / 2
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_float8;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/min_max_geo_types.out b/contrib/pax_storage/expected/statistics/min_max_geo_types.out
index b067ed69207..2a1bf609fde 100644
--- a/contrib/pax_storage/expected/statistics/min_max_geo_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_geo_types.out
@@ -4,9 +4,9 @@
 -- m/scan key build success/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the box min/max types support 
 -- 
@@ -837,6 +837,6 @@ LOG:  kind file, filter rate: 0 / 2
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_path;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/min_max_int_types.out b/contrib/pax_storage/expected/statistics/min_max_int_types.out
index 1c08ce15288..c60fa8f247d 100644
--- a/contrib/pax_storage/expected/statistics/min_max_int_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_int_types.out
@@ -4,9 +4,9 @@
 -- m/scan key build success/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the int2 min/max types support 
 -- 
@@ -2015,6 +2015,6 @@ LOG:  kind file, filter rate: 0 / 2
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_numeric;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/min_max_net_types.out b/contrib/pax_storage/expected/statistics/min_max_net_types.out
index 97c288ee5ab..801ab2ca69e 100644
--- a/contrib/pax_storage/expected/statistics/min_max_net_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_net_types.out
@@ -4,9 +4,9 @@
 -- m/scan key build success/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the inet min/max types support 
 -- 
@@ -644,6 +644,6 @@ LOG:  kind file, filter rate: 0 / 2
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_mac8;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/min_max_other_types.out b/contrib/pax_storage/expected/statistics/min_max_other_types.out
index f62316c5f0e..bb79c1e3ee1 100644
--- a/contrib/pax_storage/expected/statistics/min_max_other_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_other_types.out
@@ -4,9 +4,9 @@
 -- m/scan key build success/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the oid min/max types support 
 -- 
@@ -637,6 +637,6 @@ LOG:  kind file, filter rate: 0 / 2
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_uuid;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/min_max_text_types.out b/contrib/pax_storage/expected/statistics/min_max_text_types.out
index 6e791f40cb2..119396957c5 100644
--- a/contrib/pax_storage/expected/statistics/min_max_text_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_text_types.out
@@ -5,9 +5,9 @@
 -- m/Feature not supported/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the text min/max types support 
 -- 
@@ -3210,6 +3210,6 @@ LOG:  kind file, filter rate: 0 / 2
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_name;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/min_max_time_types.out b/contrib/pax_storage/expected/statistics/min_max_time_types.out
index 6b15a011dde..c279e8207cb 100644
--- a/contrib/pax_storage/expected/statistics/min_max_time_types.out
+++ b/contrib/pax_storage/expected/statistics/min_max_time_types.out
@@ -4,9 +4,9 @@
 -- m/scan key build success/
 -- end_matchignore
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 -- 
 -- Test the date min/max types support 
 -- 
@@ -2485,6 +2485,6 @@ LOG:  kind file, filter rate: 0 / 2
 reset client_min_messages;
 LOG:  statement: reset client_min_messages;
 drop table t_interval;
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics/statistics.out b/contrib/pax_storage/expected/statistics/statistics.out
index 97b1a7bba9f..90a06b8cfd2 100644
--- a/contrib/pax_storage/expected/statistics/statistics.out
+++ b/contrib/pax_storage/expected/statistics/statistics.out
@@ -2,7 +2,7 @@ set default_table_access_method = pax;
 -- 
 -- Test with small group
 -- 
-set pax_max_tuples_per_group = 10;
+set pax.max_tuples_per_group = 10;
 -- test min/max type support
 create table t1(v1 int, v2 text, v3 float8, v4 bool) with (minmax_columns='v1,v2,v3,v4');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
@@ -186,7 +186,7 @@ select * from get_pax_aux_table('t_interval');
 (3 rows)
 
 drop table t_interval;
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
 -- 
 -- Test with small group
 -- 
@@ -347,7 +347,7 @@ drop table t_interval;
 -- 
 -- Test the update/delete DML, stats should be updated
 -- 
-set pax_max_tuples_per_group = 250;
+set pax.max_tuples_per_group = 250;
 -- delete part of data in the first group
 create table t1_update_stats(v1 int, v2 int, v3 int) with (minmax_columns='v1,v2');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
@@ -660,7 +660,7 @@ select * from get_pax_aux_table('t10_update_stats');
 
 drop table t10_update_stats;
 -- delete twice
-set pax_max_tuples_per_group = 25;
+set pax.max_tuples_per_group = 25;
 create table t_delete_twice_stats(v1 int, v2 int, v3 int) with (minmax_columns='v2,v3');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
@@ -743,4 +743,4 @@ select * from get_pax_aux_table('t_update_twice_stats');
 (3 rows)
 
 drop table t_update_twice_stats;
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/statistics_bloom_filter.out b/contrib/pax_storage/expected/statistics_bloom_filter.out
index bb2b4ae7c19..ec96bcfbc97 100644
--- a/contrib/pax_storage/expected/statistics_bloom_filter.out
+++ b/contrib/pax_storage/expected/statistics_bloom_filter.out
@@ -6,12 +6,12 @@
 -- m/^LOG:  Missing statistics for column: .*/
 -- end_matchignore
 set default_table_access_method = pax;
-set pax_enable_debug to on;
+set pax.enable_debug to on;
 -- 
 -- Test with small group
 -- 
-set pax_max_tuples_per_group = 10;
-set pax_bloom_filter_work_memory_bytes = 102400; -- 100kb
+set pax.max_tuples_per_group = 10;
+set pax.bloom_filter_work_memory_bytes = 102400; -- 100kb
 -- create pax table with bloom filter reloptions 
 create table t1(v1 int, v2 text, v3 varchar, v4 varchar(100), v5 bit, v6 float, v7 numeric, v8 numeric(20,10)) 
     with (bloomfilter_columns='v1,v2,v3,v4,v5,v6,v7,v8');
@@ -20,7 +20,7 @@ create table t2(v1 int, v2 text, v3 varchar, v4 varchar(100), v5 bit, v6 float,
 drop table t1;
 drop table t2;
 -- test bloom filter(only work on IN case)
-set pax_enable_sparse_filter to on;
+set pax.enable_sparse_filter to on;
 -- the fixed length and type by value type
 create table t1(single_seg int, v1 int, v2 int) with (bloomfilter_columns='v1,v2');
 insert into t1 values(1, generate_series(1, 100), generate_series(101, 200));
@@ -405,8 +405,8 @@ kind group, filter rate: 2 / 4
 reset client_min_messages;
 drop table t3;
 -- test the big bloom filter
-set pax_max_tuples_per_group to 16384;
-set pax_max_tuples_per_file to 131072;
+set pax.max_tuples_per_group to 16384;
+set pax.max_tuples_per_file to 131072;
 create table t4(single_seg int, v1 varchar, v2 varchar) with (bloomfilter_columns='v1,v2');
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'single_seg' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
@@ -458,7 +458,7 @@ kind group, filter rate: 7 / 8
 (0 rows)
 
 reset client_min_messages;
-reset pax_bloom_filter_work_memory_bytes;
-reset pax_max_tuples_per_group;
-reset pax_max_tuples_per_file;
-reset pax_enable_sparse_filter;
+reset pax.bloom_filter_work_memory_bytes;
+reset pax.max_tuples_per_group;
+reset pax.max_tuples_per_file;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/expected/toast.out b/contrib/pax_storage/expected/toast.out
index 3ec9dcd61ad..9306c12137f 100644
--- a/contrib/pax_storage/expected/toast.out
+++ b/contrib/pax_storage/expected/toast.out
@@ -1,5 +1,5 @@
 set default_table_access_method = pax;
-set pax_enable_toast to true;
+set pax.enable_toast to true;
 CREATE TABLE pax_toasttest_t1(v1 text);
 alter TABLE pax_toasttest_t1 alter column v1 set storage plain;
 insert into pax_toasttest_t1 values(repeat('0', 100000000));
@@ -131,9 +131,9 @@ select length(v2), length(v4) from pax_toasttest_t2;
 
 drop table pax_toasttest_t2;
 -----------------------------------------------------------------------
--- a copy test cases that should be sucess when pax_enable_toast is off
+-- a copy test cases that should be sucess when pax.enable_toast is off
 -----------------------------------------------------------------------
-set pax_enable_toast to false;
+set pax.enable_toast to false;
 CREATE TABLE pax_toasttest_t1(v1 text);
 alter TABLE pax_toasttest_t1 alter column v1 set storage plain;
 insert into pax_toasttest_t1 values(repeat('0', 100000000));
diff --git a/contrib/pax_storage/expected/toast_failed.out b/contrib/pax_storage/expected/toast_failed.out
index dfcd8a505b8..7e758f426df 100644
--- a/contrib/pax_storage/expected/toast_failed.out
+++ b/contrib/pax_storage/expected/toast_failed.out
@@ -1,5 +1,5 @@
 set default_table_access_method = pax;
-set pax_enable_toast to true;
+set pax.enable_toast to true;
 -- test compress failed
 -- random varchar always make compress toast failed
 create or replace function random_string(integer)
diff --git a/contrib/pax_storage/expected/visimap_vec_compact.out b/contrib/pax_storage/expected/visimap_vec_compact.out
index e372f4b3054..b7c0a2b061f 100644
--- a/contrib/pax_storage/expected/visimap_vec_compact.out
+++ b/contrib/pax_storage/expected/visimap_vec_compact.out
@@ -2,7 +2,7 @@
 -- so we can test multiple group with visimap,
 -- at the beginning, in the middle, or at the end
 -- of a group.
-set pax_max_tuples_per_group = 5;
+set pax.max_tuples_per_group = 5;
 -- column types contain:
 -- 1. normal fix-length column, like int
 -- 2. normal variable-length column, like text
@@ -235,4 +235,4 @@ select * from pt1 where a = 1 and i >= 2 and i < 10;
 rollback;
 reset optimizer;
 drop table pt1;
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/visimap_vec_compact_1.out b/contrib/pax_storage/expected/visimap_vec_compact_1.out
index 1cd08636a70..e4424dbe3a1 100644
--- a/contrib/pax_storage/expected/visimap_vec_compact_1.out
+++ b/contrib/pax_storage/expected/visimap_vec_compact_1.out
@@ -2,7 +2,7 @@
 -- so we can test multiple group with visimap,
 -- at the beginning, in the middle, or at the end
 -- of a group.
-set pax_max_tuples_per_group = 5;
+set pax.max_tuples_per_group = 5;
 -- column types contain:
 -- 1. normal fix-length column, like int
 -- 2. normal variable-length column, like text
@@ -235,4 +235,4 @@ select * from pt1 where a = 1 and i >= 2 and i < 10;
 rollback;
 reset optimizer;
 drop table pt1;
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/visimap_vec_storage.out b/contrib/pax_storage/expected/visimap_vec_storage.out
index fbc3b4ef549..ab36db2e7e4 100644
--- a/contrib/pax_storage/expected/visimap_vec_storage.out
+++ b/contrib/pax_storage/expected/visimap_vec_storage.out
@@ -2,7 +2,7 @@
 -- so we can test multiple group with visimap,
 -- at the beginning, in the middle, or at the end
 -- of a group.
-set pax_max_tuples_per_group = 5;
+set pax.max_tuples_per_group = 5;
 -- column types contain:
 -- 1. normal fix-length column, like int
 -- 2. normal variable-length column, like text
@@ -235,4 +235,4 @@ select * from pt1 where a = 1 and i >= 2 and i < 10;
 rollback;
 reset optimizer;
 drop table pt1;
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/expected/visimap_vec_storage_1.out b/contrib/pax_storage/expected/visimap_vec_storage_1.out
index 336e1f94009..51068b7ec84 100644
--- a/contrib/pax_storage/expected/visimap_vec_storage_1.out
+++ b/contrib/pax_storage/expected/visimap_vec_storage_1.out
@@ -2,7 +2,7 @@
 -- so we can test multiple group with visimap,
 -- at the beginning, in the middle, or at the end
 -- of a group.
-set pax_max_tuples_per_group = 5;
+set pax.max_tuples_per_group = 5;
 -- column types contain:
 -- 1. normal fix-length column, like int
 -- 2. normal variable-length column, like text
@@ -235,4 +235,4 @@ select * from pt1 where a = 1 and i >= 2 and i < 10;
 rollback;
 reset optimizer;
 drop table pt1;
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/cluster.sql b/contrib/pax_storage/sql/cluster.sql
index 30da852522c..9b44fbdc6be 100644
--- a/contrib/pax_storage/sql/cluster.sql
+++ b/contrib/pax_storage/sql/cluster.sql
@@ -1,4 +1,4 @@
-set pax_max_tuples_per_file to 131072;
+set pax.max_tuples_per_file to 131072;
 
 -- cluster table using index
 -- start_ignore
@@ -63,7 +63,7 @@ select ptblockname,ptstatistics,ptisclustered from get_pax_aux_table('t_zorder_c
 drop table t_zorder_cluster;
 
 -- test cluster index
-set pax_max_tuples_per_file to 131072;
+set pax.max_tuples_per_file to 131072;
 drop table if EXISTS t_index_cluster;
 create table t_index_cluster(c1 int, c2 int) with (minmax_columns='c1,c2');
 \d+ t_index_cluster;
diff --git a/contrib/pax_storage/sql/filter.sql b/contrib/pax_storage/sql/filter.sql
index c2548f50703..baf4d619c6a 100644
--- a/contrib/pax_storage/sql/filter.sql
+++ b/contrib/pax_storage/sql/filter.sql
@@ -1,5 +1,5 @@
-set pax_enable_debug to on;
-set pax_enable_sparse_filter = on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter = on;
 create table pax_test.null_test_t(a int, b int, c text) using pax;
 
 insert into pax_test.null_test_t(a) select null from generate_series(1,2)i;
@@ -73,4 +73,4 @@ select * from pax_test.in_test_t where h in ('bp_2', 'bp_4');
 reset client_min_messages;
 drop table pax_test.in_test_t;
 
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/sql/filter_tree.sql b/contrib/pax_storage/sql/filter_tree.sql
index 04f8cbce942..81b350daa1e 100644
--- a/contrib/pax_storage/sql/filter_tree.sql
+++ b/contrib/pax_storage/sql/filter_tree.sql
@@ -7,8 +7,8 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 
 create  or replace function intrc(iint int)
  returns int as $$ 
@@ -132,11 +132,11 @@ select count(*) from t1 where v1 + v2 < v3;
 select count(*) from t1 where intrc(v1) + 10 > v2;
 
 -- simply the filter tree
-set pax_log_filter_tree to on;
+set pax.log_filter_tree to on;
 select count(*) from t1 where v1 > 10 or intrc(v2) < 120;
 select count(*) from t1 where v1 > 10 and intrc(v2) < 120;
 select count(*) from t1 where v1 is not null;
-reset pax_log_filter_tree;
+reset pax.log_filter_tree;
 
 reset client_min_messages;
 
diff --git a/contrib/pax_storage/sql/filter_tree_arithmetic.sql b/contrib/pax_storage/sql/filter_tree_arithmetic.sql
index 40339ecc393..deb136c9e29 100644
--- a/contrib/pax_storage/sql/filter_tree_arithmetic.sql
+++ b/contrib/pax_storage/sql/filter_tree_arithmetic.sql
@@ -7,8 +7,8 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 
 create table t_arithmetic(same int, v1 int, v2 int, v3 int) using pax with (minmax_columns='v1,v2,v3');
 create table ta_mul(same int, v1 int, v2 int, v3 int) using pax with (minmax_columns='v1,v2,v3');
diff --git a/contrib/pax_storage/sql/filter_tree_root_quals.sql b/contrib/pax_storage/sql/filter_tree_root_quals.sql
index 523f7a67f43..f4d4880f3bf 100644
--- a/contrib/pax_storage/sql/filter_tree_root_quals.sql
+++ b/contrib/pax_storage/sql/filter_tree_root_quals.sql
@@ -6,8 +6,8 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
 
 create table t1(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
 create table t2(same int, v1 int, v2 int, v3 int, v4 int) using pax with (minmax_columns='v1,v2,v3,v4');
diff --git a/contrib/pax_storage/sql/statistics/min_max_bit_byte_types.sql b/contrib/pax_storage/sql/statistics/min_max_bit_byte_types.sql
index 73bc0a26596..a9d5822c6e6 100644
--- a/contrib/pax_storage/sql/statistics/min_max_bit_byte_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_bit_byte_types.sql
@@ -5,9 +5,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the bool min/max types support 
@@ -151,8 +151,8 @@ select count(*) from t_varbit where v = '1'::bit;
 reset client_min_messages;
 drop table t_varbit;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
 
 
diff --git a/contrib/pax_storage/sql/statistics/min_max_float_types.sql b/contrib/pax_storage/sql/statistics/min_max_float_types.sql
index db17cf105ab..1ece90d9e4e 100644
--- a/contrib/pax_storage/sql/statistics/min_max_float_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_float_types.sql
@@ -5,9 +5,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the float4 min/max types support 
@@ -156,6 +156,6 @@ select count(*) from t_float8 where v <= 20::float4;
 reset client_min_messages;
 drop table t_float8;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics/min_max_geo_types.sql b/contrib/pax_storage/sql/statistics/min_max_geo_types.sql
index 02eb4929e76..575f0fe6721 100644
--- a/contrib/pax_storage/sql/statistics/min_max_geo_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_geo_types.sql
@@ -5,9 +5,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the box min/max types support 
@@ -194,6 +194,6 @@ select count(*) from t_path where v <= path'(0,0),(1,1),(2,20)';
 reset client_min_messages;
 drop table t_path;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics/min_max_int_types.sql b/contrib/pax_storage/sql/statistics/min_max_int_types.sql
index 68d9118f102..abcd1eb6374 100644
--- a/contrib/pax_storage/sql/statistics/min_max_int_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_int_types.sql
@@ -5,9 +5,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the int2 min/max types support 
@@ -366,6 +366,6 @@ select count(*) from t_numeric where v <= 20::numeric;
 reset client_min_messages;
 drop table t_numeric;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics/min_max_net_types.sql b/contrib/pax_storage/sql/statistics/min_max_net_types.sql
index fa46533689b..ceb19783ca6 100644
--- a/contrib/pax_storage/sql/statistics/min_max_net_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_net_types.sql
@@ -5,9 +5,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the inet min/max types support 
@@ -154,6 +154,6 @@ select count(*) from t_mac8 where v <= '12:34:56:00:00:00:00:20'::macaddr8;
 reset client_min_messages;
 drop table t_mac8;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics/min_max_other_types.sql b/contrib/pax_storage/sql/statistics/min_max_other_types.sql
index 1ebc0a3a504..79e93ccf83f 100644
--- a/contrib/pax_storage/sql/statistics/min_max_other_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_other_types.sql
@@ -5,9 +5,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the oid min/max types support 
@@ -145,6 +145,6 @@ select count(*) from t_uuid where v <= 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a30'::u
 reset client_min_messages;
 drop table t_uuid;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics/min_max_text_types.sql b/contrib/pax_storage/sql/statistics/min_max_text_types.sql
index 66e7ed91b21..0dfd4c9f11b 100644
--- a/contrib/pax_storage/sql/statistics/min_max_text_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_text_types.sql
@@ -6,9 +6,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the text min/max types support 
@@ -590,6 +590,6 @@ select count(*) from t_name where v <= 'pft'::varchar;
 reset client_min_messages;
 drop table t_name;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics/min_max_time_types.sql b/contrib/pax_storage/sql/statistics/min_max_time_types.sql
index 3a8c9fab872..710b5141926 100644
--- a/contrib/pax_storage/sql/statistics/min_max_time_types.sql
+++ b/contrib/pax_storage/sql/statistics/min_max_time_types.sql
@@ -5,9 +5,9 @@
 -- end_matchignore
 
 set default_table_access_method to pax;
-set pax_enable_debug to on;
-set pax_enable_sparse_filter to on;
-set pax_max_tuples_per_group to 5;
+set pax.enable_debug to on;
+set pax.enable_sparse_filter to on;
+set pax.max_tuples_per_group to 5;
 
 -- 
 -- Test the date min/max types support 
@@ -501,6 +501,6 @@ select count(*) from t_interval where v <= '20 second'::interval;
 reset client_min_messages;
 drop table t_interval;
 
-reset pax_enable_debug;
-reset pax_enable_sparse_filter;
-reset pax_max_tuples_per_group;
+reset pax.enable_debug;
+reset pax.enable_sparse_filter;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics/statistics.sql b/contrib/pax_storage/sql/statistics/statistics.sql
index 7df0302cc67..00a9337e91d 100644
--- a/contrib/pax_storage/sql/statistics/statistics.sql
+++ b/contrib/pax_storage/sql/statistics/statistics.sql
@@ -4,7 +4,7 @@ set default_table_access_method = pax;
 -- 
 -- Test with small group
 -- 
-set pax_max_tuples_per_group = 10;
+set pax.max_tuples_per_group = 10;
 
 -- test min/max type support
 create table t1(v1 int, v2 text, v3 float8, v4 bool) with (minmax_columns='v1,v2,v3,v4');
@@ -87,7 +87,7 @@ insert into t_interval values
 select * from get_pax_aux_table('t_interval');
 drop table t_interval;
 
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
 
 -- 
 -- Test with small group
@@ -162,7 +162,7 @@ drop table t_interval;
 -- 
 -- Test the update/delete DML, stats should be updated
 -- 
-set pax_max_tuples_per_group = 250;
+set pax.max_tuples_per_group = 250;
 
 -- delete part of data in the first group
 create table t1_update_stats(v1 int, v2 int, v3 int) with (minmax_columns='v1,v2');
@@ -276,7 +276,7 @@ drop table t10_update_stats;
 
 
 -- delete twice
-set pax_max_tuples_per_group = 25;
+set pax.max_tuples_per_group = 25;
 create table t_delete_twice_stats(v1 int, v2 int, v3 int) with (minmax_columns='v2,v3');
 insert into t_delete_twice_stats values(1, generate_series(1, 100), generate_series(101, 200));
 select * from get_pax_aux_table('t_delete_twice_stats');
@@ -304,4 +304,4 @@ select sum(v2), sum(v3) from t_update_twice_stats;
 select * from get_pax_aux_table('t_update_twice_stats');
 drop table t_update_twice_stats;
 
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/statistics_bloom_filter.sql b/contrib/pax_storage/sql/statistics_bloom_filter.sql
index 53cfbf9418c..a19f8b1bd83 100644
--- a/contrib/pax_storage/sql/statistics_bloom_filter.sql
+++ b/contrib/pax_storage/sql/statistics_bloom_filter.sql
@@ -6,12 +6,12 @@
 -- m/^LOG:  Missing statistics for column: .*/
 -- end_matchignore
 set default_table_access_method = pax;
-set pax_enable_debug to on;
+set pax.enable_debug to on;
 -- 
 -- Test with small group
 -- 
-set pax_max_tuples_per_group = 10;
-set pax_bloom_filter_work_memory_bytes = 102400; -- 100kb
+set pax.max_tuples_per_group = 10;
+set pax.bloom_filter_work_memory_bytes = 102400; -- 100kb
 
 -- create pax table with bloom filter reloptions 
 create table t1(v1 int, v2 text, v3 varchar, v4 varchar(100), v5 bit, v6 float, v7 numeric, v8 numeric(20,10)) 
@@ -23,7 +23,7 @@ drop table t1;
 drop table t2;
 
 -- test bloom filter(only work on IN case)
-set pax_enable_sparse_filter to on;
+set pax.enable_sparse_filter to on;
 -- the fixed length and type by value type
 create table t1(single_seg int, v1 int, v2 int) with (bloomfilter_columns='v1,v2');
 
@@ -124,8 +124,8 @@ reset client_min_messages;
 drop table t3;
 
 -- test the big bloom filter
-set pax_max_tuples_per_group to 16384;
-set pax_max_tuples_per_file to 131072;
+set pax.max_tuples_per_group to 16384;
+set pax.max_tuples_per_file to 131072;
 
 create table t4(single_seg int, v1 varchar, v2 varchar) with (bloomfilter_columns='v1,v2');
 insert into t4 values(1, generate_series(1, 1000000), generate_series(1000001, 2000000));
@@ -140,7 +140,7 @@ select * from t4 where v1 > '1' and v2 in ('8', '1000009');
 select * from t4 where v1 in ('8', '1000009') and v2 in ('8', '1000009');
 reset client_min_messages;
 
-reset pax_bloom_filter_work_memory_bytes;
-reset pax_max_tuples_per_group;
-reset pax_max_tuples_per_file;
-reset pax_enable_sparse_filter;
+reset pax.bloom_filter_work_memory_bytes;
+reset pax.max_tuples_per_group;
+reset pax.max_tuples_per_file;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/sql/toast.sql b/contrib/pax_storage/sql/toast.sql
index c4c920617d1..3a8b267cc19 100644
--- a/contrib/pax_storage/sql/toast.sql
+++ b/contrib/pax_storage/sql/toast.sql
@@ -1,6 +1,6 @@
 set default_table_access_method = pax;
 
-set pax_enable_toast to true;
+set pax.enable_toast to true;
 CREATE TABLE pax_toasttest_t1(v1 text);
 alter TABLE pax_toasttest_t1 alter column v1 set storage plain;
 insert into pax_toasttest_t1 values(repeat('0', 100000000));
@@ -48,9 +48,9 @@ select length(v2), length(v4) from pax_toasttest_t2;
 drop table pax_toasttest_t2;
 
 -----------------------------------------------------------------------
--- a copy test cases that should be sucess when pax_enable_toast is off
+-- a copy test cases that should be sucess when pax.enable_toast is off
 -----------------------------------------------------------------------
-set pax_enable_toast to false;
+set pax.enable_toast to false;
 CREATE TABLE pax_toasttest_t1(v1 text);
 alter TABLE pax_toasttest_t1 alter column v1 set storage plain;
 insert into pax_toasttest_t1 values(repeat('0', 100000000));
diff --git a/contrib/pax_storage/sql/toast_failed.sql b/contrib/pax_storage/sql/toast_failed.sql
index f02749586d3..c9139b474ce 100644
--- a/contrib/pax_storage/sql/toast_failed.sql
+++ b/contrib/pax_storage/sql/toast_failed.sql
@@ -1,6 +1,6 @@
 set default_table_access_method = pax;
 
-set pax_enable_toast to true;
+set pax.enable_toast to true;
 
 -- test compress failed
 -- random varchar always make compress toast failed
diff --git a/contrib/pax_storage/sql/visimap_vec_compact.sql b/contrib/pax_storage/sql/visimap_vec_compact.sql
index 6454c6f0b63..2989e40b3a2 100644
--- a/contrib/pax_storage/sql/visimap_vec_compact.sql
+++ b/contrib/pax_storage/sql/visimap_vec_compact.sql
@@ -2,7 +2,7 @@
 -- so we can test multiple group with visimap,
 -- at the beginning, in the middle, or at the end
 -- of a group.
-set pax_max_tuples_per_group = 5;
+set pax.max_tuples_per_group = 5;
 
 -- column types contain:
 -- 1. normal fix-length column, like int
@@ -78,4 +78,4 @@ reset optimizer;
 
 drop table pt1;
 
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/sql/visimap_vec_storage.sql b/contrib/pax_storage/sql/visimap_vec_storage.sql
index eac6eddc55e..daf8dec1ff9 100644
--- a/contrib/pax_storage/sql/visimap_vec_storage.sql
+++ b/contrib/pax_storage/sql/visimap_vec_storage.sql
@@ -2,7 +2,7 @@
 -- so we can test multiple group with visimap,
 -- at the beginning, in the middle, or at the end
 -- of a group.
-set pax_max_tuples_per_group = 5;
+set pax.max_tuples_per_group = 5;
 
 -- column types contain:
 -- 1. normal fix-length column, like int
@@ -78,4 +78,4 @@ reset optimizer;
 
 drop table pt1;
 
-reset pax_max_tuples_per_group;
+reset pax.max_tuples_per_group;
diff --git a/contrib/pax_storage/src/api/python3/paxfilereader_type.cc b/contrib/pax_storage/src/api/python3/paxfilereader_type.cc
index 3731ab613a5..262c49e592a 100644
--- a/contrib/pax_storage/src/api/python3/paxfilereader_type.cc
+++ b/contrib/pax_storage/src/api/python3/paxfilereader_type.cc
@@ -129,7 +129,7 @@ static int paxfilereader_init(PyObject *self, PyObject *args,
   PyObject *schema = NULL, *proj = NULL, *pax_file = NULL;
   PaxFileObject *pax_file_obj;
   std::shared_ptr<pax::Bitmap8> visible_map_bm = nullptr;
-  std::shared_ptr<pax::File> toast_file = nullptr;
+  std::unique_ptr<pax::File> toast_file = nullptr;
 
   PaxFileReaderObject *pax_file_reader;
   pax_file_reader = (PaxFileReaderObject *)self;
@@ -227,7 +227,7 @@ static int paxfilereader_init(PyObject *self, PyObject *args,
 
     auto file_ptr = pax::Singleton<pax::LocalFileSystem>::GetInstance()->Open(
         pax_file_obj->filepath, pax::fs::kReadMode);
-    auto reader = new pax::OrcReader(std::move(file_ptr), toast_file);
+    auto reader = new pax::OrcReader(std::move(file_ptr), std::move(toast_file));
     reader->Open(std::move(read_options));
     pax_file_reader->reader = reader;
   } catch (cbdb::CException &e) {
@@ -345,7 +345,6 @@ static PyObject *paxfilereader_readgroup(PaxFileReaderObject *self,
   try {
     for (; column_index < col_nums; column_index++) {
       const auto &column = (*columns)[column_index];
-      std::shared_ptr<pax::Bitmap8> bm;
       auto null_counts = 0;
       PyObject *schema_item = nullptr;
       long col_oid;
@@ -373,7 +372,7 @@ static PyObject *paxfilereader_readgroup(PaxFileReaderObject *self,
         continue;
       }
 
-      bm = column->GetBitmap();
+      const auto &bm = column->GetBitmap();
 
       py_rows = PyList_New(0);
       if (!py_rows) {
@@ -403,7 +402,7 @@ static PyObject *paxfilereader_readgroup(PaxFileReaderObject *self,
           if (column->IsToast(row_index)) {
             // safe to no keep the ref, because paxbuffer_to_pyobj will copy the
             // detoast datum
-            std::shared_ptr<pax::MemoryObject> ref = nullptr;
+            std::unique_ptr<pax::MemoryObject> ref = nullptr;
 
             auto datum = PointerGetDatum(buff);
             auto external_buffer = column->GetExternalToastDataBuffer();
diff --git a/contrib/pax_storage/src/api/python3/setup-debug.py b/contrib/pax_storage/src/api/python3/setup-debug.py
index 13eadaa357d..da02e2ab237 100644
--- a/contrib/pax_storage/src/api/python3/setup-debug.py
+++ b/contrib/pax_storage/src/api/python3/setup-debug.py
@@ -51,7 +51,7 @@ def abs_path(file_name):
        version = '1.0',
        description = 'PAXPY is the PYTHON3 API of PAX',
        author = 'jiaqizho',
-       author_email = 'jiaqizho@hashdata.cn',
+       author_email = 'jiaqizho@apache.org',
        url = '-',
        ext_modules = [paxpy_module]
-)
\ No newline at end of file
+)
diff --git a/contrib/pax_storage/src/api/python3/setup.py b/contrib/pax_storage/src/api/python3/setup.py
index a60cc779fd9..b739cacc465 100644
--- a/contrib/pax_storage/src/api/python3/setup.py
+++ b/contrib/pax_storage/src/api/python3/setup.py
@@ -48,7 +48,7 @@ def abs_path(file_name):
        version = '1.0',
        description = 'PAXPY is the PYTHON3 API of PAX',
        author = 'jiaqizho',
-       author_email = 'jiaqizho@hashdata.cn',
+       author_email = 'jiaqizho@apache.org',
        url = '-',
        ext_modules = [paxpy_module]
-)
\ No newline at end of file
+)
diff --git a/contrib/pax_storage/src/cpp/access/pax_access_handle.cc b/contrib/pax_storage/src/cpp/access/pax_access_handle.cc
index da07cddd5d7..12caf0e9f64 100644
--- a/contrib/pax_storage/src/cpp/access/pax_access_handle.cc
+++ b/contrib/pax_storage/src/cpp/access/pax_access_handle.cc
@@ -412,8 +412,6 @@ void CCPaxAccessMethod::FinishBulkInsert(Relation relation, int options) {
 }
 
 void CCPaxAccessMethod::ExtDmlInit(Relation rel, CmdType operation) {
-  if (!RELATION_IS_PAX(rel)) return;
-
   CBDB_TRY();
   { pax::CPaxDmlStateLocal::Instance()->InitDmlState(rel, operation); }
   CBDB_CATCH_DEFAULT();
@@ -422,8 +420,6 @@ void CCPaxAccessMethod::ExtDmlInit(Relation rel, CmdType operation) {
 }
 
 void CCPaxAccessMethod::ExtDmlFini(Relation rel, CmdType operation) {
-  if (!RELATION_IS_PAX(rel)) return;
-
   CBDB_TRY();
   { pax::CPaxDmlStateLocal::Instance()->FinishDmlState(rel, operation); }
   CBDB_CATCH_DEFAULT();
@@ -453,6 +449,7 @@ uint32 PaxAccessMethod::ScanFlags(Relation relation) {
   flags |= SCAN_FORCE_BIG_WRITE_LOCK;
 #endif
 
+  flags |= SCAN_SUPPORT_RUNTIME_FILTER;
   return flags;
 }
 
@@ -790,6 +787,8 @@ static const TableAmRoutine kPaxColumnMethods = {
     .scan_sample_next_block = pax::CCPaxAccessMethod::ScanSampleNextBlock,
     .scan_sample_next_tuple = pax::CCPaxAccessMethod::ScanSampleNextTuple,
 
+    .dml_init = pax::CCPaxAccessMethod::ExtDmlInit,
+    .dml_fini = pax::CCPaxAccessMethod::ExtDmlFini,
     .amoptions = paxc::PaxAccessMethod::AmOptions,
     .swap_relation_files = paxc::PaxAccessMethod::SwapRelationFiles,
     .validate_column_encoding_clauses =
@@ -1190,9 +1189,6 @@ void _PG_init(void) {  // NOLINT
   prev_object_access_hook = object_access_hook;
   object_access_hook = PaxObjectAccessHook;
 
-  ext_dml_init_hook = pax::CCPaxAccessMethod::ExtDmlInit;
-  ext_dml_finish_hook = pax::CCPaxAccessMethod::ExtDmlFini;
-
   prev_ProcessUtilit_hook = ProcessUtility_hook;
   ProcessUtility_hook = paxProcessUtility;
 
diff --git a/contrib/pax_storage/src/cpp/access/pax_access_handle.h b/contrib/pax_storage/src/cpp/access/pax_access_handle.h
index d541a400d2b..9ed827b4709 100644
--- a/contrib/pax_storage/src/cpp/access/pax_access_handle.h
+++ b/contrib/pax_storage/src/cpp/access/pax_access_handle.h
@@ -197,6 +197,3 @@ class CCPaxAccessMethod final {
 };
 
 }  // namespace pax
-
-extern ext_dml_func_hook_type ext_dml_init_hook;
-extern ext_dml_func_hook_type ext_dml_finish_hook;
diff --git a/contrib/pax_storage/src/cpp/access/pax_dml_state.cc b/contrib/pax_storage/src/cpp/access/pax_dml_state.cc
index 0a7d367d34f..40cb6bdcdcd 100644
--- a/contrib/pax_storage/src/cpp/access/pax_dml_state.cc
+++ b/contrib/pax_storage/src/cpp/access/pax_dml_state.cc
@@ -104,7 +104,7 @@ void CPaxDmlStateLocal::Reset() { cbdb::pax_memory_context = nullptr; }
 CPaxDmlStateLocal::CPaxDmlStateLocal()
     : last_oid_(InvalidOid), cb_{.func = DmlStateResetCallback, .arg = NULL} {}
 
-std::shared_ptr<CPaxDmlStateLocal::DmlStateValue>
+pg_attribute_always_inline std::shared_ptr<CPaxDmlStateLocal::DmlStateValue>
 CPaxDmlStateLocal::RemoveDmlState(const Oid &oid) {
   std::shared_ptr<CPaxDmlStateLocal::DmlStateValue> value;
 
@@ -121,7 +121,7 @@ CPaxDmlStateLocal::RemoveDmlState(const Oid &oid) {
   return value;
 }
 
-std::shared_ptr<CPaxDmlStateLocal::DmlStateValue>
+pg_attribute_always_inline std::shared_ptr<CPaxDmlStateLocal::DmlStateValue>
 CPaxDmlStateLocal::FindDmlState(const Oid &oid) {
   Assert(OidIsValid(oid));
 
diff --git a/contrib/pax_storage/src/cpp/access/pax_scanner.cc b/contrib/pax_storage/src/cpp/access/pax_scanner.cc
index a5e0b632002..5a354e6fa0c 100644
--- a/contrib/pax_storage/src/cpp/access/pax_scanner.cc
+++ b/contrib/pax_storage/src/cpp/access/pax_scanner.cc
@@ -218,7 +218,7 @@ bool PaxScanDesc::BitmapNextTuple(struct TBMIterateResult *tbmres,
 }
 
 TableScanDesc PaxScanDesc::BeginScan(Relation relation, Snapshot snapshot,
-                                     int nkeys, struct ScanKeyData * /*key*/,
+                                     int nkeys, struct ScanKeyData *key,
                                      ParallelTableScanDesc pscan, uint32 flags,
                                      std::shared_ptr<PaxFilter> &&pax_filter,
                                      bool build_bitmap) {
@@ -326,8 +326,8 @@ void PaxScanDesc::EndScan() {
 }
 
 TableScanDesc PaxScanDesc::BeginScanExtractColumns(
-    Relation rel, Snapshot snapshot, int /*nkeys*/,
-    struct ScanKeyData * /*key*/, ParallelTableScanDesc parallel_scan,
+    Relation rel, Snapshot snapshot, int nkeys,
+    struct ScanKeyData *key, ParallelTableScanDesc parallel_scan,
     struct PlanState *ps, uint32 flags) {
   std::shared_ptr<PaxFilter> filter;
   List *targetlist = ps->plan->targetlist;
@@ -361,7 +361,7 @@ TableScanDesc PaxScanDesc::BeginScanExtractColumns(
   filter->SetColumnProjection(std::move(col_bits));
 
   if (pax_enable_sparse_filter) {
-    filter->InitSparseFilter(rel, qual);
+    filter->InitSparseFilter(rel, qual, key, nkeys);
 
     // FIXME: enable predicate pushdown can filter rows immediately without
     // assigning all columns. But it may mess the filter orders for multiple
@@ -375,7 +375,7 @@ TableScanDesc PaxScanDesc::BeginScanExtractColumns(
       filter->InitRowFilter(rel, ps, filter->GetColumnProjection());
     }
   }
-  return BeginScan(rel, snapshot, 0, nullptr, parallel_scan, flags,
+  return BeginScan(rel, snapshot, nkeys, key, parallel_scan, flags,
                    std::move(filter), build_bitmap);
 }
 
diff --git a/contrib/pax_storage/src/cpp/access/pax_visimap.cc b/contrib/pax_storage/src/cpp/access/pax_visimap.cc
index b96752d31ba..cdc7dfe763e 100644
--- a/contrib/pax_storage/src/cpp/access/pax_visimap.cc
+++ b/contrib/pax_storage/src/cpp/access/pax_visimap.cc
@@ -143,8 +143,7 @@ bool TestVisimap(Relation rel, const char *visimap_name, int offset) {
   fs = Singleton<LocalFileSystem>::GetInstance();
 
   auto visimap = LoadVisimap(fs, options, file_path);
-  auto bm = Bitmap8(BitmapRaw<uint8>(visimap->data(), visimap->size()),
-                    Bitmap8::ReadOnlyOwnBitmap);
+  auto bm = Bitmap8(BitmapRaw<uint8>(visimap->data(), visimap->size()));
   auto is_set = bm.Test(offset);
   return !is_set;
 }
diff --git a/contrib/pax_storage/src/cpp/access/paxc_rel_options.cc b/contrib/pax_storage/src/cpp/access/paxc_rel_options.cc
index 647cb5743cf..5de1b14cd97 100644
--- a/contrib/pax_storage/src/cpp/access/paxc_rel_options.cc
+++ b/contrib/pax_storage/src/cpp/access/paxc_rel_options.cc
@@ -50,6 +50,10 @@ static const relopt_compress_type_mapping kSelfRelCompressMap[] = {
      pax::ColumnEncoding_Kind::ColumnEncoding_Kind_COMPRESS_ZSTD},
     {ColumnEncoding_Kind_COMPRESS_ZLIB_STR,
      pax::ColumnEncoding_Kind::ColumnEncoding_Kind_COMPRESS_ZLIB},
+#ifdef USE_LZ4
+    {ColumnEncoding_Kind_COMPRESS_LZ4_STR,
+     pax::ColumnEncoding_Kind::ColumnEncoding_Kind_COMPRESS_LZ4},
+#endif
 };
 
 typedef struct {
diff --git a/contrib/pax_storage/src/cpp/access/paxc_rel_options.h b/contrib/pax_storage/src/cpp/access/paxc_rel_options.h
index 4e813f38c40..e6c29363ab1 100644
--- a/contrib/pax_storage/src/cpp/access/paxc_rel_options.h
+++ b/contrib/pax_storage/src/cpp/access/paxc_rel_options.h
@@ -41,6 +41,7 @@ namespace paxc {
 #define ColumnEncoding_Kind_DICTIONARY_STR "dict"
 #define ColumnEncoding_Kind_COMPRESS_ZSTD_STR "zstd"
 #define ColumnEncoding_Kind_COMPRESS_ZLIB_STR "zlib"
+#define ColumnEncoding_Kind_COMPRESS_LZ4_STR "lz4"
 
 #define STORAGE_FORMAT_TYPE_PORC "porc"
 #define STORAGE_FORMAT_TYPE_PORC_VEC "porc_vec"
diff --git a/contrib/pax_storage/src/cpp/catalog/manifest_api.h b/contrib/pax_storage/src/cpp/catalog/manifest_api.h
index f9e8f7c9eb1..3978caf9097 100644
--- a/contrib/pax_storage/src/cpp/catalog/manifest_api.h
+++ b/contrib/pax_storage/src/cpp/catalog/manifest_api.h
@@ -28,7 +28,7 @@
 #pragma once
 
 /*
- * abstract interface of hashdata manifest
+ * abstract interface of manifest
  */
 
 #ifdef __cplusplus
@@ -42,7 +42,7 @@ extern "C" {
  * memory management.
  */
 
-/* hashdata manifest support following data types for fields */
+/* manifest support following data types for fields */
 typedef enum MetaFieldType
 {
   Meta_Field_Type_Int = 1,
diff --git a/contrib/pax_storage/src/cpp/catalog/pax_aux_table.cc b/contrib/pax_storage/src/cpp/catalog/pax_aux_table.cc
index baca9efe47d..e655f469bc3 100644
--- a/contrib/pax_storage/src/cpp/catalog/pax_aux_table.cc
+++ b/contrib/pax_storage/src/cpp/catalog/pax_aux_table.cc
@@ -700,7 +700,7 @@ pax::MicroPartitionMetadata PaxGetMicroPartitionMetadata(Relation rel,
     paxc::FetchMicroPartitionAuxRow(rel, snapshot, block_id,
                                     FetchMicroPartitionAuxRowCallbackWrapper,
                                     &ctx);
-    return std::move(ctx.info);
+    return ctx.info;
   }
   CBDB_WRAP_END;
 }
diff --git a/contrib/pax_storage/src/cpp/clustering/pax_clustering_reader.cc b/contrib/pax_storage/src/cpp/clustering/pax_clustering_reader.cc
index 536743fd722..eb74f515d85 100644
--- a/contrib/pax_storage/src/cpp/clustering/pax_clustering_reader.cc
+++ b/contrib/pax_storage/src/cpp/clustering/pax_clustering_reader.cc
@@ -63,8 +63,8 @@ bool PaxClusteringReader::GetNextTuple(TupleTableSlot *slot) {
         file->Close();
       }
 
-      std::shared_ptr<File> file;
-      std::shared_ptr<File> toast_file;
+      std::unique_ptr<File> file;
+      std::unique_ptr<File> toast_file;
       file =
           file_system_->Open(meta_info.GetFileName(), pax::fs::kReadMode);
 
@@ -75,7 +75,7 @@ bool PaxClusteringReader::GetNextTuple(TupleTableSlot *slot) {
       }
 
       reader_ = MicroPartitionFileFactory::CreateMicroPartitionReader(
-          options, ReaderFlags::FLAGS_EMPTY, file, toast_file);
+          options, ReaderFlags::FLAGS_EMPTY, std::move(file), std::move(toast_file));
     } else {
       return false;
     }
diff --git a/contrib/pax_storage/src/cpp/cmake/pax.cmake b/contrib/pax_storage/src/cpp/cmake/pax.cmake
index 71775bac2dd..528b4e8cafc 100644
--- a/contrib/pax_storage/src/cpp/cmake/pax.cmake
+++ b/contrib/pax_storage/src/cpp/cmake/pax.cmake
@@ -30,6 +30,7 @@ set(pax_comm_src
     comm/bitmap.cc
     comm/bloomfilter.cc
     comm/byte_buffer.cc
+    comm/fast_io.cc
     comm/guc.cc
     comm/paxc_wrappers.cc
     comm/pax_memory.cc
@@ -51,6 +52,7 @@ set(pax_storage_src
     storage/columns/pax_dict_encoding.cc
     storage/columns/pax_decoding.cc
     storage/columns/pax_encoding.cc
+    storage/columns/pax_delta_encoding.cc
     storage/columns/pax_rlev2_decoding.cc
     storage/columns/pax_rlev2_encoding.cc
     storage/columns/pax_vec_bitpacked_column.cc
@@ -172,7 +174,7 @@ add_subdirectory(contrib/tabulate)
 set(pax_target_src  ${PROTO_SRCS} ${pax_storage_src} ${pax_clustering_src} ${pax_exceptions_src}
   ${pax_access_src} ${pax_comm_src} ${pax_catalog_src} ${pax_vec_src})
 set(pax_target_include ${pax_target_include} ${ZTSD_HEADER} ${CMAKE_CURRENT_SOURCE_DIR} ${CBDB_INCLUDE_DIR} contrib/tabulate/include)
-set(pax_target_link_libs ${pax_target_link_libs} protobuf zstd z postgres)
+set(pax_target_link_libs ${pax_target_link_libs} protobuf zstd z postgres uring)
 if (PAX_USE_LZ4)
   list(APPEND pax_target_link_libs lz4)
 endif()
@@ -206,7 +208,7 @@ endif(VEC_BUILD)
 
 target_include_directories(pax PUBLIC ${pax_target_include})
 target_link_directories(pax PUBLIC ${pax_target_link_directories})
-target_link_libraries(pax PUBLIC ${pax_target_link_libs})
+target_link_libraries(pax PRIVATE ${pax_target_link_libs})
 set_target_properties(pax PROPERTIES
   BUILD_RPATH_USE_ORIGIN ON
   BUILD_WITH_INSTALL_RPATH ON
@@ -232,8 +234,8 @@ if (BUILD_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/)
 
-  target_link_directories(test_main PUBLIC ${pax_target_link_directories})
-  target_link_libraries(test_main PUBLIC ${pax_target_link_libs} gtest gmock postgres)
+  target_link_directories(test_main PRIVATE ${pax_target_link_directories})
+  target_link_libraries(test_main PRIVATE ${pax_target_link_libs} gtest gmock postgres)
 endif(BUILD_GTEST)
 
 if(BUILD_GBENCH)
diff --git a/contrib/pax_storage/src/cpp/cmake/pax_format.cmake b/contrib/pax_storage/src/cpp/cmake/pax_format.cmake
index 4bdc25671f9..8d28e793d27 100644
--- a/contrib/pax_storage/src/cpp/cmake/pax_format.cmake
+++ b/contrib/pax_storage/src/cpp/cmake/pax_format.cmake
@@ -20,6 +20,7 @@ set(pax_comm_src
     comm/bitmap.cc
     comm/bloomfilter.cc
     comm/byte_buffer.cc
+    comm/fast_io.cc
     comm/guc.cc
     comm/paxc_wrappers.cc
     comm/pax_memory.cc
@@ -41,6 +42,7 @@ set(pax_storage_src
     storage/columns/pax_dict_encoding.cc
     storage/columns/pax_decoding.cc
     storage/columns/pax_encoding.cc
+    storage/columns/pax_delta_encoding.cc
     storage/columns/pax_rlev2_decoding.cc
     storage/columns/pax_rlev2_encoding.cc
     storage/columns/pax_vec_column.cc
@@ -107,7 +109,7 @@ set(pax_vec_src ${pax_vec_src}
 endif()
 
 set(pax_target_include ${ZTSD_HEADER} ${CMAKE_CURRENT_SOURCE_DIR} ${CBDB_INCLUDE_DIR} contrib/tabulate/include)
-set(pax_target_link_libs uuid protobuf zstd z)
+set(pax_target_link_libs uuid protobuf zstd z uring)
 if (PAX_USE_LZ4)
   list(APPEND pax_target_link_libs lz4)
 endif()
@@ -134,7 +136,7 @@ endif(VEC_BUILD)
 add_library(paxformat SHARED ${PROTO_SRCS} ${pax_storage_src} ${pax_clustering_src} ${pax_exceptions_src} ${pax_comm_src} ${pax_vec_src})
 target_include_directories(paxformat PUBLIC ${pax_target_include})
 target_link_directories(paxformat PUBLIC ${pax_target_link_directories})
-target_link_libraries(paxformat PUBLIC ${pax_target_link_libs})  
+target_link_libraries(paxformat PRIVATE ${pax_target_link_libs})
    
 set_target_properties(paxformat PROPERTIES
   OUTPUT_NAME paxformat)
@@ -195,4 +197,4 @@ install(TARGETS paxformat
 add_executable(paxformat_test paxformat_test.cc)
 target_include_directories(paxformat_test PUBLIC ${pax_target_include} ${CMAKE_CURRENT_SOURCE_DIR})
 add_dependencies(paxformat_test paxformat)
-target_link_libraries(paxformat_test PUBLIC paxformat postgres)
+target_link_libraries(paxformat_test PRIVATE paxformat postgres)
diff --git a/contrib/pax_storage/src/cpp/comm/bitmap.h b/contrib/pax_storage/src/cpp/comm/bitmap.h
index 1fc831f1787..4e811dddc8e 100644
--- a/contrib/pax_storage/src/cpp/comm/bitmap.h
+++ b/contrib/pax_storage/src/cpp/comm/bitmap.h
@@ -134,12 +134,28 @@ struct BitmapRaw final {
     static_assert(BM_WORD_BITS == (1 << BM_WORD_SHIFTS));
     return (index >> BM_WORD_SHIFTS) < size;
   }
-  inline bool Empty() const {
+
+  inline bool Empty(uint32 end_index) const {
     if (!bitmap) return true;
-    for (size_t i = 0; i < size; i++)
-      if (bitmap[i]) return false;
+
+    uint32 end_word = BM_INDEX_WORD_OFF(end_index);
+    uint32 end_bit_offset = BM_INDEX_BIT_OFF(end_index);
+
+    for (uint32 i = 0; i < end_word && i < size; i++) {
+      if (bitmap[i] != 0) return false;
+    }
+
+    // Check partial word at end
+    if (end_word < size && end_bit_offset > 0) {
+      T mask = (T(1) << end_bit_offset) - 1;
+      if (bitmap[end_word] & mask) return false;
+    }
+
     return true;
   }
+
+  inline bool Empty() const { return Empty(size * sizeof(T) * 8ULL); }
+
   BitmapRaw() = default;
   BitmapRaw(T *buffer, size_t size) : bitmap(buffer), size(size) {}
   BitmapRaw(const BitmapRaw &) = delete;
@@ -147,19 +163,9 @@ struct BitmapRaw final {
     raw.bitmap = nullptr;
     raw.size = 0;
   }
-  BitmapRaw &operator=(BitmapRaw) = delete;
   BitmapRaw &operator=(BitmapRaw &) = delete;
   BitmapRaw &operator=(const BitmapRaw &) = delete;
-  BitmapRaw &operator=(BitmapRaw &&raw) {
-    if (this != &raw) {
-      PAX_DELETE_ARRAY(bitmap);
-      bitmap = raw.bitmap;
-      size = raw.size;
-      raw.bitmap = nullptr;
-      raw.size = 0;
-    }
-    return *this;
-  }
+  BitmapRaw &operator=(BitmapRaw &&raw) = delete;
 
   ~BitmapRaw() = default;
 
@@ -170,50 +176,57 @@ struct BitmapRaw final {
 template <typename T>
 class BitmapTpl final {
  public:
-  using BitmapMemoryPolicy = void (*)(BitmapRaw<T> &, uint32);
-  explicit BitmapTpl(uint32 initial_size = 16,
-                     BitmapMemoryPolicy policy = DefaultBitmapMemoryPolicy) {
+  using BitmapMemoryPolicy = void (*)(BitmapRaw<T> &, uint32, uint8);
+  explicit BitmapTpl(uint32 initial_size = 16, uint8 init_value = 0) {
     static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
                   sizeof(T) == 8);
     static_assert(BM_WORD_BITS == (1 << BM_WORD_SHIFTS));
-    policy_ = policy;
-    policy(raw_, Max(initial_size, 16));
+    policy_ = DefaultBitmapMemoryPolicy;
+    policy_(raw_, Max(initial_size, 16), init_value);
+    init_value_ = init_value;
   }
-  explicit BitmapTpl(const BitmapRaw<T> &raw, BitmapMemoryPolicy policy) {
+  explicit BitmapTpl(const BitmapRaw<T> &raw) {
     static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
                   sizeof(T) == 8);
     static_assert(BM_WORD_BITS == (1 << BM_WORD_SHIFTS));
-    Assert(policy == ReadOnlyRefBitmap || policy == ReadOnlyOwnBitmap);
-    policy_ = policy;
+    policy_ = ReadOnlyRefBitmap;
     raw_.bitmap = raw.bitmap;
     raw_.size = raw.size;
   }
   BitmapTpl(const BitmapTpl &tpl) = delete;
-  BitmapTpl(BitmapTpl &&tpl)
-      : raw_(std::move(tpl.raw_)), policy_(tpl.policy_) {}
+  BitmapTpl(BitmapTpl &&tpl) : raw_(std::move(tpl.raw_)), policy_(tpl.policy_) {
+    tpl.raw_.bitmap = nullptr;
+    tpl.policy_ = ReadOnlyRefBitmap;
+  }
   BitmapTpl(BitmapRaw<T> &&raw)
-      : raw_(std::move(raw)), policy_(DefaultBitmapMemoryPolicy) {}
+      : raw_(std::move(raw)), policy_(ReadOnlyRefBitmap) {}
   BitmapTpl &operator=(const BitmapTpl &tpl) = delete;
   BitmapTpl &operator=(BitmapTpl &&tpl) = delete;
   ~BitmapTpl() {
     // Reference doesn't free the memory
-    if (policy_ == ReadOnlyRefBitmap) raw_.bitmap = nullptr;
+    if (policy_ == DefaultBitmapMemoryPolicy) PAX_DELETE_ARRAY(raw_.bitmap);
+    raw_.bitmap = nullptr;
   }
 
   std::unique_ptr<BitmapTpl> Clone() const {
+    auto bm = std::make_unique<BitmapTpl>(raw_);
     auto p = PAX_NEW_ARRAY<T>(raw_.size);
     memcpy(p, raw_.bitmap, sizeof(T) * raw_.size);
-    BitmapRaw<T> bm_raw(p, raw_.size);
-    return std::make_unique<BitmapTpl>(std::move(bm_raw));
+    bm->raw_.bitmap = p;
+    bm->raw_.size = raw_.size;
+    bm->policy_ = DefaultBitmapMemoryPolicy;
+    return bm;
   }
 
   inline size_t WordBits() const { return BM_WORD_BITS; }
   inline void Set(uint32 index) {
-    if (unlikely(!raw_.HasEnoughSpace(index))) policy_(raw_, index);
+    if (unlikely(!raw_.HasEnoughSpace(index)))
+      policy_(raw_, index, init_value_);
     raw_.Set(index);
   }
   inline void SetN(uint32 index) {
-    if (unlikely(!raw_.HasEnoughSpace(index))) policy_(raw_, index);
+    if (unlikely(!raw_.HasEnoughSpace(index)))
+      policy_(raw_, index, init_value_);
     raw_.SetN(index);
   }
   inline void Clear(uint32 index) {
@@ -232,7 +245,8 @@ class BitmapTpl final {
   }
   // invert the bit and return the old value.
   inline bool Toggle(uint32 index) {
-    if (unlikely(!raw_.HasEnoughSpace(index))) policy_(raw_, index);
+    if (unlikely(!raw_.HasEnoughSpace(index)))
+      policy_(raw_, index, init_value_);
     return raw_.Toggle(index);
   }
   // count bits in range [0, index]
@@ -252,29 +266,31 @@ class BitmapTpl final {
 
   inline bool Empty() const { return raw_.Empty(); }
 
+  // check if the bitmap is empty in the range [0, end_index)
+  inline bool Empty(uint32 end_index) const { return raw_.Empty(end_index); }
+
   BitmapMemoryPolicy Policy() const { return policy_; }
 
   const BitmapRaw<T> &Raw() const { return raw_; }
   BitmapRaw<T> &Raw() { return raw_; }
 
-  static void DefaultBitmapMemoryPolicy(BitmapRaw<T> &raw, uint32 index) {
+  static void DefaultBitmapMemoryPolicy(BitmapRaw<T> &raw, uint32 index,
+                                        uint8 init_value = 0) {
     auto old_bitmap = raw.bitmap;
     auto old_size = raw.size;
     auto size = Max(BM_INDEX_WORD_OFF(index) + 1, old_size * 2);
     auto p = PAX_NEW_ARRAY<T>(size);
     if (old_size > 0) memcpy(p, old_bitmap, sizeof(T) * old_size);
-    memset(&p[old_size], 0, sizeof(T) * (size - old_size));
+    memset(&p[old_size], init_value, sizeof(T) * (size - old_size));
     raw.bitmap = p;
     raw.size = size;
     PAX_DELETE_ARRAY(old_bitmap);
   }
-  static void ReadOnlyRefBitmap(BitmapRaw<T> & /*raw*/, uint32 /*index*/) {
+  static void ReadOnlyRefBitmap(BitmapRaw<T> & /*raw*/, uint32 /*index*/,
+                                uint8 /*init_value*/) {
     // raise
     CBDB_RAISE(cbdb::CException::kExTypeInvalidMemoryOperation);
   }
-  static void ReadOnlyOwnBitmap(BitmapRaw<T> & /*raw*/, uint32 /*index*/) {
-    CBDB_RAISE(cbdb::CException::kExTypeInvalidMemoryOperation);
-  }
 
   static inline size_t RequireWords(size_t nbits) {
     return nbits ? ((nbits - 1) >> BM_WORD_SHIFTS) + 1 : 0;
@@ -287,12 +303,14 @@ class BitmapTpl final {
     return nwords * sizeof(T);
   }
 
-  static std::unique_ptr<BitmapTpl<T>> BitmapTplCopy(const BitmapTpl<T> *bitmap) {
+  static std::unique_ptr<BitmapTpl<T>> BitmapTplCopy(
+      const BitmapTpl<T> *bitmap) {
     if (bitmap == nullptr) return nullptr;
     return bitmap->Clone();
   }
 
-  static std::unique_ptr<BitmapTpl<T>> Union(const BitmapTpl<T> *a, const BitmapTpl<T> *b) {
+  static std::unique_ptr<BitmapTpl<T>> Union(const BitmapTpl<T> *a,
+                                             const BitmapTpl<T> *b) {
     std::unique_ptr<BitmapTpl<T>> result;
     const BitmapTpl<T> *large;
     const BitmapTpl<T> *small;
@@ -322,6 +340,7 @@ class BitmapTpl final {
 
   BitmapRaw<T> raw_;
   BitmapMemoryPolicy policy_;
+  uint8 init_value_ = 0;
 };
 
 using Bitmap8 = BitmapTpl<uint8>;
diff --git a/contrib/pax_storage/src/cpp/comm/bitmap_test.cc b/contrib/pax_storage/src/cpp/comm/bitmap_test.cc
index 937a9c08d8b..dd2cc8094e5 100644
--- a/contrib/pax_storage/src/cpp/comm/bitmap_test.cc
+++ b/contrib/pax_storage/src/cpp/comm/bitmap_test.cc
@@ -36,7 +36,7 @@ TEST_F(BitMapTest, Bitmap8) {
   Bitmap8 bm(20);
 
   ASSERT_TRUE(bm.Empty());
-  for (auto i = 0; i <= 128; i++) {
+  for (uint32 i = 0; i <= 128; i++) {
     ASSERT_FALSE(bm.Test(i));  // zeros
     ASSERT_FALSE(bm.Toggle(i));
     ASSERT_TRUE(bm.Test(i));
@@ -61,14 +61,14 @@ TEST_F(BitMapTest, Bitmap8) {
 
 TEST_F(BitMapTest, Bitmap8SetN) {
   Bitmap8 bm(10);
-  const auto nbits = 128;
+  const uint32 nbits = 128;
 
   ASSERT_TRUE(bm.Empty());
-  for (auto i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
+  for (uint32 i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
 
   auto fn = [&bm, nbits](uint32 index) {
     bm.ClearAll();
-    for (auto i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
+    for (uint32 i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
     bm.SetN(index);
     for (uint32 i = 0; i <= index; i++) ASSERT_TRUE(bm.Test(i));
     for (uint32 i = index + 1; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
@@ -78,13 +78,13 @@ TEST_F(BitMapTest, Bitmap8SetN) {
 
 TEST_F(BitMapTest, Bitmap8ClearN) {
   Bitmap8 bm(10);
-  const auto nbits = 128;
+  const uint32 nbits = 128;
 
   ASSERT_TRUE(bm.Empty());
-  for (auto i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
+  for (uint32 i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
 
   auto fn = [&bm, nbits](uint32 index) {
-    for (auto i = 0; i <= nbits; i++) {
+    for (uint32 i = 0; i <= nbits; i++) {
       bm.Set(i);
       ASSERT_TRUE(bm.Test(i));
     }
@@ -99,7 +99,7 @@ TEST_F(BitMapTest, Bitmap64) {
   Bitmap64 bm(100);
 
   ASSERT_TRUE(bm.Empty());
-  for (auto i = 0; i <= 128; i++) {
+  for (uint32 i = 0; i <= 128; i++) {
     ASSERT_FALSE(bm.Test(i));  // zeros
     ASSERT_FALSE(bm.Toggle(i));
     ASSERT_TRUE(bm.Test(i));
@@ -122,14 +122,14 @@ TEST_F(BitMapTest, Bitmap64) {
 }
 TEST_F(BitMapTest, Bitmap64SetN) {
   Bitmap64 bm(1);
-  const auto nbits = 512;
+  const uint32 nbits = 512;
 
   ASSERT_TRUE(bm.Empty());
-  for (auto i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
+  for (uint32 i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
 
   auto fn = [&bm, nbits](uint32 index) {
     bm.ClearAll();
-    for (auto i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
+    for (uint32 i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
     bm.SetN(index);
     for (uint32 i = 0; i <= index; i++) ASSERT_TRUE(bm.Test(i));
     for (uint32 i = index + 1; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
@@ -139,13 +139,13 @@ TEST_F(BitMapTest, Bitmap64SetN) {
 
 TEST_F(BitMapTest, Bitmap64ClearN) {
   Bitmap64 bm(1);
-  const auto nbits = 512;
+  const uint32 nbits = 512;
 
   ASSERT_TRUE(bm.Empty());
-  for (auto i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
+  for (uint32 i = 0; i <= nbits; i++) ASSERT_FALSE(bm.Test(i));
 
   auto fn = [&bm, &nbits](uint32 index) {
-    for (auto i = 0; i <= nbits; i++) {
+    for (uint32 i = 0; i <= nbits; i++) {
       bm.Set(i);
       ASSERT_TRUE(bm.Test(i));
     }
diff --git a/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.cc b/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.cc
index b9d1a723028..3e54e965698 100644
--- a/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.cc
+++ b/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.cc
@@ -124,12 +124,6 @@ void cbdb::MemoryCtxRegisterResetCallback(MemoryContext context,
   CBDB_WRAP_END;
 }
 
-Oid cbdb::RelationGetRelationId(Relation rel) {
-  CBDB_WRAP_START;
-  { return RelationGetRelid(rel); }
-  CBDB_WRAP_END;
-}
-
 #ifdef RUN_GTEST
 Datum cbdb::DatumFromCString(const char *src, size_t length) {
   CBDB_WRAP_START;
diff --git a/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.h b/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.h
index 05738a4b2ab..2031662357d 100644
--- a/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.h
+++ b/contrib/pax_storage/src/cpp/comm/cbdb_wrappers.h
@@ -114,8 +114,6 @@ void MemoryCtxDelete(MemoryContext memory_context);
 void MemoryCtxRegisterResetCallback(MemoryContext context,
                                     MemoryContextCallback *cb);
 
-Oid RelationGetRelationId(Relation rel);
-
 static inline void *DatumToPointer(Datum d) noexcept {
   return DatumGetPointer(d);
 }
@@ -164,6 +162,10 @@ static inline float8 DatumToFloat8(Datum d) noexcept {
   return DatumGetFloat8(d);
 }
 
+static pg_attribute_always_inline Oid RelationGetRelationId(Relation rel) noexcept {
+  return RelationGetRelid(rel);
+}
+
 BpChar *BpcharInput(const char *s, size_t len, int32 atttypmod);
 VarChar *VarcharInput(const char *s, size_t len, int32 atttypmod);
 text *CstringToText(const char *s, size_t len);
diff --git a/contrib/pax_storage/src/cpp/comm/common_io.h b/contrib/pax_storage/src/cpp/comm/common_io.h
new file mode 100644
index 00000000000..44730376054
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/comm/common_io.h
@@ -0,0 +1,39 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * common_io.h
+ *
+ * IDENTIFICATION
+ *	  contrib/pax_storage/src/cpp/comm/common_io.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#pragma once
+#include <cstddef>
+#include <fcntl.h>
+
+namespace pax
+{
+struct IORequest {
+  void* buffer;
+  size_t size;
+  off_t offset;
+};
+} // namespace pax
diff --git a/contrib/pax_storage/src/cpp/comm/fast_io.cc b/contrib/pax_storage/src/cpp/comm/fast_io.cc
new file mode 100644
index 00000000000..7ed96d7a377
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/comm/fast_io.cc
@@ -0,0 +1,145 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * fast_io.cc
+ *
+ * IDENTIFICATION
+ *	  contrib/pax_storage/src/cpp/comm/fast_io.cc
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "fast_io.h"
+
+#include <unistd.h>  // for pread
+
+// uring_likely may not be defined in older liburing versions
+#ifndef uring_likely
+#if __GNUC__ >= 3
+#define uring_likely(x) __builtin_expect((x) != 0, 1)
+#else
+#define uring_likely(x) ((x) != 0)
+#endif
+#endif
+
+namespace pax
+{
+
+bool IOUringFastIO::available() {
+  static char support_io_uring = 0;
+
+  if (support_io_uring == 1) return true;
+  if (support_io_uring == -1) return false;
+
+  struct io_uring ring;
+  bool supported = (io_uring_queue_init(128, &ring, 0) == 0);
+  if (supported) {
+    io_uring_queue_exit(&ring);
+  }
+  support_io_uring = supported ? 1 : -1;
+  return supported;
+}
+
+// if pair.first == 0, all read requests are successful
+// pair.second indicates the number of successful read requests
+std::pair<int, int> IOUringFastIO::read(int fd, std::vector<IORequest> &request, std::vector<bool> &result)  {
+  size_t index = 0;
+  int success_read = 0;
+  int retcode = 0;
+  size_t completed = 0;
+  size_t total_requests = request.size();
+
+  // Implementation for synchronous read using io_uring
+  if (uring_likely(request.empty())) return {0, 0};
+  if (status_ != 'i') return {-EINVAL, 0};
+
+  result.resize(request.size(), false);
+
+  while (completed < total_requests) {
+    struct io_uring_sqe *sqe;
+    struct io_uring_cqe *cqe;
+    unsigned head;
+    unsigned count;
+    int rc;
+    // Submit read requests
+    while (index < total_requests) {
+      sqe = io_uring_get_sqe(&ring_);
+      if (!sqe) break; // No more SQEs available, retry later
+
+      io_uring_prep_read(sqe, fd, request[index].buffer, request[index].size, request[index].offset);
+      io_uring_sqe_set_data(sqe, (void*)(uintptr_t)index);
+      index++;
+    }
+
+    // submit and wait for completions
+    do {
+      rc = io_uring_submit_and_wait(&ring_, 1);
+    } while (rc == -EINTR);
+    if (rc < 0) return {rc, success_read};
+
+    count = 0;
+    io_uring_for_each_cqe(&ring_, head, cqe) {
+      size_t req_index = (size_t)(uintptr_t)io_uring_cqe_get_data(cqe);
+      if (cqe->res >= 0) {
+        // Successful read
+        result[req_index] = true;
+        success_read++;
+      } else if (retcode == 0) {
+        retcode = cqe->res; // capture the first error
+      }
+      completed++;
+      count++;
+    }
+    io_uring_cq_advance(&ring_, count);
+  }
+  return {retcode, success_read}; // Placeholder
+}
+
+std::pair<int, int> SyncFastIO::read(int fd, std::vector<IORequest> &request, std::vector<bool> &result) {
+  size_t total_requests = request.size();
+  if (total_requests == 0) return {0, 0};
+
+  result.resize(total_requests, false);
+
+  int success_read = 0;
+  int retcode = 0;
+
+  for (size_t i = 0; i < total_requests; ++i) {
+    ssize_t bytes_read = 0;
+    ssize_t nbytes;
+    auto &req = request[i];
+    do {
+      nbytes = pread(fd, (char *)req.buffer + bytes_read, req.size - bytes_read, req.offset + bytes_read);
+      if (nbytes > 0) bytes_read += nbytes;
+    } while ((nbytes == -1 && errno == EINTR) || (nbytes > 0 && static_cast<size_t>(bytes_read) < req.size));
+
+    if (bytes_read < 0) {
+      if (retcode == 0) {
+          retcode = static_cast<int>(bytes_read); // capture first error
+      }
+    } else if (static_cast<size_t>(bytes_read) == request[i].size) {
+      result[i] = true;
+      success_read++;
+    }
+  }
+
+  return {retcode, success_read};
+}
+
+} // namespace pax
\ No newline at end of file
diff --git a/contrib/pax_storage/src/cpp/comm/fast_io.h b/contrib/pax_storage/src/cpp/comm/fast_io.h
new file mode 100644
index 00000000000..da63b4d89ea
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/comm/fast_io.h
@@ -0,0 +1,88 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * fast_io.h
+ *
+ * IDENTIFICATION
+ *	  contrib/pax_storage/src/cpp/comm/fast_io.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#include "comm/common_io.h"
+
+#include <liburing.h>
+#include <cstddef>
+#include <cstdio>
+#include <algorithm>
+#include <vector>
+
+namespace pax
+{
+
+template<typename T>
+int fast_io_read(int fd, std::vector<IORequest> &request) {
+  T io_handler(request.size());
+  return io_handler.read(fd, request).first;
+}
+
+template<typename T>
+std::pair<int, int> fast_io_read2(int fd, std::vector<IORequest> &request) {
+  T io_handler(request.size());
+  return io_handler.read(fd, request);
+}
+
+class SyncFastIO {
+public:
+  SyncFastIO(size_t dummy_queue_size = 0) {}
+  std::pair<int, int> read(int fd, std::vector<IORequest> &request, std::vector<bool> &result);
+};
+
+// io_uring-based FastIO
+class IOUringFastIO {
+public:
+  IOUringFastIO(size_t queue_size = 128) {
+    int ret = io_uring_queue_init(std::max(queue_size, static_cast<size_t>(128)), &ring_, 0);
+
+    // ret < 0: unsupported
+    // otherwise initialized
+    status_ = ret < 0 ? 'x' : 'i';
+  }
+
+  ~IOUringFastIO() {
+    if (status_ == 'i')
+      io_uring_queue_exit(&ring_);
+  }
+
+  static bool available();
+
+  // if pair.first == 0, all read requests are successful
+  // pair.second indicates the number of successful read requests
+  std::pair<int, int> read(int fd, std::vector<IORequest> &request, std::vector<bool> &result);
+
+private:
+  struct io_uring ring_;
+
+  // 'u' for uninitialized, 'i' for initialized, 'x' for unsupported
+  char status_ = 'u';
+};
+
+} // namespace pax
\ No newline at end of file
diff --git a/contrib/pax_storage/src/cpp/comm/guc.cc b/contrib/pax_storage/src/cpp/comm/guc.cc
index 6cdc429a3eb..8a6497d1db3 100644
--- a/contrib/pax_storage/src/cpp/comm/guc.cc
+++ b/contrib/pax_storage/src/cpp/comm/guc.cc
@@ -81,8 +81,8 @@ static bool CheckTuplePerGroup(int *newval, void **extra, GucSource source) {
   bool ok = *newval <= pax::pax_max_tuples_per_file;
   if (!ok) {
     elog(WARNING,
-         "The guc pax_max_tuples_per_group should LE with "
-         "pax_max_tuples_per_file");
+         "The guc pax.max_tuples_per_group should LE with "
+         "pax.max_tuples_per_file");
   }
   return ok;
 }
@@ -91,8 +91,8 @@ static bool CheckTuplePerFile(int *newval, void **extra, GucSource source) {
   bool ok = *newval >= pax::pax_max_tuples_per_group;
   if (!ok) {
     elog(WARNING,
-         "The guc pax_max_tuples_per_file should BE with "
-         "pax_max_tuples_per_group");
+         "The guc pax.max_tuples_per_file should BE with "
+         "pax.max_tuples_per_group");
   }
   return ok;
 }
@@ -102,8 +102,8 @@ static bool CheckMinCompressToastSize(int *newval, void **extra,
   bool ok = *newval < pax::pax_min_size_of_external_toast;
   if (!ok) {
     elog(WARNING,
-         "The guc pax_min_size_of_compress_toast should LT with "
-         "pax_min_size_of_external_toast");
+         "The guc pax.min_size_of_compress_toast should LT with "
+         "pax.min_size_of_external_toast");
   }
   return ok;
 }
@@ -113,8 +113,8 @@ static bool CheckMinExternalToastSize(int *newval, void **extra,
   bool ok = *newval > pax::pax_min_size_of_compress_toast;
   if (!ok) {
     elog(WARNING,
-         "The guc pax_min_size_of_external_toast should BT with "
-         "pax_min_size_of_compress_toast");
+         "The guc pax.min_size_of_external_toast should BT with "
+         "pax.min_size_of_compress_toast");
   }
   return ok;
 }
@@ -126,71 +126,71 @@ static bool CheckDefaultStorageFormat(char **newval, void **extra,
 }
 
 void DefineGUCs() {
-  DefineCustomBoolVariable("pax_enable_debug", "enable pax debug", NULL,
+  DefineCustomBoolVariable("pax.enable_debug", "enable pax debug", NULL,
                            &pax::pax_enable_debug, false, PGC_USERSET,
                            GUC_GPDB_NEED_SYNC, NULL, NULL, NULL);
 
-  DefineCustomBoolVariable("pax_enable_sparse_filter",
+  DefineCustomBoolVariable("pax.enable_sparse_filter",
                            "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);
 
-  DefineCustomBoolVariable("pax_enable_row_filter", "enable pax row filter",
+  DefineCustomBoolVariable("pax.enable_row_filter", "enable pax row filter",
                            NULL, &pax::pax_enable_row_filter, false,
                            PGC_USERSET, 0, NULL, NULL, NULL);
 
   DefineCustomIntVariable(
-      "pax_scan_reuse_buffer_size", "set the reuse buffer size", NULL,
+      "pax.scan_reuse_buffer_size", "set the reuse buffer size", NULL,
       &pax::pax_scan_reuse_buffer_size, PAX_SCAN_REUSE_BUFFER_DEFAULT_SIZE,
       PAX_SCAN_REUSE_BUFFER_MIN_SIZE, PAX_SCAN_REUSE_BUFFER_MAX_SIZE,
       PGC_USERSET, GUC_GPDB_NEED_SYNC, NULL, NULL, NULL);
 
   DefineCustomIntVariable(
-      "pax_max_tuples_per_group",
+      "pax.max_tuples_per_group",
       "the default value for the limit on the number of tuples in a group",
       NULL, &pax::pax_max_tuples_per_group, PAX_MAX_TUPLES_PER_GROUP_DEFAULT,
       PAX_MAX_TUPLES_PER_GROUP_MIN, PAX_MAX_TUPLES_PER_GROUP_MAX, PGC_USERSET,
       0, CheckTuplePerGroup, NULL, NULL);
 
   DefineCustomIntVariable(
-      "pax_max_tuples_per_file",
+      "pax.max_tuples_per_file",
       "the default value for the limit on the number of tuples in a file", NULL,
       &pax::pax_max_tuples_per_file, PAX_MAX_TUPLES_PER_FILE_DEFAULT,
       PAX_MAX_TUPLES_PER_FILE_MIN, PAX_MAX_NUM_TUPLES_PER_FILE, PGC_USERSET, 0,
       CheckTuplePerFile, NULL, NULL);
 
   DefineCustomIntVariable(
-      "pax_max_size_per_file",
+      "pax.max_size_per_file",
       "the default value for the limit on the number of tuples in a file", NULL,
       &pax::pax_max_size_per_file, PAX_MAX_SIZE_PER_FILE_DEFAULT,
       PAX_MAX_SIZE_PER_FILE_MIN, PAX_MAX_SIZE_PER_FILE_MAX, PGC_USERSET, 0,
       NULL, NULL, NULL);
 
-  DefineCustomBoolVariable("pax_enable_toast", "enable pax toast", NULL,
+  DefineCustomBoolVariable("pax.enable_toast", "enable pax toast", NULL,
                            &pax::pax_enable_toast, true, PGC_USERSET, 0, NULL,
                            NULL, NULL);
 
   DefineCustomIntVariable(
-      "pax_min_size_of_compress_toast",
+      "pax.min_size_of_compress_toast",
       "the minimum value for creating compress toast", NULL,
       &pax::pax_min_size_of_compress_toast, PAX_MIN_SIZE_MAKE_COMPRESSED_TOAST,
       PAX_MIN_SIZE_MAKE_COMPRESSED_TOAST, PAX_MAX_SIZE_MAKE_COMPRESSED_TOAST,
       PGC_USERSET, 0, CheckMinCompressToastSize, NULL, NULL);
 
   DefineCustomIntVariable(
-      "pax_min_size_of_external_toast",
+      "pax.min_size_of_external_toast",
       "the minimum value for creating external toast", NULL,
       &pax::pax_min_size_of_external_toast, PAX_MIN_SIZE_MAKE_EXTERNAL_TOAST,
       PAX_MIN_SIZE_MAKE_EXTERNAL_TOAST, INT_MAX, PGC_USERSET, 0,
       CheckMinExternalToastSize, NULL, NULL);
 
   DefineCustomStringVariable(
-      "pax_default_storage_format", "the default storage format", NULL,
+      "pax.default_storage_format", "the default storage format", NULL,
       &pax::pax_default_storage_format, STORAGE_FORMAT_TYPE_DEFAULT,
       PGC_USERSET, GUC_GPDB_NEED_SYNC, CheckDefaultStorageFormat, NULL, NULL);
 
-  DefineCustomIntVariable("pax_bloom_filter_work_memory_bytes",
+  DefineCustomIntVariable("pax.bloom_filter_work_memory_bytes",
                           "the bloom filter work memory(only used on write)",
                           NULL, &pax::pax_bloom_filter_work_memory_bytes,
                           PAX_BLOOM_FILTER_WORK_MEMORY_BYTES,
@@ -198,7 +198,7 @@ void DefineGUCs() {
                           PAX_MAX_BLOOM_FILTER_WORK_MEMORY_BYTES, PGC_USERSET,
                           0, NULL, NULL, NULL);
 
-  DefineCustomBoolVariable("pax_log_filter_tree", "Log the filter tree", NULL,
+  DefineCustomBoolVariable("pax.log_filter_tree", "Log the filter tree", NULL,
                            &pax::pax_log_filter_tree, false, PGC_USERSET, 0,
                            NULL, NULL, NULL);
 }
diff --git a/contrib/pax_storage/src/cpp/manifest/manifest.c b/contrib/pax_storage/src/cpp/manifest/manifest.c
index fb246a35b0c..c45efcb17a0 100644
--- a/contrib/pax_storage/src/cpp/manifest/manifest.c
+++ b/contrib/pax_storage/src/cpp/manifest/manifest.c
@@ -245,8 +245,6 @@ static void manifestvalue_to_json(yyjson_mut_doc *doc, yyjson_mut_val *obj,
 }
 
 Datum json_to_manifestvalue(yyjson_val *type_val, MetaFieldType typ) {
-  Datum value;
-
   switch (typ) {
   case Meta_Field_Type_Int:
     return Int32GetDatum(yyjson_get_int(type_val));
@@ -312,8 +310,7 @@ static const char *manifest_to_json(ManifestHeap *m, size_t *len) {
 
 static bool json_to_manifestheap(ManifestHeap *m, char *buf, int len) {
   size_t idx, max;
-  yyjson_val *datameta, *add, *remove;
-  const char *summary;
+  yyjson_val *datameta;
   yyjson_read_err err;
 
   yyjson_doc *doc =
@@ -411,7 +408,6 @@ void serialize_manifest(Relation rel, ManifestHeap *manifest, char *manifest_pax
  * we need refresh the new manifest file path in the top entrance table
  */
 void update_manifest_top_entrance(Relation rel, const char *manifest_path) {
-  Oid aux_oid;
   Relation aux_rel;
   TupleDesc desc;
   SysScanDesc scan;
@@ -562,7 +558,6 @@ Oid create_manifest_auxiliary_heap(Relation parentrel) {
  */
 void manifest_create(Relation rel, RelFileNode relnode) {
   char aux_relname[NAMEDATALEN];
-  ReindexParams reindex_params = {0};
   Relation aux_rel;
   Oid aux_oid;
   bool exists;
diff --git a/contrib/pax_storage/src/cpp/manifest/tuple.c b/contrib/pax_storage/src/cpp/manifest/tuple.c
index 6ac104ec1f9..b956058836e 100644
--- a/contrib/pax_storage/src/cpp/manifest/tuple.c
+++ b/contrib/pax_storage/src/cpp/manifest/tuple.c
@@ -284,7 +284,6 @@ void manifest_insert(ManifestRelation mrel, const MetaValue data[],
   MemoryContext oldctx;
   ManifestHeap *mheap;
   ManifestTuple mtuple;
-  Relation rel;
   
   oldctx = MemoryContextSwitchTo(mrel->mctx);
 
diff --git a/contrib/pax_storage/src/cpp/pax_gbench.cc b/contrib/pax_storage/src/cpp/pax_gbench.cc
index 82dbaaa7bb2..b6a0ecb0c76 100644
--- a/contrib/pax_storage/src/cpp/pax_gbench.cc
+++ b/contrib/pax_storage/src/cpp/pax_gbench.cc
@@ -25,12 +25,310 @@
  *-------------------------------------------------------------------------
  */
 
+#include "pax_gbench.h"
+
+#include "comm/cbdb_api.h"
+
 #include <benchmark/benchmark.h>
 
-static void example_benchmark(benchmark::State &state) {
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "access/paxc_rel_options.h"
+#include "comm/cbdb_wrappers.h"
+#include "cpp-stub/src/stub.h"
+#include "storage/micro_partition_iterator.h"
+#include "storage/pax.h"
+#include "storage/strategy.h"
+
+namespace pax::bench {
+
+// Create memory context for benchmark
+void CreateMemoryContext() {
+  MemoryContext test_memory_context = AllocSetContextCreate(
+      (MemoryContext)NULL, "TestMemoryContext", 80 * 1024 * 1024,
+      80 * 1024 * 1024, 80 * 1024 * 1024);
+  MemoryContextSwitchTo(test_memory_context);
+}
+
+// Global registry
+class BenchmarkRegistry {
+ private:
+  std::vector<InitFunction> init_functions_;
+  std::vector<CleanupFunction> cleanup_functions_;
+  bool initialized_ = false;
+
+ public:
+  void RegisterInitFunction(InitFunction func) {
+    init_functions_.push_back(func);
+  }
+
+  void RegisterCleanupFunction(CleanupFunction func) {
+    cleanup_functions_.push_back(func);
+  }
+
+  void RunAllInitFunctions() {
+    if (initialized_) return;
+
+    printf("Running PAX Benchmark Suite...\n");
+    printf("Initializing all benchmark modules...\n\n");
+
+    for (const auto &func : init_functions_) {
+      func();
+    }
+    initialized_ = true;
+  }
+
+  void RunAllCleanupFunctions() {
+    if (!initialized_) return;
+
+    printf("\nCleaning up all benchmark modules...\n");
+
+    // Cleanup functions executed in reverse order
+    for (auto it = cleanup_functions_.rbegin(); it != cleanup_functions_.rend();
+         ++it) {
+      (*it)();
+    }
+    initialized_ = false;
+  }
+};
+
+// Global registry access function
+BenchmarkRegistry &GetBenchmarkRegistry() {
+  static BenchmarkRegistry instance;
+  return instance;
+}
+
+// Registration functions
+void RegisterBenchmarkInit(InitFunction func) {
+  GetBenchmarkRegistry().RegisterInitFunction(func);
+}
+
+void RegisterBenchmarkCleanup(CleanupFunction func) {
+  GetBenchmarkRegistry().RegisterCleanupFunction(func);
+}
+
+// Global Mock functions for benchmark framework
+bool MockMinMaxGetStrategyProcinfo(Oid, Oid, Oid *, FmgrInfo *,
+                                   StrategyNumber) {
+  return false;
+}
+
+int32 MockGetFastSequences(Oid) {
+  static int32 mock_id = 0;
+  return mock_id++;
+}
+
+void MockInsertMicroPartitionPlaceHolder(Oid, int) {}
+void MockDeleteMicroPartitionEntry(Oid, Snapshot, int) {}
+void MockExecStoreVirtualTuple(TupleTableSlot *) {}
+
+std::string MockBuildPaxDirectoryPath(RelFileNode rnode, BackendId backend_id) {
+  // Create a simple file path for benchmarks
+  return std::string("./bench_data");
+}
+
+std::vector<int> MockGetMinMaxColumnIndexes(Relation) {
+  return std::vector<int>();
+}
+
+std::vector<int> MockBloomFilterColumnIndexes(Relation) {
+  return std::vector<int>();
+}
+
+std::vector<std::tuple<ColumnEncoding_Kind, int>> MockGetRelEncodingOptions(
+    Relation relation) {
+  std::vector<std::tuple<ColumnEncoding_Kind, int>> encoding_opts;
+
+  // Get number of columns from relation
+  int num_columns = 10;  // default for benchmark
+  if (relation && relation->rd_att) {
+    num_columns = relation->rd_att->natts;
+  }
+
+  // Create encoding options for each column (NO_ENCODED, 0)
+  for (int i = 0; i < num_columns; i++) {
+    encoding_opts.emplace_back(
+        std::make_tuple(ColumnEncoding_Kind_NO_ENCODED, 0));
+  }
+
+  return encoding_opts;
+}
+
+// Mock TupleDescInitEntry that doesn't rely on SYSCACHE
+void MockTupleDescInitEntry(TupleDesc desc, AttrNumber attributeNumber,
+                            const char *attributeName, Oid oidtypeid,
+                            int32 typmod, int attdim) {
+  // Basic validation
+  if (attributeNumber < 1 || attributeNumber > desc->natts) {
+    return;
+  }
+
+  Form_pg_attribute att = TupleDescAttr(desc, attributeNumber - 1);
+
+  // Set basic attribute properties
+  namestrcpy(&(att->attname), attributeName);
+  att->atttypid = oidtypeid;
+  att->atttypmod = typmod;
+  att->attndims = attdim;
+  att->attnum = attributeNumber;
+  att->attnotnull = false;
+  att->atthasdef = false;
+  att->attidentity = '\0';
+  att->attgenerated = '\0';
+  att->attisdropped = false;
+  att->attislocal = true;
+  att->attinhcount = 0;
+  att->attcollation = InvalidOid;
+
+  // Set type-specific properties based on OID (hardcoded for common types)
+  switch (oidtypeid) {
+    case INT2OID:  // smallint
+      att->attlen = 2;
+      att->attalign = 's';
+      att->attstorage = 'p';
+      att->attbyval = true;
+      break;
+    case INT4OID:  // integer
+      att->attlen = 4;
+      att->attalign = 'i';
+      att->attstorage = TYPSTORAGE_PLAIN;
+      att->attbyval = true;
+      break;
+    case INT8OID:  // bigint
+      att->attlen = 8;
+      att->attalign = 'd';
+      att->attstorage = TYPSTORAGE_PLAIN;
+      att->attbyval = FLOAT8PASSBYVAL;
+      break;
+    case FLOAT8OID:  // double precision
+      att->attlen = 8;
+      att->attalign = 'd';
+      att->attstorage = 'p';
+      att->attbyval = FLOAT8PASSBYVAL;
+      break;
+    case BOOLOID:  // boolean
+      att->attlen = 1;
+      att->attalign = 'c';
+      att->attstorage = 'p';
+      att->attbyval = true;
+      break;
+    case TEXTOID:  // text
+      att->attlen = -1;
+      att->attalign = 'i';
+      att->attstorage = TYPSTORAGE_PLAIN;
+      att->attbyval = false;
+      att->attcollation = DEFAULT_COLLATION_OID;
+      break;
+    case NUMERICOID:  // numeric
+      att->attlen = -1;
+      att->attalign = TYPALIGN_INT;
+      att->attstorage = TYPSTORAGE_PLAIN;
+      att->attbyval = false;
+      break;
+    case TIMESTAMPOID:  // timestamp
+      att->attlen = 8;
+      att->attalign = 'd';
+      att->attstorage = TYPSTORAGE_PLAIN;
+      att->attbyval = FLOAT8PASSBYVAL;
+      break;
+    default:
+      // Default values for unknown types
+      att->attlen = -1;
+      att->attalign = 'i';
+      att->attstorage = 'p';
+      att->attbyval = false;
+      break;
+  }
+}
+
+// Global initialization function for general benchmark framework
+void GlobalBenchmarkInit() {
+  static bool global_initialized = false;
+  if (global_initialized) return;
+
+  printf("Initializing PAX benchmark framework...\n");
+
+  // Initialize memory context
+  MemoryContextInit();
+
+  // Setup global Mock functions
+  static std::unique_ptr<Stub> stub_global = std::make_unique<Stub>();
+
+  stub_global->set(MinMaxGetPgStrategyProcinfo, MockMinMaxGetStrategyProcinfo);
+  stub_global->set(CPaxGetFastSequences, MockGetFastSequences);
+  stub_global->set(cbdb::BuildPaxDirectoryPath, MockBuildPaxDirectoryPath);
+  stub_global->set(cbdb::InsertMicroPartitionPlaceHolder,
+                   MockInsertMicroPartitionPlaceHolder);
+  stub_global->set(cbdb::DeleteMicroPartitionEntry,
+                   MockDeleteMicroPartitionEntry);
+  stub_global->set(cbdb::GetMinMaxColumnIndexes, MockGetMinMaxColumnIndexes);
+  stub_global->set(cbdb::GetBloomFilterColumnIndexes,
+                   MockBloomFilterColumnIndexes);
+  stub_global->set(cbdb::GetRelEncodingOptions, MockGetRelEncodingOptions);
+  stub_global->set(ExecStoreVirtualTuple, MockExecStoreVirtualTuple);
+  stub_global->set(TupleDescInitEntry, MockTupleDescInitEntry);
+
+  // Create basic test directory
+  system("mkdir -p ./bench_data");
+
+  global_initialized = true;
+  printf("PAX benchmark framework initialized.\n");
+}
+
+// Global cleanup function for general benchmark framework
+void GlobalBenchmarkCleanup() {
+  printf("Cleaning up PAX benchmark framework...\n");
+
+  // Clean up test directory
+  // system("rm -rf ./bench_data");
+
+  // Reset memory context
+  if (TopMemoryContext) {
+    MemoryContextReset(TopMemoryContext);
+  }
+
+  printf("PAX benchmark framework cleaned up.\n");
+}
+
+// Example benchmark test
+static void example_benchmark(::benchmark::State &state) {
   for (auto _ : state) {
+    // Empty example test
   }
 }
 BENCHMARK(example_benchmark);
 
-BENCHMARK_MAIN();
\ No newline at end of file
+}  // namespace pax::benchmark
+
+// Global cleanup function (C-style for atexit)
+static void cleanup_all() {
+  pax::bench::GetBenchmarkRegistry().RunAllCleanupFunctions();
+  pax::bench::GlobalBenchmarkCleanup();
+}
+
+// Main entry function
+int main(int argc, char **argv) {
+  // Register global cleanup function
+  std::atexit(cleanup_all);
+
+  // Global initialization
+  pax::bench::GlobalBenchmarkInit();
+
+  // Run all registered initialization functions
+  pax::bench::GetBenchmarkRegistry().RunAllInitFunctions();
+
+  // Initialize benchmark framework
+  ::benchmark::Initialize(&argc, argv);
+  if (::benchmark::ReportUnrecognizedArguments(argc, argv)) return 1;
+
+  printf("\n=== Starting PAX Benchmark Suite ===\n");
+  printf("Use --benchmark_filter=<pattern> to run specific tests\n");
+  printf("Use --benchmark_list_tests to see all available tests\n\n");
+
+  // Run benchmark
+  ::benchmark::RunSpecifiedBenchmarks();
+
+  return 0;
+}
\ No newline at end of file
diff --git a/contrib/pax_storage/src/cpp/pax_gbench.h b/contrib/pax_storage/src/cpp/pax_gbench.h
new file mode 100644
index 00000000000..44376022693
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/pax_gbench.h
@@ -0,0 +1,72 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * pax_gbench.h
+ *
+ * IDENTIFICATION
+ *	  contrib/pax_storage/src/cpp/pax_gbench.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#include <functional>
+#include <benchmark/benchmark.h>
+
+namespace pax {
+
+namespace bench {
+
+// Generic initialization and cleanup function types
+using InitFunction = std::function<void()>;
+using CleanupFunction = std::function<void()>;
+
+// Create memory context for benchmark
+extern void CreateMemoryContext();
+
+// Forward declaration
+class BenchmarkRegistry;
+
+// Global registry access function
+BenchmarkRegistry &GetBenchmarkRegistry();
+
+// Global initialization and cleanup functions
+void GlobalBenchmarkInit();
+void GlobalBenchmarkCleanup();
+
+// Registration functions (implemented in pax_gbench.cc)
+void RegisterBenchmarkInit(InitFunction func);
+void RegisterBenchmarkCleanup(CleanupFunction func);
+
+}  // namespace benchmark
+}  // namespace pax
+
+// Convenient registration macros
+#define REGISTER_BENCHMARK_INIT(func)               \
+  static bool BENCHMARK_INIT_##__COUNTER__ = []() { \
+    pax::bench::RegisterBenchmarkInit(func);    \
+    return true;                                    \
+  }()
+
+#define REGISTER_BENCHMARK_CLEANUP(func)               \
+  static bool BENCHMARK_CLEANUP_##__COUNTER__ = []() { \
+    pax::bench::RegisterBenchmarkCleanup(func);    \
+    return true;                                       \
+  }()
diff --git a/contrib/pax_storage/src/cpp/pax_gtest_helper.cc b/contrib/pax_storage/src/cpp/pax_gtest_helper.cc
index f95e3549aca..89a8660baf6 100644
--- a/contrib/pax_storage/src/cpp/pax_gtest_helper.cc
+++ b/contrib/pax_storage/src/cpp/pax_gtest_helper.cc
@@ -63,35 +63,53 @@ void ReleaseTestResourceOwner() {
   ResourceOwnerDelete(tmp_resource_owner);
 }
 
+void InitAttribute_text(Form_pg_attribute attr)
+{
+  memset(attr, 0, sizeof(*attr));
+  attr->atttypid = TEXTOID;
+  attr->attlen = -1;
+  attr->attbyval = false;
+  attr->attalign = TYPALIGN_DOUBLE;
+  attr->attstorage = TYPSTORAGE_PLAIN;
+  attr->attisdropped = false;
+  attr->attcollation = DEFAULT_COLLATION_OID;
+}
+
+void InitAttribute_int4(Form_pg_attribute attr)
+{
+  memset(attr, 0, sizeof(*attr));
+  attr->atttypid = INT4OID;
+  attr->attlen = 4;
+  attr->attbyval = true;
+  attr->attalign = TYPALIGN_INT;
+  attr->attstorage = TYPSTORAGE_PLAIN;
+  attr->attisdropped = false;
+  attr->attcollation = InvalidOid;
+}
+
+void InitAttribute_int8(Form_pg_attribute attr)
+{
+  memset(attr, 0, sizeof(*attr));
+  attr->atttypid = INT8OID;
+  attr->attlen = 8;
+  attr->attbyval = true;
+  attr->attalign = TYPALIGN_DOUBLE;
+  attr->attstorage = TYPSTORAGE_PLAIN;
+  attr->attisdropped = false;
+  attr->attcollation = InvalidOid;
+}
+
 static TupleDesc CreateTestTupleDesc(int ncols) {
   Assert(ncols >= COLUMN_NUMS);
   auto tuple_desc = reinterpret_cast<TupleDescData *>(cbdb::Palloc0(
       sizeof(TupleDescData) + sizeof(FormData_pg_attribute) * ncols));
 
   tuple_desc->natts = COLUMN_NUMS;
-  tuple_desc->attrs[0] = {.atttypid = TEXTOID,
-                          .attlen = -1,
-                          .attbyval = false,
-                          .attalign = TYPALIGN_DOUBLE,
-                          .attstorage = TYPSTORAGE_PLAIN,
-                          .attisdropped = false,
-                          .attcollation = DEFAULT_COLLATION_OID};
-
-  tuple_desc->attrs[1] = {.atttypid = TEXTOID,
-                          .attlen = -1,
-                          .attbyval = false,
-                          .attalign = TYPALIGN_DOUBLE,
-                          .attstorage = TYPSTORAGE_PLAIN,
-                          .attisdropped = false,
-                          .attcollation = DEFAULT_COLLATION_OID};
-
-  tuple_desc->attrs[2] = {.atttypid = INT4OID,
-                          .attlen = 4,
-                          .attbyval = true,
-                          .attalign = TYPALIGN_INT,
-                          .attstorage = TYPSTORAGE_PLAIN,
-                          .attisdropped = false,
-                          .attcollation = InvalidOid};
+
+  InitAttribute_text(&tuple_desc->attrs[0]);
+  InitAttribute_text(&tuple_desc->attrs[1]);
+  InitAttribute_int4(&tuple_desc->attrs[2]);
+
   return tuple_desc;
 }
 
diff --git a/contrib/pax_storage/src/cpp/pax_gtest_helper.h b/contrib/pax_storage/src/cpp/pax_gtest_helper.h
index b9c2f42eeaa..7a78b5fdf19 100644
--- a/contrib/pax_storage/src/cpp/pax_gtest_helper.h
+++ b/contrib/pax_storage/src/cpp/pax_gtest_helper.h
@@ -60,4 +60,8 @@ extern void DeleteTestTupleTableSlot(TupleTableSlot *tuple_slot);
 
 extern void GenTextBuffer(char *buffer, size_t length);
 extern std::vector<pax::porc::proto::Type_Kind> CreateTestSchemaTypes();
+
+extern void InitAttribute_text(Form_pg_attribute attr);
+extern void InitAttribute_int4(Form_pg_attribute attr);
+extern void InitAttribute_int8(Form_pg_attribute attr);
 }  // namespace pax::tests
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_column.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_column.cc
index 2d4bd6b7d0f..7dc2ffcd146 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_column.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_column.cc
@@ -83,13 +83,21 @@ size_t PaxColumn::GetRangeNonNullRows(size_t start_pos, size_t len) {
 
 void PaxColumn::CreateNulls(size_t cap) {
   Assert(!null_bitmap_);
-  null_bitmap_ = std::make_shared<Bitmap8>(cap);
-  null_bitmap_->SetN(total_rows_);
+  // By default, initialize every bit in the null bitmap to 1.
+  // This is based on the assumption that null values are much less frequent
+  // than non-null values in most datasets. As a result, when appending non-null
+  // values, we can simply skip setting the bit to 1, since it is already set.
+  // Only when appending a null value do we need to explicitly clear the
+  // corresponding bit.
+  null_bitmap_ = std::make_unique<Bitmap8>(cap, 0xff);
 }
 
 void PaxColumn::AppendNull() {
   if (!null_bitmap_) {
-    CreateNulls(DEFAULT_CAPACITY);
+    // Ensure that the capacity of null_bitmap_ is pax_max_tuples_per_group.
+    // This design allows the use of raw_bitmap in normal cases without
+    // incurring the overhead of checking the bitmap's capacity.
+    CreateNulls(pax::pax_max_tuples_per_group);
   }
   null_bitmap_->Clear(total_rows_);
   ++total_rows_;
@@ -111,7 +119,6 @@ void PaxColumn::AppendToast(char *buffer, size_t size) {
 }
 
 void PaxColumn::Append(char * /*buffer*/, size_t /*size*/) {
-  if (null_bitmap_) null_bitmap_->Set(total_rows_);
   ++total_rows_;
   ++non_null_rows_;
 }
@@ -208,7 +215,7 @@ std::string PaxColumn::DebugString() {
 
 template <typename T>
 PaxCommColumn<T>::PaxCommColumn(uint32 capacity) {
-  data_ = std::make_shared<DataBuffer<T>>(capacity * sizeof(T));
+  data_ = std::make_unique<DataBuffer<T>>(capacity * sizeof(T));
 }
 
 template <typename T>
@@ -218,7 +225,7 @@ template <typename T>  // NOLINT: redirect constructor
 PaxCommColumn<T>::PaxCommColumn() : PaxCommColumn(DEFAULT_CAPACITY) {}
 
 template <typename T>
-void PaxCommColumn<T>::Set(std::shared_ptr<DataBuffer<T>> data) {
+void PaxCommColumn<T>::Set(std::unique_ptr<DataBuffer<T>> data) {
   data_ = std::move(data);
 }
 
@@ -318,8 +325,8 @@ template class PaxCommColumn<double>;
 PaxNonFixedColumn::PaxNonFixedColumn(uint32 data_capacity,
                                      uint32 offsets_capacity)
     : estimated_size_(0),
-      data_(std::make_shared<DataBuffer<char>>(data_capacity)),
-      offsets_(std::make_shared<DataBuffer<int32>>(offsets_capacity)),
+      data_(std::make_unique<DataBuffer<char>>(data_capacity)),
+      offsets_(std::make_unique<DataBuffer<int32>>(offsets_capacity)),
       next_offsets_(0) {}
 
 PaxNonFixedColumn::PaxNonFixedColumn()
@@ -327,8 +334,8 @@ PaxNonFixedColumn::PaxNonFixedColumn()
 
 PaxNonFixedColumn::~PaxNonFixedColumn() {}
 
-void PaxNonFixedColumn::Set(std::shared_ptr<DataBuffer<char>> data,
-                            std::shared_ptr<DataBuffer<int32>> offsets,
+void PaxNonFixedColumn::Set(std::unique_ptr<DataBuffer<char>> data,
+                            std::unique_ptr<DataBuffer<int32>> offsets,
                             size_t total_size) {
   estimated_size_ = total_size;
   data_ = std::move(data);
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_column.h b/contrib/pax_storage/src/cpp/storage/columns/pax_column.h
index f17320c0441..0adacb06829 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_column.h
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_column.h
@@ -46,7 +46,8 @@
 
 namespace pax {
 
-#define DEFAULT_CAPACITY 2048
+#define DEFAULT_CAPACITY \
+  MIN(2048, MAX(16, MAXALIGN(pax::pax_max_tuples_per_group)))
 
 // Used to mapping pg_type
 enum PaxColumnTypeInMem {
@@ -230,16 +231,25 @@ class PaxColumn {
   inline bool HasNull() { return null_bitmap_ != nullptr; }
 
   // Are all values null?
-  inline bool AllNull() const { return null_bitmap_ && null_bitmap_->Empty(); }
+  // Check whether all bits in the specified range are zero.
+  // In pax_column, to avoid checking the capacity of the null bitmap, we
+  // allocate memory based on pax_max_tuples_per_group. As a result, the last
+  // group may contain fewer tuples than pax_max_tuples_per_group, so we need to
+  // check whether all bits in the range [0, total_rows_) are zero.
+  inline bool AllNull() const {
+    return null_bitmap_ && null_bitmap_->Empty(total_rows_);
+  }
 
   // Set the null bitmap
-  inline void SetBitmap(std::shared_ptr<Bitmap8> null_bitmap) {
+  inline void SetBitmap(std::unique_ptr<Bitmap8> null_bitmap) {
     Assert(!null_bitmap_);
     null_bitmap_ = std::move(null_bitmap);
   }
 
   // Get the null bitmap
-  inline std::shared_ptr<Bitmap8> GetBitmap() const { return null_bitmap_; }
+  inline const std::unique_ptr<Bitmap8> &GetBitmap() const {
+    return null_bitmap_;
+  }
 
   // Set the column kv attributes
   void SetAttributes(const std::map<std::string, std::string> &attrs);
@@ -354,7 +364,7 @@ class PaxColumn {
 
  protected:
   // null field bit map
-  std::shared_ptr<Bitmap8> null_bitmap_;
+  std::unique_ptr<Bitmap8> null_bitmap_;
 
   // Writer: write pointer
   // Reader: total rows
@@ -425,7 +435,7 @@ class PaxCommColumn : public PaxColumn {
 
   PaxCommColumn();
 
-  virtual void Set(std::shared_ptr<DataBuffer<T>> data);
+  virtual void Set(std::unique_ptr<DataBuffer<T>> data);
 
   PaxColumnTypeInMem GetPaxColumnTypeInMem() const override;
 
@@ -455,7 +465,7 @@ class PaxCommColumn : public PaxColumn {
   int32 GetTypeLength() const override;
 
  protected:
-  std::shared_ptr<DataBuffer<T>> data_;
+  std::unique_ptr<DataBuffer<T>> data_;
 };
 
 extern template class PaxCommColumn<char>;
@@ -474,8 +484,8 @@ class PaxNonFixedColumn : public PaxColumn {
 
   ~PaxNonFixedColumn() override;
 
-  virtual void Set(std::shared_ptr<DataBuffer<char>> data,
-                   std::shared_ptr<DataBuffer<int32>> offsets,
+  virtual void Set(std::unique_ptr<DataBuffer<char>> data,
+                   std::unique_ptr<DataBuffer<int32>> offsets,
                    size_t total_size);
 
   void Append(char *buffer, size_t size) override;
@@ -514,13 +524,13 @@ class PaxNonFixedColumn : public PaxColumn {
 
  protected:
   size_t estimated_size_;
-  std::shared_ptr<DataBuffer<char>> data_;
+  std::unique_ptr<DataBuffer<char>> data_;
 
   // orc needs to serialize int32 array
   // the length of a single tuple field will not exceed 2GB,
   // so a variable-length element of the offsets stream can use int32
   // to represent the length
-  std::shared_ptr<DataBuffer<int32>> offsets_;
+  std::unique_ptr<DataBuffer<int32>> offsets_;
 
   // used to record next offset in write path
   // in read path, next_offsets_ always be -1
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_column_test.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_column_test.cc
index dfd346ef615..b1c75c39217 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_column_test.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_column_test.cc
@@ -137,7 +137,7 @@ static std::unique_ptr<PaxColumn> CreateDecodeColumn(
   std::unique_ptr<PaxColumn> column_rc;
   switch (bits) {
     case 16: {
-      auto buffer_for_read = std::make_shared<DataBuffer<int16>>(
+      auto buffer_for_read = std::make_unique<DataBuffer<int16>>(
           reinterpret_cast<int16 *>(encoded_buff), encoded_len, false, false);
       buffer_for_read->Brush(encoded_len);
 
@@ -145,19 +145,19 @@ static std::unique_ptr<PaxColumn> CreateDecodeColumn(
         auto int_column =
             ColumnOptCreateTraits<PaxEncodingColumn, int16>::create_decoding(
                 origin_len / sizeof(int16), std::move(decoding_option));
-        int_column->Set(buffer_for_read);
+        int_column->Set(std::move(buffer_for_read));
         column_rc = std::move(int_column);
       } else {
         auto int_column =
             ColumnOptCreateTraits<PaxVecEncodingColumn, int16>::create_decoding(
                 origin_len / sizeof(int16), std::move(decoding_option));
-        int_column->Set(buffer_for_read, column_not_nulls);
+        int_column->Set(std::move(buffer_for_read), column_not_nulls);
         column_rc = std::move(int_column);
       }
       break;
     }
     case 32: {
-      auto buffer_for_read = std::make_shared<DataBuffer<int32>>(
+      auto buffer_for_read = std::make_unique<DataBuffer<int32>>(
           reinterpret_cast<int32 *>(encoded_buff), encoded_len, false, false);
       buffer_for_read->Brush(encoded_len);
 
@@ -165,19 +165,19 @@ static std::unique_ptr<PaxColumn> CreateDecodeColumn(
         auto int_column =
             ColumnOptCreateTraits<PaxEncodingColumn, int32>::create_decoding(
                 origin_len / sizeof(int32), std::move(decoding_option));
-        int_column->Set(buffer_for_read);
+        int_column->Set(std::move(buffer_for_read));
         column_rc = std::move(int_column);
       } else {
         auto int_column =
             ColumnOptCreateTraits<PaxVecEncodingColumn, int32>::create_decoding(
                 origin_len / sizeof(int32), std::move(decoding_option));
-        int_column->Set(buffer_for_read, column_not_nulls);
+        int_column->Set(std::move(buffer_for_read), column_not_nulls);
         column_rc = std::move(int_column);
       }
       break;
     }
     case 64: {
-      auto buffer_for_read = std::make_shared<DataBuffer<int64>>(
+      auto buffer_for_read = std::make_unique<DataBuffer<int64>>(
           reinterpret_cast<int64 *>(encoded_buff), encoded_len, false, false);
       buffer_for_read->Brush(encoded_len);
 
@@ -185,13 +185,13 @@ static std::unique_ptr<PaxColumn> CreateDecodeColumn(
         auto int_column =
             ColumnOptCreateTraits<PaxEncodingColumn, int64>::create_decoding(
                 origin_len / sizeof(int64), std::move(decoding_option));
-        int_column->Set(buffer_for_read);
+        int_column->Set(std::move(buffer_for_read));
         column_rc = std::move(int_column);
       } else {
         auto int_column =
             ColumnOptCreateTraits<PaxVecEncodingColumn, int64>::create_decoding(
                 origin_len / sizeof(int64), std::move(decoding_option));
-        int_column->Set(buffer_for_read, column_not_nulls);
+        int_column->Set(std::move(buffer_for_read), column_not_nulls);
         column_rc = std::move(int_column);
       }
       break;
@@ -697,7 +697,6 @@ TEST_P(PaxNonFixedColumnCompressTest,
   auto number = ::testing::get<0>(GetParam());
   auto kind = ::testing::get<1>(GetParam());
   auto verify_range = ::testing::get<2>(GetParam());
-  auto enable_offsets_encoding = ::testing::get<2>(GetParam());
   const size_t number_of_rows = 1024;
 
   PaxEncoder::EncodingOption encoding_option;
@@ -705,10 +704,9 @@ TEST_P(PaxNonFixedColumnCompressTest,
   encoding_option.compress_level = 5;
   encoding_option.is_sign = true;
 
-  if (enable_offsets_encoding) {
-    encoding_option.offsets_encode_type = kind;
-    encoding_option.offsets_compress_level = 5;
-  }
+  encoding_option.offsets_encode_type =
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+  encoding_option.offsets_compress_level = 5;
 
   non_fixed_column = new PaxNonFixedEncodingColumn(
       number_of_rows, number_of_rows, std::move(encoding_option));
@@ -744,22 +742,21 @@ TEST_P(PaxNonFixedColumnCompressTest,
   decoding_option.is_sign = true;
   decoding_option.compress_level = 5;
 
-  if (enable_offsets_encoding) {
-    decoding_option.offsets_encode_type = kind;
-    decoding_option.offsets_compress_level = 5;
-  }
+  decoding_option.offsets_encode_type =
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+  decoding_option.offsets_compress_level = 5;
 
   auto non_fixed_column_for_read = new PaxNonFixedEncodingColumn(
       number_of_rows * number, sizeof(int32) * number_of_rows,
       std::move(decoding_option));
-  auto data_buffer_for_read = std::make_shared<DataBuffer<char>>(
+  auto data_buffer_for_read = std::make_unique<DataBuffer<char>>(
       encoded_buff, encoded_len, false, false);
   data_buffer_for_read->Brush(encoded_len);
-  auto length_buffer_cpy = std::make_shared<DataBuffer<int32>>(
+  auto length_buffer_cpy = std::make_unique<DataBuffer<int32>>(
       (int32 *)offset_stream_buff, offset_stream_len, false, false);
   length_buffer_cpy->BrushAll();
-  non_fixed_column_for_read->Set(data_buffer_for_read, length_buffer_cpy,
-                                 origin_len);
+  non_fixed_column_for_read->Set(std::move(data_buffer_for_read),
+                                 std::move(length_buffer_cpy), origin_len);
   ASSERT_EQ(non_fixed_column_for_read->GetCompressLevel(), 5);
   char *verify_buff;
   size_t verify_len;
@@ -801,6 +798,9 @@ INSTANTIATE_TEST_SUITE_P(
     PaxColumnEncodingTestCombine, PaxColumnCompressTest,
     testing::Combine(testing::Values(16, 32, 64),
                      testing::Values(ColumnEncoding_Kind_NO_ENCODED,
+#ifdef USE_LZ4
+                                     ColumnEncoding_Kind_COMPRESS_LZ4,
+#endif
                                      ColumnEncoding_Kind_COMPRESS_ZSTD,
                                      ColumnEncoding_Kind_COMPRESS_ZLIB)));
 
@@ -808,6 +808,9 @@ INSTANTIATE_TEST_SUITE_P(
     PaxColumnEncodingTestCombine, PaxNonFixedColumnCompressTest,
     testing::Combine(testing::Values(16, 32, 64),
                      testing::Values(ColumnEncoding_Kind_NO_ENCODED,
+#ifdef USE_LZ4
+                                     ColumnEncoding_Kind_COMPRESS_LZ4,
+#endif
                                      ColumnEncoding_Kind_COMPRESS_ZSTD,
                                      ColumnEncoding_Kind_COMPRESS_ZLIB),
                      testing::Values(true, false),
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_columns.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_columns.cc
index 4a181947ed8..7fd3c04ae60 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_columns.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_columns.cc
@@ -377,7 +377,7 @@ size_t PaxColumns::MeasureVecDataBuffer(
 
     // has null will generate a bitmap in current stripe
     if (column->HasNull()) {
-      auto bm = column->GetBitmap();
+      const auto &bm = column->GetBitmap();
       Assert(bm);
       size_t bm_length = bm->MinimalStoredBytes(total_rows);
 
@@ -483,7 +483,7 @@ size_t PaxColumns::MeasureOrcDataBuffer(
     auto column = p_column.get();
     // has null will generate a bitmap in current stripe
     if (column->HasNull()) {
-      auto bm = column->GetBitmap();
+      const auto &bm = column->GetBitmap();
       Assert(bm);
       size_t bm_length = bm->MinimalStoredBytes(column->GetRows());
       buffer_len += bm_length;
@@ -592,7 +592,7 @@ void PaxColumns::CombineVecDataBuffer() {
 
     auto column = p_column.get();
     if (column->HasNull()) {
-      auto bm = column->GetBitmap();
+      const auto &bm = column->GetBitmap();
       Assert(bm);
       auto nbytes = bm->MinimalStoredBytes(column->GetRows());
       Assert(nbytes <= bm->Raw().size);
@@ -680,7 +680,7 @@ void PaxColumns::CombineOrcDataBuffer() {
 
     auto column = p_column.get();
     if (column->HasNull()) {
-      auto bm = column->GetBitmap();
+      const auto &bm = column->GetBitmap();
       Assert(bm);
       auto nbytes = bm->MinimalStoredBytes(column->GetRows());
       Assert(nbytes <= bm->Raw().size);
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_compress.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_compress.cc
index 87a34cbb6d7..f4bae52ea7d 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_compress.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_compress.cc
@@ -50,6 +50,12 @@ std::shared_ptr<PaxCompressor> PaxCompressor::CreateBlockCompressor(
       compressor = std::make_shared<PaxZlibCompressor>();
       break;
     }
+#ifdef USE_LZ4
+    case ColumnEncoding_Kind::ColumnEncoding_Kind_COMPRESS_LZ4: {
+      compressor = std::make_shared<PaxLZ4Compressor>();
+      break;
+    }
+#endif
     case ColumnEncoding_Kind::ColumnEncoding_Kind_DEF_ENCODED: {
       CBDB_RAISE(cbdb::CException::ExType::kExTypeLogicError,
                  fmt("Invalid compress type %d",
@@ -230,9 +236,12 @@ size_t PaxLZ4Compressor::GetCompressBound(size_t src_len) {
 }
 
 size_t PaxLZ4Compressor::Compress(void *dst_buff, size_t dst_cap,
-                                  void *src_buff, size_t src_len, int /*lvl*/) {
-  return LZ4_compress_default((char *)src_buff, (char *)dst_buff, src_len,
-                              dst_cap);
+                                  void *src_buff, size_t src_len, int lvl) {
+  // acceleration affects compression speed, the larger acceleration value,
+  // the less compression ratio.
+  int acceleration = (20 - lvl) / 6;
+  return LZ4_compress_fast((char *)src_buff, (char *)dst_buff, src_len,
+                              dst_cap, acceleration);
 }
 
 size_t PaxLZ4Compressor::Decompress(void *dst_buff, size_t dst_len,
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_compress_bench.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_compress_bench.cc
new file mode 100644
index 00000000000..0a792601e99
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_compress_bench.cc
@@ -0,0 +1,421 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * pax_compress_bench.cc
+ *
+ * IDENTIFICATION
+ *   contrib/pax_storage/src/cpp/storage/columns/pax_compress_bench.cc
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <algorithm>
+#include <cerrno>
+#include <chrono>
+#include <cstdint>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <memory>
+#include <random>
+#include <vector>
+
+#include <cstdio>
+#include <unistd.h>
+
+#include "comm/cbdb_wrappers.h"
+#include "comm/pax_memory.h"
+#include "pax_gbench.h"
+#include "storage/columns/pax_compress.h"
+#include "storage/columns/pax_decoding.h"
+#include "storage/columns/pax_delta_encoding.h"
+#include "storage/columns/pax_rlev2_encoding.h"
+#include "storage/pax_buffer.h"
+
+namespace pax::bench {
+
+namespace {
+
+// Test data and prebuilt buffers for decode/decompress benchmarks
+static const size_t kCount = 1024 * 1024;
+static std::vector<uint32_t> g_offsets;
+static std::unique_ptr<char[]> g_raw_bytes;
+static size_t g_raw_len = 0;
+
+static std::vector<char> g_rle_encoded;
+static size_t g_rle_len = 0;
+
+static std::vector<char> g_delta_encoded;
+static size_t g_delta_len = 0;
+
+static std::unique_ptr<char[]> g_zstd_compressed;
+static size_t g_zstd_len = 0;
+
+static std::shared_ptr<pax::PaxCompressor> g_zstd;
+
+// Simple helpers for bench data persistence
+static void EnsureDirExists(const char *dir_path) {
+  if (mkdir(dir_path, 0755) != 0) {
+    if (errno != EEXIST) {
+      std::cerr << "Failed to create directory: " << dir_path << std::endl;
+      std::abort();
+    }
+  }
+}
+
+static bool ReadWholeFile(const char *path, std::vector<char> &out) {
+  std::ifstream in(path, std::ios::binary);
+  if (!in.is_open()) return false;
+  in.seekg(0, std::ios::end);
+  std::streampos size = in.tellg();
+  if (size <= 0) return false;
+  out.resize(static_cast<size_t>(size));
+  in.seekg(0, std::ios::beg);
+  in.read(out.data(), size);
+  return static_cast<bool>(in);
+}
+
+static bool ReadWholeFile(const char *path, std::unique_ptr<char[]> &out,
+                          size_t &out_len) {
+  std::ifstream in(path, std::ios::binary);
+  if (!in.is_open()) return false;
+  in.seekg(0, std::ios::end);
+  std::streampos size = in.tellg();
+  if (size <= 0) return false;
+  out_len = static_cast<size_t>(size);
+  out = std::make_unique<char[]>(out_len);
+  in.seekg(0, std::ios::beg);
+  in.read(out.get(), size);
+  return static_cast<bool>(in);
+}
+
+static void WriteWholeFile(const char *path, const char *data, size_t len) {
+  std::ofstream out(path, std::ios::binary | std::ios::trunc);
+  if (!out.is_open()) {
+    std::cerr << "Failed to open file for write: " << path << std::endl;
+    std::abort();
+  }
+  out.write(data, static_cast<std::streamsize>(len));
+  if (!out) {
+    std::cerr << "Failed to write file: " << path << std::endl;
+    std::abort();
+  }
+}
+
+static const char *kBenchDataDir = "bench_data";
+static const char *kRLEV2Path = "bench_data/rle_v2_u32.bin";
+static const char *kDeltaPath = "bench_data/delta_u32.bin";
+static const char *kZSTDPath = "bench_data/zstd_u32.bin";
+static const char *kRawPath = "bench_data/raw_u32.bin";
+
+static std::vector<uint32_t> GenerateMonotonicOffsets(size_t n, uint32_t seed) {
+  std::vector<uint32_t> offsets;
+  offsets.resize(n);
+  offsets[0] = 0;
+  std::mt19937 rng(seed);
+  std::uniform_int_distribution<int> step_dist(1, 256);
+  for (size_t i = 1; i < n; ++i) {
+    offsets[i] = offsets[i - 1] + static_cast<uint32_t>(step_dist(rng));
+  }
+  return offsets;
+}
+
+// Lazily ensure raw bytes are available (prefer loading from disk)
+static void EnsureRawData() {
+  if (g_raw_len != 0 && g_raw_bytes) return;
+  EnsureDirExists(kBenchDataDir);
+  std::vector<char> raw_from_file;
+  if (ReadWholeFile(kRawPath, raw_from_file)) {
+    g_raw_len = raw_from_file.size();
+    g_raw_bytes = std::make_unique<char[]>(g_raw_len);
+    std::memcpy(g_raw_bytes.get(), raw_from_file.data(), g_raw_len);
+    return;
+  }
+  // Fallback: generate and persist
+  g_offsets = GenerateMonotonicOffsets(kCount, /*seed=*/12345);
+  g_raw_len = g_offsets.size() * sizeof(uint32_t);
+  g_raw_bytes = std::make_unique<char[]>(g_raw_len);
+  std::memcpy(g_raw_bytes.get(), g_offsets.data(), g_raw_len);
+  WriteWholeFile(kRawPath, g_raw_bytes.get(), g_raw_len);
+}
+
+// Lazily ensure RLEv2 encoded buffer exists (load or build from raw)
+static void EnsureRleEncoded() {
+  if (g_rle_len != 0 && !g_rle_encoded.empty()) return;
+  EnsureDirExists(kBenchDataDir);
+  if (ReadWholeFile(kRLEV2Path, g_rle_encoded)) {
+    g_rle_len = g_rle_encoded.size();
+    return;
+  }
+  EnsureRawData();
+  PaxEncoder::EncodingOption enc_opt;
+  enc_opt.column_encode_type = ColumnEncoding_Kind_RLE_V2;
+  enc_opt.is_sign = false;
+
+  PaxOrcEncoder rle_encoder(enc_opt);
+  auto rle_out = std::make_shared<DataBuffer<char>>(g_raw_len);
+  rle_encoder.SetDataBuffer(rle_out);
+  // encode directly from raw bytes to avoid depending on g_offsets
+  size_t count = g_raw_len / sizeof(uint32_t);
+  const uint32_t *vals = reinterpret_cast<const uint32_t *>(g_raw_bytes.get());
+  for (size_t i = 0; i < count; ++i) {
+    uint32_t v = vals[i];
+    rle_encoder.Append(reinterpret_cast<char *>(&v), sizeof(uint32_t));
+  }
+  rle_encoder.Flush();
+
+  g_rle_len = rle_encoder.GetBufferSize();
+  g_rle_encoded.assign(rle_encoder.GetBuffer(),
+                       rle_encoder.GetBuffer() + g_rle_len);
+  WriteWholeFile(kRLEV2Path, g_rle_encoded.data(), g_rle_len);
+}
+
+// Lazily ensure Delta encoded buffer exists (load or build from raw)
+static void EnsureDeltaEncoded() {
+  if (g_delta_len != 0 && !g_delta_encoded.empty()) return;
+  EnsureDirExists(kBenchDataDir);
+  if (ReadWholeFile(kDeltaPath, g_delta_encoded)) {
+    g_delta_len = g_delta_encoded.size();
+    return;
+  }
+  EnsureRawData();
+  PaxEncoder::EncodingOption enc_opt;
+  enc_opt.is_sign = false;
+  // type not used by PaxDeltaEncoder
+  PaxDeltaEncoder<uint32_t> delta_encoder(enc_opt);
+  auto delta_out = std::make_shared<DataBuffer<char>>(g_raw_len);
+  delta_encoder.SetDataBuffer(delta_out);
+  // Encode whole array in one shot
+  delta_encoder.Append(g_raw_bytes.get(), g_raw_len);
+  delta_encoder.Flush();
+
+  g_delta_len = delta_encoder.GetBufferSize();
+  g_delta_encoded.assign(delta_encoder.GetBuffer(),
+                         delta_encoder.GetBuffer() + g_delta_len);
+  WriteWholeFile(kDeltaPath, g_delta_encoded.data(), g_delta_len);
+}
+
+// Lazily ensure ZSTD compressed buffer exists (load or build from raw)
+static void EnsureZstdCompressed() {
+  EnsureDirExists(kBenchDataDir);
+  if (!g_zstd) {
+    g_zstd =
+        PaxCompressor::CreateBlockCompressor(ColumnEncoding_Kind_COMPRESS_ZSTD);
+    if (!g_zstd) {
+      std::cerr << "Failed to create ZSTD compressor" << std::endl;
+      std::abort();
+    }
+  }
+  if (g_zstd_len != 0 && g_zstd_compressed) return;
+  if (ReadWholeFile(kZSTDPath, g_zstd_compressed, g_zstd_len)) {
+    return;
+  }
+  EnsureRawData();
+  size_t bound = g_zstd->GetCompressBound(g_raw_len);
+  g_zstd_compressed = std::make_unique<char[]>(bound);
+  g_zstd_len = g_zstd->Compress(g_zstd_compressed.get(), bound,
+                                g_raw_bytes.get(), g_raw_len, /*lvl=*/5);
+  if (g_zstd->IsError(g_zstd_len) || g_zstd_len == 0) {
+    std::cerr << "ZSTD one-time compress failed" << std::endl;
+    std::abort();
+  }
+  WriteWholeFile(kZSTDPath, g_zstd_compressed.get(), g_zstd_len);
+}
+
+static void PrepareOnce() {
+  pax::bench::CreateMemoryContext();
+  EnsureDirExists(kBenchDataDir);
+}
+
+static void CleanupBenchData() {
+  const char *files[] = {kRLEV2Path, kDeltaPath, kZSTDPath, kRawPath};
+  for (const char *p : files) {
+    std::remove(p);
+  }
+
+  rmdir(kBenchDataDir);
+}
+
+}  // namespace
+
+// Register module init with gbench framework
+REGISTER_BENCHMARK_INIT(PrepareOnce);
+REGISTER_BENCHMARK_CLEANUP(CleanupBenchData);
+
+// RLEv2 encode benchmark
+static void BM_RLEV2_Encode(::benchmark::State &state) {
+  // Prepare raw data only; no encoded buffers are created here
+  EnsureRawData();
+  for (auto _ : state) {
+    PaxEncoder::EncodingOption enc_opt;
+    enc_opt.column_encode_type = ColumnEncoding_Kind_RLE_V2;
+    enc_opt.is_sign = false;
+
+    PaxOrcEncoder encoder(enc_opt);
+    auto out = std::make_shared<DataBuffer<char>>(g_raw_len);
+    encoder.SetDataBuffer(out);
+
+    size_t count = g_raw_len / sizeof(uint32_t);
+    const uint32_t *vals =
+        reinterpret_cast<const uint32_t *>(g_raw_bytes.get());
+    for (size_t i = 0; i < count; ++i) {
+      uint32_t v = vals[i];
+      encoder.Append(reinterpret_cast<char *>(&v), sizeof(uint32_t));
+    }
+    encoder.Flush();
+    g_rle_len = encoder.GetBufferSize();
+    benchmark::DoNotOptimize(encoder.GetBuffer());
+    benchmark::ClobberMemory();
+  }
+  state.SetBytesProcessed(static_cast<int64_t>(state.iterations()) *
+                          static_cast<int64_t>(g_raw_len));
+  state.counters["raw_kb"] =
+      benchmark::Counter(static_cast<double>(g_raw_len) / (1024.0));
+  state.counters["rle_kb"] =
+      benchmark::Counter(static_cast<double>(g_rle_len) / (1024.0));
+}
+BENCHMARK(BM_RLEV2_Encode);
+
+// RLEv2 decode benchmark
+static void BM_RLEV2_Decode(::benchmark::State &state) {
+  // Ensure we have raw size and encoded buffer ready (prefer from disk)
+  EnsureRawData();
+  EnsureRleEncoded();
+  for (auto _ : state) {
+    PaxDecoder::DecodingOption dec_opt;
+    dec_opt.column_encode_type = ColumnEncoding_Kind_RLE_V2;
+    dec_opt.is_sign = false;
+
+    auto decoder = PaxDecoder::CreateDecoder<int32>(dec_opt);
+    auto out = std::make_shared<DataBuffer<char>>(g_raw_len);
+    decoder->SetSrcBuffer(g_rle_encoded.data(), g_rle_len);
+    decoder->SetDataBuffer(out);
+    size_t n = decoder->Decoding();
+    benchmark::DoNotOptimize(n);
+    benchmark::ClobberMemory();
+  }
+  state.SetBytesProcessed(static_cast<int64_t>(state.iterations()) *
+                          static_cast<int64_t>(g_raw_len));
+}
+BENCHMARK(BM_RLEV2_Decode);
+
+// Delta encode benchmark
+static void BM_Delta_Encode(::benchmark::State &state) {
+  EnsureRawData();
+  for (auto _ : state) {
+    PaxEncoder::EncodingOption enc_opt;
+    enc_opt.is_sign = false;
+    PaxDeltaEncoder<uint32_t> encoder(enc_opt);
+    auto out = std::make_shared<DataBuffer<char>>(g_raw_len);
+    encoder.SetDataBuffer(out);
+    encoder.Append(g_raw_bytes.get(), g_raw_len);
+    encoder.Flush();
+    g_delta_len = encoder.GetBufferSize();
+    benchmark::DoNotOptimize(encoder.GetBuffer());
+    benchmark::ClobberMemory();
+  }
+  state.SetBytesProcessed(static_cast<int64_t>(state.iterations()) *
+                          static_cast<int64_t>(g_raw_len));
+  state.counters["delta_kb"] =
+      benchmark::Counter(static_cast<double>(g_delta_len) / (1024.0));
+}
+BENCHMARK(BM_Delta_Encode);
+
+// Delta decode benchmark
+static void BM_Delta_Decode(::benchmark::State &state) {
+  EnsureRawData();
+  EnsureDeltaEncoded();
+  for (auto _ : state) {
+    PaxDecoder::DecodingOption dec_opt;
+    dec_opt.is_sign = false;
+    dec_opt.column_encode_type = ColumnEncoding_Kind_DIRECT_DELTA;
+    PaxDeltaDecoder<int32> decoder(dec_opt);
+    auto out = std::make_shared<DataBuffer<char>>(g_raw_len);
+    decoder.SetSrcBuffer(g_delta_encoded.data(), g_delta_len);
+    decoder.SetDataBuffer(out);
+    size_t n = decoder.Decoding();
+    if (n != g_raw_len / sizeof(uint32_t) && out->Used() != g_raw_len) {
+      std::cerr << "Delta decode failed, n: " << n
+                << ", g_raw_len: " << g_raw_len
+                << ", g_delta_len: " << g_delta_len
+                << ", out: Used: " << out->Used() << std::endl;
+      std::abort();
+    }
+
+    if (memcmp(out->GetBuffer(), g_raw_bytes.get(), g_raw_len) != 0) {
+      std::cerr << "Delta decode failed, out: " << out->GetBuffer()
+                << ", g_raw_bytes: " << g_raw_bytes.get() << std::endl;
+      std::abort();
+    }
+
+    benchmark::DoNotOptimize(n);
+    benchmark::ClobberMemory();
+  }
+  state.SetBytesProcessed(static_cast<int64_t>(state.iterations()) *
+                          static_cast<int64_t>(g_raw_len));
+}
+BENCHMARK(BM_Delta_Decode);
+
+// ZSTD compress benchmark
+static void BM_ZSTD_Compress(::benchmark::State &state) {
+  EnsureRawData();
+  if (!g_zstd) {
+    g_zstd =
+        PaxCompressor::CreateBlockCompressor(ColumnEncoding_Kind_COMPRESS_ZSTD);
+    if (!g_zstd) {
+      std::cerr << "Failed to create ZSTD compressor" << std::endl;
+      std::abort();
+    }
+  }
+  size_t bound = g_zstd->GetCompressBound(g_raw_len);
+  std::unique_ptr<char[]> dst(new char[bound]);
+  for (auto _ : state) {
+    size_t n = g_zstd->Compress(dst.get(), bound, g_raw_bytes.get(), g_raw_len,
+                                /*lvl=*/5);
+    g_zstd_len = n;
+    benchmark::DoNotOptimize(n);
+    benchmark::ClobberMemory();
+  }
+  state.SetBytesProcessed(static_cast<int64_t>(state.iterations()) *
+                          static_cast<int64_t>(g_raw_len));
+  state.counters["zstd_kb"] =
+      benchmark::Counter(static_cast<double>(g_zstd_len) / (1024.0));
+}
+BENCHMARK(BM_ZSTD_Compress);
+
+// ZSTD decompress benchmark
+static void BM_ZSTD_Decompress(::benchmark::State &state) {
+  EnsureRawData();
+  EnsureZstdCompressed();
+  std::unique_ptr<char[]> dst(new char[g_raw_len]);
+  for (auto _ : state) {
+    size_t n = g_zstd->Decompress(dst.get(), g_raw_len, g_zstd_compressed.get(),
+                                  g_zstd_len);
+    benchmark::DoNotOptimize(n);
+    benchmark::ClobberMemory();
+  }
+  state.SetBytesProcessed(static_cast<int64_t>(state.iterations()) *
+                          static_cast<int64_t>(g_raw_len));
+}
+BENCHMARK(BM_ZSTD_Decompress);
+
+}  // namespace pax::bench
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_decoding.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_decoding.cc
index 7ba0fcd6768..0e15ec52088 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_decoding.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_decoding.cc
@@ -31,6 +31,7 @@
 #include "comm/pax_memory.h"
 #include "storage/columns/pax_dict_encoding.h"
 #include "storage/columns/pax_rlev2_decoding.h"
+#include "storage/columns/pax_delta_encoding.h"
 
 namespace pax {
 
@@ -47,7 +48,7 @@ std::shared_ptr<PaxDecoder> PaxDecoder::CreateDecoder(const DecodingOption &deco
       break;
     }
     case ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA: {
-      /// TODO(jiaqizho) support it
+      decoder = std::make_shared<PaxDeltaDecoder<T>>(decoder_options);
       break;
     }
     case ColumnEncoding_Kind::ColumnEncoding_Kind_DICTIONARY: {
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.cc
new file mode 100644
index 00000000000..3f4b5341c4a
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.cc
@@ -0,0 +1,511 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * pax_delta_encoding.cc
+ *
+ * IDENTIFICATION
+ *	  contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.cc
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "storage/columns/pax_delta_encoding.h"
+
+#include <algorithm>
+#include <cstring>
+#include <vector>
+
+namespace pax {
+
+// delta bitpack encoder
+template <typename T>
+PaxDeltaEncoder<T>::PaxDeltaEncoder(const EncodingOption &encoder_options)
+    : PaxEncoder(encoder_options) {}
+
+template <typename T>
+void PaxDeltaEncoder<T>::Append(char *data, size_t size) {
+  CBDB_CHECK(!has_append_, cbdb::CException::kExTypeAbort,
+             fmt("PaxDeltaEncoder::Append only support Append Once"));
+  has_append_ = true;
+
+  auto T_data = reinterpret_cast<T *>(data);
+  auto T_data_len = size / sizeof(T);
+  Encode(T_data, T_data_len);
+}
+
+inline uint8_t NumBitsAllowZero(uint32_t value) {
+  if (value == 0) return 0;
+  uint8_t bits = 0;
+  while (value) {
+    bits++;
+    value >>= 1;
+  }
+  return bits;
+}
+
+// Fast bit width calculation (0 -> 0)
+inline static uint8_t FastNumBits(uint32_t v) {
+#if defined(__GNUC__) || defined(__clang__)
+  return v == 0 ? 0 : static_cast<uint8_t>(32 - __builtin_clz(v));
+#else
+  uint8_t bits = 0;
+  while (v) {
+    ++bits;
+    v >>= 1;
+  }
+  return bits;
+#endif
+}
+
+// 64-bit bit writer based on raw pointer (writes to reserved DataBuffer range)
+struct BitWriter64Ptr {
+  uint8_t *out;
+  size_t index;
+  uint64_t bit_buffer;
+  uint32_t bit_count;
+
+  BitWriter64Ptr(uint8_t *p) : out(p), index(0), bit_buffer(0), bit_count(0) {}
+
+  inline void Append(uint32_t value, uint8_t width) {
+    if (width == 0) return;
+    bit_buffer |= (static_cast<uint64_t>(value) << bit_count);
+    bit_count += width;
+    while (bit_count >= 8) {
+      out[index++] = static_cast<uint8_t>(bit_buffer & 0xFF);
+      bit_buffer >>= 8;
+      bit_count -= 8;
+    }
+  }
+
+  inline void FlushToByte() {
+    if (bit_count > 0) {
+      out[index++] = static_cast<uint8_t>(bit_buffer & 0xFF);
+      bit_buffer = 0;
+      bit_count = 0;
+    }
+  }
+};
+
+// 64-bit bit reader based on raw pointer (limited to specified payload bytes)
+struct BitReader64Ptr {
+  const uint8_t *in;
+  size_t size;
+  size_t index;
+  uint64_t bit_buffer;
+  uint32_t bit_count;
+
+  BitReader64Ptr(const uint8_t *p, size_t len)
+      : in(p), size(len), index(0), bit_buffer(0), bit_count(0) {}
+
+  inline void Ensure(uint32_t need_bits) {
+    while (bit_count < need_bits && index < size) {
+      bit_buffer |= (static_cast<uint64_t>(in[index]) << bit_count);
+      ++index;
+      bit_count += 8;
+    }
+  }
+
+  inline uint32_t Read(uint8_t width) {
+    if (width == 0) return 0;
+    Ensure(width);
+    uint32_t result;
+    if (width == 32)
+      result = static_cast<uint32_t>(bit_buffer & 0xFFFFFFFFull);
+    else
+      result = static_cast<uint32_t>(bit_buffer & ((1ull << width) - 1));
+    bit_buffer >>= width;
+    bit_count -= width;
+    return result;
+  }
+
+  inline void AlignToByte() {
+    uint32_t drop = bit_count % 8;
+    if (drop) {
+      bit_buffer >>= drop;
+      bit_count -= drop;
+    }
+  }
+};
+
+/*
+Overall layout:
+  DeltaBlockHeader (struct, fixed-size)
+    - uint32 value_per_block
+    - uint32 values_per_mini_block
+    - uint32 total_count
+  T first_value
+  [Repeated Block until total_count is exhausted]
+    - uint32 min_delta
+    - uint8  bit_widths[ mini_blocks_per_block ]
+    - uint8  payload[computed from bit_widths]
+            // bit-packed adjusted deltas, mini-block by mini-block
+            // within a block: bits are written MSB-first, end aligned to byte
+*/
+
+template <typename T>
+size_t PaxDeltaEncoder<T>::GetBoundSize(size_t src_len) const {
+  size_t value_count = src_len / sizeof(T);
+  size_t block_count = (value_count + value_per_block_ - 1) / value_per_block_;
+  /* header + first_value + block_count * (min_delta + bit_widths )
+   * + payload was eliminated to value_count*/
+  return sizeof(DeltaBlockHeader) + sizeof(T) +
+         block_count * (sizeof(uint32) + mini_blocks_per_block_) + value_count;
+}
+
+template <typename T>
+void PaxDeltaEncoder<T>::Encode(T *data, size_t count) {
+  // Estimate allocation: by element byte count, sufficient to accommodate
+  // header and bit stream
+  if (result_buffer_->Capacity() <
+      count * sizeof(T) + sizeof(DeltaBlockHeader) + sizeof(T)) {
+    result_buffer_->ReSize(count * sizeof(T) + sizeof(DeltaBlockHeader) +
+                           sizeof(T));
+  }
+
+  DeltaBlockHeader header;
+  header.value_per_block = value_per_block_;
+  header.values_per_mini_block = values_per_mini_block_;
+  header.total_count = count;
+  // add delta block header
+  result_buffer_->Write(reinterpret_cast<char *>(&header), sizeof(header));
+  result_buffer_->Brush(sizeof(header));
+  // add base value
+  result_buffer_->Write(reinterpret_cast<char *>(&data[0]), sizeof(data[0]));
+  result_buffer_->Brush(sizeof(data[0]));
+
+  size_t values_emitted = 1;
+  T previous_value = data[0];
+
+  while (values_emitted < count) {
+    uint32_t values_in_block = std::min(
+        value_per_block_, static_cast<uint32_t>(count - values_emitted));
+
+    if (deltas_scratch_.size() < values_in_block) {
+      deltas_scratch_.resize(values_in_block);
+    }
+    uint32_t *deltas = deltas_scratch_.data();
+    uint32_t min_delta = UINT32_MAX;
+    uint32_t mini_max[mini_blocks_per_block_] = {0};
+
+    for (uint32_t i = 0; i < values_in_block; ++i) {
+      T current = data[values_emitted + i];
+      uint32_t delta = static_cast<uint32_t>(current - previous_value);
+      deltas[i] = delta;
+      previous_value = current;
+      if (delta < min_delta) min_delta = delta;
+      uint32_t mini_index = i / values_per_mini_block_;
+      if (delta > mini_max[mini_index]) mini_max[mini_index] = delta;
+    }
+
+    // write block header: min_delta later
+    uint8_t bit_widths[mini_blocks_per_block_] = {0};
+    uint64_t total_bits = 0;
+    for (uint32_t i = 0; i < mini_blocks_per_block_; ++i) {
+      uint32_t start = i * values_per_mini_block_;
+      if (start >= values_in_block) {
+        bit_widths[i] = 0;
+        continue;
+      }
+      uint32_t adjusted_max = mini_max[i] - min_delta;
+      uint8_t w = FastNumBits(adjusted_max);
+      bit_widths[i] = w;
+      uint32_t end = std::min(start + values_per_mini_block_, values_in_block);
+      total_bits += static_cast<uint64_t>(w) * (end - start);
+    }
+    uint32_t payload_bytes = static_cast<uint32_t>((total_bits + 7) / 8);
+
+    size_t need_size =
+        payload_bytes + mini_blocks_per_block_ + sizeof(min_delta);
+
+    // Grows the buffer to be at least need_size bytes. To avoid frequent
+    // resizing, the new capacity is calculated as the maximum of (current
+    // capacity * 1.5) or (current capacity + need_size).
+    if (result_buffer_->Available() < need_size) {
+      size_t inc_size = need_size > (result_buffer_->Capacity() * 0.5)
+                            ? need_size
+                            : result_buffer_->Capacity() * 0.5;
+      result_buffer_->ReSize(result_buffer_->Capacity() + inc_size);
+    }
+
+    // write block header: min_delta
+    result_buffer_->Write(reinterpret_cast<char *>(&min_delta),
+                          sizeof(min_delta));
+    result_buffer_->Brush(sizeof(min_delta));
+
+    // write bit_widths
+    result_buffer_->Write(reinterpret_cast<char *>(bit_widths),
+                          mini_blocks_per_block_);
+    result_buffer_->Brush(mini_blocks_per_block_);
+
+    uint8_t *payload_ptr =
+        reinterpret_cast<uint8_t *>(result_buffer_->GetAvailableBuffer());
+    BitWriter64Ptr bw(payload_ptr);
+    for (uint32_t i = 0; i < mini_blocks_per_block_; ++i) {
+      uint32_t start = i * values_per_mini_block_;
+      if (start >= values_in_block) break;
+      uint32_t end = std::min(start + values_per_mini_block_, values_in_block);
+      uint8_t w = bit_widths[i];
+      if (w == 0) continue;
+      for (uint32_t j = start; j < end; ++j) {
+        uint32_t adjusted = deltas[j] - min_delta;
+        bw.Append(adjusted, w);
+      }
+    }
+    bw.FlushToByte();
+    result_buffer_->Brush(payload_bytes);
+
+    values_emitted += values_in_block;
+  }
+}
+
+template <typename T>
+bool PaxDeltaEncoder<T>::SupportAppendNull() const {
+  return false;
+}
+
+template <typename T>
+void PaxDeltaEncoder<T>::Flush() {
+  // do nothing
+}
+
+// Specialized reading of one mini-block and batch writing results
+// (BitReader64Ptr)
+template <typename T>
+inline void ReadMiniBlockSpecializedPtr(BitReader64Ptr &br, T *out_values,
+                                        T &current_value, uint32_t count_in_mb,
+                                        uint32_t min_delta, uint8_t w) {
+  switch (w) {
+    case 0: {
+      for (uint32_t j = 0; j < count_in_mb; ++j) {
+        current_value =
+            static_cast<T>(static_cast<uint64_t>(current_value) + min_delta);
+        out_values[j] = current_value;
+      }
+      return;
+    }
+    case 8: {
+      for (uint32_t j = 0; j < count_in_mb; ++j) {
+        uint32_t adjusted = br.Read(8);
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       adjusted + min_delta);
+        out_values[j] = current_value;
+      }
+      return;
+    }
+    case 16: {
+      for (uint32_t j = 0; j < count_in_mb; ++j) {
+        uint32_t adjusted = br.Read(16);
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       adjusted + min_delta);
+        out_values[j] = current_value;
+      }
+      return;
+    }
+    case 32: {
+      for (uint32_t j = 0; j < count_in_mb; ++j) {
+        uint32_t adjusted = br.Read(32);
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       adjusted + min_delta);
+        out_values[j] = current_value;
+      }
+      return;
+    }
+    default: {
+      uint32_t j = 0;
+      const uint32_t n4 = count_in_mb & ~3u;
+      for (; j < n4; j += 4) {
+        uint32_t a0 = br.Read(w);
+        uint32_t a1 = br.Read(w);
+        uint32_t a2 = br.Read(w);
+        uint32_t a3 = br.Read(w);
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       a0 + min_delta);
+        out_values[j] = current_value;
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       a1 + min_delta);
+        out_values[j + 1] = current_value;
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       a2 + min_delta);
+        out_values[j + 2] = current_value;
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       a3 + min_delta);
+        out_values[j + 3] = current_value;
+      }
+      for (; j < count_in_mb; ++j) {
+        uint32_t a = br.Read(w);
+        current_value = static_cast<T>(static_cast<uint64_t>(current_value) +
+                                       a + min_delta);
+        out_values[j] = current_value;
+      }
+      return;
+    }
+  }
+}
+
+// Specialized reading of one mini-block and batch writing results
+template <typename T>
+PaxDeltaDecoder<T>::PaxDeltaDecoder(
+    const PaxDecoder::DecodingOption &encoder_options)
+    : PaxDecoder(encoder_options),
+      data_buffer_(nullptr),
+      result_buffer_(nullptr) {
+  CBDB_CHECK(encoder_options.column_encode_type ==
+                 ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA,
+             cbdb::CException::kExTypeAbort,
+             fmt("PaxDeltaDecoder only support DIRECT_DELTA encoding"));
+  // TODO: if sign is true, should use zigzag encoding, now use delta encoding
+  // for offsets in non-fixed columns
+  CBDB_CHECK(encoder_options.is_sign == false,
+             cbdb::CException::kExTypeUnImplements,
+             fmt("PaxDeltaDecoder is not supported for signed data, "
+                 "will support zigzag later"));
+}
+
+template <typename T>
+PaxDecoder *PaxDeltaDecoder<T>::SetSrcBuffer(char *data, size_t data_len) {
+  if (data) {
+    data_buffer_ =
+        std::make_shared<DataBuffer<char>>(data, data_len, false, false);
+    data_buffer_->Brush(data_len);
+  }
+  return this;
+}
+
+template <typename T>
+PaxDecoder *PaxDeltaDecoder<T>::SetDataBuffer(
+    std::shared_ptr<DataBuffer<char>> result_buffer) {
+  result_buffer_ = result_buffer;
+  return this;
+}
+
+template <typename T>
+const char *PaxDeltaDecoder<T>::GetBuffer() const {
+  return result_buffer_ ? result_buffer_->GetBuffer() : nullptr;
+}
+
+template <typename T>
+size_t PaxDeltaDecoder<T>::GetBufferSize() const {
+  return result_buffer_ ? result_buffer_->Used() : 0;
+}
+
+template <typename T>
+size_t PaxDeltaDecoder<T>::Next(const char * /*not_null*/) {
+  CBDB_RAISE(cbdb::CException::kExTypeUnImplements);
+}
+
+template <typename T>
+size_t PaxDeltaDecoder<T>::Decoding() {
+  if (!data_buffer_) return 0;
+  Assert(result_buffer_);
+
+  const uint8_t *p =
+      reinterpret_cast<const uint8_t *>(data_buffer_->GetBuffer());
+  uint32_t remaining = static_cast<uint32_t>(data_buffer_->Used());
+
+  // read header: values_per_block, values_per_mini_block_, total_count,
+  // first_value
+  DeltaBlockHeader header;
+  std::memcpy(&header, p, sizeof(header));
+  p += sizeof(header);
+  remaining -= sizeof(header);
+  uint32_t values_per_block = header.value_per_block;
+  uint32_t values_per_mini_block_ = header.values_per_mini_block;
+  uint32_t total_count = header.total_count;
+
+  T first_value;
+  std::memcpy(&first_value, p, sizeof(T));
+  p += sizeof(T);
+  remaining -= sizeof(T);
+
+  // reserve output buffer
+  if (result_buffer_->Capacity() < total_count * sizeof(T)) {
+    result_buffer_->ReSize(total_count * sizeof(T));
+  }
+
+  // write first value
+  T current_value = static_cast<T>(first_value);
+  result_buffer_->Write(reinterpret_cast<char *>(&current_value), sizeof(T));
+  result_buffer_->Brush(sizeof(T));
+  uint32_t decoded = 1;
+
+  const uint32_t mini_blocks_per_block_ =
+      values_per_block / values_per_mini_block_;
+
+  while (decoded < total_count && remaining > 0) {
+    uint32_t min_delta;
+    std::memcpy(&min_delta, p, sizeof(min_delta));
+    p += sizeof(min_delta);
+    remaining -= sizeof(min_delta);
+
+    if (remaining < mini_blocks_per_block_) break;
+
+    uint8_t bit_widths[mini_blocks_per_block_] = {0};
+    for (uint32_t i = 0; i < mini_blocks_per_block_; ++i) {
+      bit_widths[i] = *p++;
+      --remaining;
+    }
+
+    uint32_t values_in_block =
+        std::min(values_per_block, total_count - decoded);
+
+    // read payload: initialize reader with remaining bytes; we'll compute
+    // consumed
+    BitReader64Ptr br(p, remaining);
+
+    for (uint32_t i = 0; i < mini_blocks_per_block_ && decoded < total_count;
+         ++i) {
+      uint32_t start = i * values_per_mini_block_;
+      if (start >= values_in_block) break;
+      uint32_t end = std::min(start + values_per_mini_block_, values_in_block);
+      uint32_t cnt = end - start;
+      uint8_t w = bit_widths[i];
+
+      T *out_base = reinterpret_cast<T *>(result_buffer_->GetAvailableBuffer());
+      ReadMiniBlockSpecializedPtr<T>(br, out_base, current_value, cnt,
+                                     min_delta, w);
+      result_buffer_->Brush(cnt * sizeof(T));
+      decoded += cnt;
+    }
+
+    br.AlignToByte();
+
+    size_t consumed = br.index;
+    p += consumed;
+    remaining -= consumed;
+  }
+
+  Assert(result_buffer_->Used() == total_count * sizeof(T));
+
+  return result_buffer_->Used();
+}
+
+template <typename T>
+size_t PaxDeltaDecoder<T>::Decoding(const char * /*not_null*/,
+                                    size_t /*not_null_len*/) {
+  CBDB_RAISE(cbdb::CException::kExTypeUnImplements);
+}
+
+template class PaxDeltaEncoder<uint32_t>;
+template class PaxDeltaDecoder<uint32_t>;
+// Add explicit instantiations for signed integral types used by CreateDecoder
+template class PaxDeltaDecoder<long>;
+template class PaxDeltaDecoder<int>;
+template class PaxDeltaDecoder<short>;
+template class PaxDeltaDecoder<signed char>;
+
+}  // namespace pax
\ No newline at end of file
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.h b/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.h
new file mode 100644
index 00000000000..7f2251201bf
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.h
@@ -0,0 +1,135 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * pax_delta_encoding.h
+ *
+ * IDENTIFICATION
+ *	  contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#pragma once
+
+#include "storage/columns/pax_encoding.h"
+#include "storage/columns/pax_decoding.h"
+#include <vector>
+
+namespace pax {
+  
+struct BitReader64 {
+    const uint8_t*& p;
+    uint32_t& remaining;
+    uint64_t bit_buffer = 0;
+    uint32_t bit_count = 0;
+
+    BitReader64(const uint8_t*& ptr, uint32_t& size) : p(ptr), remaining(size) {}
+
+    inline void Ensure(uint32_t need_bits) {
+        while (bit_count < need_bits && remaining > 0) {
+            bit_buffer |= (static_cast<uint64_t>(*p) << bit_count);
+            ++p;
+            --remaining;
+            bit_count += 8;
+        }
+    }
+
+    inline uint32_t Read(uint8_t width) {
+        if (width == 0) return 0;
+        Ensure(width);
+        uint32_t result;
+        if (width == 32) {
+            result = static_cast<uint32_t>(bit_buffer & 0xFFFFFFFFull);
+        } else {
+            result = static_cast<uint32_t>(bit_buffer & ((1ull << width) - 1));
+        }
+        bit_buffer >>= width;
+        bit_count -= width;
+        return result;
+    }
+
+    inline void AlignToByte() {
+        uint32_t drop = bit_count % 8;
+        if (drop) {
+            bit_buffer >>= drop;
+            bit_count -= drop;
+        }
+    }
+};
+
+struct DeltaBlockHeader {
+  uint32_t value_per_block;
+  uint32_t values_per_mini_block;
+  uint32_t total_count;
+};
+
+template <typename T>
+class PaxDeltaEncoder : public PaxEncoder {
+ public:
+  explicit PaxDeltaEncoder(const EncodingOption &encoder_options);
+
+  virtual void Append(char *data, size_t size) override;
+
+  virtual bool SupportAppendNull() const override;
+
+  virtual void Flush() override;
+
+  virtual size_t GetBoundSize(size_t src_len) const override;
+
+ private:
+
+  void Encode(T *data, size_t size);
+
+ private:
+  static constexpr uint32_t value_per_block_ = 128;
+  static constexpr uint32_t mini_blocks_per_block_ = 4;
+  static constexpr uint32_t values_per_mini_block_ =
+      value_per_block_ / mini_blocks_per_block_;
+
+ private:
+  bool has_append_ = false;
+  // Reusable working buffer to avoid per-block allocations during encoding
+  std::vector<uint32_t> deltas_scratch_;
+};
+
+template <typename T>
+class PaxDeltaDecoder : public PaxDecoder {
+ public:
+  explicit PaxDeltaDecoder(const PaxDecoder::DecodingOption &encoder_options);
+
+  virtual PaxDecoder *SetSrcBuffer(char *data, size_t data_len) override;
+
+  virtual PaxDecoder *SetDataBuffer(
+      std::shared_ptr<DataBuffer<char>> result_buffer) override;
+
+  virtual size_t Next(const char *not_null) override;
+
+  virtual size_t Decoding() override;
+
+  virtual size_t Decoding(const char *not_null, size_t not_null_len) override;
+
+  virtual const char *GetBuffer() const override;
+
+  virtual size_t GetBufferSize() const override;
+
+ private:
+  std::shared_ptr<DataBuffer<char>> data_buffer_;
+  std::shared_ptr<DataBuffer<char>> result_buffer_;
+};
+
+}  // namespace pax
\ No newline at end of file
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding_test.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding_test.cc
new file mode 100644
index 00000000000..031563381ee
--- /dev/null
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding_test.cc
@@ -0,0 +1,339 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * pax_delta_encoding_test.cc
+ *
+ * IDENTIFICATION
+ *	  contrib/pax_storage/src/cpp/storage/columns/pax_delta_encoding_test.cc
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "storage/columns/pax_delta_encoding.h"
+
+#include <random>
+#include <vector>
+
+#include "comm/gtest_wrappers.h"
+#include "pax_gtest_helper.h"
+
+namespace pax {
+
+class PaxDeltaEncodingTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    // Create encoding options
+    encoding_options_.column_encode_type =
+        ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+    encoding_options_.is_sign = false;
+
+    // Create decoding options
+    decoding_options_.column_encode_type =
+        ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+    decoding_options_.is_sign = false;
+  }
+
+  void TearDown() override {}
+
+  // Fast bit width calculation (0 -> 0)
+  inline uint8_t FastNumBits(uint32_t v) {
+#if defined(__GNUC__) || defined(__clang__)
+    return v == 0 ? 0 : static_cast<uint8_t>(32 - __builtin_clz(v));
+#else
+    uint8_t bits = 0;
+    while (v) {
+      ++bits;
+      v >>= 1;
+    }
+    return bits;
+#endif
+  }
+
+  // Helper function to encode and decode data
+  template <typename T>
+  std::vector<T> EncodeAndDecode(const std::vector<T> &input) {
+    // Create encoder
+    PaxDeltaEncoder<T> encoder(encoding_options_);
+
+    size_t bound_size = encoder.GetBoundSize(input.size() * sizeof(T));
+
+    encoder.SetDataBuffer(std::make_shared<DataBuffer<char>>(bound_size));
+
+    // Encode data
+    encoder.Append(reinterpret_cast<char *>(const_cast<T *>(input.data())),
+                   input.size() * sizeof(T));
+
+    // Get encoded buffer
+    const char *encoded_data = encoder.GetBuffer();
+    size_t encoded_size = encoder.GetBufferSize();
+
+    // Create decoder
+    PaxDeltaDecoder<T> decoder(decoding_options_);
+
+    // Set source buffer
+    decoder.SetSrcBuffer(const_cast<char *>(encoded_data), encoded_size);
+
+    // Create result buffer
+    auto result_buffer =
+        std::make_shared<DataBuffer<char>>(input.size() * sizeof(T));
+    decoder.SetDataBuffer(result_buffer);
+
+    // Decode
+    size_t decoded_size = decoder.Decoding();
+
+    // Convert result back to vector
+    const T *decoded_data = reinterpret_cast<const T *>(decoder.GetBuffer());
+    size_t count = decoded_size / sizeof(T);
+
+    return std::vector<T>(decoded_data, decoded_data + count);
+  }
+
+  PaxEncoder::EncodingOption encoding_options_;
+  PaxDecoder::DecodingOption decoding_options_;
+};
+
+// Test basic functionality
+TEST_F(PaxDeltaEncodingTest, BasicEncodeDecode) {
+  std::vector<uint32_t> input = {1, 2, 3, 4, 5};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test example from documentation - consecutive sequence
+TEST_F(PaxDeltaEncodingTest, ConsecutiveSequence) {
+  std::vector<uint32_t> input = {1, 2, 3, 4, 5};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+
+  // Verify deltas would be [1, 1, 1, 1] with min_delta = 1
+  // and adjusted deltas [0, 0, 0, 0] with bit_width = 0
+}
+
+// Test example from documentation - sequence with variation
+TEST_F(PaxDeltaEncodingTest, SequenceWithVariation) {
+  std::vector<uint32_t> input = {7, 5, 3, 1, 2, 3, 4, 5};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+
+  // Verify deltas would be [-2, -2, -2, 1, 1, 1, 1] with min_delta = -2
+  // Since we cast to uint32, -2 becomes a large positive number
+  // adjusted deltas would be [0, 0, 0, 3, 3, 3, 3] with bit_width = 2
+}
+
+// Test single value
+TEST_F(PaxDeltaEncodingTest, SingleValue) {
+  std::vector<uint32_t> input = {42};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test two values
+TEST_F(PaxDeltaEncodingTest, TwoValues) {
+  std::vector<uint32_t> input = {10, 15};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test large values
+TEST_F(PaxDeltaEncodingTest, LargeValues) {
+  std::vector<uint32_t> input = {1000000, 1000001, 1000002, 1000003};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test values with large deltas
+TEST_F(PaxDeltaEncodingTest, LargeDeltas) {
+  std::vector<uint32_t> input = {1, 1000, 2000, 3000};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test full block (128 values)
+TEST_F(PaxDeltaEncodingTest, FullBlock) {
+  std::vector<uint32_t> input;
+  for (uint32_t i = 0; i < 128; ++i) {
+    input.push_back(i);
+  }
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test multiple blocks
+TEST_F(PaxDeltaEncodingTest, MultipleBlocks) {
+  std::vector<uint32_t> input;
+  for (uint32_t i = 0; i < 250; ++i) {
+    input.push_back(i);
+  }
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test random data
+TEST_F(PaxDeltaEncodingTest, RandomData) {
+  std::mt19937 gen(12345);
+  std::uniform_int_distribution<uint32_t> dis(0, 1000000);
+
+  std::vector<uint32_t> input;
+  for (int i = 0; i < 100; ++i) {
+    input.push_back(dis(gen));
+  }
+
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test payload size calculation
+TEST_F(PaxDeltaEncodingTest, PayloadSizeCalculation) {
+  std::vector<uint32_t> input = {
+      1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18,
+      19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 56, 63, 89};
+  // Test the specific example: deltas [0,0,0,0,0,0,0,0,...,0,22,6,25] with
+  // bit_width 0,5,0,0
+
+  PaxDeltaEncoder<uint32_t> encoder(encoding_options_);
+  size_t bound_size = encoder.GetBoundSize(input.size() * sizeof(uint32_t));
+  encoder.SetDataBuffer(std::make_shared<DataBuffer<char>>(bound_size));
+  encoder.Append(reinterpret_cast<char *>(input.data()),
+                 input.size() * sizeof(uint32_t));
+
+  // Verify the encoded data structure manually
+  const char *encoded_data = encoder.GetBuffer();
+  size_t encoded_size = encoder.GetBufferSize();
+
+  EXPECT_GT(encoded_size, 0);
+
+  // Parse the encoded data
+  const uint8_t *p = reinterpret_cast<const uint8_t *>(encoded_data);
+
+  // Read header
+  DeltaBlockHeader header;
+  std::memcpy(&header, p, sizeof(header));
+  p += sizeof(header);
+
+  EXPECT_EQ(header.value_per_block, 128);
+  EXPECT_EQ(header.values_per_mini_block, 32);
+  EXPECT_EQ(header.total_count, input.size());
+
+  // Read first value
+  uint32_t first_value;
+  std::memcpy(&first_value, p, sizeof(first_value));
+  p += sizeof(first_value);
+  EXPECT_EQ(first_value, 1);
+
+  // Read block data
+  uint32_t min_delta;
+  std::memcpy(&min_delta, p, sizeof(min_delta));
+  p += sizeof(min_delta);
+
+  // Read allbit widths
+  uint8_t bit_widths[4];
+  for (int i = 0; i < 4; ++i) {
+    bit_widths[i] = *p++;
+  }
+
+  // bit_widths should be [0, 6, 0, 0]
+  ASSERT_EQ(bit_widths[0], 0);
+  ASSERT_EQ(bit_widths[1], 5);
+  ASSERT_EQ(bit_widths[2], 0);
+  ASSERT_EQ(bit_widths[3], 0);
+
+  // Compute payload size from bit_widths and counts
+  uint32_t values_in_block =
+      input.size() - 1;  // we constructed input with 35 deltas in first block
+  uint64_t total_bits = 0;
+  for (uint32_t i = 0; i < 4; ++i) {
+    uint32_t start = i * 32;
+    if (start >= values_in_block) break;
+    uint32_t end = std::min(start + 32u, values_in_block);
+    uint8_t w = bit_widths[i];
+    total_bits += static_cast<uint64_t>(w) * (end - start);
+  }
+  uint32_t payload_size = static_cast<uint32_t>((total_bits + 7) / 8);
+
+  // For this example, we expect payload_size = 2 bytes
+  EXPECT_EQ(payload_size, 2);
+
+  // Assert payload bitmap is correct
+  uint8_t payload[4];
+  std::memcpy(payload, p, 4);
+  p += 4;
+
+  // payload should be LSB-Last, value is(22,6,25)
+  // [0b10110, 0b00110, 0b11001]
+  EXPECT_EQ(payload[0], 0b11010110);
+  EXPECT_EQ(payload[1], 0b01100100);
+}
+
+// Test bit width calculation helper
+TEST_F(PaxDeltaEncodingTest, BitWidthCalculation) {
+  EXPECT_EQ(FastNumBits(0), 0);
+  EXPECT_EQ(FastNumBits(1), 1);
+  EXPECT_EQ(FastNumBits(2), 2);
+  EXPECT_EQ(FastNumBits(3), 2);
+  EXPECT_EQ(FastNumBits(4), 3);
+  EXPECT_EQ(FastNumBits(7), 3);
+  EXPECT_EQ(FastNumBits(8), 4);
+  EXPECT_EQ(FastNumBits(15), 4);
+  EXPECT_EQ(FastNumBits(16), 5);
+  EXPECT_EQ(FastNumBits(255), 8);
+  EXPECT_EQ(FastNumBits(256), 9);
+}
+
+// Test zero deltas (all same values)
+TEST_F(PaxDeltaEncodingTest, ZeroDeltas) {
+  std::vector<uint32_t> input = {42, 42, 42, 42, 42};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test decreasing sequence (negative deltas)
+TEST_F(PaxDeltaEncodingTest, DecreasingSequence) {
+  std::vector<uint32_t> input = {100, 90, 80, 70, 60};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test mixed pattern
+TEST_F(PaxDeltaEncodingTest, MixedPattern) {
+  std::vector<uint32_t> input = {10, 20, 15, 25, 5, 30, 1, 35};
+  auto output = EncodeAndDecode(input);
+  EXPECT_EQ(input, output);
+}
+
+// Test empty input (edge case)
+TEST_F(PaxDeltaEncodingTest, EmptyInput) {
+  std::vector<uint32_t> input = {};
+  // This should handle gracefully or throw expected exception
+  // For now, let's skip this test until we clarify expected behavior
+}
+
+// Test different data types
+TEST_F(PaxDeltaEncodingTest, DifferentTypes) {
+  // Test int32_t (with non-negative values)
+  std::vector<uint32_t> input32 = {1, 2, 3, 4, 5};
+  auto output32 = EncodeAndDecode(input32);
+  EXPECT_EQ(input32, output32);
+}
+
+}  // namespace pax
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_dict_encoding.h b/contrib/pax_storage/src/cpp/storage/columns/pax_dict_encoding.h
index e552fa7a55a..38f3ba217db 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_dict_encoding.h
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_dict_encoding.h
@@ -53,6 +53,10 @@ class PaxDictEncoder final : public PaxEncoder {
 
   void Flush() override;
 
+  size_t GetBoundSize(size_t src_len) const override {
+    CBDB_RAISE(cbdb::CException::kExTypeUnImplements);
+  }
+
  private:
   size_t AppendInternal(char *data, size_t len);
 
@@ -89,7 +93,8 @@ class PaxDictDecoder final : public PaxDecoder {
 
   PaxDecoder *SetSrcBuffer(char *data, size_t data_len) override;
 
-  PaxDecoder *SetDataBuffer(std::shared_ptr<DataBuffer<char>> result_buffer) override;
+  PaxDecoder *SetDataBuffer(
+      std::shared_ptr<DataBuffer<char>> result_buffer) override;
 
   const char *GetBuffer() const override;
 
@@ -121,8 +126,8 @@ class PaxDictDecoder final : public PaxDecoder {
 
     buffer = src_buff->GetBuffer();
 
-    index_buffer =
-        std::make_shared<DataBuffer<int32>>((int32 *)buffer, head.indexsz, false, false);
+    index_buffer = std::make_shared<DataBuffer<int32>>(
+        (int32 *)buffer, head.indexsz, false, false);
     index_buffer->BrushAll();
 
     desc_buffer = std::make_shared<DataBuffer<int32>>(
@@ -130,8 +135,8 @@ class PaxDictDecoder final : public PaxDecoder {
         false);
     desc_buffer->BrushAll();
 
-    entry_buffer = std::make_shared<DataBuffer<char>>(buffer + head.indexsz, head.dictsz,
-                                             false, false);
+    entry_buffer = std::make_shared<DataBuffer<char>>(
+        buffer + head.indexsz, head.dictsz, false, false);
     entry_buffer->BrushAll();
 
     return std::make_tuple(index_buffer, entry_buffer, desc_buffer);
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.cc
index 3a354ceec8d..b11b2b7b6bd 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.cc
@@ -33,6 +33,7 @@
 #include "comm/pax_memory.h"
 #include "storage/columns/pax_dict_encoding.h"
 #include "storage/columns/pax_rlev2_encoding.h"
+#include "storage/columns/pax_delta_encoding.h"
 
 namespace pax {
 
@@ -56,8 +57,7 @@ std::shared_ptr<PaxEncoder> PaxEncoder::CreateStreamingEncoder(
       break;
     }
     case ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA: {
-      // TODO(jiaqizho): support direct delta encoding
-      // not support yet, then direct return a nullptr(means no encoding)
+      encoder = std::make_shared<PaxDeltaEncoder<uint32_t>>(encoder_options);
       break;
     }
     case ColumnEncoding_Kind::ColumnEncoding_Kind_DEF_ENCODED: {
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.h b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.h
index 362e68caa13..465c7bf0600 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.h
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding.h
@@ -75,6 +75,8 @@ class PaxEncoder {
 
   virtual size_t GetBufferSize() const;
 
+  virtual size_t GetBoundSize(size_t src_len) const = 0;
+
   /**
    * steaming encoder
    *
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.cc
index b59a5b879c1..0f93467812b 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.cc
@@ -124,7 +124,7 @@ void PaxEncodingColumn<T>::InitDecoder() {
 }
 
 template <typename T>
-void PaxEncodingColumn<T>::Set(std::shared_ptr<DataBuffer<T>> data) {
+void PaxEncodingColumn<T>::Set(std::unique_ptr<DataBuffer<T>> data) {
   if (decoder_) {
     // should not decoding null
     if (data->Used() != 0) {
@@ -155,7 +155,7 @@ void PaxEncodingColumn<T>::Set(std::shared_ptr<DataBuffer<T>> data) {
 
     Assert(!data->IsMemTakeOver());
   } else {
-    PaxCommColumn<T>::Set(data);
+    PaxCommColumn<T>::Set(std::move(data));
   }
 }
 
@@ -175,7 +175,7 @@ std::pair<char *, size_t> PaxEncodingColumn<T>::GetBuffer() {
     if (encoder_) {
       // changed streaming encode to blocking encode
       // because we still need store a origin data in `PaxCommColumn<T>`
-      auto origin_data_buffer = PaxCommColumn<T>::data_;
+      auto origin_data_buffer = PaxCommColumn<T>::data_.get();
 
       shared_data_ = std::make_shared<DataBuffer<char>>(origin_data_buffer->Used());
       encoder_->SetDataBuffer(shared_data_);
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.h b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.h
index 773a7848f2f..5a5f1c378ba 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.h
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_column.h
@@ -44,7 +44,7 @@ class PaxEncodingColumn : public PaxCommColumn<T> {
 
   ~PaxEncodingColumn() override;
 
-  void Set(std::shared_ptr<DataBuffer<T>> data) override;
+  void Set(std::unique_ptr<DataBuffer<T>> data) override;
 
   std::pair<char *, size_t> GetBuffer() override;
 
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.cc
index 25b6d2f1d6d..359a1c483a9 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.cc
@@ -59,21 +59,37 @@ void PaxNonFixedEncodingColumn::InitEncoder() {
 }
 
 void PaxNonFixedEncodingColumn::InitOffsetStreamCompressor() {
-  Assert(encoder_options_.offsets_encode_type !=
-         ColumnEncoding_Kind::ColumnEncoding_Kind_DEF_ENCODED);
-  offsets_compressor_ = PaxCompressor::CreateBlockCompressor(
-      encoder_options_.offsets_encode_type);
+  Assert(encoder_options_.offsets_encode_type ==
+         ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA);
+
   SetOffsetsEncodeType(encoder_options_.offsets_encode_type);
   SetOffsetsCompressLevel(encoder_options_.offsets_compress_level);
+
+  PaxEncoder::EncodingOption opt = encoder_options_;
+  opt.column_encode_type =
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+  opt.is_sign = false;
+  // offsets are fixed-width, do not enable non_fixed streaming restriction
+  offsets_encoder_ = PaxEncoder::CreateStreamingEncoder(opt, false);
 }
 
 void PaxNonFixedEncodingColumn::InitOffsetStreamDecompressor() {
   Assert(decoder_options_.offsets_encode_type !=
          ColumnEncoding_Kind::ColumnEncoding_Kind_DEF_ENCODED);
-  offsets_compressor_ = PaxCompressor::CreateBlockCompressor(
-      decoder_options_.offsets_encode_type);
   SetOffsetsEncodeType(decoder_options_.offsets_encode_type);
   SetOffsetsCompressLevel(decoder_options_.offsets_compress_level);
+
+  if (decoder_options_.offsets_encode_type ==
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA) {
+    PaxDecoder::DecodingOption temp_opt = decoder_options_;
+    temp_opt.column_encode_type =
+        ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+    temp_opt.is_sign = false;
+    offsets_decoder_ = PaxDecoder::CreateDecoder<int32>(temp_opt);
+  } else {
+    offsets_compressor_ = PaxCompressor::CreateBlockCompressor(
+        decoder_options_.offsets_encode_type);
+  }
 }
 
 void PaxNonFixedEncodingColumn::InitDecoder() {
@@ -129,8 +145,8 @@ PaxNonFixedEncodingColumn::PaxNonFixedEncodingColumn(
 
 PaxNonFixedEncodingColumn::~PaxNonFixedEncodingColumn() {}
 
-void PaxNonFixedEncodingColumn::Set(std::shared_ptr<DataBuffer<char>> data,
-                                    std::shared_ptr<DataBuffer<int32>> offsets,
+void PaxNonFixedEncodingColumn::Set(std::unique_ptr<DataBuffer<char>> data,
+                                    std::unique_ptr<DataBuffer<int32>> offsets,
                                     size_t total_size) {
   bool exist_decoder;
   Assert(data && offsets);
@@ -163,15 +179,19 @@ void PaxNonFixedEncodingColumn::Set(std::shared_ptr<DataBuffer<char>> data,
       // `data_` have the same buffer with `shared_data_`
       PaxNonFixedColumn::data_->Brush(shared_data_->Used());
       // no delete the origin data
-      shared_data_ = data;
+      shared_data_ = std::move(data);
     }
   };
 
   auto offsets_decompress = [&]() {
     Assert(!compress_route_);
-    Assert(offsets_compressor_);
+    Assert(offsets_compressor_ || offsets_decoder_);
+
+    if (offsets->Used() == 0) {
+      return;
+    }
 
-    if (offsets->Used() != 0) {
+    if (offsets_compressor_) {
       auto d_size = offsets_compressor_->Decompress(
           PaxNonFixedColumn::offsets_->Start(),
           PaxNonFixedColumn::offsets_->Capacity(), offsets->Start(),
@@ -182,28 +202,42 @@ void PaxNonFixedEncodingColumn::Set(std::shared_ptr<DataBuffer<char>> data,
             fmt("Decompress failed, %s", compressor_->ErrorName(d_size)));
       }
       PaxNonFixedColumn::offsets_->Brush(d_size);
+      return;
+    }
+
+    if (offsets_decoder_) {
+      // Decode offsets using encoder for int32 stream
+      shared_offsets_data_ = std::make_shared<DataBuffer<char>>(
+          PaxNonFixedColumn::offsets_->Start(),
+          PaxNonFixedColumn::offsets_->Capacity(), false, false);
+      offsets_decoder_->SetDataBuffer(shared_offsets_data_);
+      offsets_decoder_->SetSrcBuffer(offsets->Start(), offsets->Used());
+      offsets_decoder_->Decoding();
+      PaxNonFixedColumn::offsets_->Brush(shared_offsets_data_->Used());
+      return;
     }
   };
 
   exist_decoder = compressor_ || decoder_;
+  bool has_offsets_processor = offsets_compressor_ || offsets_decoder_;
 
-  if (exist_decoder && offsets_compressor_) {
+  if (exist_decoder && has_offsets_processor) {
     data_decompress();
     offsets_decompress();
     PaxNonFixedColumn::estimated_size_ = total_size;
     PaxNonFixedColumn::next_offsets_ = -1;
-  } else if (exist_decoder && !offsets_compressor_) {
+  } else if (exist_decoder && !has_offsets_processor) {
     data_decompress();
-    PaxNonFixedColumn::offsets_ = offsets;
+    PaxNonFixedColumn::offsets_ = std::move(offsets);
     PaxNonFixedColumn::estimated_size_ = total_size;
     PaxNonFixedColumn::next_offsets_ = -1;
-  } else if (!exist_decoder && offsets_compressor_) {
-    PaxNonFixedColumn::data_ = data;
+  } else if (!exist_decoder && has_offsets_processor) {
+    PaxNonFixedColumn::data_ = std::move(data);
     offsets_decompress();
     PaxNonFixedColumn::estimated_size_ = total_size;
     PaxNonFixedColumn::next_offsets_ = -1;
   } else {  // (!compressor_ && !offsets_compressor_)
-    PaxNonFixedColumn::Set(data, offsets, total_size);
+    PaxNonFixedColumn::Set(std::move(data), std::move(offsets), total_size);
   }
 }
 
@@ -278,17 +312,17 @@ std::pair<char *, size_t> PaxNonFixedEncodingColumn::GetOffsetBuffer(
     AppendLastOffset();
   }
 
-  if (offsets_compressor_ && compress_route_) {
-    if (shared_offsets_data_) {
-      return std::make_pair(shared_offsets_data_->Start(),
-                            shared_offsets_data_->Used());
-    }
+  if (shared_offsets_data_) {
+    return std::make_pair(shared_offsets_data_->Start(),
+                          shared_offsets_data_->Used());
+  }
 
-    if (PaxNonFixedColumn::offsets_->Used() == 0) {
-      // should never append last offset again
-      return PaxNonFixedColumn::GetOffsetBuffer(false);
-    }
+  if (PaxNonFixedColumn::offsets_->Used() == 0) {
+    // should never append last offset again
+    return PaxNonFixedColumn::GetOffsetBuffer(false);
+  }
 
+  if (offsets_compressor_ && compress_route_) {
     size_t bound_size = offsets_compressor_->GetCompressBound(
         PaxNonFixedColumn::offsets_->Used());
     shared_offsets_data_ = std::make_shared<DataBuffer<char>>(bound_size);
@@ -308,6 +342,20 @@ std::pair<char *, size_t> PaxNonFixedEncodingColumn::GetOffsetBuffer(
                           shared_offsets_data_->Used());
   }
 
+  if (offsets_encoder_ && compress_route_) {
+    // For delta encoder, allocate a buffer sized by raw bytes for safety
+    size_t bound_size = offsets_encoder_->GetBoundSize(offsets_->Used());
+    shared_offsets_data_ = std::make_shared<DataBuffer<char>>(bound_size);
+    offsets_encoder_->SetDataBuffer(shared_offsets_data_);
+
+    // Encode entire offsets buffer as a single stream
+    offsets_encoder_->Append(offsets_->Start(), offsets_->Used());
+    offsets_encoder_->Flush();
+
+    return std::make_pair(shared_offsets_data_->Start(),
+                          shared_offsets_data_->Used());
+  }
+
   // no compress or uncompressed
   // should never append last offset again
   return PaxNonFixedColumn::GetOffsetBuffer(false);
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.h b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.h
index b4e956cfe4a..f5f5fd82128 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.h
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_non_fixed_column.h
@@ -42,8 +42,8 @@ class PaxNonFixedEncodingColumn : public PaxNonFixedColumn {
 
   ~PaxNonFixedEncodingColumn() override;
 
-  void Set(std::shared_ptr<DataBuffer<char>> data,
-           std::shared_ptr<DataBuffer<int32>> offsets,
+  void Set(std::unique_ptr<DataBuffer<char>> data,
+           std::unique_ptr<DataBuffer<int32>> offsets,
            size_t total_size) override;
 
   std::pair<char *, size_t> GetBuffer() override;
@@ -83,6 +83,9 @@ class PaxNonFixedEncodingColumn : public PaxNonFixedColumn {
   std::shared_ptr<DataBuffer<char>> shared_data_;
 
   std::shared_ptr<PaxCompressor> offsets_compressor_;
+  // Optional encoder/decoder for offsets stream (alternative to compression)
+  std::shared_ptr<PaxEncoder> offsets_encoder_;
+  std::shared_ptr<PaxDecoder> offsets_decoder_;
   std::shared_ptr<DataBuffer<char>> shared_offsets_data_;
 };
 
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_test.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_test.cc
index 5fa7fb7153c..b3a7ec59458 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_test.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_encoding_test.cc
@@ -1361,4 +1361,96 @@ TEST_F(PaxEncodingTest, TestEncodingWithAllNULL) {
   ASSERT_EQ(n_read, shared_dst_data->Used());
 }
 
+TEST_F(PaxEncodingTest, TestPaxDeltaEncodingBasic) {
+  std::vector<uint32_t> data_vec{100, 101, 102, 105, 106, 110, 120, 121};
+  auto shared_data = std::make_shared<DataBuffer<char>>(1024);
+  auto shared_dst_data = std::make_shared<DataBuffer<char>>(1024);
+
+  PaxEncoder::EncodingOption encoder_options;
+  encoder_options.column_encode_type =
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+  encoder_options.is_sign = false;
+  auto encoder = PaxEncoder::CreateStreamingEncoder(encoder_options);
+
+  ASSERT_TRUE(encoder);
+  encoder->SetDataBuffer(shared_data);
+  encoder->Append(reinterpret_cast<char *>(data_vec.data()), data_vec.size() * sizeof(uint32_t));
+  encoder->Flush();
+
+  ASSERT_NE(encoder->GetBuffer(), nullptr);
+  ASSERT_GT(encoder->GetBufferSize(), 0UL);
+
+  PaxDecoder::DecodingOption decoder_options;
+  decoder_options.column_encode_type =
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+  decoder_options.is_sign = false;
+
+  auto decoder = PaxDecoder::CreateDecoder<int32>(decoder_options);
+  ASSERT_TRUE(decoder);
+  decoder->SetSrcBuffer(shared_data->GetBuffer(), shared_data->Used());
+
+  decoder->SetDataBuffer(shared_dst_data);
+  decoder->Decoding();
+
+  ASSERT_EQ(shared_dst_data->Used(), data_vec.size() * sizeof(int32));
+
+  auto result_dst_data = std::make_shared<DataBuffer<int32>>(
+      reinterpret_cast<int32 *>(shared_dst_data->Start()),
+      shared_dst_data->Used(), false, false);
+
+  for (size_t i = 0; i < data_vec.size(); ++i) {
+    ASSERT_EQ((*result_dst_data)[i], static_cast<int32>(data_vec[i]));
+  }
+}
+
+TEST_F(PaxEncodingTest, TestPaxDeltaEncodingRoundTripRandom) {
+  const size_t n = 1000;
+  std::vector<uint32_t> data_vec(n);
+  std::mt19937 rng(12345);
+  std::uniform_int_distribution<uint32_t> base_dist(0, 100);
+  std::uniform_int_distribution<uint32_t> step_dist(0, 5);
+
+  data_vec[0] = base_dist(rng);
+  for (size_t i = 1; i < n; ++i) {
+    data_vec[i] = data_vec[i - 1] + step_dist(rng);
+  }
+
+  auto shared_data = std::make_shared<DataBuffer<char>>(n * sizeof(uint32_t));
+  auto shared_dst_data = std::make_shared<DataBuffer<char>>(n * sizeof(uint32_t));
+
+  PaxEncoder::EncodingOption encoder_options;
+  encoder_options.column_encode_type =
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+  encoder_options.is_sign = false;
+  auto encoder = PaxEncoder::CreateStreamingEncoder(encoder_options);
+
+  ASSERT_TRUE(encoder);
+  encoder->SetDataBuffer(shared_data);
+
+  encoder->Append(reinterpret_cast<char *>(data_vec.data()), data_vec.size() * sizeof(uint32_t));
+  encoder->Flush();
+
+  PaxDecoder::DecodingOption decoder_options;
+  decoder_options.column_encode_type =
+      ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA;
+  decoder_options.is_sign = false;
+
+  auto decoder = PaxDecoder::CreateDecoder<int32>(decoder_options);
+  ASSERT_TRUE(decoder);
+  decoder->SetSrcBuffer(shared_data->GetBuffer(), shared_data->Used());
+
+  decoder->SetDataBuffer(shared_dst_data);
+  decoder->Decoding();
+
+  ASSERT_EQ(shared_dst_data->Used(), data_vec.size() * sizeof(int32));
+
+  auto result_dst_data = std::make_shared<DataBuffer<int32>>(
+      reinterpret_cast<int32 *>(shared_dst_data->Start()),
+      shared_dst_data->Used(), false, false);
+
+  for (size_t i = 0; i < data_vec.size(); ++i) {
+    ASSERT_EQ((*result_dst_data)[i], static_cast<int32>(data_vec[i]));
+  }
+}
+
 }  // namespace pax::tests
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_rlev2_encoding.h b/contrib/pax_storage/src/cpp/storage/columns/pax_rlev2_encoding.h
index 7d021a1f1cf..f2197258b69 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_rlev2_encoding.h
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_rlev2_encoding.h
@@ -49,6 +49,10 @@ class PaxOrcEncoder final : public PaxEncoder {
 
   void Flush() override;
 
+  size_t GetBoundSize(size_t src_len) const override {
+    CBDB_RAISE(cbdb::CException::kExTypeUnImplements);
+  }
+
  private:
   struct EncoderContext {
     bool is_sign;
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.cc b/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.cc
index aaf514f5926..8f3aafae2c4 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.cc
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.cc
@@ -348,7 +348,7 @@ void PaxVecNonFixedEncodingColumn::Set(
     PaxVecNonFixedColumn::estimated_size_ = total_size;
     PaxVecNonFixedColumn::next_offsets_ = -1;
   } else {  // (!compressor_ && !offsets_compressor_)
-    PaxVecNonFixedColumn::Set(data, offsets_, total_size, non_null_rows);
+    PaxVecNonFixedColumn::Set(data, offsets, total_size, non_null_rows);
   }
 }
 
diff --git a/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.h b/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.h
index 4362312a5a9..524ddca261a 100644
--- a/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.h
+++ b/contrib/pax_storage/src/cpp/storage/columns/pax_vec_encoding_column.h
@@ -112,6 +112,9 @@ class PaxVecNonFixedEncodingColumn : public PaxVecNonFixedColumn {
   std::shared_ptr<DataBuffer<char>> shared_data_;
 
   std::shared_ptr<PaxCompressor> offsets_compressor_;
+  // Optional encoder/decoder for offsets stream (alternative to compression)
+  std::shared_ptr<PaxEncoder> offsets_encoder_;
+  std::shared_ptr<PaxDecoder> offsets_decoder_;
   std::shared_ptr<DataBuffer<char>> shared_offsets_data_;
 };
 
diff --git a/contrib/pax_storage/src/cpp/storage/file_system.cc b/contrib/pax_storage/src/cpp/storage/file_system.cc
index fa0667241e8..2ac4803ba8c 100644
--- a/contrib/pax_storage/src/cpp/storage/file_system.cc
+++ b/contrib/pax_storage/src/cpp/storage/file_system.cc
@@ -65,4 +65,14 @@ void File::PWriteN(const void *buf, size_t count, off64_t offset) {
                  "errno=%d], %s",
                  offset, count, num, errno, DebugString().c_str()));
 }
+
+void File::ReadBatch(const std::vector<IORequest> &requests) const {
+  if (requests.empty()) {
+    return;
+  }
+  for (const auto &req : requests) {
+    PReadN(req.buffer, req.size, req.offset);
+  }
+}
+
 }  // namespace pax
diff --git a/contrib/pax_storage/src/cpp/storage/file_system.h b/contrib/pax_storage/src/cpp/storage/file_system.h
index ca1af8877cc..6569ee3b858 100644
--- a/contrib/pax_storage/src/cpp/storage/file_system.h
+++ b/contrib/pax_storage/src/cpp/storage/file_system.h
@@ -33,6 +33,7 @@
 #include <string>
 #include <vector>
 
+#include "comm/common_io.h"
 #include "comm/pax_memory.h"
 
 namespace pax {
@@ -74,6 +75,7 @@ class File {
   virtual void WriteN(const void *ptr, size_t n);
   virtual void PWriteN(const void *buf, size_t count, off_t offset);
   virtual void PReadN(void *buf, size_t count, off_t offset) const;
+  virtual void ReadBatch(const std::vector<IORequest> &requests) const;
 
   virtual void Flush() = 0;
   virtual void Delete() = 0;
diff --git a/contrib/pax_storage/src/cpp/storage/filter/pax_filter.cc b/contrib/pax_storage/src/cpp/storage/filter/pax_filter.cc
index d7f752a33ec..5f19ab58400 100644
--- a/contrib/pax_storage/src/cpp/storage/filter/pax_filter.cc
+++ b/contrib/pax_storage/src/cpp/storage/filter/pax_filter.cc
@@ -44,11 +44,12 @@ namespace pax {
 PaxFilter::PaxFilter() : sparse_filter_(nullptr), row_filter_(nullptr) {}
 
 void PaxFilter::InitSparseFilter(Relation relation, List *quals,
+                                 ScanKey key, int nkeys,
                                  bool allow_fallback_to_pg) {
   Assert(!sparse_filter_);
   sparse_filter_ =
       std::make_shared<PaxSparseFilter>(relation, allow_fallback_to_pg);
-  sparse_filter_->Initialize(quals);
+  sparse_filter_->Initialize(quals, key, nkeys);
 }
 
 #ifdef VEC_BUILD
diff --git a/contrib/pax_storage/src/cpp/storage/filter/pax_filter.h b/contrib/pax_storage/src/cpp/storage/filter/pax_filter.h
index 467b841ec89..ebc2fff8538 100644
--- a/contrib/pax_storage/src/cpp/storage/filter/pax_filter.h
+++ b/contrib/pax_storage/src/cpp/storage/filter/pax_filter.h
@@ -50,7 +50,7 @@ class PaxFilter final {
   ~PaxFilter() = default;
 
   // The sparse filter
-  void InitSparseFilter(Relation relation, List *quals,
+  void InitSparseFilter(Relation relation, List *quals, ScanKey key, int nkeys,
                         bool allow_fallback_to_pg = false);
 #ifdef VEC_BUILD
   void InitSparseFilter(
diff --git a/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h b/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h
index 504878c4dd2..6efa59a7ff6 100644
--- a/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h
+++ b/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h
@@ -65,7 +65,7 @@ class PaxSparseFilter final {
 
   bool ExistsFilterPath() const;
 
-  void Initialize(List *quals);
+  void Initialize(List *quals, ScanKey key, int nkeys);
 
 #ifdef VEC_BUILD
   void Initialize(
@@ -83,6 +83,8 @@ class PaxSparseFilter final {
  private:
 #endif
 
+  std::shared_ptr<PFTNode> ProcessScanKey(ScanKey key);
+
   // Used to build the filter tree with the PG quals
   std::shared_ptr<PFTNode> ExprWalker(Expr *expr);
   Expr *ExprFlatVar(Expr *expr);
diff --git a/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_pg_path.cc b/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_pg_path.cc
index 0630db6dc21..3a7bc64f389 100644
--- a/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_pg_path.cc
+++ b/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_pg_path.cc
@@ -36,7 +36,7 @@
 
 namespace pax {
 
-void PaxSparseFilter::Initialize(List *quals) {
+void PaxSparseFilter::Initialize(List *quals, ScanKey key, int nkeys) {
   ListCell *qual_cell;
   std::vector<std::shared_ptr<PFTNode>> fl_nodes; /* first level nodes */
   std::string origin_tree_str;
@@ -44,10 +44,27 @@ void PaxSparseFilter::Initialize(List *quals) {
   // no inited
   Assert(!filter_tree_);
 
-  if (!quals) {
+  if (!quals && nkeys == 0) {
     return;
   }
 
+  // walk scan key and only support min/max filter now
+  for (int i = 0; i < nkeys; i++) {
+    // TODO: support bloom filter in PaxFilter
+    // but now just skip it, SeqNext() will check bloom filter in PassByBloomFilter()
+    if (key[i].sk_flags & SK_BLOOM_FILTER) {
+      continue;
+    }
+
+    if (key[i].sk_strategy != BTGreaterEqualStrategyNumber &&
+        key[i].sk_strategy != BTLessEqualStrategyNumber) {
+      continue;
+    }
+    std::shared_ptr<PFTNode> fl_node = ProcessScanKey(&key[i]);
+    Assert(fl_node);
+    fl_nodes.emplace_back(std::move(fl_node));
+  }
+
   foreach (qual_cell, quals) {
     Expr *fl_clause = (Expr *)lfirst(qual_cell);
     std::shared_ptr<PFTNode> fl_node = ExprWalker(fl_clause);
@@ -67,6 +84,47 @@ void PaxSparseFilter::Initialize(List *quals) {
              origin_tree_str.c_str(), DebugString().c_str());
 }
 
+std::shared_ptr<PFTNode> PaxSparseFilter::ProcessScanKey(ScanKey key) {
+  std::shared_ptr<PFTNode> node = nullptr;
+  Assert(key);
+  Assert(!(key->sk_flags & SK_BLOOM_FILTER));
+  Assert(key->sk_strategy == BTGreaterEqualStrategyNumber ||
+         key->sk_strategy == BTLessEqualStrategyNumber);
+  Assert(key->sk_attno > 0 &&
+         key->sk_attno <= RelationGetNumberOfAttributes(rel_));
+
+  AttrNumber attno = key->sk_attno;
+
+  // Build VarNode on the left
+  auto var_node = std::make_shared<VarNode>();
+  var_node->attrno = attno;
+
+  // Build ConstNode on the right from ScanKey
+  auto const_node = std::make_shared<ConstNode>();
+  const_node->const_val = key->sk_argument;
+  const_node->const_type = key->sk_subtype;
+  if (key->sk_flags & SK_ISNULL) {
+    const_node->sk_flags |= SK_ISNULL;
+  }
+
+  // Build OpNode and attach children: (var, const)
+  auto op_node = std::make_shared<OpNode>();
+  op_node->strategy = key->sk_strategy;
+  op_node->collation = key->sk_collation;  // may be InvalidOid; executor will
+                                           // fallback to attr collation
+
+  // Set operand types
+  Form_pg_attribute attr = TupleDescAttr(RelationGetDescr(rel_), attno - 1);
+  op_node->left_typid = attr->atttypid;
+  op_node->right_typid = key->sk_subtype;
+
+  PFTNode::AppendSubNode(op_node, std::move(var_node));
+  PFTNode::AppendSubNode(op_node, std::move(const_node));
+
+  node = op_node;
+  return node;
+}
+
 Expr *PaxSparseFilter::ExprFlatVar(Expr *clause) {
   Expr *flat_clause = clause;
   if (unlikely(!clause)) {
diff --git a/contrib/pax_storage/src/cpp/storage/local_file_system.cc b/contrib/pax_storage/src/cpp/storage/local_file_system.cc
index 1c71eceb7a9..82afafbfcfd 100644
--- a/contrib/pax_storage/src/cpp/storage/local_file_system.cc
+++ b/contrib/pax_storage/src/cpp/storage/local_file_system.cc
@@ -35,6 +35,7 @@
 
 #include "access/pax_access_handle.h"
 #include "comm/cbdb_wrappers.h"
+#include "comm/fast_io.h"
 #include "comm/fmt.h"
 #include "comm/pax_memory.h"
 #include "comm/pax_resource.h"
@@ -51,6 +52,7 @@ class LocalFile final : public File {
   ssize_t Write(const void *ptr, size_t n) override;
   ssize_t PWrite(const void *ptr, size_t n, off_t offset) override;
   ssize_t PRead(void *ptr, size_t n, off_t offset) const override;
+  void ReadBatch(const std::vector<IORequest> &requests) const override;
   size_t FileLength() const override;
   void Flush() override;
   void Delete() override;
@@ -132,6 +134,26 @@ ssize_t LocalFile::PWrite(const void *ptr, size_t n, off_t offset) {
   return num;
 }
 
+void LocalFile::ReadBatch(const std::vector<IORequest> &requests) const {
+  if (unlikely(requests.empty())) return;
+
+  if (IOUringFastIO::available()) {
+    IOUringFastIO fast_io(requests.size());
+    std::vector<bool> result(requests.size(), false);
+    auto res = fast_io.read(fd_, const_cast<std::vector<IORequest>&>(requests), result);
+    CBDB_CHECK(res.first == 0, cbdb::CException::ExType::kExTypeIOError,
+               fmt("Fail to ReadBatch with io_uring [successful=%d, total=%lu], %s",
+                   res.second, requests.size(), DebugString().c_str()));
+  } else {
+    SyncFastIO fast_io;
+    std::vector<bool> result(requests.size(), false);
+    auto res = fast_io.read(fd_, const_cast<std::vector<IORequest>&>(requests), result);
+    CBDB_CHECK(res.first == 0, cbdb::CException::ExType::kExTypeIOError,
+               fmt("Fail to ReadBatch with sync read [successful=%d, total=%lu], %s",
+                   res.second, requests.size(), DebugString().c_str()));
+  }
+}
+
 size_t LocalFile::FileLength() const {
   struct stat file_stat {};
   int rc;
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition.cc b/contrib/pax_storage/src/cpp/storage/micro_partition.cc
index 57004d7d3b8..ead41b41f34 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition.cc
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition.cc
@@ -91,7 +91,7 @@ size_t MicroPartitionReaderProxy::GetTupleCountsInGroup(size_t group_index) {
 
 std::unique_ptr<ColumnStatsProvider>
 MicroPartitionReaderProxy::GetGroupStatsInfo(size_t group_index) {
-  return std::move(reader_->GetGroupStatsInfo(group_index));
+  return reader_->GetGroupStatsInfo(group_index);
 }
 
 std::unique_ptr<MicroPartitionReader::Group>
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition.h b/contrib/pax_storage/src/cpp/storage/micro_partition.h
index 8c71cfbd574..56d85b46a74 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition.h
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition.h
@@ -58,7 +58,6 @@ class MicroPartitionWriter {
     RelFileNode node;
     bool need_wal = false;
     std::vector<std::tuple<ColumnEncoding_Kind, int>> encoding_opts;
-    std::pair<ColumnEncoding_Kind, int> offsets_encoding_opts;
     std::vector<int> enable_min_max_col_idxs;
     std::vector<int> enable_bf_col_idxs;
 
@@ -181,7 +180,7 @@ class MicroPartitionReader {
     // fetch, compression/encoding. At the same time, pax column can also be
     // used as a general interface for internal using, because it's zero copy
     // from buffer. more details in `storage/columns`
-    virtual const std::shared_ptr<PaxColumns> &GetAllColumns() const = 0;
+    virtual const std::unique_ptr<PaxColumns> &GetAllColumns() const = 0;
 
     virtual void SetVisibilityMap(
         std::shared_ptr<Bitmap8> visibility_bitmap) = 0;
@@ -204,12 +203,10 @@ class MicroPartitionReader {
 
     std::shared_ptr<PaxFilter> filter;
 
-#ifdef VEC_BUILD
-    TupleDesc tuple_desc = nullptr;
-#endif
-
     // should only reference
     std::shared_ptr<Bitmap8> visibility_bitmap = nullptr;
+
+    TupleDesc tuple_desc = nullptr;
   };
   MicroPartitionReader() = default;
 
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.cc b/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.cc
index b1800edb012..01319e5ea86 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.cc
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.cc
@@ -38,9 +38,9 @@ namespace pax {
 std::unique_ptr<MicroPartitionReader>
 MicroPartitionFileFactory::CreateMicroPartitionReader(
     const MicroPartitionReader::ReaderOptions &options, int32 flags,
-    std::shared_ptr<File> file, std::shared_ptr<File> toast_file) {
+    std::unique_ptr<File> file, std::unique_ptr<File> toast_file) {
   std::unique_ptr<MicroPartitionReader> reader =
-      std::make_unique<OrcReader>(file, toast_file);
+      std::make_unique<OrcReader>(std::move(file), std::move(toast_file));
 
 #ifdef VEC_BUILD
   if (flags & ReaderFlags::FLAGS_VECTOR_PATH) {
@@ -63,13 +63,13 @@ MicroPartitionFileFactory::CreateMicroPartitionReader(
 std::unique_ptr<MicroPartitionWriter>
 MicroPartitionFileFactory::CreateMicroPartitionWriter(
     const MicroPartitionWriter::WriterOptions &options,
-    std::shared_ptr<File> file, std::shared_ptr<File> toast_file) {
+    std::unique_ptr<File> file, std::unique_ptr<File> toast_file) {
   std::vector<pax::porc::proto::Type_Kind> type_kinds;
   type_kinds = OrcWriter::BuildSchema(
       options.rel_tuple_desc,
       options.storage_format == PaxStorageFormat::kTypeStoragePorcVec);
-  return std::make_unique<OrcWriter>(options, std::move(type_kinds), file,
-                                     toast_file);
+  return std::make_unique<OrcWriter>(options, std::move(type_kinds),
+                                     std::move(file), std::move(toast_file));
 }
 
 }  // namespace pax
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.h b/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.h
index fbfef5a16b3..bc2f04056d2 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.h
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory.h
@@ -52,13 +52,13 @@ class MicroPartitionFileFactory final {
  public:
   static std::unique_ptr<MicroPartitionWriter> CreateMicroPartitionWriter(
       const MicroPartitionWriter::WriterOptions &options,
-      std::shared_ptr<File> file,
-      std::shared_ptr<File> toast_file = nullptr);
+      std::unique_ptr<File> file,
+      std::unique_ptr<File> toast_file = nullptr);
 
   static std::unique_ptr<MicroPartitionReader> CreateMicroPartitionReader(
       const MicroPartitionReader::ReaderOptions &options, int32 flags,
-      std::shared_ptr<File> file,
-      std::shared_ptr<File> toast_file = nullptr);
+      std::unique_ptr<File> file,
+      std::unique_ptr<File> toast_file = nullptr);
 };
 
 }  // namespace pax
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory_test.cc b/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory_test.cc
index fd66dd3f7ff..59d4bc0f6a1 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory_test.cc
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition_file_factory_test.cc
@@ -72,8 +72,8 @@ TEST_F(MicroPartitionFileFactoryTest, CreateMicroPartitionWriter) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   std::vector<std::tuple<ColumnEncoding_Kind, int>> types_encoding;
   types_encoding.emplace_back(
@@ -88,7 +88,7 @@ TEST_F(MicroPartitionFileFactoryTest, CreateMicroPartitionWriter) {
   writer_options.encoding_opts = types_encoding;
 
   auto writer = MicroPartitionFileFactory::CreateMicroPartitionWriter(
-      writer_options, file_ptr);
+      writer_options, std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
   writer->Close();
@@ -101,8 +101,8 @@ TEST_F(MicroPartitionFileFactoryTest, CreateMicroPartitionReader) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   std::vector<std::tuple<ColumnEncoding_Kind, int>> types_encoding;
   types_encoding.emplace_back(
@@ -117,7 +117,7 @@ TEST_F(MicroPartitionFileFactoryTest, CreateMicroPartitionReader) {
   writer_options.encoding_opts = types_encoding;
 
   auto writer = MicroPartitionFileFactory::CreateMicroPartitionWriter(
-      writer_options, file_ptr);
+      writer_options, std::move(file_ptr));
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
 
   writer->WriteTuple(tuple_slot);
@@ -130,7 +130,7 @@ TEST_F(MicroPartitionFileFactoryTest, CreateMicroPartitionReader) {
   int32 flags = FLAGS_EMPTY;
 
   auto reader = MicroPartitionFileFactory::CreateMicroPartitionReader(
-      reader_options, flags, file_ptr);
+      reader_options, flags, std::move(file_ptr));
   reader->ReadTuple(tuple_slot_empty);
   EXPECT_TRUE(VerifyTestTupleTableSlot(tuple_slot_empty));
 
@@ -145,8 +145,8 @@ TEST_F(MicroPartitionFileFactoryTest, OrcReadWithVisibilitymap) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   std::vector<std::tuple<ColumnEncoding_Kind, int>> types_encoding;
   types_encoding.emplace_back(
@@ -161,7 +161,7 @@ TEST_F(MicroPartitionFileFactoryTest, OrcReadWithVisibilitymap) {
   writer_options.encoding_opts = types_encoding;
 
   auto writer = MicroPartitionFileFactory::CreateMicroPartitionWriter(
-      writer_options, file_ptr);
+      writer_options, std::move(file_ptr));
 
   int tuple_count = 1000;
   for (int i = 0; i < tuple_count; i++) {
@@ -186,7 +186,7 @@ TEST_F(MicroPartitionFileFactoryTest, OrcReadWithVisibilitymap) {
 
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot();
   auto reader = MicroPartitionFileFactory::CreateMicroPartitionReader(
-      reader_options, flags, file_ptr);
+      reader_options, flags, std::move(file_ptr));
 
   int read_tuple_count = 0;
   while (reader->ReadTuple(tuple_slot_empty)) {
@@ -210,8 +210,8 @@ TEST_F(MicroPartitionFileFactoryTest, VecReadWithVisibilitymap) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   std::vector<std::tuple<ColumnEncoding_Kind, int>> types_encoding;
   types_encoding.emplace_back(
@@ -226,7 +226,7 @@ TEST_F(MicroPartitionFileFactoryTest, VecReadWithVisibilitymap) {
   writer_options.encoding_opts = types_encoding;
 
   auto writer = MicroPartitionFileFactory::CreateMicroPartitionWriter(
-      writer_options, file_ptr);
+      writer_options, std::move(file_ptr));
 
   int tuple_count = 1000;
   for (int i = 0; i < tuple_count; i++) {
@@ -264,7 +264,7 @@ TEST_F(MicroPartitionFileFactoryTest, VecReadWithVisibilitymap) {
       CreateVecEmptyTupleSlot(tuple_slot->tts_tupleDescriptor);
 
   auto reader = MicroPartitionFileFactory::CreateMicroPartitionReader(
-      reader_options, flags, file_ptr);
+      reader_options, flags, std::move(file_ptr));
 
   auto ret = reader->ReadTuple(read_tuple_slot);
   ASSERT_TRUE(ret);
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition_iterator.cc b/contrib/pax_storage/src/cpp/storage/micro_partition_iterator.cc
index 9c9a1f8c8cd..bb9590ca5e9 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition_iterator.cc
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition_iterator.cc
@@ -164,7 +164,7 @@ MicroPartitionMetadata MicroPartitionInfoIterator::Next() {
   Assert(tuple);
 
   tuple_ = nullptr;
-  return std::move(ToValue(tuple));
+  return ToValue(tuple);
 }
 
 void MicroPartitionInfoIterator::Rewind() {
@@ -375,7 +375,7 @@ MicroPartitionMetadata MicroPartitionInfoParallelIterator::Next() {
   Assert(tuple);
 
   tuple_ = nullptr;
-  return std::move(ToValue(tuple));
+  return ToValue(tuple);
 }
 
 void MicroPartitionInfoParallelIterator::Rewind() {
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition_stats.cc b/contrib/pax_storage/src/cpp/storage/micro_partition_stats.cc
index b18ab952527..53342ad0e2a 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition_stats.cc
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition_stats.cc
@@ -173,7 +173,6 @@ static bool PrepareStatisticsInfoCombine(
 
     auto attr = TupleDescAttr(desc, i);
     auto collation = attr->attcollation;
-    FmgrInfo finfo;
     bool get_pg_oper_succ = false;
 
     funcs.emplace_back(std::make_pair(nullptr, nullptr));
@@ -207,7 +206,6 @@ static bool PrepareStatisticsInfoCombine(
 
       GetStrategyProcinfo(attr->atttypid, attr->atttypid, funcs[i]);
       if (allow_fallback_to_pg) {
-        finfos[i] = {finfo, finfo};
         get_pg_oper_succ =
             GetStrategyProcinfo(attr->atttypid, attr->atttypid, finfos[i]);
       }
diff --git a/contrib/pax_storage/src/cpp/storage/micro_partition_stats_test.cc b/contrib/pax_storage/src/cpp/storage/micro_partition_stats_test.cc
index a589a3971fa..c18aa491432 100644
--- a/contrib/pax_storage/src/cpp/storage/micro_partition_stats_test.cc
+++ b/contrib/pax_storage/src/cpp/storage/micro_partition_stats_test.cc
@@ -51,36 +51,10 @@ TEST_F(MicroPartitionStatsTest, MicroPartitionStatsInfoCombine) {
       cbdb::Palloc0(sizeof(TupleDescData) + sizeof(FormData_pg_attribute) * 4));
 
   tuple_desc->natts = 4;
-  tuple_desc->attrs[0] = {.atttypid = INT4OID,
-                          .attlen = 4,
-                          .attbyval = true,
-                          .attalign = TYPALIGN_INT,
-                          .attstorage = TYPSTORAGE_PLAIN,
-                          .attisdropped = false,
-                          .attcollation = InvalidOid};
-
-  tuple_desc->attrs[1] = {.atttypid = TEXTOID,
-                          .attlen = -1,
-                          .attbyval = false,
-                          .attalign = TYPALIGN_DOUBLE,
-                          .attstorage = TYPSTORAGE_PLAIN,
-                          .attisdropped = false,
-                          .attcollation = DEFAULT_COLLATION_OID};
-
-  tuple_desc->attrs[2] = {.atttypid = INT4OID,
-                          .attlen = 4,
-                          .attbyval = true,
-                          .attalign = TYPALIGN_INT,
-                          .attstorage = TYPSTORAGE_PLAIN,
-                          .attisdropped = false,
-                          .attcollation = InvalidOid};
-  tuple_desc->attrs[3] = {.atttypid = INT4OID,
-                          .attlen = 4,
-                          .attbyval = true,
-                          .attalign = TYPALIGN_INT,
-                          .attstorage = TYPSTORAGE_PLAIN,
-                          .attisdropped = false,
-                          .attcollation = InvalidOid};
+  InitAttribute_int4(&tuple_desc->attrs[0]);
+  InitAttribute_text(&tuple_desc->attrs[1]);
+  InitAttribute_int4(&tuple_desc->attrs[2]);
+  InitAttribute_int4(&tuple_desc->attrs[3]);
 
   auto col_stats1_1 = mp_stats_info1.add_columnstats();
   auto col_stats1_2 = mp_stats_info1.add_columnstats();
@@ -304,4 +278,4 @@ TEST_F(MicroPartitionStatsTest, MicroPartitionStatsInfoCombine) {
   ASSERT_EQ(min_datum, cbdb::Int32ToDatum(50));
 }
 
-}  // namespace pax::tests
\ No newline at end of file
+}  // namespace pax::tests
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_dump_reader.cpp b/contrib/pax_storage/src/cpp/storage/orc/orc_dump_reader.cpp
index 16f8f93a833..f1f1eefd1df 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_dump_reader.cpp
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_dump_reader.cpp
@@ -91,8 +91,8 @@ OrcDumpReader::OrcDumpReader(DumpConfig *config)
 bool OrcDumpReader::Open() {
   FileSystem *fs = nullptr;
   std::shared_ptr<FileSystemOptions> fs_opt;
-  std::shared_ptr<File> open_file;
-  std::shared_ptr<File> open_toast_file;
+  std::unique_ptr<File> open_file;
+  std::unique_ptr<File> open_toast_file;
 
   assert(config_);
   assert(config_->file_name);
@@ -111,7 +111,7 @@ bool OrcDumpReader::Open() {
     }
   }
 
-  format_reader_ = new OrcFormatReader(open_file, open_toast_file);
+  format_reader_ = new OrcFormatReader(std::move(open_file), std::move(open_toast_file));
   format_reader_->Open();
 
   return true;
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.cc b/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.cc
index 7ee6df8ef08..ad1736f4f08 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.cc
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.cc
@@ -35,8 +35,8 @@
 
 namespace pax {
 
-OrcFormatReader::OrcFormatReader(std::shared_ptr<File> file,
-                                 std::shared_ptr<File> toast_file)
+OrcFormatReader::OrcFormatReader(std::unique_ptr<File> file,
+                                 std::unique_ptr<File> toast_file)
     : file_(std::move(file)),
       toast_file_(std::move(toast_file)),
       reused_buffer_(nullptr),
@@ -327,6 +327,7 @@ pax::porc::proto::StripeFooter OrcFormatReader::ReadStripeWithProjection(
 
   batch_offset = stripe_footer_offset;
 
+  std::vector<IORequest> io_requests;
   while (index < column_types_.size()) {
     // Current column have been skipped
     // Move `batch_offset` and `streams_index` to the right position
@@ -398,10 +399,17 @@ pax::porc::proto::StripeFooter OrcFormatReader::ReadStripeWithProjection(
       continue;
     }
 
-    file_->PReadN(data_buffer->GetAvailableBuffer(), batch_len, batch_offset);
+    {
+      IORequest io_request;
+      io_request.offset = batch_offset;
+      io_request.size = batch_len;
+      io_request.buffer = data_buffer->GetAvailableBuffer();
+      io_requests.emplace_back(io_request);
+    }
     data_buffer->Brush(batch_len);
     batch_offset += batch_len;
   }
+  file_->ReadBatch(io_requests);
 
   return stripe_footer;
 }
@@ -413,14 +421,14 @@ static std::unique_ptr<PaxColumn> BuildEncodingColumn(
     const ColumnEncoding &data_encoding, bool is_vec) {
   uint32 not_null_rows = 0;
   uint64 data_stream_len = 0;
-  std::shared_ptr<DataBuffer<T>> data_stream_buffer;
+  std::unique_ptr<DataBuffer<T>> data_stream_buffer;
 
   Assert(data_stream.kind() == pax::porc::proto::Stream_Kind_DATA);
 
   not_null_rows = static_cast<uint32>(data_stream.column());
   data_stream_len = static_cast<uint64>(data_stream.length());
 
-  data_stream_buffer = std::make_shared<DataBuffer<T>>(
+  data_stream_buffer = std::make_unique<DataBuffer<T>>(
       reinterpret_cast<T *>(data_buffer->GetAvailableBuffer()), data_stream_len,
       false, false);
 
@@ -443,7 +451,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingColumn(
     auto pax_column =
         traits::ColumnOptCreateTraits<PaxVecEncodingColumn, T>::create_decoding(
             alloc_size, decoding_option);
-    pax_column->Set(data_stream_buffer, (size_t)not_null_rows);
+    pax_column->Set(std::move(data_stream_buffer), (size_t)not_null_rows);
     return pax_column;
   } else {
     AssertImply(data_encoding.kind() ==
@@ -455,7 +463,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingColumn(
     auto pax_column =
         traits::ColumnOptCreateTraits<PaxEncodingColumn, T>::create_decoding(
             alloc_size, decoding_option);
-    pax_column->Set(data_stream_buffer);
+    pax_column->Set(std::move(data_stream_buffer));
     return pax_column;
   }
 }
@@ -466,14 +474,14 @@ static std::unique_ptr<PaxColumn> BuildEncodingBitPackedColumn(
     bool is_vec) {
   uint32 not_null_rows = 0;
   uint64 column_data_len = 0;
-  std::shared_ptr<DataBuffer<int8>> column_data_buffer;
+  std::unique_ptr<DataBuffer<int8>> column_data_buffer;
 
   Assert(data_stream.kind() == pax::porc::proto::Stream_Kind_DATA);
 
   not_null_rows = static_cast<uint32>(data_stream.column());
   column_data_len = static_cast<uint64>(data_stream.length());
 
-  column_data_buffer = std::make_shared<DataBuffer<int8>>(
+  column_data_buffer = std::make_unique<DataBuffer<int8>>(
       reinterpret_cast<int8 *>(data_buffer->GetAvailableBuffer()),
       column_data_len, false, false);
 
@@ -496,7 +504,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingBitPackedColumn(
     auto pax_column =
         traits::ColumnOptCreateTraits2<PaxVecBitPackedColumn>::create_decoding(
             alloc_size, decoding_option);
-    pax_column->Set(column_data_buffer, (size_t)not_null_rows);
+    pax_column->Set(std::move(column_data_buffer), (size_t)not_null_rows);
     return pax_column;
   } else {
     AssertImply(data_encoding.kind() ==
@@ -508,7 +516,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingBitPackedColumn(
     auto pax_column =
         traits::ColumnOptCreateTraits2<PaxBitPackedColumn>::create_decoding(
             alloc_size, decoding_option);
-    pax_column->Set(column_data_buffer);
+    pax_column->Set(std::move(column_data_buffer));
     return pax_column;
   }
 }
@@ -521,8 +529,8 @@ static std::unique_ptr<PaxColumn> BuildEncodingDecimalColumn(
   uint32 not_null_rows = 0;
   uint64 offset_stream_len = 0;
   uint64 data_stream_len = 0;
-  std::shared_ptr<DataBuffer<int32>> offset_stream_buffer;
-  std::shared_ptr<DataBuffer<char>> data_stream_buffer;
+  std::unique_ptr<DataBuffer<int32>> offset_stream_buffer;
+  std::unique_ptr<DataBuffer<char>> data_stream_buffer;
   std::unique_ptr<PaxNonFixedColumn> pax_column;
   uint64 padding = 0;
 
@@ -530,7 +538,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingDecimalColumn(
   offset_stream_len = static_cast<uint64>(len_stream.length());
   padding = len_stream.padding();
 
-  offset_stream_buffer = std::make_shared<DataBuffer<int32>>(
+  offset_stream_buffer = std::make_unique<DataBuffer<int32>>(
       reinterpret_cast<int32 *>(data_buffer->GetAvailableBuffer()),
       offset_stream_len, false, false);
 
@@ -560,7 +568,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingDecimalColumn(
   }
 #endif
 
-  data_stream_buffer = std::make_shared<DataBuffer<char>>(
+  data_stream_buffer = std::make_unique<DataBuffer<char>>(
       data_buffer->GetAvailableBuffer(), data_stream_len, false, false);
   data_stream_buffer->BrushAll();
   data_buffer->Brush(data_stream_len);
@@ -591,7 +599,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingDecimalColumn(
           data_cap, offsets_cap, std::move(decoding_option));
 
   // current memory will be freed in pax_columns->data_
-  pax_column->Set(data_stream_buffer, offset_stream_buffer, data_stream_len);
+  pax_column->Set(std::move(data_stream_buffer), std::move(offset_stream_buffer), data_stream_len);
   return pax_column;
 }
 
@@ -601,7 +609,7 @@ static std::unique_ptr<PaxColumn> BuildVecEncodingDecimalColumn(
     const ColumnEncoding &data_encoding, bool is_vec) {
   uint32 not_null_rows = 0;
   uint64 data_stream_len = 0;
-  std::shared_ptr<DataBuffer<int8>> data_stream_buffer;
+  std::unique_ptr<DataBuffer<int8>> data_stream_buffer;
 
   CBDB_CHECK(is_vec, cbdb::CException::ExType::kExTypeLogicError);
 
@@ -610,7 +618,7 @@ static std::unique_ptr<PaxColumn> BuildVecEncodingDecimalColumn(
   not_null_rows = static_cast<uint32>(data_stream.column());
   data_stream_len = static_cast<uint64>(data_stream.length());
 
-  data_stream_buffer = std::make_shared<DataBuffer<int8>>(
+  data_stream_buffer = std::make_unique<DataBuffer<int8>>(
       reinterpret_cast<int8 *>(data_buffer->GetAvailableBuffer()),
       data_stream_len, false, false);
 
@@ -630,7 +638,7 @@ static std::unique_ptr<PaxColumn> BuildVecEncodingDecimalColumn(
 
   auto pax_column = traits::ColumnOptCreateTraits2<PaxShortNumericColumn>::  //
       create_decoding(alloc_size, decoding_option);
-  pax_column->Set(data_stream_buffer, (size_t)not_null_rows);
+  pax_column->Set(std::move(data_stream_buffer), (size_t)not_null_rows);
 
   return pax_column;
 }
@@ -644,8 +652,8 @@ static std::unique_ptr<PaxColumn> BuildEncodingVecNonFixedColumn(
   uint64 offset_stream_len = 0;
   uint64 padding = 0;
   uint64 data_stream_len = 0;
-  std::shared_ptr<DataBuffer<int32>> offset_stream_buffer;
-  std::shared_ptr<DataBuffer<char>> data_stream_buffer;
+  std::unique_ptr<DataBuffer<int32>> offset_stream_buffer;
+  std::unique_ptr<DataBuffer<char>> data_stream_buffer;
   std::unique_ptr<PaxVecNonFixedColumn> pax_column;
   PaxDecoder::DecodingOption decoding_option;
   size_t data_cap, offsets_cap;
@@ -658,7 +666,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingVecNonFixedColumn(
   offset_stream_len = static_cast<uint64>(len_stream.length());
   padding = len_stream.padding();
 
-  offset_stream_buffer = std::make_shared<DataBuffer<int32>>(
+  offset_stream_buffer = std::make_unique<DataBuffer<int32>>(
       reinterpret_cast<int32 *>(data_buffer->GetAvailableBuffer()),
       offset_stream_len, false, false);
 
@@ -676,7 +684,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingVecNonFixedColumn(
   }
 
   data_buffer->Brush(offset_stream_len);
-  data_stream_buffer = std::make_shared<DataBuffer<char>>(
+  data_stream_buffer = std::make_unique<DataBuffer<char>>(
       data_buffer->GetAvailableBuffer(), data_stream_len, false, false);
 
   decoding_option.column_encode_type = data_encoding.kind();
@@ -730,7 +738,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingVecNonFixedColumn(
           create_decoding(data_cap, offsets_cap, std::move(decoding_option));
     }
   }
-  pax_column->Set(data_stream_buffer, offset_stream_buffer, data_stream_len,
+  pax_column->Set(std::move(data_stream_buffer), std::move(offset_stream_buffer), data_stream_len,
                   not_null_rows);
   return pax_column;
 }
@@ -743,8 +751,8 @@ static std::unique_ptr<PaxColumn> BuildEncodingNonFixedColumn(
   [[maybe_unused]] uint32 not_null_rows = 0;
   uint64 offset_stream_len = 0;
   uint64 data_stream_len = 0;
-  std::shared_ptr<DataBuffer<int32>> offset_stream_buffer;
-  std::shared_ptr<DataBuffer<char>> data_stream_buffer;
+  std::unique_ptr<DataBuffer<int32>> offset_stream_buffer;
+  std::unique_ptr<DataBuffer<char>> data_stream_buffer;
   std::unique_ptr<PaxNonFixedColumn> pax_column;
   uint64 padding = 0;
   PaxDecoder::DecodingOption decoding_option;
@@ -754,7 +762,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingNonFixedColumn(
   offset_stream_len = static_cast<uint64>(len_stream.length());
   padding = len_stream.padding();
 
-  offset_stream_buffer = std::make_shared<DataBuffer<int32>>(
+  offset_stream_buffer = std::make_unique<DataBuffer<int32>>(
       reinterpret_cast<int32 *>(data_buffer->GetAvailableBuffer()),
       offset_stream_len, false, false);
 
@@ -776,7 +784,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingNonFixedColumn(
   }
 #endif
 
-  data_stream_buffer = std::make_shared<DataBuffer<char>>(
+  data_stream_buffer = std::make_unique<DataBuffer<char>>(
       data_buffer->GetAvailableBuffer(), data_stream_len, false, false);
   data_stream_buffer->BrushAll();
   data_buffer->Brush(data_stream_len);
@@ -819,7 +827,7 @@ static std::unique_ptr<PaxColumn> BuildEncodingNonFixedColumn(
   }
 
   // current memory will be freed in pax_columns->data_
-  pax_column->Set(data_stream_buffer, offset_stream_buffer, data_stream_len);
+  pax_column->Set(std::move(data_stream_buffer), std::move(offset_stream_buffer), data_stream_len);
   return pax_column;
 }
 
@@ -899,7 +907,7 @@ std::unique_ptr<PaxColumns> OrcFormatReader::ReadStripe(
       continue;
     }
 
-    std::shared_ptr<Bitmap8> non_null_bitmap;
+    std::unique_ptr<Bitmap8> non_null_bitmap;
     bool has_null = stripe_info.colstats(index).hasnull();
     if (has_null) {
       const pax::porc::proto::Stream &non_null_stream =
@@ -909,9 +917,7 @@ std::unique_ptr<PaxColumns> OrcFormatReader::ReadStripe(
           reinterpret_cast<uint8 *>(data_buffer->GetAvailableBuffer());
 
       Assert(non_null_stream.kind() == pax::porc::proto::Stream_Kind_PRESENT);
-      non_null_bitmap =
-          std::make_shared<Bitmap8>(BitmapRaw<uint8>(bm_bytes, bm_nbytes),
-                                    BitmapTpl<uint8>::ReadOnlyRefBitmap);
+      non_null_bitmap = std::make_unique<Bitmap8>(BitmapRaw<uint8>(bm_bytes, bm_nbytes));
       data_buffer->Brush(bm_nbytes);
     }
 
@@ -1023,7 +1029,7 @@ std::unique_ptr<PaxColumns> OrcFormatReader::ReadStripe(
     last_column->SetRows(stripe_info.numberofrows());
     if (has_null) {
       Assert(non_null_bitmap);
-      last_column->SetBitmap(non_null_bitmap);
+      last_column->SetBitmap(std::move(non_null_bitmap));
     }
 
     if (!column_attrs_[index].empty()) {
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.h b/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.h
index 2c48b762955..003a780ca7b 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.h
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_format_reader.h
@@ -38,7 +38,7 @@ class OrcDumpReader;
 }
 class OrcFormatReader final {
  public:
-  explicit OrcFormatReader(std::shared_ptr<File> file, std::shared_ptr<File> toast_file = nullptr);
+  explicit OrcFormatReader(std::unique_ptr<File> file, std::unique_ptr<File> toast_file = nullptr);
 
   ~OrcFormatReader();
 
@@ -78,8 +78,8 @@ class OrcFormatReader final {
   friend class OrcGroupStatsProvider;
   std::vector<pax::porc::proto::Type_Kind> column_types_;
   std::vector<std::map<std::string, std::string>> column_attrs_;
-  std::shared_ptr<File> file_;
-  std::shared_ptr<File> toast_file_;
+  std::unique_ptr<File> file_;
+  std::unique_ptr<File> toast_file_;
   std::shared_ptr<DataBuffer<char>> reused_buffer_;
   size_t num_of_stripes_;
   bool is_vec_;
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_group.cc b/contrib/pax_storage/src/cpp/storage/orc/orc_group.cc
index a183c445db5..d7c8c73d220 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_group.cc
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_group.cc
@@ -49,7 +49,7 @@ inline static std::pair<Datum, bool> GetColumnDatum(PaxColumn *column,
   Datum rc;
 
   if (column->HasNull()) {
-    auto bm = column->GetBitmap();
+    const auto &bm = column->GetBitmap();
     Assert(bm);
     if (!bm->Test(row_index)) {
       *null_counts += 1;
@@ -64,7 +64,7 @@ inline static std::pair<Datum, bool> GetColumnDatum(PaxColumn *column,
   return {rc, false};
 }
 
-OrcGroup::OrcGroup(std::unique_ptr<PaxColumns> &&pax_column, size_t row_offset,
+OrcGroup::OrcGroup(std::unique_ptr<PaxColumns> pax_column, size_t row_offset,
                    const std::vector<int> *proj_col_index,
                    std::shared_ptr<Bitmap8> micro_partition_visibility_bitmap)
     : pax_columns_(std::move(pax_column)),
@@ -88,7 +88,7 @@ size_t OrcGroup::GetRows() const { return pax_columns_->GetRows(); }
 
 size_t OrcGroup::GetRowOffset() const { return row_offset_; }
 
-const std::shared_ptr<PaxColumns> &OrcGroup::GetAllColumns() const {
+const std::unique_ptr<PaxColumns> &OrcGroup::GetAllColumns() const {
   return pax_columns_;
 }
 
@@ -123,7 +123,7 @@ std::pair<bool, size_t> OrcGroup::ReadTuple(TupleTableSlot *slot) {
         }
 
         if (column->HasNull()) {
-          auto bm = column->GetBitmap();
+          const auto &bm = column->GetBitmap();
           Assert(bm);
           if (!bm->Test(current_row_index_)) {
             current_nulls_[index]++;
@@ -307,7 +307,7 @@ std::pair<Datum, bool> OrcGroup::GetColumnValueNoMissing(size_t column_index,
 void OrcGroup::CalcNullShuffle(PaxColumn *column, size_t column_index) {
   auto rows = column->GetRows();
   uint32 n_counts = 0;
-  auto bm = column->GetBitmap();
+  const auto &bm = column->GetBitmap();
 
   Assert(bm);
   Assert(column->HasNull() && !nulls_shuffle_[column_index]);
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_group.h b/contrib/pax_storage/src/cpp/storage/orc/orc_group.h
index fb59740c7f4..d8b44092ad8 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_group.h
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_group.h
@@ -40,7 +40,7 @@ class OrcDumpReader;
 class OrcGroup : public MicroPartitionReader::Group {
  public:
   OrcGroup(
-      std::unique_ptr<PaxColumns> &&pax_column, size_t row_offset,
+      std::unique_ptr<PaxColumns> pax_column, size_t row_offset,
       const std::vector<int> *proj_col_index,
       std::shared_ptr<Bitmap8> micro_partition_visibility_bitmap = nullptr);
 
@@ -50,7 +50,7 @@ class OrcGroup : public MicroPartitionReader::Group {
 
   size_t GetRowOffset() const override;
 
-  const std::shared_ptr<PaxColumns> &GetAllColumns() const override;
+  const std::unique_ptr<PaxColumns> &GetAllColumns() const override;
 
   virtual std::pair<bool, size_t> ReadTuple(TupleTableSlot *slot) override;
 
@@ -74,7 +74,7 @@ class OrcGroup : public MicroPartitionReader::Group {
                                                  size_t row_index);
 
  protected:
-  std::shared_ptr<PaxColumns> pax_columns_;
+  std::unique_ptr<PaxColumns> pax_columns_;
   std::shared_ptr<Bitmap8> micro_partition_visibility_bitmap_;
   size_t row_offset_;
   size_t current_row_index_;
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_reader.cc b/contrib/pax_storage/src/cpp/storage/orc/orc_reader.cc
index 764158dc96d..3fa4192efc6 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_reader.cc
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_reader.cc
@@ -102,12 +102,12 @@ class OrcGroupStatsProvider final : public ColumnStatsProvider {
   size_t group_index_;
 };
 
-OrcReader::OrcReader(std::shared_ptr<File> file,
-                     std::shared_ptr<File> toast_file)
+OrcReader::OrcReader(std::unique_ptr<File> file,
+                     std::unique_ptr<File> toast_file)
     : working_group_(nullptr),
       cached_group_(nullptr),
       current_group_index_(0),
-      format_reader_(file, toast_file),
+      format_reader_(std::move(file), std::move(toast_file)),
       is_closed_(true) {}
 
 std::unique_ptr<ColumnStatsProvider> OrcReader::GetGroupStatsInfo(
@@ -129,7 +129,7 @@ std::unique_ptr<MicroPartitionReader::Group> OrcReader::ReadGroup(
   for (size_t i = 0; i < pax_columns->GetColumns(); i++) {
     auto column = (*pax_columns)[i].get();
     if (column && !column->GetBuffer().first) {
-      auto bm = column->GetBitmap();
+      const auto &bm = column->GetBitmap();
       // Assert(bm);
       if (bm) {
         for (size_t n = 0; n < column->GetRows(); n++) {
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_test.cc b/contrib/pax_storage/src/cpp/storage/orc/orc_test.cc
index 5be2a860d58..006efebbbbf 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_test.cc
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_test.cc
@@ -144,7 +144,7 @@ TEST_F(OrcTest, WriteTuple) {
   ASSERT_NE(nullptr, local_fs);
 
   auto file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   OrcWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
@@ -164,7 +164,7 @@ TEST_F(OrcTest, OpenOrc) {
   ASSERT_NE(nullptr, local_fs);
 
   auto file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
@@ -192,8 +192,8 @@ TEST_F(OrcTest, WriteReadStripes) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
@@ -201,7 +201,7 @@ TEST_F(OrcTest, WriteReadStripes) {
   // file_ptr in orc writer will be freed when writer do destruct
   // current OrcWriter::CreateWriter only for test
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
   writer->Close();
@@ -210,7 +210,7 @@ TEST_F(OrcTest, WriteReadStripes) {
 
   // file_ptr in orc reader will be freed when reader do destruct
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
 
   EXPECT_EQ(1UL, reader->GetGroupNums());
@@ -229,13 +229,13 @@ TEST_F(OrcTest, WriteReadStripesTwice) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
   writer->WriteTuple(tuple_slot);
@@ -244,7 +244,7 @@ TEST_F(OrcTest, WriteReadStripesTwice) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
 
   EXPECT_EQ(1UL, reader->GetGroupNums());
@@ -280,14 +280,14 @@ TEST_F(OrcTest, WriteReadMultiStripes) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
   writer->Flush();
@@ -298,7 +298,7 @@ TEST_F(OrcTest, WriteReadMultiStripes) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
 
   EXPECT_EQ(2UL, reader->GetGroupNums());
@@ -319,14 +319,14 @@ TEST_F(OrcTest, WriteReadCloseEmptyOrc) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
   writer->WriteTuple(tuple_slot);
   writer->Flush();
 
@@ -336,7 +336,7 @@ TEST_F(OrcTest, WriteReadCloseEmptyOrc) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
 
   EXPECT_EQ(1UL, reader->GetGroupNums());
@@ -353,14 +353,14 @@ TEST_F(OrcTest, WriteReadEmptyOrc) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
   // flush empty
   writer->Flush();
   // direct close
@@ -369,7 +369,7 @@ TEST_F(OrcTest, WriteReadEmptyOrc) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(0UL, reader->GetGroupNums());
   reader->Close();
@@ -382,14 +382,14 @@ TEST_F(OrcTest, ReadTuple) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
 
   writer->WriteTuple(tuple_slot);
@@ -398,7 +398,7 @@ TEST_F(OrcTest, ReadTuple) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(1UL, reader->GetGroupNums());
   reader->ReadTuple(tuple_slot_empty);
@@ -415,15 +415,15 @@ TEST_F(OrcTest, GetTuple) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
   writer_options.group_limit = 100;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
   for (int i = 0; i < 1000; i++) {
     if (i % 5 == 0) {
       tuple_slot->tts_isnull[0] = true;
@@ -440,7 +440,7 @@ TEST_F(OrcTest, GetTuple) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
 
   reader->Open(reader_options);
@@ -487,16 +487,13 @@ TEST_F(OrcTest, WriteReadTupleWithToast) {
   pax_min_size_of_external_toast = 1024;
 
   tuple_desc->natts = TOAST_COLUMN_NUMS;
-  tuple_desc->attrs[0] = {.atttypid = TEXTOID,
-                          .attlen = -1,
-                          .attbyval = false,
-                          .attalign = TYPALIGN_DOUBLE,
-                          .attstorage = TYPSTORAGE_EXTENDED,
-                          .attisdropped = false,
-                          .attcollation = DEFAULT_COLLATION_OID};
-  tuple_desc->attrs[1] = tuple_desc->attrs[0];
-  tuple_desc->attrs[2] = tuple_desc->attrs[0];
-  tuple_desc->attrs[3] = tuple_desc->attrs[0];
+  InitAttribute_text(&tuple_desc->attrs[0]);
+  InitAttribute_text(&tuple_desc->attrs[1]);
+  InitAttribute_text(&tuple_desc->attrs[2]);
+  InitAttribute_text(&tuple_desc->attrs[3]);
+  tuple_desc->attrs[0].attstorage = TYPSTORAGE_EXTENDED;
+  tuple_desc->attrs[1].attstorage = TYPSTORAGE_EXTENDED;
+  tuple_desc->attrs[2].attstorage = TYPSTORAGE_EXTENDED;
   // column 4 is external but no compress
   tuple_desc->attrs[3].attstorage = TYPSTORAGE_EXTERNAL;
 
@@ -524,11 +521,11 @@ TEST_F(OrcTest, WriteReadTupleWithToast) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
-  std::shared_ptr<File> toast_file_ptr = local_fs->Open(toast_file_name, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> toast_file_ptr = local_fs->Open(toast_file_name, fs::kWriteMode);
+  EXPECT_NE(nullptr, toast_file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
@@ -542,7 +539,7 @@ TEST_F(OrcTest, WriteReadTupleWithToast) {
   std::vector<pax::porc::proto::Type_Kind> types_for_read = types;
 
   auto writer = OrcWriter::CreateWriter(writer_options, std::move(types),
-                                        file_ptr, toast_file_ptr);
+                                        std::move(file_ptr), std::move(toast_file_ptr));
   for (int i = 0; i < 106; i++) {
     switch (i % 3) {
       case 0: {
@@ -577,12 +574,12 @@ TEST_F(OrcTest, WriteReadTupleWithToast) {
 
   // begin full read without projection
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
-  EXPECT_NE(nullptr, file_ptr);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   toast_file_ptr = local_fs->Open(toast_file_name, fs::kReadMode);
-  EXPECT_NE(nullptr, file_ptr);
+  EXPECT_NE(nullptr, toast_file_ptr.get());
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr, toast_file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr), std::move(toast_file_ptr));
   tuple_slot_empty = MakeTupleTableSlot(tuple_desc, &TTSOpsVirtual);
 
   reader->Open(reader_options);
@@ -660,16 +657,16 @@ TEST_F(OrcTest, WriteReadTupleWithToast) {
 
   // begin read with projection
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
-  EXPECT_NE(nullptr, file_ptr);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   toast_file_ptr = local_fs->Open(toast_file_name, fs::kReadMode);
-  EXPECT_NE(nullptr, file_ptr);
+  EXPECT_NE(nullptr, toast_file_ptr.get());
   std::vector<bool> projection = {false, true, true, true};
   std::shared_ptr<PaxFilter> filter = std::make_shared<PaxFilter>();
 
   filter->SetColumnProjection(std::move(projection));
   reader_options.filter = filter;
-  reader = new OrcReader(file_ptr, toast_file_ptr);
+  reader = new OrcReader(std::move(file_ptr), std::move(toast_file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(6UL, reader->GetGroupNums());
 
@@ -763,19 +760,8 @@ TEST_P(OrcEncodingTest, ReadTupleWithEncoding) {
       cbdb::Palloc0(sizeof(TupleDescData) + sizeof(FormData_pg_attribute) * 2));
 
   tuple_desc->natts = 2;
-  tuple_desc->attrs[0] = {
-      .attlen = 8,
-      .attbyval = true,
-      .attalign = TYPALIGN_DOUBLE,
-      .attstorage = TYPSTORAGE_PLAIN,
-  };
-
-  tuple_desc->attrs[1] = {
-      .attlen = 8,
-      .attbyval = true,
-      .attalign = TYPALIGN_DOUBLE,
-      .attstorage = TYPSTORAGE_PLAIN,
-  };
+  InitAttribute_int8(&tuple_desc->attrs[0]);
+  InitAttribute_int8(&tuple_desc->attrs[1]);
 
   tuple_slot = MakeTupleTableSlot(tuple_desc, &TTSOpsVirtual);
   bool *fake_is_null =
@@ -790,8 +776,8 @@ TEST_P(OrcEncodingTest, ReadTupleWithEncoding) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   std::vector<pax::porc::proto::Type_Kind> types;
   types.emplace_back(pax::porc::proto::Type_Kind::Type_Kind_LONG);
@@ -803,7 +789,7 @@ TEST_P(OrcEncodingTest, ReadTupleWithEncoding) {
   writer_options.encoding_opts = types_encoding;
   writer_options.rel_tuple_desc = tuple_desc;
 
-  auto writer = new OrcWriter(writer_options, types, file_ptr);
+  auto writer = new OrcWriter(writer_options, types, std::move(file_ptr));
 
   for (size_t i = 0; i < 10000; i++) {
     tuple_slot->tts_values[0] = Int64GetDatum(i);
@@ -816,7 +802,7 @@ TEST_P(OrcEncodingTest, ReadTupleWithEncoding) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(1UL, reader->GetGroupNums());
   for (size_t i = 0; i < 10000; i++) {
@@ -847,19 +833,8 @@ TEST_P(OrcCompressTest, ReadTupleWithCompress) {
       cbdb::Palloc0(sizeof(TupleDescData) + sizeof(FormData_pg_attribute) * 2));
 
   tuple_desc->natts = 2;
-  tuple_desc->attrs[0] = {
-      .attlen = -1,
-      .attbyval = false,
-      .attalign = TYPALIGN_DOUBLE,
-      .attstorage = TYPSTORAGE_PLAIN,
-  };
-
-  tuple_desc->attrs[1] = {
-      .attlen = -1,
-      .attbyval = false,
-      .attalign = TYPALIGN_DOUBLE,
-      .attstorage = TYPSTORAGE_PLAIN,
-  };
+  InitAttribute_text(&tuple_desc->attrs[0]);
+  InitAttribute_text(&tuple_desc->attrs[1]);
 
   tuple_slot = MakeTupleTableSlot(tuple_desc, &TTSOpsVirtual);
   bool *fake_is_null =
@@ -872,8 +847,8 @@ TEST_P(OrcCompressTest, ReadTupleWithCompress) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   std::vector<pax::porc::proto::Type_Kind> types;
   types.emplace_back(pax::porc::proto::Type_Kind::Type_Kind_STRING);
@@ -885,7 +860,7 @@ TEST_P(OrcCompressTest, ReadTupleWithCompress) {
   writer_options.encoding_opts = types_encoding;
   writer_options.rel_tuple_desc = tuple_desc;
 
-  auto writer = new OrcWriter(writer_options, types, file_ptr);
+  auto writer = new OrcWriter(writer_options, types, std::move(file_ptr));
 
   for (size_t i = 0; i < COLUMN_SIZE; i++) {
     column_buff_str[i] = i;
@@ -903,7 +878,7 @@ TEST_P(OrcCompressTest, ReadTupleWithCompress) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
 
   ASSERT_EQ(1UL, reader->GetGroupNums());
@@ -943,14 +918,14 @@ TEST_F(OrcTest, ReadTupleDefaultColumn) {
   auto *local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
   writer->Close();
@@ -958,16 +933,12 @@ TEST_F(OrcTest, ReadTupleDefaultColumn) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(1UL, reader->GetGroupNums());
 
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false, 4);
-  tuple_slot_empty->tts_tupleDescriptor->attrs[3] = {
-      .attlen = 4,
-      .attbyval = true,
-      .attstorage = TYPSTORAGE_PLAIN,
-  };
+  InitAttribute_int4(&tuple_slot_empty->tts_tupleDescriptor->attrs[3]);
 
   tuple_slot_empty->tts_tupleDescriptor->natts = COLUMN_NUMS + 1;
 
@@ -998,14 +969,14 @@ TEST_F(OrcTest, ReadTupleDroppedColumn) {
   auto *local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
   writer->Close();
@@ -1013,7 +984,7 @@ TEST_F(OrcTest, ReadTupleDroppedColumn) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(1UL, reader->GetGroupNums());
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
@@ -1033,21 +1004,21 @@ TEST_F(OrcTest, ReadTupleDroppedColumnWithProjection) {
   auto *local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
   writer->WriteTuple(tuple_slot);
   writer->Close();
 
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(1UL, reader->GetGroupNums());
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
@@ -1071,18 +1042,8 @@ TEST_F(OrcTest, WriteReadBigTuple) {
       cbdb::Palloc0(sizeof(TupleDescData) + sizeof(FormData_pg_attribute) * 2));
 
   tuple_desc->natts = 2;
-  tuple_desc->attrs[0] = {
-      .attlen = 4,
-      .attbyval = true,
-      .attalign = TYPALIGN_INT,
-      .attstorage = TYPSTORAGE_PLAIN,
-  };
-  tuple_desc->attrs[1] = {
-      .attlen = 4,
-      .attbyval = true,
-      .attalign = TYPALIGN_INT,
-      .attstorage = TYPSTORAGE_PLAIN,
-  };
+  InitAttribute_int4(&tuple_desc->attrs[0]);
+  InitAttribute_int4(&tuple_desc->attrs[1]);
 
   tuple_slot = MakeTupleTableSlot(tuple_desc, &TTSOpsVirtual);
   bool *fake_is_null =
@@ -1097,8 +1058,8 @@ TEST_F(OrcTest, WriteReadBigTuple) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   std::vector<pax::porc::proto::Type_Kind> types;
   types.emplace_back(pax::porc::proto::Type_Kind::Type_Kind_INT);
@@ -1106,7 +1067,7 @@ TEST_F(OrcTest, WriteReadBigTuple) {
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_desc;
 
-  auto writer = OrcWriter::CreateWriter(writer_options, types, file_ptr);
+  auto writer = OrcWriter::CreateWriter(writer_options, types, std::move(file_ptr));
 
   for (size_t i = 0; i < 10000; i++) {
     tuple_slot->tts_values[0] = Int32GetDatum(i);
@@ -1119,7 +1080,7 @@ TEST_F(OrcTest, WriteReadBigTuple) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   EXPECT_EQ(1UL, reader->GetGroupNums());
   for (size_t i = 0; i < 10000; i++) {
@@ -1141,14 +1102,14 @@ TEST_F(OrcTest, WriteReadNoFixedColumnInSameTuple) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
 
@@ -1164,7 +1125,7 @@ TEST_F(OrcTest, WriteReadNoFixedColumnInSameTuple) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
 
   EXPECT_EQ(1UL, reader->GetGroupNums());
@@ -1193,14 +1154,14 @@ TEST_F(OrcTest, WriteReadWithNullField) {
   auto *local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   OrcWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   // str str int
   // null null int
@@ -1228,7 +1189,7 @@ TEST_F(OrcTest, WriteReadWithNullField) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
 
@@ -1270,14 +1231,14 @@ TEST_F(OrcTest, WriteReadWithBoundNullField) {
   auto *local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   OrcWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   // null null null
   // str str int
@@ -1302,7 +1263,7 @@ TEST_F(OrcTest, WriteReadWithBoundNullField) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
 
@@ -1336,14 +1297,14 @@ TEST_F(OrcTest, WriteReadWithALLNullField) {
   auto *local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   OrcWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   tuple_slot->tts_isnull[0] = true;
   tuple_slot->tts_isnull[1] = true;
@@ -1356,7 +1317,7 @@ TEST_F(OrcTest, WriteReadWithALLNullField) {
   file_ptr = local_fs->Open(file_name_, fs::kReadMode);
 
   MicroPartitionReader::ReaderOptions reader_options;
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
   TupleTableSlot *tuple_slot_empty = CreateTestTupleTableSlot(false);
 
@@ -1392,14 +1353,14 @@ TEST_P(OrcTestProjection, ReadTupleWithProjectionColumn) {
     proj_map[proj_index] = !proj_map[proj_index];
   }
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   MicroPartitionWriter::WriterOptions writer_options;
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
 
   writer->WriteTuple(tuple_slot);
   writer->Flush();
@@ -1414,7 +1375,7 @@ TEST_P(OrcTestProjection, ReadTupleWithProjectionColumn) {
   MicroPartitionReader::ReaderOptions reader_options;
   reader_options.filter = pax_filter;
 
-  auto reader = new OrcReader(file_ptr);
+  auto reader = new OrcReader(std::move(file_ptr));
   reader->Open(reader_options);
 
   EXPECT_EQ(2UL, reader->GetGroupNums());
@@ -1453,9 +1414,9 @@ TEST_P(OrcEncodingTest, WriterMerge) {
 
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file1_ptr = local_fs->Open(file1_name, fs::kReadWriteMode);
-  std::shared_ptr<File> file2_ptr = local_fs->Open(file2_name, fs::kReadWriteMode);
-  std::shared_ptr<File> file3_ptr = local_fs->Open(file3_name, fs::kReadWriteMode);
+  std::unique_ptr<File> file1_ptr = local_fs->Open(file1_name, fs::kReadWriteMode);
+  std::unique_ptr<File> file2_ptr = local_fs->Open(file2_name, fs::kReadWriteMode);
+  std::unique_ptr<File> file3_ptr = local_fs->Open(file3_name, fs::kReadWriteMode);
   EXPECT_NE(nullptr, file1_ptr);
   EXPECT_NE(nullptr, file2_ptr);
   EXPECT_NE(nullptr, file3_ptr);
@@ -1470,11 +1431,11 @@ TEST_P(OrcEncodingTest, WriterMerge) {
   writer_options.rel_tuple_desc = tuple_slot->tts_tupleDescriptor;
 
   auto *writer1 = new OrcWriter(writer_options,
-                                std::move(CreateTestSchemaTypes()), file1_ptr);
+                                std::move(CreateTestSchemaTypes()), std::move(file1_ptr));
   auto *writer2 = new OrcWriter(writer_options,
-                                std::move(CreateTestSchemaTypes()), file2_ptr);
+                                std::move(CreateTestSchemaTypes()), std::move(file2_ptr));
   auto *writer3 = new OrcWriter(writer_options,
-                                std::move(CreateTestSchemaTypes()), file3_ptr);
+                                std::move(CreateTestSchemaTypes()), std::move(file3_ptr));
 
   // two group + 51 rows in memory
   for (size_t i = 0; i < 251; i++) {
@@ -1511,7 +1472,7 @@ TEST_P(OrcEncodingTest, WriterMerge) {
   MicroPartitionReader::ReaderOptions reader_options;
   file3_ptr = local_fs->Open(file3_name, fs::kReadMode);
 
-  auto reader = new OrcReader(file3_ptr);
+  auto reader = new OrcReader(std::move(file3_ptr));
   reader->Open(reader_options);
 
   // no memory merge
@@ -1664,8 +1625,8 @@ TEST_F(OrcTest, ReadException) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
-  EXPECT_NE(nullptr, file_ptr);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  EXPECT_NE(nullptr, file_ptr.get());
 
   current_pb_func_call_times = 0;
   target_pb_func_call_times = 0;
@@ -1675,7 +1636,7 @@ TEST_F(OrcTest, ReadException) {
   writer_options.group_limit = 10;
 
   auto writer = OrcWriter::CreateWriter(
-      writer_options, std::move(CreateTestSchemaTypes()), file_ptr);
+      writer_options, std::move(CreateTestSchemaTypes()), std::move(file_ptr));
   for (int i = 0; i < 50; i++) {
     writer->WriteTuple(tuple_slot);
   }
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_vec_group.cc b/contrib/pax_storage/src/cpp/storage/orc/orc_vec_group.cc
index efeecdccb3c..b8690178109 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_vec_group.cc
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_vec_group.cc
@@ -32,7 +32,7 @@ namespace pax {
 inline static std::pair<Datum, bool> GetColumnDatum(PaxColumn *column,
                                                     size_t row_index) {
   if (column->HasNull()) {
-    auto bm = column->GetBitmap();
+    const auto &bm = column->GetBitmap();
     Assert(bm);
     if (!bm->Test(row_index)) {
       return {0, true};
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_vec_test.cc b/contrib/pax_storage/src/cpp/storage/orc/orc_vec_test.cc
index 64df3bef184..267150e0729 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_vec_test.cc
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_vec_test.cc
@@ -97,7 +97,7 @@ TEST_F(OrcVecTest, WriteReadGroup) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
   EXPECT_NE(nullptr, file_ptr);
 
   std::vector<pax::porc::proto::Type_Kind> types;
@@ -240,7 +240,7 @@ TEST_F(OrcVecTest, WriteReadGroupWithEncoding) {
   auto local_fs = Singleton<LocalFileSystem>::GetInstance();
   ASSERT_NE(nullptr, local_fs);
 
-  std::shared_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
+  std::unique_ptr<File> file_ptr = local_fs->Open(file_name_, fs::kWriteMode);
   EXPECT_NE(nullptr, file_ptr);
 
   std::vector<pax::porc::proto::Type_Kind> types;
diff --git a/contrib/pax_storage/src/cpp/storage/orc/orc_writer.cc b/contrib/pax_storage/src/cpp/storage/orc/orc_writer.cc
index d338aeb1473..a33d2de0fc1 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/orc_writer.cc
+++ b/contrib/pax_storage/src/cpp/storage/orc/orc_writer.cc
@@ -104,7 +104,6 @@ static std::unique_ptr<PaxColumns> BuildColumns(
     const std::vector<pax::porc::proto::Type_Kind> &types, const TupleDesc desc,
     const std::vector<std::tuple<ColumnEncoding_Kind, int>>
         &column_encoding_types,
-    const std::pair<ColumnEncoding_Kind, int> &offsets_encoding_types,
     const PaxStorageFormat &storage_format) {
   std::unique_ptr<PaxColumns> columns;
   bool is_vec;
@@ -125,14 +124,7 @@ static std::unique_ptr<PaxColumns> BuildColumns(
     encoding_option.is_sign = true;
     encoding_option.compress_level = std::get<1>(column_encoding_types[i]);
 
-    if (offsets_encoding_types.first == ColumnEncoding_Kind_DEF_ENCODED) {
-      // default value of offsets_stream is zstd
-      encoding_option.offsets_encode_type = ColumnEncoding_Kind_COMPRESS_ZSTD;
-      encoding_option.offsets_compress_level = 5;
-    } else {
-      encoding_option.offsets_encode_type = offsets_encoding_types.first;
-      encoding_option.offsets_compress_level = offsets_encoding_types.second;
-    }
+    encoding_option.offsets_encode_type = ColumnEncoding_Kind_DIRECT_DELTA;
 
     switch (type) {
       case (pax::porc::proto::Type_Kind::Type_Kind_STRING): {
@@ -225,12 +217,12 @@ static std::unique_ptr<PaxColumns> BuildColumns(
 OrcWriter::OrcWriter(
     const MicroPartitionWriter::WriterOptions &writer_options,
     const std::vector<pax::porc::proto::Type_Kind> &column_types,
-    std::shared_ptr<File> file, std::shared_ptr<File> toast_file)
+    std::unique_ptr<File> file, std::unique_ptr<File> toast_file)
     : MicroPartitionWriter(writer_options),
       is_closed_(false),
       column_types_(column_types),
-      file_(file),
-      toast_file_(toast_file),
+      file_(std::move(file)),
+      toast_file_(std::move(toast_file)),
       current_written_phy_size_(0),
       row_index_(0),
       total_rows_(0),
@@ -241,10 +233,9 @@ OrcWriter::OrcWriter(
   Assert(writer_options.rel_tuple_desc->natts ==
          static_cast<int>(column_types.size()));
 
-  pax_columns_ = BuildColumns(column_types_, writer_options.rel_tuple_desc,
-                              writer_options.encoding_opts,
-                              writer_options.offsets_encoding_opts,
-                              writer_options.storage_format);
+  pax_columns_ =
+      BuildColumns(column_types_, writer_options.rel_tuple_desc,
+                   writer_options.encoding_opts, writer_options.storage_format);
 
   summary_.rel_oid = writer_options.rel_oid;
   summary_.block_id = writer_options.block_id;
@@ -258,6 +249,16 @@ OrcWriter::OrcWriter(
 
   group_stats_.Initialize(writer_options.enable_min_max_col_idxs,
                           writer_options.enable_bf_col_idxs);
+
+  // Precompute slowpath indices for varlena columns (non-byval and typlen == -1)
+  varlena_slowpath_indices_.clear();
+  varlena_slowpath_indices_.reserve(writer_options.rel_tuple_desc->natts);
+  for (int i = 0; i < writer_options.rel_tuple_desc->natts; ++i) {
+    auto attrs = TupleDescAttr(writer_options.rel_tuple_desc, i);
+    if (!attrs->attbyval && attrs->attlen == -1) {
+      varlena_slowpath_indices_.push_back(i);
+    }
+  }
 }
 
 OrcWriter::~OrcWriter() {}
@@ -300,7 +301,6 @@ void OrcWriter::Flush() {
 
     new_columns = BuildColumns(column_types_, writer_options_.rel_tuple_desc,
                                writer_options_.encoding_opts,
-                               writer_options_.offsets_encoding_opts,
                                writer_options_.storage_format);
 
     for (size_t i = 0; i < column_types_.size(); ++i) {
@@ -321,8 +321,6 @@ void OrcWriter::Flush() {
 std::vector<std::pair<int, Datum>> OrcWriter::PrepareWriteTuple(
     TupleTableSlot *table_slot) {
   TupleDesc tuple_desc;
-  int16 type_len;
-  bool type_by_val;
   bool is_null;
   Datum tts_value;
   char type_storage;
@@ -333,18 +331,16 @@ std::vector<std::pair<int, Datum>> OrcWriter::PrepareWriteTuple(
   Assert(tuple_desc);
   const auto &required_stats_cols = group_stats_.GetRequiredStatsColsMask();
 
-  for (int i = 0; i < tuple_desc->natts; i++) {
+  for (int i : varlena_slowpath_indices_) {
     bool save_origin_datum;
     auto attrs = TupleDescAttr(tuple_desc, i);
-    type_len = attrs->attlen;
-    type_by_val = attrs->attbyval;
     is_null = table_slot->tts_isnull[i];
     tts_value = table_slot->tts_values[i];
     type_storage = attrs->attstorage;
 
     AssertImply(attrs->attisdropped, is_null);
 
-    if (is_null || type_by_val || type_len != -1) {
+    if (is_null) {
       continue;
     }
 
@@ -371,7 +367,11 @@ std::vector<std::pair<int, Datum>> OrcWriter::PrepareWriteTuple(
     // Numeric always need ensure that with the 4B header, otherwise it will
     // be converted twice in the vectorization path.
     if (required_stats_cols[i] || VARATT_IS_COMPRESSED(tts_value_vl) ||
-        VARATT_IS_EXTERNAL(tts_value_vl) || attrs->atttypid == NUMERICOID) {
+        VARATT_IS_EXTERNAL(tts_value_vl)
+#ifdef VEC_BUILD
+        || attrs->atttypid == NUMERICOID
+#endif
+    ) {
       // still detoast the origin toast
       detoast_vl = cbdb::PgDeToastDatum(tts_value_vl);
       Assert(detoast_vl != nullptr);
diff --git a/contrib/pax_storage/src/cpp/storage/orc/porc.h b/contrib/pax_storage/src/cpp/storage/orc/porc.h
index d846af6b33b..69a10ffaad7 100644
--- a/contrib/pax_storage/src/cpp/storage/orc/porc.h
+++ b/contrib/pax_storage/src/cpp/storage/orc/porc.h
@@ -50,7 +50,7 @@ class OrcWriter : public MicroPartitionWriter {
  public:
   OrcWriter(const MicroPartitionWriter::WriterOptions &orc_writer_options,
             const std::vector<pax::porc::proto::Type_Kind> &column_types,
-            std::shared_ptr<File> file, std::shared_ptr<File> toast_file = nullptr);
+            std::unique_ptr<File> file, std::unique_ptr<File> toast_file = nullptr);
 
   ~OrcWriter() override;
 
@@ -75,8 +75,8 @@ class OrcWriter : public MicroPartitionWriter {
   // only for test
   static std::unique_ptr<MicroPartitionWriter> CreateWriter(
       MicroPartitionWriter::WriterOptions options,
-      const std::vector<pax::porc::proto::Type_Kind> &column_types, std::shared_ptr<File> file,
-      std::shared_ptr<File> toast_file = nullptr) {
+      const std::vector<pax::porc::proto::Type_Kind> &column_types, std::unique_ptr<File> file,
+      std::unique_ptr<File> toast_file = nullptr) {
     std::vector<std::tuple<ColumnEncoding_Kind, int>> all_no_encoding_types;
     for (auto _ : column_types) {
       (void)_;
@@ -86,7 +86,7 @@ class OrcWriter : public MicroPartitionWriter {
 
     options.encoding_opts = all_no_encoding_types;
 
-    return std::make_unique<OrcWriter>(options, column_types, file, toast_file);
+    return std::make_unique<OrcWriter>(options, column_types, std::move(file), std::move(toast_file));
   }
 #endif
 
@@ -125,8 +125,8 @@ class OrcWriter : public MicroPartitionWriter {
   std::vector<void*> detoast_memory_holder_;
 
   const std::vector<pax::porc::proto::Type_Kind> column_types_;
-  std::shared_ptr<File> file_;
-  std::shared_ptr<File> toast_file_;
+  std::unique_ptr<File> file_;
+  std::unique_ptr<File> toast_file_;
   int32 current_written_phy_size_;
   WriteSummary summary_;
 
@@ -138,11 +138,14 @@ class OrcWriter : public MicroPartitionWriter {
   ::pax::porc::proto::Footer file_footer_;
   ::pax::porc::proto::PostScript post_script_;
   ::pax::MicroPartitionStats group_stats_;
+
+  // indices of columns that are non-byval and have typlen == -1 (varlena)
+  std::vector<int> varlena_slowpath_indices_;
 };
 
 class OrcReader : public MicroPartitionReader {
  public:
-  explicit OrcReader(std::shared_ptr<File> file, std::shared_ptr<File> toast_file = nullptr);
+  explicit OrcReader(std::unique_ptr<File> file, std::unique_ptr<File> toast_file = nullptr);
 
   ~OrcReader() override = default;
 
diff --git a/contrib/pax_storage/src/cpp/storage/pax.cc b/contrib/pax_storage/src/cpp/storage/pax.cc
index adc268c0102..69282738f4c 100644
--- a/contrib/pax_storage/src/cpp/storage/pax.cc
+++ b/contrib/pax_storage/src/cpp/storage/pax.cc
@@ -49,6 +49,8 @@
 #include "storage/vec/pax_vec_reader.h"
 #endif
 
+#define PAX_SPLIT_STRATEGY_CHECK_INTERVAL (16)
+
 namespace paxc {
 class IndexUpdaterInternal {
  public:
@@ -174,8 +176,8 @@ std::unique_ptr<MicroPartitionWriter> TableWriter::CreateMicroPartitionWriter(
   std::string file_path;
   std::string toast_file_path;
   std::string block_id;
-  std::shared_ptr<File> file;
-  std::shared_ptr<File> toast_file;
+  std::unique_ptr<File> file;
+  std::unique_ptr<File> toast_file;
   int open_flags;
   int block_number;
 
@@ -200,8 +202,6 @@ std::unique_ptr<MicroPartitionWriter> TableWriter::CreateMicroPartitionWriter(
   options.file_name = std::move(file_path);
   options.encoding_opts = GetRelEncodingOptions();
   options.storage_format = GetStorageFormat();
-  options.offsets_encoding_opts = std::make_pair(
-      PAX_OFFSETS_DEFAULT_COMPRESSTYPE, PAX_OFFSETS_DEFAULT_COMPRESSLEVEL);
   options.enable_min_max_col_idxs = GetMinMaxColumnIndexes();
   options.enable_bf_col_idxs = GetBloomFilterColumnIndexes();
 
@@ -239,7 +239,7 @@ std::unique_ptr<MicroPartitionWriter> TableWriter::CreateMicroPartitionWriter(
   }
 
   auto mp_writer = MicroPartitionFileFactory::CreateMicroPartitionWriter(
-      std::move(options), file, toast_file);
+      std::move(options), std::move(file), std::move(toast_file));
 
   Assert(mp_writer);
   mp_writer->SetWriteSummaryCallback(summary_callback_)
@@ -261,8 +261,8 @@ void TableWriter::InitOptionsCaches() {
 }
 
 void TableWriter::Open() {
-  rel_path_ = cbdb::BuildPaxDirectoryPath(
-      relation_->rd_node, relation_->rd_backend);
+  rel_path_ =
+      cbdb::BuildPaxDirectoryPath(relation_->rd_node, relation_->rd_backend);
 
   InitOptionsCaches();
 
@@ -282,14 +282,25 @@ void TableWriter::Open() {
   // insert tuple into the aux table before inserting any tuples.
   cbdb::InsertMicroPartitionPlaceHolder(RelationGetRelid(relation_),
                                         current_blockno_);
+  cur_physical_size_ = 0;
 }
 
 void TableWriter::WriteTuple(TupleTableSlot *slot) {
   Assert(writer_);
   Assert(strategy_);
-  // should check split strategy before write tuple
-  // otherwise, may got a empty file in the disk
-  if (strategy_->ShouldSplit(writer_->PhysicalSize(), num_tuples_)) {
+  // Because of the CTID constraint, we have to strictly enforce the accuracy of
+  // the tuple count and make sure it doesn't exceed
+  // PAX_MAX_NUM_TUPLES_PER_FILE. That's why we kept this precise check here.
+
+  // On the other hand,the biggest performance hit here is the PhysicalSize()
+  // function.So to reduce the overhead of calling it so often,
+  // we only update the file size every PAX_SPLIT_STRATEGY_CHECK_INTERVAL
+  // tuples.
+  if ((num_tuples_ % PAX_SPLIT_STRATEGY_CHECK_INTERVAL) == 0) {
+    cur_physical_size_ = writer_->PhysicalSize();
+  }
+
+  if (strategy_->ShouldSplit(cur_physical_size_, num_tuples_)) {
     writer_->Close();
     writer_ = nullptr;
     Open();
@@ -374,7 +385,7 @@ bool TableReader::GetTuple(TupleTableSlot *slot, ScanDirection direction,
   size_t row_index = current_block_row_index_;
   size_t max_row_index;
   size_t remaining_offset = offset;
-  std::shared_ptr<File> toast_file;
+  std::unique_ptr<File> toast_file;
   bool ok;
 
   if (!reader_) {
@@ -460,7 +471,7 @@ bool TableReader::GetTuple(TupleTableSlot *slot, ScanDirection direction,
   reader_ = MicroPartitionFileFactory::CreateMicroPartitionReader(
       std::move(options), reader_flags,
       file_system_->Open(current_block_metadata_.GetFileName(), fs::kReadMode),
-      toast_file);
+      std::move(toast_file));
 
   // row_index start from 0, so row_index = offset -1
   current_block_row_index_ = remaining_offset - 1;
@@ -476,7 +487,7 @@ void TableReader::OpenFile() {
   auto it = iterator_->Next();
   current_block_metadata_ = it;
   MicroPartitionReader::ReaderOptions options;
-  std::shared_ptr<File> toast_file;
+  std::unique_ptr<File> toast_file;
   int32 reader_flags = FLAGS_EMPTY;
 
   micro_partition_id_ = it.GetMicroPartitionId();
@@ -509,14 +520,14 @@ void TableReader::OpenFile() {
 
   if (it.GetExistToast()) {
     // must exist the file in disk
-    toast_file = file_system_->Open(it.GetFileName() + TOAST_FILE_SUFFIX,
-                                    fs::kReadMode);
+    toast_file =
+        file_system_->Open(it.GetFileName() + TOAST_FILE_SUFFIX, fs::kReadMode);
   }
 
   reader_ = MicroPartitionFileFactory::CreateMicroPartitionReader(
       std::move(options), reader_flags,
       file_system_->Open(it.GetFileName(), fs::kReadMode),
-      toast_file);
+      std::move(toast_file));
 }
 
 TableDeleter::TableDeleter(
@@ -534,7 +545,7 @@ void TableDeleter::UpdateStatsInAuxTable(
     const std::vector<int> &min_max_col_idxs,
     const std::vector<int> &bf_col_idxs, std::shared_ptr<PaxFilter> filter) {
   MicroPartitionReader::ReaderOptions options;
-  std::shared_ptr<File> toast_file;
+  std::unique_ptr<File> toast_file;
   int32 reader_flags = FLAGS_EMPTY;
   TupleTableSlot *slot;
 
@@ -553,7 +564,7 @@ void TableDeleter::UpdateStatsInAuxTable(
       std::move(options), reader_flags,
       file_system_->Open(meta.GetFileName(), fs::kReadMode,
                          file_system_options_),
-      toast_file);
+      std::move(toast_file));
 
   slot = MakeTupleTableSlot(rel_->rd_att, &TTSOpsVirtual);
   auto updated_stats = MicroPartitionStatsUpdater(mp_reader.get(), visi_bitmap)
@@ -588,8 +599,7 @@ void TableDeleter::DeleteWithVisibilityMap(
 
   std::unique_ptr<Bitmap8> visi_bitmap;
   auto catalog_update = pax::PaxCatalogUpdater::Begin(rel_);
-  auto rel_path = cbdb::BuildPaxDirectoryPath(
-      rel_->rd_node, rel_->rd_backend);
+  auto rel_path = cbdb::BuildPaxDirectoryPath(rel_->rd_node, rel_->rd_backend);
 
   min_max_col_idxs = cbdb::GetMinMaxColumnIndexes(rel_);
   stats_updater_projection->SetColumnProjection(min_max_col_idxs,
@@ -615,8 +625,7 @@ void TableDeleter::DeleteWithVisibilityMap(
         auto buffer = LoadVisimap(file_system_, file_system_options_,
                                   visibility_map_filename);
         auto visibility_file_bitmap =
-            Bitmap8(BitmapRaw<uint8>(buffer->data(), buffer->size()),
-                    Bitmap8::ReadOnlyOwnBitmap);
+            Bitmap8(BitmapRaw<uint8>(buffer->data(), buffer->size()));
         visi_bitmap =
             Bitmap8::Union(&visibility_file_bitmap, delete_visi_bitmap.get());
 
@@ -663,12 +672,10 @@ void TableDeleter::DeleteWithVisibilityMap(
     // TODO: update stats and visimap all in one catalog update
     // Update the stats in pax aux table
     // Notice that: PAX won't update the stats in group
-    UpdateStatsInAuxTable(catalog_update, micro_partition_metadata,
-                          std::make_shared<Bitmap8>(visi_bitmap->Raw(),
-                                                    Bitmap8::ReadOnlyOwnBitmap),
-                          min_max_col_idxs,
-                          cbdb::GetBloomFilterColumnIndexes(rel_),
-                          stats_updater_projection);
+    UpdateStatsInAuxTable(
+        catalog_update, micro_partition_metadata,
+        std::make_shared<Bitmap8>(visi_bitmap->Raw()), min_max_col_idxs,
+        cbdb::GetBloomFilterColumnIndexes(rel_), stats_updater_projection);
 
     // write pg_pax_blocks_oid
     catalog_update.UpdateVisimap(block_id, visimap_file_name);
diff --git a/contrib/pax_storage/src/cpp/storage/pax.h b/contrib/pax_storage/src/cpp/storage/pax.h
index 1d7a2f6b3fc..fec97e613f3 100644
--- a/contrib/pax_storage/src/cpp/storage/pax.h
+++ b/contrib/pax_storage/src/cpp/storage/pax.h
@@ -131,6 +131,7 @@ class TableWriter {
   std::vector<std::tuple<ColumnEncoding_Kind, int>> encoding_opts_;
 
   bool is_dfs_table_space_;
+  size_t cur_physical_size_ = 0;
 };
 
 class TableReader final {
diff --git a/contrib/pax_storage/src/cpp/storage/pax_defined.h b/contrib/pax_storage/src/cpp/storage/pax_defined.h
index b4ce1115af8..5315797ea3a 100644
--- a/contrib/pax_storage/src/cpp/storage/pax_defined.h
+++ b/contrib/pax_storage/src/cpp/storage/pax_defined.h
@@ -39,7 +39,7 @@ namespace pax {
 #define BITS_TO_BYTES(bits) (((bits) + 7) / 8)
 
 #define PAX_OFFSETS_DEFAULT_COMPRESSTYPE \
-  ColumnEncoding_Kind::ColumnEncoding_Kind_COMPRESS_ZSTD
+  ColumnEncoding_Kind::ColumnEncoding_Kind_DIRECT_DELTA
 #define PAX_OFFSETS_DEFAULT_COMPRESSLEVEL 5
 
 #define COLUMN_STORAGE_FORMAT_IS_VEC(column) \
diff --git a/contrib/pax_storage/src/cpp/storage/proto/pax.proto b/contrib/pax_storage/src/cpp/storage/proto/pax.proto
index 3e25710027d..765d3e0f8a5 100644
--- a/contrib/pax_storage/src/cpp/storage/proto/pax.proto
+++ b/contrib/pax_storage/src/cpp/storage/proto/pax.proto
@@ -37,6 +37,7 @@ message ColumnEncoding {
     COMPRESS_ZLIB = 4;        // use ZLIB to compress 
 
     DICTIONARY = 5;           // use dict-endoing 
+    COMPRESS_LZ4 = 6;         // use lz4 to compress
   }
 
   optional Kind kind = 1;
diff --git a/contrib/pax_storage/src/cpp/storage/toast/pax_toast.cc b/contrib/pax_storage/src/cpp/storage/toast/pax_toast.cc
index 3aa54e48ea5..7da38f6ae06 100644
--- a/contrib/pax_storage/src/cpp/storage/toast/pax_toast.cc
+++ b/contrib/pax_storage/src/cpp/storage/toast/pax_toast.cc
@@ -331,7 +331,7 @@ static std::pair<Datum, std::shared_ptr<MemoryObject>> pax_make_external_toast(
 std::pair<Datum, std::shared_ptr<MemoryObject>> pax_make_toast(
     Datum d, char storage_type) {
   std::shared_ptr<MemoryObject> mobj;
-  Datum result;
+  Datum result = d;
 
   if (!pax_enable_toast) {
     return {d, nullptr};
@@ -495,15 +495,15 @@ size_t pax_detoast_raw(Datum d, char *dst_buff, size_t dst_cap, char *ext_buff,
   return decompress_size;
 }
 
-std::pair<Datum, std::shared_ptr<MemoryObject>> pax_detoast(
+std::pair<Datum, std::unique_ptr<MemoryObject>> pax_detoast(
     Datum d, char *ext_buff, size_t ext_buff_size) {
-  std::shared_ptr<ExternalToastValue> value;
+  std::unique_ptr<ExternalToastValue> value;
 
   if (VARATT_IS_COMPRESSED(d)) {
     char *result;
     size_t raw_size = VARDATA_COMPRESSED_GET_EXTSIZE(d);
 
-    value = std::make_shared<ExternalToastValue>(raw_size + VARHDRSZ);
+    value = std::make_unique<ExternalToastValue>(raw_size + VARHDRSZ);
     result = reinterpret_cast<char *>(value->Addr());
     // only external toast exist invalid compress toast
     Assert((ToastCompressionId)(TOAST_COMPRESS_METHOD(d)) !=
@@ -515,8 +515,8 @@ std::pair<Datum, std::shared_ptr<MemoryObject>> pax_detoast(
 
     SET_VARSIZE(result, raw_size + VARHDRSZ);
 
-    return std::pair<Datum, std::shared_ptr<MemoryObject>>{
-        PointerGetDatum(result), value};
+    return std::pair<Datum, std::unique_ptr<MemoryObject>>{
+        PointerGetDatum(result), std::move(value)};
   } else if (VARATT_IS_PAX_EXTERNAL_TOAST(d)) {
     char *result;
     Assert(ext_buff);
@@ -531,7 +531,7 @@ std::pair<Datum, std::shared_ptr<MemoryObject>> pax_detoast(
                    "buff size=%lu]",
                    offset, raw_size, ext_buff_size));
 
-    value = std::make_shared<ExternalToastValue>(origin_size + VARHDRSZ);
+    value = std::make_unique<ExternalToastValue>(origin_size + VARHDRSZ);
 
     result = reinterpret_cast<char *>(value->Addr());
     auto pg_attribute_unused() decompress_size =
@@ -540,11 +540,11 @@ std::pair<Datum, std::shared_ptr<MemoryObject>> pax_detoast(
 
     Assert(decompress_size == origin_size);
     SET_VARSIZE(result, origin_size + VARHDRSZ);
-    return std::pair<Datum, std::shared_ptr<MemoryObject>>{
-        PointerGetDatum(result), value};
+    return std::pair<Datum, std::unique_ptr<MemoryObject>>{
+        PointerGetDatum(result), std::move(value)};
   }
 
-  return std::pair<Datum, std::shared_ptr<MemoryObject>>{d, nullptr};
+  return std::pair<Datum, std::unique_ptr<MemoryObject>>{d, nullptr};
 }
 
 ExternalToastValue::ExternalToastValue(size_t size)
diff --git a/contrib/pax_storage/src/cpp/storage/toast/pax_toast.h b/contrib/pax_storage/src/cpp/storage/toast/pax_toast.h
index 74d5271b99f..f7825b45256 100644
--- a/contrib/pax_storage/src/cpp/storage/toast/pax_toast.h
+++ b/contrib/pax_storage/src/cpp/storage/toast/pax_toast.h
@@ -145,7 +145,7 @@ size_t pax_toast_hdr_size(Datum d);
 // detoast pax toast
 size_t pax_detoast_raw(Datum d, char *dst_buff, size_t dst_size,
                        char *ext_buff = nullptr, size_t ext_buff_size = 0);
-std::pair<Datum, std::shared_ptr<MemoryObject>> pax_detoast(
+std::pair<Datum, std::unique_ptr<MemoryObject>> pax_detoast(
     Datum d, char *ext_buff = nullptr, size_t ext_buff_size = 0);
 
 // free pax toast
diff --git a/contrib/pax_storage/src/cpp/storage/vec/pax_porc_adpater.cc b/contrib/pax_storage/src/cpp/storage/vec/pax_porc_adpater.cc
index 3e77c04bc1a..7545e053b6e 100644
--- a/contrib/pax_storage/src/cpp/storage/vec/pax_porc_adpater.cc
+++ b/contrib/pax_storage/src/cpp/storage/vec/pax_porc_adpater.cc
@@ -29,6 +29,8 @@
 
 #ifdef VEC_BUILD
 
+#include <stdlib.h>
+
 #include "comm/vec_numeric.h"
 #include "storage/columns/pax_column_traits.h"
 #include "storage/toast/pax_toast.h"
@@ -38,6 +40,22 @@
 #endif
 namespace pax {
 
+static inline struct varlena *VarlenaShortTo4B(struct varlena *attr) {
+  Assert(attr != nullptr);
+  Assert(VARATT_IS_SHORT(attr));
+  Size data_size = VARSIZE_SHORT(attr) - VARHDRSZ_SHORT;
+  Size new_size = data_size + VARHDRSZ;
+
+  struct varlena *new_attr =
+      reinterpret_cast<struct varlena *>(malloc(new_size));
+
+  Assert(new_attr != nullptr);
+
+  SET_VARSIZE(new_attr, new_size);
+  memcpy(VARDATA(new_attr), VARDATA_SHORT(attr), data_size);
+  return new_attr;
+}
+
 static void CopyFixedRawBufferWithNull(
     PaxColumn *column, std::shared_ptr<Bitmap8> visibility_map_bitset,
     size_t bitset_index_begin, size_t range_begin, size_t range_lens,
@@ -49,7 +67,7 @@ static void CopyFixedRawBufferWithNull(
   std::tie(buffer, buffer_len) =
       column->GetRangeBuffer(data_index_begin, data_range_lens);
 
-  auto null_bitmap = column->GetBitmap();
+  const auto &null_bitmap = column->GetBitmap();
   size_t non_null_offset = 0;
   size_t type_len = column->GetTypeLength();
   for (size_t i = range_begin; i < (range_begin + range_lens); i++) {
@@ -121,10 +139,10 @@ static void CopyNonFixedBuffer(PaxColumn *column,
   size_t dst_offset = out_data_buffer->Used();
   char *buffer = nullptr;
   size_t buffer_len = 0;
-
-  auto null_bitmap = column->GetBitmap();
   size_t non_null_offset = 0;
 
+  const auto &null_bitmap = column->GetBitmap();
+
   for (size_t i = range_begin; i < (range_begin + range_lens); i++) {
     if (visibility_map_bitset &&
         visibility_map_bitset->Test(i - range_begin + bitset_index_begin)) {
@@ -219,7 +237,7 @@ static void CopyDecimalBuffer(PaxColumn *column,
   size_t buffer_len = 0;
   int32 type_len;
 
-  auto null_bitmap = column->GetBitmap();
+  const auto &null_bitmap = column->GetBitmap();
   type_len = VEC_SHORT_NUMERIC_STORE_BYTES;
 
   for (size_t i = range_begin; i < (range_begin + range_lens); i++) {
@@ -235,16 +253,22 @@ static void CopyDecimalBuffer(PaxColumn *column,
       out_data_buffer->Brush(type_len);
     } else {
       Numeric numeric;
+      bool should_free = false;
       size_t num_len = 0;
       std::tie(buffer, buffer_len) =
           column->GetBuffer(data_index_begin + non_null_offset);
 
       auto vl = (struct varlena *)DatumGetPointer(buffer);
-      Assert(!(VARATT_IS_EXTERNAL(vl) || VARATT_IS_COMPRESSED(vl) ||
-               VARATT_IS_SHORT(vl)));
+      Assert(!(VARATT_IS_EXTERNAL(vl) || VARATT_IS_COMPRESSED(vl)));
       num_len = VARSIZE_ANY_EXHDR(vl);
-      // direct cast
-      numeric = (Numeric)(buffer);
+      // it has been detoasted in OrcWriter::PrepareWriteTuple, except numeric
+      // type with short header should be detoasted to 4B header
+      if (unlikely(VARATT_IS_SHORT(vl))) {
+        numeric = VarlenaShortTo4B(vl);
+        should_free = true;
+      } else {  // direct cast
+        numeric = (Numeric)(buffer);
+      }
 
       char *dest_buff = out_data_buffer->GetAvailableBuffer();
       Assert(out_data_buffer->Available() >= (size_t)type_len);
@@ -253,6 +277,10 @@ static void CopyDecimalBuffer(PaxColumn *column,
           (int64 *)(dest_buff + sizeof(int64)));
       out_data_buffer->Brush(type_len);
       non_null_offset++;
+
+      if (should_free) {
+        free(numeric);
+      }
     }
   }
 
@@ -279,11 +307,11 @@ void CopyBitPackedBuffer(PaxColumn *column,
   std::tie(buffer, buffer_len) =
       column->GetRangeBuffer(data_index_begin, data_range_lens);
 
-  auto null_bitmap = column->GetBitmap();
   size_t bit_index = 0;
   size_t non_null_offset = 0;
   size_t type_len = column->GetTypeLength();
   size_t tuple_offset = group_base_offset + range_begin;
+  const auto &null_bitmap = column->GetBitmap();
 
   for (size_t i = 0; i < range_lens; i++) {
     bool is_visible = !visibility_map_bitset ||
@@ -431,7 +459,7 @@ std::pair<size_t, size_t> VecAdapter::AppendPorcFormat(PaxColumns *columns,
 
       vec_cache_buffer_[index].is_dict = true;
       if (column->HasNull()) {
-        auto null_bitmap = column->GetBitmap();
+        const auto &null_bitmap = column->GetBitmap();
         size_t non_null_offset = 0;
 
         for (size_t i = 0; i < range_lens; i++) {
@@ -576,8 +604,7 @@ std::pair<size_t, size_t> VecAdapter::AppendPorcFormat(PaxColumns *columns,
         vec_buffer->Set(boolean_buffer, align_size);
 
         Bitmap8 vec_bool_bitmap(
-            BitmapRaw<uint8>((uint8 *)(boolean_buffer), align_size),
-            BitmapTpl<uint8>::ReadOnlyRefBitmap);
+            BitmapRaw<uint8>((uint8 *)(boolean_buffer), align_size));
 
         CopyBitPackedBuffer(column, micro_partition_visibility_bitmap_,
                             group_base_offset_, range_begin, range_lens,
diff --git a/contrib/pax_storage/src/cpp/storage/vec/pax_vec_comm.cc b/contrib/pax_storage/src/cpp/storage/vec/pax_vec_comm.cc
index 160d2928b9b..11f31caad95 100644
--- a/contrib/pax_storage/src/cpp/storage/vec/pax_vec_comm.cc
+++ b/contrib/pax_storage/src/cpp/storage/vec/pax_vec_comm.cc
@@ -88,12 +88,12 @@ void CopyBitmapBuffer(PaxColumn *column,
       Assert(!null_bits_buffer->GetBuffer());
       null_bits_buffer->Set(BlockBuffer::Alloc<char>(null_align_bytes),
                             null_align_bytes);
-      auto bitmap = column->GetBitmap();
+      const auto &bitmap = column->GetBitmap();
       Assert(bitmap);
       CopyBitmap(bitmap.get(), range_begin, range_lens, null_bits_buffer);
       *out_visable_null_counts = range_lens - data_range_lens;
     } else {
-      auto bitmap = column->GetBitmap();
+      const auto &bitmap = column->GetBitmap();
       Assert(bitmap);
 
       Bitmap8 null_bitmap(out_range_lens);
diff --git a/contrib/pax_storage/src/cpp/storage/vec_parallel_common.cc b/contrib/pax_storage/src/cpp/storage/vec_parallel_common.cc
index f3ca311628e..7e57b9ae011 100644
--- a/contrib/pax_storage/src/cpp/storage/vec_parallel_common.cc
+++ b/contrib/pax_storage/src/cpp/storage/vec_parallel_common.cc
@@ -132,7 +132,7 @@ bool PaxFragmentInterface::OpenFile() {
   InitAdapter();
 
   auto data_file = file_system->Open(m->GetFileName(), fs::kReadMode, desc->GetFileSystemOptions());
-  std::shared_ptr<File> toast_file;
+  std::unique_ptr<File> toast_file;
   if (auto name = m->GetToastName(); !name.empty()) {
     toast_file = file_system->Open(name, fs::kReadMode, desc->GetFileSystemOptions());
   }
diff --git a/contrib/pax_storage/src/cpp/storage/vec_parallel_pax.cc b/contrib/pax_storage/src/cpp/storage/vec_parallel_pax.cc
index a93d5d17646..632be28f827 100644
--- a/contrib/pax_storage/src/cpp/storage/vec_parallel_pax.cc
+++ b/contrib/pax_storage/src/cpp/storage/vec_parallel_pax.cc
@@ -60,7 +60,7 @@ class MicroPartitionInfo : public MicroPartitionInfoProvider {
     if (!visimap_name.empty()) {
       visimap = pax::LoadVisimap(file_system, nullptr, visimap_name);
       BitmapRaw<uint8_t> raw(visimap->data(), visimap->size());
-      bitmap = std::make_unique<Bitmap8>(raw, BitmapTpl<uint8>::ReadOnlyRefBitmap);
+      bitmap = std::make_unique<Bitmap8>(raw);
     }
     return {std::move(visimap), std::move(bitmap)};
   }
diff --git a/contrib/pax_storage/src/test/regress/expected/DML_over_joins_optimizer.out b/contrib/pax_storage/src/test/regress/expected/DML_over_joins_optimizer.out
index aa87cea2a3e..abdad77c7f7 100644
--- a/contrib/pax_storage/src/test/regress/expected/DML_over_joins_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/DML_over_joins_optimizer.out
@@ -1613,22 +1613,21 @@ HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For
                                   QUERY PLAN                                  
 ------------------------------------------------------------------------------
  Delete on tab1
-   ->  Result
-         ->  Redistribute Motion 3:3  (slice1; segments: 3)
-               Hash Key: tab1.b
-               ->  Hash Join
-                     Hash Cond: (tab2.a = tab1.a)
-                     ->  Seq Scan on tab2
-                     ->  Hash
-                           ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                                 Hash Key: tab1.a
-                                 ->  Hash Join
-                                       Hash Cond: (tab3.b = tab1.b)
-                                       ->  Seq Scan on tab3
-                                       ->  Hash
-                                             ->  Seq Scan on tab1
+   ->  Hash Join
+         Hash Cond: (tab3.b = tab1.b)
+         ->  Seq Scan on tab3
+         ->  Hash
+               ->  Redistribute Motion 3:3  (slice1; segments: 3)
+                     Hash Key: tab1.b
+                     ->  Hash Join
+                           Hash Cond: (tab2.a = tab1.a)
+                           ->  Seq Scan on tab2
+                           ->  Hash
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                       Hash Key: tab1.a
+                                       ->  Seq Scan on tab1
  Optimizer: GPORCA
-(16 rows)
+(15 rows)
 
 -- ----------------------------------------------------------------------
 -- Test: teardown.sql
diff --git a/contrib/pax_storage/src/test/regress/expected/autostats.out b/contrib/pax_storage/src/test/regress/expected/autostats.out
index 6b184579907..6061799b2b4 100644
--- a/contrib/pax_storage/src/test/regress/expected/autostats.out
+++ b/contrib/pax_storage/src/test/regress/expected/autostats.out
@@ -11,7 +11,7 @@
 -- end_matchignore
 set gp_autostats_mode=on_change;
 set gp_autostats_on_change_threshold=9;
-set pax_enable_debug = false;
+set pax.enable_debug = false;
 set log_autostats=on;
 set client_min_messages=log;
 reset optimizer_trace_fallback;
diff --git a/contrib/pax_storage/src/test/regress/expected/bfv_joins_optimizer.out b/contrib/pax_storage/src/test/regress/expected/bfv_joins_optimizer.out
index cc84f9983ff..236f6b93542 100644
--- a/contrib/pax_storage/src/test/regress/expected/bfv_joins_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/bfv_joins_optimizer.out
@@ -2982,27 +2982,27 @@ ON (member_group.group_id IN (12,13,14,15) AND member_subgroup.subgroup_name = r
                                          QUERY PLAN                                          
 ---------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Hash Join
-         Hash Cond: (member."group_id" = member_group."group_id")
-         ->  Seq Scan on member
-         ->  Hash
-               ->  Broadcast Motion 3:3  (slice2; segments: 3)
-                     ->  Hash Left Join
-                           Hash Cond: (member_subgroup.subgroup_name = (region.county_name)::text)
-                           Join Filter: (member_group."group_id" = ANY ('{12,13,14,15}'::integer[]))
-                           ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                                 Hash Key: member_subgroup.subgroup_name
-                                 ->  Hash Join
-                                       Hash Cond: (member_subgroup."group_id" = member_group."group_id")
-                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)
-                                             Hash Key: member_subgroup."group_id"
+   ->  Hash Left Join
+         Hash Cond: (member_subgroup.subgroup_name = (region.county_name)::text)
+         Join Filter: (member_group."group_id" = ANY ('{12,13,14,15}'::integer[]))
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: member_subgroup.subgroup_name
+               ->  Hash Join
+                     Hash Cond: (member."group_id" = member_group."group_id")
+                     ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                           Hash Key: member."group_id"
+                           ->  Hash Join
+                                 Hash Cond: (member."group_id" = member_subgroup."group_id")
+                                 ->  Seq Scan on member
+                                 ->  Hash
+                                       ->  Broadcast Motion 3:3  (slice4; segments: 3)
                                              ->  Seq Scan on member_subgroup
-                                       ->  Hash
-                                             ->  Seq Scan on member_group
-                           ->  Hash
-                                 ->  Redistribute Motion 3:3  (slice5; segments: 3)
-                                       Hash Key: region.county_name
-                                       ->  Seq Scan on region
+                     ->  Hash
+                           ->  Seq Scan on member_group
+         ->  Hash
+               ->  Redistribute Motion 3:3  (slice5; segments: 3)
+                     Hash Key: region.county_name
+                     ->  Seq Scan on region
  Optimizer: Pivotal Optimizer (GPORCA)
 (23 rows)
 
diff --git a/contrib/pax_storage/src/test/regress/expected/create_index.out b/contrib/pax_storage/src/test/regress/expected/create_index.out
index ac4958d56dc..963ce9a6b39 100644
--- a/contrib/pax_storage/src/test/regress/expected/create_index.out
+++ b/contrib/pax_storage/src/test/regress/expected/create_index.out
@@ -2690,7 +2690,6 @@ COMMIT;
 -- we keep the `CONCURRENTLY` to make the following commands fail,
 -- so these commands will not cause deadlock with test create_view,
 -- like `drop schema xxx cascade;`.
--- See more details at https://code.hashdata.xyz/cloudberry/cbdb/-/issues/54
 REINDEX TABLE CONCURRENTLY pg_class; -- no catalog relation
 ERROR:  cannot reindex system catalogs concurrently
 REINDEX INDEX CONCURRENTLY pg_class_oid_index; -- no catalog index
diff --git a/contrib/pax_storage/src/test/regress/expected/create_index_optimizer.out b/contrib/pax_storage/src/test/regress/expected/create_index_optimizer.out
index 8d0a41352a8..81728a31260 100644
--- a/contrib/pax_storage/src/test/regress/expected/create_index_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/create_index_optimizer.out
@@ -2717,7 +2717,6 @@ COMMIT;
 -- we keep the `CONCURRENTLY` to make the following commands fail,
 -- so these commands will not cause deadlock with test create_view,
 -- like `drop schema xxx cascade;`.
--- See more details at https://code.hashdata.xyz/cloudberry/cbdb/-/issues/54
 REINDEX TABLE CONCURRENTLY pg_class; -- no catalog relation
 ERROR:  cannot reindex system catalogs concurrently
 REINDEX INDEX CONCURRENTLY pg_class_oid_index; -- no catalog index
diff --git a/contrib/pax_storage/src/test/regress/expected/create_table_distpol.out b/contrib/pax_storage/src/test/regress/expected/create_table_distpol.out
index 545d14625f4..46479ca2126 100644
--- a/contrib/pax_storage/src/test/regress/expected/create_table_distpol.out
+++ b/contrib/pax_storage/src/test/regress/expected/create_table_distpol.out
@@ -128,9 +128,7 @@ select distkey from gp_distribution_policy where localoid = 'distpol_person_copy
 RESET gp_create_table_random_default_distribution;
 -- Test duplicate distribute keys
 CREATE TABLE ctas_dup_dk as SELECT distinct age as c1, age as c2 from distpol_person; 
-ERROR:  duplicate DISTRIBUTED BY column 'c1'
 SELECT distinct age c1, age c2 into ctas_dup_dk_1 from distpol_person;
-ERROR:  duplicate DISTRIBUTED BY column 'c1'
 --
 -- Test deriving distribution key from the query's distribution in
 -- CREATE TABLE AS
diff --git a/contrib/pax_storage/src/test/regress/expected/gp_dqa_optimizer.out b/contrib/pax_storage/src/test/regress/expected/gp_dqa_optimizer.out
index 250ad329a5e..db4d467570b 100644
--- a/contrib/pax_storage/src/test/regress/expected/gp_dqa_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/gp_dqa_optimizer.out
@@ -65,20 +65,18 @@ select count(distinct d) from dqa_t1 group by i;
 (12 rows)
 
 explain (costs off) select count(distinct d) from dqa_t1 group by i;
-                         QUERY PLAN                         
-------------------------------------------------------------
+                            QUERY PLAN                            
+------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Finalize HashAggregate
+   ->  GroupAggregate
          Group Key: i
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)
-               Hash Key: i
-               ->  Partial GroupAggregate
-                     Group Key: i
-                     ->  Sort
-                           Sort Key: i, d
-                           ->  Seq Scan on dqa_t1
+         ->  Sort
+               Sort Key: i
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: i
+                     ->  Seq Scan on dqa_t1
  Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
-(11 rows)
+(9 rows)
 
 select count(distinct d), sum(distinct d) from dqa_t1 group by i;
  count | sum 
@@ -98,20 +96,18 @@ select count(distinct d), sum(distinct d) from dqa_t1 group by i;
 (12 rows)
 
 explain (costs off) select count(distinct d), sum(distinct d) from dqa_t1 group by i;
-                         QUERY PLAN                         
-------------------------------------------------------------
+                            QUERY PLAN                            
+------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Finalize HashAggregate
+   ->  GroupAggregate
          Group Key: i
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)
-               Hash Key: i
-               ->  Partial GroupAggregate
-                     Group Key: i
-                     ->  Sort
-                           Sort Key: i, d
-                           ->  Seq Scan on dqa_t1
+         ->  Sort
+               Sort Key: i
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: i
+                     ->  Seq Scan on dqa_t1
  Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
-(11 rows)
+(9 rows)
 
 select count(distinct d), count(distinct dt) from dqa_t1;
  count | count 
@@ -1909,20 +1905,18 @@ select count(distinct d) from dqa_t1 group by i;
 (12 rows)
 
 explain (costs off) select count(distinct d) from dqa_t1 group by i;
-                         QUERY PLAN                         
-------------------------------------------------------------
+                            QUERY PLAN                            
+------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Finalize HashAggregate
+   ->  GroupAggregate
          Group Key: i
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)
-               Hash Key: i
-               ->  Partial GroupAggregate
-                     Group Key: i
-                     ->  Sort
-                           Sort Key: i, d
-                           ->  Seq Scan on dqa_t1
+         ->  Sort
+               Sort Key: i
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: i
+                     ->  Seq Scan on dqa_t1
  Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
-(11 rows)
+(9 rows)
 
 select count(distinct d), count(distinct c), count(distinct dt) from dqa_t1;
  count | count | count 
diff --git a/contrib/pax_storage/src/test/regress/expected/gp_toolkit.out b/contrib/pax_storage/src/test/regress/expected/gp_toolkit.out
index 336354081af..745db42283a 100644
--- a/contrib/pax_storage/src/test/regress/expected/gp_toolkit.out
+++ b/contrib/pax_storage/src/test/regress/expected/gp_toolkit.out
@@ -304,7 +304,7 @@ update pg_statistic set stawidth=2034567890 where starelid = 'wide_width_test'::
 select btdrelpages, btdexppages from gp_toolkit.gp_bloat_expected_pages where btdrelid='wide_width_test'::regclass;
  btdrelpages | btdexppages 
 -------------+-------------
-           4 |  3104504228
+           1 |  3104504228
 (1 row)
 
 select * from gp_toolkit.gp_bloat_diag WHERE bdinspname <> 'pg_catalog';
diff --git a/contrib/pax_storage/src/test/regress/expected/gporca.out b/contrib/pax_storage/src/test/regress/expected/gporca.out
index 91a33a91bd4..25dc1938bed 100644
--- a/contrib/pax_storage/src/test/regress/expected/gporca.out
+++ b/contrib/pax_storage/src/test/regress/expected/gporca.out
@@ -10666,7 +10666,7 @@ create table foo(a int, b int) distributed by (a);
 -- and log_min_duration_statement, they are the most obvious ones.
 set log_statement='none';
 set log_min_duration_statement=-1;
-set pax_enable_debug to off;
+set pax.enable_debug to off;
 set client_min_messages='log';
 explain select count(*) from foo group by cube(a,b);
                                               QUERY PLAN                                              
@@ -10687,7 +10687,7 @@ explain select count(*) from foo group by cube(a,b);
 (9 rows)
 
 reset client_min_messages;
-reset pax_enable_debug;
+reset pax.enable_debug;
 reset log_statement;
 reset log_min_duration_statement;
 -- TVF accepts ANYENUM, ANYELEMENT returns ANYENUM, ANYARRAY
@@ -10804,11 +10804,11 @@ explain select * from foo where b in ('1', '2');
 set optimizer_enable_ctas = off;
 set log_statement='none';
 set log_min_duration_statement=-1;
-set pax_enable_debug to off;
+set pax.enable_debug to off;
 set client_min_messages='log';
 create table foo_ctas(a) as (select generate_series(1,10)) distributed by (a);
 reset client_min_messages;
-reset pax_enable_debug;
+reset pax.enable_debug;
 reset log_min_duration_statement;
 reset log_statement;
 reset optimizer_enable_ctas;
diff --git a/contrib/pax_storage/src/test/regress/expected/gporca_optimizer.out b/contrib/pax_storage/src/test/regress/expected/gporca_optimizer.out
index d638a97071b..c6b03a95ae1 100644
--- a/contrib/pax_storage/src/test/regress/expected/gporca_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/gporca_optimizer.out
@@ -2396,9 +2396,9 @@ explain select case when bar1.x2 = bar2.x2 then coalesce((select 1 from orca.foo
 from orca.bar1 inner join orca.bar2 on (bar1.x2 = bar2.x2) order by bar1.x1; 
                                                        QUERY PLAN                                                       
 ------------------------------------------------------------------------------------------------------------------------
- Sort  (cost=0.00..1765423.13 rows=20 width=8)
+ Sort  (cost=0.00..1765423.00 rows=20 width=8)
    Sort Key: bar1.x1
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1765423.13 rows=20 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1765423.00 rows=20 width=8)
          ->  Hash Join  (cost=0.00..862.00 rows=7 width=12)
                Hash Cond: (bar1.x2 = bar2.x2)
                ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=7 width=8)
@@ -2416,7 +2416,7 @@ from orca.bar1 inner join orca.bar2 on (bar1.x2 = bar2.x2) order by bar1.x1;
                              ->  Materialize  (cost=0.00..431.00 rows=10 width=4)
                                    ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=10 width=4)
                                          ->  Seq Scan on foo  (cost=0.00..431.00 rows=4 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (21 rows)
 
 select case when bar1.x2 = bar2.x2 then coalesce((select 1 from orca.foo where bar1.x2 = bar2.x2 and bar1.x2 = random() and foo.x2 = bar2.x2),0) else 1 end as col1, bar1.x1
@@ -9907,15 +9907,15 @@ analyze orca.bm_test;
 create index bm_test_idx on orca.bm_test using bitmap (i);
 set optimizer_enable_bitmapscan=on;
 explain select * from orca.bm_test where i=2 and t='2';
-                                   QUERY PLAN
+                                   QUERY PLAN                                   
 --------------------------------------------------------------------------------
- Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..204.39 rows=2 width=6)
-   ->  Bitmap Heap Scan on bm_test  (cost=0.00..204.39 rows=2 width=6)
+ Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..397.98 rows=2 width=6)
+   ->  Bitmap Heap Scan on bm_test  (cost=0.00..397.98 rows=1 width=6)
          Recheck Cond: (i = 2)
          Filter: (t = '2'::text)
          ->  Bitmap Index Scan on bm_test_idx  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (i = 2)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (7 rows)
 
 select * from orca.bm_test where i=2 and t='2';
@@ -10050,10 +10050,10 @@ create index bm_multi_test_idx_part on orca.bm_dyn_test_multilvl_part using bitm
 analyze orca.bm_dyn_test_multilvl_part;
 -- print name of parent index
 explain select * from orca.bm_dyn_test_multilvl_part where year = 2019;
-                                                        QUERY PLAN                                                        
---------------------------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..7.95 rows=53 width=18)
-   ->  Append  (cost=0.00..6.89 rows=18 width=18)
+                                                                      QUERY PLAN                                                                      
+------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..5.13 rows=59 width=18)
+   ->  Append  (cost=0.00..4.34 rows=20 width=18)
          ->  Seq Scan on bm_dyn_test_multilvl_part_1_prt_2_2_prt_1_3_prt_usa bm_dyn_test_multilvl_part_1  (cost=0.00..1.01 rows=1 width=44)
                Filter: (year = 2019)
          ->  Seq Scan on bm_dyn_test_multilvl_part_1_prt_2_2_prt_1_3_prt_other_regions bm_dyn_test_multilvl_part_2  (cost=0.00..1.01 rows=1 width=44)
@@ -10290,8 +10290,8 @@ WHERE tq.sym = tt.symbol AND
       tt.event_ts <  tq.end_ts
 GROUP BY 1
 ORDER BY 1 asc ;
-                                                                                                       QUERY PLAN                                                                                                       
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                              QUERY PLAN                                                               
+---------------------------------------------------------------------------------------------------------------------------------------
  GroupAggregate  (cost=0.00..862.00 rows=1 width=16)
    Group Key: ((((tt.event_ts / 100000) / 5) * 5))
    ->  Sort  (cost=0.00..862.00 rows=1 width=8)
@@ -10306,7 +10306,7 @@ ORDER BY 1 asc ;
                                  Number of partitions to scan: 2 (out of 2)
                      ->  Hash  (cost=431.00..431.00 rows=1 width=24)
                            ->  Seq Scan on my_tt_agg_opt tt  (cost=0.00..431.00 rows=1 width=24)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (15 rows)
 
 -- MPP-25661: IndexScan crashing for qual with reference to outer tuple
@@ -10349,8 +10349,8 @@ explain select id, comment from idxscan_outer as o join idxscan_inner as i on o.
 where ordernum between 10 and 20;
                                               QUERY PLAN                                              
 ------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.01 rows=3 width=9)
-   ->  Nested Loop  (cost=0.00..1324033.01 rows=1 width=9)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324032.98 rows=3 width=9)
+   ->  Nested Loop  (cost=0.00..1324032.98 rows=1 width=9)
          Join Filter: (o.id = i.productid)
          ->  Seq Scan on idxscan_outer o  (cost=0.00..431.00 rows=3 width=4)
          ->  Materialize  (cost=0.00..431.00 rows=1 width=9)
@@ -10530,45 +10530,45 @@ select disable_xform('CXformSelect2IndexGet');
 EXPLAIN SELECT * FROM btree_test WHERE a in (1, 47);
                                      QUERY PLAN                                      
 -------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..204.38 rows=3 width=8)
-   ->  Bitmap Heap Scan on btree_test  (cost=0.00..204.38 rows=1 width=8)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..387.97 rows=3 width=8)
+   ->  Bitmap Heap Scan on btree_test  (cost=0.00..387.97 rows=1 width=8)
          Recheck Cond: (a = ANY ('{1,47}'::integer[]))
          ->  Bitmap Index Scan on btree_test_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{1,47}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 EXPLAIN SELECT * FROM btree_test WHERE a in ('2', 47);
                                      QUERY PLAN                                      
 -------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..204.38 rows=3 width=8)
-   ->  Bitmap Heap Scan on btree_test  (cost=0.00..204.38 rows=1 width=8)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..387.97 rows=3 width=8)
+   ->  Bitmap Heap Scan on btree_test  (cost=0.00..387.97 rows=1 width=8)
          Recheck Cond: (a = ANY ('{2,47}'::integer[]))
          ->  Bitmap Index Scan on btree_test_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{2,47}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 EXPLAIN SELECT * FROM btree_test WHERE a in ('1', '2');
                                      QUERY PLAN                                      
 -------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..204.38 rows=3 width=8)
-   ->  Bitmap Heap Scan on btree_test  (cost=0.00..204.38 rows=1 width=8)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..387.97 rows=3 width=8)
+   ->  Bitmap Heap Scan on btree_test  (cost=0.00..387.97 rows=1 width=8)
          Recheck Cond: (a = ANY ('{1,2}'::integer[]))
          ->  Bitmap Index Scan on btree_test_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{1,2}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 EXPLAIN SELECT * FROM btree_test WHERE a in ('1', '2', 47);
                                      QUERY PLAN                                      
 -------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..613.15 rows=4 width=8)
-   ->  Bitmap Heap Scan on btree_test  (cost=0.00..613.15 rows=2 width=8)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..387.97 rows=4 width=8)
+   ->  Bitmap Heap Scan on btree_test  (cost=0.00..387.97 rows=2 width=8)
          Recheck Cond: (a = ANY ('{1,2,47}'::integer[]))
          ->  Bitmap Index Scan on btree_test_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{1,2,47}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 SELECT * FROM btree_test WHERE a in ('1', '2', 47);
@@ -10614,56 +10614,56 @@ CREATE INDEX bitmap_index ON bitmap_test USING BITMAP(a);
 EXPLAIN SELECT * FROM bitmap_test WHERE a in (1);
                                    QUERY PLAN                                    
 ---------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..68.82 rows=2 width=4)
-   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..68.82 rows=1 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..391.30 rows=1 width=4)
+   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..391.30 rows=1 width=4)
          Recheck Cond: (a = 1)
          ->  Bitmap Index Scan on bitmap_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = 1)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 EXPLAIN SELECT * FROM bitmap_test WHERE a in (1, 47);
                                    QUERY PLAN                                    
 ---------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..204.38 rows=3 width=4)
-   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..204.38 rows=1 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..407.97 rows=3 width=4)
+   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..407.97 rows=1 width=4)
          Recheck Cond: (a = ANY ('{1,47}'::integer[]))
          ->  Bitmap Index Scan on bitmap_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{1,47}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 EXPLAIN SELECT * FROM bitmap_test WHERE a in ('2', 47);
                                    QUERY PLAN                                    
 ---------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..204.38 rows=3 width=4)
-   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..204.38 rows=1 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..407.97 rows=3 width=4)
+   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..407.97 rows=1 width=4)
          Recheck Cond: (a = ANY ('{2,47}'::integer[]))
          ->  Bitmap Index Scan on bitmap_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{2,47}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 EXPLAIN SELECT * FROM bitmap_test WHERE a in ('1', '2');
-                                   QUERY PLAN
+                                   QUERY PLAN                                    
 ---------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..204.38 rows=3 width=4)
-   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..204.38 rows=1 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..407.97 rows=3 width=4)
+   ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..407.97 rows=1 width=4)
          Recheck Cond: (a = ANY ('{1,2}'::integer[]))
          ->  Bitmap Index Scan on bitmap_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{1,2}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 EXPLAIN SELECT * FROM bitmap_test WHERE a in ('1', '2', 47);
-                                   QUERY PLAN
+                                   QUERY PLAN                                    
 ---------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..417.97 rows=4 width=4)
    ->  Bitmap Heap Scan on bitmap_test  (cost=0.00..417.97 rows=2 width=4)
          Recheck Cond: (a = ANY ('{1,2,47}'::integer[]))
          ->  Bitmap Index Scan on bitmap_index  (cost=0.00..0.00 rows=0 width=0)
                Index Cond: (a = ANY ('{1,2,47}'::integer[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (6 rows)
 
 -- Test Logging for unsupported features in ORCA
@@ -10677,7 +10677,7 @@ create table foo(a int, b int) distributed by (a);
 -- and log_min_duration_statement, they are the most obvious ones.
 set log_statement='none';
 set log_min_duration_statement=-1;
-set pax_enable_debug to off;
+set pax.enable_debug to off;
 set client_min_messages='log';
 explain select count(*) from foo group by cube(a,b);
                                                       QUERY PLAN                                                      
@@ -10715,7 +10715,7 @@ explain select count(*) from foo group by cube(a,b);
 (30 rows)
 
 reset client_min_messages;
-reset pax_enable_debug;
+reset pax.enable_debug;
 reset log_statement;
 reset log_min_duration_statement;
 -- TVF accepts ANYENUM, ANYELEMENT returns ANYENUM, ANYARRAY
@@ -10825,18 +10825,18 @@ explain select * from foo where b in ('1', '2');
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
    ->  Seq Scan on foo  (cost=0.00..431.00 rows=1 width=12)
          Filter: ((b)::text = ANY ('{1,2}'::text[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (4 rows)
 
 set optimizer_enable_ctas = off;
 set log_statement='none';
 set log_min_duration_statement=-1;
-set pax_enable_debug to off;
+set pax.enable_debug to off;
 set client_min_messages='log';
 create table foo_ctas(a) as (select generate_series(1,10)) distributed by (a);
 LOG:  2023-08-17 15:11:09:454388 PDT,THD000,NOTICE,"Falling back to Postgres-based planner because GPORCA does not support the following feature: CTAS. Set optimizer_enable_ctas to on to enable CTAS with GPORCA",
 reset client_min_messages;
-reset pax_enable_debug;
+reset pax.enable_debug;
 reset log_min_duration_statement;
 reset log_statement;
 reset optimizer_enable_ctas;
@@ -10855,8 +10855,8 @@ set optimizer_force_multistage_agg = off;
 set optimizer_force_three_stage_scalar_dqa = off;
 -- end_ignore
 explain (costs off) select count(*), t2.c from input_tab1 t1 left join input_tab2 t2 on t1.a = t2.c group by t2.c;
-                                      QUERY PLAN                                      
---------------------------------------------------------------------------------------
+                            QUERY PLAN                            
+------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    ->  GroupAggregate
          Group Key: t2.c
@@ -10869,7 +10869,7 @@ explain (costs off) select count(*), t2.c from input_tab1 t1 left join input_tab
                            ->  Seq Scan on input_tab1 t1
                            ->  Hash
                                  ->  Seq Scan on input_tab2 t2
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (13 rows)
 
 select count(*), t2.c from input_tab1 t1 left join input_tab2 t2 on t1.a = t2.c group by t2.c;
@@ -10923,7 +10923,7 @@ FROM   (SELECT *
                            ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=7)
                                  ->  Seq Scan on tab_2  (cost=0.00..431.00 rows=1 width=7)
                ->  Seq Scan on tab_3  (cost=0.00..431.00 rows=1 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (11 rows)
 
 SELECT Count(*)
@@ -11158,15 +11158,15 @@ INSERT INTO csq_cast_param_inner VALUES
 EXPLAIN SELECT a FROM csq_cast_param_outer WHERE b in (SELECT CASE WHEN a > 1 THEN d ELSE '42' END FROM csq_cast_param_inner);
                                                 QUERY PLAN                                                 
 -----------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324032.56 rows=2 width=4)
-   ->  Seq Scan on csq_cast_param_outer  (cost=0.00..1324032.56 rows=1 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324032.38 rows=1 width=4)
+   ->  Seq Scan on csq_cast_param_outer  (cost=0.00..1324032.38 rows=1 width=4)
          Filter: (SubPlan 1)
          SubPlan 1
-           ->  Result  (cost=0.00..431.00 rows=2 width=4)
-                 ->  Materialize  (cost=0.00..431.00 rows=2 width=4)
-                       ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
+           ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                 ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
+                       ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
                              ->  Seq Scan on csq_cast_param_inner  (cost=0.00..431.00 rows=1 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (9 rows)
 
 SELECT a FROM csq_cast_param_outer WHERE b in (SELECT CASE WHEN a > 1 THEN d ELSE '42' END FROM csq_cast_param_inner);
@@ -11182,15 +11182,15 @@ CREATE CAST (myint AS numeric) WITH FUNCTION myint_numeric(myint) AS IMPLICIT;
 EXPLAIN SELECT a FROM csq_cast_param_outer WHERE b in (SELECT CASE WHEN a > 1 THEN d ELSE '42' END FROM csq_cast_param_inner);
                                                 QUERY PLAN                                                 
 -----------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324032.56 rows=2 width=4)
-   ->  Seq Scan on csq_cast_param_outer  (cost=0.00..1324032.56 rows=1 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324032.38 rows=1 width=4)
+   ->  Seq Scan on csq_cast_param_outer  (cost=0.00..1324032.38 rows=1 width=4)
          Filter: (SubPlan 1)
          SubPlan 1
-           ->  Result  (cost=0.00..431.00 rows=2 width=4)
-                 ->  Materialize  (cost=0.00..431.00 rows=2 width=4)
-                       ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
+           ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                 ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
+                       ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
                              ->  Seq Scan on csq_cast_param_inner  (cost=0.00..431.00 rows=1 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (9 rows)
 
 SELECT a FROM csq_cast_param_outer WHERE b in (SELECT CASE WHEN a > 1 THEN d ELSE '42' END FROM csq_cast_param_inner);
@@ -11211,19 +11211,19 @@ SELECT a FROM ggg WHERE a IN (NULL, 'x');
 EXPLAIN SELECT a FROM ggg WHERE a NOT IN (NULL, '');
                                   QUERY PLAN                                  
 ------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=2)
-   ->  Seq Scan on ggg  (cost=0.00..431.00 rows=1 width=2)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+   ->  Seq Scan on ggg  (cost=0.00..431.00 rows=1 width=8)
          Filter: (a <> ALL ('{NULL,""}'::bpchar[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (4 rows)
 
 EXPLAIN SELECT a FROM ggg WHERE a IN (NULL, 'x');
                                   QUERY PLAN                                  
 ------------------------------------------------------------------------------
- Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..431.00 rows=1 width=2)
-   ->  Seq Scan on ggg  (cost=0.00..431.00 rows=1 width=2)
+ Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..431.00 rows=1 width=8)
+   ->  Seq Scan on ggg  (cost=0.00..431.00 rows=1 width=8)
          Filter: (a = ANY ('{NULL,x}'::bpchar[]))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (4 rows)
 
 -- result node with one time filter and filter
@@ -11280,10 +11280,9 @@ EXPLAIN (COSTS OFF) WITH abc AS (SELECT onetimefilter1.a, onetimefilter1.b FROM
                        Filter: (share0_ref3.b = f1.b)
                        ->  Materialize
                              ->  Broadcast Motion 3:3  (slice6; segments: 3)
-                                   ->  Result
-                                         ->  Shared Scan (share slice:id 6:0)
+                                   ->  Shared Scan (share slice:id 6:0)
  Optimizer: GPORCA
-(43 rows)
+(42 rows)
 
 WITH abc AS (SELECT onetimefilter1.a, onetimefilter1.b FROM onetimefilter1, onetimefilter2 WHERE onetimefilter1.a=onetimefilter2.a) SELECT (SELECT 1 FROM abc WHERE f1.b = f2.b LIMIT 1), COALESCE((SELECT 2 FROM abc WHERE f1.a=random() AND f1.a=2), 0), (SELECT b FROM abc WHERE b=f1.b) FROM onetimefilter1 f1, onetimefilter2 f2 WHERE f1.b = f2.b;
  ?column? | coalesce | b  
@@ -11409,28 +11408,39 @@ SELECT * FROM ds_part, non_part2 WHERE ds_part.c = non_part2.e AND non_part2.f =
 (0 rows)
 
 explain analyze SELECT * FROM ds_part, non_part2 WHERE ds_part.c = non_part2.e AND non_part2.f = 10 AND a IN ( SELECT b + 1 FROM non_part1);
-                                                     QUERY PLAN                                                     
---------------------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324481.18 rows=1 width=20)
-   ->  Hash Join  (cost=0.00..1324481.18 rows=1 width=20)
+                                                                          QUERY PLAN                                                                          
+--------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324480.95 rows=1 width=20) (actual time=4.000..4.000 rows=0 loops=1)
+   ->  Hash Join  (cost=0.00..1324480.95 rows=1 width=20) (actual time=4.000..4.000 rows=0 loops=1)
          Hash Cond: (ds_part.c = non_part2.e)
-         ->  Dynamic Seq Scan on ds_part  (cost=0.00..1324050.11 rows=334 width=12)
+         ->  Dynamic Seq Scan on ds_part  (cost=0.00..1324049.89 rows=334 width=12) (actual time=0.000..0.000 rows=0 loops=1)
                Number of partitions to scan: 6 (out of 6)
                Filter: ((a = (b + 1)) AND (SubPlan 1))
+               Partitions scanned:  Avg 1.0 x 3 workers.  Max 1 parts (seg0).
                SubPlan 1
-                 ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
-                       ->  Broadcast Motion 1:3  (slice2)  (cost=0.00..431.00 rows=1 width=4)
-                             ->  Limit  (cost=0.00..431.00 rows=1 width=4)
-                                   ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
-                                         ->  Limit  (cost=0.00..431.00 rows=1 width=4)
-                                               ->  Seq Scan on non_part1  (cost=0.00..431.00 rows=34 width=4)
-         ->  Hash  (cost=431.00..431.00 rows=1 width=8)
-               ->  Partition Selector (selector id: $0)  (cost=0.00..431.00 rows=1 width=8)
-                     ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
-                           ->  Seq Scan on non_part2  (cost=0.00..431.00 rows=1 width=8)
+                 ->  Materialize  (cost=0.00..431.00 rows=1 width=4) (never executed)
+                       ->  Broadcast Motion 1:3  (slice2)  (cost=0.00..431.00 rows=1 width=4) (never executed)
+                             ->  Limit  (cost=0.00..431.00 rows=1 width=4) (actual time=4.000..4.000 rows=1 loops=1)
+                                   ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4) (actual time=4.000..4.000 rows=1 loops=1)
+                                         ->  Limit  (cost=0.00..431.00 rows=1 width=4) (actual time=0.000..0.000 rows=1 loops=1)
+                                               ->  Seq Scan on non_part1  (cost=0.00..431.00 rows=34 width=4) (actual time=0.000..0.000 rows=1 loops=1)
+         ->  Hash  (cost=431.00..431.00 rows=1 width=8) (actual time=4.000..4.000 rows=1 loops=1)
+               Buckets: 262144  Batches: 1  Memory Usage: 2049kB
+               ->  Partition Selector (selector id: $0)  (cost=0.00..431.00 rows=1 width=8) (actual time=4.000..4.000 rows=1 loops=1)
+                     ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=1 width=8) (actual time=4.000..4.000 rows=1 loops=1)
+                           ->  Seq Scan on non_part2  (cost=0.00..431.00 rows=1 width=8) (actual time=0.000..0.000 rows=1 loops=1)
                                  Filter: (f = 10)
- Optimizer: Pivotal Optimizer (GPORCA)
-(19 rows)
+                                 Rows Removed by Filter: 24
+ Planning Time: 24.393 ms
+   (slice0)    Executor memory: 81K bytes.
+   (slice1)    Executor memory: 2231K bytes avg x 3x(0) workers, 2231K bytes max (seg0).  Work_mem: 2049K bytes max.
+   (slice2)    Executor memory: 20K bytes (entry db).
+   (slice3)    Executor memory: 118K bytes avg x 3x(0) workers, 118K bytes max (seg0).
+   (slice4)    Executor memory: 115K bytes avg x 3x(0) workers, 115K bytes max (seg0).
+ Memory used:  128000kB
+ Optimizer: GPORCA
+ Execution Time: 2.262 ms
+(30 rows)
 
 SELECT *, a IN ( SELECT b + 1 FROM non_part1) FROM ds_part, non_part2 WHERE ds_part.c = non_part2.e AND non_part2.f = 10 AND a IN ( SELECT b FROM non_part1);
  a  | b  | c  | e  | f  | ?column? 
@@ -11620,12 +11630,12 @@ update gp_distribution_policy set numsegments = numsegments-1 where localoid = '
 reset allow_system_table_mods;
 -- populate the tables on this smaller cluster
 explain insert into gpexp_hash select i, i from generate_series(1,50) i;
-                                         QUERY PLAN                                         
---------------------------------------------------------------------------------------------
- Insert on gpexp_hash  (cost=0.00..30.00 rows=500 width=8)
-   ->  Redistribute Motion 1:2  (slice1; segments: 1)  (cost=0.00..30.00 rows=1000 width=8)
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Insert on gpexp_hash  (cost=0.00..1.25 rows=0 width=0)
+   ->  Redistribute Motion 1:2  (slice1; segments: 1)  (cost=0.00..1.25 rows=25 width=8)
          Hash Key: i.i
-         ->  Function Scan on generate_series i  (cost=0.00..10.00 rows=500 width=8)
+         ->  Function Scan on generate_series i  (cost=0.00..0.50 rows=50 width=8)
  Optimizer: Postgres query optimizer
 (5 rows)
 
@@ -11693,14 +11703,14 @@ select b, count(*) from gpexp_hash group by b order by b;
 explain update gpexp_rand set b=(select b from gpexp_hash where gpexp_rand.a = gpexp_hash.a);
                                                 QUERY PLAN                                                
 ----------------------------------------------------------------------------------------------------------
- Update on gpexp_rand  (cost=0.00..216.00 rows=25 width=18)
-   ->  Seq Scan on gpexp_rand  (cost=0.00..215.00 rows=25 width=18)
+ Update on gpexp_rand  (cost=0.00..70.00 rows=0 width=0)
+   ->  Seq Scan on gpexp_rand  (cost=0.00..70.00 rows=25 width=46)
          SubPlan 1
-           ->  Result  (cost=0.00..4.25 rows=50 width=4)
+           ->  Result  (cost=0.00..2.75 rows=50 width=4)
                  Filter: (gpexp_rand.a = gpexp_hash.a)
-                 ->  Materialize  (cost=0.00..3.75 rows=50 width=8)
-                       ->  Broadcast Motion 2:2  (slice1; segments: 2)  (cost=0.00..3.50 rows=25 width=8)
-                             ->  Seq Scan on gpexp_hash  (cost=0.00..2.50 rows=25 width=8)
+                 ->  Materialize  (cost=0.00..2.25 rows=50 width=8)
+                       ->  Broadcast Motion 2:2  (slice1; segments: 2)  (cost=0.00..2.00 rows=50 width=8)
+                             ->  Seq Scan on gpexp_hash  (cost=0.00..1.25 rows=25 width=8)
  Optimizer: Postgres query optimizer
 (9 rows)
 
@@ -11726,7 +11736,7 @@ delete from gpexp_repl where b >= 20;
 explain insert into gpexp_repl values (20, 20);
                        QUERY PLAN                       
 --------------------------------------------------------
- Insert on gpexp_repl  (cost=0.00..0.01 rows=1 width=8)
+ Insert on gpexp_repl  (cost=0.00..0.01 rows=0 width=0)
    ->  Result  (cost=0.00..0.01 rows=1 width=8)
  Optimizer: Postgres query optimizer
 (3 rows)
@@ -11792,21 +11802,21 @@ analyze part2_1_prt_2;
 -- the plan should contain a 2 stage limit. If we incorrectly estimate that the
 -- relation is empty, we would end up choosing a single stage limit. 
 explain select * from part1, part2 where part1.b = part2.b limit 5;
-                                                      QUERY PLAN                                                       
------------------------------------------------------------------------------------------------------------------------
- Limit  (cost=0.00..862.14 rows=5 width=16)
+                                                      QUERY PLAN                                                      
+----------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..862.13 rows=5 width=16)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.13 rows=5 width=16)
          ->  Limit  (cost=0.00..862.13 rows=2 width=16)
-               ->  Hash Join  (cost=0.00..862.13 rows=334 width=16)
+               ->  Hash Join  (cost=0.00..862.13 rows=333 width=16)
                      Hash Cond: (part1.b = part2.b)
-                     ->  Dynamic Seq Scan on part1  (cost=0.00..431.01 rows=334 width=8)
+                     ->  Dynamic Seq Scan on part1  (cost=0.00..431.01 rows=333 width=8)
                            Number of partitions to scan: 4 (out of 4)
-                     ->  Hash  (cost=431.02..431.02 rows=100 width=8)
-                           ->  Partition Selector (selector id: $0)  (cost=0.00..431.02 rows=100 width=8)
-                                 ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.02 rows=100 width=8)
-                                       ->  Dynamic Seq Scan on part2  (cost=0.00..431.00 rows=34 width=8)
+                     ->  Hash  (cost=431.02..431.02 rows=97 width=8)
+                           ->  Partition Selector (selector id: $0)  (cost=0.00..431.02 rows=97 width=8)
+                                 ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.02 rows=97 width=8)
+                                       ->  Dynamic Seq Scan on part2  (cost=0.00..431.00 rows=33 width=8)
                                              Number of partitions to scan: 4 (out of 4)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (13 rows)
 
 -- test opfamily handling in ORCA
@@ -11858,14 +11868,14 @@ ANALYZE btab_old_hash;
 EXPLAIN SELECT a, b FROM atab_old_hash INNER JOIN btab_old_hash ON a |=| b;
                                             QUERY PLAN                                             
 ---------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice2; segments: 3)  (cost=0.00..1324032.87 rows=5 width=8)
-   ->  Nested Loop  (cost=0.00..1324032.87 rows=2 width=8)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324032.86 rows=5 width=8)
+   ->  Nested Loop  (cost=0.00..1324032.86 rows=2 width=8)
          Join Filter: (atab_old_hash.a |=| btab_old_hash.b)
          ->  Seq Scan on btab_old_hash  (cost=0.00..431.00 rows=2 width=4)
          ->  Materialize  (cost=0.00..431.00 rows=3 width=4)
-               ->  Broadcast Motion 3:3  (slice1; segments: 3)  (cost=0.00..431.00 rows=3 width=4)
+               ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=3 width=4)
                      ->  Seq Scan on atab_old_hash  (cost=0.00..431.00 rows=1 width=4)
- Optimizer: Pivotal Optimizer (GPORCA) version 3.93.0
+ Optimizer: GPORCA
 (8 rows)
 
 SELECT a, b FROM atab_old_hash INNER JOIN btab_old_hash ON a |=| b;
@@ -11951,20 +11961,37 @@ select disable_xform('CXformFullOuterJoin2HashJoin');
 
 -- fallback reason: Invalid system target list found for AO table
 EXPLAIN SELECT a, b FROM atab_old_hash FULL JOIN btab_old_hash ON a |=| b;
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=1.06..2.31 rows=6 width=8)
-   ->  Hash Full Join  (cost=1.06..2.23 rows=2 width=8)
-         Hash Cond: (atab_old_hash.a |=| btab_old_hash.b)
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1.03 rows=1 width=4)
-               Hash Key: atab_old_hash.a
-               ->  Seq Scan on atab_old_hash  (cost=0.00..1.01 rows=1 width=4)
-         ->  Hash  (cost=1.04..1.04 rows=1 width=4)
-               ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..1.04 rows=1 width=4)
-                     Hash Key: btab_old_hash.b
-                     ->  Seq Scan on btab_old_hash  (cost=0.00..1.01 rows=1 width=4)
- Optimizer: Postgres query optimizer
-(11 rows)
+                                                          QUERY PLAN                                                          
+------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2586.00 rows=10 width=8)
+   ->  Result  (cost=0.00..2586.00 rows=4 width=8)
+         ->  Sequence  (cost=0.00..2586.00 rows=4 width=8)
+               ->  Shared Scan (share slice:id 1:2)  (cost=0.00..431.00 rows=2 width=1)
+                     ->  Seq Scan on btab_old_hash  (cost=0.00..431.00 rows=2 width=22)
+               ->  Sequence  (cost=0.00..2155.00 rows=4 width=8)
+                     ->  Shared Scan (share slice:id 1:3)  (cost=0.00..431.00 rows=1 width=1)
+                           ->  Seq Scan on atab_old_hash  (cost=0.00..431.00 rows=1 width=22)
+                     ->  Append  (cost=0.00..1724.00 rows=4 width=8)
+                           ->  Hash Left Join  (cost=0.00..862.00 rows=3 width=8)
+                                 Hash Cond: (share2_ref2.b |=| share3_ref2.a)
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
+                                       Hash Key: share2_ref2.b
+                                       ->  Shared Scan (share slice:id 2:2)  (cost=0.00..431.00 rows=2 width=4)
+                                 ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                                             Hash Key: share3_ref2.a
+                                             ->  Shared Scan (share slice:id 3:3)  (cost=0.00..431.00 rows=1 width=4)
+                           ->  Hash Anti Join  (cost=0.00..862.00 rows=1 width=4)
+                                 Hash Cond: (share3_ref3.a |=| share2_ref3.b)
+                                 ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                                       Hash Key: share3_ref3.a
+                                       ->  Shared Scan (share slice:id 4:3)  (cost=0.00..431.00 rows=1 width=4)
+                                 ->  Hash  (cost=431.00..431.00 rows=2 width=4)
+                                       ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
+                                             Hash Key: share2_ref3.b
+                                             ->  Shared Scan (share slice:id 5:2)  (cost=0.00..431.00 rows=2 width=4)
+ Optimizer: GPORCA
+(28 rows)
 
 SELECT a, b FROM atab_old_hash FULL JOIN btab_old_hash ON a |=| b;
  a  | b  
@@ -12020,9 +12047,9 @@ select disable_xform('CXformImplementInnerJoin');
 EXPLAIN SELECT 1 FROM foo1 left join foo2 on foo1.a = foo2.a AND foo2.c = 3 AND foo2.b IN (SELECT b FROM foo3);
                                                      QUERY PLAN                                                      
 ---------------------------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1721310.84 rows=2 width=4)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1721310.84 rows=2 width=1)
-         ->  Nested Loop Left Join  (cost=0.00..1721310.84 rows=1 width=1)
+ Result  (cost=0.00..1721310.83 rows=2 width=4)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1721310.83 rows=2 width=1)
+         ->  Nested Loop Left Join  (cost=0.00..1721310.83 rows=1 width=1)
                Join Filter: (foo1.a = foo2.a)
                ->  Seq Scan on foo1  (cost=0.00..431.00 rows=1 width=4)
                ->  Materialize  (cost=0.00..818.97 rows=1 width=4)
@@ -12035,7 +12062,7 @@ EXPLAIN SELECT 1 FROM foo1 left join foo2 on foo1.a = foo2.a AND foo2.c = 3 AND
                            ->  Hash  (cost=431.00..431.00 rows=2 width=4)
                                  ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
                                        ->  Seq Scan on foo3  (cost=0.00..431.00 rows=1 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (16 rows)
 
 SELECT 1 FROM foo1 left join foo2 on foo1.a = foo2.a AND foo2.c = 3 AND foo2.b IN (SELECT b FROM foo3);
@@ -12079,8 +12106,8 @@ SELECT DISTINCT L1.c, L1.lid
 FROM t55 L1 CROSS JOIN META
 WHERE L1.lid = int4in(textout(meta.load_id));
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
-                                                                            QUERY PLAN                                                                             
--------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                              QUERY PLAN                                                               
+---------------------------------------------------------------------------------------------------------------------------------------
  Result  (cost=0.00..431.09 rows=1 width=8)
    Output: c, lid
    ->  Redistribute Motion 3:3  (slice1; segments: 3)  (cost=0.00..431.07 rows=1 width=8)
@@ -12094,15 +12121,15 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entr
                      ->  Hash Join  (cost=0.00..431.07 rows=1 width=8)
                            Output: c, lid
                            Hash Cond: (l1.lid = int4in(textout(('99'::text))))
-                           ->  Seq Scan on orca.t55 l1  (cost=0.00..431.01 rows=334 width=8)
+                           ->  Seq Scan on orca.t55 l1  (cost=0.00..431.00 rows=334 width=8)
                                  Output: c, lid
                            ->  Hash  (cost=0.00..0.00 rows=1 width=8)
                                  Output: ('2020-01-01'::text), ('99'::text)
                                  ->  Result  (cost=0.00..0.00 rows=1 width=1)
                                        Output: '2020-01-01'::text, '99'::text
- Optimizer: Pivotal Optimizer (GPORCA)
- Settings: optimizer_enable_coordinator_only_queries = 'on', optimizer_enable_master_only_queries = 'on', optimizer_join_order = 'query', optimizer_segments = '3'
-(25 rows)
+ Settings: enable_incremental_sort = 'on', optimizer = 'on', optimizer_enable_dynamicbitmapscan = 'on', optimizer_join_order = 'query'
+ Optimizer: GPORCA
+(21 rows)
 
 CREATE TABLE TP AS
 WITH META AS (SELECT '2020-01-01' AS VALID_DT, '99' AS LOAD_ID)
@@ -12132,8 +12159,8 @@ explain select * from lossycastrangepart where b::int = 10;
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=16)
    ->  Dynamic Seq Scan on lossycastrangepart  (cost=0.00..431.00 rows=1 width=16)
          Number of partitions to scan: 4 (out of 4)
-         Filter: (int4(b) = 10)
- Optimizer: Pivotal Optimizer (GPORCA)
+         Filter: ((b)::integer = 10)
+ Optimizer: GPORCA
 (5 rows)
 
 select * from lossycastrangepart where b::int = 10;
@@ -12149,8 +12176,8 @@ explain select * from lossycastrangepart where b::int = 11;
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=16)
    ->  Dynamic Seq Scan on lossycastrangepart  (cost=0.00..431.00 rows=1 width=16)
          Number of partitions to scan: 4 (out of 4)
-         Filter: (int4(b) = 11)
- Optimizer: Pivotal Optimizer (GPORCA)
+         Filter: ((b)::integer = 11)
+ Optimizer: GPORCA
 (5 rows)
 
 select * from lossycastrangepart where b::int = 11;
@@ -12166,8 +12193,8 @@ explain select * from lossycastrangepart where b::int < 10;
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=16)
    ->  Dynamic Seq Scan on lossycastrangepart  (cost=0.00..431.00 rows=1 width=16)
          Number of partitions to scan: 4 (out of 4)
-         Filter: (int4(b) < 10)
- Optimizer: Pivotal Optimizer (GPORCA)
+         Filter: ((b)::integer < 10)
+ Optimizer: GPORCA
 (5 rows)
 
 select * from lossycastrangepart where b::int < 10;
@@ -12337,12 +12364,12 @@ where out.b in (select coalesce(tcorr2.a, 99)
                 from tcorr1 left outer join tcorr2 on tcorr1.a=tcorr2.a+out.a);
                                             QUERY PLAN                                            
 --------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1356692031.36 rows=1 width=8)
+ Result  (cost=0.00..1356692012.89 rows=1 width=8)
    Filter: (SubPlan 1)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
          ->  Seq Scan on tcorr1 "out"  (cost=0.00..431.00 rows=1 width=8)
    SubPlan 1
-     ->  Nested Loop Left Join  (cost=0.00..1324032.56 rows=2 width=4)
+     ->  Nested Loop Left Join  (cost=0.00..1324032.54 rows=2 width=4)
            Join Filter: (tcorr1.a = (tcorr2.a + "out".a))
            ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
                  ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
@@ -12371,7 +12398,7 @@ where out.b in (select max(tcorr2.b + out.b - 1)
                 where tcorr2.a=out.a);
                                                QUERY PLAN                                               
 --------------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1324032.63 rows=1 width=8)
+ Result  (cost=0.00..1324032.61 rows=1 width=8)
    Filter: (SubPlan 1)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
          ->  Seq Scan on tcorr1 "out"  (cost=0.00..431.00 rows=1 width=8)
@@ -12406,12 +12433,12 @@ where out.b in (select coalesce(tcorr2_d.c, 99)
                                              group by a) tcorr2_d on tcorr1.a=tcorr2_d.a);
                                                      QUERY PLAN                                                     
 --------------------------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1356692228.44 rows=1 width=8)
+ Result  (cost=0.00..1356692209.98 rows=1 width=8)
    Filter: (SubPlan 1)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
          ->  Seq Scan on tcorr1 "out"  (cost=0.00..431.00 rows=1 width=8)
    SubPlan 1
-     ->  Nested Loop Left Join  (cost=0.00..1324032.75 rows=3 width=8)
+     ->  Nested Loop Left Join  (cost=0.00..1324032.74 rows=3 width=8)
            Join Filter: (tcorr1.a = tcorr2.a)
            ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
                  ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
@@ -12425,7 +12452,7 @@ where out.b in (select coalesce(tcorr2_d.c, 99)
                              ->  Materialize  (cost=0.00..431.00 rows=1 width=8)
                                    ->  Gather Motion 3:1  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
                                          ->  Seq Scan on tcorr2  (cost=0.00..431.00 rows=1 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (20 rows)
 
 -- expect 1 row
@@ -12459,12 +12486,12 @@ where out.b in (select coalesce(tcorr2.a, 99)
                 from tcorr1 left outer join tcorr2 on tcorr1.a=tcorr2.a+out.a);
                                             QUERY PLAN                                            
 --------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1356692031.36 rows=1 width=8)
+ Result  (cost=0.00..1356692012.89 rows=1 width=8)
    Filter: (SubPlan 1)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
          ->  Seq Scan on tcorr1 "out"  (cost=0.00..431.00 rows=1 width=8)
    SubPlan 1
-     ->  Nested Loop Left Join  (cost=0.00..1324032.56 rows=2 width=4)
+     ->  Nested Loop Left Join  (cost=0.00..1324032.54 rows=2 width=4)
            Join Filter: (tcorr1.a = (tcorr2.a + "out".a))
            ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
                  ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
@@ -12472,7 +12499,7 @@ where out.b in (select coalesce(tcorr2.a, 99)
            ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
                  ->  Gather Motion 3:1  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
                        ->  Seq Scan on tcorr2  (cost=0.00..431.00 rows=1 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (14 rows)
 
 -- expect 1 row
@@ -12493,7 +12520,7 @@ where out.b in (select max(tcorr2.b + out.b - 1)
                 where tcorr2.a=out.a);
                                                QUERY PLAN                                               
 --------------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1324032.63 rows=1 width=8)
+ Result  (cost=0.00..1324032.61 rows=1 width=8)
    Filter: (SubPlan 1)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
          ->  Seq Scan on tcorr1 "out"  (cost=0.00..431.00 rows=1 width=8)
@@ -12528,12 +12555,12 @@ where out.b in (select coalesce(tcorr2_d.c, 99)
                                              group by a) tcorr2_d on tcorr1.a=tcorr2_d.a);
                                                      QUERY PLAN                                                     
 --------------------------------------------------------------------------------------------------------------------
- Result  (cost=0.00..1356692228.44 rows=1 width=8)
+ Result  (cost=0.00..1356692209.98 rows=1 width=8)
    Filter: (SubPlan 1)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
          ->  Seq Scan on tcorr1 "out"  (cost=0.00..431.00 rows=1 width=8)
    SubPlan 1
-     ->  Nested Loop Left Join  (cost=0.00..1324032.75 rows=3 width=8)
+     ->  Nested Loop Left Join  (cost=0.00..1324032.74 rows=3 width=8)
            Join Filter: (tcorr1.a = tcorr2.a)
            ->  Materialize  (cost=0.00..431.00 rows=1 width=4)
                  ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
@@ -12547,7 +12574,7 @@ where out.b in (select coalesce(tcorr2_d.c, 99)
                              ->  Materialize  (cost=0.00..431.00 rows=1 width=8)
                                    ->  Gather Motion 3:1  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
                                          ->  Seq Scan on tcorr2  (cost=0.00..431.00 rows=1 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (20 rows)
 
 -- expect 1 row
@@ -13739,8 +13766,8 @@ set enable_hashjoin=off;
 explain select r.a, r.b, r.c, l.c from left_outer_index_nl_foo r left outer join left_outer_index_nl_bar l on r.b=l.b;
                                             QUERY PLAN                                             
 ---------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.80 rows=7 width=16)
-   ->  Nested Loop Left Join  (cost=0.00..1324033.80 rows=3 width=16)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.78 rows=7 width=16)
+   ->  Nested Loop Left Join  (cost=0.00..1324033.78 rows=3 width=16)
          Join Filter: (r.b = l.b)
          ->  Seq Scan on left_outer_index_nl_foo r  (cost=0.00..431.00 rows=2 width=12)
          ->  Materialize  (cost=0.00..431.00 rows=5 width=8)
@@ -13773,8 +13800,8 @@ analyze left_outer_index_nl_bar_hash;
 explain select r.a, r.b, r.c, l.c from left_outer_index_nl_foo_hash r left outer join left_outer_index_nl_bar l on r.b=l.b;
                                             QUERY PLAN                                             
 ---------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.77 rows=7 width=14)
-   ->  Nested Loop Left Join  (cost=0.00..1324033.77 rows=3 width=14)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.75 rows=7 width=14)
+   ->  Nested Loop Left Join  (cost=0.00..1324033.75 rows=3 width=14)
          Join Filter: (r.b = l.b)
          ->  Seq Scan on left_outer_index_nl_foo_hash r  (cost=0.00..431.00 rows=2 width=10)
          ->  Materialize  (cost=0.00..431.00 rows=5 width=8)
@@ -13794,10 +13821,10 @@ select r.a, r.b, r.c, l.c from left_outer_index_nl_foo_hash r left outer join le
 
 --- verify that a motion is introduced such that joins on each segment are internal to that segment (distributed by join key)
 explain select r.a, r.b, r.c, l.c from left_outer_index_nl_foo_hash r left outer join left_outer_index_nl_bar_hash l on r.b=l.b;
-                                              QUERY PLAN                                              
-------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.54 rows=7 width=12)
-   ->  Nested Loop Left Join  (cost=0.00..1324033.54 rows=3 width=12)
+                                               QUERY PLAN                                               
+--------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.52 rows=7 width=12)
+   ->  Nested Loop Left Join  (cost=0.00..1324033.52 rows=3 width=12)
          Join Filter: (r.b = l.b)
          ->  Seq Scan on left_outer_index_nl_foo_hash r  (cost=0.00..431.00 rows=2 width=10)
          ->  Materialize  (cost=0.00..431.00 rows=5 width=6)
@@ -13826,8 +13853,8 @@ analyze left_outer_index_nl_bar_repl;
 explain select r.a, r.b, r.c, l.c from left_outer_index_nl_foo_repl r left outer join left_outer_index_nl_bar_repl l on r.b=l.b;
                                           QUERY PLAN                                          
 ----------------------------------------------------------------------------------------------
- Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..1324035.09 rows=7 width=16)
-   ->  Nested Loop Left Join  (cost=0.00..1324035.09 rows=21 width=16)
+ Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..1324035.01 rows=7 width=16)
+   ->  Nested Loop Left Join  (cost=0.00..1324035.01 rows=21 width=16)
          Join Filter: (r.b = l.b)
          ->  Seq Scan on left_outer_index_nl_foo_repl r  (cost=0.00..431.00 rows=12 width=12)
          ->  Seq Scan on left_outer_index_nl_bar_repl l  (cost=0.00..431.00 rows=15 width=8)
@@ -13845,10 +13872,10 @@ select r.a, r.b, r.c, l.c from left_outer_index_nl_foo_repl r left outer join le
 
 --- outer side replicated, inner side hashed can have interesting cases (gather + join on one segment of inner side and redistribute + join + gather are both valid)
 explain select r.a, r.b, r.c, l.c from left_outer_index_nl_foo_repl r left outer join left_outer_index_nl_bar_hash l on r.b=l.b;
-                                              QUERY PLAN                                              
-------------------------------------------------------------------------------------------------------
- Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..1324035.41 rows=7 width=14)
-   ->  Nested Loop Left Join  (cost=0.00..1324035.41 rows=21 width=14)
+                                               QUERY PLAN                                               
+--------------------------------------------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..1324035.37 rows=7 width=14)
+   ->  Nested Loop Left Join  (cost=0.00..1324035.37 rows=21 width=14)
          Join Filter: (r.b = l.b)
          ->  Seq Scan on left_outer_index_nl_foo_repl r  (cost=0.00..431.00 rows=12 width=12)
          ->  Materialize  (cost=0.00..431.00 rows=15 width=6)
@@ -13884,8 +13911,8 @@ ANALYZE tt2;
 EXPLAIN SELECT b FROM tt1 WHERE NOT EXISTS (SELECT * FROM tt2 WHERE (tt2.d = tt1.b) IS DISTINCT FROM false);
                                             QUERY PLAN                                             
 ---------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.03 rows=4 width=4)
-   ->  Nested Loop Anti Join  (cost=0.00..1324033.03 rows=2 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.01 rows=4 width=4)
+   ->  Nested Loop Anti Join  (cost=0.00..1324033.01 rows=2 width=4)
          Join Filter: ((tt2.d = tt1.b) IS DISTINCT FROM false)
          ->  Seq Scan on tt1  (cost=0.00..431.00 rows=2 width=4)
          ->  Materialize  (cost=0.00..431.00 rows=4 width=4)
@@ -13902,8 +13929,8 @@ SELECT b FROM tt1 WHERE NOT EXISTS (SELECT * FROM tt2 WHERE (tt2.d = tt1.b) IS D
 EXPLAIN SELECT b FROM tt1 WHERE NOT EXISTS (SELECT * FROM tt2 WHERE (tt2.d = tt1.b) IS DISTINCT FROM true);
                                             QUERY PLAN                                             
 ---------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.03 rows=4 width=4)
-   ->  Nested Loop Anti Join  (cost=0.00..1324033.03 rows=2 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.01 rows=4 width=4)
+   ->  Nested Loop Anti Join  (cost=0.00..1324033.01 rows=2 width=4)
          Join Filter: ((tt2.d = tt1.b) IS DISTINCT FROM true)
          ->  Seq Scan on tt1  (cost=0.00..431.00 rows=2 width=4)
          ->  Materialize  (cost=0.00..431.00 rows=4 width=4)
@@ -13920,8 +13947,8 @@ SELECT b FROM tt1 WHERE NOT EXISTS (SELECT * FROM tt2 WHERE (tt2.d = tt1.b) IS D
 EXPLAIN SELECT b FROM tt1 WHERE NOT EXISTS (SELECT * FROM tt2 WHERE (tt1.b = tt2.d) IS DISTINCT FROM NULL);
                                             QUERY PLAN                                             
 ---------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.03 rows=4 width=4)
-   ->  Nested Loop Anti Join  (cost=0.00..1324033.03 rows=2 width=4)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324033.01 rows=4 width=4)
+   ->  Nested Loop Anti Join  (cost=0.00..1324033.01 rows=2 width=4)
          Join Filter: (NOT ((tt1.b = tt2.d) IS NULL))
          ->  Seq Scan on tt1  (cost=0.00..431.00 rows=2 width=4)
          ->  Materialize  (cost=0.00..431.00 rows=4 width=4)
@@ -14754,8 +14781,8 @@ analyze ts_tbl;
 explain select * from ts_tbl where ts = to_timestamp('99991231'::text, 'YYYYMMDD'::text);
                                      QUERY PLAN                                      
 -------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=40 width=8)
-   ->  Index Only Scan using ts_tbl_idx on ts_tbl  (cost=0.00..6.00 rows=14 width=8)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=1 width=8)
+   ->  Index Only Scan using ts_tbl_idx on ts_tbl  (cost=0.00..6.01 rows=1 width=8)
          Index Cond: (ts = 'Fri Dec 31 00:00:00 9999 PST'::timestamp with time zone)
  Optimizer: Pivotal Optimizer (GPORCA)
 (4 rows)
diff --git a/contrib/pax_storage/src/test/regress/expected/groupingsets.out b/contrib/pax_storage/src/test/regress/expected/groupingsets.out
index 5dd8bb8b53e..25a26d506f8 100644
--- a/contrib/pax_storage/src/test/regress/expected/groupingsets.out
+++ b/contrib/pax_storage/src/test/regress/expected/groupingsets.out
@@ -1784,6 +1784,7 @@ select array(select row(v.a,s1.*) from (select two,four, count(*) from onek grou
 (2 rows)
 
 -- test the knapsack
+set hash_mem_multiplier = 1;
 set enable_indexscan = false;
 set work_mem = '64kB';
 explain (costs off)
@@ -1863,6 +1864,7 @@ explain (costs off)
  Optimizer: Postgres query optimizer
 (15 rows)
 
+reset hash_mem_multiplier;
 -- check collation-sensitive matching between grouping expressions
 -- (similar to a check for aggregates, but there are additional code
 -- paths for GROUPING, so check again here)
diff --git a/contrib/pax_storage/src/test/regress/expected/groupingsets_optimizer.out b/contrib/pax_storage/src/test/regress/expected/groupingsets_optimizer.out
index 9923ea610d2..b3da68b1f9d 100644
--- a/contrib/pax_storage/src/test/regress/expected/groupingsets_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/groupingsets_optimizer.out
@@ -1847,6 +1847,7 @@ select array(select row(v.a,s1.*) from (select two,four, count(*) from onek grou
 (2 rows)
 
 -- test the knapsack
+set hash_mem_multiplier = 1;
 set enable_indexscan = false;
 set work_mem = '64kB';
 explain (costs off)
@@ -1890,12 +1891,11 @@ explain (costs off)
                            ->  Streaming Partial HashAggregate
                                  Group Key: share0_ref5.hundred
                                  ->  Shared Scan (share slice:id 5:0)
-               ->  Finalize HashAggregate
+               ->  HashAggregate
                      Group Key: share0_ref6.thousand
                      ->  Redistribute Motion 3:3  (slice6; segments: 3)
                            Hash Key: share0_ref6.thousand
-                           ->  Streaming Partial HashAggregate
-                                 Group Key: share0_ref6.thousand
+                           ->  Result
                                  ->  Shared Scan (share slice:id 6:0)
                ->  HashAggregate
                      Group Key: share0_ref7.twothousand
@@ -1907,7 +1907,7 @@ explain (costs off)
                      Group Key: share0_ref8.unique1
                      ->  Shared Scan (share slice:id 1:0)
  Optimizer: Pivotal Optimizer (GPORCA)
-(50 rows)
+(49 rows)
 
 explain (costs off)
   select unique1,
@@ -1998,12 +1998,11 @@ explain (costs off)
                            ->  Streaming Partial HashAggregate
                                  Group Key: share0_ref5.hundred
                                  ->  Shared Scan (share slice:id 5:0)
-               ->  Finalize HashAggregate
+               ->  HashAggregate
                      Group Key: share0_ref6.thousand
                      ->  Redistribute Motion 3:3  (slice6; segments: 3)
                            Hash Key: share0_ref6.thousand
-                           ->  Streaming Partial HashAggregate
-                                 Group Key: share0_ref6.thousand
+                           ->  Result
                                  ->  Shared Scan (share slice:id 6:0)
                ->  HashAggregate
                      Group Key: share0_ref7.twothousand
@@ -2015,8 +2014,9 @@ explain (costs off)
                      Group Key: share0_ref8.unique1
                      ->  Shared Scan (share slice:id 1:0)
  Optimizer: Pivotal Optimizer (GPORCA)
-(50 rows)
+(49 rows)
 
+reset hash_mem_multiplier;
 -- check collation-sensitive matching between grouping expressions
 -- (similar to a check for aggregates, but there are additional code
 -- paths for GROUPING, so check again here)
diff --git a/contrib/pax_storage/src/test/regress/expected/incremental_analyze.out b/contrib/pax_storage/src/test/regress/expected/incremental_analyze.out
index f03df4df785..1808ca8082e 100644
--- a/contrib/pax_storage/src/test/regress/expected/incremental_analyze.out
+++ b/contrib/pax_storage/src/test/regress/expected/incremental_analyze.out
@@ -1949,7 +1949,7 @@ SELECT staattnum, stakind1, stakind2, stakind3, stakind4, stakind5,
 FROM pg_statistic WHERE starelid = 'simple_table_no_hll'::regclass;
  staattnum | stakind1 | stakind2 | stakind3 | stakind4 | stakind5 |  stavalues1  | stavalues2 | stavalues3 | stavalues4 | stavalues5 
 -----------+----------+----------+----------+----------+----------+--------------+------------+------------+------------+------------
-         1 |        2 |        3 |        0 |        0 |        0 | {1,3,5,7,10} |            |            |            | 
+         1 |        2 |        3 |        8 |        0 |        0 | {1,3,5,7,10} |            | {10}       |            | 
 (1 row)
 
 -- Make sure analyze rootpartition option works in an option list
diff --git a/contrib/pax_storage/src/test/regress/expected/limit.out b/contrib/pax_storage/src/test/regress/expected/limit.out
index 4b6e5e1f0a6..b03d00ce77e 100644
--- a/contrib/pax_storage/src/test/regress/expected/limit.out
+++ b/contrib/pax_storage/src/test/regress/expected/limit.out
@@ -131,7 +131,7 @@ select * from int8_tbl offset (case when random() < 0.5 then null::bigint end);
 (5 rows)
 
 -- Test assorted cases involving backwards fetch from a LIMIT plan node
--- Disable backward scan test which is not supported in this version of Cloudberry Database
+-- Disable backward scan test which is not supported in this version of Apache Cloudberry
 --start_ignore
 /*
  * begin;
diff --git a/contrib/pax_storage/src/test/regress/expected/limit_optimizer.out b/contrib/pax_storage/src/test/regress/expected/limit_optimizer.out
index b8562703a6c..4892a3bb414 100644
--- a/contrib/pax_storage/src/test/regress/expected/limit_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/limit_optimizer.out
@@ -131,7 +131,7 @@ select * from int8_tbl offset (case when random() < 0.5 then null::bigint end);
 (5 rows)
 
 -- Test assorted cases involving backwards fetch from a LIMIT plan node
--- Disable backward scan test which is not supported in this version of Cloudberry Database
+-- Disable backward scan test which is not supported in this version of Apache Cloudberry
 --start_ignore
 /*
  * begin;
@@ -358,29 +358,28 @@ order by s2 desc;
 explain (verbose, costs off)
 select sum(tenthous) as s1, sum(tenthous) + random()*0 as s2
   from tenk1 group by thousand order by thousand limit 3;
-                                                             QUERY PLAN                                                              
--------------------------------------------------------------------------------------------------------------------------------------
+                                                               QUERY PLAN                                                                
+-----------------------------------------------------------------------------------------------------------------------------------------
  Result
-   Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision)))
+   Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision)))
    ->  Limit
-         Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision))), thousand
+         Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision))), thousand
          ->  Gather Motion 3:1  (slice1; segments: 3)
-               Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision))), thousand
+               Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision))), thousand
                Merge Key: thousand
                ->  Limit
-                     Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision))), thousand
-                     ->  Finalize GroupAggregate
-                           Output: sum(tenthous), ((sum(tenthous))::double precision + (random() * '0'::double precision)), thousand
-                           Group Key: tenk1.thousand
+                     Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision))), thousand
+                     ->  Result
+                           Output: (sum(tenthous)), (((sum(tenthous)))::double precision + (random() * '0'::double precision)), thousand
                            ->  Sort
-                                 Output: thousand, (PARTIAL sum(tenthous)), (PARTIAL sum(tenthous))
+                                 Output: (sum(tenthous)), (sum(tenthous)), thousand
                                  Sort Key: tenk1.thousand
-                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                                       Output: thousand, (PARTIAL sum(tenthous)), (PARTIAL sum(tenthous))
-                                       Hash Key: thousand
-                                       ->  Streaming Partial HashAggregate
-                                             Output: thousand, PARTIAL sum(tenthous), PARTIAL sum(tenthous)
-                                             Group Key: tenk1.thousand
+                                 ->  HashAggregate
+                                       Output: sum(tenthous), sum(tenthous), thousand
+                                       Group Key: tenk1.thousand
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                             Output: thousand, tenthous
+                                             Hash Key: thousand
                                              ->  Seq Scan on public.tenk1
                                                    Output: thousand, tenthous
  Optimizer: Pivotal Optimizer (GPORCA)
diff --git a/contrib/pax_storage/src/test/regress/expected/misc_functions_optimizer.out b/contrib/pax_storage/src/test/regress/expected/misc_functions_optimizer.out
index 8cdcba95fb1..56138548e88 100644
--- a/contrib/pax_storage/src/test/regress/expected/misc_functions_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/misc_functions_optimizer.out
@@ -235,7 +235,7 @@ WHERE my_int_eq(a.unique2, 42);
          ->  Hash
                ->  Seq Scan on tenk1 a
                      Filter: my_int_eq(unique2, 42)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (8 rows)
 
 -- With support function that knows it's int4eq, we get a different plan
@@ -243,17 +243,16 @@ ALTER FUNCTION my_int_eq(int, int) SUPPORT test_support_func;
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1 a JOIN tenk1 b ON a.unique1 = b.unique1
 WHERE my_int_eq(a.unique2, 42);
-                      QUERY PLAN                      
-------------------------------------------------------
+                      QUERY PLAN                       
+-------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Hash Join
-         Hash Cond: (b.unique1 = a.unique1)
-         ->  Seq Scan on tenk1 b
-         ->  Hash
-               ->  Seq Scan on tenk1 a
-                     Filter: my_int_eq(unique2, 42)
- Optimizer: Pivotal Optimizer (GPORCA)
-(8 rows)
+   ->  Nested Loop
+         ->  Seq Scan on tenk1 a
+               Filter: my_int_eq(unique2, 42)
+         ->  Index Scan using tenk1_unique1 on tenk1 b
+               Index Cond: (unique1 = a.unique1)
+ Optimizer: Postgres query optimizer
+(7 rows)
 
 -- Also test non-default rowcount estimate
 CREATE FUNCTION my_gen_series(int, int) RETURNS SETOF integer
@@ -262,27 +261,26 @@ CREATE FUNCTION my_gen_series(int, int) RETURNS SETOF integer
   SUPPORT test_support_func;
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1 a JOIN my_gen_series(1,1000) g ON a.unique1 = g;
-                            QUERY PLAN                            
-------------------------------------------------------------------
+                  QUERY PLAN                  
+----------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    ->  Hash Join
-         Hash Cond: (a.unique1 = my_gen_series.my_gen_series)
-         ->  Seq Scan on tenk1 a
+         Hash Cond: (g.g = a.unique1)
+         ->  Function Scan on my_gen_series g
          ->  Hash
-               ->  Function Scan on my_gen_series
- Optimizer: Pivotal Optimizer (GPORCA)
+               ->  Seq Scan on tenk1 a
+ Optimizer: Postgres query optimizer
 (7 rows)
 
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1 a JOIN my_gen_series(1,5) g ON a.unique1 = g;
-                            QUERY PLAN                            
-------------------------------------------------------------------
+                      QUERY PLAN                       
+-------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Hash Join
-         Hash Cond: (a.unique1 = my_gen_series.my_gen_series)
-         ->  Seq Scan on tenk1 a
-         ->  Hash
-               ->  Function Scan on my_gen_series
- Optimizer: Pivotal Optimizer (GPORCA)
-(7 rows)
+   ->  Nested Loop
+         ->  Function Scan on my_gen_series g
+         ->  Index Scan using tenk1_unique1 on tenk1 a
+               Index Cond: (unique1 = g.g)
+ Optimizer: Postgres query optimizer
+(6 rows)
 
diff --git a/contrib/pax_storage/src/test/regress/expected/olap_plans_optimizer.out b/contrib/pax_storage/src/test/regress/expected/olap_plans_optimizer.out
index fda6a3821ca..4f4915b3dd8 100644
--- a/contrib/pax_storage/src/test/regress/expected/olap_plans_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/olap_plans_optimizer.out
@@ -79,18 +79,20 @@ select a, b, c, sum(d) from olap_test group by a, b, c;
 
 -- If it's not a superset, redistribution is needed.
 explain select a, sum(d) from olap_test group by a;
-                                           QUERY PLAN                                            
--------------------------------------------------------------------------------------------------
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.55 rows=3 width=12)
-   ->  Finalize HashAggregate  (cost=0.00..431.55 rows=1 width=12)
+   ->  Finalize GroupAggregate  (cost=0.00..431.55 rows=1 width=12)
          Group Key: a
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.55 rows=1 width=12)
-               Hash Key: a
-               ->  Streaming Partial HashAggregate  (cost=0.00..431.55 rows=1 width=12)
-                     Group Key: a
-                     ->  Seq Scan on olap_test  (cost=0.00..431.09 rows=3334 width=8)
+         ->  Sort  (cost=0.00..431.55 rows=2 width=12)
+               Sort Key: a
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.55 rows=2 width=12)
+                     Hash Key: a
+                     ->  Streaming Partial HashAggregate  (cost=0.00..431.55 rows=2 width=12)
+                           Group Key: a
+                           ->  Seq Scan on olap_test  (cost=0.00..431.09 rows=3334 width=8)
  Optimizer: GPORCA
-(9 rows)
+(11 rows)
 
 select a, sum(d) from olap_test group by a;
  a |   sum    
@@ -185,8 +187,8 @@ set gp_motion_cost_per_row=1.0;
 -- If the query produces a relatively small number of groups in comparison to
 -- the number of input rows, two-stage aggregation will be picked.
 explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c));
-                                                  QUERY PLAN                                                  
---------------------------------------------------------------------------------------------------------------
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1726.51 rows=152 width=20)
    ->  Sequence  (cost=0.00..1726.50 rows=51 width=20)
          ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.19 rows=3334 width=1)
@@ -199,18 +201,20 @@ explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a)
                            ->  Streaming Partial HashAggregate  (cost=0.00..431.91 rows=44 width=16)
                                  Group Key: share0_ref2.b, share0_ref2.c
                                  ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.10 rows=3334 width=12)
-               ->  Finalize HashAggregate  (cost=0.00..431.47 rows=1 width=12)
+               ->  Finalize GroupAggregate  (cost=0.00..431.47 rows=1 width=12)
                      Group Key: share0_ref3.a
-                     ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=1 width=12)
-                           Hash Key: share0_ref3.a
-                           ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=1 width=12)
-                                 Group Key: share0_ref3.a
-                                 ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
+                     ->  Sort  (cost=0.00..431.47 rows=2 width=12)
+                           Sort Key: share0_ref3.a
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=2 width=12)
+                                 Hash Key: share0_ref3.a
+                                 ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=2 width=12)
+                                       Group Key: share0_ref3.a
+                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
                ->  HashAggregate  (cost=0.00..431.91 rows=7 width=16)
                      Group Key: share0_ref4.a, share0_ref4.b
                      ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.10 rows=3334 width=12)
  Optimizer: GPORCA
-(23 rows)
+(25 rows)
 
 select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c));
  a | b  | c  |   sum    
@@ -255,8 +259,8 @@ select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c)
 -- If the query produces a relatively large number of groups in comparison to
 -- the number of input rows, one-stage aggregation will be picked.
 explain select a, b, d, sum(d) from olap_test group by grouping sets((a, b), (a), (b, d));
-                                                  QUERY PLAN                                                   
----------------------------------------------------------------------------------------------------------------
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1727.48 rows=10022 width=20)
    ->  Sequence  (cost=0.00..1726.74 rows=3341 width=20)
          ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.17 rows=3334 width=1)
@@ -268,18 +272,20 @@ explain select a, b, d, sum(d) from olap_test group by grouping sets((a, b), (a)
                            Hash Key: share0_ref2.b, share0_ref2.d
                            ->  Result  (cost=0.00..431.06 rows=3334 width=8)
                                  ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.06 rows=3334 width=8)
-               ->  Finalize HashAggregate  (cost=0.00..431.47 rows=1 width=12)
+               ->  Finalize GroupAggregate  (cost=0.00..431.47 rows=1 width=12)
                      Group Key: share0_ref3.a
-                     ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=1 width=12)
-                           Hash Key: share0_ref3.a
-                           ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=1 width=12)
-                                 Group Key: share0_ref3.a
-                                 ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
+                     ->  Sort  (cost=0.00..431.47 rows=2 width=12)
+                           Sort Key: share0_ref3.a
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=2 width=12)
+                                 Hash Key: share0_ref3.a
+                                 ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=2 width=12)
+                                       Group Key: share0_ref3.a
+                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
                ->  HashAggregate  (cost=0.00..431.91 rows=7 width=16)
                      Group Key: share0_ref4.a, share0_ref4.b
                      ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.10 rows=3334 width=12)
  Optimizer: GPORCA
-(22 rows)
+(24 rows)
 
 -- do not execute this query as it would produce too many tuples.
 -- Test that when the second-stage Agg doesn't try to preserve the
@@ -292,8 +298,8 @@ explain select a, b, d, sum(d) from olap_test group by grouping sets((a, b), (a)
 -- from the Merge Key.
 set enable_hashagg=off;
 explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c)) limit 200;
-                                                     QUERY PLAN                                                     
---------------------------------------------------------------------------------------------------------------------
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
  Limit  (cost=0.00..1726.51 rows=152 width=20)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1726.51 rows=152 width=20)
          ->  Sequence  (cost=0.00..1726.50 rows=51 width=20)
@@ -307,18 +313,20 @@ explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a)
                                  ->  Streaming Partial HashAggregate  (cost=0.00..431.91 rows=44 width=16)
                                        Group Key: share0_ref2.b, share0_ref2.c
                                        ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.10 rows=3334 width=12)
-                     ->  Finalize HashAggregate  (cost=0.00..431.47 rows=1 width=12)
+                     ->  Finalize GroupAggregate  (cost=0.00..431.47 rows=1 width=12)
                            Group Key: share0_ref3.a
-                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=1 width=12)
-                                 Hash Key: share0_ref3.a
-                                 ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=1 width=12)
-                                       Group Key: share0_ref3.a
-                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
+                           ->  Sort  (cost=0.00..431.47 rows=2 width=12)
+                                 Sort Key: share0_ref3.a
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=2 width=12)
+                                       Hash Key: share0_ref3.a
+                                       ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=2 width=12)
+                                             Group Key: share0_ref3.a
+                                             ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
                      ->  HashAggregate  (cost=0.00..431.91 rows=7 width=16)
                            Group Key: share0_ref4.a, share0_ref4.b
                            ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.10 rows=3334 width=12)
  Optimizer: GPORCA
-(24 rows)
+(26 rows)
 
 reset enable_hashagg;
 --
@@ -331,48 +339,40 @@ create table foo_ctas(a int, b int) distributed randomly;
 insert into foo_ctas select g%5, g%2 from generate_series(1, 100) g;
 analyze foo_ctas;
 explain create table bar_ctas as select * from foo_ctas group by a, b distributed by (b);
-                                                 QUERY PLAN                                                 
-------------------------------------------------------------------------------------------------------------
+                                                 QUERY PLAN                                                  
+-------------------------------------------------------------------------------------------------------------
  Result  (cost=0.00..431.10 rows=6 width=8)
    ->  Redistribute Motion 3:3  (slice1; segments: 3)  (cost=0.00..431.01 rows=6 width=8)
          Hash Key: b
          ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
                Group Key: a, b
-               ->  Sort  (cost=0.00..431.01 rows=2 width=8)
+               ->  Sort  (cost=0.00..431.01 rows=34 width=8)
                      Sort Key: a, b
-                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.01 rows=2 width=8)
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
                            Hash Key: a, b
-                           ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
-                                 Group Key: a, b
-                                 ->  Sort  (cost=0.00..431.01 rows=34 width=8)
-                                       Sort Key: a, b
-                                       ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
-(15 rows)
+                           ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
+ Optimizer: GPORCA
+(11 rows)
 
 create table bar_ctas as select * from foo_ctas group by a, b distributed by (b);
 -- Currently, the planner misses this optimization with INSERT, so this
 -- needs an extra Redistribute Motion.
 explain insert into bar_ctas select * from foo_ctas group by a, b;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
  Insert on bar_ctas  (cost=0.00..431.10 rows=2 width=8)
    ->  Result  (cost=0.00..431.01 rows=6 width=12)
          ->  Redistribute Motion 3:3  (slice1; segments: 3)  (cost=0.00..431.01 rows=6 width=8)
                Hash Key: foo_ctas.b
                ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
                      Group Key: foo_ctas.a, foo_ctas.b
-                     ->  Sort  (cost=0.00..431.01 rows=2 width=8)
+                     ->  Sort  (cost=0.00..431.01 rows=34 width=8)
                            Sort Key: foo_ctas.a, foo_ctas.b
-                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.01 rows=2 width=8)
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
                                  Hash Key: foo_ctas.a, foo_ctas.b
-                                 ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
-                                       Group Key: foo_ctas.a, foo_ctas.b
-                                       ->  Sort  (cost=0.00..431.01 rows=34 width=8)
-                                             Sort Key: foo_ctas.a, foo_ctas.b
-                                             ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
-(16 rows)
+                                 ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
+ Optimizer: GPORCA
+(12 rows)
 
 drop table foo_ctas;
 drop table bar_ctas;
diff --git a/contrib/pax_storage/src/test/regress/expected/qp_misc.out b/contrib/pax_storage/src/test/regress/expected/qp_misc.out
index 5dbf5419ad6..28adde90fe9 100644
--- a/contrib/pax_storage/src/test/regress/expected/qp_misc.out
+++ b/contrib/pax_storage/src/test/regress/expected/qp_misc.out
@@ -745,7 +745,7 @@ f1,f2,f3
 
 -- SubqueryInCase_p1
 -- test expected to fail until function supported in GPDB
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryInCase_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -848,7 +848,7 @@ f1,f2,f3
 
 -- SubqueryPredicateNotIn_p1
 -- test expected to fail until function supported in GPDB
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryPredicateNotIn_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -923,7 +923,7 @@ f1,f2,f3
 
 -- SubqueryQuantifiedPredicateEmpty_p1
 -- test expected to fail until GPDB support this function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateEmpty_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -943,7 +943,7 @@ f1,f2,f3
 
 -- SubqueryQuantifiedPredicateLarge_p1
 -- test expected to fail until GPDB supports this function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateLarge_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -2732,7 +2732,7 @@ f1
 
 -- SubqueryQuantifiedPredicateNull_gp_p1
 -- test expected to fail until GPDB support function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateNull_gp_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1, count(*) c  from (
@@ -2749,7 +2749,7 @@ f1
 
 -- SubqueryQuantifiedPredicateSmall_gp_p1
 -- test expected to fail until GPDB supports function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateSmall_gp_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1, count(*) c  from (
diff --git a/contrib/pax_storage/src/test/regress/expected/qp_misc_rio_join_small.out b/contrib/pax_storage/src/test/regress/expected/qp_misc_rio_join_small.out
index 9c38612fbcd..334180e2645 100644
--- a/contrib/pax_storage/src/test/regress/expected/qp_misc_rio_join_small.out
+++ b/contrib/pax_storage/src/test/regress/expected/qp_misc_rio_join_small.out
@@ -31,10 +31,10 @@ CREATE TABLE my_tt_agg_small (
 --
 COPY my_tt_agg_small (symbol, event_ts, trade_price, trade_volume) FROM stdin;
 --
--- Cloudberry Database database dump complete
+-- Apache Cloudberry database dump complete
 --
 --
--- Cloudberry Database database dump
+-- Apache Cloudberry database dump
 --
 --
 -- Name: my_tq_agg_small; Type: TABLE; Schema: public; Tablespace: 
@@ -55,7 +55,7 @@ COPY my_tq_agg_small (ets, sym, bid_price, ask_price, end_ts) FROM stdin;
 --
 CREATE INDEX my_tq_agg_small_ets_end_ts_ix ON my_tq_agg_small USING btree (ets, end_ts);
 --
--- Cloudberry Database database dump complete
+-- Apache Cloudberry database dump complete
 --
 set enable_hashjoin=off;
 create index my_tt_agg_small_event_ts_ix on my_tt_agg_small(event_ts);
diff --git a/contrib/pax_storage/src/test/regress/expected/qp_with_clause.out b/contrib/pax_storage/src/test/regress/expected/qp_with_clause.out
index 2a496cc0f7a..f2b67df8d8f 100644
--- a/contrib/pax_storage/src/test/regress/expected/qp_with_clause.out
+++ b/contrib/pax_storage/src/test/regress/expected/qp_with_clause.out
@@ -11089,7 +11089,7 @@ ORDER BY 1, 2, 3, 4 DESC LIMIT 25;
  35NAME        |              7 | 5NAME        |              1
 (25 rows)
 
--- Test that SharedInputScan within the same slice is always executed 
+-- Test that ShareInputScan within the same slice is always executed 
 set gp_cte_sharing=on;
 -- start_ignore
 CREATE TABLE car (a int, b int);
diff --git a/contrib/pax_storage/src/test/regress/expected/query_finish_pending.out b/contrib/pax_storage/src/test/regress/expected/query_finish_pending.out
index cd162170e13..f075a0f75a2 100644
--- a/contrib/pax_storage/src/test/regress/expected/query_finish_pending.out
+++ b/contrib/pax_storage/src/test/regress/expected/query_finish_pending.out
@@ -92,7 +92,7 @@ select gp_inject_fault('execsort_sort_bounded_heap', 'status', 2);
  
 (1 row)
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node
 drop table if exists testsisc;
 NOTICE:  table "testsisc" does not exist, skipping
@@ -104,7 +104,7 @@ insert into testsisc select i, i % 1000, i % 100000, i % 75 from
 	(select count(*) as nsegments from gp_segment_configuration where role='p' and content >= 0) foo) bar; 
 set gp_resqueue_print_operator_memory_limits=on;
 set statement_mem='2MB';
--- ORCA does not generate SharedInputScan with a Sort node underneath it. For
+-- ORCA does not generate ShareInputScan with a Sort node underneath it. For
 -- the following query, ORCA disregards the order by inside the cte definition;
 -- planner on the other hand does not.
 set optimizer=off;
@@ -114,8 +114,8 @@ select gp_inject_fault('execshare_input_next', 'reset', 2);
  Success:
 (1 row)
 
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
  gp_inject_fault 
 -----------------
@@ -137,7 +137,7 @@ select gp_inject_fault('execshare_input_next', 'status', 2);
  
 (1 row)
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node and sort_mk algorithm is used
 select gp_inject_fault('execshare_input_next', 'reset', 2);
  gp_inject_fault 
@@ -145,8 +145,8 @@ select gp_inject_fault('execshare_input_next', 'reset', 2);
  Success:
 (1 row)
 
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
  gp_inject_fault 
 -----------------
diff --git a/contrib/pax_storage/src/test/regress/expected/rowsecurity.out b/contrib/pax_storage/src/test/regress/expected/rowsecurity.out
index 4cd81f77e1e..60b9a3ed711 100644
--- a/contrib/pax_storage/src/test/regress/expected/rowsecurity.out
+++ b/contrib/pax_storage/src/test/regress/expected/rowsecurity.out
@@ -6,7 +6,7 @@
 SET client_min_messages TO 'warning';
 SET gp_enable_relsize_collection to on;
 -- Pax filter will call the f_leak, then output is not right
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 DROP USER IF EXISTS regress_rls_alice;
 DROP USER IF EXISTS regress_rls_bob;
 DROP USER IF EXISTS regress_rls_carol;
@@ -1878,15 +1878,15 @@ AND f_leak(t2_1.b) AND f_leak(t2_2.b) RETURNING *, t2_1, t2_2;
    ->  Update on t2 t2_1
          ->  Explicit Redistribute Motion 3:3  (slice2; segments: 3)
                ->  Hash Join
-                     Hash Cond: (t2_2.b = t2_1.b)
+                     Hash Cond: (t2_1.b = t2_2.b)
                      ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                           Hash Key: t2_2.b
-                           ->  Seq Scan on t2 t2_2
+                           Hash Key: t2_1.b
+                           ->  Seq Scan on t2 t2_1
                                  Filter: ((a = 3) AND ((a % 2) = 1) AND f_leak(b))
                      ->  Hash
                            ->  Redistribute Motion 3:3  (slice4; segments: 3)
-                                 Hash Key: t2_1.b
-                                 ->  Seq Scan on t2 t2_1
+                                 Hash Key: t2_2.b
+                                 ->  Seq Scan on t2 t2_2
                                        Filter: ((a = 3) AND ((a % 2) = 1) AND f_leak(b))
  Optimizer: Postgres query optimizer
 (15 rows)
@@ -4148,4 +4148,4 @@ CREATE POLICY p1 ON rls_tbl_force USING (c1 = 5) WITH CHECK (c1 < 5);
 CREATE POLICY p2 ON rls_tbl_force FOR SELECT USING (c1 = 8);
 CREATE POLICY p3 ON rls_tbl_force FOR UPDATE USING (c1 = 8) WITH CHECK (c1 >= 5);
 CREATE POLICY p4 ON rls_tbl_force FOR DELETE USING (c1 = 8);
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/expected/rowsecurity_optimizer.out b/contrib/pax_storage/src/test/regress/expected/rowsecurity_optimizer.out
index da828356739..c5229896acf 100644
--- a/contrib/pax_storage/src/test/regress/expected/rowsecurity_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/rowsecurity_optimizer.out
@@ -6,7 +6,7 @@
 SET client_min_messages TO 'warning';
 SET gp_enable_relsize_collection to on;
 -- Pax filter will call the f_leak, then output is not right
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 DROP USER IF EXISTS regress_rls_alice;
 DROP USER IF EXISTS regress_rls_bob;
 DROP USER IF EXISTS regress_rls_carol;
@@ -1878,15 +1878,15 @@ AND f_leak(t2_1.b) AND f_leak(t2_2.b) RETURNING *, t2_1, t2_2;
    ->  Update on t2 t2_1
          ->  Explicit Redistribute Motion 3:3  (slice2; segments: 3)
                ->  Hash Join
-                     Hash Cond: (t2_2.b = t2_1.b)
+                     Hash Cond: (t2_1.b = t2_2.b)
                      ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                           Hash Key: t2_2.b
-                           ->  Seq Scan on t2 t2_2
+                           Hash Key: t2_1.b
+                           ->  Seq Scan on t2 t2_1
                                  Filter: ((a = 3) AND ((a % 2) = 1) AND f_leak(b))
                      ->  Hash
                            ->  Redistribute Motion 3:3  (slice4; segments: 3)
-                                 Hash Key: t2_1.b
-                                 ->  Seq Scan on t2 t2_1
+                                 Hash Key: t2_2.b
+                                 ->  Seq Scan on t2 t2_2
                                        Filter: ((a = 3) AND ((a % 2) = 1) AND f_leak(b))
  Optimizer: Postgres query optimizer
 (15 rows)
@@ -4162,4 +4162,4 @@ CREATE POLICY p1 ON rls_tbl_force USING (c1 = 5) WITH CHECK (c1 < 5);
 CREATE POLICY p2 ON rls_tbl_force FOR SELECT USING (c1 = 8);
 CREATE POLICY p3 ON rls_tbl_force FOR UPDATE USING (c1 = 8) WITH CHECK (c1 >= 5);
 CREATE POLICY p4 ON rls_tbl_force FOR DELETE USING (c1 = 8);
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/expected/select_views.out b/contrib/pax_storage/src/test/regress/expected/select_views.out
index 0865c2638db..5b87a438ca8 100644
--- a/contrib/pax_storage/src/test/regress/expected/select_views.out
+++ b/contrib/pax_storage/src/test/regress/expected/select_views.out
@@ -2,7 +2,7 @@
 -- SELECT_VIEWS
 -- test the views defined in CREATE_VIEWS
 --
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 SELECT * FROM street;
                 name                |                                                                                                                                                                                                                   thepath                                                                                                                                                                                                                    |   cname   
 ------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------
@@ -1581,4 +1581,4 @@ NOTICE:  f_leak => hamburger  (seg0 slice1 127.0.0.1:25432 pid=890)
 -- Cleanup.
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_alice;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/expected/select_views_optimizer.out b/contrib/pax_storage/src/test/regress/expected/select_views_optimizer.out
index b4f5ce7faa7..e5691b5969a 100644
--- a/contrib/pax_storage/src/test/regress/expected/select_views_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/select_views_optimizer.out
@@ -2,7 +2,7 @@
 -- SELECT_VIEWS
 -- test the views defined in CREATE_VIEWS
 --
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 SELECT * FROM street;
                 name                |                                                                                                                                                                                                                   thepath                                                                                                                                                                                                                    |   cname   
 ------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------
@@ -1589,4 +1589,4 @@ NOTICE:  f_leak => hamburger  (seg1 slice1 127.0.0.1:7003 pid=16817)
 -- Cleanup.
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_alice;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/expected/shared_scan_optimizer.out b/contrib/pax_storage/src/test/regress/expected/shared_scan_optimizer.out
index a8ab8bd0c23..a256c71063a 100644
--- a/contrib/pax_storage/src/test/regress/expected/shared_scan_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/shared_scan_optimizer.out
@@ -111,7 +111,7 @@ WITH cte AS (SELECT * FROM t1 WHERE random() < 0.1 LIMIT 10) SELECT a, 1, 1 FROM
                                  ->  Shared Scan (share slice:id 3:0)
                      ->  Hash
                            ->  Seq Scan on t2
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (17 rows)
 
 -- This functions returns one more column than expected.
diff --git a/contrib/pax_storage/src/test/regress/expected/stats_ext.out b/contrib/pax_storage/src/test/regress/expected/stats_ext.out
index 1891db48e66..9de552fb0aa 100644
--- a/contrib/pax_storage/src/test/regress/expected/stats_ext.out
+++ b/contrib/pax_storage/src/test/regress/expected/stats_ext.out
@@ -4,7 +4,7 @@
 -- roughly the same estimates as in upstream.
 set gp_selectivity_damping_for_scans = off;
 set gp_selectivity_damping_for_joins = off;
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 -- Set constraint_exclusion to partition as same as upstream to make test pass.
 set constraint_exclusion to 'partition';
 --
@@ -3233,4 +3233,4 @@ NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to table tststats.priv_test_tbl
 drop cascades to view tststats.priv_test_view
 DROP USER regress_stats_user1;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/expected/stats_ext_optimizer.out b/contrib/pax_storage/src/test/regress/expected/stats_ext_optimizer.out
index 46a9c4b4273..a3818d9bf0c 100644
--- a/contrib/pax_storage/src/test/regress/expected/stats_ext_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/stats_ext_optimizer.out
@@ -4,7 +4,7 @@
 -- roughly the same estimates as in upstream.
 set gp_selectivity_damping_for_scans = off;
 set gp_selectivity_damping_for_joins = off;
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 -- Set constraint_exclusion to partition as same as upstream to make test pass.
 set constraint_exclusion to 'partition';
 --
@@ -3268,4 +3268,4 @@ NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to table tststats.priv_test_tbl
 drop cascades to view tststats.priv_test_view
 DROP USER regress_stats_user1;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/expected/subselect_gp_optimizer.out b/contrib/pax_storage/src/test/regress/expected/subselect_gp_optimizer.out
index 41ab2a59a70..8c4b96b6be8 100644
--- a/contrib/pax_storage/src/test/regress/expected/subselect_gp_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/subselect_gp_optimizer.out
@@ -1643,110 +1643,102 @@ EXPLAIN SELECT '' AS five, f1 AS "Correlated Field"
 EXPLAIN select count(*) from
   (select 1 from tenk1 a
    where unique1 IN (select hundred from tenk1 b)) ss;
-                                                       QUERY PLAN                                                        
--------------------------------------------------------------------------------------------------------------------------
+                                                     QUERY PLAN                                                     
+--------------------------------------------------------------------------------------------------------------------
  Finalize Aggregate  (cost=0.00..826.06 rows=1 width=8)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..826.06 rows=1 width=8)
          ->  Partial Aggregate  (cost=0.00..826.06 rows=1 width=8)
                ->  Nested Loop  (cost=0.00..826.06 rows=34 width=1)
                      Join Filter: true
-                     ->  GroupAggregate  (cost=0.00..431.94 rows=34 width=4)
+                     ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                            Group Key: b.hundred
-                           ->  Sort  (cost=0.00..431.94 rows=34 width=4)
-                                 Sort Key: b.hundred
-                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.94 rows=34 width=4)
-                                       Hash Key: b.hundred
-                                       ->  Streaming HashAggregate  (cost=0.00..431.94 rows=34 width=4)
-                                             Group Key: b.hundred
-                                             ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                 Hash Key: b.hundred
+                                 ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                       Group Key: b.hundred
+                                       ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
                      ->  Bitmap Heap Scan on tenk1 a  (cost=0.00..394.11 rows=1 width=1)
                            Recheck Cond: (unique1 = b.hundred)
                            ->  Bitmap Index Scan on tenk1_unique1  (cost=0.00..0.00 rows=0 width=0)
                                  Index Cond: (unique1 = b.hundred)
  Optimizer: GPORCA
-(19 rows)
+(17 rows)
 
 EXPLAIN select count(distinct ss.ten) from
   (select ten from tenk1 a
    where unique1 IN (select hundred from tenk1 b)) ss;
-                                                          QUERY PLAN                                                           
--------------------------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=0.00..826.06 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..826.06 rows=1 width=8)
-         ->  Partial Aggregate  (cost=0.00..826.06 rows=1 width=8)
-               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..826.06 rows=34 width=4)
+                                                        QUERY PLAN                                                        
+--------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..826.07 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..826.07 rows=1 width=8)
+         ->  Partial Aggregate  (cost=0.00..826.07 rows=1 width=8)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..826.07 rows=34 width=4)
                      Hash Key: a.ten
-                     ->  Nested Loop  (cost=0.00..826.06 rows=34 width=4)
+                     ->  Nested Loop  (cost=0.00..826.07 rows=34 width=4)
                            Join Filter: true
-                           ->  GroupAggregate  (cost=0.00..431.94 rows=34 width=4)
+                           ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                                  Group Key: b.hundred
-                                 ->  Sort  (cost=0.00..431.94 rows=34 width=4)
-                                       Sort Key: b.hundred
-                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.94 rows=34 width=4)
-                                             Hash Key: b.hundred
-                                             ->  Streaming HashAggregate  (cost=0.00..431.94 rows=34 width=4)
-                                                   Group Key: b.hundred
-                                                   ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                       Hash Key: b.hundred
+                                       ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                             Group Key: b.hundred
+                                             ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
                            ->  Bitmap Heap Scan on tenk1 a  (cost=0.00..394.12 rows=1 width=4)
                                  Recheck Cond: (unique1 = b.hundred)
                                  ->  Bitmap Index Scan on tenk1_unique1  (cost=0.00..0.00 rows=0 width=0)
                                        Index Cond: (unique1 = b.hundred)
  Optimizer: GPORCA
-(21 rows)
+(19 rows)
 
 EXPLAIN select count(*) from
   (select 1 from tenk1 a
    where unique1 IN (select distinct hundred from tenk1 b)) ss;
-                                                       QUERY PLAN                                                        
--------------------------------------------------------------------------------------------------------------------------
+                                                     QUERY PLAN                                                     
+--------------------------------------------------------------------------------------------------------------------
  Finalize Aggregate  (cost=0.00..826.06 rows=1 width=8)
    ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..826.06 rows=1 width=8)
          ->  Partial Aggregate  (cost=0.00..826.06 rows=1 width=8)
                ->  Nested Loop  (cost=0.00..826.06 rows=34 width=1)
                      Join Filter: true
-                     ->  GroupAggregate  (cost=0.00..431.94 rows=34 width=4)
+                     ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                            Group Key: b.hundred
-                           ->  Sort  (cost=0.00..431.94 rows=34 width=4)
-                                 Sort Key: b.hundred
-                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.94 rows=34 width=4)
-                                       Hash Key: b.hundred
-                                       ->  Streaming HashAggregate  (cost=0.00..431.94 rows=34 width=4)
-                                             Group Key: b.hundred
-                                             ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                 Hash Key: b.hundred
+                                 ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                       Group Key: b.hundred
+                                       ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
                      ->  Bitmap Heap Scan on tenk1 a  (cost=0.00..394.11 rows=1 width=1)
                            Recheck Cond: (unique1 = b.hundred)
                            ->  Bitmap Index Scan on tenk1_unique1  (cost=0.00..0.00 rows=0 width=0)
                                  Index Cond: (unique1 = b.hundred)
  Optimizer: GPORCA
-(19 rows)
+(17 rows)
 
 EXPLAIN select count(distinct ss.ten) from
   (select ten from tenk1 a
    where unique1 IN (select distinct hundred from tenk1 b)) ss;
-                                                          QUERY PLAN                                                           
--------------------------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=0.00..826.06 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..826.06 rows=1 width=8)
-         ->  Partial Aggregate  (cost=0.00..826.06 rows=1 width=8)
-               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..826.06 rows=34 width=4)
+                                                        QUERY PLAN                                                        
+--------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..826.07 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..826.07 rows=1 width=8)
+         ->  Partial Aggregate  (cost=0.00..826.07 rows=1 width=8)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..826.07 rows=34 width=4)
                      Hash Key: a.ten
-                     ->  Nested Loop  (cost=0.00..826.06 rows=34 width=4)
+                     ->  Nested Loop  (cost=0.00..826.07 rows=34 width=4)
                            Join Filter: true
-                           ->  GroupAggregate  (cost=0.00..431.94 rows=34 width=4)
+                           ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                                  Group Key: b.hundred
-                                 ->  Sort  (cost=0.00..431.94 rows=34 width=4)
-                                       Sort Key: b.hundred
-                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.94 rows=34 width=4)
-                                             Hash Key: b.hundred
-                                             ->  Streaming HashAggregate  (cost=0.00..431.94 rows=34 width=4)
-                                                   Group Key: b.hundred
-                                                   ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                       Hash Key: b.hundred
+                                       ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                             Group Key: b.hundred
+                                             ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
                            ->  Bitmap Heap Scan on tenk1 a  (cost=0.00..394.12 rows=1 width=4)
                                  Recheck Cond: (unique1 = b.hundred)
                                  ->  Bitmap Index Scan on tenk1_unique1  (cost=0.00..0.00 rows=0 width=0)
                                        Index Cond: (unique1 = b.hundred)
  Optimizer: GPORCA
-(21 rows)
+(19 rows)
 
 --
 -- In case of simple exists query, planner can generate alternative
diff --git a/contrib/pax_storage/src/test/regress/expected/tsrf_optimizer.out b/contrib/pax_storage/src/test/regress/expected/tsrf_optimizer.out
index 187b086d4cb..90a3a352a98 100644
--- a/contrib/pax_storage/src/test/regress/expected/tsrf_optimizer.out
+++ b/contrib/pax_storage/src/test/regress/expected/tsrf_optimizer.out
@@ -88,15 +88,16 @@ ANALYZE few;
 -- SRF with a provably-dummy relation
 explain (verbose, costs off)
 SELECT unnest(ARRAY[1, 2]) FROM few WHERE false;
-              QUERY PLAN              
---------------------------------------
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
  ProjectSet
    Output: unnest('{1,2}'::integer[])
    ->  Result
-         Output: NULL::integer, NULL::tid, NULL::xid, NULL::cid, NULL::xid, NULL::cid, NULL::oid, NULL::integer, NULL::oid
+         Output: NULL::integer, NULL::tid, NULL::oid, NULL::integer, NULL::oid
          One-Time Filter: false
- Optimizer: Pivotal Optimizer (GPORCA)
-(6 rows)
+ Settings: optimizer = 'on'
+ Optimizer: GPORCA
+(7 rows)
 
 SELECT unnest(ARRAY[1, 2]) FROM few WHERE false;
  unnest 
@@ -117,12 +118,12 @@ SELECT * FROM few f1,
          ->  ProjectSet
                Output: unnest('{1,2}'::integer[])
                ->  Result
-                     Output: NULL::integer, NULL::tid, NULL::xid, NULL::cid, NULL::xid, NULL::cid, NULL::oid, NULL::integer, NULL::oid
+                     Output: NULL::integer, NULL::tid, NULL::oid, NULL::integer, NULL::oid
                      One-Time Filter: false
          ->  Seq Scan on public.few f1
                Output: id, dataa, datab
- Settings: enable_parallel = 'off', optimizer = 'on'
- Optimizer: Pivotal Optimizer (GPORCA)
+ Settings: optimizer = 'on'
+ Optimizer: GPORCA
 (14 rows)
 
 SELECT * FROM few f1,
diff --git a/contrib/pax_storage/src/test/regress/input/external_table.source b/contrib/pax_storage/src/test/regress/input/external_table.source
index ea018e581bf..e4d57c1ae83 100644
--- a/contrib/pax_storage/src/test/regress/input/external_table.source
+++ b/contrib/pax_storage/src/test/regress/input/external_table.source
@@ -1365,10 +1365,22 @@ SELECT COUNT(*) FROM gp_read_error_log('exttab_heap_join_1');
 \! rm @abs_srcdir@/data/tableless.csv
 
 -- start_ignore
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 -- end_ignore
 
--- Create external table with on clause
+-- Create external table on coordinator
+-- good, should fetch data from coordinator
+CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY  INTEGER ,
+                            N_NAME       CHAR(25) ,
+                            N_REGIONKEY  INTEGER ,
+                            N_COMMENT    VARCHAR(152))
+location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
+FORMAT 'text' (delimiter '|');
+SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+
+-- bad, should error
 CREATE EXTERNAL TABLE exttab_with_on_coordinator( i int, j text )
 LOCATION ('file://@hostname@@abs_srcdir@/data/exttab_few_errors.data') ON COORDINATOR FORMAT 'TEXT' (DELIMITER '|');
 
diff --git a/contrib/pax_storage/src/test/regress/input/temp_tablespaces.source b/contrib/pax_storage/src/test/regress/input/temp_tablespaces.source
index c3d19970517..c36522fe90d 100644
--- a/contrib/pax_storage/src/test/regress/input/temp_tablespaces.source
+++ b/contrib/pax_storage/src/test/regress/input/temp_tablespaces.source
@@ -45,7 +45,7 @@ CREATE TABLE tts_foo (i int, j int) distributed by(i);
 insert into tts_foo select i, i from generate_series(1,80000)i;
 ANALYZE tts_foo;
 set gp_cte_sharing=on;
--- CBDB_PARALLEL_FIXME: since we disabled shared input scan in parallel mode, sisc_xslice_temp_files
+-- CBDB_PARALLEL_FIXME: since we disabled Share Input Scan in parallel mode, sisc_xslice_temp_files
 -- will never be triggered. We need set max_parallel_workers_per_gather to 0 in this case.
 set max_parallel_workers_per_gather = 0;
 
diff --git a/contrib/pax_storage/src/test/regress/mem_quota_util.py b/contrib/pax_storage/src/test/regress/mem_quota_util.py
index 6e38a380029..7d830530c24 100755
--- a/contrib/pax_storage/src/test/regress/mem_quota_util.py
+++ b/contrib/pax_storage/src/test/regress/mem_quota_util.py
@@ -17,7 +17,7 @@
     from multiprocessing import Process
     from gppylib.commands import unix
 except Exception as e:
-    sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e))
+    sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e))
 
 def parseargs( help=False ):
     parser = OptionParser()
diff --git a/contrib/pax_storage/src/test/regress/output/external_table.source b/contrib/pax_storage/src/test/regress/output/external_table.source
index 19791a992c3..53c72200f01 100644
--- a/contrib/pax_storage/src/test/regress/output/external_table.source
+++ b/contrib/pax_storage/src/test/regress/output/external_table.source
@@ -2601,14 +2601,36 @@ SELECT COUNT(*) FROM gp_read_error_log('exttab_heap_join_1');
 
 \! rm @abs_srcdir@/data/tableless.csv
 -- start_ignore
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+NOTICE:  table "ext_nation_on_coordinator" does not exist, skipping
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 NOTICE:  table "exttab_with_on_coordinator" does not exist, skipping
 -- end_ignore
--- Create external table with on clause
+-- Create external table on coordinator
+-- good, should fetch data from coordinator
+CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY  INTEGER ,
+                            N_NAME       CHAR(25) ,
+                            N_REGIONKEY  INTEGER ,
+                            N_COMMENT    VARCHAR(152))
+location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
+FORMAT 'text' (delimiter '|');
+SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
+ gp_segment_id | n_nationkey |          n_name           | n_regionkey |                                                   n_comment                                                    
+---------------+-------------+---------------------------+-------------+----------------------------------------------------------------------------------------------------------------
+            -1 |          24 | UNITED STATES             |           1 | y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
+            -1 |          23 | UNITED KINGDOM            |           3 | eans boost carefully special requests. accounts are. carefull
+            -1 |          22 | RUSSIA                    |           3 |  requests against the platelets use never according to the quickly regular pint
+            -1 |          21 | VIETNAM                   |           2 | hely enticingly express accounts. even, final 
+            -1 |          20 | SAUDI ARABIA              |           4 | ts. silent requests haggle. closely express packages sleep across the blithely
+(5 rows)
+
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+-- bad, should error
 CREATE EXTERNAL TABLE exttab_with_on_coordinator( i int, j text )
 LOCATION ('file://@hostname@@abs_srcdir@/data/exttab_few_errors.data') ON COORDINATOR FORMAT 'TEXT' (DELIMITER '|');
 SELECT * FROM exttab_with_on_coordinator;
-ERROR:  'ON COORDINATOR' is not supported by this protocol yet
+ERROR:  invalid input syntax for type integer: "error_0"
+CONTEXT:  External table exttab_with_on_coordinator, line 3 of file://@hostname@@abs_srcdir@/data/exttab_few_errors.data, column i
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 -- start_ignore
 DROP EXTERNAL TABLE IF EXISTS exttab_with_option_empty;
diff --git a/contrib/pax_storage/src/test/regress/output/external_table_optimizer.source b/contrib/pax_storage/src/test/regress/output/external_table_optimizer.source
index 68523e63aae..6c4f884d292 100644
--- a/contrib/pax_storage/src/test/regress/output/external_table_optimizer.source
+++ b/contrib/pax_storage/src/test/regress/output/external_table_optimizer.source
@@ -2601,14 +2601,36 @@ SELECT COUNT(*) FROM gp_read_error_log('exttab_heap_join_1');
 
 \! rm @abs_srcdir@/data/tableless.csv
 -- start_ignore
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+NOTICE:  table "ext_nation_on_coordinator" does not exist, skipping
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 NOTICE:  table "exttab_with_on_coordinator" does not exist, skipping
 -- end_ignore
--- Create external table with on clause
+-- Create external table on coordinator
+-- good, should fetch data from coordinator
+CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY  INTEGER ,
+                            N_NAME       CHAR(25) ,
+                            N_REGIONKEY  INTEGER ,
+                            N_COMMENT    VARCHAR(152))
+location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
+FORMAT 'text' (delimiter '|');
+SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
+ gp_segment_id | n_nationkey |          n_name           | n_regionkey |                                                   n_comment                                                    
+---------------+-------------+---------------------------+-------------+----------------------------------------------------------------------------------------------------------------
+            -1 |          24 | UNITED STATES             |           1 | y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
+            -1 |          23 | UNITED KINGDOM            |           3 | eans boost carefully special requests. accounts are. carefull
+            -1 |          22 | RUSSIA                    |           3 |  requests against the platelets use never according to the quickly regular pint
+            -1 |          21 | VIETNAM                   |           2 | hely enticingly express accounts. even, final 
+            -1 |          20 | SAUDI ARABIA              |           4 | ts. silent requests haggle. closely express packages sleep across the blithely
+(5 rows)
+
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+-- bad, should error
 CREATE EXTERNAL TABLE exttab_with_on_coordinator( i int, j text )
 LOCATION ('file://@hostname@@abs_srcdir@/data/exttab_few_errors.data') ON COORDINATOR FORMAT 'TEXT' (DELIMITER '|');
 SELECT * FROM exttab_with_on_coordinator;
-ERROR:  'ON COORDINATOR' is not supported by this protocol yet
+ERROR:  invalid input syntax for type integer: "error_0"
+CONTEXT:  External table exttab_with_on_coordinator, line 3 of file://@hostname@@abs_srcdir@/data/exttab_few_errors.data, column i
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 -- start_ignore
 DROP EXTERNAL TABLE IF EXISTS exttab_with_option_empty;
diff --git a/contrib/pax_storage/src/test/regress/output/temp_tablespaces.source b/contrib/pax_storage/src/test/regress/output/temp_tablespaces.source
index 1f579686f3d..f11164ce226 100644
--- a/contrib/pax_storage/src/test/regress/output/temp_tablespaces.source
+++ b/contrib/pax_storage/src/test/regress/output/temp_tablespaces.source
@@ -56,7 +56,7 @@ CREATE TABLE tts_foo (i int, j int) distributed by(i);
 insert into tts_foo select i, i from generate_series(1,80000)i;
 ANALYZE tts_foo;
 set gp_cte_sharing=on;
--- CBDB_PARALLEL_FIXME: since we disabled shared input scan in parallel mode, sisc_xslice_temp_files
+-- CBDB_PARALLEL_FIXME: since we disabled Share Input Scan in parallel mode, sisc_xslice_temp_files
 -- will never be triggered. We need set max_parallel_workers_per_gather to 0 in this case.
 set max_parallel_workers_per_gather = 0;
 -- CASE 1: when temp_tablespaces is set, hashagg and share-input-scan
diff --git a/contrib/pax_storage/src/test/regress/sql/agg_pushdown.sql b/contrib/pax_storage/src/test/regress/sql/agg_pushdown.sql
index 3378f8b64e6..0d1e45ae992 100644
--- a/contrib/pax_storage/src/test/regress/sql/agg_pushdown.sql
+++ b/contrib/pax_storage/src/test/regress/sql/agg_pushdown.sql
@@ -1,5 +1,8 @@
 -- disable ORCA
 SET optimizer TO off;
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 -- Test case group 1: basic functions
 CREATE TABLE agg_pushdown_parent (
diff --git a/contrib/pax_storage/src/test/regress/sql/aggregates.sql b/contrib/pax_storage/src/test/regress/sql/aggregates.sql
index 158223e2633..136c70fb384 100644
--- a/contrib/pax_storage/src/test/regress/sql/aggregates.sql
+++ b/contrib/pax_storage/src/test/regress/sql/aggregates.sql
@@ -1,6 +1,9 @@
 --
 -- AGGREGATES
 --
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 -- start_ignore
 -- end_ignore
diff --git a/contrib/pax_storage/src/test/regress/sql/autostats.sql b/contrib/pax_storage/src/test/regress/sql/autostats.sql
index 42831cda5f9..ce19afac413 100644
--- a/contrib/pax_storage/src/test/regress/sql/autostats.sql
+++ b/contrib/pax_storage/src/test/regress/sql/autostats.sql
@@ -11,7 +11,7 @@
 -- end_matchignore
 set gp_autostats_mode=on_change;
 set gp_autostats_on_change_threshold=9;
-set pax_enable_debug = false;
+set pax.enable_debug = false;
 set log_autostats=on;
 set client_min_messages=log;
 reset optimizer_trace_fallback;
diff --git a/contrib/pax_storage/src/test/regress/sql/bfv_aggregate.sql b/contrib/pax_storage/src/test/regress/sql/bfv_aggregate.sql
index 92d90ae72d9..8bc9d97c513 100644
--- a/contrib/pax_storage/src/test/regress/sql/bfv_aggregate.sql
+++ b/contrib/pax_storage/src/test/regress/sql/bfv_aggregate.sql
@@ -1,5 +1,8 @@
 create schema bfv_aggregate;
 set search_path=bfv_aggregate;
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 --
 -- Window function with outer references in PARTITION BY/ORDER BY clause
diff --git a/contrib/pax_storage/src/test/regress/sql/cbdb_parallel.sql b/contrib/pax_storage/src/test/regress/sql/cbdb_parallel.sql
index ea47dfdcf60..78d2cb382dc 100644
--- a/contrib/pax_storage/src/test/regress/sql/cbdb_parallel.sql
+++ b/contrib/pax_storage/src/test/regress/sql/cbdb_parallel.sql
@@ -695,7 +695,7 @@ declare
  results1 RECORD;
 begin
   create table t_p(c1 int, c2 int) using pax  with(parallel_workers=8) distributed by(c1);
-  set pax_max_tuples_per_file to 131072;
+  set pax.max_tuples_per_file to 131072;
   insert into t_p select i, i+1 from generate_series(1, 10000000)i;
   analyze t_p;
   if ao_row then
diff --git a/contrib/pax_storage/src/test/regress/sql/create_index.sql b/contrib/pax_storage/src/test/regress/sql/create_index.sql
index a0e3fc5ccdc..2cb3cc77fd0 100644
--- a/contrib/pax_storage/src/test/regress/sql/create_index.sql
+++ b/contrib/pax_storage/src/test/regress/sql/create_index.sql
@@ -1111,7 +1111,6 @@ COMMIT;
 -- we keep the `CONCURRENTLY` to make the following commands fail,
 -- so these commands will not cause deadlock with test create_view,
 -- like `drop schema xxx cascade;`.
--- See more details at https://code.hashdata.xyz/cloudberry/cbdb/-/issues/54
 REINDEX TABLE CONCURRENTLY pg_class; -- no catalog relation
 REINDEX INDEX CONCURRENTLY pg_class_oid_index; -- no catalog index
 -- These are the toast table and index of pg_authid.
diff --git a/contrib/pax_storage/src/test/regress/sql/direct_dispatch.sql b/contrib/pax_storage/src/test/regress/sql/direct_dispatch.sql
index d9e7b562a0a..783c6cf77f6 100644
--- a/contrib/pax_storage/src/test/regress/sql/direct_dispatch.sql
+++ b/contrib/pax_storage/src/test/regress/sql/direct_dispatch.sql
@@ -1,5 +1,8 @@
 -- turn off autostats so we don't have to worry about the logging of the autostat queries
 set gp_autostats_mode = None;
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 -- create needed tables (in a transaction, for speed)
 begin;
diff --git a/contrib/pax_storage/src/test/regress/sql/eagerfree.sql b/contrib/pax_storage/src/test/regress/sql/eagerfree.sql
index 81500e4575b..e2b79d19f9a 100644
--- a/contrib/pax_storage/src/test/regress/sql/eagerfree.sql
+++ b/contrib/pax_storage/src/test/regress/sql/eagerfree.sql
@@ -1,5 +1,8 @@
 create schema eagerfree;
 set search_path=eagerfree;
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 create table smallt (i int, t text, d date) distributed by (i);
 insert into smallt select i%10, 'text ' || (i%15), '2011-01-01'::date + ((i%20) || ' days')::interval
diff --git a/contrib/pax_storage/src/test/regress/sql/gp_aggregates_costs.sql b/contrib/pax_storage/src/test/regress/sql/gp_aggregates_costs.sql
index c1337de6083..8c3263a58bf 100644
--- a/contrib/pax_storage/src/test/regress/sql/gp_aggregates_costs.sql
+++ b/contrib/pax_storage/src/test/regress/sql/gp_aggregates_costs.sql
@@ -5,6 +5,9 @@ insert into cost_agg_t2 select i, random() * 99999, i % 300000 from generate_ser
 analyze cost_agg_t1;
 analyze cost_agg_t2;
 
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 --
 -- Test planner's decisions on aggregates when only little memory is available.
 --
diff --git a/contrib/pax_storage/src/test/regress/sql/gp_hashagg.sql b/contrib/pax_storage/src/test/regress/sql/gp_hashagg.sql
index 36000de8af8..7b880c4e62c 100644
--- a/contrib/pax_storage/src/test/regress/sql/gp_hashagg.sql
+++ b/contrib/pax_storage/src/test/regress/sql/gp_hashagg.sql
@@ -10,6 +10,9 @@ insert into hashagg_test values (1,1,'1/1/2006','hi',2);
 insert into hashagg_test values (1,1,'1/2/2006','hi',3);
 insert into hashagg_test values (1,1,'1/3/2006','hi',4);
 
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 -- this will get the wrong answer (right number of rows, wrong aggregates)
 set enable_seqscan=off;
 select grp,sum(v) from hashagg_test where id1 = 1 and id2 = 1 and day between '1/1/2006' and '1/31/2006' group by grp order by sum(v) desc;
diff --git a/contrib/pax_storage/src/test/regress/sql/gporca.sql b/contrib/pax_storage/src/test/regress/sql/gporca.sql
index 83100dd6c16..b19afd60d7b 100644
--- a/contrib/pax_storage/src/test/regress/sql/gporca.sql
+++ b/contrib/pax_storage/src/test/regress/sql/gporca.sql
@@ -1,6 +1,9 @@
 --
 -- ORCA tests
 --
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 -- show version
 SELECT count(*) from gp_opt_version();
@@ -1977,11 +1980,11 @@ create table foo(a int, b int) distributed by (a);
 -- and log_min_duration_statement, they are the most obvious ones.
 set log_statement='none';
 set log_min_duration_statement=-1;
-set pax_enable_debug to off;
+set pax.enable_debug to off;
 set client_min_messages='log';
 explain select count(*) from foo group by cube(a,b);
 reset client_min_messages;
-reset pax_enable_debug;
+reset pax.enable_debug;
 reset log_statement;
 reset log_min_duration_statement;
 
@@ -2054,11 +2057,11 @@ explain select * from foo where b in ('1', '2');
 set optimizer_enable_ctas = off;
 set log_statement='none';
 set log_min_duration_statement=-1;
-set pax_enable_debug to off;
+set pax.enable_debug to off;
 set client_min_messages='log';
 create table foo_ctas(a) as (select generate_series(1,10)) distributed by (a);
 reset client_min_messages;
-reset pax_enable_debug;
+reset pax.enable_debug;
 reset log_min_duration_statement;
 reset log_statement;
 reset optimizer_enable_ctas;
diff --git a/contrib/pax_storage/src/test/regress/sql/groupingsets.sql b/contrib/pax_storage/src/test/regress/sql/groupingsets.sql
index 835a3cff623..294a52c2036 100644
--- a/contrib/pax_storage/src/test/regress/sql/groupingsets.sql
+++ b/contrib/pax_storage/src/test/regress/sql/groupingsets.sql
@@ -518,6 +518,7 @@ select array(select row(v.a,s1.*) from (select two,four, count(*) from onek grou
 
 -- test the knapsack
 
+set hash_mem_multiplier = 1;
 set enable_indexscan = false;
 set work_mem = '64kB';
 explain (costs off)
@@ -541,6 +542,7 @@ explain (costs off)
          count(*)
     from tenk1 group by grouping sets (unique1,twothousand,thousand,hundred,ten,four,two);
 
+reset hash_mem_multiplier;
 -- check collation-sensitive matching between grouping expressions
 -- (similar to a check for aggregates, but there are additional code
 -- paths for GROUPING, so check again here)
diff --git a/contrib/pax_storage/src/test/regress/sql/incremental_analyze.sql b/contrib/pax_storage/src/test/regress/sql/incremental_analyze.sql
index 5260b8b2e29..ed3ccdc7853 100644
--- a/contrib/pax_storage/src/test/regress/sql/incremental_analyze.sql
+++ b/contrib/pax_storage/src/test/regress/sql/incremental_analyze.sql
@@ -14,7 +14,7 @@ ALTER DATABASE incrementalanalyze SET lc_monetary TO 'C';
 \c incrementalanalyze
 DROP SCHEMA IF EXISTS incremental_analyze;
 CREATE SCHEMA incremental_analyze;
-set pax_enable_debug = false;
+set pax.enable_debug = false;
 -- end_ignore
 -- Test ANALYZE for different data types
 -- Case 1: Partitions have MCVs but after merge, none of the partition MCVs 
diff --git a/contrib/pax_storage/src/test/regress/sql/indexjoin.sql b/contrib/pax_storage/src/test/regress/sql/indexjoin.sql
index b99b561e42c..59290287e3b 100644
--- a/contrib/pax_storage/src/test/regress/sql/indexjoin.sql
+++ b/contrib/pax_storage/src/test/regress/sql/indexjoin.sql
@@ -4,6 +4,9 @@ CREATE TABLE my_tt_agg_small (
     trade_price numeric,
     trade_volume bigint
 ) DISTRIBUTED BY (symbol);
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 
 CREATE TABLE my_tq_agg_small (
diff --git a/contrib/pax_storage/src/test/regress/sql/limit.sql b/contrib/pax_storage/src/test/regress/sql/limit.sql
index e47b3f9bf29..ab44f3b5e36 100644
--- a/contrib/pax_storage/src/test/regress/sql/limit.sql
+++ b/contrib/pax_storage/src/test/regress/sql/limit.sql
@@ -37,7 +37,7 @@ select * from int8_tbl limit (case when random() < 0.5 then null::bigint end);
 select * from int8_tbl offset (case when random() < 0.5 then null::bigint end);
 
 -- Test assorted cases involving backwards fetch from a LIMIT plan node
--- Disable backward scan test which is not supported in this version of Cloudberry Database
+-- Disable backward scan test which is not supported in this version of Apache Cloudberry
 --start_ignore
 /*
  * begin;
diff --git a/contrib/pax_storage/src/test/regress/sql/limit_gp.sql b/contrib/pax_storage/src/test/regress/sql/limit_gp.sql
index 88c934c0779..0a1b4e8fd58 100644
--- a/contrib/pax_storage/src/test/regress/sql/limit_gp.sql
+++ b/contrib/pax_storage/src/test/regress/sql/limit_gp.sql
@@ -2,6 +2,9 @@
 -- Check for MPP-19310 and MPP-19857 where mksort produces wrong result
 -- on OPT build, and fails assertion on debug build if a "LIMIT" query
 -- spills to disk.
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 CREATE TABLE mksort_limit_test_table(dkey INT, jkey INT, rval REAL, tval TEXT default repeat('abcdefghijklmnopqrstuvwxyz', 300)) DISTRIBUTED BY (dkey);
 INSERT INTO mksort_limit_test_table VALUES(generate_series(1, 10000), generate_series(10001, 20000), sqrt(generate_series(10001, 20000)));
diff --git a/contrib/pax_storage/src/test/regress/sql/olap_plans.sql b/contrib/pax_storage/src/test/regress/sql/olap_plans.sql
index c4242a34565..5b7ed221f18 100644
--- a/contrib/pax_storage/src/test/regress/sql/olap_plans.sql
+++ b/contrib/pax_storage/src/test/regress/sql/olap_plans.sql
@@ -2,6 +2,9 @@
 -- Test the planner's ability to produce different kinds of plans to implement
 -- grouping and aggregation.
 --
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 drop table if exists olap_test;
 drop table if exists olap_test_single;
diff --git a/contrib/pax_storage/src/test/regress/sql/partition_aggregate.sql b/contrib/pax_storage/src/test/regress/sql/partition_aggregate.sql
index 0e1ea0eec80..d93f5cffc2c 100644
--- a/contrib/pax_storage/src/test/regress/sql/partition_aggregate.sql
+++ b/contrib/pax_storage/src/test/regress/sql/partition_aggregate.sql
@@ -5,6 +5,9 @@
 -- Note: to ensure plan stability, it's a good idea to make the partitions of
 -- any one partitioned table in this test all have different numbers of rows.
 --
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 -- Disable ORCA since it does support partition-wise aggregates
 set optimizer to off;
diff --git a/contrib/pax_storage/src/test/regress/sql/partition_join.sql b/contrib/pax_storage/src/test/regress/sql/partition_join.sql
index 1d188d1476f..311384e85b2 100644
--- a/contrib/pax_storage/src/test/regress/sql/partition_join.sql
+++ b/contrib/pax_storage/src/test/regress/sql/partition_join.sql
@@ -2,6 +2,9 @@
 -- PARTITION_JOIN
 -- Test partitionwise join between partitioned tables
 --
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 -- Disable ORCA since it does support partition-wise joins
 set optimizer to off;
diff --git a/contrib/pax_storage/src/test/regress/sql/qp_misc.sql b/contrib/pax_storage/src/test/regress/sql/qp_misc.sql
index 7aacbfd5268..3d4e81761b3 100644
--- a/contrib/pax_storage/src/test/regress/sql/qp_misc.sql
+++ b/contrib/pax_storage/src/test/regress/sql/qp_misc.sql
@@ -1,6 +1,6 @@
 -- start_ignore
 --
--- Cloudberry Database database dump
+-- Apache Cloudberry database dump
 --
 
 SET client_encoding = 'UTF8';
@@ -1153,7 +1153,7 @@ ALTER TABLE ONLY tclob
     ADD CONSTRAINT clobpk PRIMARY KEY (rnum);
 
 --
--- Cloudberry Database database dump complete
+-- Apache Cloudberry database dump complete
 --
 
 -- end_ignore
@@ -1379,7 +1379,7 @@ f1,f2,f3
 ) Q ) P;
 -- SubqueryInCase_p1
 -- test expected to fail until function supported in GPDB
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryInCase_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -1452,7 +1452,7 @@ f1,f2,f3
 ) Q ) P;
 -- SubqueryPredicateNotIn_p1
 -- test expected to fail until function supported in GPDB
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryPredicateNotIn_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -1507,7 +1507,7 @@ f1,f2,f3
 ) Q ) P;
 -- SubqueryQuantifiedPredicateEmpty_p1
 -- test expected to fail until GPDB support this function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateEmpty_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -1522,7 +1522,7 @@ f1,f2,f3
 ) Q ) P;
 -- SubqueryQuantifiedPredicateLarge_p1
 -- test expected to fail until GPDB supports this function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support that query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateLarge_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1,f2,f3, count(*) c  from (
@@ -2801,7 +2801,7 @@ f1
 ) Q ) P;
 -- SubqueryQuantifiedPredicateNull_gp_p1
 -- test expected to fail until GPDB support function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateNull_gp_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1, count(*) c  from (
@@ -2813,7 +2813,7 @@ f1
 ) Q ) P;
 -- SubqueryQuantifiedPredicateSmall_gp_p1
 -- test expected to fail until GPDB supports function
--- GPDB Limitation ERROR:  Cloudberry Database does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
+-- GPDB Limitation ERROR:  Apache Cloudberry does not yet support this query.  DETAIL:  The query contains a multi-row subquery.
 select 'SubqueryQuantifiedPredicateSmall_gp_p1' test_name_part, case when c = 1 then 1 else 0 end pass_ind from (
 select count(distinct c) c from (
 select f1, count(*) c  from (
diff --git a/contrib/pax_storage/src/test/regress/sql/qp_misc_rio_join_small.sql b/contrib/pax_storage/src/test/regress/sql/qp_misc_rio_join_small.sql
index bd20eedc202..0ababb42098 100644
--- a/contrib/pax_storage/src/test/regress/sql/qp_misc_rio_join_small.sql
+++ b/contrib/pax_storage/src/test/regress/sql/qp_misc_rio_join_small.sql
@@ -5,7 +5,7 @@ drop index if exists my_tt_agg_small_event_ts_ix;
 
 
 --
--- Cloudberry Database database dump
+-- Apache Cloudberry database dump
 --
 
 SET client_encoding = 'UTF8';
@@ -4042,11 +4042,11 @@ SSO             	20101126114705550	415500	200
 \.
 
 --
--- Cloudberry Database database dump complete
+-- Apache Cloudberry database dump complete
 --
 
 --
--- Cloudberry Database database dump
+-- Apache Cloudberry database dump
 --
 
 --
@@ -24078,7 +24078,7 @@ CREATE INDEX my_tq_agg_small_ets_end_ts_ix ON my_tq_agg_small USING btree (ets,
 
 
 --
--- Cloudberry Database database dump complete
+-- Apache Cloudberry database dump complete
 --
 
 set enable_hashjoin=off;
diff --git a/contrib/pax_storage/src/test/regress/sql/qp_with_clause.sql b/contrib/pax_storage/src/test/regress/sql/qp_with_clause.sql
index ad018427f55..567de4f00d1 100644
--- a/contrib/pax_storage/src/test/regress/sql/qp_with_clause.sql
+++ b/contrib/pax_storage/src/test/regress/sql/qp_with_clause.sql
@@ -10329,7 +10329,7 @@ WHERE  e.deptno = dc1.deptno AND
        m.deptno = dmc1.dept_mgr_no
 ORDER BY 1, 2, 3, 4 DESC LIMIT 25;
 
--- Test that SharedInputScan within the same slice is always executed 
+-- Test that ShareInputScan within the same slice is always executed 
 set gp_cte_sharing=on;
 
 -- start_ignore
diff --git a/contrib/pax_storage/src/test/regress/sql/query_finish_pending.sql b/contrib/pax_storage/src/test/regress/sql/query_finish_pending.sql
index 220fd4c35e5..e2d0a186d0c 100644
--- a/contrib/pax_storage/src/test/regress/sql/query_finish_pending.sql
+++ b/contrib/pax_storage/src/test/regress/sql/query_finish_pending.sql
@@ -38,7 +38,7 @@ reset enable_parallel;
 
 select gp_inject_fault('execsort_sort_bounded_heap', 'status', 2);
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node
 drop table if exists testsisc;
 create table testsisc (i1 int, i2 int, i3 int, i4 int); 
@@ -48,13 +48,13 @@ insert into testsisc select i, i % 1000, i % 100000, i % 75 from
 
 set gp_resqueue_print_operator_memory_limits=on;
 set statement_mem='2MB';
--- ORCA does not generate SharedInputScan with a Sort node underneath it. For
+-- ORCA does not generate ShareInputScan with a Sort node underneath it. For
 -- the following query, ORCA disregards the order by inside the cte definition;
 -- planner on the other hand does not.
 set optimizer=off;
 select gp_inject_fault('execshare_input_next', 'reset', 2);
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
 
 set enable_parallel = off;
@@ -64,13 +64,13 @@ select * from cte c1, cte c2 limit 2;
 
 select gp_inject_fault('execshare_input_next', 'status', 2);
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node and sort_mk algorithm is used
 
 
 select gp_inject_fault('execshare_input_next', 'reset', 2);
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
 
 with cte as (select i2 from testsisc order by i2)
diff --git a/contrib/pax_storage/src/test/regress/sql/rowsecurity.sql b/contrib/pax_storage/src/test/regress/sql/rowsecurity.sql
index 648816bbf22..ba74fed3c00 100644
--- a/contrib/pax_storage/src/test/regress/sql/rowsecurity.sql
+++ b/contrib/pax_storage/src/test/regress/sql/rowsecurity.sql
@@ -8,7 +8,7 @@
 SET client_min_messages TO 'warning';
 SET gp_enable_relsize_collection to on;
 -- Pax filter will call the f_leak, then output is not right
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 
 DROP USER IF EXISTS regress_rls_alice;
 DROP USER IF EXISTS regress_rls_bob;
@@ -1901,4 +1901,4 @@ CREATE POLICY p1 ON rls_tbl_force USING (c1 = 5) WITH CHECK (c1 < 5);
 CREATE POLICY p2 ON rls_tbl_force FOR SELECT USING (c1 = 8);
 CREATE POLICY p3 ON rls_tbl_force FOR UPDATE USING (c1 = 8) WITH CHECK (c1 >= 5);
 CREATE POLICY p4 ON rls_tbl_force FOR DELETE USING (c1 = 8);
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/sql/select_distinct.sql b/contrib/pax_storage/src/test/regress/sql/select_distinct.sql
index 27b63e699a0..35facaa9ca3 100644
--- a/contrib/pax_storage/src/test/regress/sql/select_distinct.sql
+++ b/contrib/pax_storage/src/test/regress/sql/select_distinct.sql
@@ -1,6 +1,9 @@
 --
 -- SELECT_DISTINCT
 --
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 --
 -- awk '{print $3;}' onek.data | sort -n | uniq
diff --git a/contrib/pax_storage/src/test/regress/sql/select_views.sql b/contrib/pax_storage/src/test/regress/sql/select_views.sql
index 0ced30cea91..8270b99d44a 100644
--- a/contrib/pax_storage/src/test/regress/sql/select_views.sql
+++ b/contrib/pax_storage/src/test/regress/sql/select_views.sql
@@ -2,7 +2,7 @@
 -- SELECT_VIEWS
 -- test the views defined in CREATE_VIEWS
 --
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 SELECT * FROM street;
 
 SELECT name, #thepath FROM iexit ORDER BY name COLLATE "C", 2;
@@ -167,4 +167,4 @@ EXECUTE p2;		-- To be perform as a view without security-barrier
 -- Cleanup.
 RESET SESSION AUTHORIZATION;
 DROP ROLE regress_alice;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/sql/shared_scan.sql b/contrib/pax_storage/src/test/regress/sql/shared_scan.sql
index 7234cef6e4a..d37eca9cdce 100644
--- a/contrib/pax_storage/src/test/regress/sql/shared_scan.sql
+++ b/contrib/pax_storage/src/test/regress/sql/shared_scan.sql
@@ -2,6 +2,9 @@
 -- Queries that lead to hanging (not dead lock) when we don't handle synchronization properly in shared scan
 -- Queries that lead to wrong result when we don't finish executing the subtree below the shared scan being squelched.
 --
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 CREATE SCHEMA shared_scan;
 
diff --git a/contrib/pax_storage/src/test/regress/sql/stats_ext.sql b/contrib/pax_storage/src/test/regress/sql/stats_ext.sql
index a6d1362da77..2fa5a327e3f 100644
--- a/contrib/pax_storage/src/test/regress/sql/stats_ext.sql
+++ b/contrib/pax_storage/src/test/regress/sql/stats_ext.sql
@@ -6,7 +6,7 @@
 -- roughly the same estimates as in upstream.
 set gp_selectivity_damping_for_scans = off;
 set gp_selectivity_damping_for_joins = off;
-set pax_enable_sparse_filter to off;
+set pax.enable_sparse_filter to off;
 -- Set constraint_exclusion to partition as same as upstream to make test pass.
 set constraint_exclusion to 'partition';
 
@@ -1644,4 +1644,4 @@ DROP FUNCTION op_leak(int, int);
 RESET SESSION AUTHORIZATION;
 DROP SCHEMA tststats CASCADE;
 DROP USER regress_stats_user1;
-reset pax_enable_sparse_filter;
+reset pax.enable_sparse_filter;
diff --git a/contrib/pax_storage/src/test/regress/sql/tidrangescan.sql b/contrib/pax_storage/src/test/regress/sql/tidrangescan.sql
index 562ec68a792..0f7a99a040c 100644
--- a/contrib/pax_storage/src/test/regress/sql/tidrangescan.sql
+++ b/contrib/pax_storage/src/test/regress/sql/tidrangescan.sql
@@ -97,7 +97,7 @@ DECLARE c SCROLL CURSOR FOR SELECT ctid FROM tidrangescan WHERE ctid < '(1,0)';
 FETCH NEXT c;
 FETCH NEXT c;
 --start_ignore
-/* backward scan is not supported in this version of Cloudberry Database */
+/* backward scan is not supported in this version of Apache Cloudberry */
 /*
 FETCH PRIOR c;
 FETCH FIRST c;
diff --git a/contrib/pax_storage/src/test/regress/sql/window.sql b/contrib/pax_storage/src/test/regress/sql/window.sql
index 6fd72f478e4..3ef1bc824c6 100644
--- a/contrib/pax_storage/src/test/regress/sql/window.sql
+++ b/contrib/pax_storage/src/test/regress/sql/window.sql
@@ -2,6 +2,9 @@
 -- wrong result for some core case. Turn it on to run the existing tests
 -- and minimize the difference from upstream.
 set enable_incremental_sort=on;
+-- start_ignore
+set gp_use_streaming_hashagg = off;
+-- end_ignore
 
 --
 -- WINDOW FUNCTIONS
diff --git a/contrib/pg_buffercache/expected/pg_buffercache.out b/contrib/pg_buffercache/expected/pg_buffercache.out
index 7b41872634e..de77aac68b0 100644
--- a/contrib/pg_buffercache/expected/pg_buffercache.out
+++ b/contrib/pg_buffercache/expected/pg_buffercache.out
@@ -17,9 +17,24 @@ from pg_buffercache_summary();
  t        | t        | t
 (1 row)
 
+SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
+ ?column? 
+----------
+ t
+(1 row)
+
 -- Check that the functions / views can't be accessed by default. To avoid
 -- having to create a dedicated user, use the pg_database_owner pseudo-role.
 SET ROLE pg_database_owner;
+SELECT * FROM pg_buffercache;
+ERROR:  permission denied for view pg_buffercache
+SELECT * FROM pg_buffercache_pages() AS p (wrong int);
+ERROR:  permission denied for function pg_buffercache_pages
+SELECT * FROM pg_buffercache_summary();
+ERROR:  permission denied for function pg_buffercache_summary
+SELECT * FROM pg_buffercache_usage_counts();
+ERROR:  permission denied for function pg_buffercache_usage_counts
+RESET role;
 SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
  ?column? 
 ----------
@@ -72,17 +87,7 @@ SELECT count(*) > 0 FROM gp_buffercache_usage_counts_aggregated WHERE buffers >=
 (1 row)
 
 -- Check that the functions / views can't be accessed by default.
-CREATE ROLE buffercache_test;
-SET ROLE buffercache_test;
-SELECT * FROM pg_buffercache;
-ERROR:  permission denied for view pg_buffercache
-SELECT * FROM pg_buffercache_pages() AS p (wrong int);
-ERROR:  permission denied for function pg_buffercache_pages
-SELECT * FROM pg_buffercache_summary();
-ERROR:  permission denied for function pg_buffercache_summary
-RESET role;
-SELECT * FROM pg_buffercache_usage_counts();
-ERROR:  permission denied for function pg_buffercache_usage_counts
+SET ROLE pg_database_owner;
 -- GPDB
 SELECT * FROM pg_buffercache_summary;
 ERROR:  permission denied for view pg_buffercache_summary
@@ -166,4 +171,3 @@ SELECT count(*) > 0 FROM gp_buffercache_usage_counts_aggregated;
 (1 row)
 
 RESET ROLE;
-DROP ROLE buffercache_test;
diff --git a/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql b/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql
index 8f212dc5e93..d5aebf3ba39 100644
--- a/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql
+++ b/contrib/pg_buffercache/pg_buffercache--1.3--1.4.sql
@@ -12,6 +12,17 @@ CREATE FUNCTION pg_buffercache_summary(
 AS 'MODULE_PATHNAME', 'pg_buffercache_summary'
 LANGUAGE C PARALLEL SAFE;
 
+CREATE FUNCTION pg_buffercache_usage_counts(
+    OUT usage_count int4,
+    OUT buffers int4,
+    OUT dirty int4,
+    OUT pinned int4)
+RETURNS SETOF record
+AS 'MODULE_PATHNAME', 'pg_buffercache_usage_counts'
+LANGUAGE C PARALLEL SAFE;
+
 -- Don't want these to be available to public.
 REVOKE ALL ON FUNCTION pg_buffercache_summary() FROM PUBLIC;
 GRANT EXECUTE ON FUNCTION pg_buffercache_summary() TO pg_monitor;
+REVOKE ALL ON FUNCTION pg_buffercache_usage_counts() FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION pg_buffercache_usage_counts() TO pg_monitor;
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index 8e0807d6265..e91f35599f0 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -18,6 +18,7 @@
 #define NUM_BUFFERCACHE_PAGES_MIN_ELEM	8
 #define NUM_BUFFERCACHE_PAGES_ELEM	9
 #define NUM_BUFFERCACHE_SUMMARY_ELEM 5
+#define NUM_BUFFERCACHE_USAGE_COUNTS_ELEM 4
 
 PG_MODULE_MAGIC;
 
@@ -61,6 +62,7 @@ typedef struct
  */
 PG_FUNCTION_INFO_V1(pg_buffercache_pages);
 PG_FUNCTION_INFO_V1(pg_buffercache_summary);
+PG_FUNCTION_INFO_V1(pg_buffercache_usage_counts);
 
 Datum
 pg_buffercache_pages(PG_FUNCTION_ARGS)
@@ -304,3 +306,44 @@ pg_buffercache_summary(PG_FUNCTION_ARGS)
 
 	PG_RETURN_DATUM(result);
 }
+
+Datum
+pg_buffercache_usage_counts(PG_FUNCTION_ARGS)
+{
+	ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+	int			usage_counts[BM_MAX_USAGE_COUNT + 1] = {0};
+	int			dirty[BM_MAX_USAGE_COUNT + 1] = {0};
+	int			pinned[BM_MAX_USAGE_COUNT + 1] = {0};
+	Datum		values[NUM_BUFFERCACHE_USAGE_COUNTS_ELEM];
+	bool		nulls[NUM_BUFFERCACHE_USAGE_COUNTS_ELEM] = {0};
+
+	InitMaterializedSRF(fcinfo, 0);
+
+	for (int i = 0; i < NBuffers; i++)
+	{
+		BufferDesc *bufHdr = GetBufferDescriptor(i);
+		uint32		buf_state = pg_atomic_read_u32(&bufHdr->state);
+		int			usage_count;
+
+		usage_count = BUF_STATE_GET_USAGECOUNT(buf_state);
+		usage_counts[usage_count]++;
+
+		if (buf_state & BM_DIRTY)
+			dirty[usage_count]++;
+
+		if (BUF_STATE_GET_REFCOUNT(buf_state) > 0)
+			pinned[usage_count]++;
+	}
+
+	for (int i = 0; i < BM_MAX_USAGE_COUNT + 1; i++)
+	{
+		values[0] = Int32GetDatum(i);
+		values[1] = Int32GetDatum(usage_counts[i]);
+		values[2] = Int32GetDatum(dirty[i]);
+		values[3] = Int32GetDatum(pinned[i]);
+
+		tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc, values, nulls);
+	}
+
+	return (Datum) 0;
+}
diff --git a/contrib/pg_buffercache/sql/pg_buffercache.sql b/contrib/pg_buffercache/sql/pg_buffercache.sql
index 5d2beecd707..e9091c9e38c 100644
--- a/contrib/pg_buffercache/sql/pg_buffercache.sql
+++ b/contrib/pg_buffercache/sql/pg_buffercache.sql
@@ -10,12 +10,15 @@ select buffers_used + buffers_unused > 0,
         buffers_pinned <= buffers_used
 from pg_buffercache_summary();
 
+SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
+
 -- Check that the functions / views can't be accessed by default. To avoid
 -- having to create a dedicated user, use the pg_database_owner pseudo-role.
 SET ROLE pg_database_owner;
 SELECT * FROM pg_buffercache;
 SELECT * FROM pg_buffercache_pages() AS p (wrong int);
 SELECT * FROM pg_buffercache_summary();
+SELECT * FROM pg_buffercache_usage_counts();
 RESET role;
 SELECT count(*) > 0 FROM pg_buffercache_usage_counts() WHERE buffers >= 0;
 
@@ -42,12 +45,7 @@ SELECT count(*) > 0 FROM gp_buffercache_usage_counts WHERE buffers >= 0;
 SELECT count(*) > 0 FROM gp_buffercache_usage_counts_aggregated WHERE buffers >= 0;
 
 -- Check that the functions / views can't be accessed by default.
-CREATE ROLE buffercache_test;
-SET ROLE buffercache_test;
-SELECT * FROM pg_buffercache;
-SELECT * FROM pg_buffercache_pages() AS p (wrong int);
-SELECT * FROM pg_buffercache_summary();
-SELECT * FROM pg_buffercache_usage_counts();
+SET ROLE pg_database_owner;
 -- GPDB
 SELECT * FROM pg_buffercache_summary;
 SELECT * FROM pg_buffercache_usage_counts;
@@ -73,5 +71,3 @@ SELECT buffers_used + buffers_unused > 0 FROM gp_buffercache_summary_aggregated;
 SELECT count(*) > 0 FROM gp_buffercache_usage_counts;
 SELECT count(*) > 0 FROM gp_buffercache_usage_counts_aggregated;
 RESET ROLE;
-
-DROP ROLE buffercache_test;
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 3cd6221d001..b125bcca694 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -313,7 +313,8 @@ static void pgss_post_parse_analyze(ParseState *pstate, Query *query,
 static PlannedStmt *pgss_planner(Query *parse,
 								 const char *query_string,
 								 int cursorOptions,
-								 ParamListInfo boundParams);
+								 ParamListInfo boundParams,
+								 OptimizerOptions *optimizer_options);
 static void pgss_ExecutorStart(QueryDesc *queryDesc, int eflags);
 static void pgss_ExecutorRun(QueryDesc *queryDesc,
 							 ScanDirection direction,
@@ -866,7 +867,8 @@ static PlannedStmt *
 pgss_planner(Query *parse,
 			 const char *query_string,
 			 int cursorOptions,
-			 ParamListInfo boundParams)
+			 ParamListInfo boundParams,
+			 OptimizerOptions *optimizer_options)
 {
 	PlannedStmt *result;
 
@@ -908,10 +910,10 @@ pgss_planner(Query *parse,
 		{
 			if (prev_planner_hook)
 				result = prev_planner_hook(parse, query_string, cursorOptions,
-										   boundParams);
+										   boundParams, optimizer_options);
 			else
 				result = standard_planner(parse, query_string, cursorOptions,
-										  boundParams);
+										  boundParams, optimizer_options);
 		}
 		PG_FINALLY();
 		{
@@ -945,10 +947,10 @@ pgss_planner(Query *parse,
 	{
 		if (prev_planner_hook)
 			result = prev_planner_hook(parse, query_string, cursorOptions,
-									   boundParams);
+									   boundParams, optimizer_options);
 		else
 			result = standard_planner(parse, query_string, cursorOptions,
-									  boundParams);
+									  boundParams, optimizer_options);
 	}
 
 	return result;
diff --git a/contrib/pgstattuple/expected/pgstattuple.out b/contrib/pgstattuple/expected/pgstattuple.out
index 4542d692b55..c8542e75416 100644
--- a/contrib/pgstattuple/expected/pgstattuple.out
+++ b/contrib/pgstattuple/expected/pgstattuple.out
@@ -152,6 +152,8 @@ select pgstatginindex('test_hashidx');
 ERROR:  relation "test_hashidx" is not a GIN index
 -- check that using any of these functions with unsupported relations will fail
 create table test_partitioned (a int) partition by range (a);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 create index test_partitioned_index on test_partitioned(a);
 -- these should all fail
 select pgstattuple('test_partitioned');
@@ -159,9 +161,9 @@ ERROR:  "test_partitioned" (partitioned table) is not supported
 select pgstattuple('test_partitioned_index');
 ERROR:  "test_partitioned_index" (partitioned index) is not supported
 select pgstattuple_approx('test_partitioned');
-ERROR:  "test_partitioned" is not a table, materialized view, or TOAST table
+ERROR:  "test_partitioned" is not a table, directory table, materialized view, or TOAST table
 select pg_relpages('test_partitioned');
-ERROR:  "test_partitioned" is not a table, index, materialized view, sequence, or TOAST table
+ERROR:  "test_partitioned" is not a table, directory table, index, materialized view, sequence, or TOAST table
 select pgstatindex('test_partitioned');
 ERROR:  relation "test_partitioned" is not a btree index
 select pgstatginindex('test_partitioned');
@@ -173,9 +175,9 @@ create view test_view as select 1;
 select pgstattuple('test_view');
 ERROR:  "test_view" (view) is not supported
 select pgstattuple_approx('test_view');
-ERROR:  "test_view" is not a table, materialized view, or TOAST table
+ERROR:  "test_view" is not a table, directory table, materialized view, or TOAST table
 select pg_relpages('test_view');
-ERROR:  "test_view" is not a table, index, materialized view, sequence, or TOAST table
+ERROR:  "test_view" is not a table, directory table, index, materialized view, sequence, or TOAST table
 select pgstatindex('test_view');
 ERROR:  relation "test_view" is not a btree index
 select pgstatginindex('test_view');
@@ -189,9 +191,9 @@ create foreign table test_foreign_table () server dummy_server;
 select pgstattuple('test_foreign_table');
 ERROR:  "test_foreign_table" (foreign table) is not supported
 select pgstattuple_approx('test_foreign_table');
-ERROR:  "test_foreign_table" is not a table, materialized view, or TOAST table
+ERROR:  "test_foreign_table" is not a table, directory table, materialized view, or TOAST table
 select pg_relpages('test_foreign_table');
-ERROR:  "test_foreign_table" is not a table, index, materialized view, sequence, or TOAST table
+ERROR:  "test_foreign_table" is not a table, directory table, index, materialized view, sequence, or TOAST table
 select pgstatindex('test_foreign_table');
 ERROR:  relation "test_foreign_table" is not a btree index
 select pgstatginindex('test_foreign_table');
@@ -200,6 +202,7 @@ select pgstathashindex('test_foreign_table');
 ERROR:  "test_foreign_table" is not an index
 -- a partition of a partitioned table should work though
 create table test_partition partition of test_partitioned for values from (1) to (100);
+NOTICE:  table has parent, setting distribution columns to match parent table
 select pgstattuple('test_partition');
      pgstattuple     
 ---------------------
diff --git a/contrib/udp2/CMakeLists.txt b/contrib/udp2/CMakeLists.txt
new file mode 100644
index 00000000000..9a4835a1b53
--- /dev/null
+++ b/contrib/udp2/CMakeLists.txt
@@ -0,0 +1,111 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+cmake_minimum_required(VERSION 3.11.0)
+project(udp2)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+# Get the top-level project directory
+set(TOP_DIR ${PROJECT_SOURCE_DIR}/../..)
+set(CBDB_INCLUDE_DIR ${TOP_DIR}/src/include)
+
+# CMAKE_INSTALL_PREFIX should be set by the calling Makefile
+# If not set, we'll use a reasonable default but warn about it
+if(NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
+    message(WARNING "CMAKE_INSTALL_PREFIX not set by parent build system, using default")
+    set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install prefix" FORCE)
+endif()
+
+# Check for debug/release configuration from main project
+include(CheckSymbolExists)
+set(PG_CONFIG_HEADER_FILE "${CBDB_INCLUDE_DIR}/pg_config.h")
+if(EXISTS "${PG_CONFIG_HEADER_FILE}")
+    CHECK_SYMBOL_EXISTS(USE_ASSERT_CHECKING "${PG_CONFIG_HEADER_FILE}" UDP2_USE_DEBUG)
+    if(UDP2_USE_DEBUG)
+        set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
+        message(STATUS "Setting CMAKE_BUILD_TYPE to 'Debug' based on main project configuration")
+    else()
+        set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
+        message(STATUS "Setting CMAKE_BUILD_TYPE to 'Release' based on main project configuration")
+    endif()
+else()
+    # Fallback to Release if pg_config.h is not found
+    if(NOT CMAKE_BUILD_TYPE)
+        set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+        message(STATUS "Setting default CMAKE_BUILD_TYPE to 'Release'")
+    endif()
+endif()
+
+# First, build and install ic_common as a subdirectory
+add_subdirectory(ic_common)
+
+# Set up include directories
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_INSTALL_PREFIX}/include/postgresql/)
+include_directories(${CMAKE_INSTALL_PREFIX}/include/postgresql/udp2/)
+include_directories(${CBDB_INCLUDE_DIR})
+include_directories(${CBDB_INCLUDE_DIR}/server)
+
+# Set up library directories
+link_directories(${CMAKE_INSTALL_PREFIX}/lib/postgresql/)
+
+# Source files for udp2 module
+set(UDP2_SOURCES
+    ic_udp2.c
+    ic_modules.c
+)
+
+# Create the udp2 shared library
+add_library(udp2 SHARED ${UDP2_SOURCES})
+
+# Set compiler flags consistent with main project
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE -Wall -Wpointer-arith -Wendif-labels -Wmissing-format-attribute -Wimplicit-fallthrough=3 -Wcast-function-type -Wformat-security -fno-strict-aliasing -fwrapv")
+
+if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -ggdb")
+    message(STATUS "Building udp2 in Debug mode")
+elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O2 -DNDEBUG")
+    message(STATUS "Building udp2 in Release mode")
+endif()
+
+# Link against ic_common library
+target_link_libraries(udp2 ic_common)
+
+# Make sure ic_common is built before udp2
+add_dependencies(udp2 ic_common)
+
+# Set output name and remove lib prefix
+set_target_properties(udp2 PROPERTIES
+    OUTPUT_NAME "udp2"
+    PREFIX ""
+)
+
+# Install the udp2 library
+install(TARGETS udp2
+    LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/postgresql/"
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/postgresql/"
+)
+
+# Install udp2 headers
+install(FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/ic_udp2.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ic_modules.h"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/include/postgresql/"
+)
diff --git a/contrib/udp2/Makefile b/contrib/udp2/Makefile
new file mode 100644
index 00000000000..e4891e9a528
--- /dev/null
+++ b/contrib/udp2/Makefile
@@ -0,0 +1,70 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# contrib/udp2/Makefile
+
+top_builddir = ../..
+
+# Include the standard PostgreSQL build system to get variables like prefix, DESTDIR, etc.
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/udp2
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+
+# Use CMake for building this module
+CMAKE_BUILD_DIR = build
+
+# Default target
+all: $(CMAKE_BUILD_DIR)/udp2.so
+
+# Create build directory and configure with CMake
+$(CMAKE_BUILD_DIR)/Makefile:
+	@echo "Configuring udp2 with CMake..."
+	@mkdir -p $(CMAKE_BUILD_DIR)
+	@cd $(CMAKE_BUILD_DIR) && cmake -DCMAKE_INSTALL_PREFIX=$(DESTDIR)$(prefix) ..
+
+# Build the project using CMake
+$(CMAKE_BUILD_DIR)/udp2.so: $(CMAKE_BUILD_DIR)/Makefile
+	@echo "Building udp2 with CMake..."
+	@cd $(CMAKE_BUILD_DIR) && $(MAKE)
+	@cp $(CMAKE_BUILD_DIR)/udp2.so udp2.so
+
+# Install target
+install: $(CMAKE_BUILD_DIR)/udp2.so
+	@echo "Installing udp2..."
+	@cd $(CMAKE_BUILD_DIR) && $(MAKE) install
+
+# Clean target
+clean:
+	@echo "Cleaning udp2..."
+	@rm -rf $(CMAKE_BUILD_DIR)
+	@rm -f udp2.so
+
+# Ensure ic_common is built first
+ic_common:
+	@echo "Building ic_common..."
+	@mkdir -p ic_common/build
+	@cd ic_common/build && cmake -DCMAKE_INSTALL_PREFIX=$(DESTDIR)$(prefix) .. && $(MAKE) && $(MAKE) install
+
+# Make sure ic_common is built before udp2
+$(CMAKE_BUILD_DIR)/udp2.so: ic_common
+
+.PHONY: all install clean ic_common
diff --git a/contrib/udp2/README.md b/contrib/udp2/README.md
new file mode 100644
index 00000000000..9cfe9f9c989
--- /dev/null
+++ b/contrib/udp2/README.md
@@ -0,0 +1,247 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+# UDP2 Interconnect Protocol Implementation
+
+## Project Background
+
+UDP2 is a next-generation interconnect protocol implementation based on the original UDP protocol, located in the `contrib/udp2` directory. In CloudBerry Database, the interconnect is responsible for data transmission and synchronization between nodes, serving as a core component for distributed query execution.
+
+Currently, the database supports three interconnect protocol implementations:
+- **TCP** (`contrib/interconnect/tcp`) - Reliable transmission based on TCP protocol
+- **UDP** (`contrib/interconnect/udp`) - High-performance transmission based on UDP protocol
+- **Proxy** (`contrib/interconnect/proxy`) - Proxy-based transmission
+
+UDP2 is an architectural refactoring based on the original UDP protocol implementation, aimed at achieving complete separation between interconnect and the database kernel.
+
+## Project Goals
+
+The core objectives of the UDP2 protocol implementation are:
+
+1. **Architecture Decoupling**: Completely separate the interconnect protocol implementation from the database kernel, enabling independent development and evolution
+2. **Independent Testing**: Enable end-to-end functional and performance testing of interconnect without depending on the database kernel
+3. **Rapid Diagnosis**: Quickly identify whether issues are at the interconnect level or database kernel level
+4. **Modular Design**: Provide clear interface boundaries for easier extension and maintenance
+
+## Current Project Implementation Architecture
+
+### Overall Architecture Design
+
+UDP2 adopts a layered architecture design, primarily divided into two layers:
+
+```
+┌─────────────────────────────────────────────────────────┐
+│                Database Kernel Layer                    │
+│  ┌────────────────────────────────────────────────────┐ │
+│  │            contrib/udp2/                           │ │
+│  │  ┌─────────────────┐  ┌────────────────────────┐   │ │
+│  │  │   ic_modules.c  │  │      ic_udp2.c         │   │ │
+│  │  │   ic_modules.h  │  │      ic_udp2.h         │   │ │
+│  │  └─────────────────┘  └────────────────────────┘   │ │
+│  │              Adapter Layer (Database Adapter)      │ │
+│  └────────────────────────────────────────────────────┘ │
+└─────────────────────────────────────────────────────────┘
+                              │
+                              │ C/C++ Interface
+                              ▼
+┌──────────────────────────────────────────────────────────┐
+│            Independent IC Communication Library          │
+│  ┌─────────────────────────────────────────────────────┐ │
+│  │            contrib/udp2/ic_common/                  │ │
+│  │  ┌─────────────────┐  ┌─────────────────────────┐   │ │
+│  │  │   ic_types.h    │  │      ic_utility.hpp     │   │ │
+│  │  │   ic_except.hpp │  │   ic_faultinjection.h   │   │ │
+│  │  └─────────────────┘  └─────────────────────────┘   │ │
+│  │  ┌────────────────────────────────────────────────┐ │ │
+│  │  │         contrib/udp2/ic_common/udp2/           │ │ │
+│  │  │  ┌─────────────────┐  ┌─────────────────────┐  │ │ │
+│  │  │  │   ic_udp2.h     │  │   ic_udp2.hpp       │  │ │ │
+│  │  │  │   ic_udp2.cpp   │  │ic_udp2_internal.hpp │  │ │ │
+│  │  │  └─────────────────┘  └─────────────────────┘  │ │ │
+│  │  └────────────────────────────────────────────────┘ │ │
+│  │              Core Communication Library             │ │
+│  └─────────────────────────────────────────────────────┘ │
+└──────────────────────────────────────────────────────────┘
+```
+
+### Core Component Description
+
+#### 1. Adapter Layer (`contrib/udp2/`)
+- **ic_modules.c/h**: Module registration and initialization, implementing the `MotionIPCLayer` interface
+- **ic_udp2.c/h**: Adapter layer between database kernel and ic_common library
+- Responsible for converting database kernel data structures to ic_common library standard interfaces
+
+#### 2. Core Communication Library (`contrib/udp2/ic_common/`)
+- **ic_types.h**: Defines core data types and interfaces, decoupled from database kernel
+- **ic_utility.hpp**: Common utility functions and logging system
+- **ic_except.hpp**: Exception handling mechanism
+- **ic_faultinjection.h**: Fault injection testing support
+
+#### 3. UDP2 Protocol Implementation (`contrib/udp2/ic_common/udp2/`)
+- **ic_udp2.h**: C language interface definition
+- **ic_udp2.hpp**: C++ interface definition
+- **ic_udp2.cpp**: Core protocol implementation
+- **ic_udp2_internal.hpp**: Internal implementation details
+
+### Build System
+
+UDP2 uses CMake build system with support for independent compilation:
+
+```
+contrib/udp2/
+├── CMakeLists.txt         # Main build configuration
+├── Makefile               # PostgreSQL-compatible Makefile
+└── ic_common/
+    ├── CMakeLists.txt     # ic_common library build configuration
+    └── build/             # Build output directory
+```
+
+Build process:
+1. First build the `ic_common` dynamic library (`libic_common.so`)
+2. Then build the `udp2` module (`udp2.so`), linking against the `ic_common` library
+
+## How to Switch Database to This Protocol Implementation
+
+### Enable UDP2 Support at Compile Time
+
+1. **Configure compilation options**:
+```bash
+./configure --enable-ic-udp2 [other options]
+make && make install
+```
+
+2. **Verify compilation results**:
+```bash
+# Check if udp2.so is generated
+ls -la $GPHOME/lib/postgresql/udp2.so
+
+# Check if ic_common library is installed
+ls -la $GPHOME/lib/libic_common.so
+```
+
+### Runtime Configuration
+
+```bash
+# Set cluster to use UDP2 by default
+gpconfig -c gp_interconnect_type -v udp2
+
+# Reload configuration
+gpstop -air
+```
+
+```sql
+-- Check current interconnect type
+SHOW gp_interconnect_type;
+```
+
+## Technical Details
+
+### Interface Design
+
+UDP2 achieves decoupling between database kernel and communication library through standardized C interfaces:
+
+```c
+// Core interface functions (ic_common/udp2/ic_udp2.h)
+extern ICChunkTransportState* UDP2_SetupUDP(ICSliceTable *sliceTable,
+                                            SessionMotionLayerIPCParam *param);
+extern void UDP2_TeardownUDP(ICChunkTransportState *transportStates, bool hasErrors);
+
+// Data send/receive interfaces
+extern bool UDP2_SendData(ICChunkTransportState *transportStates,
+                          int16 motNodeID, int16 targetRoute,
+                          DataBlock *pblocks, int num, bool broadcast);
+extern void UDP2_RecvAny(ICChunkTransportState *transportStates,
+                         int16 motNodeID, int16 *srcRoute,
+                         GetDataLenInPacket getLen, DataBlock *data);
+```
+
+### Data Structure Mapping
+
+UDP2 defines lightweight data structures to replace complex database kernel structures:
+
+```c
+// Lightweight process information (replaces CdbProcess)
+typedef struct ICCdbProcess {
+    bool valid;
+    char *listenerAddr;
+    int listenerPort;
+    int pid;
+    int contentid;
+    int dbid;
+} ICCdbProcess;
+
+// Lightweight slice information (replaces ExecSlice)
+typedef struct ICExecSlice {
+    int sliceIndex;
+    int parentIndex;
+    int numChildren;
+    int *children;
+    int numSegments;
+    int numPrimaryProcesses;
+    ICCdbProcess *primaryProcesses;
+} ICExecSlice;
+```
+
+### Error Handling Mechanism
+
+UDP2 implements a unified error handling mechanism:
+
+```c
+typedef enum ErrorLevel {
+    LEVEL_OK,
+    LEVEL_ERROR,
+    LEVEL_FATAL,
+} ErrorLevel;
+
+// Error handling interfaces
+extern void SetLastError(ErrorLevel level, const char *msg);
+extern ICError* GetLastError();
+extern void ResetLastError();
+```
+
+## Development and Debugging
+
+### Independent Compilation Testing
+
+```bash
+# Enter ic_common directory
+cd contrib/udp2/ic_common
+
+# Create build directory
+mkdir build && cd build
+
+# Configure and compile
+cmake -DCMAKE_BUILD_TYPE=Debug ..
+make -j
+```
+
+### Debug Configuration
+
+Enable verbose logging in development environment:
+
+```sql
+-- Enable interconnect debug logging
+SET gp_log_interconnect = 'debug';
+
+-- Set log level
+SET log_min_messages = 'debug1';
+
+-- Enable detailed error information
+SET gp_interconnect_log_stats = on;
+```
diff --git a/contrib/udp2/ic_common/CMakeLists.txt b/contrib/udp2/ic_common/CMakeLists.txt
new file mode 100644
index 00000000000..2c26e002b84
--- /dev/null
+++ b/contrib/udp2/ic_common/CMakeLists.txt
@@ -0,0 +1,95 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+cmake_minimum_required(VERSION 3.11.0)
+project(ic_common)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+# Get the top-level project directory
+set(TOP_DIR ${PROJECT_SOURCE_DIR}/../../..)
+set(CBDB_INCLUDE_DIR ${TOP_DIR}/src/include)
+
+# CMAKE_INSTALL_PREFIX should be set by the calling Makefile
+# If not set, we'll use a reasonable default but warn about it
+if(NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
+    message(WARNING "CMAKE_INSTALL_PREFIX not set by parent build system, using default")
+    set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install prefix" FORCE)
+endif()
+
+# Check for debug/release configuration from main project
+include(CheckSymbolExists)
+set(PG_CONFIG_HEADER_FILE "${CBDB_INCLUDE_DIR}/pg_config.h")
+if(EXISTS "${PG_CONFIG_HEADER_FILE}")
+    CHECK_SYMBOL_EXISTS(USE_ASSERT_CHECKING "${PG_CONFIG_HEADER_FILE}" IC_USE_DEBUG)
+    if(IC_USE_DEBUG)
+        set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
+        message(STATUS "Setting CMAKE_BUILD_TYPE to 'Debug' based on main project configuration")
+    else()
+        set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
+        message(STATUS "Setting CMAKE_BUILD_TYPE to 'Release' based on main project configuration")
+    endif()
+else()
+    # Fallback to Release if pg_config.h is not found
+    if(NOT CMAKE_BUILD_TYPE)
+        set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+        message(STATUS "Setting default CMAKE_BUILD_TYPE to 'Release'")
+    endif()
+endif()
+
+file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/udp2/*.cpp")
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/udp2)
+
+add_library(ic_common SHARED ${SOURCES})
+
+set_target_properties(ic_common PROPERTIES OUTPUT_NAME "ic_common")
+
+# Set compiler flags consistent with main project
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -Wall -Wpointer-arith -Wendif-labels -Wmissing-format-attribute -Wimplicit-fallthrough=3 -Wcast-function-type -Wformat-security -fno-strict-aliasing -fwrapv")
+
+if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -ggdb")
+    message(STATUS "Building ic_common in Debug mode")
+elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG")
+    message(STATUS "Building ic_common in Release mode")
+endif()
+
+# Install headers to the main project's include directory
+install(FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/ic_types.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ic_except.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ic_utility.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ic_faultinjection.h"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/include/postgresql/"
+)
+
+install(FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/udp2/ic_udp2.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/udp2/ic_udp2.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/udp2/ic_udp2_internal.hpp"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/include/postgresql/udp2/"
+)
+
+# Install library to the main project's lib directory
+install(TARGETS ic_common
+    LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/"
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/"
+)
diff --git a/contrib/udp2/ic_common/ic_except.hpp b/contrib/udp2/ic_common/ic_except.hpp
new file mode 100644
index 00000000000..9761d499487
--- /dev/null
+++ b/contrib/udp2/ic_common/ic_except.hpp
@@ -0,0 +1,75 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_except.hpp
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/ic_except.hpp
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef IC_EXCEPT_HPP
+#define IC_EXCEPT_HPP
+
+class ICException: public std::runtime_error {
+public:
+	ICException(const std::string & arg, const char *file, int line): std::runtime_error(arg) {
+		std::stringstream ss;
+		ss << arg << " from " << file << ":" << line << std::endl;
+		detail = ss.str();
+	}
+	~ICException() throw() {}
+
+	virtual const char *msg() const {
+		return detail.c_str();
+	}
+
+protected:
+	std::string detail;
+};
+
+class ICFatalException: public ICException {
+public:
+	ICFatalException(const std::string & arg, const char *file, int line):
+		ICException(arg, file, line) {}
+	~ICFatalException() throw () {}
+};
+
+class ICInvalidIndex: public ICException {
+public:
+	ICInvalidIndex(const std::string & arg, const char *file, int line):
+		ICException(arg, file, line) {}
+	~ICInvalidIndex() throw () {}
+};
+
+class ICNetworkException: public ICException {
+public:
+	ICNetworkException(const std::string & arg, const char *file, int line):
+		ICException(arg, file, line) {}
+	~ICNetworkException() throw () {}
+};
+
+class ICReceiveThreadException: public ICException {
+public:
+	ICReceiveThreadException(const std::string & arg, const char *file, int line):
+		ICException(arg, file, line) {}
+	~ICReceiveThreadException() throw () {}
+};
+
+#endif // IC_EXCEPT_HPP
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/ic_faultinjection.h b/contrib/udp2/ic_common/ic_faultinjection.h
new file mode 100644
index 00000000000..b79cfed28dd
--- /dev/null
+++ b/contrib/udp2/ic_common/ic_faultinjection.h
@@ -0,0 +1,620 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_faultinjection.h
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/ic_faultinjection.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef IC_FAULTINJECTION_H
+#define IC_FAULTINJECTION_H
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
+
+#ifdef USE_ASSERT_CHECKING
+
+static bool udp_testmode = false;
+
+static inline void
+set_test_mode()
+{
+	if (session_param.gp_udpic_dropseg != UNDEF_SEGMENT
+			|| session_param.gp_udpic_dropacks_percent != 0
+			|| session_param.gp_udpic_dropxmit_percent != 0
+			|| session_param.gp_udpic_fault_inject_percent != 0)
+		udp_testmode = true;
+	else
+		udp_testmode = false;
+}
+
+/*
+ * testmode_inject_fault
+ *		Return whether we inject a fault given a probability.
+ *
+ */
+static inline bool
+testmode_inject_fault(int percent)
+{
+	if (udp_testmode &&
+		(session_param.gp_udpic_dropseg == UNDEF_SEGMENT || session_param.gp_udpic_dropseg == global_param.segindex))
+	{
+			if (random() % 100 < percent)
+				return true;
+	}
+
+	return false;
+}
+
+/* Track the malloc times */
+static pthread_mutex_t	icudp_malloc_tracking_lock = PTHREAD_MUTEX_INITIALIZER;
+static int64 icudp_malloc_times = 0;
+
+/* Fault type enumeration. */
+typedef enum {
+	/* These are used to inject packet content corruption. */
+	FINC_PKT_HEADER_SHORTEN = 0,
+	FINC_PKT_PKT_SHORTEN = 1,
+	FINC_PKT_CRC_CORRUPT = 2,
+	FINC_PKT_HEADER_LEN_ZERO = 3,
+	FINC_PKT_HEADER_LEN_NEGATIVE = 4,
+	FINC_PKT_MISMATCH = 5,
+
+	/* These are used to inject query cancel and process die. */
+	FINC_INTR_QUERY_CANCEL = 12,
+	FINC_INTR_PROC_DIE = 13,
+
+	/* These are used to inject OS API errors. */
+	FINC_OS_EAGAIN = 16,
+	FINC_OS_EINTR = 17,
+	FINC_OS_EWOULDBLOCK = 18,
+	FINC_OS_NET_INTERFACE = 19,
+	FINC_OS_MEM_INTERFACE = 20,
+	FINC_OS_CREATE_THREAD = 21,
+	FINC_PKT_TOO_LONG = 22,
+
+	/* These are used to inject network faults. */
+	FINC_NET_RECV_ERROR = 23,
+	FINC_NET_PKT_DUP = 24,
+	FINC_NET_RECV_ZERO = 25,
+
+	/* This is a fault which is used to introduce a specific null return of malloc in bg thread */
+	FINC_RX_BUF_NULL = 29,
+
+	/* The last guard item, don't put anything behind this one. */
+	FINC_MAX_LIMITATION = 31,
+} FAULT_INJECTION_TYPE;
+
+#define FINC_HAS_FAULT(type) (session_param.gp_udpic_fault_inject_bitmap & (1U << (type)))
+
+/*
+* FAULT_TYPE_FUNCTION
+*                define the all test function name which uses fault injection test.
+*/
+typedef enum {
+	FUNC_TESTMODE_RECVFROM,
+	FUNC_TESTMODE_MAX
+} FAULT_TYPE_FUNCTION;
+
+/*
+* fault_type_array_length
+*                record acutal fault type number for every test function which uses fault injection test.
+*/
+static unsigned int fault_type_array_length[FUNC_TESTMODE_MAX][1] = { 0 };
+
+/*
+* fault_type_array
+*                define the fault type for for every test function which uses fault injection test.
+*/
+static const unsigned int fault_type_array[][FINC_MAX_LIMITATION + 1] = {
+	{ FINC_OS_EAGAIN,  FINC_OS_EINTR, FINC_OS_EWOULDBLOCK, FINC_NET_RECV_ZERO, FINC_OS_NET_INTERFACE, FINC_NET_RECV_ERROR, FINC_MAX_LIMITATION }
+};
+
+/*
+ * testmode_check_interrupts
+ * 		ML_CHECK_FOR_INTERRUPTS in test mode with interrupts injected.
+ */
+static inline void
+testmode_check_interrupts(const char *caller_name, bool teardownActive)
+{
+}
+
+/* We needs a private copy to corrupt the packet. */
+#define FAULT_INJECT_BACKUP_PKT() \
+do { \
+	pktModified = true; \
+	memcpy(&hdrbk, (void *) buffer, sizeof(icpkthdr)); \
+} while (0)
+
+/*
+ * get_fault_type_array_length
+ * 		Retrive test function fault type size recorded in array fault_type_array_length.
+ */
+static inline unsigned int
+get_fault_type_array_length(unsigned int func_name)
+{
+	if (!fault_type_array_length[func_name][0]) {
+		for (unsigned int i = 0; i < FINC_MAX_LIMITATION + 1; i++) {
+			if (fault_type_array[func_name][i] == FINC_MAX_LIMITATION) {
+				fault_type_array_length[func_name][0] = i;
+				break;
+			}
+		}
+	}
+	return fault_type_array_length[func_name][0];
+}
+
+/*
+ * random_with_range
+ * 		Generate the random value predefined in fault_type_array.
+ */
+static inline int
+random_with_array(unsigned int func_name)
+{
+	Assert((func_name < FUNC_TESTMODE_MAX) && (fault_type_array!= NULL));
+	unsigned int length = get_fault_type_array_length(func_name);
+	Assert((length != 0) && (length < FINC_MAX_LIMITATION));
+	return fault_type_array[func_name][(rand() % length)];
+}
+
+/*
+ * testmode_sendto
+ * 		Many kinds of fault packets are injected in this function.
+ */
+static ssize_t
+testmode_sendto(const char *caller_name, int socket, const void *buffer,
+			   size_t length, int flags, const struct sockaddr *dest_addr,
+			   socklen_t dest_len)
+{
+	int		n;
+	int		testmode_length = length;
+	size_t	icpkthdr_size = sizeof(icpkthdr);
+	bool	is_pkt = false;
+	bool	pktModified = false;
+	int		fault_type;
+	icpkthdr hdrbk;
+	icpkthdr *msg = (icpkthdr *) buffer;
+
+	if (!testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+		goto no_fault_inject;
+
+	/*
+	 * Generate a fault type.
+	 */
+	fault_type = random() % FINC_MAX_LIMITATION;
+
+	/* Make sure we are modifying a packet. */
+	if (length >= icpkthdr_size)
+		is_pkt = true;
+
+	/* Inject a fault */
+	switch (fault_type)
+	{
+		case FINC_PKT_HEADER_SHORTEN:
+			if (!FINC_HAS_FAULT(fault_type) || !is_pkt)
+				break;
+			testmode_length = icpkthdr_size - 1;
+			LOG(INFO, "inject fault to sendto: FINC_PKT_HEADER_SHORTEN");
+			break;
+
+		case FINC_PKT_PKT_SHORTEN:
+			if (!FINC_HAS_FAULT(fault_type) || !is_pkt)
+				break;
+			if (length > icpkthdr_size)
+				testmode_length--;
+			LOG(INFO, "inject fault to sendto: FINC_PKT_PKT_SHORTEN");
+			break;
+
+		case FINC_PKT_CRC_CORRUPT:
+			if (!FINC_HAS_FAULT(fault_type) || !is_pkt)
+				break;
+			FAULT_INJECT_BACKUP_PKT();
+			if (!session_param.gp_interconnect_full_crc)
+				break;
+			msg->crc++;
+			LOG(INFO, "inject fault to sendto: FINC_PKT_CRC_CORRUPT");
+			break;
+
+		case FINC_PKT_HEADER_LEN_ZERO:
+			if (!FINC_HAS_FAULT(fault_type) || !is_pkt)
+				break;
+			FAULT_INJECT_BACKUP_PKT();
+			msg->len = 0;
+			LOG(INFO, "inject fault to sendto: FINC_PKT_HEADER_LEN_ZERO");
+			break;
+
+		case FINC_PKT_HEADER_LEN_NEGATIVE:
+			if (!FINC_HAS_FAULT(fault_type) || !is_pkt)
+				break;
+			FAULT_INJECT_BACKUP_PKT();
+			msg->len = -1;
+			LOG(INFO, "inject fault to sendto: FINC_PKT_HEADER_LEN_NEGATIVE");
+			break;
+
+		case FINC_PKT_MISMATCH:
+			if (!FINC_HAS_FAULT(fault_type) || !is_pkt)
+				break;
+			FAULT_INJECT_BACKUP_PKT();
+			msg->srcPid = -1;	/* There is no such pid. */
+			msg->icId = 0;
+			msg->seq = 1;
+			LOG(INFO, "inject fault to sendto: FINC_PKT_MISMATCH");
+			break;
+
+		case FINC_OS_EAGAIN:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to sendto: FINC_OS_EAGAIN");
+			errno = EAGAIN;
+			return -1;
+
+		case FINC_OS_EINTR:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to sendto: FINC_OS_EINTR");
+			errno = EINTR;
+			return -1;
+
+		case FINC_NET_PKT_DUP:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to sendto: FINC_NET_PKT_DUP");
+			if ((n = sendto(socket, buffer, testmode_length, flags, dest_addr, dest_len)) != (int)length)
+				return n;
+			break;
+
+		case FINC_OS_NET_INTERFACE:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to sendto: FINC_OS_NET_INTERFACE");
+			errno = EFAULT;
+			return -1;
+
+		case FINC_PKT_TOO_LONG:
+			if (!FINC_HAS_FAULT(fault_type) || !is_pkt)
+				break;
+			LOG(INFO, "inject fault to sendto: FINC_PKT_TOO_LONG");
+			errno = EMSGSIZE;
+			return -1;
+
+		default:
+			break;
+	}
+
+no_fault_inject:
+	n = sendto(socket, buffer, testmode_length, flags, dest_addr, dest_len);
+
+	if (pktModified)
+		memcpy((void *) buffer, &hdrbk, sizeof(icpkthdr));
+	return n;
+}
+
+/*
+ * testmode_recvfrom
+ * 		recvfrom function with faults injected.
+ */
+static ssize_t
+testmode_recvfrom(const char *caller_name, int socket, void *buffer,
+				  size_t length, int flags, struct sockaddr *address,
+				  socklen_t *address_len)
+{
+	int		fault_type;
+
+	if (!testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+		goto no_fault_inject;
+
+	fault_type = random_with_array(FUNC_TESTMODE_RECVFROM);
+
+	switch (fault_type)
+	{
+		case FINC_OS_EAGAIN:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to recvfrom: FINC_OS_EAGAIN");
+			errno = EAGAIN;
+			return -1;
+
+		case FINC_OS_EINTR:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to recvfrom: FINC_OS_EINTR");
+			errno = EINTR;
+			return -1;
+
+		case FINC_OS_EWOULDBLOCK:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to recvfrom: FINC_OS_EWOULDBLOCK");
+			errno = EWOULDBLOCK;
+			return -1;
+
+		case FINC_NET_RECV_ZERO:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+
+			memset(buffer, 0, length);
+			LOG(INFO, "inject fault to recvfrom: FINC_NET_RECV_ZERO");
+			return 0;
+
+		case FINC_OS_NET_INTERFACE:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to recvfrom: FINC_OS_NET_INTERFACE");
+			errno = EFAULT;
+			return -1;
+
+		case FINC_NET_RECV_ERROR:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to recvfrom: FINC_NET_RECV_ERROR");
+			errno = EFAULT;
+			return -1;
+
+		default:
+			break;
+	}
+
+no_fault_inject:
+	return recvfrom(socket, buffer, length, flags, address, address_len);
+}
+
+/*
+ * testmode_poll
+ * 		poll function with faults injected.
+ */
+static int
+testmode_poll(const char *caller_name, struct pollfd fds[], nfds_t nfds,
+			  int timeout)
+{
+	int		fault_type;
+
+	if (!testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+		goto no_fault_inject;
+
+	fault_type = random() % FINC_MAX_LIMITATION;
+
+	switch (fault_type)
+	{
+		case FINC_OS_EINTR:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to poll: FINC_OS_EINTR");
+			errno = EINTR;
+			return -1;
+
+		case FINC_OS_NET_INTERFACE:
+			if (!FINC_HAS_FAULT(fault_type))
+				break;
+			LOG(INFO, "inject fault to poll: FINC_OS_NET_INTERFACE");
+			errno = EFAULT;
+			return -1;
+
+		default:
+			break;
+	}
+
+no_fault_inject:
+	return poll(fds, nfds, timeout);
+}
+
+/*
+ * testmode_socket
+ * 		socket function with faults injected.
+ *
+ */
+static int
+testmode_socket(const char *caller_name, int domain, int type, int protocol)
+{
+	if (FINC_HAS_FAULT(FINC_OS_NET_INTERFACE) &&
+		testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+	{
+		LOG(INFO, "inject fault to socket: FINC_OS_NET_INTERFACE");
+		errno = ENOMEM;
+		return -1;
+	}
+
+	return socket(domain, type, protocol);
+}
+
+/*
+ * testmode_bind
+ *   	bind function with fault injected.
+ *
+ */
+static int
+testmode_bind(const char *caller_name, int socket,
+			  const struct sockaddr *address, socklen_t address_len)
+{
+	if (FINC_HAS_FAULT(FINC_OS_NET_INTERFACE) &&
+		testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+	{
+		LOG(INFO, "inject fault to bind: FINC_OS_NET_INTERFACE");
+		errno = EFAULT;
+		return -1;
+	}
+
+	return bind(socket, address, address_len);
+}
+
+/*
+ * testmode_getsockname
+ * 		getsockname function with faults injected.
+ *
+ */
+static int
+testmode_getsockname(const char *caller_name, int socket,
+					 struct sockaddr *address,
+					 socklen_t *address_len)
+{
+	if (FINC_HAS_FAULT(FINC_OS_NET_INTERFACE) &&
+		testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+	{
+		LOG(INFO, "inject fault to getsockname: FINC_OS_NET_INTERFACE");
+		errno = EFAULT;
+		return -1;
+	}
+
+	return getsockname(socket, address, address_len);
+}
+
+/*
+ * testmode_setsockopt
+ * 		setsockopt with faults injected.
+ */
+static int
+testmode_setsockopt(const char *caller_name, int socket, int level,
+					int option_name, const void *option_value,
+					socklen_t option_len)
+{
+	if (FINC_HAS_FAULT(FINC_OS_NET_INTERFACE) &&
+		testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+	{
+		LOG(INFO, "inject fault to setsockopt: FINC_OS_NET_INTERFACE");
+		errno = ENOMEM;
+		return -1;
+	}
+
+	return setsockopt(socket, level, option_name, option_value, option_len);
+}
+
+/*
+ * testmode_pg_getaddrinfo_all
+ * 		pg_getaddrinfo_all with faults injected.
+ */
+static int
+testmode_pg_getaddrinfo_all(const char *caller_name, const char *hostname,
+				   const char *servname, const struct addrinfo *hints,
+				   struct addrinfo **res)
+{
+	if (FINC_HAS_FAULT(FINC_OS_NET_INTERFACE) &&
+		testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+	{
+		LOG(INFO, "inject fault to pg_getaddrinfo_all: FINC_OS_NET_INTERFACE");
+		return -1;
+	}
+
+	//return pg_getaddrinfo_all(hostname, servname, hints, res);
+	return getaddrinfo(hostname, servname, hints, res);
+}
+
+/*
+ * testmode_free
+ * 		free function with free time tracking added.
+ */
+static void
+testmode_free(const char *caller_name, void *ptr)
+{
+	if (ptr == NULL)
+		return;
+
+	pthread_mutex_lock(&icudp_malloc_tracking_lock);
+	icudp_malloc_times--;
+	pthread_mutex_unlock(&icudp_malloc_tracking_lock);
+	free(ptr);
+}
+
+/*
+ * testmode_pthread_create
+ * 		pthread_create with faults injected.
+ */
+static int
+testmode_pthread_create(const char *caller_name, pthread_t *thread,
+		const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg)
+{
+	if (FINC_HAS_FAULT(FINC_OS_CREATE_THREAD) &&
+		testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+	{
+		LOG(INFO, "inject fault to pthread_create: FINC_OS_CREATE_THREAD");
+		return ENOMEM;
+	}
+
+	return pthread_create(thread, attr, start_routine, arg);
+}
+
+#ifdef ML_CHECK_FOR_INTERRUPTS
+#undef ML_CHECK_FOR_INTERRUPTS
+#endif
+#undef sendto
+#undef recvfrom
+#undef poll
+#undef socket
+#undef bind
+#undef getsockname
+#undef getsockopt
+#undef setsockopt
+#undef pg_getaddrinfo_all
+#undef malloc
+#undef free
+#undef palloc0
+#undef pthread_create
+
+#define ML_CHECK_FOR_INTERRUPTS(teardownActive) \
+	testmode_check_interrupts(__FUNCTION__, teardownActive)
+
+#define sendto(socket, buffer, length, flags, dest_addr, dest_len) \
+	testmode_sendto(__FUNCTION__, socket, buffer, length, flags, dest_addr, dest_len)
+
+#define recvfrom(socket, buffer, length, flags, address, address_len) \
+	testmode_recvfrom(__FUNCTION__, socket, buffer, length, flags, address, address_len)
+
+#define poll(fds, nfds, timeout) \
+	testmode_poll(__FUNCTION__, fds, nfds, timeout)
+
+#define socket(domain, type, protocol) \
+	testmode_socket(__FUNCTION__, domain, type, protocol)
+
+#define bind(socket, address, address_len) \
+	testmode_bind(__FUNCTION__, socket, address, address_len)
+
+#define getsockname(socket, address, address_len) \
+	testmode_getsockname(__FUNCTION__, socket, address, address_len)
+
+#define getsockopt(socket, level, option_name, option_value, option_len) \
+	testmode_getsockopt(__FUNCTION__, socket, level, option_name, option_value, option_len)
+
+#define setsockopt(socket, level, option_name, option_value, option_len) \
+	testmode_setsockopt(__FUNCTION__, socket, level, option_name, option_value, option_len)
+
+#define getaddrinfo(hostname, servname, hints, res) \
+	testmode_pg_getaddrinfo_all(__FUNCTION__, hostname, servname, hints, res)
+
+#define malloc(size) \
+	testmode_malloc(__FUNCTION__, size)
+
+#define free(ptr) \
+	testmode_free(__FUNCTION__, ptr)
+
+/*
+#define ic_malloc0(size) \
+	testmode_malloc0(__FUNCTION__, size)
+*/
+
+#define pthread_create(thread, attr, start_routine, arg) \
+	testmode_pthread_create(__FUNCTION__, thread, attr, start_routine, arg)
+#endif
+
+#endif
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/ic_types.h b/contrib/udp2/ic_common/ic_types.h
new file mode 100644
index 00000000000..e31d02e493d
--- /dev/null
+++ b/contrib/udp2/ic_common/ic_types.h
@@ -0,0 +1,212 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_types.h
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/ic_types.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef IC_TYPES_H
+#define IC_TYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * data type
+ */
+typedef signed char       int8;   /* == 8 bits */
+typedef signed short      int16;  /* == 16 bits */
+typedef signed int        int32;  /* == 32 bits */
+typedef unsigned char     uint8;  /* == 8 bits */
+typedef unsigned short    uint16; /* == 16 bits */
+typedef unsigned int      uint32; /* == 32 bits */
+typedef long int          int64;
+typedef unsigned long int uint64;
+
+typedef uint64 DistributedTransactionId;
+
+/* the lite version of CdbProcess */
+typedef struct ICCdbProcess
+{
+	bool valid;
+	char *listenerAddr; /* Interconnect listener IPv4 address, a C-string */
+	int listenerPort;   /* Interconnect listener port */
+	int pid;            /* Backend PID of the process. */
+	int contentid;
+	int dbid;
+
+} ICCdbProcess;
+
+/* the lite version of ExecSlice */
+typedef struct ICExecSlice
+{
+	int			sliceIndex;
+	int			parentIndex;
+
+	int			numChildren;
+	int			*children;
+
+	int			numSegments;
+
+	int			numPrimaryProcesses;
+	ICCdbProcess *primaryProcesses;
+
+} ICExecSlice;
+
+/* the lite version of SliceTable */
+typedef struct ICSliceTable
+{
+	int			localSlice;		/* Index of the slice to execute. */
+	int			numSlices;
+	ICExecSlice *slices;		/* Array of ICExecSlice, indexed by SliceIndex */
+	uint32		ic_instance_id;
+
+} ICSliceTable;
+
+typedef struct ICChunkTransportState
+{
+	/* keeps track of if we've "activated" connections via SetupInterconnect(). */
+	bool		activated;
+	bool		teardownActive;
+
+	/* slice table stuff. */
+	struct ICSliceTable  *sliceTable;
+	int			sliceId;
+	int			icInstanceId; /* the same as sliceTable->ic_instance_id */
+
+	/* whether we've logged when network timeout happens */
+	bool		networkTimeoutIsLogged;
+
+	/* save client's state */
+	void		*clientState;
+
+} ICChunkTransportState;
+
+struct MemoryBlock
+{
+	unsigned char *pos;
+	int           len;
+};
+
+typedef struct MemoryBlock BufferBlock;
+typedef struct MemoryBlock DataBlock;
+
+typedef int (*GetDataLenInPacket)(unsigned char *msg, int msg_size);
+
+/*
+ * GlobalMotionLayerIPCParam and SessionMotionLayerIPCParam
+ */
+typedef bool (*CheckPostmasterIsAliveCallback)(void);
+typedef void  (*CheckInterruptsCallback)(int teardownActive);
+typedef void  (*SimpleFaultInjectorCallback)(const char *faultname);
+typedef void *(*CreateOpaqueDataWithConn)(void);
+typedef void (*DestroyOpaqueDataInConn)(void **);
+typedef void (*CheckCancelOnQDCallback)(ICChunkTransportState *pTransportStates);
+
+typedef struct GlobalMotionLayerIPCParam
+{
+	char *interconnect_address; /* postmaster.h */
+	int  Gp_role;               /* Gp_role */
+	int  ic_htab_size;          /* cdbgang.h */
+	int  segment_number;        /* getgpsegmentCount() */
+	int  MyProcPid;             /* miscadmin.h */
+	int  dbid;                  /* GpIdentity */
+	int  segindex;              /* GpIdentity */
+	bool MyProcPort;            /* miscadmin.h */
+	int  myprocport_sock;       /* MyProcPort->sock */
+	int  Gp_max_packet_size;    /* default: 8192 */
+	int  Gp_udp_bufsize_k;      /* default: 0 */
+	int  Gp_interconnect_address_type; /* default: INTERCONNECT_ADDRESS_TYPE_UNICAST_IC */
+
+	CheckPostmasterIsAliveCallback checkPostmasterIsAliveCallback;
+	CheckInterruptsCallback        checkInterruptsCallback;
+	SimpleFaultInjectorCallback    simpleFaultInjectorCallback;
+
+	CreateOpaqueDataWithConn       createOpaqueDataCallback;
+	DestroyOpaqueDataInConn        destroyOpaqueDataCallback;
+
+	CheckCancelOnQDCallback        checkCancelOnQDCallback;
+
+} GlobalMotionLayerIPCParam;
+
+typedef struct SessionMotionLayerIPCParam
+{
+	int  Gp_interconnect_queue_depth;                 /* default: 4 */
+	int  Gp_interconnect_snd_queue_depth;             /* default: 2 */
+	int  Gp_interconnect_cursor_ic_table_size;        /* default: 128 */
+	int  Gp_interconnect_timer_period;                /* default: 5 */
+	int  Gp_interconnect_timer_checking_period;       /* default: 20 */
+	int  Gp_interconnect_default_rtt;                 /* default: 20 */
+	int  Gp_interconnect_min_rto;                     /* default: 20 */
+	int  Gp_interconnect_transmit_timeout;            /* default: 3600 */
+	int  Gp_interconnect_min_retries_before_timeout;  /* default: 100 */
+	int  Gp_interconnect_debug_retry_interval;        /* default: 10 */
+	bool gp_interconnect_full_crc;                    /* default: false */
+	bool gp_interconnect_aggressive_retry;            /* default: true */
+	bool gp_interconnect_cache_future_packets;        /* default: true */
+	bool gp_interconnect_log_stats;                   /* default: false */
+	int  interconnect_setup_timeout;                  /* default: 7200 */
+	int  gp_log_interconnect;                         /* default: terse */
+	int  gp_session_id;                               /* global unique id for session. */
+	int  Gp_interconnect_fc_method;                   /* default: INTERCONNECT_FC_METHOD_LOSS */
+	int  gp_command_count;
+	uint32  gp_interconnect_id;
+	int  log_min_messages;                            /* default: IC_WARNING */
+	DistributedTransactionId distTransId;             /* default: 0 */
+
+	int gp_udpic_dropseg;              /* default: -2 */
+	int gp_udpic_dropacks_percent;     /* default: 0 */
+	int gp_udpic_dropxmit_percent;     /* default: 0 */
+	int gp_udpic_fault_inject_percent; /* default: 0 */
+	int gp_udpic_fault_inject_bitmap;  /* default: 0 */
+	int gp_udpic_network_disable_ipv6; /* default: 0 */
+
+} SessionMotionLayerIPCParam;
+
+/*
+ * handle error
+ */
+#define MSGLEN 1024
+
+typedef enum ErrorLevel
+{
+	LEVEL_OK,
+	LEVEL_ERROR,
+	LEVEL_FATAL,
+} ErrorLevel;
+
+typedef struct ICError
+{
+	ErrorLevel level;
+	char       msg[MSGLEN];
+} ICError;
+
+extern void ResetLastError();
+extern ICError* GetLastError();
+extern void SetLastError(ErrorLevel level, const char *msg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // IC_TYPES_H
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/ic_utility.cpp b/contrib/udp2/ic_common/ic_utility.cpp
new file mode 100644
index 00000000000..7a5a0747238
--- /dev/null
+++ b/contrib/udp2/ic_common/ic_utility.cpp
@@ -0,0 +1,1371 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_utility.cpp
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/ic_utility.cpp
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include <cstring>
+
+#include "ic_types.h"
+#include "ic_utility.hpp"
+
+/*
+ * global_param and session_param;
+ */
+GlobalMotionLayerIPCParam global_param =
+	{NULL, /* interconnect_address */
+	 -1,   /* Gp_role */
+	 0,    /* ic_htab_size */
+	 0,    /* segment_number */
+	 -1,   /* MyProcPid */
+	 -1,   /* dbid */
+	 -1,   /* segindex */
+	 false,/* MyProcPort */
+	 -1,   /* myprocport_sock */
+	 8192, /* Gp_max_packet_size */
+	 0,    /* Gp_udp_bufsize_k */
+	 INTERCONNECT_ADDRESS_TYPE_UNICAST_IC, /* Gp_interconnect_address_type */
+	 NULL, /* CheckPostmasterIsAliveCallback */
+	 NULL, /* checkInterruptsCallback */
+	 NULL, /* simpleFaultInjectorCallback */
+	 NULL, /* createOpaqueDataCallback */
+	 NULL, /* destroyOpaqueDataCallback */
+	 NULL, /* checkCancelOnQDCallback */
+	 };
+
+SessionMotionLayerIPCParam session_param =
+	{4,    /* Gp_interconnect_queue_depth */
+	 2,    /* Gp_interconnect_snd_queue_depth */
+	 128,  /* Gp_interconnect_cursor_ic_table_size */
+	 5,    /* Gp_interconnect_timer_period */
+	 20,   /* Gp_interconnect_timer_checking_period */
+	 20,   /* Gp_interconnect_default_rtt */
+	 20,   /* Gp_interconnect_min_rto */
+	 3600, /* Gp_interconnect_transmit_timeout */
+	 100,  /* Gp_interconnect_min_retries_before_timeout */
+	 10,   /* Gp_interconnect_debug_retry_interval */
+	 false,/* gp_interconnect_full_crc */
+	 true, /* gp_interconnect_aggressive_retry */
+	 true, /* gp_interconnect_cache_future_packets */
+	 false,/* gp_interconnect_log_stats */
+	 7200, /* interconnect_setup_timeout */
+	 GPVARS_VERBOSITY_TERSE_IC, /* gp_log_interconnect */
+	 -1,   /* gp_session_id */
+	 INTERCONNECT_FC_METHOD_LOSS_IC, /* Gp_interconnect_fc_method */
+	 -1,   /* gp_command_count */
+	 0,    /* gp_interconnect_id */
+	 IC_WARNING, /* log_min_messages */
+	 0,    /* distTransId */
+
+	 UNDEF_SEGMENT,   /* gp_udpic_dropseg */
+	 0,    /* gp_udpic_dropacks_percent */
+	 0,    /* gp_udpic_dropxmit_percent */
+	 0,    /* gp_udpic_fault_inject_percent */
+	 0,    /* gp_udpic_fault_inject_bitmap */
+	 0,    /* gp_udpic_network_disable_ipv6 */
+	};
+
+
+/*
+ * logger stuff
+ */
+Logger RootLogger;
+static std::mutex LoggerMutex;
+static thread_local std::once_flag Once;
+static thread_local char ProcessId[64];
+
+const char * SeverityName[] = { "FATAL", "ERROR", "WARNING", "INFO", "DEBUG1",
+                                "DEBUG2", "DEBUG3", "DEBUG4", "DEBUG5"
+                              };
+
+static void InitProcessId() {
+    std::stringstream ss;
+    ss.imbue(std::locale::classic());
+    ss << "p" << getpid() << ", th" << pthread_self();
+    snprintf(ProcessId, sizeof(ProcessId), "%s", ss.str().c_str());
+}
+
+Logger::Logger() :
+    fd(STDERR_FILENO), severity(DEFAULT_LOG_LEVEL) {
+}
+
+Logger::~Logger() {
+}
+
+void Logger::setOutputFd(int f) {
+    fd = f;
+}
+
+void Logger::setLogSeverity(LogSeverity l) {
+    severity.store(l, std::memory_order_relaxed);
+}
+
+void Logger::printf(LogSeverity s, const char * fmt, ...) {
+    va_list ap;
+
+    if (s > severity || fd < 0) {
+        return;
+    }
+
+    try {
+        call_once(Once, InitProcessId);
+        std::vector<char> buffer;
+        struct tm tm_time;
+        struct timeval tval;
+        memset(&tval, 0, sizeof(tval));
+        gettimeofday(&tval, NULL);
+        localtime_r(&tval.tv_sec, &tm_time);
+        //determine buffer size
+        va_start(ap, fmt);
+        int size = vsnprintf(nullptr, 0, fmt, ap);
+        va_end(ap);
+        //100 is enough for prefix
+        buffer.resize(size + 100);
+        size = snprintf(buffer.data(), buffer.size(), "%04d-%02d-%02d %02d:%02d:%02d.%06ld, %s, %s ", tm_time.tm_year + 1900,
+                        1 + tm_time.tm_mon, tm_time.tm_mday, tm_time.tm_hour,
+                        tm_time.tm_min, tm_time.tm_sec, static_cast<long>(tval.tv_usec), ProcessId, SeverityName[s]);
+        va_start(ap, fmt);
+        size += vsnprintf(buffer.data() + size, buffer.size() - size, fmt, ap);
+        va_end(ap);
+        {
+            std::lock_guard<std::mutex> lock(LoggerMutex);
+            dprintf(fd, "%s\n", buffer.data());
+        }
+        return;
+    } catch (const std::exception & e) {
+        dprintf(fd, "%s:%d %s %s", __FILE__, __LINE__,
+                "FATAL: get an unexpected exception:", e.what());
+        throw;
+    }
+}
+
+/*
+ * crc32
+ */
+static uint32 comp_crc32c_sb8(uint32 crc, const void *data, size_t len);
+
+/*
+ * Use slicing-by-8 algorithm.
+ *
+ * On big-endian systems, the intermediate value is kept in reverse byte
+ * order, to avoid byte-swapping during the calculation. FIN_CRC32C reverses
+ * the bytes to the final order.
+ */
+#define INIT_CRC32C(crc) ((crc) = 0xFFFFFFFF)
+#define COMP_CRC32C(crc, data, len) \
+	((crc) = comp_crc32c_sb8((crc), (data), (len)))
+#ifdef WORDS_BIGENDIAN
+#define FIN_CRC32C(crc) ((crc) = ic_bswap32(crc) ^ 0xFFFFFFFF)
+#else
+#define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
+#endif
+
+uint32
+ComputeCRC(const void *data, size_t len)
+{
+	uint32 local_crc;
+
+	INIT_CRC32C(local_crc);
+	COMP_CRC32C(local_crc, data, len);
+	FIN_CRC32C(local_crc);
+
+	return local_crc;
+}
+
+/*
+ * Lookup tables for the slicing-by-8 algorithm, for the so-called Castagnoli
+ * polynomial (the same that is used e.g. in iSCSI), 0x1EDC6F41. Using
+ * Williams' terms, this is the "normal", not "reflected" version. However, on
+ * big-endian systems the values in the tables are stored in byte-reversed
+ * order (IOW, the tables are stored in little-endian order even on big-endian
+ * systems).
+ */
+static const uint32 crc32c_table[8][256] = {
+#ifndef WORDS_BIGENDIAN
+	{
+		0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,
+		0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
+		0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
+		0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
+		0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,
+		0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+		0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,
+		0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,
+		0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
+		0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,
+		0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,
+		0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+		0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,
+		0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,
+		0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
+		0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,
+		0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,
+		0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+		0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,
+		0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,
+		0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
+		0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,
+		0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,
+		0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+		0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,
+		0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,
+		0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
+		0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,
+		0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,
+		0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+		0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,
+		0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,
+		0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
+		0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,
+		0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,
+		0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+		0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,
+		0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,
+		0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
+		0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,
+		0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,
+		0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+		0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,
+		0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,
+		0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
+		0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,
+		0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,
+		0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+		0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,
+		0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,
+		0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
+		0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,
+		0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,
+		0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+		0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,
+		0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,
+		0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
+		0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,
+		0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,
+		0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+		0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,
+		0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,
+		0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
+		0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351
+	},
+	{
+		0x00000000, 0x13A29877, 0x274530EE, 0x34E7A899,
+		0x4E8A61DC, 0x5D28F9AB, 0x69CF5132, 0x7A6DC945,
+		0x9D14C3B8, 0x8EB65BCF, 0xBA51F356, 0xA9F36B21,
+		0xD39EA264, 0xC03C3A13, 0xF4DB928A, 0xE7790AFD,
+		0x3FC5F181, 0x2C6769F6, 0x1880C16F, 0x0B225918,
+		0x714F905D, 0x62ED082A, 0x560AA0B3, 0x45A838C4,
+		0xA2D13239, 0xB173AA4E, 0x859402D7, 0x96369AA0,
+		0xEC5B53E5, 0xFFF9CB92, 0xCB1E630B, 0xD8BCFB7C,
+		0x7F8BE302, 0x6C297B75, 0x58CED3EC, 0x4B6C4B9B,
+		0x310182DE, 0x22A31AA9, 0x1644B230, 0x05E62A47,
+		0xE29F20BA, 0xF13DB8CD, 0xC5DA1054, 0xD6788823,
+		0xAC154166, 0xBFB7D911, 0x8B507188, 0x98F2E9FF,
+		0x404E1283, 0x53EC8AF4, 0x670B226D, 0x74A9BA1A,
+		0x0EC4735F, 0x1D66EB28, 0x298143B1, 0x3A23DBC6,
+		0xDD5AD13B, 0xCEF8494C, 0xFA1FE1D5, 0xE9BD79A2,
+		0x93D0B0E7, 0x80722890, 0xB4958009, 0xA737187E,
+		0xFF17C604, 0xECB55E73, 0xD852F6EA, 0xCBF06E9D,
+		0xB19DA7D8, 0xA23F3FAF, 0x96D89736, 0x857A0F41,
+		0x620305BC, 0x71A19DCB, 0x45463552, 0x56E4AD25,
+		0x2C896460, 0x3F2BFC17, 0x0BCC548E, 0x186ECCF9,
+		0xC0D23785, 0xD370AFF2, 0xE797076B, 0xF4359F1C,
+		0x8E585659, 0x9DFACE2E, 0xA91D66B7, 0xBABFFEC0,
+		0x5DC6F43D, 0x4E646C4A, 0x7A83C4D3, 0x69215CA4,
+		0x134C95E1, 0x00EE0D96, 0x3409A50F, 0x27AB3D78,
+		0x809C2506, 0x933EBD71, 0xA7D915E8, 0xB47B8D9F,
+		0xCE1644DA, 0xDDB4DCAD, 0xE9537434, 0xFAF1EC43,
+		0x1D88E6BE, 0x0E2A7EC9, 0x3ACDD650, 0x296F4E27,
+		0x53028762, 0x40A01F15, 0x7447B78C, 0x67E52FFB,
+		0xBF59D487, 0xACFB4CF0, 0x981CE469, 0x8BBE7C1E,
+		0xF1D3B55B, 0xE2712D2C, 0xD69685B5, 0xC5341DC2,
+		0x224D173F, 0x31EF8F48, 0x050827D1, 0x16AABFA6,
+		0x6CC776E3, 0x7F65EE94, 0x4B82460D, 0x5820DE7A,
+		0xFBC3FAF9, 0xE861628E, 0xDC86CA17, 0xCF245260,
+		0xB5499B25, 0xA6EB0352, 0x920CABCB, 0x81AE33BC,
+		0x66D73941, 0x7575A136, 0x419209AF, 0x523091D8,
+		0x285D589D, 0x3BFFC0EA, 0x0F186873, 0x1CBAF004,
+		0xC4060B78, 0xD7A4930F, 0xE3433B96, 0xF0E1A3E1,
+		0x8A8C6AA4, 0x992EF2D3, 0xADC95A4A, 0xBE6BC23D,
+		0x5912C8C0, 0x4AB050B7, 0x7E57F82E, 0x6DF56059,
+		0x1798A91C, 0x043A316B, 0x30DD99F2, 0x237F0185,
+		0x844819FB, 0x97EA818C, 0xA30D2915, 0xB0AFB162,
+		0xCAC27827, 0xD960E050, 0xED8748C9, 0xFE25D0BE,
+		0x195CDA43, 0x0AFE4234, 0x3E19EAAD, 0x2DBB72DA,
+		0x57D6BB9F, 0x447423E8, 0x70938B71, 0x63311306,
+		0xBB8DE87A, 0xA82F700D, 0x9CC8D894, 0x8F6A40E3,
+		0xF50789A6, 0xE6A511D1, 0xD242B948, 0xC1E0213F,
+		0x26992BC2, 0x353BB3B5, 0x01DC1B2C, 0x127E835B,
+		0x68134A1E, 0x7BB1D269, 0x4F567AF0, 0x5CF4E287,
+		0x04D43CFD, 0x1776A48A, 0x23910C13, 0x30339464,
+		0x4A5E5D21, 0x59FCC556, 0x6D1B6DCF, 0x7EB9F5B8,
+		0x99C0FF45, 0x8A626732, 0xBE85CFAB, 0xAD2757DC,
+		0xD74A9E99, 0xC4E806EE, 0xF00FAE77, 0xE3AD3600,
+		0x3B11CD7C, 0x28B3550B, 0x1C54FD92, 0x0FF665E5,
+		0x759BACA0, 0x663934D7, 0x52DE9C4E, 0x417C0439,
+		0xA6050EC4, 0xB5A796B3, 0x81403E2A, 0x92E2A65D,
+		0xE88F6F18, 0xFB2DF76F, 0xCFCA5FF6, 0xDC68C781,
+		0x7B5FDFFF, 0x68FD4788, 0x5C1AEF11, 0x4FB87766,
+		0x35D5BE23, 0x26772654, 0x12908ECD, 0x013216BA,
+		0xE64B1C47, 0xF5E98430, 0xC10E2CA9, 0xD2ACB4DE,
+		0xA8C17D9B, 0xBB63E5EC, 0x8F844D75, 0x9C26D502,
+		0x449A2E7E, 0x5738B609, 0x63DF1E90, 0x707D86E7,
+		0x0A104FA2, 0x19B2D7D5, 0x2D557F4C, 0x3EF7E73B,
+		0xD98EEDC6, 0xCA2C75B1, 0xFECBDD28, 0xED69455F,
+		0x97048C1A, 0x84A6146D, 0xB041BCF4, 0xA3E32483
+	},
+	{
+		0x00000000, 0xA541927E, 0x4F6F520D, 0xEA2EC073,
+		0x9EDEA41A, 0x3B9F3664, 0xD1B1F617, 0x74F06469,
+		0x38513EC5, 0x9D10ACBB, 0x773E6CC8, 0xD27FFEB6,
+		0xA68F9ADF, 0x03CE08A1, 0xE9E0C8D2, 0x4CA15AAC,
+		0x70A27D8A, 0xD5E3EFF4, 0x3FCD2F87, 0x9A8CBDF9,
+		0xEE7CD990, 0x4B3D4BEE, 0xA1138B9D, 0x045219E3,
+		0x48F3434F, 0xEDB2D131, 0x079C1142, 0xA2DD833C,
+		0xD62DE755, 0x736C752B, 0x9942B558, 0x3C032726,
+		0xE144FB14, 0x4405696A, 0xAE2BA919, 0x0B6A3B67,
+		0x7F9A5F0E, 0xDADBCD70, 0x30F50D03, 0x95B49F7D,
+		0xD915C5D1, 0x7C5457AF, 0x967A97DC, 0x333B05A2,
+		0x47CB61CB, 0xE28AF3B5, 0x08A433C6, 0xADE5A1B8,
+		0x91E6869E, 0x34A714E0, 0xDE89D493, 0x7BC846ED,
+		0x0F382284, 0xAA79B0FA, 0x40577089, 0xE516E2F7,
+		0xA9B7B85B, 0x0CF62A25, 0xE6D8EA56, 0x43997828,
+		0x37691C41, 0x92288E3F, 0x78064E4C, 0xDD47DC32,
+		0xC76580D9, 0x622412A7, 0x880AD2D4, 0x2D4B40AA,
+		0x59BB24C3, 0xFCFAB6BD, 0x16D476CE, 0xB395E4B0,
+		0xFF34BE1C, 0x5A752C62, 0xB05BEC11, 0x151A7E6F,
+		0x61EA1A06, 0xC4AB8878, 0x2E85480B, 0x8BC4DA75,
+		0xB7C7FD53, 0x12866F2D, 0xF8A8AF5E, 0x5DE93D20,
+		0x29195949, 0x8C58CB37, 0x66760B44, 0xC337993A,
+		0x8F96C396, 0x2AD751E8, 0xC0F9919B, 0x65B803E5,
+		0x1148678C, 0xB409F5F2, 0x5E273581, 0xFB66A7FF,
+		0x26217BCD, 0x8360E9B3, 0x694E29C0, 0xCC0FBBBE,
+		0xB8FFDFD7, 0x1DBE4DA9, 0xF7908DDA, 0x52D11FA4,
+		0x1E704508, 0xBB31D776, 0x511F1705, 0xF45E857B,
+		0x80AEE112, 0x25EF736C, 0xCFC1B31F, 0x6A802161,
+		0x56830647, 0xF3C29439, 0x19EC544A, 0xBCADC634,
+		0xC85DA25D, 0x6D1C3023, 0x8732F050, 0x2273622E,
+		0x6ED23882, 0xCB93AAFC, 0x21BD6A8F, 0x84FCF8F1,
+		0xF00C9C98, 0x554D0EE6, 0xBF63CE95, 0x1A225CEB,
+		0x8B277743, 0x2E66E53D, 0xC448254E, 0x6109B730,
+		0x15F9D359, 0xB0B84127, 0x5A968154, 0xFFD7132A,
+		0xB3764986, 0x1637DBF8, 0xFC191B8B, 0x595889F5,
+		0x2DA8ED9C, 0x88E97FE2, 0x62C7BF91, 0xC7862DEF,
+		0xFB850AC9, 0x5EC498B7, 0xB4EA58C4, 0x11ABCABA,
+		0x655BAED3, 0xC01A3CAD, 0x2A34FCDE, 0x8F756EA0,
+		0xC3D4340C, 0x6695A672, 0x8CBB6601, 0x29FAF47F,
+		0x5D0A9016, 0xF84B0268, 0x1265C21B, 0xB7245065,
+		0x6A638C57, 0xCF221E29, 0x250CDE5A, 0x804D4C24,
+		0xF4BD284D, 0x51FCBA33, 0xBBD27A40, 0x1E93E83E,
+		0x5232B292, 0xF77320EC, 0x1D5DE09F, 0xB81C72E1,
+		0xCCEC1688, 0x69AD84F6, 0x83834485, 0x26C2D6FB,
+		0x1AC1F1DD, 0xBF8063A3, 0x55AEA3D0, 0xF0EF31AE,
+		0x841F55C7, 0x215EC7B9, 0xCB7007CA, 0x6E3195B4,
+		0x2290CF18, 0x87D15D66, 0x6DFF9D15, 0xC8BE0F6B,
+		0xBC4E6B02, 0x190FF97C, 0xF321390F, 0x5660AB71,
+		0x4C42F79A, 0xE90365E4, 0x032DA597, 0xA66C37E9,
+		0xD29C5380, 0x77DDC1FE, 0x9DF3018D, 0x38B293F3,
+		0x7413C95F, 0xD1525B21, 0x3B7C9B52, 0x9E3D092C,
+		0xEACD6D45, 0x4F8CFF3B, 0xA5A23F48, 0x00E3AD36,
+		0x3CE08A10, 0x99A1186E, 0x738FD81D, 0xD6CE4A63,
+		0xA23E2E0A, 0x077FBC74, 0xED517C07, 0x4810EE79,
+		0x04B1B4D5, 0xA1F026AB, 0x4BDEE6D8, 0xEE9F74A6,
+		0x9A6F10CF, 0x3F2E82B1, 0xD50042C2, 0x7041D0BC,
+		0xAD060C8E, 0x08479EF0, 0xE2695E83, 0x4728CCFD,
+		0x33D8A894, 0x96993AEA, 0x7CB7FA99, 0xD9F668E7,
+		0x9557324B, 0x3016A035, 0xDA386046, 0x7F79F238,
+		0x0B899651, 0xAEC8042F, 0x44E6C45C, 0xE1A75622,
+		0xDDA47104, 0x78E5E37A, 0x92CB2309, 0x378AB177,
+		0x437AD51E, 0xE63B4760, 0x0C158713, 0xA954156D,
+		0xE5F54FC1, 0x40B4DDBF, 0xAA9A1DCC, 0x0FDB8FB2,
+		0x7B2BEBDB, 0xDE6A79A5, 0x3444B9D6, 0x91052BA8
+	},
+	{
+		0x00000000, 0xDD45AAB8, 0xBF672381, 0x62228939,
+		0x7B2231F3, 0xA6679B4B, 0xC4451272, 0x1900B8CA,
+		0xF64463E6, 0x2B01C95E, 0x49234067, 0x9466EADF,
+		0x8D665215, 0x5023F8AD, 0x32017194, 0xEF44DB2C,
+		0xE964B13D, 0x34211B85, 0x560392BC, 0x8B463804,
+		0x924680CE, 0x4F032A76, 0x2D21A34F, 0xF06409F7,
+		0x1F20D2DB, 0xC2657863, 0xA047F15A, 0x7D025BE2,
+		0x6402E328, 0xB9474990, 0xDB65C0A9, 0x06206A11,
+		0xD725148B, 0x0A60BE33, 0x6842370A, 0xB5079DB2,
+		0xAC072578, 0x71428FC0, 0x136006F9, 0xCE25AC41,
+		0x2161776D, 0xFC24DDD5, 0x9E0654EC, 0x4343FE54,
+		0x5A43469E, 0x8706EC26, 0xE524651F, 0x3861CFA7,
+		0x3E41A5B6, 0xE3040F0E, 0x81268637, 0x5C632C8F,
+		0x45639445, 0x98263EFD, 0xFA04B7C4, 0x27411D7C,
+		0xC805C650, 0x15406CE8, 0x7762E5D1, 0xAA274F69,
+		0xB327F7A3, 0x6E625D1B, 0x0C40D422, 0xD1057E9A,
+		0xABA65FE7, 0x76E3F55F, 0x14C17C66, 0xC984D6DE,
+		0xD0846E14, 0x0DC1C4AC, 0x6FE34D95, 0xB2A6E72D,
+		0x5DE23C01, 0x80A796B9, 0xE2851F80, 0x3FC0B538,
+		0x26C00DF2, 0xFB85A74A, 0x99A72E73, 0x44E284CB,
+		0x42C2EEDA, 0x9F874462, 0xFDA5CD5B, 0x20E067E3,
+		0x39E0DF29, 0xE4A57591, 0x8687FCA8, 0x5BC25610,
+		0xB4868D3C, 0x69C32784, 0x0BE1AEBD, 0xD6A40405,
+		0xCFA4BCCF, 0x12E11677, 0x70C39F4E, 0xAD8635F6,
+		0x7C834B6C, 0xA1C6E1D4, 0xC3E468ED, 0x1EA1C255,
+		0x07A17A9F, 0xDAE4D027, 0xB8C6591E, 0x6583F3A6,
+		0x8AC7288A, 0x57828232, 0x35A00B0B, 0xE8E5A1B3,
+		0xF1E51979, 0x2CA0B3C1, 0x4E823AF8, 0x93C79040,
+		0x95E7FA51, 0x48A250E9, 0x2A80D9D0, 0xF7C57368,
+		0xEEC5CBA2, 0x3380611A, 0x51A2E823, 0x8CE7429B,
+		0x63A399B7, 0xBEE6330F, 0xDCC4BA36, 0x0181108E,
+		0x1881A844, 0xC5C402FC, 0xA7E68BC5, 0x7AA3217D,
+		0x52A0C93F, 0x8FE56387, 0xEDC7EABE, 0x30824006,
+		0x2982F8CC, 0xF4C75274, 0x96E5DB4D, 0x4BA071F5,
+		0xA4E4AAD9, 0x79A10061, 0x1B838958, 0xC6C623E0,
+		0xDFC69B2A, 0x02833192, 0x60A1B8AB, 0xBDE41213,
+		0xBBC47802, 0x6681D2BA, 0x04A35B83, 0xD9E6F13B,
+		0xC0E649F1, 0x1DA3E349, 0x7F816A70, 0xA2C4C0C8,
+		0x4D801BE4, 0x90C5B15C, 0xF2E73865, 0x2FA292DD,
+		0x36A22A17, 0xEBE780AF, 0x89C50996, 0x5480A32E,
+		0x8585DDB4, 0x58C0770C, 0x3AE2FE35, 0xE7A7548D,
+		0xFEA7EC47, 0x23E246FF, 0x41C0CFC6, 0x9C85657E,
+		0x73C1BE52, 0xAE8414EA, 0xCCA69DD3, 0x11E3376B,
+		0x08E38FA1, 0xD5A62519, 0xB784AC20, 0x6AC10698,
+		0x6CE16C89, 0xB1A4C631, 0xD3864F08, 0x0EC3E5B0,
+		0x17C35D7A, 0xCA86F7C2, 0xA8A47EFB, 0x75E1D443,
+		0x9AA50F6F, 0x47E0A5D7, 0x25C22CEE, 0xF8878656,
+		0xE1873E9C, 0x3CC29424, 0x5EE01D1D, 0x83A5B7A5,
+		0xF90696D8, 0x24433C60, 0x4661B559, 0x9B241FE1,
+		0x8224A72B, 0x5F610D93, 0x3D4384AA, 0xE0062E12,
+		0x0F42F53E, 0xD2075F86, 0xB025D6BF, 0x6D607C07,
+		0x7460C4CD, 0xA9256E75, 0xCB07E74C, 0x16424DF4,
+		0x106227E5, 0xCD278D5D, 0xAF050464, 0x7240AEDC,
+		0x6B401616, 0xB605BCAE, 0xD4273597, 0x09629F2F,
+		0xE6264403, 0x3B63EEBB, 0x59416782, 0x8404CD3A,
+		0x9D0475F0, 0x4041DF48, 0x22635671, 0xFF26FCC9,
+		0x2E238253, 0xF36628EB, 0x9144A1D2, 0x4C010B6A,
+		0x5501B3A0, 0x88441918, 0xEA669021, 0x37233A99,
+		0xD867E1B5, 0x05224B0D, 0x6700C234, 0xBA45688C,
+		0xA345D046, 0x7E007AFE, 0x1C22F3C7, 0xC167597F,
+		0xC747336E, 0x1A0299D6, 0x782010EF, 0xA565BA57,
+		0xBC65029D, 0x6120A825, 0x0302211C, 0xDE478BA4,
+		0x31035088, 0xEC46FA30, 0x8E647309, 0x5321D9B1,
+		0x4A21617B, 0x9764CBC3, 0xF54642FA, 0x2803E842
+	},
+	{
+		0x00000000, 0x38116FAC, 0x7022DF58, 0x4833B0F4,
+		0xE045BEB0, 0xD854D11C, 0x906761E8, 0xA8760E44,
+		0xC5670B91, 0xFD76643D, 0xB545D4C9, 0x8D54BB65,
+		0x2522B521, 0x1D33DA8D, 0x55006A79, 0x6D1105D5,
+		0x8F2261D3, 0xB7330E7F, 0xFF00BE8B, 0xC711D127,
+		0x6F67DF63, 0x5776B0CF, 0x1F45003B, 0x27546F97,
+		0x4A456A42, 0x725405EE, 0x3A67B51A, 0x0276DAB6,
+		0xAA00D4F2, 0x9211BB5E, 0xDA220BAA, 0xE2336406,
+		0x1BA8B557, 0x23B9DAFB, 0x6B8A6A0F, 0x539B05A3,
+		0xFBED0BE7, 0xC3FC644B, 0x8BCFD4BF, 0xB3DEBB13,
+		0xDECFBEC6, 0xE6DED16A, 0xAEED619E, 0x96FC0E32,
+		0x3E8A0076, 0x069B6FDA, 0x4EA8DF2E, 0x76B9B082,
+		0x948AD484, 0xAC9BBB28, 0xE4A80BDC, 0xDCB96470,
+		0x74CF6A34, 0x4CDE0598, 0x04EDB56C, 0x3CFCDAC0,
+		0x51EDDF15, 0x69FCB0B9, 0x21CF004D, 0x19DE6FE1,
+		0xB1A861A5, 0x89B90E09, 0xC18ABEFD, 0xF99BD151,
+		0x37516AAE, 0x0F400502, 0x4773B5F6, 0x7F62DA5A,
+		0xD714D41E, 0xEF05BBB2, 0xA7360B46, 0x9F2764EA,
+		0xF236613F, 0xCA270E93, 0x8214BE67, 0xBA05D1CB,
+		0x1273DF8F, 0x2A62B023, 0x625100D7, 0x5A406F7B,
+		0xB8730B7D, 0x806264D1, 0xC851D425, 0xF040BB89,
+		0x5836B5CD, 0x6027DA61, 0x28146A95, 0x10050539,
+		0x7D1400EC, 0x45056F40, 0x0D36DFB4, 0x3527B018,
+		0x9D51BE5C, 0xA540D1F0, 0xED736104, 0xD5620EA8,
+		0x2CF9DFF9, 0x14E8B055, 0x5CDB00A1, 0x64CA6F0D,
+		0xCCBC6149, 0xF4AD0EE5, 0xBC9EBE11, 0x848FD1BD,
+		0xE99ED468, 0xD18FBBC4, 0x99BC0B30, 0xA1AD649C,
+		0x09DB6AD8, 0x31CA0574, 0x79F9B580, 0x41E8DA2C,
+		0xA3DBBE2A, 0x9BCAD186, 0xD3F96172, 0xEBE80EDE,
+		0x439E009A, 0x7B8F6F36, 0x33BCDFC2, 0x0BADB06E,
+		0x66BCB5BB, 0x5EADDA17, 0x169E6AE3, 0x2E8F054F,
+		0x86F90B0B, 0xBEE864A7, 0xF6DBD453, 0xCECABBFF,
+		0x6EA2D55C, 0x56B3BAF0, 0x1E800A04, 0x269165A8,
+		0x8EE76BEC, 0xB6F60440, 0xFEC5B4B4, 0xC6D4DB18,
+		0xABC5DECD, 0x93D4B161, 0xDBE70195, 0xE3F66E39,
+		0x4B80607D, 0x73910FD1, 0x3BA2BF25, 0x03B3D089,
+		0xE180B48F, 0xD991DB23, 0x91A26BD7, 0xA9B3047B,
+		0x01C50A3F, 0x39D46593, 0x71E7D567, 0x49F6BACB,
+		0x24E7BF1E, 0x1CF6D0B2, 0x54C56046, 0x6CD40FEA,
+		0xC4A201AE, 0xFCB36E02, 0xB480DEF6, 0x8C91B15A,
+		0x750A600B, 0x4D1B0FA7, 0x0528BF53, 0x3D39D0FF,
+		0x954FDEBB, 0xAD5EB117, 0xE56D01E3, 0xDD7C6E4F,
+		0xB06D6B9A, 0x887C0436, 0xC04FB4C2, 0xF85EDB6E,
+		0x5028D52A, 0x6839BA86, 0x200A0A72, 0x181B65DE,
+		0xFA2801D8, 0xC2396E74, 0x8A0ADE80, 0xB21BB12C,
+		0x1A6DBF68, 0x227CD0C4, 0x6A4F6030, 0x525E0F9C,
+		0x3F4F0A49, 0x075E65E5, 0x4F6DD511, 0x777CBABD,
+		0xDF0AB4F9, 0xE71BDB55, 0xAF286BA1, 0x9739040D,
+		0x59F3BFF2, 0x61E2D05E, 0x29D160AA, 0x11C00F06,
+		0xB9B60142, 0x81A76EEE, 0xC994DE1A, 0xF185B1B6,
+		0x9C94B463, 0xA485DBCF, 0xECB66B3B, 0xD4A70497,
+		0x7CD10AD3, 0x44C0657F, 0x0CF3D58B, 0x34E2BA27,
+		0xD6D1DE21, 0xEEC0B18D, 0xA6F30179, 0x9EE26ED5,
+		0x36946091, 0x0E850F3D, 0x46B6BFC9, 0x7EA7D065,
+		0x13B6D5B0, 0x2BA7BA1C, 0x63940AE8, 0x5B856544,
+		0xF3F36B00, 0xCBE204AC, 0x83D1B458, 0xBBC0DBF4,
+		0x425B0AA5, 0x7A4A6509, 0x3279D5FD, 0x0A68BA51,
+		0xA21EB415, 0x9A0FDBB9, 0xD23C6B4D, 0xEA2D04E1,
+		0x873C0134, 0xBF2D6E98, 0xF71EDE6C, 0xCF0FB1C0,
+		0x6779BF84, 0x5F68D028, 0x175B60DC, 0x2F4A0F70,
+		0xCD796B76, 0xF56804DA, 0xBD5BB42E, 0x854ADB82,
+		0x2D3CD5C6, 0x152DBA6A, 0x5D1E0A9E, 0x650F6532,
+		0x081E60E7, 0x300F0F4B, 0x783CBFBF, 0x402DD013,
+		0xE85BDE57, 0xD04AB1FB, 0x9879010F, 0xA0686EA3
+	},
+	{
+		0x00000000, 0xEF306B19, 0xDB8CA0C3, 0x34BCCBDA,
+		0xB2F53777, 0x5DC55C6E, 0x697997B4, 0x8649FCAD,
+		0x6006181F, 0x8F367306, 0xBB8AB8DC, 0x54BAD3C5,
+		0xD2F32F68, 0x3DC34471, 0x097F8FAB, 0xE64FE4B2,
+		0xC00C303E, 0x2F3C5B27, 0x1B8090FD, 0xF4B0FBE4,
+		0x72F90749, 0x9DC96C50, 0xA975A78A, 0x4645CC93,
+		0xA00A2821, 0x4F3A4338, 0x7B8688E2, 0x94B6E3FB,
+		0x12FF1F56, 0xFDCF744F, 0xC973BF95, 0x2643D48C,
+		0x85F4168D, 0x6AC47D94, 0x5E78B64E, 0xB148DD57,
+		0x370121FA, 0xD8314AE3, 0xEC8D8139, 0x03BDEA20,
+		0xE5F20E92, 0x0AC2658B, 0x3E7EAE51, 0xD14EC548,
+		0x570739E5, 0xB83752FC, 0x8C8B9926, 0x63BBF23F,
+		0x45F826B3, 0xAAC84DAA, 0x9E748670, 0x7144ED69,
+		0xF70D11C4, 0x183D7ADD, 0x2C81B107, 0xC3B1DA1E,
+		0x25FE3EAC, 0xCACE55B5, 0xFE729E6F, 0x1142F576,
+		0x970B09DB, 0x783B62C2, 0x4C87A918, 0xA3B7C201,
+		0x0E045BEB, 0xE13430F2, 0xD588FB28, 0x3AB89031,
+		0xBCF16C9C, 0x53C10785, 0x677DCC5F, 0x884DA746,
+		0x6E0243F4, 0x813228ED, 0xB58EE337, 0x5ABE882E,
+		0xDCF77483, 0x33C71F9A, 0x077BD440, 0xE84BBF59,
+		0xCE086BD5, 0x213800CC, 0x1584CB16, 0xFAB4A00F,
+		0x7CFD5CA2, 0x93CD37BB, 0xA771FC61, 0x48419778,
+		0xAE0E73CA, 0x413E18D3, 0x7582D309, 0x9AB2B810,
+		0x1CFB44BD, 0xF3CB2FA4, 0xC777E47E, 0x28478F67,
+		0x8BF04D66, 0x64C0267F, 0x507CEDA5, 0xBF4C86BC,
+		0x39057A11, 0xD6351108, 0xE289DAD2, 0x0DB9B1CB,
+		0xEBF65579, 0x04C63E60, 0x307AF5BA, 0xDF4A9EA3,
+		0x5903620E, 0xB6330917, 0x828FC2CD, 0x6DBFA9D4,
+		0x4BFC7D58, 0xA4CC1641, 0x9070DD9B, 0x7F40B682,
+		0xF9094A2F, 0x16392136, 0x2285EAEC, 0xCDB581F5,
+		0x2BFA6547, 0xC4CA0E5E, 0xF076C584, 0x1F46AE9D,
+		0x990F5230, 0x763F3929, 0x4283F2F3, 0xADB399EA,
+		0x1C08B7D6, 0xF338DCCF, 0xC7841715, 0x28B47C0C,
+		0xAEFD80A1, 0x41CDEBB8, 0x75712062, 0x9A414B7B,
+		0x7C0EAFC9, 0x933EC4D0, 0xA7820F0A, 0x48B26413,
+		0xCEFB98BE, 0x21CBF3A7, 0x1577387D, 0xFA475364,
+		0xDC0487E8, 0x3334ECF1, 0x0788272B, 0xE8B84C32,
+		0x6EF1B09F, 0x81C1DB86, 0xB57D105C, 0x5A4D7B45,
+		0xBC029FF7, 0x5332F4EE, 0x678E3F34, 0x88BE542D,
+		0x0EF7A880, 0xE1C7C399, 0xD57B0843, 0x3A4B635A,
+		0x99FCA15B, 0x76CCCA42, 0x42700198, 0xAD406A81,
+		0x2B09962C, 0xC439FD35, 0xF08536EF, 0x1FB55DF6,
+		0xF9FAB944, 0x16CAD25D, 0x22761987, 0xCD46729E,
+		0x4B0F8E33, 0xA43FE52A, 0x90832EF0, 0x7FB345E9,
+		0x59F09165, 0xB6C0FA7C, 0x827C31A6, 0x6D4C5ABF,
+		0xEB05A612, 0x0435CD0B, 0x308906D1, 0xDFB96DC8,
+		0x39F6897A, 0xD6C6E263, 0xE27A29B9, 0x0D4A42A0,
+		0x8B03BE0D, 0x6433D514, 0x508F1ECE, 0xBFBF75D7,
+		0x120CEC3D, 0xFD3C8724, 0xC9804CFE, 0x26B027E7,
+		0xA0F9DB4A, 0x4FC9B053, 0x7B757B89, 0x94451090,
+		0x720AF422, 0x9D3A9F3B, 0xA98654E1, 0x46B63FF8,
+		0xC0FFC355, 0x2FCFA84C, 0x1B736396, 0xF443088F,
+		0xD200DC03, 0x3D30B71A, 0x098C7CC0, 0xE6BC17D9,
+		0x60F5EB74, 0x8FC5806D, 0xBB794BB7, 0x544920AE,
+		0xB206C41C, 0x5D36AF05, 0x698A64DF, 0x86BA0FC6,
+		0x00F3F36B, 0xEFC39872, 0xDB7F53A8, 0x344F38B1,
+		0x97F8FAB0, 0x78C891A9, 0x4C745A73, 0xA344316A,
+		0x250DCDC7, 0xCA3DA6DE, 0xFE816D04, 0x11B1061D,
+		0xF7FEE2AF, 0x18CE89B6, 0x2C72426C, 0xC3422975,
+		0x450BD5D8, 0xAA3BBEC1, 0x9E87751B, 0x71B71E02,
+		0x57F4CA8E, 0xB8C4A197, 0x8C786A4D, 0x63480154,
+		0xE501FDF9, 0x0A3196E0, 0x3E8D5D3A, 0xD1BD3623,
+		0x37F2D291, 0xD8C2B988, 0xEC7E7252, 0x034E194B,
+		0x8507E5E6, 0x6A378EFF, 0x5E8B4525, 0xB1BB2E3C
+	},
+	{
+		0x00000000, 0x68032CC8, 0xD0065990, 0xB8057558,
+		0xA5E0C5D1, 0xCDE3E919, 0x75E69C41, 0x1DE5B089,
+		0x4E2DFD53, 0x262ED19B, 0x9E2BA4C3, 0xF628880B,
+		0xEBCD3882, 0x83CE144A, 0x3BCB6112, 0x53C84DDA,
+		0x9C5BFAA6, 0xF458D66E, 0x4C5DA336, 0x245E8FFE,
+		0x39BB3F77, 0x51B813BF, 0xE9BD66E7, 0x81BE4A2F,
+		0xD27607F5, 0xBA752B3D, 0x02705E65, 0x6A7372AD,
+		0x7796C224, 0x1F95EEEC, 0xA7909BB4, 0xCF93B77C,
+		0x3D5B83BD, 0x5558AF75, 0xED5DDA2D, 0x855EF6E5,
+		0x98BB466C, 0xF0B86AA4, 0x48BD1FFC, 0x20BE3334,
+		0x73767EEE, 0x1B755226, 0xA370277E, 0xCB730BB6,
+		0xD696BB3F, 0xBE9597F7, 0x0690E2AF, 0x6E93CE67,
+		0xA100791B, 0xC90355D3, 0x7106208B, 0x19050C43,
+		0x04E0BCCA, 0x6CE39002, 0xD4E6E55A, 0xBCE5C992,
+		0xEF2D8448, 0x872EA880, 0x3F2BDDD8, 0x5728F110,
+		0x4ACD4199, 0x22CE6D51, 0x9ACB1809, 0xF2C834C1,
+		0x7AB7077A, 0x12B42BB2, 0xAAB15EEA, 0xC2B27222,
+		0xDF57C2AB, 0xB754EE63, 0x0F519B3B, 0x6752B7F3,
+		0x349AFA29, 0x5C99D6E1, 0xE49CA3B9, 0x8C9F8F71,
+		0x917A3FF8, 0xF9791330, 0x417C6668, 0x297F4AA0,
+		0xE6ECFDDC, 0x8EEFD114, 0x36EAA44C, 0x5EE98884,
+		0x430C380D, 0x2B0F14C5, 0x930A619D, 0xFB094D55,
+		0xA8C1008F, 0xC0C22C47, 0x78C7591F, 0x10C475D7,
+		0x0D21C55E, 0x6522E996, 0xDD279CCE, 0xB524B006,
+		0x47EC84C7, 0x2FEFA80F, 0x97EADD57, 0xFFE9F19F,
+		0xE20C4116, 0x8A0F6DDE, 0x320A1886, 0x5A09344E,
+		0x09C17994, 0x61C2555C, 0xD9C72004, 0xB1C40CCC,
+		0xAC21BC45, 0xC422908D, 0x7C27E5D5, 0x1424C91D,
+		0xDBB77E61, 0xB3B452A9, 0x0BB127F1, 0x63B20B39,
+		0x7E57BBB0, 0x16549778, 0xAE51E220, 0xC652CEE8,
+		0x959A8332, 0xFD99AFFA, 0x459CDAA2, 0x2D9FF66A,
+		0x307A46E3, 0x58796A2B, 0xE07C1F73, 0x887F33BB,
+		0xF56E0EF4, 0x9D6D223C, 0x25685764, 0x4D6B7BAC,
+		0x508ECB25, 0x388DE7ED, 0x808892B5, 0xE88BBE7D,
+		0xBB43F3A7, 0xD340DF6F, 0x6B45AA37, 0x034686FF,
+		0x1EA33676, 0x76A01ABE, 0xCEA56FE6, 0xA6A6432E,
+		0x6935F452, 0x0136D89A, 0xB933ADC2, 0xD130810A,
+		0xCCD53183, 0xA4D61D4B, 0x1CD36813, 0x74D044DB,
+		0x27180901, 0x4F1B25C9, 0xF71E5091, 0x9F1D7C59,
+		0x82F8CCD0, 0xEAFBE018, 0x52FE9540, 0x3AFDB988,
+		0xC8358D49, 0xA036A181, 0x1833D4D9, 0x7030F811,
+		0x6DD54898, 0x05D66450, 0xBDD31108, 0xD5D03DC0,
+		0x8618701A, 0xEE1B5CD2, 0x561E298A, 0x3E1D0542,
+		0x23F8B5CB, 0x4BFB9903, 0xF3FEEC5B, 0x9BFDC093,
+		0x546E77EF, 0x3C6D5B27, 0x84682E7F, 0xEC6B02B7,
+		0xF18EB23E, 0x998D9EF6, 0x2188EBAE, 0x498BC766,
+		0x1A438ABC, 0x7240A674, 0xCA45D32C, 0xA246FFE4,
+		0xBFA34F6D, 0xD7A063A5, 0x6FA516FD, 0x07A63A35,
+		0x8FD9098E, 0xE7DA2546, 0x5FDF501E, 0x37DC7CD6,
+		0x2A39CC5F, 0x423AE097, 0xFA3F95CF, 0x923CB907,
+		0xC1F4F4DD, 0xA9F7D815, 0x11F2AD4D, 0x79F18185,
+		0x6414310C, 0x0C171DC4, 0xB412689C, 0xDC114454,
+		0x1382F328, 0x7B81DFE0, 0xC384AAB8, 0xAB878670,
+		0xB66236F9, 0xDE611A31, 0x66646F69, 0x0E6743A1,
+		0x5DAF0E7B, 0x35AC22B3, 0x8DA957EB, 0xE5AA7B23,
+		0xF84FCBAA, 0x904CE762, 0x2849923A, 0x404ABEF2,
+		0xB2828A33, 0xDA81A6FB, 0x6284D3A3, 0x0A87FF6B,
+		0x17624FE2, 0x7F61632A, 0xC7641672, 0xAF673ABA,
+		0xFCAF7760, 0x94AC5BA8, 0x2CA92EF0, 0x44AA0238,
+		0x594FB2B1, 0x314C9E79, 0x8949EB21, 0xE14AC7E9,
+		0x2ED97095, 0x46DA5C5D, 0xFEDF2905, 0x96DC05CD,
+		0x8B39B544, 0xE33A998C, 0x5B3FECD4, 0x333CC01C,
+		0x60F48DC6, 0x08F7A10E, 0xB0F2D456, 0xD8F1F89E,
+		0xC5144817, 0xAD1764DF, 0x15121187, 0x7D113D4F
+	},
+	{
+		0x00000000, 0x493C7D27, 0x9278FA4E, 0xDB448769,
+		0x211D826D, 0x6821FF4A, 0xB3657823, 0xFA590504,
+		0x423B04DA, 0x0B0779FD, 0xD043FE94, 0x997F83B3,
+		0x632686B7, 0x2A1AFB90, 0xF15E7CF9, 0xB86201DE,
+		0x847609B4, 0xCD4A7493, 0x160EF3FA, 0x5F328EDD,
+		0xA56B8BD9, 0xEC57F6FE, 0x37137197, 0x7E2F0CB0,
+		0xC64D0D6E, 0x8F717049, 0x5435F720, 0x1D098A07,
+		0xE7508F03, 0xAE6CF224, 0x7528754D, 0x3C14086A,
+		0x0D006599, 0x443C18BE, 0x9F789FD7, 0xD644E2F0,
+		0x2C1DE7F4, 0x65219AD3, 0xBE651DBA, 0xF759609D,
+		0x4F3B6143, 0x06071C64, 0xDD439B0D, 0x947FE62A,
+		0x6E26E32E, 0x271A9E09, 0xFC5E1960, 0xB5626447,
+		0x89766C2D, 0xC04A110A, 0x1B0E9663, 0x5232EB44,
+		0xA86BEE40, 0xE1579367, 0x3A13140E, 0x732F6929,
+		0xCB4D68F7, 0x827115D0, 0x593592B9, 0x1009EF9E,
+		0xEA50EA9A, 0xA36C97BD, 0x782810D4, 0x31146DF3,
+		0x1A00CB32, 0x533CB615, 0x8878317C, 0xC1444C5B,
+		0x3B1D495F, 0x72213478, 0xA965B311, 0xE059CE36,
+		0x583BCFE8, 0x1107B2CF, 0xCA4335A6, 0x837F4881,
+		0x79264D85, 0x301A30A2, 0xEB5EB7CB, 0xA262CAEC,
+		0x9E76C286, 0xD74ABFA1, 0x0C0E38C8, 0x453245EF,
+		0xBF6B40EB, 0xF6573DCC, 0x2D13BAA5, 0x642FC782,
+		0xDC4DC65C, 0x9571BB7B, 0x4E353C12, 0x07094135,
+		0xFD504431, 0xB46C3916, 0x6F28BE7F, 0x2614C358,
+		0x1700AEAB, 0x5E3CD38C, 0x857854E5, 0xCC4429C2,
+		0x361D2CC6, 0x7F2151E1, 0xA465D688, 0xED59ABAF,
+		0x553BAA71, 0x1C07D756, 0xC743503F, 0x8E7F2D18,
+		0x7426281C, 0x3D1A553B, 0xE65ED252, 0xAF62AF75,
+		0x9376A71F, 0xDA4ADA38, 0x010E5D51, 0x48322076,
+		0xB26B2572, 0xFB575855, 0x2013DF3C, 0x692FA21B,
+		0xD14DA3C5, 0x9871DEE2, 0x4335598B, 0x0A0924AC,
+		0xF05021A8, 0xB96C5C8F, 0x6228DBE6, 0x2B14A6C1,
+		0x34019664, 0x7D3DEB43, 0xA6796C2A, 0xEF45110D,
+		0x151C1409, 0x5C20692E, 0x8764EE47, 0xCE589360,
+		0x763A92BE, 0x3F06EF99, 0xE44268F0, 0xAD7E15D7,
+		0x572710D3, 0x1E1B6DF4, 0xC55FEA9D, 0x8C6397BA,
+		0xB0779FD0, 0xF94BE2F7, 0x220F659E, 0x6B3318B9,
+		0x916A1DBD, 0xD856609A, 0x0312E7F3, 0x4A2E9AD4,
+		0xF24C9B0A, 0xBB70E62D, 0x60346144, 0x29081C63,
+		0xD3511967, 0x9A6D6440, 0x4129E329, 0x08159E0E,
+		0x3901F3FD, 0x703D8EDA, 0xAB7909B3, 0xE2457494,
+		0x181C7190, 0x51200CB7, 0x8A648BDE, 0xC358F6F9,
+		0x7B3AF727, 0x32068A00, 0xE9420D69, 0xA07E704E,
+		0x5A27754A, 0x131B086D, 0xC85F8F04, 0x8163F223,
+		0xBD77FA49, 0xF44B876E, 0x2F0F0007, 0x66337D20,
+		0x9C6A7824, 0xD5560503, 0x0E12826A, 0x472EFF4D,
+		0xFF4CFE93, 0xB67083B4, 0x6D3404DD, 0x240879FA,
+		0xDE517CFE, 0x976D01D9, 0x4C2986B0, 0x0515FB97,
+		0x2E015D56, 0x673D2071, 0xBC79A718, 0xF545DA3F,
+		0x0F1CDF3B, 0x4620A21C, 0x9D642575, 0xD4585852,
+		0x6C3A598C, 0x250624AB, 0xFE42A3C2, 0xB77EDEE5,
+		0x4D27DBE1, 0x041BA6C6, 0xDF5F21AF, 0x96635C88,
+		0xAA7754E2, 0xE34B29C5, 0x380FAEAC, 0x7133D38B,
+		0x8B6AD68F, 0xC256ABA8, 0x19122CC1, 0x502E51E6,
+		0xE84C5038, 0xA1702D1F, 0x7A34AA76, 0x3308D751,
+		0xC951D255, 0x806DAF72, 0x5B29281B, 0x1215553C,
+		0x230138CF, 0x6A3D45E8, 0xB179C281, 0xF845BFA6,
+		0x021CBAA2, 0x4B20C785, 0x906440EC, 0xD9583DCB,
+		0x613A3C15, 0x28064132, 0xF342C65B, 0xBA7EBB7C,
+		0x4027BE78, 0x091BC35F, 0xD25F4436, 0x9B633911,
+		0xA777317B, 0xEE4B4C5C, 0x350FCB35, 0x7C33B612,
+		0x866AB316, 0xCF56CE31, 0x14124958, 0x5D2E347F,
+		0xE54C35A1, 0xAC704886, 0x7734CFEF, 0x3E08B2C8,
+		0xC451B7CC, 0x8D6DCAEB, 0x56294D82, 0x1F1530A5
+	}
+#else							/* !WORDS_BIGENDIAN */
+	{
+		0x00000000, 0x03836BF2, 0xF7703BE1, 0xF4F35013,
+		0x1F979AC7, 0x1C14F135, 0xE8E7A126, 0xEB64CAD4,
+		0xCF58D98A, 0xCCDBB278, 0x3828E26B, 0x3BAB8999,
+		0xD0CF434D, 0xD34C28BF, 0x27BF78AC, 0x243C135E,
+		0x6FC75E10, 0x6C4435E2, 0x98B765F1, 0x9B340E03,
+		0x7050C4D7, 0x73D3AF25, 0x8720FF36, 0x84A394C4,
+		0xA09F879A, 0xA31CEC68, 0x57EFBC7B, 0x546CD789,
+		0xBF081D5D, 0xBC8B76AF, 0x487826BC, 0x4BFB4D4E,
+		0xDE8EBD20, 0xDD0DD6D2, 0x29FE86C1, 0x2A7DED33,
+		0xC11927E7, 0xC29A4C15, 0x36691C06, 0x35EA77F4,
+		0x11D664AA, 0x12550F58, 0xE6A65F4B, 0xE52534B9,
+		0x0E41FE6D, 0x0DC2959F, 0xF931C58C, 0xFAB2AE7E,
+		0xB149E330, 0xB2CA88C2, 0x4639D8D1, 0x45BAB323,
+		0xAEDE79F7, 0xAD5D1205, 0x59AE4216, 0x5A2D29E4,
+		0x7E113ABA, 0x7D925148, 0x8961015B, 0x8AE26AA9,
+		0x6186A07D, 0x6205CB8F, 0x96F69B9C, 0x9575F06E,
+		0xBC1D7B41, 0xBF9E10B3, 0x4B6D40A0, 0x48EE2B52,
+		0xA38AE186, 0xA0098A74, 0x54FADA67, 0x5779B195,
+		0x7345A2CB, 0x70C6C939, 0x8435992A, 0x87B6F2D8,
+		0x6CD2380C, 0x6F5153FE, 0x9BA203ED, 0x9821681F,
+		0xD3DA2551, 0xD0594EA3, 0x24AA1EB0, 0x27297542,
+		0xCC4DBF96, 0xCFCED464, 0x3B3D8477, 0x38BEEF85,
+		0x1C82FCDB, 0x1F019729, 0xEBF2C73A, 0xE871ACC8,
+		0x0315661C, 0x00960DEE, 0xF4655DFD, 0xF7E6360F,
+		0x6293C661, 0x6110AD93, 0x95E3FD80, 0x96609672,
+		0x7D045CA6, 0x7E873754, 0x8A746747, 0x89F70CB5,
+		0xADCB1FEB, 0xAE487419, 0x5ABB240A, 0x59384FF8,
+		0xB25C852C, 0xB1DFEEDE, 0x452CBECD, 0x46AFD53F,
+		0x0D549871, 0x0ED7F383, 0xFA24A390, 0xF9A7C862,
+		0x12C302B6, 0x11406944, 0xE5B33957, 0xE63052A5,
+		0xC20C41FB, 0xC18F2A09, 0x357C7A1A, 0x36FF11E8,
+		0xDD9BDB3C, 0xDE18B0CE, 0x2AEBE0DD, 0x29688B2F,
+		0x783BF682, 0x7BB89D70, 0x8F4BCD63, 0x8CC8A691,
+		0x67AC6C45, 0x642F07B7, 0x90DC57A4, 0x935F3C56,
+		0xB7632F08, 0xB4E044FA, 0x401314E9, 0x43907F1B,
+		0xA8F4B5CF, 0xAB77DE3D, 0x5F848E2E, 0x5C07E5DC,
+		0x17FCA892, 0x147FC360, 0xE08C9373, 0xE30FF881,
+		0x086B3255, 0x0BE859A7, 0xFF1B09B4, 0xFC986246,
+		0xD8A47118, 0xDB271AEA, 0x2FD44AF9, 0x2C57210B,
+		0xC733EBDF, 0xC4B0802D, 0x3043D03E, 0x33C0BBCC,
+		0xA6B54BA2, 0xA5362050, 0x51C57043, 0x52461BB1,
+		0xB922D165, 0xBAA1BA97, 0x4E52EA84, 0x4DD18176,
+		0x69ED9228, 0x6A6EF9DA, 0x9E9DA9C9, 0x9D1EC23B,
+		0x767A08EF, 0x75F9631D, 0x810A330E, 0x828958FC,
+		0xC97215B2, 0xCAF17E40, 0x3E022E53, 0x3D8145A1,
+		0xD6E58F75, 0xD566E487, 0x2195B494, 0x2216DF66,
+		0x062ACC38, 0x05A9A7CA, 0xF15AF7D9, 0xF2D99C2B,
+		0x19BD56FF, 0x1A3E3D0D, 0xEECD6D1E, 0xED4E06EC,
+		0xC4268DC3, 0xC7A5E631, 0x3356B622, 0x30D5DDD0,
+		0xDBB11704, 0xD8327CF6, 0x2CC12CE5, 0x2F424717,
+		0x0B7E5449, 0x08FD3FBB, 0xFC0E6FA8, 0xFF8D045A,
+		0x14E9CE8E, 0x176AA57C, 0xE399F56F, 0xE01A9E9D,
+		0xABE1D3D3, 0xA862B821, 0x5C91E832, 0x5F1283C0,
+		0xB4764914, 0xB7F522E6, 0x430672F5, 0x40851907,
+		0x64B90A59, 0x673A61AB, 0x93C931B8, 0x904A5A4A,
+		0x7B2E909E, 0x78ADFB6C, 0x8C5EAB7F, 0x8FDDC08D,
+		0x1AA830E3, 0x192B5B11, 0xEDD80B02, 0xEE5B60F0,
+		0x053FAA24, 0x06BCC1D6, 0xF24F91C5, 0xF1CCFA37,
+		0xD5F0E969, 0xD673829B, 0x2280D288, 0x2103B97A,
+		0xCA6773AE, 0xC9E4185C, 0x3D17484F, 0x3E9423BD,
+		0x756F6EF3, 0x76EC0501, 0x821F5512, 0x819C3EE0,
+		0x6AF8F434, 0x697B9FC6, 0x9D88CFD5, 0x9E0BA427,
+		0xBA37B779, 0xB9B4DC8B, 0x4D478C98, 0x4EC4E76A,
+		0xA5A02DBE, 0xA623464C, 0x52D0165F, 0x51537DAD,
+	},
+	{
+		0x00000000, 0x7798A213, 0xEE304527, 0x99A8E734,
+		0xDC618A4E, 0xABF9285D, 0x3251CF69, 0x45C96D7A,
+		0xB8C3149D, 0xCF5BB68E, 0x56F351BA, 0x216BF3A9,
+		0x64A29ED3, 0x133A3CC0, 0x8A92DBF4, 0xFD0A79E7,
+		0x81F1C53F, 0xF669672C, 0x6FC18018, 0x1859220B,
+		0x5D904F71, 0x2A08ED62, 0xB3A00A56, 0xC438A845,
+		0x3932D1A2, 0x4EAA73B1, 0xD7029485, 0xA09A3696,
+		0xE5535BEC, 0x92CBF9FF, 0x0B631ECB, 0x7CFBBCD8,
+		0x02E38B7F, 0x757B296C, 0xECD3CE58, 0x9B4B6C4B,
+		0xDE820131, 0xA91AA322, 0x30B24416, 0x472AE605,
+		0xBA209FE2, 0xCDB83DF1, 0x5410DAC5, 0x238878D6,
+		0x664115AC, 0x11D9B7BF, 0x8871508B, 0xFFE9F298,
+		0x83124E40, 0xF48AEC53, 0x6D220B67, 0x1ABAA974,
+		0x5F73C40E, 0x28EB661D, 0xB1438129, 0xC6DB233A,
+		0x3BD15ADD, 0x4C49F8CE, 0xD5E11FFA, 0xA279BDE9,
+		0xE7B0D093, 0x90287280, 0x098095B4, 0x7E1837A7,
+		0x04C617FF, 0x735EB5EC, 0xEAF652D8, 0x9D6EF0CB,
+		0xD8A79DB1, 0xAF3F3FA2, 0x3697D896, 0x410F7A85,
+		0xBC050362, 0xCB9DA171, 0x52354645, 0x25ADE456,
+		0x6064892C, 0x17FC2B3F, 0x8E54CC0B, 0xF9CC6E18,
+		0x8537D2C0, 0xF2AF70D3, 0x6B0797E7, 0x1C9F35F4,
+		0x5956588E, 0x2ECEFA9D, 0xB7661DA9, 0xC0FEBFBA,
+		0x3DF4C65D, 0x4A6C644E, 0xD3C4837A, 0xA45C2169,
+		0xE1954C13, 0x960DEE00, 0x0FA50934, 0x783DAB27,
+		0x06259C80, 0x71BD3E93, 0xE815D9A7, 0x9F8D7BB4,
+		0xDA4416CE, 0xADDCB4DD, 0x347453E9, 0x43ECF1FA,
+		0xBEE6881D, 0xC97E2A0E, 0x50D6CD3A, 0x274E6F29,
+		0x62870253, 0x151FA040, 0x8CB74774, 0xFB2FE567,
+		0x87D459BF, 0xF04CFBAC, 0x69E41C98, 0x1E7CBE8B,
+		0x5BB5D3F1, 0x2C2D71E2, 0xB58596D6, 0xC21D34C5,
+		0x3F174D22, 0x488FEF31, 0xD1270805, 0xA6BFAA16,
+		0xE376C76C, 0x94EE657F, 0x0D46824B, 0x7ADE2058,
+		0xF9FAC3FB, 0x8E6261E8, 0x17CA86DC, 0x605224CF,
+		0x259B49B5, 0x5203EBA6, 0xCBAB0C92, 0xBC33AE81,
+		0x4139D766, 0x36A17575, 0xAF099241, 0xD8913052,
+		0x9D585D28, 0xEAC0FF3B, 0x7368180F, 0x04F0BA1C,
+		0x780B06C4, 0x0F93A4D7, 0x963B43E3, 0xE1A3E1F0,
+		0xA46A8C8A, 0xD3F22E99, 0x4A5AC9AD, 0x3DC26BBE,
+		0xC0C81259, 0xB750B04A, 0x2EF8577E, 0x5960F56D,
+		0x1CA99817, 0x6B313A04, 0xF299DD30, 0x85017F23,
+		0xFB194884, 0x8C81EA97, 0x15290DA3, 0x62B1AFB0,
+		0x2778C2CA, 0x50E060D9, 0xC94887ED, 0xBED025FE,
+		0x43DA5C19, 0x3442FE0A, 0xADEA193E, 0xDA72BB2D,
+		0x9FBBD657, 0xE8237444, 0x718B9370, 0x06133163,
+		0x7AE88DBB, 0x0D702FA8, 0x94D8C89C, 0xE3406A8F,
+		0xA68907F5, 0xD111A5E6, 0x48B942D2, 0x3F21E0C1,
+		0xC22B9926, 0xB5B33B35, 0x2C1BDC01, 0x5B837E12,
+		0x1E4A1368, 0x69D2B17B, 0xF07A564F, 0x87E2F45C,
+		0xFD3CD404, 0x8AA47617, 0x130C9123, 0x64943330,
+		0x215D5E4A, 0x56C5FC59, 0xCF6D1B6D, 0xB8F5B97E,
+		0x45FFC099, 0x3267628A, 0xABCF85BE, 0xDC5727AD,
+		0x999E4AD7, 0xEE06E8C4, 0x77AE0FF0, 0x0036ADE3,
+		0x7CCD113B, 0x0B55B328, 0x92FD541C, 0xE565F60F,
+		0xA0AC9B75, 0xD7343966, 0x4E9CDE52, 0x39047C41,
+		0xC40E05A6, 0xB396A7B5, 0x2A3E4081, 0x5DA6E292,
+		0x186F8FE8, 0x6FF72DFB, 0xF65FCACF, 0x81C768DC,
+		0xFFDF5F7B, 0x8847FD68, 0x11EF1A5C, 0x6677B84F,
+		0x23BED535, 0x54267726, 0xCD8E9012, 0xBA163201,
+		0x471C4BE6, 0x3084E9F5, 0xA92C0EC1, 0xDEB4ACD2,
+		0x9B7DC1A8, 0xECE563BB, 0x754D848F, 0x02D5269C,
+		0x7E2E9A44, 0x09B63857, 0x901EDF63, 0xE7867D70,
+		0xA24F100A, 0xD5D7B219, 0x4C7F552D, 0x3BE7F73E,
+		0xC6ED8ED9, 0xB1752CCA, 0x28DDCBFE, 0x5F4569ED,
+		0x1A8C0497, 0x6D14A684, 0xF4BC41B0, 0x8324E3A3,
+	},
+	{
+		0x00000000, 0x7E9241A5, 0x0D526F4F, 0x73C02EEA,
+		0x1AA4DE9E, 0x64369F3B, 0x17F6B1D1, 0x6964F074,
+		0xC53E5138, 0xBBAC109D, 0xC86C3E77, 0xB6FE7FD2,
+		0xDF9A8FA6, 0xA108CE03, 0xD2C8E0E9, 0xAC5AA14C,
+		0x8A7DA270, 0xF4EFE3D5, 0x872FCD3F, 0xF9BD8C9A,
+		0x90D97CEE, 0xEE4B3D4B, 0x9D8B13A1, 0xE3195204,
+		0x4F43F348, 0x31D1B2ED, 0x42119C07, 0x3C83DDA2,
+		0x55E72DD6, 0x2B756C73, 0x58B54299, 0x2627033C,
+		0x14FB44E1, 0x6A690544, 0x19A92BAE, 0x673B6A0B,
+		0x0E5F9A7F, 0x70CDDBDA, 0x030DF530, 0x7D9FB495,
+		0xD1C515D9, 0xAF57547C, 0xDC977A96, 0xA2053B33,
+		0xCB61CB47, 0xB5F38AE2, 0xC633A408, 0xB8A1E5AD,
+		0x9E86E691, 0xE014A734, 0x93D489DE, 0xED46C87B,
+		0x8422380F, 0xFAB079AA, 0x89705740, 0xF7E216E5,
+		0x5BB8B7A9, 0x252AF60C, 0x56EAD8E6, 0x28789943,
+		0x411C6937, 0x3F8E2892, 0x4C4E0678, 0x32DC47DD,
+		0xD98065C7, 0xA7122462, 0xD4D20A88, 0xAA404B2D,
+		0xC324BB59, 0xBDB6FAFC, 0xCE76D416, 0xB0E495B3,
+		0x1CBE34FF, 0x622C755A, 0x11EC5BB0, 0x6F7E1A15,
+		0x061AEA61, 0x7888ABC4, 0x0B48852E, 0x75DAC48B,
+		0x53FDC7B7, 0x2D6F8612, 0x5EAFA8F8, 0x203DE95D,
+		0x49591929, 0x37CB588C, 0x440B7666, 0x3A9937C3,
+		0x96C3968F, 0xE851D72A, 0x9B91F9C0, 0xE503B865,
+		0x8C674811, 0xF2F509B4, 0x8135275E, 0xFFA766FB,
+		0xCD7B2126, 0xB3E96083, 0xC0294E69, 0xBEBB0FCC,
+		0xD7DFFFB8, 0xA94DBE1D, 0xDA8D90F7, 0xA41FD152,
+		0x0845701E, 0x76D731BB, 0x05171F51, 0x7B855EF4,
+		0x12E1AE80, 0x6C73EF25, 0x1FB3C1CF, 0x6121806A,
+		0x47068356, 0x3994C2F3, 0x4A54EC19, 0x34C6ADBC,
+		0x5DA25DC8, 0x23301C6D, 0x50F03287, 0x2E627322,
+		0x8238D26E, 0xFCAA93CB, 0x8F6ABD21, 0xF1F8FC84,
+		0x989C0CF0, 0xE60E4D55, 0x95CE63BF, 0xEB5C221A,
+		0x4377278B, 0x3DE5662E, 0x4E2548C4, 0x30B70961,
+		0x59D3F915, 0x2741B8B0, 0x5481965A, 0x2A13D7FF,
+		0x864976B3, 0xF8DB3716, 0x8B1B19FC, 0xF5895859,
+		0x9CEDA82D, 0xE27FE988, 0x91BFC762, 0xEF2D86C7,
+		0xC90A85FB, 0xB798C45E, 0xC458EAB4, 0xBACAAB11,
+		0xD3AE5B65, 0xAD3C1AC0, 0xDEFC342A, 0xA06E758F,
+		0x0C34D4C3, 0x72A69566, 0x0166BB8C, 0x7FF4FA29,
+		0x16900A5D, 0x68024BF8, 0x1BC26512, 0x655024B7,
+		0x578C636A, 0x291E22CF, 0x5ADE0C25, 0x244C4D80,
+		0x4D28BDF4, 0x33BAFC51, 0x407AD2BB, 0x3EE8931E,
+		0x92B23252, 0xEC2073F7, 0x9FE05D1D, 0xE1721CB8,
+		0x8816ECCC, 0xF684AD69, 0x85448383, 0xFBD6C226,
+		0xDDF1C11A, 0xA36380BF, 0xD0A3AE55, 0xAE31EFF0,
+		0xC7551F84, 0xB9C75E21, 0xCA0770CB, 0xB495316E,
+		0x18CF9022, 0x665DD187, 0x159DFF6D, 0x6B0FBEC8,
+		0x026B4EBC, 0x7CF90F19, 0x0F3921F3, 0x71AB6056,
+		0x9AF7424C, 0xE46503E9, 0x97A52D03, 0xE9376CA6,
+		0x80539CD2, 0xFEC1DD77, 0x8D01F39D, 0xF393B238,
+		0x5FC91374, 0x215B52D1, 0x529B7C3B, 0x2C093D9E,
+		0x456DCDEA, 0x3BFF8C4F, 0x483FA2A5, 0x36ADE300,
+		0x108AE03C, 0x6E18A199, 0x1DD88F73, 0x634ACED6,
+		0x0A2E3EA2, 0x74BC7F07, 0x077C51ED, 0x79EE1048,
+		0xD5B4B104, 0xAB26F0A1, 0xD8E6DE4B, 0xA6749FEE,
+		0xCF106F9A, 0xB1822E3F, 0xC24200D5, 0xBCD04170,
+		0x8E0C06AD, 0xF09E4708, 0x835E69E2, 0xFDCC2847,
+		0x94A8D833, 0xEA3A9996, 0x99FAB77C, 0xE768F6D9,
+		0x4B325795, 0x35A01630, 0x466038DA, 0x38F2797F,
+		0x5196890B, 0x2F04C8AE, 0x5CC4E644, 0x2256A7E1,
+		0x0471A4DD, 0x7AE3E578, 0x0923CB92, 0x77B18A37,
+		0x1ED57A43, 0x60473BE6, 0x1387150C, 0x6D1554A9,
+		0xC14FF5E5, 0xBFDDB440, 0xCC1D9AAA, 0xB28FDB0F,
+		0xDBEB2B7B, 0xA5796ADE, 0xD6B94434, 0xA82B0591,
+	},
+	{
+		0x00000000, 0xB8AA45DD, 0x812367BF, 0x39892262,
+		0xF331227B, 0x4B9B67A6, 0x721245C4, 0xCAB80019,
+		0xE66344F6, 0x5EC9012B, 0x67402349, 0xDFEA6694,
+		0x1552668D, 0xADF82350, 0x94710132, 0x2CDB44EF,
+		0x3DB164E9, 0x851B2134, 0xBC920356, 0x0438468B,
+		0xCE804692, 0x762A034F, 0x4FA3212D, 0xF70964F0,
+		0xDBD2201F, 0x637865C2, 0x5AF147A0, 0xE25B027D,
+		0x28E30264, 0x904947B9, 0xA9C065DB, 0x116A2006,
+		0x8B1425D7, 0x33BE600A, 0x0A374268, 0xB29D07B5,
+		0x782507AC, 0xC08F4271, 0xF9066013, 0x41AC25CE,
+		0x6D776121, 0xD5DD24FC, 0xEC54069E, 0x54FE4343,
+		0x9E46435A, 0x26EC0687, 0x1F6524E5, 0xA7CF6138,
+		0xB6A5413E, 0x0E0F04E3, 0x37862681, 0x8F2C635C,
+		0x45946345, 0xFD3E2698, 0xC4B704FA, 0x7C1D4127,
+		0x50C605C8, 0xE86C4015, 0xD1E56277, 0x694F27AA,
+		0xA3F727B3, 0x1B5D626E, 0x22D4400C, 0x9A7E05D1,
+		0xE75FA6AB, 0x5FF5E376, 0x667CC114, 0xDED684C9,
+		0x146E84D0, 0xACC4C10D, 0x954DE36F, 0x2DE7A6B2,
+		0x013CE25D, 0xB996A780, 0x801F85E2, 0x38B5C03F,
+		0xF20DC026, 0x4AA785FB, 0x732EA799, 0xCB84E244,
+		0xDAEEC242, 0x6244879F, 0x5BCDA5FD, 0xE367E020,
+		0x29DFE039, 0x9175A5E4, 0xA8FC8786, 0x1056C25B,
+		0x3C8D86B4, 0x8427C369, 0xBDAEE10B, 0x0504A4D6,
+		0xCFBCA4CF, 0x7716E112, 0x4E9FC370, 0xF63586AD,
+		0x6C4B837C, 0xD4E1C6A1, 0xED68E4C3, 0x55C2A11E,
+		0x9F7AA107, 0x27D0E4DA, 0x1E59C6B8, 0xA6F38365,
+		0x8A28C78A, 0x32828257, 0x0B0BA035, 0xB3A1E5E8,
+		0x7919E5F1, 0xC1B3A02C, 0xF83A824E, 0x4090C793,
+		0x51FAE795, 0xE950A248, 0xD0D9802A, 0x6873C5F7,
+		0xA2CBC5EE, 0x1A618033, 0x23E8A251, 0x9B42E78C,
+		0xB799A363, 0x0F33E6BE, 0x36BAC4DC, 0x8E108101,
+		0x44A88118, 0xFC02C4C5, 0xC58BE6A7, 0x7D21A37A,
+		0x3FC9A052, 0x8763E58F, 0xBEEAC7ED, 0x06408230,
+		0xCCF88229, 0x7452C7F4, 0x4DDBE596, 0xF571A04B,
+		0xD9AAE4A4, 0x6100A179, 0x5889831B, 0xE023C6C6,
+		0x2A9BC6DF, 0x92318302, 0xABB8A160, 0x1312E4BD,
+		0x0278C4BB, 0xBAD28166, 0x835BA304, 0x3BF1E6D9,
+		0xF149E6C0, 0x49E3A31D, 0x706A817F, 0xC8C0C4A2,
+		0xE41B804D, 0x5CB1C590, 0x6538E7F2, 0xDD92A22F,
+		0x172AA236, 0xAF80E7EB, 0x9609C589, 0x2EA38054,
+		0xB4DD8585, 0x0C77C058, 0x35FEE23A, 0x8D54A7E7,
+		0x47ECA7FE, 0xFF46E223, 0xC6CFC041, 0x7E65859C,
+		0x52BEC173, 0xEA1484AE, 0xD39DA6CC, 0x6B37E311,
+		0xA18FE308, 0x1925A6D5, 0x20AC84B7, 0x9806C16A,
+		0x896CE16C, 0x31C6A4B1, 0x084F86D3, 0xB0E5C30E,
+		0x7A5DC317, 0xC2F786CA, 0xFB7EA4A8, 0x43D4E175,
+		0x6F0FA59A, 0xD7A5E047, 0xEE2CC225, 0x568687F8,
+		0x9C3E87E1, 0x2494C23C, 0x1D1DE05E, 0xA5B7A583,
+		0xD89606F9, 0x603C4324, 0x59B56146, 0xE11F249B,
+		0x2BA72482, 0x930D615F, 0xAA84433D, 0x122E06E0,
+		0x3EF5420F, 0x865F07D2, 0xBFD625B0, 0x077C606D,
+		0xCDC46074, 0x756E25A9, 0x4CE707CB, 0xF44D4216,
+		0xE5276210, 0x5D8D27CD, 0x640405AF, 0xDCAE4072,
+		0x1616406B, 0xAEBC05B6, 0x973527D4, 0x2F9F6209,
+		0x034426E6, 0xBBEE633B, 0x82674159, 0x3ACD0484,
+		0xF075049D, 0x48DF4140, 0x71566322, 0xC9FC26FF,
+		0x5382232E, 0xEB2866F3, 0xD2A14491, 0x6A0B014C,
+		0xA0B30155, 0x18194488, 0x219066EA, 0x993A2337,
+		0xB5E167D8, 0x0D4B2205, 0x34C20067, 0x8C6845BA,
+		0x46D045A3, 0xFE7A007E, 0xC7F3221C, 0x7F5967C1,
+		0x6E3347C7, 0xD699021A, 0xEF102078, 0x57BA65A5,
+		0x9D0265BC, 0x25A82061, 0x1C210203, 0xA48B47DE,
+		0x88500331, 0x30FA46EC, 0x0973648E, 0xB1D92153,
+		0x7B61214A, 0xC3CB6497, 0xFA4246F5, 0x42E80328,
+	},
+	{
+		0x00000000, 0xAC6F1138, 0x58DF2270, 0xF4B03348,
+		0xB0BE45E0, 0x1CD154D8, 0xE8616790, 0x440E76A8,
+		0x910B67C5, 0x3D6476FD, 0xC9D445B5, 0x65BB548D,
+		0x21B52225, 0x8DDA331D, 0x796A0055, 0xD505116D,
+		0xD361228F, 0x7F0E33B7, 0x8BBE00FF, 0x27D111C7,
+		0x63DF676F, 0xCFB07657, 0x3B00451F, 0x976F5427,
+		0x426A454A, 0xEE055472, 0x1AB5673A, 0xB6DA7602,
+		0xF2D400AA, 0x5EBB1192, 0xAA0B22DA, 0x066433E2,
+		0x57B5A81B, 0xFBDAB923, 0x0F6A8A6B, 0xA3059B53,
+		0xE70BEDFB, 0x4B64FCC3, 0xBFD4CF8B, 0x13BBDEB3,
+		0xC6BECFDE, 0x6AD1DEE6, 0x9E61EDAE, 0x320EFC96,
+		0x76008A3E, 0xDA6F9B06, 0x2EDFA84E, 0x82B0B976,
+		0x84D48A94, 0x28BB9BAC, 0xDC0BA8E4, 0x7064B9DC,
+		0x346ACF74, 0x9805DE4C, 0x6CB5ED04, 0xC0DAFC3C,
+		0x15DFED51, 0xB9B0FC69, 0x4D00CF21, 0xE16FDE19,
+		0xA561A8B1, 0x090EB989, 0xFDBE8AC1, 0x51D19BF9,
+		0xAE6A5137, 0x0205400F, 0xF6B57347, 0x5ADA627F,
+		0x1ED414D7, 0xB2BB05EF, 0x460B36A7, 0xEA64279F,
+		0x3F6136F2, 0x930E27CA, 0x67BE1482, 0xCBD105BA,
+		0x8FDF7312, 0x23B0622A, 0xD7005162, 0x7B6F405A,
+		0x7D0B73B8, 0xD1646280, 0x25D451C8, 0x89BB40F0,
+		0xCDB53658, 0x61DA2760, 0x956A1428, 0x39050510,
+		0xEC00147D, 0x406F0545, 0xB4DF360D, 0x18B02735,
+		0x5CBE519D, 0xF0D140A5, 0x046173ED, 0xA80E62D5,
+		0xF9DFF92C, 0x55B0E814, 0xA100DB5C, 0x0D6FCA64,
+		0x4961BCCC, 0xE50EADF4, 0x11BE9EBC, 0xBDD18F84,
+		0x68D49EE9, 0xC4BB8FD1, 0x300BBC99, 0x9C64ADA1,
+		0xD86ADB09, 0x7405CA31, 0x80B5F979, 0x2CDAE841,
+		0x2ABEDBA3, 0x86D1CA9B, 0x7261F9D3, 0xDE0EE8EB,
+		0x9A009E43, 0x366F8F7B, 0xC2DFBC33, 0x6EB0AD0B,
+		0xBBB5BC66, 0x17DAAD5E, 0xE36A9E16, 0x4F058F2E,
+		0x0B0BF986, 0xA764E8BE, 0x53D4DBF6, 0xFFBBCACE,
+		0x5CD5A26E, 0xF0BAB356, 0x040A801E, 0xA8659126,
+		0xEC6BE78E, 0x4004F6B6, 0xB4B4C5FE, 0x18DBD4C6,
+		0xCDDEC5AB, 0x61B1D493, 0x9501E7DB, 0x396EF6E3,
+		0x7D60804B, 0xD10F9173, 0x25BFA23B, 0x89D0B303,
+		0x8FB480E1, 0x23DB91D9, 0xD76BA291, 0x7B04B3A9,
+		0x3F0AC501, 0x9365D439, 0x67D5E771, 0xCBBAF649,
+		0x1EBFE724, 0xB2D0F61C, 0x4660C554, 0xEA0FD46C,
+		0xAE01A2C4, 0x026EB3FC, 0xF6DE80B4, 0x5AB1918C,
+		0x0B600A75, 0xA70F1B4D, 0x53BF2805, 0xFFD0393D,
+		0xBBDE4F95, 0x17B15EAD, 0xE3016DE5, 0x4F6E7CDD,
+		0x9A6B6DB0, 0x36047C88, 0xC2B44FC0, 0x6EDB5EF8,
+		0x2AD52850, 0x86BA3968, 0x720A0A20, 0xDE651B18,
+		0xD80128FA, 0x746E39C2, 0x80DE0A8A, 0x2CB11BB2,
+		0x68BF6D1A, 0xC4D07C22, 0x30604F6A, 0x9C0F5E52,
+		0x490A4F3F, 0xE5655E07, 0x11D56D4F, 0xBDBA7C77,
+		0xF9B40ADF, 0x55DB1BE7, 0xA16B28AF, 0x0D043997,
+		0xF2BFF359, 0x5ED0E261, 0xAA60D129, 0x060FC011,
+		0x4201B6B9, 0xEE6EA781, 0x1ADE94C9, 0xB6B185F1,
+		0x63B4949C, 0xCFDB85A4, 0x3B6BB6EC, 0x9704A7D4,
+		0xD30AD17C, 0x7F65C044, 0x8BD5F30C, 0x27BAE234,
+		0x21DED1D6, 0x8DB1C0EE, 0x7901F3A6, 0xD56EE29E,
+		0x91609436, 0x3D0F850E, 0xC9BFB646, 0x65D0A77E,
+		0xB0D5B613, 0x1CBAA72B, 0xE80A9463, 0x4465855B,
+		0x006BF3F3, 0xAC04E2CB, 0x58B4D183, 0xF4DBC0BB,
+		0xA50A5B42, 0x09654A7A, 0xFDD57932, 0x51BA680A,
+		0x15B41EA2, 0xB9DB0F9A, 0x4D6B3CD2, 0xE1042DEA,
+		0x34013C87, 0x986E2DBF, 0x6CDE1EF7, 0xC0B10FCF,
+		0x84BF7967, 0x28D0685F, 0xDC605B17, 0x700F4A2F,
+		0x766B79CD, 0xDA0468F5, 0x2EB45BBD, 0x82DB4A85,
+		0xC6D53C2D, 0x6ABA2D15, 0x9E0A1E5D, 0x32650F65,
+		0xE7601E08, 0x4B0F0F30, 0xBFBF3C78, 0x13D02D40,
+		0x57DE5BE8, 0xFBB14AD0, 0x0F017998, 0xA36E68A0,
+	},
+	{
+		0x00000000, 0x196B30EF, 0xC3A08CDB, 0xDACBBC34,
+		0x7737F5B2, 0x6E5CC55D, 0xB4977969, 0xADFC4986,
+		0x1F180660, 0x0673368F, 0xDCB88ABB, 0xC5D3BA54,
+		0x682FF3D2, 0x7144C33D, 0xAB8F7F09, 0xB2E44FE6,
+		0x3E300CC0, 0x275B3C2F, 0xFD90801B, 0xE4FBB0F4,
+		0x4907F972, 0x506CC99D, 0x8AA775A9, 0x93CC4546,
+		0x21280AA0, 0x38433A4F, 0xE288867B, 0xFBE3B694,
+		0x561FFF12, 0x4F74CFFD, 0x95BF73C9, 0x8CD44326,
+		0x8D16F485, 0x947DC46A, 0x4EB6785E, 0x57DD48B1,
+		0xFA210137, 0xE34A31D8, 0x39818DEC, 0x20EABD03,
+		0x920EF2E5, 0x8B65C20A, 0x51AE7E3E, 0x48C54ED1,
+		0xE5390757, 0xFC5237B8, 0x26998B8C, 0x3FF2BB63,
+		0xB326F845, 0xAA4DC8AA, 0x7086749E, 0x69ED4471,
+		0xC4110DF7, 0xDD7A3D18, 0x07B1812C, 0x1EDAB1C3,
+		0xAC3EFE25, 0xB555CECA, 0x6F9E72FE, 0x76F54211,
+		0xDB090B97, 0xC2623B78, 0x18A9874C, 0x01C2B7A3,
+		0xEB5B040E, 0xF23034E1, 0x28FB88D5, 0x3190B83A,
+		0x9C6CF1BC, 0x8507C153, 0x5FCC7D67, 0x46A74D88,
+		0xF443026E, 0xED283281, 0x37E38EB5, 0x2E88BE5A,
+		0x8374F7DC, 0x9A1FC733, 0x40D47B07, 0x59BF4BE8,
+		0xD56B08CE, 0xCC003821, 0x16CB8415, 0x0FA0B4FA,
+		0xA25CFD7C, 0xBB37CD93, 0x61FC71A7, 0x78974148,
+		0xCA730EAE, 0xD3183E41, 0x09D38275, 0x10B8B29A,
+		0xBD44FB1C, 0xA42FCBF3, 0x7EE477C7, 0x678F4728,
+		0x664DF08B, 0x7F26C064, 0xA5ED7C50, 0xBC864CBF,
+		0x117A0539, 0x081135D6, 0xD2DA89E2, 0xCBB1B90D,
+		0x7955F6EB, 0x603EC604, 0xBAF57A30, 0xA39E4ADF,
+		0x0E620359, 0x170933B6, 0xCDC28F82, 0xD4A9BF6D,
+		0x587DFC4B, 0x4116CCA4, 0x9BDD7090, 0x82B6407F,
+		0x2F4A09F9, 0x36213916, 0xECEA8522, 0xF581B5CD,
+		0x4765FA2B, 0x5E0ECAC4, 0x84C576F0, 0x9DAE461F,
+		0x30520F99, 0x29393F76, 0xF3F28342, 0xEA99B3AD,
+		0xD6B7081C, 0xCFDC38F3, 0x151784C7, 0x0C7CB428,
+		0xA180FDAE, 0xB8EBCD41, 0x62207175, 0x7B4B419A,
+		0xC9AF0E7C, 0xD0C43E93, 0x0A0F82A7, 0x1364B248,
+		0xBE98FBCE, 0xA7F3CB21, 0x7D387715, 0x645347FA,
+		0xE88704DC, 0xF1EC3433, 0x2B278807, 0x324CB8E8,
+		0x9FB0F16E, 0x86DBC181, 0x5C107DB5, 0x457B4D5A,
+		0xF79F02BC, 0xEEF43253, 0x343F8E67, 0x2D54BE88,
+		0x80A8F70E, 0x99C3C7E1, 0x43087BD5, 0x5A634B3A,
+		0x5BA1FC99, 0x42CACC76, 0x98017042, 0x816A40AD,
+		0x2C96092B, 0x35FD39C4, 0xEF3685F0, 0xF65DB51F,
+		0x44B9FAF9, 0x5DD2CA16, 0x87197622, 0x9E7246CD,
+		0x338E0F4B, 0x2AE53FA4, 0xF02E8390, 0xE945B37F,
+		0x6591F059, 0x7CFAC0B6, 0xA6317C82, 0xBF5A4C6D,
+		0x12A605EB, 0x0BCD3504, 0xD1068930, 0xC86DB9DF,
+		0x7A89F639, 0x63E2C6D6, 0xB9297AE2, 0xA0424A0D,
+		0x0DBE038B, 0x14D53364, 0xCE1E8F50, 0xD775BFBF,
+		0x3DEC0C12, 0x24873CFD, 0xFE4C80C9, 0xE727B026,
+		0x4ADBF9A0, 0x53B0C94F, 0x897B757B, 0x90104594,
+		0x22F40A72, 0x3B9F3A9D, 0xE15486A9, 0xF83FB646,
+		0x55C3FFC0, 0x4CA8CF2F, 0x9663731B, 0x8F0843F4,
+		0x03DC00D2, 0x1AB7303D, 0xC07C8C09, 0xD917BCE6,
+		0x74EBF560, 0x6D80C58F, 0xB74B79BB, 0xAE204954,
+		0x1CC406B2, 0x05AF365D, 0xDF648A69, 0xC60FBA86,
+		0x6BF3F300, 0x7298C3EF, 0xA8537FDB, 0xB1384F34,
+		0xB0FAF897, 0xA991C878, 0x735A744C, 0x6A3144A3,
+		0xC7CD0D25, 0xDEA63DCA, 0x046D81FE, 0x1D06B111,
+		0xAFE2FEF7, 0xB689CE18, 0x6C42722C, 0x752942C3,
+		0xD8D50B45, 0xC1BE3BAA, 0x1B75879E, 0x021EB771,
+		0x8ECAF457, 0x97A1C4B8, 0x4D6A788C, 0x54014863,
+		0xF9FD01E5, 0xE096310A, 0x3A5D8D3E, 0x2336BDD1,
+		0x91D2F237, 0x88B9C2D8, 0x52727EEC, 0x4B194E03,
+		0xE6E50785, 0xFF8E376A, 0x25458B5E, 0x3C2EBBB1,
+	},
+	{
+		0x00000000, 0xC82C0368, 0x905906D0, 0x587505B8,
+		0xD1C5E0A5, 0x19E9E3CD, 0x419CE675, 0x89B0E51D,
+		0x53FD2D4E, 0x9BD12E26, 0xC3A42B9E, 0x0B8828F6,
+		0x8238CDEB, 0x4A14CE83, 0x1261CB3B, 0xDA4DC853,
+		0xA6FA5B9C, 0x6ED658F4, 0x36A35D4C, 0xFE8F5E24,
+		0x773FBB39, 0xBF13B851, 0xE766BDE9, 0x2F4ABE81,
+		0xF50776D2, 0x3D2B75BA, 0x655E7002, 0xAD72736A,
+		0x24C29677, 0xECEE951F, 0xB49B90A7, 0x7CB793CF,
+		0xBD835B3D, 0x75AF5855, 0x2DDA5DED, 0xE5F65E85,
+		0x6C46BB98, 0xA46AB8F0, 0xFC1FBD48, 0x3433BE20,
+		0xEE7E7673, 0x2652751B, 0x7E2770A3, 0xB60B73CB,
+		0x3FBB96D6, 0xF79795BE, 0xAFE29006, 0x67CE936E,
+		0x1B7900A1, 0xD35503C9, 0x8B200671, 0x430C0519,
+		0xCABCE004, 0x0290E36C, 0x5AE5E6D4, 0x92C9E5BC,
+		0x48842DEF, 0x80A82E87, 0xD8DD2B3F, 0x10F12857,
+		0x9941CD4A, 0x516DCE22, 0x0918CB9A, 0xC134C8F2,
+		0x7A07B77A, 0xB22BB412, 0xEA5EB1AA, 0x2272B2C2,
+		0xABC257DF, 0x63EE54B7, 0x3B9B510F, 0xF3B75267,
+		0x29FA9A34, 0xE1D6995C, 0xB9A39CE4, 0x718F9F8C,
+		0xF83F7A91, 0x301379F9, 0x68667C41, 0xA04A7F29,
+		0xDCFDECE6, 0x14D1EF8E, 0x4CA4EA36, 0x8488E95E,
+		0x0D380C43, 0xC5140F2B, 0x9D610A93, 0x554D09FB,
+		0x8F00C1A8, 0x472CC2C0, 0x1F59C778, 0xD775C410,
+		0x5EC5210D, 0x96E92265, 0xCE9C27DD, 0x06B024B5,
+		0xC784EC47, 0x0FA8EF2F, 0x57DDEA97, 0x9FF1E9FF,
+		0x16410CE2, 0xDE6D0F8A, 0x86180A32, 0x4E34095A,
+		0x9479C109, 0x5C55C261, 0x0420C7D9, 0xCC0CC4B1,
+		0x45BC21AC, 0x8D9022C4, 0xD5E5277C, 0x1DC92414,
+		0x617EB7DB, 0xA952B4B3, 0xF127B10B, 0x390BB263,
+		0xB0BB577E, 0x78975416, 0x20E251AE, 0xE8CE52C6,
+		0x32839A95, 0xFAAF99FD, 0xA2DA9C45, 0x6AF69F2D,
+		0xE3467A30, 0x2B6A7958, 0x731F7CE0, 0xBB337F88,
+		0xF40E6EF5, 0x3C226D9D, 0x64576825, 0xAC7B6B4D,
+		0x25CB8E50, 0xEDE78D38, 0xB5928880, 0x7DBE8BE8,
+		0xA7F343BB, 0x6FDF40D3, 0x37AA456B, 0xFF864603,
+		0x7636A31E, 0xBE1AA076, 0xE66FA5CE, 0x2E43A6A6,
+		0x52F43569, 0x9AD83601, 0xC2AD33B9, 0x0A8130D1,
+		0x8331D5CC, 0x4B1DD6A4, 0x1368D31C, 0xDB44D074,
+		0x01091827, 0xC9251B4F, 0x91501EF7, 0x597C1D9F,
+		0xD0CCF882, 0x18E0FBEA, 0x4095FE52, 0x88B9FD3A,
+		0x498D35C8, 0x81A136A0, 0xD9D43318, 0x11F83070,
+		0x9848D56D, 0x5064D605, 0x0811D3BD, 0xC03DD0D5,
+		0x1A701886, 0xD25C1BEE, 0x8A291E56, 0x42051D3E,
+		0xCBB5F823, 0x0399FB4B, 0x5BECFEF3, 0x93C0FD9B,
+		0xEF776E54, 0x275B6D3C, 0x7F2E6884, 0xB7026BEC,
+		0x3EB28EF1, 0xF69E8D99, 0xAEEB8821, 0x66C78B49,
+		0xBC8A431A, 0x74A64072, 0x2CD345CA, 0xE4FF46A2,
+		0x6D4FA3BF, 0xA563A0D7, 0xFD16A56F, 0x353AA607,
+		0x8E09D98F, 0x4625DAE7, 0x1E50DF5F, 0xD67CDC37,
+		0x5FCC392A, 0x97E03A42, 0xCF953FFA, 0x07B93C92,
+		0xDDF4F4C1, 0x15D8F7A9, 0x4DADF211, 0x8581F179,
+		0x0C311464, 0xC41D170C, 0x9C6812B4, 0x544411DC,
+		0x28F38213, 0xE0DF817B, 0xB8AA84C3, 0x708687AB,
+		0xF93662B6, 0x311A61DE, 0x696F6466, 0xA143670E,
+		0x7B0EAF5D, 0xB322AC35, 0xEB57A98D, 0x237BAAE5,
+		0xAACB4FF8, 0x62E74C90, 0x3A924928, 0xF2BE4A40,
+		0x338A82B2, 0xFBA681DA, 0xA3D38462, 0x6BFF870A,
+		0xE24F6217, 0x2A63617F, 0x721664C7, 0xBA3A67AF,
+		0x6077AFFC, 0xA85BAC94, 0xF02EA92C, 0x3802AA44,
+		0xB1B24F59, 0x799E4C31, 0x21EB4989, 0xE9C74AE1,
+		0x9570D92E, 0x5D5CDA46, 0x0529DFFE, 0xCD05DC96,
+		0x44B5398B, 0x8C993AE3, 0xD4EC3F5B, 0x1CC03C33,
+		0xC68DF460, 0x0EA1F708, 0x56D4F2B0, 0x9EF8F1D8,
+		0x174814C5, 0xDF6417AD, 0x87111215, 0x4F3D117D,
+	},
+	{
+		0x00000000, 0x277D3C49, 0x4EFA7892, 0x698744DB,
+		0x6D821D21, 0x4AFF2168, 0x237865B3, 0x040559FA,
+		0xDA043B42, 0xFD79070B, 0x94FE43D0, 0xB3837F99,
+		0xB7862663, 0x90FB1A2A, 0xF97C5EF1, 0xDE0162B8,
+		0xB4097684, 0x93744ACD, 0xFAF30E16, 0xDD8E325F,
+		0xD98B6BA5, 0xFEF657EC, 0x97711337, 0xB00C2F7E,
+		0x6E0D4DC6, 0x4970718F, 0x20F73554, 0x078A091D,
+		0x038F50E7, 0x24F26CAE, 0x4D752875, 0x6A08143C,
+		0x9965000D, 0xBE183C44, 0xD79F789F, 0xF0E244D6,
+		0xF4E71D2C, 0xD39A2165, 0xBA1D65BE, 0x9D6059F7,
+		0x43613B4F, 0x641C0706, 0x0D9B43DD, 0x2AE67F94,
+		0x2EE3266E, 0x099E1A27, 0x60195EFC, 0x476462B5,
+		0x2D6C7689, 0x0A114AC0, 0x63960E1B, 0x44EB3252,
+		0x40EE6BA8, 0x679357E1, 0x0E14133A, 0x29692F73,
+		0xF7684DCB, 0xD0157182, 0xB9923559, 0x9EEF0910,
+		0x9AEA50EA, 0xBD976CA3, 0xD4102878, 0xF36D1431,
+		0x32CB001A, 0x15B63C53, 0x7C317888, 0x5B4C44C1,
+		0x5F491D3B, 0x78342172, 0x11B365A9, 0x36CE59E0,
+		0xE8CF3B58, 0xCFB20711, 0xA63543CA, 0x81487F83,
+		0x854D2679, 0xA2301A30, 0xCBB75EEB, 0xECCA62A2,
+		0x86C2769E, 0xA1BF4AD7, 0xC8380E0C, 0xEF453245,
+		0xEB406BBF, 0xCC3D57F6, 0xA5BA132D, 0x82C72F64,
+		0x5CC64DDC, 0x7BBB7195, 0x123C354E, 0x35410907,
+		0x314450FD, 0x16396CB4, 0x7FBE286F, 0x58C31426,
+		0xABAE0017, 0x8CD33C5E, 0xE5547885, 0xC22944CC,
+		0xC62C1D36, 0xE151217F, 0x88D665A4, 0xAFAB59ED,
+		0x71AA3B55, 0x56D7071C, 0x3F5043C7, 0x182D7F8E,
+		0x1C282674, 0x3B551A3D, 0x52D25EE6, 0x75AF62AF,
+		0x1FA77693, 0x38DA4ADA, 0x515D0E01, 0x76203248,
+		0x72256BB2, 0x555857FB, 0x3CDF1320, 0x1BA22F69,
+		0xC5A34DD1, 0xE2DE7198, 0x8B593543, 0xAC24090A,
+		0xA82150F0, 0x8F5C6CB9, 0xE6DB2862, 0xC1A6142B,
+		0x64960134, 0x43EB3D7D, 0x2A6C79A6, 0x0D1145EF,
+		0x09141C15, 0x2E69205C, 0x47EE6487, 0x609358CE,
+		0xBE923A76, 0x99EF063F, 0xF06842E4, 0xD7157EAD,
+		0xD3102757, 0xF46D1B1E, 0x9DEA5FC5, 0xBA97638C,
+		0xD09F77B0, 0xF7E24BF9, 0x9E650F22, 0xB918336B,
+		0xBD1D6A91, 0x9A6056D8, 0xF3E71203, 0xD49A2E4A,
+		0x0A9B4CF2, 0x2DE670BB, 0x44613460, 0x631C0829,
+		0x671951D3, 0x40646D9A, 0x29E32941, 0x0E9E1508,
+		0xFDF30139, 0xDA8E3D70, 0xB30979AB, 0x947445E2,
+		0x90711C18, 0xB70C2051, 0xDE8B648A, 0xF9F658C3,
+		0x27F73A7B, 0x008A0632, 0x690D42E9, 0x4E707EA0,
+		0x4A75275A, 0x6D081B13, 0x048F5FC8, 0x23F26381,
+		0x49FA77BD, 0x6E874BF4, 0x07000F2F, 0x207D3366,
+		0x24786A9C, 0x030556D5, 0x6A82120E, 0x4DFF2E47,
+		0x93FE4CFF, 0xB48370B6, 0xDD04346D, 0xFA790824,
+		0xFE7C51DE, 0xD9016D97, 0xB086294C, 0x97FB1505,
+		0x565D012E, 0x71203D67, 0x18A779BC, 0x3FDA45F5,
+		0x3BDF1C0F, 0x1CA22046, 0x7525649D, 0x525858D4,
+		0x8C593A6C, 0xAB240625, 0xC2A342FE, 0xE5DE7EB7,
+		0xE1DB274D, 0xC6A61B04, 0xAF215FDF, 0x885C6396,
+		0xE25477AA, 0xC5294BE3, 0xACAE0F38, 0x8BD33371,
+		0x8FD66A8B, 0xA8AB56C2, 0xC12C1219, 0xE6512E50,
+		0x38504CE8, 0x1F2D70A1, 0x76AA347A, 0x51D70833,
+		0x55D251C9, 0x72AF6D80, 0x1B28295B, 0x3C551512,
+		0xCF380123, 0xE8453D6A, 0x81C279B1, 0xA6BF45F8,
+		0xA2BA1C02, 0x85C7204B, 0xEC406490, 0xCB3D58D9,
+		0x153C3A61, 0x32410628, 0x5BC642F3, 0x7CBB7EBA,
+		0x78BE2740, 0x5FC31B09, 0x36445FD2, 0x1139639B,
+		0x7B3177A7, 0x5C4C4BEE, 0x35CB0F35, 0x12B6337C,
+		0x16B36A86, 0x31CE56CF, 0x58491214, 0x7F342E5D,
+		0xA1354CE5, 0x864870AC, 0xEFCF3477, 0xC8B2083E,
+		0xCCB751C4, 0xEBCA6D8D, 0x824D2956, 0xA530151F
+	}
+#endif							/* WORDS_BIGENDIAN */
+};
+
+/* Accumulate one input byte */
+#ifdef WORDS_BIGENDIAN
+#define CRC8(x) crc32c_table[0][((crc >> 24) ^ (x)) & 0xFF] ^ (crc << 8)
+#else
+#define CRC8(x) crc32c_table[0][(crc ^ (x)) & 0xFF] ^ (crc >> 8)
+#endif
+
+uint32
+comp_crc32c_sb8(uint32 crc, const void *data, size_t len)
+{
+	const unsigned char *p = (const unsigned char *)data;
+	const uint32 *p4;
+
+	/*
+	 * Handle 0-3 initial bytes one at a time, so that the loop below starts
+	 * with a pointer aligned to four bytes.
+	 */
+	while (len > 0 && ((uintptr_t) p & 3))
+	{
+		crc = CRC8(*p++);
+		len--;
+	}
+
+	/*
+	 * Process eight bytes of data at a time.
+	 */
+	p4 = (const uint32 *) p;
+	while (len >= 8)
+	{
+		uint32		a = *p4++ ^ crc;
+		uint32		b = *p4++;
+
+#ifdef WORDS_BIGENDIAN
+		const uint8 c0 = b;
+		const uint8 c1 = b >> 8;
+		const uint8 c2 = b >> 16;
+		const uint8 c3 = b >> 24;
+		const uint8 c4 = a;
+		const uint8 c5 = a >> 8;
+		const uint8 c6 = a >> 16;
+		const uint8 c7 = a >> 24;
+#else
+		const uint8 c0 = b >> 24;
+		const uint8 c1 = b >> 16;
+		const uint8 c2 = b >> 8;
+		const uint8 c3 = b;
+		const uint8 c4 = a >> 24;
+		const uint8 c5 = a >> 16;
+		const uint8 c6 = a >> 8;
+		const uint8 c7 = a;
+#endif
+
+		crc =
+			crc32c_table[0][c0] ^ crc32c_table[1][c1] ^
+			crc32c_table[2][c2] ^ crc32c_table[3][c3] ^
+			crc32c_table[4][c4] ^ crc32c_table[5][c5] ^
+			crc32c_table[6][c6] ^ crc32c_table[7][c7];
+
+		len -= 8;
+	}
+
+	/*
+	 * Handle any remaining bytes one at a time.
+	 */
+	p = (const unsigned char *) p4;
+	while (len > 0)
+	{
+		crc = CRC8(*p++);
+		len--;
+	}
+
+	return crc;
+}
+
+/*
+ * error handle
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static thread_local ICError ic_error = {LEVEL_ERROR};
+
+ICError*
+GetLastError()
+{
+	return &ic_error;
+}
+
+void
+ResetLastError()
+{
+	ic_error.level = LEVEL_OK;
+}
+
+void
+SetLastError(ErrorLevel level, const char *msg)
+{
+	ic_error.level = level;
+	strncpy(ic_error.msg, msg, sizeof(ic_error.msg) - 1);
+	ic_error.msg[sizeof(ic_error.msg) - 1] = 0;
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/ic_utility.hpp b/contrib/udp2/ic_common/ic_utility.hpp
new file mode 100644
index 00000000000..b8c8919ff12
--- /dev/null
+++ b/contrib/udp2/ic_common/ic_utility.hpp
@@ -0,0 +1,167 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_utility.hpp
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/ic_utility.hpp
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef IC_UTILITY_HPP
+#define IC_UTILITY_HPP
+
+#include <atomic>
+#include <mutex>
+#include <sstream>
+#include <vector>
+
+#include <stdarg.h>
+#include <sys/time.h>
+#include <unistd.h>
+
+/* Define this if you want tons of logs! */
+#undef AMS_VERBOSE_LOGGING
+
+#ifndef NDEBUG
+#define USE_ASSERT_CHECKING 1
+#endif
+
+#define Assert(p) assert(p)
+#define closesocket close
+
+#define IC_DEBUG5		10
+#define IC_DEBUG4		11
+#define IC_DEBUG3		12
+#define IC_DEBUG2		13
+#define IC_DEBUG1		14
+#define IC_LOG			15
+#define IC_WARNING		19
+
+/* tupchunk.h */
+#define ANY_ROUTE -100
+
+/* cdbvars.h */
+#define DEFAULT_PACKET_SIZE 8192
+#define MIN_PACKET_SIZE 512
+#define MAX_PACKET_SIZE 65507 /* Max payload for IPv4/UDP (subtract 20 more for IPv6 without extensions) */
+#define UNDEF_SEGMENT -2
+
+/* c.h */
+#define Max(x, y)		((x) > (y) ? (x) : (y))
+#define Min(x, y)		((x) < (y) ? (x) : (y))
+
+/* cdbinterconnect.h */
+#define CTS_INITIAL_SIZE (10)
+
+/* pg_list.h */
+#define NIL						((List *) NULL)
+
+/* transam.h */
+#define InvalidTransactionId		(0)
+
+#define INVALID_SOCKET (-1)
+
+/*
+ * CONTAINER_OF
+ */
+#define CONTAINER_OF(ptr, type, member) \
+	( \
+	  reinterpret_cast<type*>(reinterpret_cast<char*>(ptr) - offsetof(type, member)) \
+	)
+
+
+typedef enum GpVars_Verbosity_IC
+{
+	GPVARS_VERBOSITY_UNDEFINED_IC = 0,
+	GPVARS_VERBOSITY_OFF_IC,
+	GPVARS_VERBOSITY_TERSE_IC,
+	GPVARS_VERBOSITY_VERBOSE_IC,
+	GPVARS_VERBOSITY_DEBUG_IC,
+} GpVars_Verbosity_IC;
+
+typedef enum GpVars_Interconnect_Method_IC
+{
+	INTERCONNECT_FC_METHOD_CAPACITY_IC = 0,
+	INTERCONNECT_FC_METHOD_LOSS_IC = 2,
+	INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC = 3,
+	INTERCONNECT_FC_METHOD_LOSS_TIMER_IC = 4,
+} GpVars_Interconnect_Method_IC;
+
+typedef enum
+{
+	GP_ROLE_UNDEFINED_IC = 0,		/* Should never see this role in use */
+	GP_ROLE_UTILITY_IC,			/* Operating as a simple database engine */
+	GP_ROLE_DISPATCH_IC,			/* Operating as the parallel query dispatcher */
+	GP_ROLE_EXECUTE_IC,			/* Operating as a parallel query executor */
+} GpRoleValue_IC;
+
+typedef enum GpVars_Interconnect_Address_Type_IC
+{
+	INTERCONNECT_ADDRESS_TYPE_UNICAST_IC = 0,
+	INTERCONNECT_ADDRESS_TYPE_WILDCARD_IC
+} GpVars_Interconnect_Address_Type_IC;
+
+
+/*
+ * global_param and session_param;
+ */
+extern GlobalMotionLayerIPCParam global_param;
+extern SessionMotionLayerIPCParam session_param;
+
+/*
+ * logger stuff
+ */
+#define DEFAULT_LOG_LEVEL INFO
+extern const char * SeverityName[9];
+
+enum LogSeverity {
+    FATAL, LOG_ERROR, WARNING, INFO, DEBUG1, DEBUG2, DEBUG3, DEBUG4, DEBUG5
+};
+
+class Logger;
+
+class Logger {
+public:
+    Logger();
+
+    ~Logger();
+
+    void setOutputFd(int f);
+
+    void setLogSeverity(LogSeverity l);
+
+    void printf(LogSeverity s, const char * fmt, ...) __attribute__((format(printf, 3, 4)));
+
+private:
+    int fd;
+    std::atomic<LogSeverity> severity;
+};
+
+extern Logger RootLogger;
+
+#define LOG(s, fmt, ...) \
+    RootLogger.printf(s, fmt, ##__VA_ARGS__)
+
+/*
+ * crc32
+ */
+extern uint32 ComputeCRC(const void *data, size_t len);
+
+#endif // IC_UTILITY_HPP
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/udp2/ic_udp2.cpp b/contrib/udp2/ic_common/udp2/ic_udp2.cpp
new file mode 100644
index 00000000000..a747d91f600
--- /dev/null
+++ b/contrib/udp2/ic_common/udp2/ic_udp2.cpp
@@ -0,0 +1,7649 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_udp2.cpp
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/udp2/ic_udp2.cpp
+ *
+ *               +--------------+
+ *               |  ic_types.h  |
+ *               +--------------+
+ *                  /         \
+ *       +--------------+  +---------------+
+ *       | C interface  |  | C++ interface |
+ *       |  ic_udp2.h   |  |  ic_udp2.hpp  |
+ *       +--------------+  +---------------+
+ *                   \         /
+ *            +----------------------+
+ *            |     C++ implement    |
+ *            |  ic_udp2_internal.hpp|
+ *            |  ic_faultinjection.h |
+ *            |  ic_udp2.cpp         |
+ *            +----------------------+
+ *-------------------------------------------------------------------------
+ */
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+#include <sstream>
+#include <stdexcept>
+#include <thread>
+#include <vector>
+#include <atomic>
+#include <cstdarg>
+
+/*
+ * interface header files
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ic_types.h"
+#include "ic_udp2.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "ic_udp2.hpp"
+
+/*
+ * internal header files
+ */
+#include "ic_utility.hpp"
+#include "ic_udp2_internal.hpp"
+#include "ic_faultinjection.h"
+
+/*
+ * Hints to the compiler about the likelihood of a branch. Both likely() and
+ * unlikely() return the boolean value of the contained expression.
+ *
+ * These should only be used sparingly, in very hot code paths. It's very easy
+ * to mis-estimate likelihoods.
+ */
+#if __GNUC__ >= 3
+#define likely(x)	__builtin_expect((x) != 0, 1)
+#define unlikely(x) __builtin_expect((x) != 0, 0)
+#else
+#define likely(x)	((x) != 0)
+#define unlikely(x) ((x) != 0)
+#endif
+
+static int timeoutArray[] =
+{
+	1,
+	1,
+	2,
+	4,
+	8,
+	16,
+	32,
+	64,
+	128,
+	256,
+	512,
+	512							/* MAX_TRY */
+};
+
+/*
+ * Main thread (Receiver) and background thread use the information in
+ * this data structure to handle data packets.
+ */
+static ReceiveControlInfo rx_control_info;
+
+/*
+ * The buffer pool used for keeping data packets.
+ *
+ * maxCount is set to 1 to make sure there is always a buffer
+ * for picking packets from OS buffer.
+ */
+static RxBufferPool rx_buffer_pool = {1, 0, NULL};
+
+/*
+ * The sender side buffer pool.
+ */
+static SendBufferPool snd_buffer_pool;
+
+/*
+ * Main thread use the information in this data structure to do ack handling
+ * and congestion control.
+ */
+static SendControlInfo snd_control_info;
+
+/*
+ * Shared control information that is used by senders, receivers and background thread.
+ */
+static ICGlobalControlInfo ic_control_info;
+
+/*
+ * All connections in a process share this unack queue ring instance.
+ */
+static UnackQueueRing unack_queue_ring = {0};
+
+static int	ICSenderSocket = -1;
+static int32 ICSenderPort = 0;
+static int	ICSenderFamily = 0;
+
+/* Statistics for UDP interconnect. */
+static ICStatistics ic_statistics;
+
+/* Cached sockaddr of the listening udp socket */
+static struct sockaddr_storage udp_dummy_packet_sockaddr;
+
+/* UDP listen fd */
+static int			UDP_listenerFd = -1;
+
+/* UDP listen port */
+static int32 udp_listener_port = 0;
+
+static std::mutex mtx;
+static std::condition_variable cv;
+
+CChunkTransportState *CChunkTransportStateImpl::state_ = nullptr;
+
+static struct mudp_manager mudp;
+
+/*
+ * Identity the user of ic module by vector_engine_is_user:
+ * "false" means PG executor, "true" means Arrow executor.
+ */
+static thread_local bool vector_engine_is_user = false;
+static thread_local bool thread_quit = false;
+
+#define CHECK_QUIT_FLAG() \
+	do { \
+		if (thread_quit) { \
+			throw ICException("received thread quit flag.", __FILE__, __LINE__); \
+		} \
+	} while(0)
+
+#define CHECK_INTERRUPTS(state) \
+	do { \
+		if (vector_engine_is_user) { \
+			CHECK_QUIT_FLAG(); \
+		} else if (global_param.checkInterruptsCallback) { \
+			global_param.checkInterruptsCallback((state)->teardownActive); \
+		} \
+	} while(0)
+
+#define CHECK_CANCEL(state) \
+	do { \
+		if (vector_engine_is_user) { \
+			CHECK_QUIT_FLAG(); \
+		} else if (global_param.checkCancelOnQDCallback) { \
+			global_param.checkCancelOnQDCallback(state); \
+		} \
+	} while(0)
+
+#define CHECK_POSTMASTER_ALIVE() \
+	do { \
+		if (vector_engine_is_user) { \
+			CHECK_QUIT_FLAG(); \
+		} else if (global_param.checkPostmasterIsAliveCallback && !global_param.checkPostmasterIsAliveCallback()) { \
+			throw ICFatalException("FATAL, interconnect failed to send chunks, Postmaster is not alive.", __FILE__, __LINE__); \
+		} \
+	} while(0)
+
+/*=========================================================================
+ * STATIC FUNCTIONS declarations
+ */
+
+/* Background thread error handling functions. */
+static void checkRxThreadError(void);
+static void setRxThreadError(int eno);
+static void resetRxThreadError(void);
+
+static uint32 setUDPSocketBufferSize(int ic_socket, int buffer_type);
+static void setupOutgoingUDPConnection(int icid, TransportEntry *pChunkEntry, UDPConn *conn);
+
+/* ICBufferList functions. */
+static inline void icBufferListInitHeadLink(ICBufferLink *link);
+
+static inline void InitMotionUDPIFC(int *listenerSocketFd, int32 *listenerPort);
+static inline void CleanupMotionUDPIFC(void);
+
+static bool dispatcherAYT(void);
+static void checkQDConnectionAlive(void);
+
+static void *rxThreadFunc(void *arg);
+
+static void putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64 now);
+
+static bool cacheFuturePacket(icpkthdr *pkt, struct sockaddr_storage *peer, int peer_len);
+static void cleanupStartupCache(void);
+static void handleCachedPackets(void);
+
+static uint64 getCurrentTime(void);
+static void initMutex(pthread_mutex_t *mutex);
+
+static inline void logPkt(const char *prefix, icpkthdr *pkt);
+
+static void ConvertToIPv4MappedAddr(struct sockaddr_storage *sockaddr, socklen_t *o_len);
+#if defined(__darwin__)
+#define    s6_addr32 __u6_addr.__u6_addr32
+static void ConvertIPv6WildcardToLoopback(struct sockaddr_storage* dest);
+#endif
+
+static void setupUDPListeningSocket(int *listenerSocketFd, int32 *listenerPort,
+                           int *txFamily, struct sockaddr_storage *listenerSockaddr);
+static void getSockAddr(struct sockaddr_storage *peer, socklen_t *peer_len, const char *listenerAddr, int listenerPort);
+static void SendDummyPacket(void);
+static bool handleDataPacket(UDPConn *conn, icpkthdr *pkt, struct sockaddr_storage *peer, socklen_t *peerlen, AckSendParam *param, bool *wakeup_mainthread);
+static bool handleMismatch(icpkthdr *pkt, struct sockaddr_storage *peer, int peer_len);
+static void initUnackQueueRing(UnackQueueRing *uqr);
+
+static ssize_t sendtoWithRetry(int socket, const void *message, size_t length, int flags, const struct sockaddr *dest_addr, socklen_t dest_len, int retry, const char *errDetail);
+
+static char *format_sockaddr_udp(struct sockaddr_storage *sa, char *buf, size_t len);
+
+static void initUdpManager(mudp_manager_t mptr);
+
+static char* flags2txt(uint32 pkt_flags);
+
+static const char* flags_text[] =
+	{"recv2send", "ack", "stop", "eos", "nak", "disorder", "duplicate", "capacity"};
+
+static char*
+flags2txt(uint32 pkt_flags)
+{
+	thread_local static char flags[64];
+
+	char *p = flags;
+	*p = '\0';
+	int bytes = 0;
+	for (size_t i = 0; i < sizeof(flags_text)/sizeof(flags_text[0]); ++i) {
+		if (pkt_flags & (1 << i))
+			bytes += snprintf(p + bytes, 64, "%s | ", flags_text[i]);
+	}
+
+	if (bytes > 0)
+		bytes -= 3;
+	*(p + bytes) = '\0';
+
+	return flags;
+}
+
+/*
+ * CursorICHistoryTable::prune
+ * 		Prune entries in the hash table.
+ */
+void
+CursorICHistoryTable::prune(uint32 icId) {
+	for (uint32 index = 0; index < size; index++) {
+		CursorICHistoryEntry *p = table[index], *q = NULL;
+		while (p) {
+			/* remove an entry if it is older than the prune-point */
+			if (p->icId < icId) {
+				if (!q)
+					table[index] = p->next;
+				else
+					q->next = p->next;
+
+				/* set up next loop */
+				CursorICHistoryEntry *trash = p;
+				p = trash->next;
+				ic_free(trash);
+
+				count--;
+			} else {
+				q = p;
+				p = p->next;
+			}
+		}
+	}
+}
+
+#ifdef TRANSFER_PROTOCOL_STATS
+typedef enum TransProtoEvent
+{
+	TPE_DATA_PKT_SEND,
+	TPE_ACK_PKT_QUERY
+} TransProtoEvent;
+
+typedef struct TransProtoStatEntry TransProtoStatEntry;
+struct TransProtoStatEntry
+{
+	TransProtoStatEntry *next;
+
+	/* Basic information */
+	uint32		time;
+	TransProtoEvent event;
+	int			dstPid;
+	uint32		seq;
+
+	/* more attributes can be added on demand. */
+
+	/*
+	 * float	cwnd;
+	 * int		capacity;
+	 */
+};
+
+typedef struct TransProtoStats TransProtoStats;
+struct TransProtoStats
+{
+	std::mutex lock;
+	TransProtoStatEntry *head;
+	TransProtoStatEntry *tail;
+	uint64		count;
+	uint64		startTime;
+
+	void init();
+	void update(TransProtoEvent event, icpkthdr *pkt);
+	void dump();
+};
+
+static TransProtoStats trans_proto_stats =
+{
+	{}, NULL, NULL, 0
+};
+
+/*
+ * init
+ * 		Initialize the transport protocol states data structures.
+ */
+void
+TransProtoStats::init()
+{
+	std::lock_guard<std::mutex> guard(this->lock);
+
+	while (this->head) {
+		TransProtoStatEntry *cur = this->head;
+		this->head = this->head->next;
+		ic_free(cur);
+		this->count--;
+	}
+
+	this->head = NULL;
+	this->tail = NULL;
+	this->count = 0;
+	this->startTime = getCurrentTime();
+}
+
+void
+TransProtoStats::update(TransProtoEvent event, icpkthdr *pkt)
+{
+	/* Add to list */
+	TransProtoStatEntry *entry = (TransProtoStatEntry *) ic_malloc(sizeof(TransProtoStatEntry));
+	if (!entry)
+		return;
+
+	memset(entry, 0, sizeof(*entry));
+
+	/* change the list */
+	std::lock_guard<std::mutex> guard(this->lock);
+	if (this->count == 0) {
+		/* 1st element */
+		this->head = entry;
+		this->tail = entry;
+	} else {
+		this->tail->next = entry;
+		this->tail = entry;
+	}
+	this->count++;
+
+	entry->time = getCurrentTime() - this->startTime;
+	entry->event = event;
+	entry->dstPid = pkt->dstPid;
+	entry->seq = pkt->seq;
+
+	/*
+	 * Other attributes can be added on demand new->cwnd =
+	 * snd_control_info.cwnd; new->capacity = conn->capacity;
+	 */
+}
+
+void
+TransProtoStats::dump()
+{
+	char		tmpbuf[32];
+
+	snprintf(tmpbuf, 32, "%d.%lu.txt", global_param.MyProcPid, getCurrentTime());
+	FILE	   *ofile = fopen(tmpbuf, "w+");
+
+	std::lock_guard<std::mutex> guard(this->lock);
+	while (this->head)
+	{
+		TransProtoStatEntry *cur = NULL;
+
+		cur = this->head;
+		this->head = this->head->next;
+
+		fprintf(ofile, "time %d event %d seq %d destpid %d\n", cur->time, cur->event, cur->seq, cur->dstPid);
+		ic_free(cur);
+		this->count--;
+	}
+
+	this->tail = NULL;
+	fclose(ofile);
+}
+
+#endif							/* TRANSFER_PROTOCOL_STATS */
+
+/*
+ * initConnHashTable
+ * 		Initialize a connection hash table.
+ */
+bool
+ConnHashTable::init()
+{
+	this->size = global_param.Gp_role == GP_ROLE_DISPATCH_IC ?
+				 (global_param.segment_number * 2) : global_param.ic_htab_size;
+	Assert(this->size > 0);
+
+	this->table = (struct ConnHtabBin **) ic_malloc(this->size * sizeof(struct ConnHtabBin *));
+	if (this->table == NULL)
+		return false;
+
+	for (int i = 0; i < this->size; i++)
+		this->table[i] = NULL;
+
+	return true;
+}
+
+/*
+ * connAddHash
+ * 		Add a connection to the hash table
+ *
+ * Note: we want to add a connection to the hashtable if it isn't
+ * already there ... so we just have to check the pointer values -- no
+ * need to use CONN_HASH_MATCH() at all!
+ */
+bool
+ConnHashTable::add(UDPConn *conn)
+{
+	uint32 hashcode = CONN_HASH_VALUE(&conn->conn_info) % this->size;
+
+	/*
+	 * check for collision -- if we already have an entry for this connection,
+	 * don't add another one.
+	 */
+	for (struct ConnHtabBin *bin = this->table[hashcode]; bin != NULL; bin = bin->next)
+	{
+		if (bin->conn == conn)
+		{
+			LOG(DEBUG5, "ConnHashTable::add(): duplicate ?! node %d route %d", conn->conn_info.motNodeId, conn->route);
+			return true;		/* false *only* indicates memory-alloc
+								 * failure. */
+		}
+	}
+
+	struct ConnHtabBin *newbin = (struct ConnHtabBin *) ic_malloc(sizeof(struct ConnHtabBin));
+	if (newbin == NULL)
+		return false;
+
+	newbin->conn = conn;
+	newbin->next = this->table[hashcode];
+	this->table[hashcode] = newbin;
+
+	ic_statistics.activeConnectionsNum++;
+
+	return true;
+}
+
+/*
+ * remove
+ * 		Delete a connection from the hash table
+ *
+ * Note: we want to remove a connection from the hashtable if it is
+ * there ... so we just have to check the pointer values -- no need to
+ * use CONN_HASH_MATCH() at all!
+ */
+void
+ConnHashTable::remove(UDPConn *conn)
+{
+	uint32		hashcode;
+	struct ConnHtabBin *c,
+			   *p,
+			   *trash;
+
+	hashcode = CONN_HASH_VALUE(&conn->conn_info) % this->size;
+
+	c = this->table[hashcode];
+
+	/* find entry */
+	p = NULL;
+	while (c != NULL)
+	{
+		/* found ? */
+		if (c->conn == conn)
+			break;
+
+		p = c;
+		c = c->next;
+	}
+
+	/* not found ? */
+	if (c == NULL)
+	{
+		return;
+	}
+
+	/* found the connection, remove from the chain. */
+	trash = c;
+
+	if (p == NULL)
+		this->table[hashcode] = c->next;
+	else
+		p->next = c->next;
+
+	ic_free(trash);
+
+	ic_statistics.activeConnectionsNum--;
+
+	return;
+}
+
+/*
+ * findConnByHeader
+ * 		Find the corresponding connection given a pkt header information.
+ *
+ * With the new mirroring scheme, the interconnect is no longer involved:
+ * we don't have to disambiguate anymore.
+ *
+ * NOTE: the icpkthdr field dstListenerPort is used for disambiguation.
+ * on receivers it may not match the actual port (it may have an extra bit
+ * set (1<<31)).
+ */
+UDPConn *
+ConnHashTable::find(icpkthdr *hdr) {
+
+	uint32 hashcode = CONN_HASH_VALUE(hdr) % this->size;
+	for (struct ConnHtabBin *bin = this->table[hashcode]; bin != NULL; bin = bin->next) {
+		UDPConn *conn = bin->conn;
+
+		if (CONN_HASH_MATCH(&conn->conn_info, hdr)) {
+			UDPConn *ret = conn;
+			if (IC_DEBUG5 >= session_param.log_min_messages)
+				LOG(DEBUG5, "ConnHashTable::find: found. route %d state %d hashcode %d conn %p",
+					conn->route, ret->state, hashcode, ret);
+
+			return ret;
+		}
+	}
+
+	if (IC_DEBUG5 >= session_param.log_min_messages)
+		LOG(DEBUG5, "ConnHashTable::find: not found! (hdr->srcPid %d hdr->srcContentId %d "
+					"hdr->dstContentId %d hdr->dstPid %d sess(%d:%d) cmd(%d:%d)) hashcode %d",
+					hdr->srcPid, hdr->srcContentId, hdr->dstContentId, hdr->dstPid, hdr->sessionId,
+					session_param.gp_session_id, hdr->icId, ic_control_info.ic_instance_id, hashcode);
+
+	return NULL;
+}
+
+void
+ConnHashTable::destroy() {
+	for (int i = 0; i < this->size; i++) {
+		while (this->table[i] != NULL) {
+			struct ConnHtabBin *trash = this->table[i];
+			this->table[i] = trash->next;
+			ic_free(trash);
+		}
+	}
+
+	ic_free(this->table);
+	this->table = NULL;
+	this->size = 0;
+}
+
+/*
+ * icBufferListInitHeadLink
+ * 		Initialize the pointers in the head link to point to itself.
+ */
+static inline void
+icBufferListInitHeadLink(ICBufferLink *link)
+{
+	link->next = link->prev = link;
+}
+
+
+#if defined(USE_ASSERT_CHECKING) || defined(AMS_VERBOSE_LOGGING)
+
+/*
+ * icBufferListLog
+ * 		Log the buffer list.
+ */
+void
+ICBufferList::icBufferListLog()
+{
+	LOG(INFO, "Length %d, type %d headptr %p", this->len, this->type, &this->head);
+
+	ICBufferLink *bufLink = this->head.next;
+
+	int			len = this->len;
+	int			i = 0;
+
+	while (bufLink != &this->head && len > 0)
+	{
+		ICBuffer   *buf = (this->type == ICBufferListType_Primary ? GET_ICBUFFER_FROM_PRIMARY(bufLink)
+						   : GET_ICBUFFER_FROM_SECONDARY(bufLink));
+
+		LOG(INFO, "Node %d, linkptr %p", i++, bufLink);
+
+		logPkt("from list", buf->pkt);
+		bufLink = bufLink->next;
+		len--;
+	}
+}
+#endif
+
+#ifdef USE_ASSERT_CHECKING
+/*
+ * icBufferListCheck
+ * 		Buffer list sanity check.
+ */
+void
+ICBufferList::icBufferListCheck(const char *prefix)
+{
+	int len = this->len;
+	ICBufferLink *link = this->head.next;
+
+	if (len < 0)
+	{
+		LOG(LOG_ERROR, "ICBufferList ERROR %s: list length %d < 0 ", prefix, this->length());
+		goto error;
+	}
+
+	if (len == 0 && (this->head.prev != this->head.next && this->head.prev != &this->head))
+	{
+		LOG(LOG_ERROR, "ICBufferList ERROR %s: length is 0, &list->head %p, prev %p, next %p",
+					   prefix, &this->head, this->head.prev, this->head.next);
+		this->icBufferListLog();
+		goto error;
+	}
+
+	while (len > 0)
+	{
+		link = link->next;
+		len--;
+	}
+
+	if (link != &this->head)
+	{
+		LOG(LOG_ERROR, "ICBufferList ERROR: %s len %d", prefix, this->len);
+		this->icBufferListLog();
+		goto error;
+	}
+
+	return;
+
+error:
+	LOG(INFO, "wait for 120s and then abort.");
+	ic_usleep(120000000);
+	abort();
+}
+#endif
+
+/*
+ * ICBufferList::init
+ * 		Initialize the buffer list with the given type.
+ */
+void
+ICBufferList::init(ICBufferListType atype)
+{
+	Assert(atype == ICBufferListType_Primary|| atype == ICBufferListType_Secondary);
+
+	type = atype;
+	len  = 0;
+
+	icBufferListInitHeadLink(&head);
+
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::init");
+#endif
+}
+
+/*
+ * ICBufferList::is_head
+ * 		Return whether the given link is the head link of the list.
+ *
+ * 	This function is often used as the end condition of an iteration of the list.
+ */
+bool
+ICBufferList::is_head(ICBufferLink *link)
+{
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::is_head");
+#endif
+	return (link == &head);
+}
+
+/*
+ * ICBufferList::first
+ * 		Return the first link after the head link.
+ *
+ * 	Note that the head link is a pseudo link used to only to ease the operations of the link list.
+ * 	If the list only contains the head link, this function will return the head link.
+ */
+ICBufferLink *
+ICBufferList::first()
+{
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::first");
+#endif
+	return head.next;
+}
+
+/*
+ * ICBufferList::length
+ * 		Get the list length.
+ */
+int
+ICBufferList::length()
+{
+	return len;
+}
+
+/*
+ * ICBufferList::delete
+ *		Remove an buffer from the buffer list and return the buffer.
+ */
+ICBuffer *
+ICBufferList::remove(ICBuffer *buf)
+{
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::delete");
+#endif
+
+	ICBufferLink *bufLink = NULL;
+
+	bufLink = (this->type == ICBufferListType_Primary ? &buf->primary : &buf->secondary);
+
+	bufLink->prev->next = bufLink->next;
+	bufLink->next->prev = bufLink->prev;
+
+	len--;
+
+	return buf;
+}
+
+/*
+ * ICBufferList::pop
+ * 		Remove the head buffer from the list.
+ */
+ICBuffer *
+ICBufferList::pop()
+{
+	ICBuffer   *buf = NULL;
+	ICBufferLink *bufLink = NULL;
+
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::pop");
+#endif
+
+	if (this->len == 0)
+		return NULL;
+
+	bufLink = this->first();
+	buf = (this->type == ICBufferListType_Primary ? GET_ICBUFFER_FROM_PRIMARY(bufLink)
+		   : GET_ICBUFFER_FROM_SECONDARY(bufLink));
+
+	bufLink->prev->next = bufLink->next;
+	bufLink->next->prev = bufLink->prev;
+
+	this->len--;
+
+	return buf;
+}
+
+/*
+ * ICBufferList::free
+ * 		Free all the buffers in the list.
+ */
+void
+ICBufferList::destroy()
+{
+	ICBuffer   *buf = NULL;
+
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::free");
+#endif
+
+	while ((buf = this->pop()) != NULL)
+		ic_free(buf);
+}
+
+/*
+ * ICBufferList::append
+ * 		Append a buffer to the tail of a double-link list.
+ */
+ICBuffer *
+ICBufferList::append(ICBuffer *buf)
+{
+	Assert(buf);
+
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::append");
+#endif
+
+	ICBufferLink *bufLink = NULL;
+
+	bufLink = (this->type == ICBufferListType_Primary ? &buf->primary : &buf->secondary);
+
+	bufLink->prev = this->head.prev;
+	bufLink->next = &this->head;
+
+	this->head.prev->next = bufLink;
+	this->head.prev = bufLink;
+
+	this->len++;
+
+	return buf;
+}
+
+/*
+ * ICBufferList::return
+ * 		Return the buffers in the list to the free buffer list.
+ *
+ * If the buf is also in an expiration queue, we also need to remove it from the expiration queue.
+ *
+ */
+void
+ICBufferList::release(bool inExpirationQueue)
+{
+#ifdef USE_ASSERT_CHECKING
+	this->icBufferListCheck("ICBufferList::return");
+#endif
+	ICBuffer   *buf = NULL;
+
+	while ((buf = this->pop()) != NULL)
+	{
+		if (inExpirationQueue)	/* the buf is in also in the expiration queue */
+		{
+			ICBufferList *alist = &unack_queue_ring.slots[buf->unackQueueRingSlot];
+			buf = alist->remove(buf);
+			unack_queue_ring.numOutStanding--;
+			if (this->length() >= 1)
+				unack_queue_ring.numSharedOutStanding--;
+		}
+
+		snd_buffer_pool.freeList.append(buf);
+	}
+}
+
+#ifdef USE_ASSERT_CHECKING
+/*
+ * ICBufferList::dump_to_file
+ * 		Dump a buffer list.
+ */
+void
+ICBufferList::dump_to_file(FILE *ofile)
+{
+	this->icBufferListCheck("ICBufferList::dump_to_file");
+
+	ICBufferLink *bufLink = this->head.next;
+
+	int			len = this->len;
+	int			i = 0;
+
+	fprintf(ofile, "List Length %d\n", len);
+	while (bufLink != &this->head && len > 0)
+	{
+		ICBuffer   *buf = (this->type == ICBufferListType_Primary ? GET_ICBUFFER_FROM_PRIMARY(bufLink)
+						   : GET_ICBUFFER_FROM_SECONDARY(bufLink));
+
+		fprintf(ofile, "Node %d, linkptr %p ", i++, bufLink);
+		fprintf(ofile, "Packet Content [%s: seq %d extraSeq %d]: motNodeId %d, crc %d len %d "
+				"srcContentId %d dstDesContentId %d "
+				"srcPid %d dstPid %d "
+				"srcListenerPort %d dstListernerPort %d "
+				"sendSliceIndex %d recvSliceIndex %d "
+				"sessionId %d icId %d "
+				"flags %d\n",
+				buf->pkt->flags & UDPIC_FLAGS_RECEIVER_TO_SENDER ? "ACK" : "DATA",
+				buf->pkt->seq, buf->pkt->extraSeq, buf->pkt->motNodeId, buf->pkt->crc, buf->pkt->len,
+				buf->pkt->srcContentId, buf->pkt->dstContentId,
+				buf->pkt->srcPid, buf->pkt->dstPid,
+				buf->pkt->srcListenerPort, buf->pkt->dstListenerPort,
+				buf->pkt->sendSliceIndex, buf->pkt->recvSliceIndex,
+				buf->pkt->sessionId, buf->pkt->icId,
+				buf->pkt->flags);
+		bufLink = bufLink->next;
+		len--;
+	}
+}
+#endif
+
+/*
+ * initUnackQueueRing
+ *		Initialize an unack queue ring.
+ *
+ *	Align current time to a slot boundary and set current slot index (time pointer) to 0.
+ */
+static void
+initUnackQueueRing(UnackQueueRing *uqr)
+{
+	int			i = 0;
+
+	uqr->currentTime = 0;
+	uqr->idx = 0;
+	uqr->numOutStanding = 0;
+	uqr->numSharedOutStanding = 0;
+
+	for (; i < UNACK_QUEUE_RING_SLOTS_NUM; i++)
+	{
+		uqr->slots[i].init(ICBufferListType_Secondary);
+	}
+
+#ifdef TIMEOUT_Z
+	uqr->retrans_count = 0;
+	uqr->no_retrans_count = 0;
+	uqr->time_difference = 0;
+	uqr->min = 0;
+	uqr->max = 0;
+#endif
+}
+
+/*
+ * RxBufferPool::get
+ * 		Get a receive buffer.
+ *
+ * SHOULD BE CALLED WITH ic_control_info.lock *LOCKED*
+ *
+ * NOTE: This function MUST NOT contain elog or ereport statements.
+ * elog is NOT thread-safe.  Developers should instead use something like:
+ *
+ * NOTE: In threads, we cannot use palloc/pfree, because it's not thread safe.
+ */
+icpkthdr *
+RxBufferPool::get()
+{
+	icpkthdr   *ret = NULL;
+
+#ifdef USE_ASSERT_CHECKING
+	if (FINC_HAS_FAULT(FINC_RX_BUF_NULL) &&
+		testmode_inject_fault(session_param.gp_udpic_fault_inject_percent))
+		return NULL;
+#endif
+
+	do
+	{
+		if (this->freeList == NULL)
+		{
+			if (this->count > this->maxCount)
+			{
+				if (IC_DEBUG3 >= session_param.log_min_messages)
+					LOG(DEBUG3, "Interconnect ran out of rx-buffers count/max %d/%d", this->count, this->maxCount);
+				break;
+			}
+
+			/* malloc is used for thread safty. */
+			ret = (icpkthdr *) ic_malloc(global_param.Gp_max_packet_size);
+
+			/*
+			 * Note: we return NULL if the malloc() fails -- and the
+			 * background thread will set the error. Main thread will check
+			 * the error, report it and start teardown.
+			 */
+			if (ret != NULL)
+				this->count++;
+
+			break;
+		}
+
+		/* we have buffers available in our freelist */
+		ret = this->get_free();
+
+	} while (0);
+
+	return ret;
+}
+
+/*
+ * RxBufferPool::put
+ * 		Return a receive buffer to free list
+ *
+ *  SHOULD BE CALLED WITH ic_control_info.lock *LOCKED*
+ */
+void
+RxBufferPool::put(icpkthdr *buf)
+{
+	/* return the buffer into the free list. */
+	*(char **) buf = this->freeList;
+	this->freeList = (char *)buf;
+}
+
+/*
+ * RxBufferPool::get_free
+ * 		Get a receive buffer from free list
+ *
+ * SHOULD BE CALLED WITH ic_control_info.lock *LOCKED*
+ *
+ * NOTE: This function MUST NOT contain elog or ereport statements.
+ * elog is NOT thread-safe.  Developers should instead use something like:
+ *
+ * NOTE: In threads, we cannot use palloc/pfree, because it's not thread safe.
+ */
+icpkthdr *
+RxBufferPool::get_free()
+{
+	icpkthdr   *buf = NULL;
+
+	buf = (icpkthdr *) this->freeList;
+	this->freeList = *(char **) (this->freeList);
+	return buf;
+}
+
+/*
+ * RxBufferPool::free
+ * 		Free a receive buffer.
+ *
+ * NOTE: This function MUST NOT contain elog or ereport statements.
+ * elog is NOT thread-safe.  Developers should instead use something like:
+ *
+ * NOTE: In threads, we cannot use palloc/pfree, because it's not thread safe.
+ */
+void
+RxBufferPool::release(icpkthdr *buf)
+{
+	ic_free(buf);
+	count--;
+}
+
+/*
+ * init
+ * 		Initialize the send buffer pool.
+ *
+ * The initial maxCount is set to 1 for gp_interconnect_snd_queue_depth = 1 case,
+ * then there is at least an extra free buffer to send for that case.
+ */
+void
+SendBufferPool::init()
+{
+	this->freeList.init(ICBufferListType_Primary);
+	this->count = 0;
+	this->maxCount = (session_param.Gp_interconnect_snd_queue_depth == 1 ? 1 : 0);
+}
+
+/*
+ * clean
+ * 		Clean the send buffer pool.
+ */
+void
+SendBufferPool::clean()
+{
+	this->freeList.destroy();
+	this->count = 0;
+	this->maxCount = 0;
+}
+
+/*
+ * get
+ * 		Get a send buffer for a connection.
+ *
+ *  Different flow control mechanisms use different buffer management policies.
+ *  Capacity based flow control uses per-connection buffer policy and Loss based
+ *  flow control uses shared buffer policy.
+ *
+ * 	Return NULL when no free buffer available.
+ */
+ICBuffer *
+SendBufferPool::get(UDPConn *conn)
+{
+	ICBuffer   *ret = NULL;
+
+	ic_statistics.totalBuffers += (this->freeList.length() + this->maxCount - this->count);
+	ic_statistics.bufferCountingTime++;
+
+	/* Capacity based flow control does not use shared buffers */
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_CAPACITY_IC)
+	{
+		Assert(conn->unackQueue.length() + conn->sndQueue.length() <= session_param.Gp_interconnect_snd_queue_depth);
+		if (conn->unackQueue.length() + conn->sndQueue.length() >= session_param.Gp_interconnect_snd_queue_depth)
+			return NULL;
+	}
+
+	if (this->freeList.length() > 0)
+	{
+		return this->freeList.pop();
+	}
+	else
+	{
+		if (this->count < this->maxCount)
+		{
+			ret = (ICBuffer *) ic_malloc0(global_param.Gp_max_packet_size + sizeof(ICBuffer));
+			this->count++;
+			ret->conn = NULL;
+			ret->nRetry = 0;
+			icBufferListInitHeadLink(&ret->primary);
+			icBufferListInitHeadLink(&ret->secondary);
+			ret->unackQueueRingSlot = 0;
+		}
+		else
+		{
+			return NULL;
+		}
+	}
+
+	return ret;
+}
+
+static struct rto_hashstore*
+initRTOHashstore()
+{
+	int i;
+	struct rto_hashstore* hs = (struct rto_hashstore*)ic_malloc(sizeof(struct rto_hashstore));
+
+	for (i = 0; i < RTO_HASH; i++)
+		TAILQ_INIT(&hs->rto_list[i]);
+
+	TAILQ_INIT(&hs->rto_list[RTO_HASH]);
+
+	return hs;
+}
+
+static void
+initUdpManager(mudp_manager_t mudp)
+{
+	mudp->rto_store = initRTOHashstore();
+	mudp->rto_list_cnt = 0;
+	mudp->cur_ts = 0;
+}
+
+static inline void
+addtoRTOList(mudp_manager_t mudp, UDPConn *cur_stream)
+{
+	if (!mudp->rto_list_cnt)
+	{
+		mudp->rto_store->rto_now_idx = 0;
+		mudp->rto_store->rto_now_ts = cur_stream->sndvar.ts_rto;
+	}
+
+	if (cur_stream->on_rto_idx < 0 )
+	{
+		if (cur_stream->on_timewait_list)
+			return;
+
+		int diff = (int32_t)(cur_stream->sndvar.ts_rto - mudp->rto_store->rto_now_ts);
+		if (diff < RTO_HASH)
+		{
+			int offset= (diff + mudp->rto_store->rto_now_idx) % RTO_HASH;
+			cur_stream->on_rto_idx = offset;
+			TAILQ_INSERT_TAIL(&(mudp->rto_store->rto_list[offset]),
+					cur_stream, sndvar.timer_link);
+		}
+		else
+		{
+			cur_stream->on_rto_idx = RTO_HASH;
+			TAILQ_INSERT_TAIL(&(mudp->rto_store->rto_list[RTO_HASH]),
+					cur_stream, sndvar.timer_link);
+		}
+		mudp->rto_list_cnt++;
+	}
+}
+
+static inline void
+removeFromRTOList(mudp_manager_t mudp,
+				UDPConn *cur_stream)
+{
+	if (cur_stream->on_rto_idx < 0)
+		return;
+
+	TAILQ_REMOVE(&mudp->rto_store->rto_list[cur_stream->on_rto_idx],
+			cur_stream, sndvar.timer_link);
+	cur_stream->on_rto_idx = -1;
+
+	mudp->rto_list_cnt--;
+}
+
+static inline void
+updateRetransmissionTimer(mudp_manager_t mudp,
+				UDPConn *cur_stream,
+				uint32_t cur_ts)
+{
+	cur_stream->sndvar.nrtx = 0;
+
+	/* if in rto list, remove it */
+	if (cur_stream->on_rto_idx >= 0)
+		removeFromRTOList(mudp, cur_stream);
+
+	/* Reset retransmission timeout */
+	if (UDP_SEQ_GT(cur_stream->snd_nxt, cur_stream->sndvar.snd_una))
+	{
+		/* there are packets sent but not acked */
+		/* update rto timestamp */
+		cur_stream->sndvar.ts_rto = cur_ts + cur_stream->sndvar.rto;
+		addtoRTOList(mudp, cur_stream);
+	}
+
+	if (cur_stream->on_rto_idx == -1)
+	{
+		cur_stream->sndvar.ts_rto = cur_ts + cur_stream->sndvar.rto;
+		addtoRTOList(mudp, cur_stream);
+	}
+}
+
+static int 
+handleRTO(mudp_manager_t mudp,
+				uint32_t cur_ts,
+				UDPConn *cur_stream,
+				ICChunkTransportState *transportStates,
+				TransportEntry *pEntry,
+				UDPConn *triggerConn)
+{
+	/* check for expiration */
+	int                     count = 0;
+	int                     retransmits = 0;
+	UDPConn *currBuffConn = NULL;
+	uint32_t now = cur_ts;
+
+	Assert(unack_queue_ring.currentTime != 0);
+	removeFromRTOList(mudp, cur_stream);
+
+	while (now >= (unack_queue_ring.currentTime + TIMER_SPAN) && count++ < UNACK_QUEUE_RING_SLOTS_NUM)
+	{
+		/* expired, need to resend them */
+		ICBuffer   *curBuf = NULL;
+
+		while ((curBuf = unack_queue_ring.slots[unack_queue_ring.idx].pop()) != NULL)
+		{
+			curBuf->nRetry++;
+			currBuffConn = static_cast<UDPConn*>(curBuf->conn);
+			putIntoUnackQueueRing(
+								&unack_queue_ring,
+								curBuf,
+								currBuffConn->computeExpirationPeriod(curBuf->nRetry), now);
+
+#ifdef TRANSFER_PROTOCOL_STATS
+			trans_proto_stats.update(TPE_DATA_PKT_SEND, curBuf->pkt);
+#endif
+
+			currBuffConn->sendOnce(curBuf->pkt);
+
+			retransmits++;
+			ic_statistics.retransmits++;
+			currBuffConn->stat_count_resent++;
+			currBuffConn->stat_max_resent = Max(currBuffConn->stat_max_resent, currBuffConn->stat_count_resent);
+			UDPConn::checkNetworkTimeout(curBuf, now, &transportStates->networkTimeoutIsLogged);
+
+#ifdef AMS_VERBOSE_LOGGING
+			LOG(INFO, "RESEND pkt with seq %d (retry %d, rtt " UINT64_FORMAT ") to route %d",
+				  curBuf->pkt->seq, curBuf->nRetry, curBuf->conn->rtt, curBuf->conn->route);
+			logPkt("RESEND PKT in checkExpiration", curBuf->pkt);
+#endif
+		}
+
+		unack_queue_ring.currentTime += TIMER_SPAN;
+		unack_queue_ring.idx = (unack_queue_ring.idx + 1) % (UNACK_QUEUE_RING_SLOTS_NUM);
+	}
+	return 0;
+}
+
+static inline void
+rearrangeRTOStore(mudp_manager_t mudp)
+{
+	UDPConn *walk, *next;
+	struct rto_hashstore::rto_head* rto_list = &mudp->rto_store->rto_list[RTO_HASH];
+	int cnt = 0;
+
+	for (walk = TAILQ_FIRST(rto_list); walk != NULL; walk = next)
+	{
+		next = TAILQ_NEXT(walk, sndvar.timer_link);
+
+		int diff = (int32_t)(mudp->rto_store->rto_now_ts - walk->sndvar.ts_rto);
+		if (diff < RTO_HASH)
+		{
+			int offset = (diff + mudp->rto_store->rto_now_idx) % RTO_HASH;
+			TAILQ_REMOVE(&mudp->rto_store->rto_list[RTO_HASH],
+					walk, sndvar.timer_link);
+			walk->on_rto_idx = offset;
+			TAILQ_INSERT_TAIL(&(mudp->rto_store->rto_list[offset]),
+					walk, sndvar.timer_link);
+		}
+		cnt++;
+	}
+}
+
+static inline void
+checkRtmTimeout(mudp_manager_t mudp,
+				uint32_t cur_ts,
+				int thresh,
+				ICChunkTransportState *transportStates,
+				TransportEntry *pEntry,
+				UDPConn *triggerConn)
+{
+	UDPConn *walk, *next;
+	struct rto_hashstore::rto_head* rto_list;
+	int cnt;
+
+	if (!mudp->rto_list_cnt)
+		return;
+
+	cnt = 0;
+
+	while (1)
+	{
+		rto_list = &mudp->rto_store->rto_list[mudp->rto_store->rto_now_idx];
+		if ((int32_t)(cur_ts - mudp->rto_store->rto_now_ts) < 0)
+			break;
+
+		for (walk = TAILQ_FIRST(rto_list); walk != NULL; walk = next)
+		{
+			if (++cnt > thresh)
+				break;
+			next = TAILQ_NEXT(walk, sndvar.timer_link);
+
+			if (walk->on_rto_idx >= 0)
+			{
+				TAILQ_REMOVE(rto_list, walk, sndvar.timer_link);
+				mudp->rto_list_cnt--;
+				walk->on_rto_idx = -1;
+				handleRTO(mudp, cur_ts, walk, transportStates, pEntry, triggerConn);
+			}
+		}
+
+		if (cnt > thresh)
+		{
+			break;
+		}
+		else
+		{
+			mudp->rto_store->rto_now_idx = (mudp->rto_store->rto_now_idx + 1) % RTO_HASH;
+			mudp->rto_store->rto_now_ts++;
+			if (!(mudp->rto_store->rto_now_idx % 1000))
+				rearrangeRTOStore(mudp);
+		}
+
+	}
+}
+
+/*
+ * estimateRTT - Dynamically estimates the Round-Trip Time (RTT) and adjusts Retransmission Timeout (RTO)
+ * 
+ * This function implements a variant of the Jacobson/Karels algorithm for RTT estimation, adapted for UDP-based
+ * motion control connections. It updates smoothed RTT (srtt), mean deviation (mdev), and RTO values based on 
+ * newly measured RTT samples (mrtt). The RTO calculation ensures reliable data transmission over unreliable networks.
+ *
+ * Key Components:
+ *   - srtt:   Smoothed Round-Trip Time (weighted average of historical RTT samples)
+ *   - mdev:   Mean Deviation (measure of RTT variability)
+ *   - rttvar: Adaptive RTT variation bound (used to clamp RTO updates)
+ *   - rto:    Retransmission Timeout (dynamically adjusted based on srtt + rttvar)
+ *
+ * Algorithm Details:
+ *   1. For the first RTT sample:
+ *        srtt    = mrtt << 3   (scaled by 8 for fixed-point arithmetic)
+ *        mdev    = mrtt << 1   (scaled by 2)
+ *        rttvar  = max(mdev, rto_min)
+ *   2. For subsequent samples:
+ *        Delta   = mrtt - (srtt >> 3)  (difference between new sample and smoothed RTT)
+ *        srtt   += Delta               (update srtt with 1/8 weight of new sample)
+ *        Delta   = abs(Delta) - (mdev >> 2)
+ *        mdev   += Delta               (update mdev with 1/4 weight)
+ *   3. rttvar bounds the maximum RTT variation:
+ *        If mdev > mdev_max, update mdev_max and rttvar
+ *        On new ACKs (snd_una > rtt_seq), decay rttvar toward mdev_max
+ *   4. Final RTO calculation:
+ *        rto = (srtt >> 3) + rttvar   (clamped to RTO_MAX)
+ *
+ * Parameters:
+ *   @mConn:  Parent motion connection context (container of MotionConnUDP)
+ *   @mrtt:   Measured Round-Trip Time (in microseconds) for the latest packet
+ *
+ * Notes:
+ *   - Designed for non-retransmitted packets to avoid sampling bias.
+ *   - Uses fixed-point arithmetic to avoid floating-point operations.
+ *   - Minimum RTO (rto_min) is set to 20ms (HZ/5/10, assuming HZ=100).
+ *   - Critical for adaptive timeout control in UDP protocols where reliability is implemented at the application layer.
+ *   - Thread-unsafe: Must be called in a synchronized context (e.g., packet processing loop).
+ */
+static inline void
+estimateRTT(UDPConn *conn , uint32_t mrtt)
+{
+	/* This function should be called for not retransmitted packets */
+	/* TODO: determine rto_min */
+
+	long m = mrtt;
+	uint32_t rto_min = UDP_RTO_MIN / 10;
+
+	if (m == 0)
+		m = 1;
+
+	/*
+	 * Special RTO optimization for high-speed networks:
+	 * When measured RTT (m) is below 100 microseconds and current RTO is under 10ms,
+	 * forcibly set RTO to half of RTO_MIN. This targets two scenarios:
+	 *   - Loopback interfaces (localhost communication)
+	 *   - Ultra-low-latency networks (e.g., InfiniBand, RDMA)
+	 */
+	if(m < 100 && conn->rttvar.rto < 10000)
+	{
+		conn->rttvar.rto = RTO_MIN / 2;
+	}
+
+	if (conn->rttvar.srtt != 0)
+	{
+		/* rtt = 7/8 rtt + 1/8 new */
+		m -= (conn->rttvar.srtt >> LOSS_THRESH);
+		conn->rttvar.srtt += m;
+		if (m < 0)
+		{
+			m = -m;
+			m -= (conn->rttvar.mdev >> RTT_SHIFT_ALPHA);
+			if (m > 0)
+				m >>= LOSS_THRESH;
+		}
+		else
+		{
+			m -= (conn->rttvar.mdev >> RTT_SHIFT_ALPHA);
+		}
+		conn->rttvar.mdev += m;
+		if (conn->rttvar.mdev > conn->rttvar.mdev_max)
+		{
+			conn->rttvar.mdev_max = conn->rttvar.mdev;
+			if (conn->rttvar.mdev_max > conn->rttvar.rttvar)
+			{
+				conn->rttvar.rttvar = conn->rttvar.mdev_max;
+			}
+		}
+		if (UDP_SEQ_GT(conn->rttvar.snd_una, conn->rttvar.rtt_seq))
+		{
+			if (conn->rttvar.mdev_max < conn->rttvar.rttvar)
+			{
+				conn->rttvar.rttvar -= (conn->rttvar.rttvar - conn->rttvar.mdev_max) >> RTT_SHIFT_ALPHA;
+			}
+			conn->rttvar.mdev_max = rto_min;
+		}
+	}
+	else
+	{
+		/* fresh measurement */
+		conn->rttvar.srtt = m << LOSS_THRESH;
+		conn->rttvar.mdev = m << 1;
+		conn->rttvar.mdev_max = conn->rttvar.rttvar = MAX(conn->rttvar.mdev, rto_min);
+	}
+
+	conn->rttvar.rto = ((conn->rttvar.srtt >> LOSS_THRESH) + conn->rttvar.rttvar) > RTO_MAX ? RTO_MAX : ((conn->rttvar.srtt >> LOSS_THRESH) + conn->rttvar.rttvar);
+}
+
+/*
+ * addCRC
+ * 		add CRC field to the packet.
+ */
+static void
+addCRC(icpkthdr *pkt)
+{
+	pkt->crc = ComputeCRC(pkt, pkt->len);
+}
+
+/*
+ * checkCRC
+ * 		check the validity of the packet.
+ */
+static bool
+checkCRC(icpkthdr *pkt)
+{
+	uint32		rx_crc,
+				local_crc;
+
+	rx_crc = pkt->crc;
+	pkt->crc = 0;
+	local_crc = ComputeCRC(pkt, pkt->len);
+	if (rx_crc != local_crc)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+
+/*
+ * checkRxThreadError
+ * 		Check whether there was error in the background thread in main thread.
+ *
+ * 	If error found, report it.
+ */
+static void
+checkRxThreadError()
+{
+	int eno;
+
+	eno = ic_atomic_read_u32(&ic_control_info.eno);
+	if (eno != 0)
+	{
+		errno = eno;
+
+		std::stringstream ss;
+		ss <<"ERROR, interconnect encountered an error, in receive background thread: "<<strerror(eno);
+		throw ICReceiveThreadException(ss.str(), __FILE__, __LINE__);
+	}
+}
+
+/*
+ * setRxThreadError
+ * 		Set the error no in background thread.
+ *
+ * 	Record the error in background thread. Main thread checks the errors periodically.
+ * 	If main thread will find it, main thread will handle it.
+ */
+static void
+setRxThreadError(int eno)
+{
+	uint32 expected = 0;
+
+	/* always let main thread know the error that occurred first. */
+	if (ic_atomic_compare_exchange_u32(&ic_control_info.eno, &expected, (uint32) eno))
+	{
+		LOG(LOG_ERROR, "Interconnect error: in background thread, set ic_control_info.eno to %d, "
+					   "rx_buffer_pool.count %d, rx_buffer_pool.maxCount %d",
+					   expected, rx_buffer_pool.count, rx_buffer_pool.maxCount);
+	}
+}
+
+/*
+ * resetRxThreadError
+ * 		Reset the error no.
+ *
+ */
+static void
+resetRxThreadError()
+{
+	ic_atomic_write_u32(&ic_control_info.eno, 0);
+}
+
+/*
+  * Set UDP IC send/receive socket buffer size.
+  *
+  * We must carefully size the UDP IC socket's send/receive buffers. If the size
+  * is too small, say 128K, and send queue depth and receive queue depth are
+  * large, then there might be a lot of dropped/reordered packets. We start
+  * trying from a size of 2MB (unless Gp_udp_bufsize_k is specified), and
+  * gradually back off to UDPIC_MIN_BUF_SIZE. For a given size setting to be
+  * successful, the corresponding UDP kernel buffer size params must be adequate.
+  *
+ */
+static uint32
+setUDPSocketBufferSize(int ic_socket, int buffer_type)
+{
+    int                 expected_size;
+    int                 curr_size;
+    socklen_t           option_len = 0;
+
+    Assert(buffer_type == SO_SNDBUF || buffer_type == SO_RCVBUF);
+
+	expected_size = (global_param.Gp_udp_bufsize_k ? global_param.Gp_udp_bufsize_k * 1024 : 2048 * 1024);
+
+    curr_size = expected_size;
+    option_len = sizeof(curr_size);
+    while (setsockopt(ic_socket, SOL_SOCKET, buffer_type, (const char *) &curr_size, option_len) < 0)
+	{
+		if(session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+			LOG(DEBUG3, "UDP-IC: setsockopt %s failed to set buffer size = %d bytes: %m",
+                          buffer_type == SO_SNDBUF ? "send": "receive",
+                          curr_size);
+
+        curr_size = curr_size >> 1;
+        if (curr_size < UDPIC_MIN_BUF_SIZE)
+            return -1;
+	}
+
+	if(session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+    	LOG(DEBUG3, "UDP-IC: socket %s current buffer size = %d bytes",
+                      buffer_type == SO_SNDBUF ? "send": "receive",
+                      curr_size);
+
+    return curr_size;
+}
+
+
+/*
+ * setupUDPListeningSocket
+ * 		Setup udp listening socket.
+ */
+static void
+setupUDPListeningSocket(int *listenerSocketFd, int32 *listenerPort, int *txFamily, struct sockaddr_storage *listenerSockaddr)
+{
+    struct addrinfo         *addrs = NULL;
+    struct addrinfo         *addr;
+    struct addrinfo         hints;
+    int                     ret;
+    int                     ic_socket = INVALID_SOCKET;
+    struct sockaddr_storage ic_socket_addr;
+    int                     tries = 0;
+    struct sockaddr_storage listenerAddr;
+    socklen_t               listenerAddrlen = sizeof(ic_socket_addr);
+    uint32                  socketSendBufferSize;
+    uint32                  socketRecvBufferSize;
+
+	memset(&hints, 0, sizeof(struct addrinfo));
+	hints.ai_family = AF_UNSPEC;	/* Allow IPv4 or IPv6 */
+	hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */
+	hints.ai_protocol = 0;
+    hints.ai_addrlen = 0;
+    hints.ai_addr = NULL;
+    hints.ai_canonname = NULL;
+    hints.ai_next = NULL;
+    hints.ai_flags |= AI_NUMERICHOST;
+
+#ifdef USE_ASSERT_CHECKING
+	if (session_param.gp_udpic_network_disable_ipv6)
+		hints.ai_family = AF_INET;
+#endif
+
+	if (global_param.Gp_interconnect_address_type == INTERCONNECT_ADDRESS_TYPE_UNICAST_IC)
+	{
+		Assert(global_param.interconnect_address && strlen(global_param.interconnect_address) > 0);
+		hints.ai_flags |= AI_NUMERICHOST;
+		if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+			LOG(DEBUG3, "getaddrinfo called with unicast address: %s", global_param.interconnect_address);
+	}
+	else
+	{
+		Assert(global_param.interconnect_address == NULL);
+		hints.ai_flags |= AI_PASSIVE;
+		if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+			LOG(DEBUG3, "getaddrinfo called with wildcard address");
+	}
+
+	/*
+     * Restrict what IP address we will listen on to just the one that was
+     * used to create this QE session.
+	 */
+    Assert(global_param.interconnect_address && strlen(global_param.interconnect_address) > 0);
+    ret = getaddrinfo((!global_param.interconnect_address || global_param.interconnect_address[0] == '\0') ? NULL : global_param.interconnect_address,
+			NULL, &hints, &addrs);
+    if (ret || !addrs)
+    {
+        LOG(INFO, "could not resolve address for UDP IC socket %s: %s",
+                        global_param.interconnect_address,
+                        gai_strerror(ret));
+        goto startup_failed;
+    }
+
+	/*
+     * On some platforms, pg_getaddrinfo_all() may return multiple addresses
+     * only one of which will actually work (eg, both IPv6 and IPv4 addresses
+     * when kernel will reject IPv6).  Worse, the failure may occur at the
+     * bind() or perhaps even connect() stage.  So we must loop through the
+     * results till we find a working combination. We will generate DEBUG
+     * messages, but no error, for bogus combinations.
+	 */
+	for (addr = addrs; addr != NULL; addr = addr->ai_next)
+	{
+#ifdef HAVE_UNIX_SOCKETS
+        /* Ignore AF_UNIX sockets, if any are returned. */
+        if (addr->ai_family == AF_UNIX)
+            continue;
+#endif
+
+		if (++tries > 1 && session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+			LOG(DEBUG3, "trying another address for UDP interconnect socket");
+
+        ic_socket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+        if (ic_socket == INVALID_SOCKET)
+		{
+			if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+				LOG(DEBUG3, "could not create UDP interconnect socket: %m");
+			continue;
+		}
+
+        /*
+         * Bind the socket to a kernel assigned ephemeral port on the
+         * interconnect_address.
+         */
+        if (bind(ic_socket, addr->ai_addr, addr->ai_addrlen) < 0)
+		{
+			if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+				LOG(DEBUG3, "could not bind UDP interconnect socket: %m");
+            closesocket(ic_socket);
+            ic_socket = INVALID_SOCKET;
+            continue;
+		}
+
+        /* Call getsockname() to eventually obtain the assigned ephemeral port */
+        if (getsockname(ic_socket, (struct sockaddr *) &listenerAddr, &listenerAddrlen) < 0)
+		{
+			if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+				LOG(DEBUG3, "could not get address of UDP interconnect socket: %m");
+            closesocket(ic_socket);
+            ic_socket = INVALID_SOCKET;
+            continue;
+		}
+
+       /* If we get here, we have a working socket */
+       break;
+	}
+
+    if (!addr || ic_socket == INVALID_SOCKET)
+        goto startup_failed;
+
+    /* Memorize the socket fd, kernel assigned port and address family */
+    *listenerSocketFd = ic_socket;
+    if (listenerAddr.ss_family == AF_INET6)
+    {
+        *listenerPort = ntohs(((struct sockaddr_in6 *) &listenerAddr)->sin6_port);
+        *txFamily = AF_INET6;
+    }
+    else
+    {
+        *listenerPort = ntohs(((struct sockaddr_in *) &listenerAddr)->sin_port);
+        *txFamily = AF_INET;
+    }
+
+    /*
+     * cache the successful sockaddr of the listening socket, so
+     * we can use this information to connect to the listening socket.
+     */
+    if (listenerSockaddr != NULL)
+        memcpy(listenerSockaddr, &listenerAddr, sizeof(struct sockaddr_storage));
+
+    /* Set up socket non-blocking mode */
+    if (!ic_set_noblock(ic_socket))
+    {
+        LOG(INFO, "could not set UDP interconnect socket to nonblocking mode: %s", strerror(errno));
+        goto startup_failed;
+    }
+
+    /* Set up the socket's send and receive buffer sizes. */
+    socketRecvBufferSize = setUDPSocketBufferSize(ic_socket, SO_RCVBUF);
+    if (socketRecvBufferSize == static_cast<uint32>(-1))
+        goto startup_failed;
+    ic_control_info.socketRecvBufferSize = socketRecvBufferSize;
+
+    socketSendBufferSize = setUDPSocketBufferSize(ic_socket, SO_SNDBUF);
+    if (socketSendBufferSize == static_cast<uint32>(-1))
+        goto startup_failed;
+    ic_control_info.socketSendBufferSize = socketSendBufferSize;
+
+	if (addrs != NULL)
+		freeaddrinfo(addrs);
+	return;
+
+startup_failed:
+	if (addrs)
+		freeaddrinfo(addrs);
+	if (ic_socket != INVALID_SOCKET)
+	{
+		closesocket(ic_socket);
+	}
+
+	std::stringstream ss;
+	ss << "ERROR,interconnect error: Could not set up udp listener socket: " << strerror(errno);
+	throw ICNetworkException(ss.str(), __FILE__, __LINE__);
+}
+
+/*
+ * InitMutex
+ * 		Initialize mutex.
+ */
+static void
+initMutex(pthread_mutex_t *mutex)
+{
+	pthread_mutexattr_t m_atts;
+
+	pthread_mutexattr_init(&m_atts);
+	pthread_mutexattr_settype(&m_atts, PTHREAD_MUTEX_ERRORCHECK);
+
+	pthread_mutex_init(mutex, &m_atts);
+}
+
+/*
+ * Set up the udp interconnect pthread signal mask, we don't want to run our signal handlers
+ */
+static void
+ic_set_pthread_sigmasks(sigset_t *old_sigs)
+{
+#ifndef WIN32
+	sigset_t sigs;
+	int		 err;
+
+	sigfillset(&sigs);
+
+	err = pthread_sigmask(SIG_BLOCK, &sigs, old_sigs);
+	if (err != 0)
+	{
+		std::stringstream ss;
+		ss << "ERROR: Failed to get pthread signal masks with return value: "<<err;
+		throw ICReceiveThreadException(ss.str(), __FILE__, __LINE__);
+	}
+#else
+	(void) old_sigs;
+#endif
+}
+
+static void
+ic_reset_pthread_sigmasks(sigset_t *sigs)
+{
+#ifndef WIN32
+	int err;
+
+	err = pthread_sigmask(SIG_SETMASK, sigs, NULL);
+	if (err != 0)
+	{
+		std::stringstream ss;
+		ss <<"ERROR: Failed to reset pthread signal masks with return value: "<<err;
+		throw ICReceiveThreadException(ss.str(), __FILE__, __LINE__);
+	}
+#else
+	(void) sigs;
+#endif
+}
+
+/*
+ * InitMotionUDPIFC
+ * 		Initialize UDP specific comms, and create rx-thread.
+ */
+static inline void
+InitMotionUDPIFC(int *listenerSocketFd, int32 *listenerPort)
+{
+	int			pthread_err;
+	int			txFamily = -1;
+
+	/* attributes of the thread we're creating */
+	pthread_attr_t t_atts;
+	sigset_t	   pthread_sigs;
+
+#ifdef USE_ASSERT_CHECKING
+	set_test_mode();
+#endif
+
+	/* Initialize global ic control data. */
+	ic_atomic_init_u32(&ic_control_info.eno, 0);
+	ic_control_info.isSender = false;
+	ic_control_info.socketSendBufferSize = 2 * 1024 * 1024;
+	ic_control_info.socketRecvBufferSize = 2 * 1024 * 1024;
+	initMutex(&ic_control_info.lock);
+	ic_atomic_init_u32(&ic_control_info.shutdown, 0);
+	ic_control_info.threadCreated = false;
+	ic_control_info.ic_instance_id = 0;
+
+	ic_control_info.connHtab.init();
+	if (!ic_control_info.startupCacheHtab.init())
+	{
+		throw ICFatalException("FATAL, failed to initialize connection htab for startup cache", __FILE__, __LINE__);
+	}
+
+	/*
+	 * setup listening socket and sending socket for Interconnect.
+	 */
+    setupUDPListeningSocket(listenerSocketFd, listenerPort, &txFamily, &udp_dummy_packet_sockaddr);
+    setupUDPListeningSocket(&ICSenderSocket, &ICSenderPort, &ICSenderFamily, NULL);
+
+	/* Initialize receive control data. */
+	rx_control_info.mainWaitingState.reset();
+
+	/* allocate a buffer for sending disorder messages */
+	rx_control_info.disorderBuffer = (icpkthdr *)ic_malloc0(MIN_PACKET_SIZE);
+	rx_control_info.lastDXatId = InvalidTransactionId;
+	rx_control_info.lastTornIcId = 0;
+	rx_control_info.cursorHistoryTable.init();
+
+	/* Initialize receive buffer pool */
+	rx_buffer_pool.count = 0;
+	rx_buffer_pool.maxCount = 1;
+	rx_buffer_pool.freeList = NULL;
+
+	/* Initialize send control data */
+	snd_control_info.cwnd = 0;
+	snd_control_info.minCwnd = 0;
+	snd_control_info.ackBuffer = (icpkthdr *)ic_malloc0(MIN_PACKET_SIZE);
+
+	/* Start up our rx-thread */
+
+	/*
+	 * save ourselves some memory: the defaults for thread stack size are
+	 * large (1M+)
+	 */
+	pthread_attr_init(&t_atts);
+
+	pthread_attr_setstacksize(&t_atts, Max(PTHREAD_STACK_MIN, (128 * 1024)));
+	ic_set_pthread_sigmasks(&pthread_sigs);
+	pthread_err = pthread_create(&ic_control_info.threadHandle, &t_atts, rxThreadFunc, NULL);
+	ic_reset_pthread_sigmasks(&pthread_sigs);
+
+	pthread_attr_destroy(&t_atts);
+	if (pthread_err != 0)
+	{
+		ic_control_info.threadCreated = false;
+		std::stringstream ss;
+		ss<<"FATAL: pthread_create() failed with err "<<pthread_err;
+		throw ICFatalException(ss.str(), __FILE__, __LINE__);
+	}
+
+	ic_control_info.threadCreated = true;
+}
+
+/*
+ * CleanupMotionUDPIFC
+ * 		Clean up UDP specific stuff such as cursor ic hash table, thread etc.
+ */
+static inline void
+CleanupMotionUDPIFC(void)
+{
+	LOG(DEBUG2, "udp-ic: telling receiver thread to shutdown.");
+
+	/*
+	 * We should not hold any lock when we reach here even when we report
+	 * FATAL errors. Just in case, We still release the locks here.
+	 */
+	pthread_mutex_unlock(&ic_control_info.lock);
+
+	/* Shutdown rx thread. */
+	ic_atomic_write_u32(&ic_control_info.shutdown, 1);
+
+	if (ic_control_info.threadCreated)
+		pthread_join(ic_control_info.threadHandle, NULL);
+
+	LOG(DEBUG2, "udp-ic: receiver thread shutdown.");
+
+	rx_control_info.cursorHistoryTable.purge();
+
+	ic_control_info.connHtab.destroy();
+
+	/* background thread exited, we can do the cleanup without locking. */
+	cleanupStartupCache();
+	ic_control_info.startupCacheHtab.destroy();
+
+	/* free the disorder buffer */
+	ic_free(rx_control_info.disorderBuffer);
+	rx_control_info.disorderBuffer = NULL;
+
+	/* free the buffer for acks */
+	ic_free(snd_control_info.ackBuffer);
+	snd_control_info.ackBuffer = NULL;
+
+	if (ICSenderSocket >= 0)
+		closesocket(ICSenderSocket);
+	ICSenderSocket = -1;
+	ICSenderPort = 0;
+	ICSenderFamily = 0;
+
+    memset(&udp_dummy_packet_sockaddr, 0, sizeof(udp_dummy_packet_sockaddr));
+
+#ifdef USE_ASSERT_CHECKING
+
+	/*
+	 * Check malloc times, in Interconnect part, memory are carefully released
+	 * in tear down code (even when error occurred). But if a FATAL error is
+	 * reported, tear down code will not be executed. Thus, it is still
+	 * possible the malloc times and free times do not match when we reach
+	 * here. The process will die in this case, the mismatch does not
+	 * introduce issues.
+	 */
+	if (icudp_malloc_times != 0)
+		LOG(INFO, "WARNING: malloc times and free times do not match. remain alloc times: %ld", icudp_malloc_times);
+#endif
+}
+
+/*
+ * getSockAddr
+ * 		Convert IP addr and port to sockaddr
+ */
+static void
+getSockAddr(struct sockaddr_storage *peer, socklen_t *peer_len, const char *listenerAddr, int listenerPort)
+{
+	int			ret;
+	char		portNumberStr[32];
+	char	   *service;
+	struct addrinfo *addrs = NULL;
+	struct addrinfo hint;
+
+	/*
+	 * Get socketaddr to connect to.
+	 */
+
+	/* Initialize hint structure */
+	memset(&hint, 0, sizeof(hint));
+	hint.ai_socktype = SOCK_DGRAM;	/* UDP */
+	hint.ai_family = AF_UNSPEC; /* Allow for any family (v4, v6, even unix in
+								 * the future)  */
+#ifdef AI_NUMERICSERV
+	hint.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;	/* Never do name
+														 * resolution */
+#else
+	hint.ai_flags = AI_NUMERICHOST; /* Never do name resolution */
+#endif
+
+	snprintf(portNumberStr, sizeof(portNumberStr), "%d", listenerPort);
+	service = portNumberStr;
+
+	addrs = NULL;
+	/* NULL has special meaning to getaddrinfo(). */
+	ret = getaddrinfo((!listenerAddr || listenerAddr[0] == '\0') ? NULL : listenerAddr,
+					 service, &hint, &addrs);
+	if (ret || !addrs)
+	{
+		if (addrs)
+			freeaddrinfo(addrs);
+
+		std::stringstream ss;
+		ss<<"ERROR, interconnect error: Could not parse remote listener address: '"<<listenerAddr<<
+			"' port '"<<listenerPort<<"': "<<gai_strerror(ret)<<" getaddrinfo() unable to parse address: '"<<listenerAddr<<"'";
+		throw ICNetworkException(ss.str(), __FILE__, __LINE__);
+	}
+
+	/*
+	 * Since we aren't using name resolution, getaddrinfo will return only 1
+	 * entry
+	 */
+
+	LOG(DEBUG1, "GetSockAddr socket ai_family %d ai_socktype %d ai_protocol %d for %s ",
+				addrs->ai_family, addrs->ai_socktype, addrs->ai_protocol, listenerAddr);
+	memset(peer, 0, sizeof(struct sockaddr_storage));
+	memcpy(peer, addrs->ai_addr, addrs->ai_addrlen);
+	*peer_len = addrs->ai_addrlen;
+
+	if (addrs)
+		freeaddrinfo(addrs);
+}
+
+/*
+ * format_sockaddr
+ *			Format a sockaddr to a human readable string
+ *
+ * This function must be kept threadsafe, elog/ereport/palloc etc are not
+ * allowed within this function.
+ */
+static char *
+format_sockaddr_udp(struct sockaddr_storage *sa, char *buf, size_t len)
+{
+	int			ret;
+	char		remote_host[NI_MAXHOST];
+	char		remote_port[NI_MAXSERV];
+
+	ret = getnameinfo((const struct sockaddr *)sa, sizeof(struct sockaddr_storage),
+							 remote_host, sizeof(remote_host),
+							 remote_port, sizeof(remote_port),
+							 NI_NUMERICHOST | NI_NUMERICSERV);
+	if (ret != 0)
+	{
+		strncpy(remote_host, "???", sizeof(remote_host));
+		strncpy(remote_port, "???", sizeof(remote_port));
+	}
+
+	if (ret != 0)
+		snprintf(buf, len, "?host?:?port?");
+	else
+	{
+#ifdef HAVE_IPV6
+		if (sa->ss_family == AF_INET6)
+			snprintf(buf, len, "[%s]:%s", remote_host, remote_port);
+		else
+#endif
+			snprintf(buf, len, "%s:%s", remote_host, remote_port);
+	}
+
+	return buf;
+}
+
+/*
+ * setupOutgoingUDPConnection
+ *		Setup outgoing UDP connection.
+ */
+static void
+setupOutgoingUDPConnection(int icid, TransportEntry *pEntry, UDPConn *conn)
+{
+	ICCdbProcess *cdbProc = NULL;
+
+	Assert(pEntry);
+
+	cdbProc = conn->cdbProc;
+	Assert(conn->state == mcsSetupOutgoingConnection);
+	Assert(conn->cdbProc);
+
+	conn->remoteContentId = cdbProc->contentid;
+	conn->stat_min_ack_time = ~((uint64) 0);
+
+	/* Save the information for the error message if getaddrinfo fails */
+	if (strchr(cdbProc->listenerAddr, ':') != 0)
+		snprintf(conn->remoteHostAndPort, sizeof(conn->remoteHostAndPort),
+				 "[%s]:%d", cdbProc->listenerAddr, cdbProc->listenerPort);
+	else
+		snprintf(conn->remoteHostAndPort, sizeof(conn->remoteHostAndPort),
+				 "%s:%d", cdbProc->listenerAddr, cdbProc->listenerPort);
+
+	/*
+	 * Get socketaddr to connect to.
+	 */
+	getSockAddr(&conn->peer, &conn->peer_len, cdbProc->listenerAddr, cdbProc->listenerPort);
+
+	/* Save the destination IP address */
+	format_sockaddr_udp(&conn->peer, conn->remoteHostAndPort,
+				   sizeof(conn->remoteHostAndPort));
+
+	Assert(conn->peer.ss_family == AF_INET || conn->peer.ss_family == AF_INET6);
+
+	{
+#ifdef USE_ASSERT_CHECKING
+		{
+			struct sockaddr_storage source_addr;
+			socklen_t	source_addr_len;
+
+			memset(&source_addr, 0, sizeof(source_addr));
+			source_addr_len = sizeof(source_addr);
+
+			if (getsockname(pEntry->txfd, (struct sockaddr *) &source_addr, &source_addr_len) == -1)
+			{
+				throw ICNetworkException(std::string("ERROR, interconnect Error: Could not get port from socket, %m")+strerror(errno), __FILE__, __LINE__);
+			}
+			Assert(pEntry->txfd_family == source_addr.ss_family);
+		}
+#endif
+
+		/*
+		 * If the socket was created with a different address family than the
+		 * place we are sending to, we might need to do something special.
+		 */
+		if (pEntry->txfd_family != conn->peer.ss_family)
+		{
+			/*
+			 * If the socket was created AF_INET6, but the address we want to
+			 * send to is IPv4 (AF_INET), we might need to change the address
+			 * format.  On Linux, it isn't necessary:  glibc automatically
+			 * handles this.  But on MAC OSX and Solaris, we need to convert
+			 * the IPv4 address to an V4-MAPPED address in AF_INET6 format.
+			 */
+			if (pEntry->txfd_family == AF_INET6)
+			{
+				LOG(DEBUG1, "We are inet6, remote is inet.  Converting to v4 mapped address.");
+				ConvertToIPv4MappedAddr(&conn->peer, &conn->peer_len);
+			}
+			else
+			{
+				/*
+				 * If we get here, something is really wrong.  We created the
+				 * socket as IPv4-only (AF_INET), but the address we are
+				 * trying to send to is IPv6.  It's possible we could have a
+				 * V4-mapped address that we could convert to an IPv4 address,
+				 * but there is currently no code path where that could
+				 * happen.  So this must be an error.
+				 */
+				throw ICNetworkException("ERROR: Trying to use an IPv4 (AF_INET) socket to send to an IPv6 address", __FILE__, __LINE__);
+			}
+		}
+	}
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "Interconnect connecting to seg%d slice%d %s pid=%d sockfd=%d",
+					conn->remoteContentId, pEntry->recvSlice->sliceIndex, conn->remoteHostAndPort, conn->cdbProc->pid, conn->sockfd);
+
+	/* send connection request */
+	memset(&conn->conn_info, 0, sizeof(conn->conn_info));
+	conn->conn_info.len = 0;
+	conn->conn_info.flags = 0;
+	conn->conn_info.motNodeId = pEntry->motNodeId;
+
+	conn->conn_info.recvSliceIndex = pEntry->recvSlice->sliceIndex;
+	conn->conn_info.sendSliceIndex = pEntry->sendSlice->sliceIndex;
+	conn->conn_info.srcContentId = global_param.segindex;
+	conn->conn_info.dstContentId = conn->cdbProc->contentid;
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "setupOutgoingUDPConnection: node %d route %d srccontent %d dstcontent %d: %s",
+					pEntry->motNodeId, conn->route, global_param.segindex, conn->cdbProc->contentid, conn->remoteHostAndPort);
+
+	conn->conn_info.srcListenerPort = UDP2_GetListenPortUDP();
+	conn->conn_info.srcPid = global_param.MyProcPid;
+	conn->conn_info.dstPid = conn->cdbProc->pid;
+	conn->conn_info.dstListenerPort = conn->cdbProc->listenerPort;
+
+	conn->conn_info.sessionId = session_param.gp_session_id;
+	conn->conn_info.icId = icid;
+
+	ic_control_info.connHtab.add(conn);
+
+	/*
+	 * No need to get the connection lock here, since background rx thread
+	 * will never access send connections.
+	 */
+	conn->msgPos = NULL;
+	conn->msgSize = sizeof(conn->conn_info);
+	conn->stillActive = true;
+	conn->conn_info.seq = 1;
+	conn->rttvar.ts_rto = 0;
+	conn->rttvar.rto = UDP_INITIAL_RTO;
+	conn->rttvar.srtt = 0;
+	conn->rttvar.rttvar = 0;
+	conn->rttvar.snd_una = 0;
+	conn->rttvar.nrtx = 0;
+	conn->rttvar.max_nrtx = 0;
+	conn->rttvar.mss = UDP_DEFAULT_MSS;
+	conn->rttvar.cwnd = 2;
+	conn->rttvar.ssthresh = UDP_INFINITE_SSTHRESH;
+	conn->rttvar.loss_count = 0;
+	conn->rttvar.karn_mode = false;
+	conn->on_rto_idx = -1;
+	Assert(conn->peer.ss_family == AF_INET || conn->peer.ss_family == AF_INET6);
+}
+
+/*
+ * If the socket was created AF_INET6, but the address we want to
+ * send to is IPv4 (AF_INET), we need to change the address
+ * format. On Linux, this is not necessary: glibc automatically
+ * handles this. But on MAC OSX and Solaris, we need to convert
+ * the IPv4 address to IPv4-mapped IPv6 address in AF_INET6 format.
+ *
+ * The comment above relies on getaddrinfo() via function getSockAddr to get
+ * the correct V4-mapped address. We need to be careful here as we need to
+ * ensure that the platform we are using is POSIX 1003-2001 compliant.
+ * Just to be on the safeside, we'll be keeping this function for
+ * now to be used for all platforms and not rely on POSIX.
+ *
+ * Since this can be called in a signal handler, we avoid the use of
+ * async-signal unsafe functions such as memset/memcpy
+ */
+static void
+ConvertToIPv4MappedAddr(struct sockaddr_storage *sockaddr, socklen_t *o_len)
+{
+	const struct sockaddr_in *in = (const struct sockaddr_in *)sockaddr;
+	struct sockaddr_storage temp = {0};
+	struct sockaddr_in6 *in6_new = (struct sockaddr_in6 *)&temp;
+
+	/* Construct a IPv4-to-IPv6 mapped address.  */
+	temp.ss_family = AF_INET6;
+	in6_new->sin6_family = AF_INET6;
+	in6_new->sin6_port = in->sin_port;
+	in6_new->sin6_flowinfo = 0;
+
+	((uint16 *)&in6_new->sin6_addr)[5] = 0xffff;
+
+	in6_new->sin6_addr.s6_addr32[3] = in->sin_addr.s_addr;
+	in6_new->sin6_scope_id = 0;
+
+	/* copy it back */
+	*sockaddr = temp;
+	*o_len = sizeof(struct sockaddr_in6);
+}
+
+#if defined(__darwin__)
+/* macos does not accept :: as the destination, we will need to covert this to the IPv6 loopback */
+static void
+ConvertIPv6WildcardToLoopback(struct sockaddr_storage *dest)
+{
+	char address[INET6_ADDRSTRLEN];
+	/* we want to terminate our own process, so this should be local */
+	const struct sockaddr_in6 *in6 = (const struct sockaddr_in6 *)&udp_dummy_packet_sockaddr;
+	inet_ntop(AF_INET6, &in6->sin6_addr, address, sizeof(address));
+	if (strcmp("::", address) == 0)
+		((struct sockaddr_in6 *)dest)->sin6_addr = in6addr_loopback;
+}
+#endif
+
+/*
+ * handleCachedPackets
+ * 		Deal with cached packets.
+ */
+static void
+handleCachedPackets(void)
+{
+	UDPConn *cachedConn = NULL;
+	UDPConn *setupConn = NULL;
+	ConnHtabBin *bin = NULL;
+	icpkthdr   *pkt = NULL;
+	AckSendParam param;
+	int			i = 0;
+	uint32		j = 0;
+	bool		dummy;
+
+	for (i = 0; i < ic_control_info.startupCacheHtab.size; i++)
+	{
+		bin = ic_control_info.startupCacheHtab.table[i];
+
+		while (bin)
+		{
+			cachedConn = bin->conn;
+			setupConn = NULL;
+
+			for (j = 0; j < cachedConn->pkt_q_size; j++)
+			{
+				pkt = (icpkthdr *) cachedConn->pkt_q[j];
+
+				if (pkt == NULL)
+					continue;
+
+				rx_buffer_pool.maxCount--;
+
+				/* look up this pkt's connection in connHtab */
+				setupConn = ic_control_info.connHtab.find(pkt);
+				if (setupConn == NULL)
+				{
+					/* mismatch! */
+					rx_buffer_pool.put(pkt);
+					cachedConn->pkt_q[j] = NULL;
+					continue;
+				}
+
+				memset(&param, 0, sizeof(param));
+				if (!handleDataPacket(setupConn, pkt, &cachedConn->peer, &cachedConn->peer_len, &param, &dummy))
+				{
+					/* no need to cache this packet */
+					rx_buffer_pool.put(pkt);
+				}
+
+				ic_statistics.recvPktNum++;
+				if (param.msg.len != 0)
+					UDPConn::sendAckWithParam(&param);
+
+				cachedConn->pkt_q[j] = NULL;
+			}
+			bin = bin->next;
+			ic_control_info.startupCacheHtab.remove(cachedConn);
+
+			/*
+			 * MPP-19981 free the cached connections; otherwise memory leak
+			 * would be introduced.
+			 */
+			ic_free(cachedConn->pkt_q);
+			delete cachedConn;
+		}
+	}
+}
+
+/*
+ * CChunkTransportStateImpl::setup
+ * 		Internal function for setting up UDP interconnect.
+ */
+ICChunkTransportState*
+CChunkTransportStateImpl::setup(ICSliceTable *sliceTable)
+{
+	pthread_mutex_lock(&ic_control_info.lock);
+
+	Assert(sliceTable->ic_instance_id > 0);
+
+	if (global_param.Gp_role == GP_ROLE_DISPATCH_IC)
+	{
+		/*
+		 * QD use cursorHistoryTable to handle mismatch packets, no
+		 * need to update ic_control_info.ic_instance_id
+		 */
+		Assert(session_param.gp_interconnect_id == sliceTable->ic_instance_id);
+	}
+	else
+	{
+		/*
+		 * update ic_control_info.ic_instance_id, it is mainly used
+		 * by rx thread to handle mismatch packets
+		 */
+		ic_control_info.ic_instance_id = sliceTable->ic_instance_id;
+	}
+
+	CChunkTransportStateImpl *state_impl = new CChunkTransportStateImpl(sliceTable);
+	ICChunkTransportState *interconnect_context = static_cast<ICChunkTransportState*>(state_impl);
+	CChunkTransportStateImpl::state_ = static_cast<CChunkTransportState*>(state_impl);
+
+#ifdef USE_ASSERT_CHECKING
+	ICExecSlice *mySlice = &interconnect_context->sliceTable->slices[sliceTable->localSlice];
+	Assert(mySlice && mySlice->sliceIndex == sliceTable->localSlice);
+#endif
+
+#ifdef USE_ASSERT_CHECKING
+	set_test_mode();
+#endif
+
+	if (global_param.Gp_role == GP_ROLE_DISPATCH_IC)
+	{
+		CursorICHistoryTable *ich_table = &rx_control_info.cursorHistoryTable;
+		//DistributedTransactionId distTransId = getDistributedTransactionId(); TODO: add callback;
+		DistributedTransactionId distTransId = InvalidTransactionId;
+
+       if (ich_table->count > (2 * ich_table->size))
+       {
+           /*
+            * distTransId != lastDXatId
+            * Means the last transaction is finished, it's ok to make a prune.
+            */
+            if (distTransId != rx_control_info.lastDXatId)
+            {
+                if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+                    LOG(DEBUG1, "prune cursor history table (count %d), icid %d, prune_id %d",
+                        ich_table->count, sliceTable->ic_instance_id, sliceTable->ic_instance_id);
+			   ich_table->prune(sliceTable->ic_instance_id);
+            }
+            /*
+             * distTransId == lastDXatId and they are not InvalidTransactionId(0)
+             * Means current (non Read-Only) transaction isn't finished, should not prune.
+             */
+            else if (rx_control_info.lastDXatId != InvalidTransactionId)
+            {
+                ;
+            }
+            /*
+             * distTransId == lastDXatId and they are InvalidTransactionId(0)
+             * Means they are the same transaction or different Read-Only transactions.
+             *
+             * For the latter, it's hard to get a perfect timepoint to prune: prune eagerly may
+             * cause problems (pruned current Txn's Ic instances), but prune in low frequency
+             * causes memory leak.
+             *
+             * So, we choose a simple algorithm to prune it here. And if it mistakenly prune out
+             * the still-in-used Ic instance (with lower id), the query may hang forever.
+             * Then user have to set a bigger gp_interconnect_cursor_ic_table_size value and
+             * try the query again, it is a workaround.
+             *
+             * More backgrounds please see: https://github.com/greenplum-db/gpdb/pull/16458
+             */
+            else
+            {
+                if (sliceTable->ic_instance_id > ich_table->size)
+                {
+                    uint32 prune_id = sliceTable->ic_instance_id - ich_table->size;
+                    Assert(prune_id < sliceTable->ic_instance_id);
+ 
+                    if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+                        LOG(DEBUG1, "prune cursor history table (count %d), icid %d, prune_id %d",
+                            ich_table->count, sliceTable->ic_instance_id, prune_id);
+                    ich_table->prune(prune_id);
+               }
+			}
+		}
+
+		ich_table->add(sliceTable->ic_instance_id, session_param.gp_command_count);
+		/* save the latest transaction id */
+		rx_control_info.lastDXatId = distTransId;
+	}
+
+	/* Initiate receiving connections. */
+	state_impl->CreateRecvEntries(sliceTable);
+
+	/* Initiate outgoing connections. */
+	state_impl->CreateSendEntries(sliceTable);
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "SetupUDPInterconnect will activate Listening on ports=%d/%d sockfd=%d.", 0, UDP2_GetListenPortUDP(), UDP_listenerFd);
+
+	/*
+	 * If there are packets cached by background thread, add them to the
+	 * connections.
+	 */
+	if (session_param.gp_interconnect_cache_future_packets)
+		handleCachedPackets();
+
+	interconnect_context->activated = true;
+
+	pthread_mutex_unlock(&ic_control_info.lock);
+
+	return interconnect_context;
+}
+
+/*
+ * sendControlMessage
+ * 		Helper function to send a control message.
+ */
+void
+UDPConn::sendControlMessage(icpkthdr *pkt, int fd, struct sockaddr *addr, socklen_t peerLen)
+{
+	int			n;
+
+#ifdef USE_ASSERT_CHECKING
+	if (testmode_inject_fault(session_param.gp_udpic_dropacks_percent))
+	{
+#ifdef AMS_VERBOSE_LOGGING
+		LOG(INFO, "THROW CONTROL MESSAGE with seq %d extraSeq %d srcpid %d despid %d", pkt->seq, pkt->extraSeq, pkt->srcPid, pkt->dstPid);
+#endif
+		return;
+	}
+#endif
+
+	/* Add CRC for the control message. */
+	if (session_param.gp_interconnect_full_crc)
+		addCRC(pkt);
+
+	/* retry 10 times for sending control message */
+	int counter = 0;
+	while (counter < 10)
+	{
+		counter++;
+		n = sendto(fd, (const char *)pkt, pkt->len, 0, addr, peerLen);
+		if (n < 0)
+		{
+			if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+				continue;
+			else
+			{
+				LOG(INFO, "sendcontrolmessage: got errno %d", errno);
+				return;
+			}
+		}
+		break;
+	}
+	if (n < int(pkt->len))
+		LOG(INFO, "sendcontrolmessage: got error %d errno %d seq %d", n, errno, pkt->seq);
+}
+
+/*
+ * setAckParam
+ * 		Set the ack sending parameters.
+ */
+void
+UDPConn::setAckParam(AckSendParam *param, int32 flags, uint32 seq, uint32 extraSeq)
+{
+	memcpy(&param->msg, (char *) &this->conn_info, sizeof(icpkthdr));
+	param->msg.flags = flags;
+	param->msg.seq   = seq;
+	param->msg.extraSeq = extraSeq;
+	param->msg.len   = sizeof(icpkthdr);
+	param->peer      = this->peer;
+	param->peer_len  = this->peer_len;
+}
+
+/*
+ * sendAckWithParam
+ * 		Send acknowledgment to sender.
+ */
+void
+UDPConn::sendAckWithParam(AckSendParam *param)
+{
+	sendControlMessage(&param->msg, UDP_listenerFd, (struct sockaddr *) &param->peer, param->peer_len);
+}
+
+/*
+ * sendAck
+ * 		Send acknowledgment to sender.
+ */
+void
+UDPConn::sendAck(int32 flags, uint32 seq, uint32 extraSeq)
+{
+	icpkthdr	msg;
+
+	memcpy(&msg, (char *) &this->conn_info, sizeof(msg));
+	msg.flags = flags;
+	msg.seq   = seq;
+	msg.extraSeq = extraSeq;
+	msg.len = sizeof(icpkthdr);
+
+	LOG(DEBUG1, "sendack: node %d route %d seq %d extraSeq %d, flags %s", msg.motNodeId, this->route, msg.seq, msg.extraSeq, flags2txt(msg.flags));
+
+	sendControlMessage(&msg, UDP_listenerFd, (struct sockaddr *) &this->peer, this->peer_len);
+}
+
+/*
+ * sendDisorderAck
+ *		Send a disorder message to the sender.
+ *
+ * Whenever the receiver detects a disorder packet, it will assemble a disorder message
+ * which contains the sequence numbers of the possibly lost packets.
+ *
+ */
+void
+UDPConn::sendDisorderAck(uint32 seq, uint32 extraSeq, uint32 lostPktCnt)
+{
+	icpkthdr   *disorderBuffer = rx_control_info.disorderBuffer;
+
+	memcpy(disorderBuffer, (char *) &this->conn_info, sizeof(icpkthdr));
+
+	disorderBuffer->flags |= UDPIC_FLAGS_DISORDER;
+	disorderBuffer->seq = seq;
+	disorderBuffer->extraSeq = extraSeq;
+	disorderBuffer->len = lostPktCnt * sizeof(uint32) + sizeof(icpkthdr);
+
+#ifdef AMS_VERBOSE_LOGGING
+	if (!(this->peer.ss_family == AF_INET || this->peer.ss_family == AF_INET6))
+	{
+		LOG(INFO, "UDP Interconnect bug (in sendDisorderAck): trying to send ack when we don't know where to send to %s", this->remoteHostAndPort);
+	}
+#endif
+
+	sendControlMessage(disorderBuffer, UDP_listenerFd, (struct sockaddr *) &this->peer, this->peer_len);
+}
+
+/*
+ * sendStatusQueryMessage
+ *		Used by senders to send a status query message for a connection to receivers.
+ *
+ * When receivers get such a message, they will respond with
+ * the connection status (consumed seq, received seq ...).
+ */
+void
+UDPConn::sendStatusQueryMessage(uint32 seq)
+{
+	icpkthdr	msg;
+
+	memcpy(&msg, (char *) &this->conn_info, sizeof(msg));
+	msg.flags = UDPIC_FLAGS_CAPACITY;
+	msg.seq = seq;
+	msg.extraSeq = 0;
+	msg.len = sizeof(msg);
+
+#ifdef TRANSFER_PROTOCOL_STATS
+	trans_proto_stats.update(TPE_ACK_PKT_QUERY, &msg);
+#endif
+
+	sendControlMessage(&msg, entry_->txfd, (struct sockaddr *) &this->peer, this->peer_len);
+}
+
+/*
+ * ReleaseBuffer
+ * 		Return a buffer and send an acknowledgment.
+ *
+ *  SHOULD BE CALLED WITH ic_control_info.lock *LOCKED*
+ */
+void
+UDPConn::ReleaseBuffer(AckSendParam *param)
+{
+	icpkthdr   *buf;
+	uint32		seq;
+
+	buf = (icpkthdr *) this->pkt_q[this->pkt_q_head];
+	if (buf == NULL)
+	{
+		pthread_mutex_unlock(&ic_control_info.lock);
+		throw ICFatalException("FATAL: ReleaseBuffer: buffer is NULL", __FILE__, __LINE__);
+	}
+
+	seq = buf->seq;
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "LOG: ReleaseBuffer conn %p pkt [seq %d] for node %d route %d, [head seq] %d queue size %d, queue head %d queue tail %d",
+			  this, seq, buf->motNodeId, this->route, this->conn_info.seq - this->pkt_q_size, this->pkt_q_size, this->pkt_q_head, this->pkt_q_tail);
+#endif
+
+	this->pkt_q[this->pkt_q_head] = NULL;
+	this->pBuff = NULL;
+	this->pkt_q_head = (this->pkt_q_head + 1) % this->pkt_q_capacity;
+	this->pkt_q_size--;
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "LOG: ReleaseBuffer conn %p pkt [seq %d] for node %d route %d, [head seq] %d queue size %d, queue head %d queue tail %d",
+			  this, seq, buf->motNodeId, this->route, this->conn_info.seq - this->pkt_q_size, this->pkt_q_size, this->pkt_q_head, this->pkt_q_tail);
+#endif
+
+	rx_buffer_pool.put(buf);
+	this->conn_info.extraSeq = seq;
+
+	/* Send an Ack to the sender. */
+	if ((seq % 2 == 0) || (this->pkt_q_capacity == 1))
+	{
+		if (param != NULL)
+		{
+			this->setAckParam(param, UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY | this->conn_info.flags, this->conn_info.seq - 1, seq);
+		}
+		else
+		{
+			this->sendAck(UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY | this->conn_info.flags, this->conn_info.seq - 1, seq);
+		}
+	}
+}
+
+/*
+ * computeExpirationPeriod
+ * 		Compute expiration period according to the connection information.
+ *
+ * Considerations on expiration period computation:
+ *
+ * RTT is dynamically computed, and expiration period is based on RTT values.
+ * We cannot simply use RTT as the expiration value, since real workload does
+ * not always have a stable RTT. A small constant value is multiplied to the RTT value
+ * to make the resending logic insensitive to the frequent small changes of RTT.
+ *
+ */
+uint64
+UDPConn::computeExpirationPeriod(uint32 retry)
+{
+	/*
+	 * In fault injection mode, we often use DEFAULT_RTT, because the
+	 * intentional large percent of packet/ack losses will make the RTT too
+	 * large. This will lead to a slow retransmit speed. In real hardware
+	 * environment/workload, we do not expect such a packet loss pattern.
+	 */
+#ifdef USE_ASSERT_CHECKING
+	if (udp_testmode)
+	{
+		return DEFAULT_RTT;
+	}
+	else
+#endif
+	{
+		if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+			return Min(retry > 3 ? this->rttvar.rto * retry : this->rttvar.rto, UNACK_QUEUE_RING_LENGTH_LOSS);
+
+		uint32 factor = (retry <= 12 ? retry : 12);
+		return Max(MIN_EXPIRATION_PERIOD, Min(MAX_EXPIRATION_PERIOD, (int)(this->rtt + (this->dev << 2)) << (factor)));
+	}
+}
+
+/*
+ * freeDisorderedPackets
+ * 		Put the disordered packets into free buffer list.
+ */
+void
+UDPConn::freeDisorderedPackets()
+{
+	uint32		k;
+
+	if (this->pkt_q == NULL)
+		return;
+
+	for (k = 0; k < this->pkt_q_capacity; k++)
+	{
+		icpkthdr   *buf = (icpkthdr *)this->pkt_q[k];
+
+		if (buf != NULL)
+		{
+			if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+				LOG(DEBUG1, "CLEAR Out-of-order PKT: conn %p pkt [seq %d] for node %d route %d, "
+							"[head seq] %d queue size %d, queue head %d queue tail %d",
+							this, buf->seq, buf->motNodeId, this->route, this->conn_info.seq - this->pkt_q_size,
+							this->pkt_q_size, this->pkt_q_head, this->pkt_q_tail);
+
+			/* return the buffer into the free list. */
+			rx_buffer_pool.put(buf);
+			this->pkt_q[k] = NULL;
+		}
+	}
+}
+
+/*
+ * prepareRxConnForRead
+ * 		Prepare the receive connection for reading.
+ *
+ * MUST BE CALLED WITH ic_control_info.lock LOCKED.
+ */
+void
+UDPConn::prepareRxConnForRead()
+{
+	LOG(DEBUG3, "In prepareRxConnForRead: conn %p, q_head %d q_tail %d q_size %d",
+			this, this->pkt_q_head, this->pkt_q_tail, this->pkt_q_size);
+
+	Assert(this->pkt_q[this->pkt_q_head] != NULL);
+	this->pBuff     = this->pkt_q[this->pkt_q_head];
+	this->msgPos    = this->pBuff;
+	this->msgSize   = ((icpkthdr *) this->pBuff)->len;
+	this->recvBytes = this->msgSize;
+}
+
+/*
+ * DeactiveConn
+ * 		Mark the connection inactive.
+ */
+void
+UDPConn::DeactiveConn()
+{
+	pthread_mutex_lock(&ic_control_info.lock);
+	this->stillActive = false;
+	pthread_mutex_unlock(&ic_control_info.lock);
+}
+
+/*
+ * handleAckedPacket
+ * 		Called by sender to process acked packet.
+ *
+ * 	Remove it from unack queue and unack queue ring, change the rtt ...
+ *
+ * 	RTT (Round Trip Time) is computed as the time between we send the packet
+ * 	and receive the acknowledgement for the packet. When an acknowledgement
+ * 	is received, an estimated RTT value (called SRTT, smoothed RTT) is updated
+ * 	by using the following equation. And we also set a limitation of the max
+ * 	value and min value for SRTT.
+ *	    (1) SRTT = (1 - g) SRTT + g x RTT (0 < g < 1)
+ *	where RTT is the measured round trip time of the packet. In implementation,
+ *	g is set to 1/8. In order to compute expiration period, we also compute an
+ *	estimated delay variance SDEV by using:
+ *	    (2) SDEV = (1 - h) x SDEV + h x |SERR| (0 < h < 1, In implementation, h is set to 1/4)
+ *	where SERR is calculated by using:
+ *	    (3) SERR = RTT - SRTT
+ *	Expiration period determines the timing we resend a packet. A long RTT means
+ *	a long expiration period. Delay variance is used to incorporate the variance
+ *	of workload/network variances at different time. When a packet is retransmitted,
+ *	we back off exponentially the expiration period.
+ *	    (4) exp_period = (SRTT + y x SDEV) << retry
+ *	Here y is a constant (In implementation, we use 4) and retry is the times the
+ *	packet is retransmitted.
+ */
+void
+UDPConn::handleAckedPacket(ICBuffer *buf, uint64 now, struct icpkthdr *pkt)
+{
+	uint64		ackTime = 0;
+	bool		bufIsHead = false; 
+	UDPConn *bufConn = NULL;
+
+	bufIsHead = (&buf->primary == this->unackQueue.first());
+
+	buf = this->unackQueue.remove(buf);
+
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC || session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER_IC)
+	{
+		bufConn = static_cast<UDPConn*>(buf->conn);
+		buf = unack_queue_ring.slots[buf->unackQueueRingSlot].remove(buf);
+		unack_queue_ring.numOutStanding--;
+		if (this->unackQueue.length() >= 1)
+		unack_queue_ring.numSharedOutStanding--;
+
+		ackTime = now - buf->sentTime;
+
+		if (buf->nRetry == 0)
+		{
+			/* adjust the congestion control window. */
+			if (snd_control_info.cwnd < snd_control_info.ssthresh)
+				snd_control_info.cwnd += 2;
+			else
+				snd_control_info.cwnd += 1 / snd_control_info.cwnd;
+			snd_control_info.cwnd = Min(snd_control_info.cwnd, snd_buffer_pool.maxCount);
+		}
+
+		if ((bufConn->rttvar.rto << 1) > ackTime && pkt->retry_times != session_param.Gp_interconnect_min_retries_before_timeout)
+			estimateRTT(bufConn, (now - pkt->send_time));
+
+		if (buf->nRetry && pkt->retry_times > 0 && pkt->retry_times < session_param.Gp_interconnect_min_retries_before_timeout)
+			bufConn->rttvar.rto += (bufConn->rttvar.rto >> 4 * buf->nRetry);
+
+		if (unlikely(session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER_IC))
+		{
+			bufConn->sndvar.ts_rto = bufConn->rttvar.rto;
+			addtoRTOList(&mudp, bufConn);
+		}
+	}
+
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_IC)
+	{
+		ICBufferList *alist = &unack_queue_ring.slots[buf->unackQueueRingSlot];
+		buf = alist->remove(buf);
+		unack_queue_ring.numOutStanding--;
+		if (this->unackQueue.length() >= 1)
+			unack_queue_ring.numSharedOutStanding--;
+
+		ackTime = now - buf->sentTime;
+
+		/*
+		 * In udp_testmode, we do not change rtt dynamically due to the large
+		 * number of packet losses introduced by fault injection code. This
+		 * can decrease the testing time.
+		 */
+#ifdef USE_ASSERT_CHECKING
+		if (!udp_testmode)
+#endif
+		{
+			uint64		newRTT = 0;
+			uint64		newDEV = 0;
+
+			if (buf->nRetry == 0)
+			{
+				bufConn = static_cast<UDPConn*>(buf->conn);
+				newRTT = bufConn->rtt - (bufConn->rtt >> RTT_SHIFT_COEFFICIENT) + (ackTime >> RTT_SHIFT_COEFFICIENT);
+				newRTT = Min(MAX_RTT, Max(newRTT, MIN_RTT));
+				bufConn->rtt = newRTT;
+
+				newDEV = bufConn->dev - (bufConn->dev >> DEV_SHIFT_COEFFICIENT) + ((Max(ackTime, newRTT) - Min(ackTime, newRTT)) >> DEV_SHIFT_COEFFICIENT);
+				newDEV = Min(MAX_DEV, Max(newDEV, MIN_DEV));
+				bufConn->dev = newDEV;
+
+				/* adjust the congestion control window. */
+				if (snd_control_info.cwnd < snd_control_info.ssthresh)
+					snd_control_info.cwnd += 1;
+				else
+					snd_control_info.cwnd += 1 / snd_control_info.cwnd;
+				snd_control_info.cwnd = Min(snd_control_info.cwnd, snd_buffer_pool.maxCount);
+			}
+		}
+	}
+
+	bufConn = static_cast<UDPConn*>(buf->conn);
+	bufConn->stat_total_ack_time += ackTime;
+	bufConn->stat_max_ack_time = Max(ackTime, bufConn->stat_max_ack_time);
+	bufConn->stat_min_ack_time = Min(ackTime, bufConn->stat_min_ack_time);
+
+	/*
+	 * only change receivedAckSeq when it is the smallest pkt we sent and have
+	 * not received ack for it.
+	 */
+	if (bufIsHead)
+		this->receivedAckSeq = buf->pkt->seq;
+
+	/* The first packet acts like a connect setup packet */
+	if (buf->pkt->seq == 1)
+		this->state = mcsStarted;
+
+	snd_buffer_pool.freeList.append(buf);
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "REMOVEPKT %d from unack queue for route %d (retry %d) sndbufmaxcount %d sndbufcount %d "
+			  "sndbuffreelistlen %d, sntSeq %d consumedSeq %d recvAckSeq %d capacity %d, sndQ %d, unackQ %d",
+			  buf->pkt->seq, this->route, buf->nRetry, snd_buffer_pool.maxCount, snd_buffer_pool.count,
+			  snd_buffer_pool.freeList.length(), bufConn->sentSeq, bufConn->consumedSeq,
+			  bufConn->receivedAckSeq, bufConn->capacity, bufConn->sndQueue.length(),
+			  bufConn->unackQueue.length());
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+	{
+		bufConn->unackQueue.icBufferListLog();
+		bufConn->sndQueue.icBufferListLog();
+	}
+#endif
+}
+
+/*
+ * dispatcherAYT
+ * 		Check the connection from the dispatcher to verify that it is still there.
+ *
+ * The connection is a struct Port, stored in the global MyProcPort.
+ *
+ * Return true if the dispatcher connection is still alive.
+ */
+static bool
+dispatcherAYT(void)
+{
+	ssize_t		ret;
+	char		buf;
+
+	/*
+	 * For background worker or auxiliary process like gdd, there is no client.
+	 * As a result, MyProcPort is NULL. We should skip dispatcherAYT check here.
+	 */
+	if (global_param.MyProcPort == false)
+		return true;
+
+	if (global_param.myprocport_sock < 0)
+		return false;
+
+#ifndef WIN32
+	ret = recv(global_param.myprocport_sock, &buf, 1, MSG_PEEK | MSG_DONTWAIT);
+#else
+	ret = recv(global_param.myprocport_sock, &buf, 1, MSG_PEEK | MSG_PARTIAL);
+#endif
+
+	if (ret == 0)				/* socket has been closed. EOF */
+		return false;
+
+	if (ret > 0)				/* data waiting on socket, it must be OK. */
+		return true;
+
+	if (ret == -1)				/* error, or would be block. */
+	{
+		if (errno == EAGAIN || errno == EINPROGRESS)
+			return true;		/* connection intact, no data available */
+		else
+			return false;
+	}
+	/* not reached */
+
+	return true;
+}
+
+/*
+ * checkQDConnectionAlive
+ * 		Check whether QD connection is still alive. If not, report error.
+ */
+static void
+checkQDConnectionAlive(void)
+{
+	if (!dispatcherAYT())
+	{
+		if (global_param.Gp_role == GP_ROLE_EXECUTE_IC)
+			throw ICNetworkException("interconnect error segment lost contact with master (recv)", __FILE__, __LINE__);
+		else
+			throw ICNetworkException("interconnect error master lost contact with client (recv)", __FILE__, __LINE__);
+	}
+}
+
+/*
+ * getCurrentTime
+ * 		get current time
+ *
+ */
+static uint64
+getCurrentTime(void)
+{
+	struct timeval newTime;
+	int			status = 1;
+	uint64		t = 0;
+
+#if HAVE_LIBRT
+	/* Use clock_gettime to return monotonic time value. */
+	struct timespec ts;
+
+	status = clock_gettime(CLOCK_MONOTONIC, &ts);
+
+	newTime.tv_sec = ts.tv_sec;
+	newTime.tv_usec = ts.tv_nsec / 1000;
+
+#endif
+
+	if (status != 0)
+		gettimeofday(&newTime, NULL);
+
+	t = ((uint64) newTime.tv_sec) * USECS_PER_SECOND + newTime.tv_usec;
+	return t;
+}
+
+/*
+ * putIntoUnackQueueRing
+ * 		Put the buffer into the ring.
+ *
+ * expTime - expiration time from now
+ *
+ */
+static void
+putIntoUnackQueueRing(UnackQueueRing *uqr, ICBuffer *buf, uint64 expTime, uint64 now)
+{
+	UDPConn *buffConn = static_cast<UDPConn*>(buf->conn);
+	uint64		diff = 0;
+	int			idx = 0;
+	
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+	{
+		/* The first packet, currentTime is not initialized */
+#ifndef TIMEOUT_Z
+		if (uqr->currentTime == 0)
+			uqr->currentTime = now - (now % TIMER_SPAN_LOSS);
+#else
+		if (uqr->currentTime == 0 && buffConn->rttvar.rto == 0)
+			uqr->currentTime = now - (now % TIMER_SPAN_LOSS);
+		else
+			uqr->currentTime = now + buffConn->rttvar.rto;
+
+#endif
+		diff = expTime;
+		if (diff >= UNACK_QUEUE_RING_LENGTH_LOSS)
+		{
+#ifdef AMS_VERBOSE_LOGGING
+			LOG(INFO, "putIntoUnackQueueRing:" "now " UINT64_FORMAT "expTime " UINT64_FORMAT "diff " UINT64_FORMAT "uqr-currentTime " UINT64_FORMAT, now, expTime, diff, uqr->currentTime);
+#endif
+			diff = UNACK_QUEUE_RING_LENGTH_LOSS - 1;
+		}
+		else if (diff < TIMER_SPAN_LOSS)
+		{
+			diff = diff < TIMER_SPAN_LOSS ? TIMER_SPAN_LOSS : diff;
+		}
+	}
+	else
+	{
+		if (uqr->currentTime == 0)
+		uqr->currentTime = now - (now % TIMER_SPAN_LOSS);
+
+		diff = now + expTime - uqr->currentTime;
+		if (diff >= UNACK_QUEUE_RING_LENGTH)
+		{
+#ifdef AMS_VERBOSE_LOGGING
+			LOG(INFO, "putIntoUnackQueueRing:" "now " UINT64_FORMAT "expTime " UINT64_FORMAT "diff " UINT64_FORMAT "uqr-currentTime " UINT64_FORMAT, now, expTime, diff, uqr->currentTime);
+#endif
+			diff = UNACK_QUEUE_RING_LENGTH - 1;
+		}
+		else if (diff < TIMER_SPAN)
+		{
+			diff = TIMER_SPAN;
+		}
+
+		idx = (uqr->idx + diff / TIMER_SPAN) % UNACK_QUEUE_RING_SLOTS_NUM;
+
+#ifdef AMS_VERBOSE_LOGGING
+		LOG(INFO, "PUTTW: curtime " UINT64_FORMAT " now " UINT64_FORMAT " (diff " UINT64_FORMAT ") expTime " UINT64_FORMAT " previdx %d, nowidx %d, nextidx %d", uqr->currentTime, now, diff, expTime, buf->unackQueueRingSlot, uqr->idx, idx);
+#endif
+	}
+
+	idx = (uqr->idx + diff / TIMER_SPAN) % UNACK_QUEUE_RING_SLOTS_NUM;
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "PUTTW: curtime %lu now %lu (diff %lu) expTime %lu previdx %d, nowidx %d, nextidx %d", uqr->currentTime, now, diff, expTime, buf->unackQueueRingSlot, uqr->idx, idx);
+#endif
+
+	buf->unackQueueRingSlot = idx;
+	unack_queue_ring.slots[idx].append(buf);
+}
+
+/*
+ * handleDataPacket
+ * 		Handling the data packet.
+ *
+ * On return, will set *wakeup_mainthread, if a packet was received successfully
+ * and the caller should wake up the main thread, after releasing the mutex.
+ */
+static bool
+handleDataPacket(UDPConn *conn, icpkthdr *pkt, struct sockaddr_storage *peer, socklen_t *peerlen,
+				 AckSendParam *param, bool *wakeup_mainthread)
+{
+	if ((pkt->len == sizeof(icpkthdr)) && (pkt->flags & UDPIC_FLAGS_CAPACITY))
+	{
+		if (IC_DEBUG1 >= session_param.log_min_messages)
+			LOG(DEBUG1, "status queuy message received, seq %d, srcpid %d, dstpid %d, icid %d, sid %d",
+					  pkt->seq, pkt->srcPid, pkt->dstPid, pkt->icId, pkt->sessionId);
+
+#ifdef AMS_VERBOSE_LOGGING
+		logPkt("STATUS QUERY MESSAGE", pkt);
+#endif
+		uint32		seq = conn->conn_info.seq > 0 ? conn->conn_info.seq - 1 : 0;
+		uint32		extraSeq = conn->stopRequested ? seq : conn->conn_info.extraSeq;
+
+		conn->setAckParam(param, UDPIC_FLAGS_CAPACITY | UDPIC_FLAGS_ACK | conn->conn_info.flags, seq, extraSeq);
+
+		return false;
+	}
+
+	/*
+	 * when we're not doing a full-setup on every statement, we've got to
+	 * update the peer info -- full setups do this at setup-time.
+	 */
+
+	/*
+	 * Note the change here, for process start race and disordered message, if
+	 * we do not fill in peer address, then we may send some acks to unknown
+	 * address. Thus, the following condition is used.
+	 *
+	 */
+	if (pkt->seq <= conn->pkt_q_capacity)
+	{
+		/* fill in the peer.  Need to cast away "volatile".  ugly */
+		memset((void *) &conn->peer, 0, sizeof(conn->peer));
+		memcpy((void *) &conn->peer, peer, *peerlen);
+		conn->peer_len = *peerlen;
+
+		conn->conn_info.dstListenerPort = pkt->dstListenerPort;
+		if (IC_DEBUG2 >= session_param.log_min_messages)
+			LOG(DEBUG2, "received the head packets when eliding setup, pkt seq %d", pkt->seq);
+	}
+
+	/* data packet */
+	if (pkt->flags & UDPIC_FLAGS_EOS)
+	{
+		if (IC_DEBUG3 >= session_param.log_min_messages)
+			LOG(DEBUG3, "received packet with EOS motid %d route %d seq %d",
+						pkt->motNodeId, conn->route, pkt->seq);
+	}
+
+	/*
+	 * if we got a stop, but didn't request a stop -- ignore, this is a
+	 * startup blip: we must have acked with a stop -- we don't want to do
+	 * anything further with the stop-message if we didn't request a stop!
+	 *
+	 * this is especially important after eliding setup is enabled.
+	 */
+	if (!conn->stopRequested && (pkt->flags & UDPIC_FLAGS_STOP))
+	{
+		if (pkt->flags & UDPIC_FLAGS_EOS)
+		{
+			LOG(INFO, "non-requested stop flag, EOS! seq %d, flags 0x%x", pkt->seq, pkt->flags);
+		}
+		return false;
+	}
+
+	if (conn->stopRequested && conn->stillActive)
+	{
+		if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC && IC_DEBUG5 >= session_param.log_min_messages)
+			LOG(DEBUG5, "rx_thread got packet on active connection marked stopRequested. "
+						"(flags 0x%x) node %d route %d pkt seq %d conn seq %d",
+						pkt->flags, pkt->motNodeId, conn->route, pkt->seq, conn->conn_info.seq);
+
+		/* can we update stillActive ? */
+		if (IC_DEBUG2 >= session_param.log_min_messages)
+			if (!(pkt->flags & UDPIC_FLAGS_STOP) && !(pkt->flags & UDPIC_FLAGS_EOS))
+				LOG(DEBUG2, "stop requested but no stop flag on return packet ?!");
+
+		if (pkt->flags & UDPIC_FLAGS_EOS)
+			conn->conn_info.flags |= UDPIC_FLAGS_EOS;
+
+		if (conn->conn_info.seq < pkt->seq)
+			conn->conn_info.seq = pkt->seq; /* note here */
+
+		conn->setAckParam(param, UDPIC_FLAGS_ACK | UDPIC_FLAGS_STOP | UDPIC_FLAGS_CAPACITY | conn->conn_info.flags, pkt->seq, pkt->seq);
+
+		/* we only update stillActive if eos has been sent by peer. */
+		if (pkt->flags & UDPIC_FLAGS_EOS)
+		{
+			if (IC_DEBUG2 >= session_param.log_min_messages)
+				LOG(DEBUG2, "stop requested and acknowledged by sending peer");
+			conn->stillActive = false;
+		}
+
+		return false;
+	}
+
+	/* dropped ack or timeout */
+	if (pkt->seq < conn->conn_info.seq)
+	{
+		ic_statistics.duplicatedPktNum++;
+		if (IC_DEBUG3 >= session_param.log_min_messages)
+			LOG(DEBUG3, "dropped ack ? ignored data packet w/ cmd %d conn->cmd %d node %d route %d seq %d expected %d flags 0x%x",
+						pkt->icId, conn->conn_info.icId, pkt->motNodeId, conn->route, pkt->seq, conn->conn_info.seq, pkt->flags);
+
+		conn->setAckParam(param, UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY | conn->conn_info.flags, conn->conn_info.seq - 1, conn->conn_info.extraSeq);
+
+		return false;
+	}
+
+	/* sequence number is correct */
+	if (!conn->stillActive)
+	{
+		/* peer may have dropped ack */
+		if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_VERBOSE_IC &&
+			IC_DEBUG1 >= session_param.log_min_messages)
+			LOG(DEBUG1, "received on inactive connection node %d route %d (seq %d pkt->seq %d)",
+						pkt->motNodeId, conn->route, conn->conn_info.seq, pkt->seq);
+
+		if (conn->conn_info.seq < pkt->seq)
+			conn->conn_info.seq = pkt->seq;
+		conn->setAckParam(param, UDPIC_FLAGS_ACK | UDPIC_FLAGS_STOP | UDPIC_FLAGS_CAPACITY | conn->conn_info.flags, pkt->seq, pkt->seq);
+
+		return false;
+	}
+
+	/* headSeq is the seq for the head packet. */
+	uint32		headSeq = conn->conn_info.seq - conn->pkt_q_size;
+
+	if ((conn->pkt_q_size == conn->pkt_q_capacity) || (pkt->seq - headSeq >= conn->pkt_q_capacity))
+	{
+		/*
+		 * Error case: NO RX SPACE or out of range pkt This indicates a bug.
+		 */
+		logPkt("Interconnect error: received a packet when the queue is full ", pkt);
+		ic_statistics.disorderedPktNum++;
+		conn->stat_count_dropped++;
+
+		if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER_IC && rx_control_info.mainWaitingState.waiting &&
+			rx_control_info.mainWaitingState.waitingNode == pkt->motNodeId &&
+			rx_control_info.mainWaitingState.waitingQuery == pkt->icId)
+		{
+			if (rx_control_info.mainWaitingState.waitingRoute == ANY_ROUTE)
+			{
+				if (rx_control_info.mainWaitingState.reachRoute == ANY_ROUTE)
+					rx_control_info.mainWaitingState.reachRoute = conn->route;
+			}
+			else if (rx_control_info.mainWaitingState.waitingRoute == conn->route)
+			{
+				if (IC_DEBUG2 >= session_param.log_min_messages)
+					LOG(INFO, "rx thread: main_waiting waking it route %d", rx_control_info.mainWaitingState.waitingRoute);
+				rx_control_info.mainWaitingState.reachRoute = conn->route;
+			}
+			/* WAKE MAIN THREAD HERE */
+			*wakeup_mainthread = true;
+		}
+
+		if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+		{
+			conn->setAckParam(param, UDPIC_FLAGS_FULL, conn->conn_info.seq - 1, conn->conn_info.extraSeq);
+		}
+		return false;
+	}
+
+	/* put the packet at the his position */
+	bool		toWakeup = false;
+
+	int			pos = (pkt->seq - 1) % conn->pkt_q_capacity;
+
+	if (conn->pkt_q[pos] == NULL)
+	{
+		conn->pkt_q[pos] = (uint8 *) pkt;
+		if (pos == conn->pkt_q_head)
+		{
+#ifdef AMS_VERBOSE_LOGGING
+			LOG(INFO, "SAVE pkt at QUEUE HEAD [seq %d] for node %d route %d, queue head seq %d, queue size %d, queue head %d queue tail %d",
+					  pkt->seq, pkt->motNodeId, conn->route, headSeq, conn->pkt_q_size, conn->pkt_q_head, conn->pkt_q_tail);
+#endif
+			toWakeup = true;
+		}
+
+		if (pos == conn->pkt_q_tail)
+		{
+			/* move the queue tail */
+			for (; conn->pkt_q[conn->pkt_q_tail] != NULL && conn->pkt_q_size < conn->pkt_q_capacity;)
+			{
+				conn->pkt_q_size++;
+				conn->pkt_q_tail = (conn->pkt_q_tail + 1) % conn->pkt_q_capacity;
+				conn->conn_info.seq++;
+			}
+
+			/* set the EOS flag */
+			if (((icpkthdr *) (conn->pkt_q[(conn->pkt_q_tail + conn->pkt_q_capacity - 1) % conn->pkt_q_capacity]))->flags & UDPIC_FLAGS_EOS)
+			{
+				conn->conn_info.flags |= UDPIC_FLAGS_EOS;
+				if (IC_DEBUG1 >= session_param.log_min_messages)
+					LOG(DEBUG1, "RX_THREAD: the packet with EOS flag is available for access in the queue for route %d", conn->route);
+			}
+
+			/* ack data packet */
+			conn->setAckParam(param, UDPIC_FLAGS_CAPACITY | UDPIC_FLAGS_ACK | conn->conn_info.flags, conn->conn_info.seq - 1, conn->conn_info.extraSeq);
+
+#ifdef AMS_VERBOSE_LOGGING
+			LOG(INFO, "SAVE conn %p pkt at QUEUE TAIL [seq %d] at pos [%d] for node %d route %d, [head seq] %d, queue size %d, queue head %d queue tail %d",
+					  conn, pkt->seq, pos, pkt->motNodeId, conn->route, headSeq, conn->pkt_q_size, conn->pkt_q_head, conn->pkt_q_tail);
+#endif
+		}
+		else					/* deal with out-of-order packet */
+		{
+			if (IC_DEBUG1 >= session_param.log_min_messages)
+				LOG(DEBUG1, "SAVE conn %p OUT-OF-ORDER pkt [seq %d] at pos [%d] for node %d route %d, [head seq] %d, queue size %d, queue head %d queue tail %d",
+							conn, pkt->seq, pos, pkt->motNodeId, conn->route, headSeq, conn->pkt_q_size, conn->pkt_q_head, conn->pkt_q_tail);
+
+			/* send an ack for out-of-order packet */
+			ic_statistics.disorderedPktNum++;
+			conn->handleDisorderPacket(pos, headSeq + conn->pkt_q_size, pkt);
+		}
+	}
+	else						/* duplicate pkt */
+	{
+		if (IC_DEBUG1 >= session_param.log_min_messages)
+			LOG(DEBUG1, "DUPLICATE pkt [seq %d], [head seq] %d, queue size %d, queue head %d queue tail %d",
+						pkt->seq, headSeq, conn->pkt_q_size, conn->pkt_q_head, conn->pkt_q_tail);
+
+		conn->setAckParam(param, UDPIC_FLAGS_DUPLICATE | conn->conn_info.flags, pkt->seq, conn->conn_info.seq - 1);
+		ic_statistics.duplicatedPktNum++;
+		return false;
+	}
+
+	/* Was the main thread waiting for something ? */
+	if (rx_control_info.mainWaitingState.waiting &&
+		rx_control_info.mainWaitingState.waitingNode == pkt->motNodeId &&
+		rx_control_info.mainWaitingState.waitingQuery == pkt->icId && toWakeup)
+	{
+		if (rx_control_info.mainWaitingState.waitingRoute == ANY_ROUTE)
+		{
+			if (rx_control_info.mainWaitingState.reachRoute == ANY_ROUTE)
+				rx_control_info.mainWaitingState.reachRoute = conn->route;
+		}
+		else if (rx_control_info.mainWaitingState.waitingRoute == conn->route)
+		{
+			if (IC_DEBUG2 >= session_param.log_min_messages)
+				LOG(DEBUG2, "rx thread: main_waiting waking it route %d", rx_control_info.mainWaitingState.waitingRoute);
+			rx_control_info.mainWaitingState.reachRoute = conn->route;
+		}
+		/* WAKE MAIN THREAD HERE */
+		*wakeup_mainthread = true;
+	}
+
+	return true;
+}
+
+/*
+ * rxThreadFunc
+ * 		Main function of the receive background thread.
+ *
+ * NOTE: This function MUST NOT contain elog or ereport statements.
+ * elog is NOT thread-safe.  Developers should instead use something like:
+ *
+ * NOTE: In threads, we cannot use palloc/pfree, because it's not thread safe.
+ */
+static void *
+rxThreadFunc(void *arg)
+{
+	icpkthdr   *pkt = NULL;
+	bool		skip_poll = false;
+
+	for (;;)
+	{
+		struct pollfd nfd;
+		int			n;
+
+		/* check shutdown condition */
+		if (ic_atomic_read_u32(&ic_control_info.shutdown) == 1)
+		{
+			if (IC_DEBUG1 >= session_param.log_min_messages)
+				LOG(DEBUG1, "udp-ic: rx-thread shutting down");
+			break;
+		}
+
+		/* Try to get a buffer */
+		if (pkt == NULL)
+		{
+			pthread_mutex_lock(&ic_control_info.lock);
+			pkt = rx_buffer_pool.get();
+			pthread_mutex_unlock(&ic_control_info.lock);
+
+			if (pkt == NULL)
+			{
+				setRxThreadError(ENOMEM);
+				continue;
+			}
+		}
+
+		if (!skip_poll)
+		{
+			/* Do we have inbound traffic to handle ? */
+			nfd.fd = UDP_listenerFd;
+			nfd.events = POLLIN;
+
+			n = poll(&nfd, 1, RX_THREAD_POLL_TIMEOUT);
+
+			if (ic_atomic_read_u32(&ic_control_info.shutdown) == 1)
+			{
+				if (IC_DEBUG1 >= session_param.log_min_messages)
+					LOG(DEBUG1, "udp-ic: rx-thread shutting down");
+				break;
+			}
+
+			if (n < 0)
+			{
+				if (errno == EINTR)
+					continue;
+
+				/*
+				 * ERROR case: if simply break out the loop here, there will
+				 * be a hung here, since main thread will never be waken up,
+				 * and senders will not get responses anymore.
+				 *
+				 * Thus, we set an error flag, and let main thread to report
+				 * an error.
+				 */
+				setRxThreadError(errno);
+				continue;
+			}
+
+			if (n == 0)
+				continue;
+		}
+
+		if (skip_poll || (n == 1 && (nfd.events & POLLIN)))
+		{
+			/* we've got something interesting to read */
+			/* handle incoming */
+			/* ready to read on our socket */
+			int read_count = 0;
+
+			struct sockaddr_storage peer;
+			socklen_t	peerlen;
+
+			peerlen = sizeof(peer);
+			read_count = recvfrom(UDP_listenerFd, (char *) pkt, global_param.Gp_max_packet_size, 0,
+								  (struct sockaddr *) &peer, &peerlen);
+
+			if (ic_atomic_read_u32(&ic_control_info.shutdown) == 1)
+			{
+				if (IC_DEBUG1 >= session_param.log_min_messages)
+					LOG(DEBUG1, "udp-ic: rx-thread shutting down");
+				break;
+			}
+
+			if (IC_DEBUG5 >= session_param.log_min_messages)
+				LOG(DEBUG5, "received inbound len %d", read_count);
+
+			if (read_count < 0)
+			{
+				skip_poll = false;
+
+				if (errno == EWOULDBLOCK || errno == EINTR)
+					continue;
+
+				LOG(LOG_ERROR, "Interconnect error: recvfrom (%d)", errno);
+
+				/*
+				 * ERROR case: if simply break out the loop here, there will
+				 * be a hung here, since main thread will never be waken up,
+				 * and senders will not get responses anymore.
+				 *
+				 * Thus, we set an error flag, and let main thread to report
+				 * an error.
+				 */
+				setRxThreadError(errno);
+				continue;
+			}
+
+			if (static_cast<unsigned long>(read_count) < sizeof(icpkthdr))
+			{
+				if (IC_DEBUG1 >= session_param.log_min_messages)
+					LOG(DEBUG1, "Interconnect error: short conn receive (%d)", read_count);
+				continue;
+			}
+
+			/*
+			 * when we get a "good" recvfrom() result, we can skip poll()
+			 * until we get a bad one.
+			 */
+			skip_poll = true;
+
+			/* length must be >= 0 */
+			if (pkt->len < 0)
+			{
+				if (IC_DEBUG3 >= session_param.log_min_messages)
+					LOG(DEBUG3, "received inbound with negative length");
+				continue;
+			}
+
+			if (pkt->len != static_cast<unsigned int>(read_count))
+			{
+				if (IC_DEBUG3 >= session_param.log_min_messages)
+					LOG(DEBUG3, "received inbound packet [%d], short: read %d bytes, pkt->len %d", pkt->seq, read_count, pkt->len);
+				continue;
+			}
+
+			/*
+			 * check the CRC of the payload.
+			 */
+			if (session_param.gp_interconnect_full_crc)
+			{
+				if (!checkCRC(pkt))
+				{
+					ic_atomic_add_fetch_u32((ic_atomic_uint32 *) &ic_statistics.crcErrors, 1);
+					if (IC_DEBUG2 >= session_param.log_min_messages)
+						LOG(DEBUG2, "received network data error, dropping bad packet, user data unaffected.");
+					continue;
+				}
+			}
+
+#ifdef AMS_VERBOSE_LOGGING
+			logPkt("GOT MESSAGE", pkt);
+#endif
+
+			bool		wakeup_mainthread = false;
+			AckSendParam param;
+
+			memset(&param, 0, sizeof(AckSendParam));
+
+			/*
+			 * Get the connection for the pkt.
+			 *
+			 * The connection hash table should be locked until finishing the
+			 * processing of the packet to avoid the connection
+			 * addition/removal from the hash table during the mean time.
+			 */
+			pthread_mutex_lock(&ic_control_info.lock);
+			UDPConn *conn = ic_control_info.connHtab.find(pkt);
+			if (conn != NULL)
+			{
+				uint64          now = getCurrentTime();
+				uint64 send_time = pkt->send_time;
+				uint64 recv_time = now;
+				uint64 retry_times = pkt->retry_times;
+
+				bool drop_ack = pkt->seq < conn->conn_info.seq ? true : false;
+				/* Handling a regular packet */
+				if (handleDataPacket(conn, pkt, &peer, &peerlen, &param, &wakeup_mainthread))
+					pkt = NULL;
+				if (!pkt)
+				{
+					param.msg.send_time = send_time;
+					param.msg.recv_time = recv_time;
+					param.msg.retry_times = retry_times;
+				}
+				if (drop_ack)
+					param.msg.retry_times = session_param.Gp_interconnect_min_retries_before_timeout;
+				ic_statistics.recvPktNum++;
+			}
+			else
+			{
+				/*
+				 * There may have two kinds of Mismatched packets: a) Past
+				 * packets from previous command after I was torn down b)
+				 * Future packets from current command before my connections
+				 * are built.
+				 *
+				 * The handling logic is to "Ack the past and Nak the future".
+				 */
+				if ((pkt->flags & UDPIC_FLAGS_RECEIVER_TO_SENDER) == 0)
+				{
+					if (IC_DEBUG1 >= session_param.log_min_messages)
+						LOG(DEBUG1, "mismatched packet received, seq %d, srcpid %d, dstpid %d, icid %d, sid %d",
+									pkt->seq, pkt->srcPid, pkt->dstPid, pkt->icId, pkt->sessionId);
+
+#ifdef AMS_VERBOSE_LOGGING
+					logPkt("Got a Mismatched Packet", pkt);
+#endif
+
+					if (handleMismatch(pkt, &peer, peerlen))
+						pkt = NULL;
+					ic_statistics.mismatchNum++;
+				}
+			}
+			pthread_mutex_unlock(&ic_control_info.lock);
+
+			if (wakeup_mainthread) {
+				cv.notify_one();
+			}
+
+			/*
+			 * real ack sending is after lock release to decrease the lock
+			 * holding time.
+			 */
+			if (param.msg.len != 0)
+				UDPConn::sendAckWithParam(&param);
+		}
+
+		/* pthread_yield(); */
+	}
+
+	/* Before return, we release the packet. */
+	if (pkt)
+	{
+		pthread_mutex_lock(&ic_control_info.lock);
+		rx_buffer_pool.release(pkt);
+		pkt = NULL;
+		pthread_mutex_unlock(&ic_control_info.lock);
+	}
+
+	/* nothing to return */
+	return NULL;
+}
+
+/*
+ * handleMismatch
+ * 		If the mismatched packet is from an old connection, we may need to
+ * 		send an acknowledgment.
+ *
+ * We are called with the receiver-lock held, and we never release it.
+ *
+ * For QD:
+ * 1) Not in hashtable     : NAK it/Do nothing
+ * 	  Causes:  a) Start race
+ * 	           b) Before the entry for the ic instance is inserted, an error happened.
+ * 	           c) From past transactions: should no happen.
+ * 2) Active in hashtable  : NAK it/Do nothing
+ *    Causes:  a) Error reported after the entry is inserted, and connections are
+ *                not inserted to the hashtable yet, and before teardown is called.
+ * 3) Inactive in hashtable: ACK it (with stop)
+ *    Causes: a) Normal execution: after teardown is called on current command.
+ *            b) Error case, 2a) after teardown is called.
+ *            c) Normal execution: from past history transactions (should not happen).
+ *
+ * For QE:
+ * 1) pkt->id > ic_control_info.ic_instance_id : NAK it/Do nothing
+ *    Causes: a) Start race
+ *            b) Before ic_control_info.ic_instance_id is assigned to correct value, an error happened.
+ * 2) lastTornIcId < pkt->id == ic_control_info.ic_instance_id: NAK it/Do nothing
+ *    Causes:  a) Error reported after ic_control_info.ic_instance_id is set, and connections are
+ *                not inserted to the hashtable yet, and before teardown is called.
+ * 3) lastTornIcId == pkt->id == ic_control_info.ic_instance_id: ACK it (with stop)
+ *    Causes:  a) Normal execution: after teardown is called on current command
+ * 4) pkt->id < ic_control_info.ic_instance_id: NAK it/Do nothing/ACK it.
+ *    Causes:  a) Should not happen.
+ *
+ */
+static bool
+handleMismatch(icpkthdr *pkt, struct sockaddr_storage *peer, int peer_len)
+{
+	bool		cached = false;
+
+	/*
+	 * we want to ack old packets; but *must* avoid acking connection
+	 * requests:
+	 *
+	 * "ACK the past, NAK the future" explicit NAKs aren't necessary, we just
+	 * don't want to ACK future packets, that confuses everyone.
+	 */
+	if (pkt->seq > 0 && pkt->sessionId == session_param.gp_session_id)
+	{
+		bool		need_ack = false;
+		uint8		ack_flags = 0;
+
+		/*
+		 * The QD-backends can't use a counter, they've potentially got
+		 * multiple instances (one for each active cursor)
+		 */
+		if (global_param.Gp_role == GP_ROLE_DISPATCH_IC)
+		{
+			struct CursorICHistoryEntry *p;
+
+			p = rx_control_info.cursorHistoryTable.get(pkt->icId);
+			if (p)
+			{
+				if (p->status == 0)
+				{
+					/* Torn down. Ack the past. */
+					need_ack = true;
+				}
+				else			/* p->status == 1 */
+				{
+					/*
+					 * Not torn down yet. It happens when an error
+					 * (out-of-memory, network error...) occurred after the
+					 * cursor entry is inserted into the table in interconnect
+					 * setup process. The peer will be canceled.
+					 */
+					if (IC_DEBUG1 >= session_param.log_min_messages)
+						LOG(DEBUG1, "GOT A MISMATCH PACKET WITH ID %d HISTORY THINKS IT IS ACTIVE", pkt->icId);
+					return cached;	/* ignore, no ack */
+				}
+			}
+			else
+			{
+				if (IC_DEBUG1 >= session_param.log_min_messages)
+					LOG(DEBUG1, "GOT A MISMATCH PACKET WITH ID %d HISTORY HAS NO RECORD", pkt->icId);
+
+				/*
+				 * No record means that two possibilities. 1) It is from the
+				 * future. It is due to startup race. We do not ack future
+				 * packets 2) Before the entry for the ic instance is
+				 * inserted, an error happened. We do not ack for this case
+				 * too. The peer will be canceled.
+				 */
+				ack_flags = UDPIC_FLAGS_NAK;
+				need_ack = false;
+
+				if (session_param.gp_interconnect_cache_future_packets)
+				{
+					cached = cacheFuturePacket(pkt, peer, peer_len);
+				}
+			}
+		}
+		/* The QEs get to use a simple counter. */
+		else if (global_param.Gp_role == GP_ROLE_EXECUTE_IC)
+		{
+			if (ic_control_info.ic_instance_id >= pkt->icId)
+			{
+				need_ack = true;
+
+				/*
+				 * We want to "ACK the past, but NAK the future."
+				 *
+				 * handleAck() will retransmit.
+				 */
+				if (pkt->seq >= 1 && pkt->icId > rx_control_info.lastTornIcId)
+				{
+					ack_flags = UDPIC_FLAGS_NAK;
+					need_ack = false;
+				}
+			}
+			else
+			{
+				/*
+				 * ic_control_info.ic_instance_id < pkt->icId, from the future
+				 */ 
+				if (session_param.gp_interconnect_cache_future_packets)
+				{
+					cached = cacheFuturePacket(pkt, peer, peer_len);
+				}
+			}
+		}
+
+		if (need_ack)
+		{
+			UDPConn	dummyconn(NULL);
+			char		buf[128];	/* numeric IP addresses shouldn't exceed
+									 * about 50 chars, but play it safe */
+
+			memcpy(&dummyconn.conn_info, pkt, sizeof(icpkthdr));
+			dummyconn.peer = *peer;
+			dummyconn.peer_len = peer_len;
+
+			dummyconn.conn_info.flags |= ack_flags;
+
+			if (IC_DEBUG1 >= session_param.log_min_messages)
+				LOG(DEBUG1, "ACKING PACKET WITH FLAGS: pkt->seq %d 0x%x [pkt->icId %d last-teardown %d interconnect_id %d]",
+							pkt->seq, dummyconn.conn_info.flags, pkt->icId, rx_control_info.lastTornIcId, ic_control_info.ic_instance_id);
+
+			format_sockaddr_udp(&dummyconn.peer, buf, sizeof(buf));
+
+			if (IC_DEBUG1 >= session_param.log_min_messages)
+				LOG(DEBUG1, "ACKING PACKET TO %s", buf);
+
+			if ((ack_flags & UDPIC_FLAGS_NAK) == 0)
+			{
+				ack_flags |= UDPIC_FLAGS_STOP | UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY | UDPIC_FLAGS_RECEIVER_TO_SENDER;
+			}
+			else
+			{
+				ack_flags |= UDPIC_FLAGS_RECEIVER_TO_SENDER;
+			}
+
+			/*
+			 * There are two cases, we may need to send a response to sender
+			 * here. One is start race and the other is receiver becomes idle.
+			 *
+			 * ack_flags here can take two possible values 1) UDPIC_FLAGS_NAK
+			 * | UDPIC_FLAGS_RECEIVER_TO_SENDER (for start race) 2)
+			 * UDPIC_FLAGS_STOP | UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY |
+			 * UDPIC_FLAGS_RECEIVER_TO_SENDER (for idle receiver)
+			 *
+			 * The final flags in the packet may take some extra bits such as
+			 * 1) UDPIC_FLAGS_STOP 2) UDPIC_FLAGS_EOS 3) UDPIC_FLAGS_CAPACITY
+			 * which are from original packet
+			 */
+			dummyconn.sendAck(ack_flags | dummyconn.conn_info.flags, dummyconn.conn_info.seq, dummyconn.conn_info.seq);
+		}
+	}
+	else
+	{
+		if (IC_DEBUG1 >= session_param.log_min_messages)
+			LOG(DEBUG1, "dropping packet from command-id %d seq %d (my cmd %d)", pkt->icId, pkt->seq, ic_control_info.ic_instance_id);
+	}
+
+	return cached;
+}
+
+/*
+ * cacheFuturePacket
+ *		Cache the future packets during the setupUDPIFCInterconnect.
+ *
+ * Return true if packet is cached, otherwise false
+ */
+static bool
+cacheFuturePacket(icpkthdr *pkt, struct sockaddr_storage *peer, int peer_len)
+{
+	UDPConn *conn = ic_control_info.startupCacheHtab.find(pkt);
+	if (conn == NULL)
+	{
+		try {
+			conn = new UDPConn(NULL);
+		} catch (const std::bad_alloc & e) {
+			errno = ENOMEM;
+			setRxThreadError(errno);
+			return false;
+		}
+
+		memset((void *) conn, 0, sizeof(UDPConn));
+		memcpy(&conn->conn_info, pkt, sizeof(icpkthdr));
+
+		conn->pkt_q_capacity = session_param.Gp_interconnect_queue_depth;
+		conn->pkt_q_size = session_param.Gp_interconnect_queue_depth;
+		conn->pkt_q = (uint8 **) ic_malloc(session_param.Gp_interconnect_queue_depth * sizeof(uint8 *));
+
+		if (conn->pkt_q == NULL)
+		{
+			/* malloc failed.  */
+			delete conn;
+			setRxThreadError(errno);
+			return false;
+		}
+
+		/* We only use the array to store cached packets. */
+		memset(conn->pkt_q, 0, session_param.Gp_interconnect_queue_depth * sizeof(uint8 *));
+
+		/* Put connection to the hashtable. */
+		if (!ic_control_info.startupCacheHtab.add(conn))
+		{
+			ic_free(conn->pkt_q);
+			delete conn;
+			setRxThreadError(errno);
+			return false;
+		}
+
+		/* Setup the peer sock information. */
+		memcpy(&conn->peer, peer, peer_len);
+		conn->peer_len = peer_len;
+	}
+
+	/*
+	 * Reject packets with invalid sequence numbers and packets which have
+	 * been cached before.
+	 */
+	if (pkt->seq > conn->pkt_q_size || pkt->seq == 0 || conn->pkt_q[pkt->seq - 1] != NULL)
+		return false;
+
+	conn->pkt_q[pkt->seq - 1] = (uint8 *) pkt;
+	rx_buffer_pool.maxCount++;
+	ic_statistics.startupCachedPktNum++;
+
+	return true;
+}
+
+/*
+ * cleanupStartupCache
+ *		Clean the startup cache.
+ */
+static void
+cleanupStartupCache()
+{
+	ConnHtabBin *bin = NULL;
+	UDPConn *cachedConn = NULL;
+	icpkthdr   *pkt = NULL;
+	int			i = 0;
+	uint32		j = 0;
+
+	for (i = 0; i < ic_control_info.startupCacheHtab.size; i++)
+	{
+		bin = ic_control_info.startupCacheHtab.table[i];
+
+		while (bin)
+		{
+			cachedConn = bin->conn;
+
+			for (j = 0; j < cachedConn->pkt_q_size; j++)
+			{
+				pkt = (icpkthdr *) cachedConn->pkt_q[j];
+
+				if (pkt == NULL)
+					continue;
+
+				rx_buffer_pool.maxCount--;
+				rx_buffer_pool.put(pkt);
+				cachedConn->pkt_q[j] = NULL;
+			}
+			bin = bin->next;
+			ic_control_info.startupCacheHtab.remove(cachedConn);
+
+			/*
+			 * MPP-19981 free the cached connections; otherwise memory leak
+			 * would be introduced.
+			 */
+			ic_free(cachedConn->pkt_q);
+			ic_free(cachedConn);
+		}
+	}
+}
+
+
+#ifdef USE_ASSERT_CHECKING
+
+/* The following functions are facility methods for debugging.
+ * They are quite useful when there are a large number of connections.
+ * These functions can be called from gdb to output internal information to a file.
+ */
+
+/*
+ * dumpUnackQueueRing
+ * 		Dump an unack queue ring.
+ */
+static void
+dumpUnackQueueRing(const char *fname)
+{
+	FILE	   *ofile = fopen(fname, "w+");
+	int			i;
+
+	fprintf(ofile, "UnackQueueRing: currentTime %lu, idx %d numOutstanding %d numSharedOutstanding %d\n",
+			unack_queue_ring.currentTime, unack_queue_ring.idx,
+			unack_queue_ring.numOutStanding, unack_queue_ring.numSharedOutStanding);
+	fprintf(ofile, "==================================\n");
+	for (i = 0; i < UNACK_QUEUE_RING_SLOTS_NUM; i++)
+	{
+		if (unack_queue_ring.slots[i].length() > 0)
+		{
+			unack_queue_ring.slots[i].dump_to_file(ofile);
+		}
+	}
+
+	fclose(ofile);
+}
+
+/*
+ * dumpConnections
+ * 		Dump connections.
+ */
+void
+TransportEntry::dumpConnections(const char *fname)
+{
+	int			i;
+	uint32		j;
+
+	return;
+
+	FILE	   *ofile = fopen(fname, "w+");
+
+	fprintf(ofile, "Entry connections: conn num %d \n", this->numConns);
+	fprintf(ofile, "==================================\n");
+	for (i = 0; i < this->numConns; i++)
+	{
+		UDPConn *conn = this->GetConn(i);
+
+		fprintf(ofile, "conns[%d] motNodeId=%d: remoteContentId=%d pid=%d sockfd=%d remote=%s "
+				"capacity=%d sentSeq=%d receivedAckSeq=%d consumedSeq=%d rtt=%lu"
+				" dev=%lu deadlockCheckBeginTime=%lu route=%d msgSize=%d msgPos=%p"
+				" recvBytes=%d tupleCount=%d stillActive=%d stopRequested=%d "
+				"state=%d\n",
+				i, this->motNodeId,
+				conn->remoteContentId,
+				conn->cdbProc ? conn->cdbProc->pid : 0,
+				conn->sockfd,
+				conn->remoteHostAndPort,
+				conn->capacity, conn->sentSeq, conn->receivedAckSeq, conn->consumedSeq,
+				conn->rtt, conn->dev, conn->deadlockCheckBeginTime, conn->route, conn->msgSize, conn->msgPos,
+				conn->recvBytes, conn->tupleCount, conn->stillActive, conn->stopRequested,
+				conn->state);
+		fprintf(ofile, "conn_info [%s: seq %d extraSeq %d]: motNodeId %d, crc %d len %d "
+				"srcContentId %d dstDesContentId %d "
+				"srcPid %d dstPid %d "
+				"srcListenerPort %d dstListernerPort %d "
+				"sendSliceIndex %d recvSliceIndex %d "
+				"sessionId %d icId %d "
+				"flags %d\n",
+				conn->conn_info.flags & UDPIC_FLAGS_RECEIVER_TO_SENDER ? "ACK" : "DATA",
+				conn->conn_info.seq, conn->conn_info.extraSeq, conn->conn_info.motNodeId, conn->conn_info.crc, conn->conn_info.len,
+				conn->conn_info.srcContentId, conn->conn_info.dstContentId,
+				conn->conn_info.srcPid, conn->conn_info.dstPid,
+				conn->conn_info.srcListenerPort, conn->conn_info.dstListenerPort,
+				conn->conn_info.sendSliceIndex, conn->conn_info.recvSliceIndex,
+				conn->conn_info.sessionId, conn->conn_info.icId,
+				conn->conn_info.flags);
+
+		if (!ic_control_info.isSender)
+		{
+			fprintf(ofile, "pkt_q_size=%d pkt_q_head=%d pkt_q_tail=%d pkt_q=%p\n", conn->pkt_q_size, conn->pkt_q_head, conn->pkt_q_tail, conn->pkt_q);
+			for (j = 0; j < conn->pkt_q_capacity; j++)
+			{
+				if (conn->pkt_q != NULL && conn->pkt_q[j] != NULL)
+				{
+					icpkthdr   *pkt = (icpkthdr *) conn->pkt_q[j];
+
+					fprintf(ofile, "Packet (pos %d) Info [%s: seq %d extraSeq %d]: motNodeId %d, crc %d len %d "
+							"srcContentId %d dstDesContentId %d "
+							"srcPid %d dstPid %d "
+							"srcListenerPort %d dstListernerPort %d "
+							"sendSliceIndex %d recvSliceIndex %d "
+							"sessionId %d icId %d "
+							"flags %d\n",
+							j,
+							pkt->flags & UDPIC_FLAGS_RECEIVER_TO_SENDER ? "ACK" : "DATA",
+							pkt->seq, pkt->extraSeq, pkt->motNodeId, pkt->crc, pkt->len,
+							pkt->srcContentId, pkt->dstContentId,
+							pkt->srcPid, pkt->dstPid,
+							pkt->srcListenerPort, pkt->dstListenerPort,
+							pkt->sendSliceIndex, pkt->recvSliceIndex,
+							pkt->sessionId, pkt->icId,
+							pkt->flags);
+				}
+			}
+		}
+		if (ic_control_info.isSender)
+		{
+			fprintf(ofile, "sndQueue ");
+			conn->sndQueue.dump_to_file(ofile);
+			fprintf(ofile, "unackQueue ");
+			conn->unackQueue.dump_to_file(ofile);
+
+			dumpUnackQueueRing("/tmp/dumpUnackQueueRing");
+		}
+		fprintf(ofile, "\n");
+	}
+	fclose(ofile);
+}
+#endif
+
+/*
+ * logPkt
+ * 		Log a packet.
+ *
+ */
+static inline void
+logPkt(const char *prefix, icpkthdr *pkt)
+{
+	LOG(INFO, "%s [%s: seq %d extraSeq %d]: motNodeId %d, crc %d len %d "
+			  "srcContentId %d dstDesContentId %d "
+			  "srcPid %d dstPid %d "
+			  "srcListenerPort %d dstListernerPort %d "
+			  "sendSliceIndex %d recvSliceIndex %d "
+			  "sessionId %d icId %d "
+			  "flags %d ",
+			  prefix, pkt->flags & UDPIC_FLAGS_RECEIVER_TO_SENDER ? "ACK" : "DATA",
+			  pkt->seq, pkt->extraSeq, pkt->motNodeId, pkt->crc, pkt->len,
+			  pkt->srcContentId, pkt->dstContentId,
+			  pkt->srcPid, pkt->dstPid,
+			  pkt->srcListenerPort, pkt->dstListenerPort,
+			  pkt->sendSliceIndex, pkt->recvSliceIndex,
+			  pkt->sessionId, pkt->icId,
+			  pkt->flags);
+}
+
+/*
+ * Send a dummy packet to interconnect thread to exit poll() immediately
+ */
+static void
+SendDummyPacket(void)
+{
+   int                 ret;
+   const char          *dummy_pkt = "stop it";
+   int                 counter;
+   struct sockaddr_storage dest;
+   socklen_t   dest_len;
+
+   Assert(udp_dummy_packet_sockaddr.ss_family == AF_INET || udp_dummy_packet_sockaddr.ss_family == AF_INET6);
+   Assert(ICSenderFamily == AF_INET || ICSenderFamily == AF_INET6);
+
+   dest = udp_dummy_packet_sockaddr;
+   dest_len = (ICSenderFamily == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
+
+   if (ICSenderFamily == AF_INET6)
+   {
+#if defined(__darwin__)
+       if (udp_dummy_packet_sockaddr.ss_family == AF_INET6)
+           ConvertIPv6WildcardToLoopback(&dest);
+#endif
+       if (udp_dummy_packet_sockaddr.ss_family == AF_INET)
+           ConvertToIPv4MappedAddr(&dest, &dest_len);
+   }
+
+   if (ICSenderFamily == AF_INET && udp_dummy_packet_sockaddr.ss_family == AF_INET6)
+   {
+       /* the size of AF_INET6 is bigger than the side of IPv4, so
+        * converting from IPv6 to IPv4 may potentially not work. */
+       LOG(INFO, "sending dummy packet failed: cannot send from AF_INET to receiving on AF_INET6");
+       return;
+   }
+
+	/*
+     * Send a dummy package to the interconnect listener, try 10 times.
+     * We don't want to close the socket at the end of this function, since
+     * the socket will eventually close during the motion layer cleanup.
+	 */
+
+	counter = 0;
+	while (counter < 10)
+	{
+		counter++;
+		ret = sendto(ICSenderSocket, dummy_pkt, strlen(dummy_pkt), 0, (struct sockaddr *) &dest, dest_len);
+		if (ret < 0)
+		{
+			if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+				continue;
+			else
+			{
+				LOG(INFO, "send dummy packet failed, sendto failed: %m");
+				return;
+			}
+		}
+		break;
+	}
+
+	if (counter >= 10)
+	{
+		LOG(INFO, "send dummy packet failed, sendto failed with 10 times: %m");
+	}
+}
+
+/*
+ * prepareXmit
+ * 		Prepare connection for transmit.
+ */
+void
+UDPConn::prepareXmit()
+{
+	this->conn_info.len = this->msgSize;
+	this->conn_info.crc = 0;
+
+	memcpy(this->pBuff, &this->conn_info, sizeof(this->conn_info));
+
+	/* increase the sequence no */
+	this->conn_info.seq++;
+
+	if (session_param.gp_interconnect_full_crc)
+	{
+		icpkthdr *pkt = (icpkthdr *)this->pBuff;
+		addCRC(pkt);
+	}
+}
+
+ /*
+  * sendtoWithRetry
+  *         Retry sendto logic and send the packets.
+  */
+static ssize_t
+sendtoWithRetry(int socket, const void *message, size_t length,
+           int flags, const struct sockaddr *dest_addr,
+           socklen_t dest_len, int retry, const char *errDetail)
+{
+    int32       n;
+    int count = 0;
+
+xmit_retry:
+    /*
+     * If given retry count is positive, retry up to the limited times.
+     * Otherwise, retry for unlimited times until succeed.
+     */
+    if (retry > 0 && ++count > retry)
+       return n;
+	n = sendto(socket, message, length, flags, dest_addr, dest_len);
+    if (n < 0)
+    {
+		int			save_errno = errno;
+
+		if (errno == EINTR)
+			goto xmit_retry;
+
+        /*
+         * EAGAIN: no space ? not an error.
+         *
+         * EFAULT: In Linux system call, it only happens when copying a socket
+         * address into kernel space failed, which is less likely to happen,
+         * but mocked heavily by our fault injection in regression tests.
+         */
+        if (errno == EAGAIN || errno == EFAULT)
+            return n;
+
+		/*
+		 * If Linux iptables (nf_conntrack?) drops an outgoing packet, it may
+		 * return an EPERM to the application. This might be simply because of
+		 * traffic shaping or congestion, so ignore it.
+		 */
+		if (errno == EPERM)
+		{
+			LOG(LOG_ERROR, "Interconnect error writing an outgoing packet: %m, "
+						   "error during sendto() %s", errDetail);
+			return n;
+		}
+
+		/*
+		 * If the OS can detect an MTU issue on the host network interfaces, we
+		 * would get EMSGSIZE here. So, bail with a HINT about checking MTU.
+		 */
+		if (errno == EMSGSIZE)
+		{
+			std::stringstream ss;
+			ss << "ERROR, Interconnect error writing an outgoing packet: " << strerror(errno) << "error during sendto() call (error:" << save_errno << ", " << errDetail << ")."
+			   << "check if interface MTU is equal across the cluster and lower than gp_max_packet_size" << "\n";
+			throw ICNetworkException(ss.str(), __FILE__, __LINE__);
+		}
+
+		std::stringstream ss;
+		ss <<"ERROR, Interconnect error writing an outgoing packet: "<<strerror(errno)<<
+			"error during sendto() call (error:"<<save_errno<<", "<<errDetail << ").\n";
+		throw ICNetworkException(ss.str(), __FILE__, __LINE__);
+		/* not reached */
+	}
+
+	return n;
+}
+
+/*
+ * sendOnce
+ * 		Send a packet.
+ */
+void
+UDPConn::sendOnce(icpkthdr *pkt)
+{
+	int32 n;
+#ifdef USE_ASSERT_CHECKING
+	if (testmode_inject_fault(session_param.gp_udpic_dropxmit_percent))
+	{
+#ifdef AMS_VERBOSE_LOGGING
+		LOG(INFO, "THROW PKT with seq %d srcpid %d despid %d",
+				  pkt->seq, pkt->srcPid, pkt->dstPid);
+#endif
+		return;
+	}
+#endif
+
+	Assert(pkt->srcContentId == global_param.segindex);
+	Assert(pkt->motNodeId == entry_->motNodeId);
+	LOG(DEBUG3, "UDPConn::sendOnce(): icid: %d, motNodeId: %d, srcSeg: %d, dstSeg: %d, srcPid: %d, dstPid: %d, seq: %d, len: %d, flags: %s",
+			pkt->icId, pkt->motNodeId, pkt->srcContentId, pkt->dstContentId, pkt->srcPid, pkt->dstPid, pkt->seq, pkt->len, flags2txt(pkt->flags));
+
+    char errDetail[256];
+    snprintf(errDetail, sizeof(errDetail), "For Remote Connection: contentId=%d at %s",
+                      this->remoteContentId,
+                      this->remoteHostAndPort);
+    n = sendtoWithRetry(this->entry_->txfd, pkt, pkt->len, 0,
+                           (struct sockaddr *) &this->peer, this->peer_len, -1, errDetail);
+	if (n != int(pkt->len))
+	{
+		if (IC_DEBUG1 >= session_param.log_min_messages)
+			LOG(DEBUG1, "Interconnect error writing an outgoing packet [seq %d]: short transmit (given %d sent %d) during sendto() call."
+						"For Remote Connection: contentId=%d at %s", pkt->seq, pkt->len, n,
+						this->remoteContentId, this->remoteHostAndPort);
+#ifdef AMS_VERBOSE_LOGGING
+		logPkt("PKT DETAILS ", pkt);
+#endif
+	}
+	return;
+}
+
+void
+UDPConn::handleStop()
+{
+	if (!this->stillActive || !this->stopRequested)
+		return;
+
+	/* mark buffer empty */
+	this->tupleCount = 0;
+	this->msgSize = sizeof(this->conn_info);
+
+	/* now send our stop-ack EOS */
+	this->conn_info.flags |= UDPIC_FLAGS_EOS;
+
+	Assert(this->curBuff != NULL);
+
+	this->pBuff[this->msgSize] = 'S';
+	this->msgSize += 1;
+
+	/* now ready to actually send */
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "handleStopMsgs: node %d route %d, seq %d",
+					entry_->motNodeId, this->route, this->conn_info.seq);
+
+	/* place it into the send queue */
+	this->prepareXmit();
+	this->sndQueue.append(this->curBuff);
+	this->curBuff = NULL;
+	this->pBuff = NULL;
+
+	/* return all buffers */
+	this->sndQueue.release(false);
+	this->unackQueue.release(session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_CAPACITY_IC ? false : true);
+
+	this->tupleCount = 0;
+	this->msgSize = sizeof(this->conn_info);
+
+	this->state = mcsEosSent;
+	this->stillActive = false;
+	this->stopRequested = false;
+}
+
+/*
+ * sendBuffers
+ * 		Called by sender to send the buffers in the send queue.
+ *
+ * Send the buffers in the send queue of the connection if there is capacity left
+ * and the congestion control condition is satisfied.
+ *
+ * Here, we make sure that a connection can have at least one outstanding buffer.
+ * This is very important for two reasons:
+ *
+ * 1) The handling logic of the ack of the outstanding buffer can always send a buffer
+ *    in the send queue. Otherwise, there may be a deadlock.
+ * 2) This makes sure that any connection can have a minimum bandwidth for data
+ *    sending.
+ *
+ * After sending a buffer, the buffer will be placed into both the unack queue and
+ * the corresponding queue in the unack queue ring.
+ */
+void
+UDPConn::sendBuffers()
+{
+	while (this->capacity > 0 && this->sndQueue.length() > 0)
+	{
+		ICBuffer   *buf = NULL;
+
+		if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_IC || session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+		{
+			if (this->unackQueue.length() > 0 &&
+				unack_queue_ring.numSharedOutStanding >= (snd_control_info.cwnd - snd_control_info.minCwnd))
+			break;
+		}
+
+		/* for connection setup, we only allow one outstanding packet. */
+		if (this->state == mcsSetupOutgoingConnection && this->unackQueue.length() >= 1)
+			break;
+
+		buf = this->sndQueue.pop();
+
+		uint64		now = getCurrentTime();
+
+		buf->sentTime = now;
+		buf->unackQueueRingSlot = -1;
+		buf->nRetry = 0;
+		buf->conn = this;
+		this->capacity--;
+
+		this->unackQueue.append(buf);
+
+		if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_IC || session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+		{
+			unack_queue_ring.numOutStanding++;
+			if (this->unackQueue.length() > 1)
+				unack_queue_ring.numSharedOutStanding++;
+
+			putIntoUnackQueueRing(&unack_queue_ring,
+								  buf,
+								  this->computeExpirationPeriod(buf->nRetry),
+								  now);
+		}
+
+		/*
+		 * Note the place of sendOnce here. If we send before appending it to
+		 * the unack queue and putting it into unack queue ring, and there is
+		 * a network error occurred in the sendOnce function, error message
+		 * will be output. In the time of error message output, interrupts is
+		 * potentially checked, if there is a pending query cancel, it will
+		 * lead to a dangled buffer (memory leak).
+		 */
+#ifdef TRANSFER_PROTOCOL_STATS
+		trans_proto_stats.update(TPE_DATA_PKT_SEND, buf->pkt);
+#endif
+
+		struct icpkthdr *pkt_ = buf->pkt;
+		pkt_->send_time = now;
+		pkt_->recv_time = 0;
+		pkt_->retry_times = buf->nRetry;
+		this->sendOnce(buf->pkt);
+
+		ic_statistics.sndPktNum++;
+
+#ifdef AMS_VERBOSE_LOGGING
+		logPkt("SEND PKT DETAIL", buf->pkt);
+#endif
+
+		this->sentSeq = buf->pkt->seq;
+	}
+}
+
+/*
+ * handleDisorderPacket
+ * 		Called by rx thread to assemble and send a disorder message.
+ *
+ * In current implementation, we limit the number of lost packet sequence numbers
+ * in the disorder message by the MIN_PACKET_SIZE. There are two reasons here:
+ *
+ * 1) The maximal number of lost packet sequence numbers are actually bounded by the
+ *    receive queue depth whose maximal value is very large. Since we share the packet
+ *    receive and ack receive in the background thread, the size of disorder should be
+ *    also limited by the max packet size.
+ * 2) We can use Gp_max_packet_size here to limit the number of lost packet sequence numbers.
+ *    But considering we do not want to let senders send many packets when getting a lost
+ *    message. Here we use MIN_PACKET_SIZE.
+ *
+ *
+ * the format of a disorder message:
+ * I) pkt header
+ *  - seq      -> packet sequence number that triggers the disorder message
+ *  - extraSeq -> the largest seq of the received packets
+ *  - flags    -> UDPIC_FLAGS_DISORDER
+ *  - len      -> sizeof(icpkthdr) + sizeof(uint32) * (lost pkt count)
+ * II) content
+ *  - an array of lost pkt sequence numbers (uint32)
+ *
+ */
+void
+UDPConn::handleDisorderPacket(int pos, uint32 tailSeq, icpkthdr *pkt)
+{
+	int			start = 0;
+	uint32		lostPktCnt = 0;
+	uint32	   *curSeq = (uint32 *) &rx_control_info.disorderBuffer[1];
+	uint32		maxSeqs = MAX_SEQS_IN_DISORDER_ACK;
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "PROCESS_DISORDER PKT BEGIN:");
+#endif
+
+	start = this->pkt_q_tail;
+
+	while (start != pos && lostPktCnt < maxSeqs)
+	{
+		if (this->pkt_q[start] == NULL)
+		{
+			*curSeq = tailSeq;
+			lostPktCnt++;
+			curSeq++;
+
+#ifdef AMS_VERBOSE_LOGGING
+			LOG(INFO, "PROCESS_DISORDER add seq [%d], lostPktCnt %d", *curSeq, lostPktCnt);
+#endif
+		}
+
+		tailSeq++;
+		start = (start + 1) % this->pkt_q_capacity;
+	}
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "PROCESS_DISORDER PKT END:");
+#endif
+
+	/* when reaching here, cnt must not be 0 */
+	this->sendDisorderAck(pkt->seq, this->conn_info.seq - 1, lostPktCnt);
+}
+
+/*
+ * handleAckForDisorderPkt
+ * 		Called by sender to deal with acks for disorder packet.
+ */
+bool
+UDPConn::handleAckForDisorderPkt(icpkthdr *pkt)
+{
+	ICBufferLink *link = NULL;
+	ICBuffer   *buf = NULL;
+	ICBufferLink *next = NULL;
+	uint64		now = getCurrentTime();
+	uint32	   *curLostPktSeq = 0;
+	int			lostPktCnt = 0;
+	static uint32 times = 0;
+	static uint32 lastSeq = 0;
+	bool		shouldSendBuffers = false;
+
+	if (pkt->extraSeq != lastSeq)
+	{
+		lastSeq = pkt->extraSeq;
+		times = 0;
+		return false;
+	}
+	else
+	{
+		times++;
+		if (times != 2)
+			return false;
+	}
+
+	curLostPktSeq = (uint32 *) &pkt[1];
+	lostPktCnt = (pkt->len - sizeof(icpkthdr)) / sizeof(uint32);
+
+	/*
+	 * Resend all the missed packets and remove received packets from queues
+	 */
+
+	link = this->unackQueue.first();
+	buf = GET_ICBUFFER_FROM_PRIMARY(link);
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "DISORDER: pktlen %d cnt %d pktseq %d first loss %d buf %p",
+			  pkt->len, lostPktCnt, pkt->seq, *curLostPktSeq, buf);
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+	{
+		this->unackQueue.icBufferListLog();
+		this->sndQueue.icBufferListLog();
+	}
+#endif
+
+	/*
+	 * iterate the unack queue
+	 */
+	while (!this->unackQueue.is_head(link) && buf->pkt->seq <= pkt->seq && lostPktCnt > 0)
+	{
+#ifdef AMS_VERBOSE_LOGGING
+		LOG(INFO, "DISORDER: bufseq %d curlostpkt %d cnt %d buf %p pkt->seq %d",
+				  buf->pkt->seq, *curLostPktSeq, lostPktCnt, buf, pkt->seq);
+#endif
+
+		if (buf->pkt->seq == pkt->seq)
+		{
+			this->handleAckedPacket(buf, now, pkt);
+			shouldSendBuffers = true;
+			break;
+		}
+
+		if (buf->pkt->seq == *curLostPktSeq)
+		{
+			/* this is a lost packet, retransmit */
+
+			buf->nRetry++;
+			if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_IC || session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+			{
+				ICBufferList *alist = &unack_queue_ring.slots[buf->unackQueueRingSlot];
+				buf = alist->remove(buf);
+				putIntoUnackQueueRing(&unack_queue_ring, buf,
+									  this->computeExpirationPeriod(buf->nRetry), now);
+			}
+#ifdef TRANSFER_PROTOCOL_STATS
+			trans_proto_stats.update(TPE_DATA_PKT_SEND, buf->pkt);
+#endif
+
+			Assert(this == buf->conn);
+			this->sendOnce(buf->pkt);
+
+#ifdef AMS_VERBOSE_LOGGING
+			LOG(INFO, "RESEND a buffer for DISORDER: seq %d", buf->pkt->seq);
+			logPkt("DISORDER RESEND DETAIL ", buf->pkt);
+#endif
+
+			ic_statistics.retransmits++;
+			curLostPktSeq++;
+			lostPktCnt--;
+
+			link = link->next;
+			buf = GET_ICBUFFER_FROM_PRIMARY(link);
+		}
+		else if (buf->pkt->seq < *curLostPktSeq)
+		{
+			/* remove packet already received. */
+
+			next = link->next;
+			this->handleAckedPacket(buf, now, pkt);
+			shouldSendBuffers = true;
+			link = next;
+			buf = GET_ICBUFFER_FROM_PRIMARY(link);
+		}
+		else					/* buf->pkt->seq > *curPktSeq */
+		{
+			/*
+			 * this case is introduced when the disorder message tell you a
+			 * pkt is lost. But when we handle this message, a message (for
+			 * example, duplicate ack, or another disorder message) arriving
+			 * before this message already removed the pkt.
+			 */
+			curLostPktSeq++;
+			lostPktCnt--;
+		}
+	}
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_IC || session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+	{
+		snd_control_info.ssthresh = Max(snd_control_info.cwnd / 2, snd_control_info.minCwnd);
+		snd_control_info.cwnd = snd_control_info.ssthresh;
+	}
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "After DISORDER: sndQ %d unackQ %d", this->sndQueue.length(), this->unackQueue.length());
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+	{
+		this->unackQueue.icBufferListLog();
+		this->sndQueue.icBufferListLog();
+	}
+#endif
+
+	return shouldSendBuffers;
+}
+
+/*
+ * handleAckForDuplicatePkt
+ * 		Called by sender to deal with acks for duplicate packet.
+ *
+ */
+bool
+UDPConn::handleAckForDuplicatePkt(icpkthdr *pkt)
+{
+	ICBufferLink *link = NULL;
+	ICBuffer   *buf = NULL;
+	ICBufferLink *next = NULL;
+	uint64		now = getCurrentTime();
+	bool		shouldSendBuffers = false;
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "RESEND the unacked buffers in the queue due to %s", pkt->len == 0 ? "PROCESS_START_RACE" : "DISORDER");
+#endif
+
+	if (pkt->seq <= pkt->extraSeq)
+	{
+		/* Indicate a bug here. */
+		LOG(LOG_ERROR, "invalid duplicate message: seq %d extraSeq %d", pkt->seq, pkt->extraSeq);
+		return false;
+	}
+
+	link = this->unackQueue.first();
+	buf = GET_ICBUFFER_FROM_PRIMARY(link);
+
+	/* deal with continuous pkts */
+	while (!this->unackQueue.is_head(link) && (buf->pkt->seq <= pkt->extraSeq))
+	{
+		next = link->next;
+		this->handleAckedPacket(buf, now, pkt);
+		shouldSendBuffers = true;
+		link = next;
+		buf = GET_ICBUFFER_FROM_PRIMARY(link);
+	}
+
+	/* deal with the single duplicate packet */
+	while (!this->unackQueue.is_head(link) && buf->pkt->seq <= pkt->seq)
+	{
+		next = link->next;
+		if (buf->pkt->seq == pkt->seq)
+		{
+			this->handleAckedPacket(buf, now, pkt);
+			shouldSendBuffers = true;
+			break;
+		}
+		link = next;
+		buf = GET_ICBUFFER_FROM_PRIMARY(link);
+	}
+
+	return shouldSendBuffers;
+}
+
+/*
+ * checkNetworkTimeout
+ *		check network timeout case.
+ */
+void
+UDPConn::checkNetworkTimeout(ICBuffer *buf, uint64 now, bool *networkTimeoutIsLogged)
+{
+	/*
+	 * Using only the time to first sent time to decide timeout is not enough,
+	 * since there is a possibility the sender process is not scheduled or
+	 * blocked by OS for a long time. In this case, only a few times are
+	 * tried. Thus, the GUC Gp_interconnect_min_retries_before_timeout is
+	 * added here.
+	 */
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC &&
+		buf->nRetry % session_param.Gp_interconnect_debug_retry_interval == 0)
+	{
+		LOG(INFO, "resending packet (seq %d) to %s (pid %d cid %d) with %d retries in %lu seconds",
+				  buf->pkt->seq, buf->conn->remoteHostAndPort, buf->pkt->dstPid, buf->pkt->dstContentId, buf->nRetry,
+				  (now - buf->sentTime) / 1000 / 1000);
+	}
+
+	if ((buf->nRetry > session_param.Gp_interconnect_min_retries_before_timeout) &&
+		(now - buf->sentTime) > ((uint64) session_param.Gp_interconnect_transmit_timeout * 1000 * 1000))
+	{
+		std::stringstream ss;
+		ss <<"ERROR, interconnect encountered a network error, please check your network"<<
+			"Failed to send packet (seq "<<buf->pkt->seq<<") to "<<buf->conn->remoteHostAndPort<<
+			" (pid "<<buf->pkt->dstPid<<" cid "<<buf->pkt->dstContentId<<") after "<<buf->nRetry<<
+			" retries in "<<session_param.Gp_interconnect_transmit_timeout<<" seconds.";
+		throw ICNetworkException(ss.str(), __FILE__, __LINE__);
+	}
+
+	/*
+	 * Default value of Gp_interconnect_transmit_timeout is one hours.
+	 * It taks too long time to detect a network error and it is not user friendly.
+	 *
+	 * Packets would be dropped repeatly on some specific ports. We'd better have
+	 * a warning messgage for this case and give the DBA a chance to detect this error
+	 * earlier. Since packets would also be dropped when network is bad, we should not
+	 * error out here, but just give a warning message. Erroring our is still handled
+	 * by GUC Gp_interconnect_transmit_timeout as above. Note that warning message should
+	 * be printed for each statement only once.
+	 */
+	if ((buf->nRetry >= session_param.Gp_interconnect_min_retries_before_timeout) && !(*networkTimeoutIsLogged))
+	{
+		LOG(WARNING, "interconnect may encountered a network error, please check your network"
+					 "Failed to send packet (seq %d) to %s (pid %d cid %d) after %d retries.",
+					 buf->pkt->seq, buf->conn->remoteHostAndPort, buf->pkt->dstPid, buf->pkt->dstContentId, buf->nRetry);
+		*networkTimeoutIsLogged = true;
+	}
+}
+
+/*
+ * checkExpiration
+ * 		Check whether packets expire. If a packet expires, resend the packet,
+ * 		and adjust its position in the unack queue ring.
+ *
+ */
+void
+UDPConn::checkExpiration(ICChunkTransportState *transportStates, uint64 now)
+{
+	/* check for expiration */
+	int	count = 0;
+	int	retransmits = 0;
+	UDPConn *currBuffConn = NULL;
+
+	Assert(unack_queue_ring.currentTime != 0);
+
+	if (unlikely(session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER_IC))
+	{
+		checkRtmTimeout(&mudp, now, 500, transportStates, this->entry_, this);
+		return;
+	}
+
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+	{
+		uint64 timer_span_time = unack_queue_ring.currentTime + TIMER_SPAN_LOSS;
+
+		while (now >= (timer_span_time + unack_queue_ring.time_difference)  && count++ < UNACK_QUEUE_RING_SLOTS_NUM)
+		{
+			/* expired, need to resend them */
+			ICBuffer   *curBuf = NULL;
+
+			while ((curBuf = unack_queue_ring.slots[unack_queue_ring.idx].pop()) != NULL)
+			{
+				UDPConn *conn = static_cast<UDPConn*>(curBuf->conn);
+				curBuf->nRetry++;
+
+				/*
+				 * Fixed Timeout Thresholds: Traditional TCP-style Retransmission Timeout
+				 * (RTTVAR.RTO) calculations may be too rigid for networks with volatile
+				 * latency. This leads to:
+				 *   Premature Retransmissions: Unnecessary data resends during temporary
+				 *     latency spikes, wasting bandwidth.
+				 *   Delayed Recovery: Slow reaction to actual packet loss when RTO is
+				 *     overly conservative.
+				 * 
+				 * Lack of Context Awareness: Static RTO ignores real-time network behavior
+				 * patterns, reducing throughput and responsiveness.
+				 * 
+				 * Solution: Dynamic Timeout Threshold Adjustment
+				 * Implements an adaptive timeout mechanism to optimize retransmission:
+				 *   if (now < (curBuf->sentTime + conn->rttvar.rto)) {
+				 *       uint32_t diff = (curBuf->sentTime + conn->rttvar.rto) - now;
+				 *       // ... (statistical tracking and threshold adjustment)
+				 *   }
+				 *   Temporary Latency Spike: Uses max (conservative) to avoid false
+				 *     retransmits, reducing bandwidth waste (vs. traditional mistaken
+				 *     retransmissions).
+				 *   Persistent Packet Loss: Prioritizes min (aggressive) via
+				 *     weight_retrans, accelerating recovery (vs. slow fixed-RTO reaction).
+				 *   Stable Network: Balances weights for equilibrium throughput (vs.
+				 *     static RTO limitations).
+				 */
+				if (now < (curBuf->sentTime +  conn->rttvar.rto))
+				{
+#ifdef TIMEOUT_Z
+					uint32_t diff = (curBuf->sentTime +  conn->rttvar.rto) - now;
+					if(unack_queue_ring.retrans_count == 0 && unack_queue_ring.no_retrans_count == 0)
+					{
+						unack_queue_ring.min = diff;
+						unack_queue_ring.max = diff;
+					}
+
+					if (diff < unack_queue_ring.min) unack_queue_ring.min = diff;
+					if (diff > unack_queue_ring.max) unack_queue_ring.max = diff;
+
+					if (unack_queue_ring.retrans_count == 0)
+						unack_queue_ring.time_difference = unack_queue_ring.max;
+					else if (unack_queue_ring.no_retrans_count == 0 && ic_statistics.retransmits < (session_param.Gp_interconnect_min_retries_before_timeout / 4)) 
+						unack_queue_ring.time_difference = 0;
+					else
+					{
+						uint32_t total_count = unack_queue_ring.retrans_count + unack_queue_ring.no_retrans_count;
+						double weight_retrans = (double)unack_queue_ring.retrans_count / total_count;
+						double weight_no_retrans = (double)unack_queue_ring.no_retrans_count / total_count;
+						unack_queue_ring.time_difference = (uint32_t)(unack_queue_ring.max * weight_no_retrans + unack_queue_ring.min * weight_retrans);
+					}
+					
+					++unack_queue_ring.no_retrans_count;
+				}
+				else
+					++unack_queue_ring.retrans_count;
+#endif
+
+#ifdef TRANSFER_PROTOCOL_STATS
+				trans_proto_stats.update(TPE_DATA_PKT_SEND, curBuf->pkt);
+#endif
+
+				currBuffConn = static_cast<UDPConn*>(curBuf->conn);
+				putIntoUnackQueueRing(&unack_queue_ring,
+									  curBuf,
+									  currBuffConn->computeExpirationPeriod(curBuf->nRetry), getCurrentTime());
+				struct icpkthdr *pkt_ = curBuf->pkt;
+
+				pkt_->send_time = getCurrentTime();
+				pkt_->recv_time = 0;
+				pkt_->retry_times = curBuf->nRetry;
+
+				currBuffConn->sendOnce(curBuf->pkt);
+
+				/*
+				 * Adaptive Retry Backoff with Polling for Network Asymmetry Mitigation
+				 *
+				 * This logic addresses two critical network pathologies:
+				 *  1. RTO Distortion Amplification: 
+				 *     - Packet loss in volatile networks causes RTO-based retransmission errors
+				 *     - Multiple spurious retries increase network load and congestion collapse risk
+				 *  2. Data Skew-Induced Starvation:
+				 *     - Under unbalanced workloads, low-traffic nodes experience MON (Message Order Number) delays
+				 *     - Delayed ACKs trigger false retransmissions even when packets arrive eventually
+				 *     - Unacked queue inflation worsens congestion in high-traffic nodes
+				 */
+				int32_t loop_ack = curBuf->nRetry;
+				uint32_t rto_min = UDP_RTO_MIN / 10;
+				uint32_t rtoMs = conn->rttvar.rto / 1000;
+				int32_t wait_time = rto_min > rtoMs ? rto_min : rtoMs;
+				int32_t loop = 0;
+
+				/*
+				 * To optimize performance, we need to process all the time-out file descriptors (fds)
+				 * in each batch together.
+				 */
+				if (loop_ack > 0)
+				{
+					while (loop++ < loop_ack)
+					{
+						if (this->entry_->pollAcks(wait_time))
+						{
+							this->entry_->handleAcks(false);
+							curBuf->nRetry = 0;
+							break;
+						}
+
+						struct icpkthdr *pkt_ = curBuf->pkt;
+						pkt_->send_time = getCurrentTime();
+						pkt_->recv_time = 0;
+						pkt_->retry_times = curBuf->nRetry;
+						currBuffConn->sendOnce(pkt_);
+
+						if (loop_ack < (session_param.Gp_interconnect_min_retries_before_timeout / 10))
+							wait_time += wait_time / 10;
+						else if (loop_ack > (session_param.Gp_interconnect_min_retries_before_timeout / 10) && loop_ack < (session_param.Gp_interconnect_min_retries_before_timeout / 5))
+							wait_time += RTO_MAX / 10;
+						else if (loop_ack > (session_param.Gp_interconnect_min_retries_before_timeout / 5) && loop_ack < (session_param.Gp_interconnect_min_retries_before_timeout / 2))
+							wait_time += RTO_MAX / 5;
+						else if (loop_ack < (session_param.Gp_interconnect_min_retries_before_timeout))
+							wait_time += RTO_MAX;
+					};
+				}
+
+				if (loop_ack > session_param.Gp_interconnect_min_retries_before_timeout / 5)
+					LOG(INFO, "Resending packet (seq %d) to %s (pid %d cid %d) with %d retries in %lu seconds",
+							curBuf->pkt->seq, curBuf->conn->remoteHostAndPort,
+							curBuf->pkt->dstPid, curBuf->pkt->dstContentId, curBuf->nRetry,
+							(now - curBuf->sentTime) / 1000 / 1000);
+
+				retransmits++;
+				ic_statistics.retransmits++;
+				currBuffConn->stat_count_resent++;
+				currBuffConn->stat_max_resent = Max(currBuffConn->stat_max_resent,
+													currBuffConn->stat_count_resent);
+
+				UDPConn::checkNetworkTimeout(curBuf, now, &transportStates->networkTimeoutIsLogged);
+
+#ifdef AMS_VERBOSE_LOGGING
+				LOG(INFO, "RESEND pkt with seq %d (retry %d, rtt " UINT64_FORMAT ") to route %d",
+						curBuf->pkt->seq, curBuf->nRetry, currBuffConn->rtt, currBuffConn->route);
+				logPkt("RESEND PKT in checkExpiration", curBuf->pkt);
+#endif
+			}
+
+			timer_span_time += TIMER_SPAN_LOSS;
+			unack_queue_ring.idx = (unack_queue_ring.idx + 1) % (UNACK_QUEUE_RING_SLOTS_NUM);
+		}
+	}
+	else
+	{
+		while (now >= (unack_queue_ring.currentTime + TIMER_SPAN) && count++ < UNACK_QUEUE_RING_SLOTS_NUM)
+		{
+			/* expired, need to resend them */
+			ICBuffer   *curBuf = NULL;
+
+			while ((curBuf = unack_queue_ring.slots[unack_queue_ring.idx].pop()) != NULL)
+			{
+				curBuf->nRetry++;
+				currBuffConn = static_cast<UDPConn*>(curBuf->conn);
+				putIntoUnackQueueRing(
+									&unack_queue_ring,
+									curBuf,
+									currBuffConn->computeExpirationPeriod(curBuf->nRetry), now);
+
+#ifdef TRANSFER_PROTOCOL_STATS
+				trans_proto_stats.update(TPE_DATA_PKT_SEND, curBuf->pkt);
+#endif
+
+				currBuffConn->sendOnce(curBuf->pkt);
+
+				retransmits++;
+				ic_statistics.retransmits++;
+				currBuffConn->stat_count_resent++;
+				currBuffConn->stat_max_resent = Max(currBuffConn->stat_max_resent, currBuffConn->stat_count_resent);
+				UDPConn::checkNetworkTimeout(curBuf, now, &transportStates->networkTimeoutIsLogged);
+
+#ifdef AMS_VERBOSE_LOGGING
+				LOG(INFO, "RESEND pkt with seq %d (retry %d, rtt " UINT64_FORMAT ") to route %d",
+					  curBuf->pkt->seq, curBuf->nRetry, curBuf->conn->rtt, curBuf->conn->route);
+				logPkt("RESEND PKT in checkExpiration", curBuf->pkt);
+#endif
+			}
+
+			unack_queue_ring.currentTime += TIMER_SPAN;
+			unack_queue_ring.idx = (unack_queue_ring.idx + 1) % (UNACK_QUEUE_RING_SLOTS_NUM);
+		}
+
+		/*
+		 * deal with case when there is a long time this function is not called.
+		 */
+		unack_queue_ring.currentTime = now - (now % (TIMER_SPAN));
+	}
+
+	if (retransmits > 0)
+	{
+		snd_control_info.ssthresh = Max(snd_control_info.cwnd / 2, snd_control_info.minCwnd);
+		snd_control_info.cwnd = snd_control_info.minCwnd;
+	}
+}
+
+/*
+ * checkDeadlock
+ * 		Check whether deadlock occurs on a connection.
+ *
+ * What this function does is to send a status query message to rx thread when
+ * the connection has not received any acks for some time. This is to avoid
+ * potential deadlock when there are continuous ack losses. Packet resending
+ * logic does not help avoiding deadlock here since the packets in the unack
+ * queue may already been removed when the sender knows that they have been
+ * already buffered in the receiver side queue.
+ *
+ * Some considerations on deadlock check time period:
+ *
+ * Potential deadlock occurs rarely. According to our experiments on various
+ * workloads and hardware. It occurred only when fault injection is enabled
+ * and a large number packets and acknowledgments are discarded. Thus, here we
+ * use a relatively large deadlock check period.
+ *
+ */
+void
+UDPConn::checkDeadlock()
+{
+	uint64		deadlockCheckTime;
+
+	if (this->unackQueue.length() == 0 && this->capacity == 0 && this->sndQueue.length() > 0)
+	{
+		/* we must have received some acks before deadlock occurs. */
+		Assert(this->deadlockCheckBeginTime > 0);
+
+#ifdef USE_ASSERT_CHECKING
+		if (udp_testmode)
+		{
+			deadlockCheckTime = 100000;
+		}
+		else
+#endif
+		{
+			deadlockCheckTime = DEADLOCK_CHECKING_TIME;
+		}
+
+		uint64		now = getCurrentTime();
+
+		/* request the capacity to avoid the deadlock case */
+		if (((now - ic_control_info.lastDeadlockCheckTime) > deadlockCheckTime) &&
+			((now - this->deadlockCheckBeginTime) > deadlockCheckTime))
+		{
+			this->sendStatusQueryMessage(this->conn_info.seq - 1);
+			ic_control_info.lastDeadlockCheckTime = now;
+			ic_statistics.statusQueryMsgNum++;
+
+			if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC && this->entry_->pollAcks(50))
+			{
+				this->entry_->handleAcks(false);
+				this->deadlockCheckBeginTime = now;
+			}
+
+			/* check network error. */
+			if ((now - this->deadlockCheckBeginTime) > ((uint64) session_param.Gp_interconnect_transmit_timeout * 100 * 1000))
+			{
+				LOG(INFO, "Did not get any response from %s (pid %d cid %d) in 600 seconds.", this->remoteHostAndPort,
+						  this->conn_info.dstPid, this->conn_info.dstContentId);
+
+				if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER_IC)
+					this->capacity += 1;
+
+				if ((now - this->deadlockCheckBeginTime) > ((uint64)session_param.Gp_interconnect_transmit_timeout * 1000 * 1000))
+				{
+					std::stringstream ss;
+					ss << "ERROR, interconnect encountered a network error, please check your network."
+					   << "Did not get any response from " << remoteHostAndPort << " (pid " << conn_info.dstPid << " cid " << conn_info.dstContentId << ") in "
+					   << session_param.Gp_interconnect_transmit_timeout << " seconds.";
+					throw ICNetworkException(ss.str(), __FILE__, __LINE__);
+				}
+			}
+		}
+	}
+}
+
+/*
+ * updateRetransmitStatistics
+ * 		Update the retransmit statistics.
+ */
+void
+UDPConn::updateRetransmitStatistics()
+{
+	ic_statistics.retransmits++;
+	this->stat_count_resent++;
+	this->stat_max_resent = Max(this->stat_max_resent, this->stat_count_resent);
+}
+
+/*
+ * checkExpirationCapacityFC
+ * 		Check expiration for capacity based flow control method.
+ */
+void
+UDPConn::checkExpirationCapacityFC(int timeout)
+{
+	if (this->unackQueue.length() == 0)
+		return;
+
+	uint64		now = getCurrentTime();
+	uint64		elapsed = now - ic_control_info.lastPacketSendTime;
+
+	if (elapsed >= ((uint64) timeout * 1000))
+	{
+		ICBufferLink *bufLink = this->unackQueue.first();
+		ICBuffer   *buf = GET_ICBUFFER_FROM_PRIMARY(bufLink);
+
+		Assert(this == buf->conn);
+		this->sendOnce(buf->pkt);
+
+		buf->nRetry++;
+		ic_control_info.lastPacketSendTime = now;
+
+		this->updateRetransmitStatistics();
+		UDPConn::checkNetworkTimeout(buf, now, &entry_->state->networkTimeoutIsLogged);
+	}
+}
+
+/*
+ * checkExceptions
+ * 		Check exceptions including packet expiration, deadlock, bg thread error, NIC failure...
+ * 		Caller should start from 0 with retry, so that the expensive check for deadlock and
+ * 		QD connection can be avoided in a healthy state.
+ */
+void
+UDPConn::checkExceptions(int retry, int timeout)
+{
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_CAPACITY_IC
+		/* || conn->state == mcsSetupOutgoingConnection */ )
+	{
+		this->checkExpirationCapacityFC(timeout);
+	}
+
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_IC || session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+	{
+		uint64 now = getCurrentTime();
+
+		if (now - ic_control_info.lastExpirationCheckTime > uint64(TIMER_CHECKING_PERIOD))
+		{
+			this->checkExpiration(this->entry_->state, now);
+			ic_control_info.lastExpirationCheckTime = now;
+		}
+	}
+
+	if ((retry & 0x3) == 2)
+	{
+		this->checkDeadlock();
+
+		checkRxThreadError();
+		CHECK_INTERRUPTS(this->entry_->state);
+	}
+
+	/*
+	 * 1. NIC on master (and thus the QD connection) may become bad, check it.
+	 * 2. Postmaster may become invalid, check it
+	 *
+	 * We check modulo 2 to correlate with the deadlock check above at the
+	 * initial iteration.
+	 */
+	if ((retry & 0x3f) == 2)
+	{
+		checkQDConnectionAlive();
+		CHECK_POSTMASTER_ALIVE();
+	}
+}
+
+/*
+ * computeTimeout
+ * 		Compute timeout value in ms.
+ */
+int
+UDPConn::computeTimeout(int retry)
+{
+	int32_t rtoMs = 0;
+
+	rtoMs = this->rttvar.rto / 1000;
+	if (this->unackQueue.length() == 0)
+		return TIMER_CHECKING_PERIOD;
+
+	ICBufferLink *bufLink = this->unackQueue.first();
+	ICBuffer   *buf = GET_ICBUFFER_FROM_PRIMARY(bufLink);
+
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_ADVANCE_IC)
+	{
+		if (buf->nRetry == 0 && retry == 0 && unack_queue_ring.numSharedOutStanding < (snd_control_info.cwnd - snd_control_info.minCwnd))
+			return 0;
+
+		return rtoMs > TIMER_CHECKING_PERIOD ? rtoMs: TIMER_CHECKING_PERIOD;
+	}
+
+	if (buf->nRetry == 0 && retry == 0)
+		return 0;
+
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_IC)
+		return TIMER_CHECKING_PERIOD;
+
+	/* for capacity based flow control */
+	return TIMEOUT(buf->nRetry);
+}
+
+/*
+ * UDPConn::Send
+ * 		is used to send a tcItem to a single destination. Tuples often are
+ * 		*very small* we aggregate in our local buffer before sending into the kernel.
+ *
+ * PARAMETERS
+ *	 conn - UDPConn that the tcItem is to be sent to.
+ *	 tcItem - message to be sent.
+ *	 motionId - Node Motion Id.
+ */
+void
+UDPConn::Send(DataBlock *data)
+{
+	int			length = data->len;
+	int			retry = 0;
+	bool		doCheckExpiration = false;
+	bool		gotStops = false;
+
+	Assert(this->msgSize > 0);
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(DEBUG3, "UDPConn::Send(): msgSize %d this chunk length %d this seq %d",
+			this->msgSize, data->len, this->conn_info.seq);
+#endif
+
+	if (this->msgSize + length <= global_param.Gp_max_packet_size)
+	{
+		memcpy(this->pBuff + this->msgSize, data->pos, data->len);
+		this->msgSize += length;
+
+		this->tupleCount++;
+		return;
+	}
+
+	/* prepare this for transmit */
+	ic_statistics.totalCapacity += this->capacity;
+	ic_statistics.capacityCountingTime++;
+
+	/* try to send it */
+	this->prepareXmit();
+	this->sndQueue.append(this->curBuff);
+	this->sendBuffers();
+
+	/* get a new buffer */
+	this->curBuff = NULL;
+	this->pBuff = NULL;
+
+	uint64 now = getCurrentTime();
+
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_CAPACITY_IC)
+		doCheckExpiration = false;
+	else
+		doCheckExpiration = (now - ic_control_info.lastExpirationCheckTime) > MAX_TIME_NO_TIMER_CHECKING ? true : false;
+
+	ic_control_info.lastPacketSendTime = 0;
+	this->deadlockCheckBeginTime = now;
+
+	while (doCheckExpiration || (this->curBuff = snd_buffer_pool.get(this)) == NULL)
+	{
+		int timeout = (doCheckExpiration ? 0 : this->computeTimeout(retry));
+
+		if (this->entry_->pollAcks(timeout))
+		{
+			if (this->entry_->handleAcks(true))
+			{
+				/*
+				 * We make sure that we deal with the stop messages only after
+				 * we get a buffer. Otherwise, if the stop message is not for
+				 * this connection, this will lead to an error for the
+				 * following data sending of this connection.
+				 */
+				gotStops = true;
+			}
+		}
+		this->checkExceptions(retry++, timeout);
+		doCheckExpiration = false;
+
+		if (!doCheckExpiration && this->unackQueue.length() == 0 && this->capacity > 0 && this->sndQueue.length() > 0)
+			this->sendBuffers();
+	}
+
+	this->pBuff = (uint8 *) this->curBuff->pkt;
+
+	if (gotStops)
+	{
+		/* handling stop message will make some connection not active anymore */
+		this->entry_->handleStopMsgs();
+
+		if (!this->stillActive)
+			return;
+	}
+
+	/* reinitialize connection */
+	this->tupleCount = 0;
+	this->msgSize = sizeof(this->conn_info);
+
+	/* now we can copy the input to the new buffer */
+	memcpy(this->pBuff + this->msgSize, data->pos, data->len);
+	this->msgSize += length;
+
+	this->tupleCount++;
+}
+
+/*
+ * C++ implement for udp protocol.
+ */
+UDPConn::UDPConn(TransportEntry *entry)
+{
+	/* the field of MotionConn */
+	this->sockfd        = -1;
+	this->pBuff         = nullptr;
+	this->msgSize       = 0;
+	this->msgPos        = nullptr;
+	this->recvBytes     = 0;
+	this->tupleCount    = 0;
+	this->stillActive   = false;
+	this->stopRequested = false;
+	this->cdbProc       = nullptr;
+	this->remoteContentId      = -1;
+	this->remoteHostAndPort[0] = '\0';
+	this->opaque_data = nullptr;
+	this->sent_record_typmod = 0;
+
+	/* the field of UDPConn */
+	this->capacity  = -1;
+	this->sentSeq   = 0;
+	this->receivedAckSeq = 0;
+	this->consumedSeq    = 0;
+	this->rtt = 0;
+	this->dev = 0;
+	this->deadlockCheckBeginTime = -1;
+	this->curBuff  = nullptr;
+	this->route    = 0;
+	this->peer_len = 0;
+	this->pkt_q_capacity = 0;
+	this->pkt_q_size     = 0;
+	this->pkt_q_head     = -1;
+	this->pkt_q_tail     = -1;
+	this->pkt_q          = nullptr;
+	this->stat_total_ack_time = 0;
+	this->stat_count_acks     = 0;
+	this->stat_max_ack_time   = 0;
+	this->stat_min_ack_time   = 0;
+	this->stat_count_resent   = 0;
+	this->stat_max_resent     = 0;
+	this->stat_count_dropped  = 0;
+
+	this->state = mcsNull;
+	this->sockfd = -1;
+	this->msgSize = 0;
+	this->tupleCount = 0;
+	this->stillActive = false;
+	this->stopRequested = false;
+	this->cdbProc = NULL;
+	this->opaque_data = NULL;
+	this->sent_record_typmod = 0;
+
+	/*
+	 * "UDPConn dummyconn(NULL)" will be called by handleMismatch() in rx thread,
+	 * it will lead to the error: "palloc called from thread". So code below should
+	 * be called in MakeSendEntry() and MakeRecvEntry();
+	 * if (global_param.createOpaqueDataCallback)
+	 *	this->opaque_data = global_param.createOpaqueDataCallback();
+	 */
+
+	this->entry_ = entry;
+}
+
+UDPConn*
+TransportEntry::GetConn(int index)
+{
+	Assert(index >= 0);
+
+	if (index >= 0 && static_cast<size_t>(index) < this->conns_.size())
+		return this->conns_[index].get();
+
+	std::stringstream ss;
+	ss << "invalid index for conn, index: " << index << ", conn size: " << conns_.size();
+	throw ICInvalidIndex(ss.str(), __FILE__, __LINE__);
+}
+
+/*
+ * aggregateStatistics
+ * 		aggregate statistics.
+ */
+void
+TransportEntry::aggregateStatistics()
+{
+	/*
+	 * We first clear the stats, and then compute new stats by aggregating the
+	 * stats from each connection.
+	 */
+	this->stat_total_ack_time = 0;
+	this->stat_count_acks = 0;
+	this->stat_max_ack_time = 0;
+	this->stat_min_ack_time = ~((uint64) 0);
+	this->stat_count_resent = 0;
+	this->stat_max_resent = 0;
+	this->stat_count_dropped = 0;
+
+	Assert(this->numConns == static_cast<int>(this->conns_.size()));
+	for (int connNo = 0; connNo < this->numConns; connNo++)
+	{
+		UDPConn *conn = this->GetConn(connNo);
+
+		this->stat_total_ack_time += conn->stat_total_ack_time;
+		this->stat_count_acks += conn->stat_count_acks;
+		this->stat_max_ack_time = Max(this->stat_max_ack_time, conn->stat_max_ack_time);
+		this->stat_min_ack_time = Min(this->stat_min_ack_time, conn->stat_min_ack_time);
+		this->stat_count_resent += conn->stat_count_resent;
+		this->stat_max_resent = Max(this->stat_max_resent, conn->stat_max_resent);
+		this->stat_count_dropped += conn->stat_count_dropped;
+	}
+}
+
+/*
+ * handleAck
+ * 		handle acks incoming from our upstream peers.
+ *
+ * if we receive a stop message, return true (caller will clean up).
+ */
+bool
+TransportEntry::handleAcks(bool need_flush)
+{
+	bool		ret = false;
+	UDPConn *ackConn = NULL;
+	int			n;
+
+	struct sockaddr_storage peer;
+	socklen_t	peerlen;
+
+	struct icpkthdr *pkt = snd_control_info.ackBuffer;
+	bool shouldSendBuffers = false;
+
+	for (;;)
+	{
+
+		/* ready to read on our socket ? */
+		peerlen = sizeof(peer);
+		n = recvfrom(this->txfd, (char *) pkt, MIN_PACKET_SIZE, 0,
+					 (struct sockaddr *) &peer, &peerlen);
+
+		if (n < 0)
+		{
+			if (errno == EWOULDBLOCK)	/* had nothing to read. */
+			{
+				this->aggregateStatistics();
+				return ret;
+			}
+
+			CHECK_INTERRUPTS(this->state);
+
+			if (errno == EINTR)
+				continue;
+
+			throw ICNetworkException("ERROR, interconnect error waiting for peer ack, During recvfrom() call.", __FILE__, __LINE__);
+		}
+		else if (n < int(sizeof(struct icpkthdr)))
+		{
+			continue;
+		}
+		else if (n != int(pkt->len))
+		{
+			continue;
+		}
+
+		/*
+		 * check the CRC of the payload.
+		 */
+		if (session_param.gp_interconnect_full_crc)
+		{
+			if (!checkCRC(pkt))
+			{
+				ic_atomic_add_fetch_u32((ic_atomic_uint32 *) &ic_statistics.crcErrors, 1);
+				if (IC_DEBUG2 >= session_param.log_min_messages)
+					LOG(DEBUG2, "received network data error, dropping bad packet, user data unaffected.");
+				continue;
+			}
+		}
+
+		/*
+		 * read packet, is this the ack we want ?
+		 */
+		if (pkt->srcContentId == global_param.segindex &&
+			pkt->srcPid == global_param.MyProcPid &&
+			pkt->srcListenerPort == (UDP2_GetListenPortUDP()) &&
+			pkt->sessionId == session_param.gp_session_id &&
+			pkt->icId == this->state->icInstanceId)
+		{
+			Assert(pkt->motNodeId == motNodeId);
+			LOG(DEBUG3, "TransportEntry::handleAcks(): icid: %d, motNodeId: %d, srcSeg: %d, dstSeg: %d, srcPid: %d, dstPid: %d, seq: %d, extraSeq: %d, len: %d, flags: %s",
+					pkt->icId, pkt->motNodeId, pkt->srcContentId, pkt->dstContentId, pkt->srcPid, pkt->dstPid, pkt->seq, pkt->extraSeq, pkt->len, flags2txt(pkt->flags));
+
+			/*
+			 * packet is for me. Note here we do not need to get a connection
+			 * lock here, since background rx thread only read the hash table.
+			 */
+			ackConn = ic_control_info.connHtab.find(pkt);
+			if (ackConn == NULL)
+			{
+				LOG(INFO, "Received ack for unknown connection (flags 0x%x)", pkt->flags);
+				continue;
+			}
+
+			ackConn->stat_count_acks++;
+			ic_statistics.recvAckNum++;
+
+			uint64 now = getCurrentTime();
+
+			ackConn->deadlockCheckBeginTime = now;
+
+			/*
+			 * We simply disregard pkt losses (NAK) due to process start race
+			 * (that is, sender is started earlier than receiver. rx
+			 * background thread may receive packets when connections are not
+			 * created yet).
+			 *
+			 * Another option is to resend the packet immediately, but
+			 * experiments do not show any benefits.
+			 */
+			if (pkt->flags & UDPIC_FLAGS_NAK)
+				continue;
+
+			while (true)
+			{
+				if (pkt->flags & UDPIC_FLAGS_CAPACITY)
+				{
+					if (pkt->extraSeq > ackConn->consumedSeq)
+					{
+						ackConn->capacity += pkt->extraSeq - ackConn->consumedSeq;
+						ackConn->consumedSeq = pkt->extraSeq;
+						shouldSendBuffers = true;
+					}
+				}
+				else if (pkt->flags & UDPIC_FLAGS_DUPLICATE)
+				{
+					if (IC_DEBUG1 >= session_param.log_min_messages)
+						LOG(DEBUG1, "GOTDUPACK [seq %d] from route %d; srcpid %d dstpid %d cmd %d flags 0x%x connseq %d",
+								  pkt->seq, ackConn->route, pkt->srcPid, pkt->dstPid, pkt->icId, pkt->flags, ackConn->conn_info.seq);
+
+					shouldSendBuffers |= (ackConn->handleAckForDuplicatePkt(pkt));
+					break;
+				}
+				else if (pkt->flags & UDPIC_FLAGS_DISORDER)
+				{
+					if (IC_DEBUG1 >= session_param.log_min_messages)
+						LOG(DEBUG1, "GOTDISORDER [seq %d] from route %d; srcpid %d dstpid %d cmd %d flags 0x%x connseq %d",
+									pkt->seq, ackConn->route, pkt->srcPid, pkt->dstPid, pkt->icId, pkt->flags, ackConn->conn_info.seq);
+
+					shouldSendBuffers |= (ackConn->handleAckForDisorderPkt(pkt));
+					break;
+				}
+				else if (pkt->flags & UDPIC_FLAGS_FULL)
+				{
+					if (IC_DEBUG1 >= session_param.log_min_messages)
+						LOG(DEBUG1, "Recv buff is full [seq %d] from route %d; srcpid %d dstpid %d cmd %d flags 0x%x connseq %d", pkt->seq, ackConn->route, pkt->srcPid, pkt->dstPid, pkt->icId, pkt->flags, ackConn->conn_info.seq);
+					break;
+				}
+
+				/*
+				 * don't get out of the loop if pkt->seq equals to
+				 * ackConn->receivedAckSeq, need to check UDPIC_FLAGS_STOP
+				 * flag
+				 */
+				if (pkt->seq < ackConn->receivedAckSeq)
+				{
+					if (IC_DEBUG1 >= session_param.log_min_messages)
+						LOG(DEBUG1, "ack with bad seq?! expected (%d, %d] got %d flags 0x%x, capacity %d consumedSeq %d",
+									ackConn->receivedAckSeq, ackConn->sentSeq, pkt->seq, pkt->flags, ackConn->capacity, ackConn->consumedSeq);
+					break;
+				}
+
+				/* haven't gotten a stop request, maybe this is one ? */
+				if ((pkt->flags & UDPIC_FLAGS_STOP) && !ackConn->stopRequested && ackConn->stillActive)
+				{
+#ifdef AMS_VERBOSE_LOGGING
+					LOG(INFO, "got ack with stop; srcpid %d dstpid %d cmd %d flags 0x%x pktseq %d connseq %d",
+							  pkt->srcPid, pkt->dstPid, pkt->icId, pkt->flags, pkt->seq, ackConn->conn_info.seq);
+#endif
+					ackConn->stopRequested = true;
+					ackConn->conn_info.flags |= UDPIC_FLAGS_STOP;
+					ret = true;
+					/* continue to deal with acks */
+				}
+
+				if (pkt->seq == ackConn->receivedAckSeq)
+				{
+					if (IC_DEBUG1 >= session_param.log_min_messages)
+						LOG(DEBUG1, "ack with bad seq?! expected (%d, %d] got %d flags 0x%x, capacity %d consumedSeq %d",
+									ackConn->receivedAckSeq, ackConn->sentSeq, pkt->seq, pkt->flags, ackConn->capacity, ackConn->consumedSeq);
+					break;
+				}
+
+				/* deal with a regular ack. */
+				if (pkt->flags & UDPIC_FLAGS_ACK)
+				{
+					ICBufferLink *link = NULL;
+					ICBufferLink *next = NULL;
+					ICBuffer   *buf = NULL;
+
+#ifdef AMS_VERBOSE_LOGGING
+					LOG(INFO, "GOTACK [seq %d] from route %d; srcpid %d dstpid %d cmd %d flags 0x%x connseq %d",
+							  pkt->seq, ackConn->route, pkt->srcPid, pkt->dstPid, pkt->icId, pkt->flags, ackConn->conn_info.seq);
+#endif
+
+					link = ackConn->unackQueue.first();
+					buf = GET_ICBUFFER_FROM_PRIMARY(link);
+
+					while (!ackConn->unackQueue.is_head(link) && buf->pkt->seq <= pkt->seq)
+					{
+						next = link->next;
+						ackConn->handleAckedPacket(buf, now, pkt);
+						shouldSendBuffers = true;
+						link = next;
+						buf = GET_ICBUFFER_FROM_PRIMARY(link);
+					}
+				}
+				break;
+			}
+
+			/*
+			 * When there is a capacity increase or some outstanding buffers
+			 * removed from the unack queue ring, we should try to send
+			 * buffers for the connection. Even when stop is received, we
+			 * still send here, since in STOP/EOS race case, we may have been
+			 * in EOS sending logic and will not check stop message.
+			 */
+			if (shouldSendBuffers && need_flush)
+				ackConn->sendBuffers();
+		}
+		else
+		{
+			if (IC_DEBUG1 >= session_param.log_min_messages)
+				LOG(DEBUG1, "handleAck: not the ack we're looking for (flags 0x%x)...mot(%d) content(%d:%d) srcpid(%d:%d) "
+						"dstpid(%d) srcport(%d:%d) dstport(%d) sess(%d:%d) cmd(%d:%d)",
+						pkt->flags, pkt->motNodeId, pkt->srcContentId, global_param.segindex,
+						pkt->srcPid, global_param.MyProcPid, pkt->dstPid, pkt->srcListenerPort,
+						(UDP2_GetListenPortUDP()), pkt->dstListenerPort, pkt->sessionId, session_param.gp_session_id,
+						pkt->icId, this->state->icInstanceId);
+		}
+	}
+
+	return ret;
+}
+
+/*
+ * handleStopMsgs
+ *		handle stop messages.
+ *
+ */
+void
+TransportEntry::handleStopMsgs()
+{
+	int			i = 0;
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(DEBUG3, "handleStopMsgs: node %d", this->motNodeId);
+#endif
+
+	while (i < this->numConns)
+	{
+		UDPConn *conn = this->GetConn(i);
+
+#ifdef AMS_VERBOSE_LOGGING
+		LOG(DEBUG3, "handleStopMsgs: node %d route %d %s %s", this->motNodeId, conn->route,
+				(conn->stillActive ? "active" : "NOT active"), (conn->stopRequested ? "stop requested" : ""));
+		LOG(DEBUG3, "handleStopMsgs: node %d route %d msgSize %d",
+				this->motNodeId, conn->route, conn->msgSize);
+#endif
+
+		/*
+		 * MPP-2427: we're guaranteed to have recently flushed, but this might
+		 * not be empty (if we got a stop on a buffer that wasn't the one we
+		 * were sending) ... empty it first so the outbound buffer is empty
+		 * when we get here.
+		 */
+		conn->handleStop();
+
+		i++;
+
+		if (i == this->numConns)
+		{
+			if (this->pollAcks(0))
+			{
+				bool rs = this->handleAcks(true);
+				if (rs)
+				{
+					/* more stops found, loop again. */
+					i = 0;
+					continue;
+				}
+			}
+		}
+	}
+}
+
+/*
+ * pollAcks
+ * 		Timeout polling of acks
+ */
+bool
+TransportEntry::pollAcks(int timeout)
+{
+	struct pollfd nfd;
+	int			n;
+
+	nfd.fd = this->txfd;
+	nfd.events = POLLIN;
+
+	n = poll(&nfd, 1, timeout);
+	if (n < 0)
+	{
+		CHECK_INTERRUPTS(this->state);
+
+		if (errno == EINTR)
+			return false;
+
+		throw ICNetworkException("ERROR, interconnect error waiting for peer ack During poll() call.", __FILE__, __LINE__);
+		/* not reached */
+	}
+
+	if (n == 0)					/* timeout */
+	{
+		return false;
+	}
+
+	/* got an ack to handle (possibly a stop message) */
+	if (n == 1 && (nfd.events & POLLIN))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+std::unique_ptr<TransportEntry>
+TransportEntry::MakeRecvEntry(CChunkTransportStateImpl *state,
+							  int icid,
+							  ICExecSlice *sendSlice,
+							  ICExecSlice *recvSlice)
+{
+	int			incoming_count = 0;
+	int			expectedTotalIncoming = 0;
+
+	Assert(sendSlice->sliceIndex > 0);
+	Assert(recvSlice->sliceIndex >= 0);
+
+	int motNodeID = sendSlice->sliceIndex;
+	int numConns  = sendSlice->numPrimaryProcesses;
+
+	std::unique_ptr<TransportEntry> pEntry =
+		std::make_unique<TransportEntry>(state, motNodeID, numConns, sendSlice, recvSlice);
+
+	pEntry->conns_.resize(numConns);
+	for (int i = 0; i < numConns; ++i)
+	{
+		pEntry->conns_[i] = std::make_unique<UDPConn>(pEntry.get());
+		UDPConn *conn = pEntry->conns_[i].get();
+
+		Assert(i < sendSlice->numPrimaryProcesses);
+		ICCdbProcess *cdbProc = sendSlice->primaryProcesses + i;
+		if (cdbProc->valid)
+		{
+			conn->cdbProc = cdbProc;
+
+			expectedTotalIncoming++;
+
+			/* rx_buffer_queue */
+			conn->pkt_q_capacity = session_param.Gp_interconnect_queue_depth;
+			conn->pkt_q_size = 0;
+			conn->pkt_q_head = 0;
+			conn->pkt_q_tail = 0;
+
+			if (global_param.simpleFaultInjectorCallback)
+				global_param.simpleFaultInjectorCallback("interconnect_setup_palloc");
+
+			conn->pkt_q = (uint8 **) ic_malloc0(conn->pkt_q_capacity * sizeof(uint8 *));
+
+			/* update the max buffer count of our rx buffer pool.  */
+			rx_buffer_pool.maxCount += conn->pkt_q_capacity;
+
+			/*
+			 * connection header info (defining characteristics of this
+			 * connection)
+			 */
+			memset(&conn->conn_info, 0, sizeof(conn->conn_info));
+			conn->route = i;
+
+			conn->conn_info.seq = 1;
+			conn->stillActive = true;
+
+			incoming_count++;
+
+			conn->conn_info.motNodeId = pEntry->motNodeId;
+			conn->conn_info.recvSliceIndex = recvSlice->sliceIndex;
+			conn->conn_info.sendSliceIndex = sendSlice->sliceIndex;
+
+			conn->conn_info.srcContentId = conn->cdbProc->contentid;
+			conn->conn_info.dstContentId = global_param.segindex;
+
+			conn->conn_info.srcListenerPort = conn->cdbProc->listenerPort;
+			conn->conn_info.dstListenerPort = UDP2_GetListenPortUDP();
+			conn->conn_info.srcPid          = conn->cdbProc->pid;
+			conn->conn_info.dstPid          = global_param.MyProcPid;
+			conn->conn_info.sessionId       = session_param.gp_session_id;
+			conn->conn_info.icId            = icid;
+			conn->conn_info.flags           = UDPIC_FLAGS_RECEIVER_TO_SENDER;
+
+			conn->rttvar.ts_rto = 0;
+			conn->rttvar.rto = UDP_INITIAL_RTO;
+			conn->rttvar.srtt = 0;
+			conn->rttvar.rttvar = 0;
+			conn->rttvar.snd_una = 0;
+			conn->rttvar.nrtx = 0;
+			conn->rttvar.max_nrtx = 0;
+			conn->rttvar.mss = UDP_DEFAULT_MSS;
+			conn->rttvar.cwnd = 2;
+			conn->rttvar.ssthresh = UDP_INFINITE_SSTHRESH;
+			conn->rttvar.loss_count = 0;
+			conn->rttvar.karn_mode = false;
+			conn->on_rto_idx = -1;
+			ic_control_info.connHtab.add(conn);
+
+			if (global_param.createOpaqueDataCallback)
+				conn->opaque_data = global_param.createOpaqueDataCallback();
+		}
+	}
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+	{
+		LOG(DEBUG1, "SetupUDPInterconnect will activate "
+					"%d incoming, %d expect incoming for ic_instancce_id %d.",
+					incoming_count, expectedTotalIncoming, icid);
+	}
+
+	return pEntry;
+}
+
+std::unique_ptr<TransportEntry>
+TransportEntry::MakeSendEntry(CChunkTransportStateImpl *state,
+							  int icid,
+							  ICExecSlice *sendSlice,
+							  ICExecSlice *recvSlice)
+{
+	int			outgoing_count = 0;
+	int			expectedTotalOutgoing = 0;
+
+	Assert(sendSlice->sliceIndex > 0);
+	Assert(recvSlice->sliceIndex >= 0);
+
+	int motNodeID = sendSlice->sliceIndex;
+	int numConns  = recvSlice->numPrimaryProcesses;
+
+	std::unique_ptr<TransportEntry> pEntry =
+		std::make_unique<TransportEntry>(state, motNodeID, numConns, sendSlice, recvSlice);
+
+	pEntry->txfd = ICSenderSocket;
+	pEntry->txport = ICSenderPort;
+	pEntry->txfd_family = ICSenderFamily;
+
+	int route = 0;
+	pEntry->conns_.resize(numConns);
+
+	for (int i = 0; i < numConns; ++i)
+	{
+		pEntry->conns_[i] = std::make_unique<UDPConn>(pEntry.get());
+		UDPConn *conn = pEntry->conns_[i].get();
+
+		/*
+		* Setup a MotionConn entry for each of our outbound connections. Request
+		* a connection to each receiving backend's listening port. NB: Some
+		* mirrors could be down & have no CdbProcess entry.
+		*/
+		ICCdbProcess *cdbProc = recvSlice->primaryProcesses + i;
+		if (cdbProc->valid)
+		{
+			conn->cdbProc = cdbProc;
+			conn->sndQueue.init(ICBufferListType_Primary);
+			conn->unackQueue.init(ICBufferListType_Primary);
+			conn->capacity = session_param.Gp_interconnect_queue_depth;
+
+			/* send buffer pool must be initialized before this. */
+			snd_buffer_pool.maxCount += session_param.Gp_interconnect_snd_queue_depth;
+			snd_control_info.cwnd += 1;
+			conn->curBuff = snd_buffer_pool.get(conn);
+
+			/* should have at least one buffer for each connection */
+			Assert(conn->curBuff != NULL);
+
+			conn->rtt = DEFAULT_RTT;
+			conn->dev = DEFAULT_DEV;
+			conn->deadlockCheckBeginTime = 0;
+			conn->tupleCount = 0;
+			conn->msgSize = sizeof(conn->conn_info);
+			conn->sentSeq = 0;
+			conn->receivedAckSeq = 0;
+			conn->consumedSeq = 0;
+			conn->pBuff = (uint8 *) conn->curBuff->pkt;
+			conn->state = mcsSetupOutgoingConnection;
+			conn->route = route++;
+			expectedTotalOutgoing++;
+
+			setupOutgoingUDPConnection(icid, pEntry.get(), conn);
+			outgoing_count++;
+
+			if (global_param.createOpaqueDataCallback)
+				conn->opaque_data = global_param.createOpaqueDataCallback();
+		}
+	}
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+	{
+		LOG(DEBUG1, "SetupUDPInterconnect will activate "
+					"%d outgoing, %d expect outgoing routes for ic_instancce_id %d.",
+					outgoing_count, expectedTotalOutgoing, icid);
+	}
+
+	return pEntry;
+}
+
+TransportEntry::TransportEntry(CChunkTransportStateImpl *state,
+							   int motNodeID,
+							   int numConns,
+							   ICExecSlice *sendSlice,
+							   ICExecSlice *recvSlice)
+{
+	/* the field of CChunkTransportStateEntry */
+	this->valid     = false;
+	this->conns     = nullptr;
+
+	/* the field of TransportEntry */
+	this->txfd        = -1;
+	this->txfd_family = -1;
+	this->txport      = 0;
+	this->sendingEos  = false;
+	this->stat_total_ack_time = 0;
+	this->stat_count_acks     = 0;
+	this->stat_max_ack_time   = 0;
+	this->stat_min_ack_time   = 0;
+	this->stat_count_resent   = 0;
+	this->stat_max_resent     = 0;
+	this->stat_count_dropped  = 0;
+
+	this->motNodeId = motNodeID;
+	this->numConns  = numConns;
+	this->scanStart = 0;
+	this->sendSlice = sendSlice;
+	this->recvSlice = recvSlice;
+	this->state     = state;
+	this->valid     = true;
+}
+
+/*
+ * receiveChunksUDPIFC
+ * 		Receive chunks from the senders
+ *
+ * MUST BE CALLED WITH ic_control_info.lock LOCKED.
+ */
+void
+TransportEntry::receiveChunksUDPIFC(int16 *srcRoute,
+									UDPConn *conn,
+									GetDataLenInPacket getLen,
+									DataBlock *data)
+{
+	int			retries = 0;
+	bool		directed = false;
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(DEBUG5, "receivechunksUDP: motnodeid %d", this->motNodeId);
+#endif
+
+	if (conn != nullptr)
+	{
+		directed = true;
+		*srcRoute = conn->route;
+		rx_control_info.mainWaitingState.set(this->motNodeId, conn->route, this->state->icInstanceId);
+	}
+	else
+	{
+		/* non-directed receive */
+		rx_control_info.mainWaitingState.set(this->motNodeId, ANY_ROUTE, this->state->icInstanceId);
+	}
+
+	std::unique_lock<std::mutex> lock(mtx);
+	auto timeout = std::chrono::milliseconds(MAIN_THREAD_COND_TIMEOUT_MS);
+
+	/* we didn't have any data, so we've got to read it from the network. */
+	for (;;)
+	{
+		UDPConn *rxconn = nullptr;
+
+		/* 1. Do we have data ready */
+		if (rx_control_info.mainWaitingState.reachRoute != ANY_ROUTE)
+		{
+			rxconn = this->GetConn(rx_control_info.mainWaitingState.reachRoute);
+			rxconn->prepareRxConnForRead();
+
+			LOG(DEBUG2, "receiveChunksUDPIFC: non-directed rx woke on route %d", rx_control_info.mainWaitingState.reachRoute);
+			rx_control_info.mainWaitingState.reset();
+		}
+
+		this->aggregateStatistics();
+		if (rxconn)
+		{
+			Assert(rxconn->pBuff);
+
+			pthread_mutex_unlock(&ic_control_info.lock);
+
+			LOG(DEBUG2, "got data with length %d", rxconn->recvBytes);
+			/* successfully read into this connection's buffer. */
+			rxconn->GetDataInBuf(getLen, data);
+
+			if (!directed)
+				*srcRoute = rxconn->route;
+
+			return;
+		}
+
+		retries++;
+
+		/*
+		 * Ok, we've processed all the items currently in the queue. Arm the
+		 * latch (before releasing the mutex), and wait for more messages to
+		 * arrive. The RX thread will wake us up using the latch.
+		 */
+		pthread_mutex_unlock(&ic_control_info.lock);
+
+		if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		{
+			LOG(DEBUG5, "waiting (timed) on route %d %s", rx_control_info.mainWaitingState.waitingRoute,
+						(rx_control_info.mainWaitingState.waitingRoute == ANY_ROUTE ? "(any route)" : ""));
+		}
+
+		/*
+		 * Wait for data to become ready.
+		 *
+		 * In the QD, also wake up immediately if any QE reports an
+		 * error through the main QD-QE libpq connection. For that, ask
+		 * the dispatcher for a file descriptor to wait on for that.
+		 */
+		cv.wait_for(lock, timeout, []{return rx_control_info.mainWaitingState.reachRoute != ANY_ROUTE;});
+
+		/* check the potential errors in rx thread. */
+		checkRxThreadError();
+
+		/* do not check interrupts when holding the lock */
+		CHECK_INTERRUPTS(this->state);
+
+		/* check to see if the task coordinator should cancel */
+		CHECK_CANCEL(this->state);
+
+		/*
+		 * 1. NIC on master (and thus the QD connection) may become bad, check
+		 * it. 2. Postmaster may become invalid, check it
+		 */
+		if ((retries & 0x3f) == 0)
+		{
+			checkQDConnectionAlive();
+			CHECK_POSTMASTER_ALIVE();
+		}
+
+		pthread_mutex_lock(&ic_control_info.lock);
+
+	} /* for (;;) */
+
+	/* We either got data, or get cancelled. We never make it out to here. */
+	return;				/* make GCC behave */
+}
+
+void
+UDPConn::GetDataInBuf(GetDataLenInPacket getLen, DataBlock *data)
+{
+	int bytesProcessed = 0;
+
+	Assert(data);
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(DEBUG5, "recvtuple chunk recv bytes %d msgsize %d conn->pBuff %p conn->msgPos: %p",
+			this->recvBytes, this->msgSize, this->pBuff, this->msgPos);
+#endif
+
+	int ic_hdr_size = sizeof(struct icpkthdr);
+
+	data->pos = this->msgPos + ic_hdr_size;
+	int rc = getLen ? getLen(data->pos, this->msgSize - ic_hdr_size) : (this->msgSize - ic_hdr_size);
+	if (rc < 0)
+	{
+		std::stringstream ss;
+		ss << "Failed to call getLen in GetDataInBuf, result: " << rc;
+		throw ICException(ss.str(), __FILE__, __LINE__);
+	}
+	data->len = rc;
+
+	bytesProcessed += ic_hdr_size;
+	bytesProcessed += data->len;
+
+	Assert(bytesProcessed == this->msgSize);
+
+	this->recvBytes -= this->msgSize;
+	if (this->recvBytes != 0)
+	{
+#ifdef AMS_VERBOSE_LOGGING
+		LOG(DEBUG5, "residual message %d bytes", this->recvBytes);
+#endif
+		this->msgPos += this->msgSize;
+	}
+
+	this->msgSize = 0;
+}
+
+/*
+ * RecvTupleChunkFromAnyUDPIFC_Internal
+ * 		Receive tuple chunks from any route (connections)
+ */
+void
+TransportEntry::RecvAny(int16 *srcRoute,
+						GetDataLenInPacket getLen,
+						DataBlock *data)
+{
+	int			index,
+				activeCount = 0;
+	bool		found = false;
+
+	UDPConn *conn;
+
+	index = this->scanStart;
+
+	pthread_mutex_lock(&ic_control_info.lock);
+
+	for (int i = 0; i < this->numConns; i++, index++)
+	{
+		if (index >= this->numConns)
+			index = 0;
+
+		conn = this->GetConn(index);
+		if (conn->stillActive)
+			activeCount++;
+
+		ic_statistics.totalRecvQueueSize += conn->pkt_q_size;
+		ic_statistics.recvQueueSizeCountingTime++;
+
+		if (conn->pkt_q_size > 0)
+		{
+			found = true;
+			conn->prepareRxConnForRead();
+			break;
+		}
+	}
+
+	if (found)
+	{
+		pthread_mutex_unlock(&ic_control_info.lock);
+
+		conn->GetDataInBuf(getLen, data);
+
+		*srcRoute = conn->route;
+		this->scanStart = index + 1;
+		return;
+	}
+
+	/* no data pending in our queue */
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "RecvTupleChunkFromAnyUDPIFC(): activeCount is %d", activeCount);
+#endif
+	if (activeCount == 0)
+	{
+		pthread_mutex_unlock(&ic_control_info.lock);
+		return;
+	}
+
+	/* receiveChunksUDPIFC() releases ic_control_info.lock as a side-effect */
+	this->receiveChunksUDPIFC(srcRoute, nullptr, getLen, data);
+
+	this->scanStart = *srcRoute + 1;
+}
+
+/*
+ * RecvTupleChunkFromUDPIFC_Internal
+ * 		Receive tuple chunks from a specific route (connection)
+ */
+void
+TransportEntry::RecvRoute(int16 srcRoute, GetDataLenInPacket getLen, DataBlock *data)
+{
+	UDPConn *conn = this->GetConn(srcRoute);
+
+#ifdef AMS_VERBOSE_LOGGING
+	if (!conn->stillActive)
+	{
+		LOG(INFO, "RecvTupleChunkFromUDPIFC(): connection inactive ?!");
+	}
+#endif
+
+	pthread_mutex_lock(&ic_control_info.lock);
+
+	if (!conn->stillActive)
+	{
+		pthread_mutex_unlock(&ic_control_info.lock);
+		return;
+	}
+
+	ic_statistics.totalRecvQueueSize += conn->pkt_q_size;
+	ic_statistics.recvQueueSizeCountingTime++;
+
+	if (conn->pkt_q[conn->pkt_q_head] != NULL)
+	{
+		conn->prepareRxConnForRead();
+
+		pthread_mutex_unlock(&ic_control_info.lock);
+
+		conn->GetDataInBuf(getLen, data);
+
+		return;
+	}
+
+	/* no existing data, we've got to read a packet */
+	/* receiveChunksUDPIFC() releases ic_control_info.lock as a side-effect */
+	int16 route;
+	this->receiveChunksUDPIFC(&route, conn, getLen, data);
+}
+
+/*
+ * TeardownUDPIFCInterconnect_Internal
+ * 		Helper function for TeardownUDPIFCInterconnect.
+ *
+ * Developers should pay attention to:
+ *
+ * 1) Do not handle interrupts/throw errors in Teardown, otherwise, Teardown may be called twice.
+ *    It will introduce an undefined behavior. And memory leaks will be introduced.
+ *
+ * 2) Be careful about adding elog/ereport/write_log in Teardown function,
+ *    esp, out of HOLD_INTERRUPTS/RESUME_INTERRUPTS pair, since elog/ereport/write_log may
+ *    handle interrupts.
+ *
+ */
+void
+CChunkTransportStateImpl::teardown(bool hasErrors)
+{
+	bool		isReceiver = false;
+
+	/* Log the start of TeardownInterconnect. */
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_TERSE_IC)
+	{
+		LogSeverity elevel = INFO;
+
+		if (hasErrors || !this->activated)
+		{
+			if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+				elevel = INFO;
+			else
+				elevel = DEBUG1;
+		}
+		else if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+			elevel = DEBUG4;
+
+		if (elevel)
+		{
+			ICExecSlice *mySlice = &this->sliceTable->slices[this->sliceId];
+			LOG(elevel, "Interconnect seg%d slice%d cleanup state: %s; setup was %s",
+						global_param.segindex, mySlice->sliceIndex,
+						hasErrors ? "hasErrors" : "normal",
+						this->activated ? "completed" : "exited");
+		}
+
+		/* if setup did not complete, log the slicetable */
+		if (!this->activated && session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		{
+			//elog_node_display(DEBUG3, "local slice table", this->sliceTable, true);
+			//TODO: print real slicetable;
+			LOG(DEBUG3, "local slice table: ####");
+		}
+	}
+
+	/*
+	 * The long jump with CheckXXX() in receiveChunksUDPIFC() introduces the
+	 * locked mtx, so unlock it here.
+	 */
+	mtx.unlock();
+
+	/*
+	 * add lock to protect the hash table, since background thread is still
+	 * working.
+	 */
+	pthread_mutex_lock(&ic_control_info.lock);
+
+	if (session_param.gp_interconnect_cache_future_packets)
+		cleanupStartupCache();
+
+	/*
+	 * Now "normal" connections which made it through our peer-registration
+	 * step. With these we have to worry about "in-flight" data.
+	 */
+	this->DestroySendEntries();
+
+	/*
+	 * Previously, there is a piece of code that deals with pending stops. Now
+	 * it is delegated to background rx thread which will deal with any
+	 * mismatched packets.
+	 */
+
+	/*
+	 * cleanup all of our Receiving Motion nodes, these get closed immediately
+	 * (the receiver know for real if they want to shut down -- they aren't
+	 * going to be processing any more data).
+	 */
+	this->DestroyRecvEntries(&isReceiver);
+
+	/*
+	 * now that we've moved active rx-buffers to the freelist, we can prune
+	 * the freelist itself
+	 */
+	while (rx_buffer_pool.count > rx_buffer_pool.maxCount)
+	{
+		icpkthdr   *buf = NULL;
+
+		/* If this happened, there are some memory leaks.. */
+		if (rx_buffer_pool.freeList == NULL)
+		{
+			pthread_mutex_unlock(&ic_control_info.lock);
+
+			std::stringstream ss;
+			ss << "FATAL: freelist NULL: count " << rx_buffer_pool.count
+			   << " max " << rx_buffer_pool.maxCount << " buf " << rx_buffer_pool.freeList;
+			throw ICFatalException(ss.str(), __FILE__, __LINE__);
+		}
+
+		buf = rx_buffer_pool.get_free();
+		rx_buffer_pool.release(buf);
+	}
+
+	/*
+	 * Update the history of interconnect instance id.
+	 */
+	if (global_param.Gp_role == GP_ROLE_DISPATCH_IC)
+	{
+		rx_control_info.cursorHistoryTable.update(this->icInstanceId, 0);
+	}
+	else if (global_param.Gp_role == GP_ROLE_EXECUTE_IC)
+	{
+		rx_control_info.lastTornIcId = this->icInstanceId;
+	}
+
+	if (IC_DEBUG1 >= session_param.log_min_messages)
+	{
+		LOG(DEBUG1, "Interconnect State: "
+					"isSender %d isReceiver %d "
+					"snd_queue_depth %d recv_queue_depth %d Gp_max_packet_size %d "
+					"UNACK_QUEUE_RING_SLOTS_NUM %d TIMER_SPAN %lld DEFAULT_RTT %d "
+					"hasErrors %d, ic_instance_id %d ic_id_last_teardown %d "
+					"snd_buffer_pool.count %d snd_buffer_pool.maxCount %d snd_sock_bufsize %d recv_sock_bufsize %d "
+					"snd_pkt_count %d retransmits %d crc_errors %d"
+					" recv_pkt_count %d recv_ack_num %d"
+					" recv_queue_size_avg %f"
+					" capacity_avg %f"
+					" freebuf_avg %f "
+					"mismatch_pkt_num %d disordered_pkt_num %d duplicated_pkt_num %d"
+					" cwnd %f status_query_msg_num %d",
+					ic_control_info.isSender, isReceiver,
+					session_param.Gp_interconnect_snd_queue_depth, session_param.Gp_interconnect_queue_depth, global_param.Gp_max_packet_size,
+					UNACK_QUEUE_RING_SLOTS_NUM, TIMER_SPAN, DEFAULT_RTT,
+					hasErrors, this->icInstanceId, rx_control_info.lastTornIcId,
+					snd_buffer_pool.count, snd_buffer_pool.maxCount, ic_control_info.socketSendBufferSize, ic_control_info.socketRecvBufferSize,
+					ic_statistics.sndPktNum, ic_statistics.retransmits, ic_statistics.crcErrors,
+					ic_statistics.recvPktNum, ic_statistics.recvAckNum,
+					(double) ((double) ic_statistics.totalRecvQueueSize) / ((double) ic_statistics.recvQueueSizeCountingTime),
+					(double) ((double) ic_statistics.totalCapacity) / ((double) ic_statistics.capacityCountingTime),
+					(double) ((double) ic_statistics.totalBuffers) / ((double) ic_statistics.bufferCountingTime),
+					ic_statistics.mismatchNum, ic_statistics.disorderedPktNum, ic_statistics.duplicatedPktNum,
+					snd_control_info.cwnd, ic_statistics.statusQueryMsgNum);
+	}
+
+	ic_control_info.isSender = false;
+	memset(&ic_statistics, 0, sizeof(ICStatistics));
+
+	pthread_mutex_unlock(&ic_control_info.lock);
+
+	/* reset the rx thread network error flag */
+	resetRxThreadError();
+
+	/* free sliceTable */
+	if (this->sliceTable)
+	{
+		ICSliceTable *ic_tbl = this->sliceTable;
+		for (int i = 0; i < ic_tbl->numSlices; ++i)
+		{
+			ICExecSlice *ic_slice = ic_tbl->slices + i;
+			ic_free(ic_slice->children);
+			ic_free(ic_slice->primaryProcesses);
+		}
+		ic_free(ic_tbl->slices);
+		ic_free(ic_tbl);
+	}
+
+	this->activated = false;
+	this->sliceTable = NULL;
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_TERSE_IC)
+		LOG(DEBUG1, "TeardownUDPIFCInterconnect_Internal successful");
+}
+
+void
+TransportEntry::Broadcast(DataBlock *data, int *inactiveCountPtr)
+{
+	int			*p_inactive = inactiveCountPtr;
+	int			index, inactive = 0;
+
+	/* add our tcItem to each of the outgoing buffers. */
+	index = Max(0, global_param.segindex); /* entry-db has -1 */
+	for (int i = 0; i < this->numConns; i++, index++)
+	{
+		if (index >= this->numConns)
+			index = 0;
+
+		UDPConn *conn = this->GetConn(index);
+
+		/* only send to still interested receivers. */
+		if (conn->stillActive)
+		{
+			conn->Send(data);
+			if (!conn->stillActive)
+				inactive++;
+		}
+	}
+
+	if (p_inactive != NULL)
+		*p_inactive = (inactive ? 1 : 0);
+}
+
+TransportEntry*
+CChunkTransportStateImpl::GetEntry(int motNodeID, bool checkValid)
+{
+	if (motNodeID > 0 && motNodeID <= static_cast<int>(this->entries_.size()))
+	{
+		TransportEntry *pEntry = this->entries_[motNodeID - 1].get();
+		if (pEntry != nullptr)
+		{
+			if (!checkValid)
+				return pEntry;
+			if (pEntry->motNodeId == motNodeID && pEntry->valid)
+				return pEntry;
+		}
+	}
+
+	std::stringstream ss;
+	ss << "ERROR, Interconnect Error: Unexpected Motion Node Id: " << motNodeID
+	   << ". This means a motion node that wasn't setup is requesting interconnect resources.";
+	throw ICInvalidIndex(ss.str(), __FILE__, __LINE__);
+}
+
+/*
+ * The number of the Receiving Motion may be > 1, such as
+ * Hashjoin
+ *   -> Redis Motion
+ *     ...
+ *   -> Hash
+ *     -> Redis Motion
+ *       ...
+ */
+void
+CChunkTransportStateImpl::CreateRecvEntries(ICSliceTable *sliceTable)
+{
+	ICExecSlice *mySlice = &sliceTable->slices[sliceTable->localSlice];
+
+	/* now we'll do some setup for each of our Receiving Motion Nodes. */
+	for (int child_index = 0; child_index < mySlice->numChildren; ++child_index)
+	{
+		int childId = mySlice->children[child_index];
+		ICExecSlice *sendSlice = &sliceTable->slices[childId];
+
+		if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+			LOG(DEBUG1, "Setup recving connections: my slice %d, childId %d", mySlice->sliceIndex, childId);
+
+		if (sendSlice->sliceIndex > static_cast<int>(this->entries_.size()))
+			this->entries_.resize(sendSlice->sliceIndex);
+		this->checkMotNodeID(sendSlice->sliceIndex);
+
+		std::unique_ptr<TransportEntry> pEntry =
+			TransportEntry::MakeRecvEntry(this, sliceTable->ic_instance_id, sendSlice, mySlice);
+		this->entries_[sendSlice->sliceIndex - 1] = std::move(pEntry);
+	}
+}
+
+void
+CChunkTransportStateImpl::CreateSendEntries(ICSliceTable *sliceTable)
+{
+	ICExecSlice *sendSlice = &sliceTable->slices[sliceTable->localSlice];
+
+	if (sendSlice->parentIndex == -1) {
+		ic_control_info.isSender = false;
+		ic_control_info.lastExpirationCheckTime = 0;
+		return;
+	}
+
+	snd_control_info.cwnd = 0;
+	snd_control_info.minCwnd = 0;
+	snd_control_info.ssthresh = 0;
+
+	snd_buffer_pool.init();
+	initUnackQueueRing(&unack_queue_ring);
+	if (session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_LOSS_TIMER_IC)
+		initUdpManager(&mudp);
+	ic_control_info.isSender = true;
+	ic_control_info.lastExpirationCheckTime = getCurrentTime();
+	ic_control_info.lastPacketSendTime = ic_control_info.lastExpirationCheckTime;
+	ic_control_info.lastDeadlockCheckTime = ic_control_info.lastExpirationCheckTime;
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "Interconnect seg%d slice%d setting up sending motion node",
+					global_param.segindex, sendSlice->sliceIndex);
+
+	if (sendSlice->sliceIndex > static_cast<int>(this->entries_.size()))
+		this->entries_.resize(sendSlice->sliceIndex);
+	this->checkMotNodeID(sendSlice->sliceIndex);
+
+	ICExecSlice *recvSlice = &sliceTable->slices[sendSlice->parentIndex];
+	std::unique_ptr<TransportEntry> pEntry =
+		TransportEntry::MakeSendEntry(this, sliceTable->ic_instance_id, sendSlice, recvSlice);
+
+	pEntry->txfd   = ICSenderSocket;
+	pEntry->txport = ICSenderPort;
+	pEntry->txfd_family = ICSenderFamily;
+
+	snd_control_info.minCwnd = snd_control_info.cwnd;
+	snd_control_info.ssthresh = snd_buffer_pool.maxCount;
+
+#ifdef TRANSFER_PROTOCOL_STATS
+	trans_proto_stats.init();
+#endif
+
+	this->entries_[sendSlice->sliceIndex - 1] = std::move(pEntry);
+}
+
+void
+CChunkTransportStateImpl::DestroyRecvEntries(bool *isReceiver)
+{
+	ICExecSlice *mySlice = &this->sliceTable->slices[this->sliceId];
+	for (int child_index = 0; child_index < mySlice->numChildren; ++child_index)
+	{
+		int childId = mySlice->children[child_index];
+		ICExecSlice *aSlice = &this->sliceTable->slices[childId];
+
+		/*
+		 * First check whether the entry is initialized to avoid the potential
+		 * errors thrown out from the removeChunkTransportState, which may
+		 * introduce some memory leaks.
+		 */
+		int motNodeID = aSlice->sliceIndex;
+		if (this->entries_[motNodeID - 1] == nullptr)
+			continue;
+
+		TransportEntry *pEntry = this->entries_[motNodeID - 1].get();
+		Assert(motNodeID == pEntry->motNodeId);
+
+		/* now it is safe to remove. */
+		if (!pEntry->valid)
+			continue;
+
+#ifdef USE_ASSERT_CHECKING
+		pEntry->dumpConnections("/tmp/receiving_entries");
+#endif
+		/* remove it */
+		pEntry->valid = false;
+
+		if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+			LOG(DEBUG1, "Interconnect closing connections from slice%d", aSlice->sliceIndex);
+
+		*isReceiver = true;
+
+		/*
+		 * receivers know that they no longer care about data from
+		 * below ... so we can safely discard data queued in both
+		 * directions
+		 */
+		for (size_t i = 0; i < pEntry->conns_.size(); ++i)
+		{
+			UDPConn *conn = pEntry->conns_[i].get();
+
+			Assert(conn);
+			if (!conn)
+				continue;
+
+			if (conn->cdbProc == NULL)
+				continue;
+
+			/* out of memory has occurred, break out */
+			if (!conn->pkt_q)
+				break;
+
+			rx_buffer_pool.maxCount -= conn->pkt_q_capacity;
+
+			ic_control_info.connHtab.remove(conn);
+
+			/*
+			 * ReleaseBuffer() dequeues messages and moves
+			 * them to pBuff
+			 */
+			while (conn->pkt_q_size > 0)
+				conn->ReleaseBuffer(NULL);
+
+			/* we also need to clear all the out-of-order packets */
+			conn->freeDisorderedPackets();
+
+			/* free up the packet queue */
+			ic_free(conn->pkt_q);
+			conn->pkt_q = NULL;
+
+			if (global_param.destroyOpaqueDataCallback)
+				global_param.destroyOpaqueDataCallback(&conn->opaque_data);
+
+			if (conn->curBuff)
+			{
+				ic_free(conn->curBuff);
+				conn->curBuff = NULL;
+			}
+		} // for conn
+
+		Assert(!pEntry->conns);
+	} // for entry
+}
+
+/*
+ * computeNetworkStatistics
+ * 		Compute the max/min/avg network statistics.
+ */
+static inline void
+computeNetworkStatistics(uint64 value, uint64 *min, uint64 *max, double *sum)
+{
+	if (value >= *max)
+		*max = value;
+	if (value <= *min)
+		*min = value;
+	*sum += value;
+}
+
+void
+CChunkTransportStateImpl::DestroySendEntries()
+{
+	ICExecSlice *mySlice = &this->sliceTable->slices[this->sliceId];
+	if (mySlice->parentIndex == -1)
+		return;
+
+	/* cleanup a Sending motion node. */
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+	{
+		ICExecSlice *parentSlice = &this->sliceTable->slices[mySlice->parentIndex];
+		LOG(DEBUG1, "Interconnect seg%d slice%d closing connections to slice%d (%d peers)",
+					global_param.segindex, mySlice->sliceIndex, mySlice->parentIndex,
+					parentSlice->numPrimaryProcesses);
+	}
+
+	/*
+	 * In the olden days, we required that the error case successfully
+	 * transmit and end-of-stream message here. But the introduction of
+	 * cdbdisp_check_estate_for_cancel() alleviates for the QD case, and
+	 * the cross-connection of writer gangs in the dispatcher (propagation
+	 * of cancel between them) fixes the I-S case.
+	 *
+	 * So the call to forceEosToPeers() is no longer required.
+	 */
+	int motNodeID = mySlice->sliceIndex;
+	if (this->entries_[motNodeID - 1] == nullptr)
+		return;
+
+	TransportEntry *pEntry = this->entries_[motNodeID - 1].get();
+	Assert(motNodeID == pEntry->motNodeId);
+
+	/* now it is safe to remove. */
+	if (!pEntry->valid)
+		return;
+
+#ifdef USE_ASSERT_CHECKING
+	pEntry->dumpConnections("/tmp/sending_entries");
+#endif
+
+	/* remove it */
+	pEntry->valid = false;
+
+	uint64		maxRtt = 0;
+	double		avgRtt = 0;
+	uint64		minRtt = ~((uint64) 0);
+
+	uint64		maxDev = 0;
+	double		avgDev = 0;
+	uint64		minDev = ~((uint64) 0);
+
+	/* connection array allocation may fail in interconnect setup. */
+	for (size_t i = 0; i < pEntry->conns_.size(); ++i)
+	{
+		UDPConn *conn = pEntry->conns_[i].get();
+
+		Assert(conn);
+		if (!conn)
+			continue;
+
+		if (!conn->cdbProc)
+			continue;
+
+		/* compute some statistics */
+		computeNetworkStatistics(conn->rtt, &minRtt, &maxRtt, &avgRtt);
+		computeNetworkStatistics(conn->dev, &minDev, &maxDev, &avgDev);
+
+		conn->sndQueue.release(false);
+		conn->unackQueue.release(session_param.Gp_interconnect_fc_method == INTERCONNECT_FC_METHOD_CAPACITY_IC ? false : true);
+
+		ic_control_info.connHtab.remove(conn);
+
+		if (conn->curBuff)
+		{
+			ic_free(conn->curBuff);
+			conn->curBuff = NULL;
+		}
+	}
+	avgRtt = avgRtt / pEntry->numConns;
+	avgDev = avgDev / pEntry->numConns;
+
+	/* free all send side buffers */
+	snd_buffer_pool.clean();
+
+	Assert(!pEntry->conns);
+
+#ifdef TRANSFER_PROTOCOL_STATS
+	trans_proto_stats.dump();
+#endif
+
+	if (IC_DEBUG1 >= session_param.log_min_messages)
+	{
+		LOG(DEBUG1, "Interconnect State: isSender %d DEFAULT_RTT %d rtt/dev [%lu/%lu, %f/%f, %lu/%lu] ",
+					ic_control_info.isSender, DEFAULT_RTT, (minRtt == ~((uint64) 0) ? 0 : minRtt),
+					(minDev == ~((uint64) 0) ? 0 : minDev), avgRtt, avgDev, maxRtt, maxDev);
+	}
+}
+
+void
+CChunkTransportStateImpl::checkMotNodeID(int sendMotNodeID)
+{
+	Assert(sendMotNodeID > 0);
+
+	if ((sendMotNodeID) <= 0) {
+		std::stringstream ss;
+		ss <<"ERROR, Interconnect Error: Unexpected Motion Node Id: "<<sendMotNodeID<<
+			". This means a motion node that wasn't setup is requesting interconnect resources.";
+		throw ICInvalidIndex(ss.str(), __FILE__, __LINE__);
+	}
+
+	TransportEntry *pEntry = this->entries_[sendMotNodeID - 1].get();
+	if (pEntry != nullptr) {
+		UDPConn *conn = pEntry->conns_.size() ? pEntry->conns_[0].get() : nullptr;
+
+		Assert(static_cast<size_t>(pEntry->numConns) == pEntry->conns_.size());
+		std::stringstream ss;
+		ss <<"ERROR, interconnect error: A HTAB entry for motion node "<<sendMotNodeID<<
+			" already exists numConns "<<pEntry->conns_.size()<<
+			" first sock " << (conn != NULL ? conn->sockfd : -2);
+		throw ICInvalidIndex(ss.str(), __FILE__, __LINE__);
+	}
+}
+
+CChunkTransportStateImpl::CChunkTransportStateImpl(ICSliceTable *_sliceTable)
+{
+	activated       = false;
+	teardownActive  = false;
+
+	sliceTable      = _sliceTable;
+	sliceId         = sliceTable->localSlice;
+	icInstanceId    = sliceTable->ic_instance_id;
+
+	networkTimeoutIsLogged = false;
+
+	clientState     = NULL;
+}
+
+ICChunkTransportState*
+CChunkTransportStateImpl::SetupUDP(ICSliceTable *sliceTable, SessionMotionLayerIPCParam *param)
+{
+	if (param)
+		memcpy(&session_param, param, sizeof(*param));
+
+	/*
+	 * The rx-thread might have set an error since last teardown,
+	 * technically it is not part of current query, discard it directly.
+	 */
+	resetRxThreadError();
+
+	try {
+		ICChunkTransportState *state = CChunkTransportStateImpl::setup(sliceTable);
+
+		/* Internal error if we locked the mutex but forgot to unlock it. */
+		Assert(pthread_mutex_unlock(&ic_control_info.lock) != 0);
+
+		return state;
+
+	} catch (...) {
+		/*
+		 * Remove connections from hash table to avoid packet handling in the
+		 * rx pthread, else the packet handling code could use memory whose
+		 * context (InterconnectContext) would be soon reset - that could
+		 * panic the process.
+		 */
+		ConnHashTable *ht = &ic_control_info.connHtab;
+
+		for (int i = 0; i < ht->size; i++)
+		{
+			struct ConnHtabBin *trash;
+			UDPConn *conn = NULL;
+
+			trash = ht->table[i];
+			while (trash != NULL)
+			{
+				conn = trash->conn;
+				/* Get trash at first as trash will be pfree-ed in remove. */
+				trash = trash->next;
+				ht->remove(conn);
+			}
+		}
+		pthread_mutex_unlock(&ic_control_info.lock);
+
+		throw;
+	}
+}
+
+void
+CChunkTransportStateImpl::TeardownUDP(bool hasErrors)
+{
+	try {
+		CChunkTransportStateImpl::state_ = nullptr;
+		this->teardown(hasErrors);
+		delete this;
+		Assert(pthread_mutex_unlock(&ic_control_info.lock) != 0);
+	} catch (...) {
+		pthread_mutex_unlock(&ic_control_info.lock);
+		throw;
+	}
+}
+
+CChunkTransportState **
+CChunkTransportStateImpl::GetTransportState()
+{
+	return &CChunkTransportStateImpl::state_;
+}
+
+void
+CChunkTransportStateImpl::RecvRoute(int16 motNodeID,
+												   int16 srcRoute,
+												   GetDataLenInPacket getLen,
+												   DataBlock *data)
+{
+	try {
+		TransportEntry *pEntry = GetEntry(motNodeID, true);
+		pEntry->RecvRoute(srcRoute, getLen, data);
+
+		/* error if mutex still held (debug build only) */
+		Assert(pthread_mutex_unlock(&ic_control_info.lock) != 0);
+	} catch (...) {
+		pthread_mutex_unlock(&ic_control_info.lock);
+		throw;
+	}
+}
+
+void
+CChunkTransportStateImpl::RecvAny(int16 motNodeID,
+								int16 *srcRoute,
+								GetDataLenInPacket getLen,
+								DataBlock *data)
+{
+	try {
+		TransportEntry *pEntry = GetEntry(motNodeID, true);
+		pEntry->RecvAny(srcRoute, getLen, data);
+
+		/* error if mutex still held (debug build only) */
+		Assert(pthread_mutex_unlock(&ic_control_info.lock) != 0);
+	} catch (...) {
+		pthread_mutex_unlock(&ic_control_info.lock);
+		throw;
+	}
+}
+
+void
+CChunkTransportStateImpl::SendEOS(int motNodeID, DataBlock *data)
+{
+	int			retry = 0;
+	int			activeCount = 0;
+	int			timeout = 0;
+
+	TransportEntry *pEntry = GetEntry(motNodeID, true);
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "Interconnect seg%d slice%d sending end-of-stream to slice%d",
+					global_param.segindex, motNodeID, pEntry->recvSlice->sliceIndex);
+
+	/*
+	 * we want to add our tcItem onto each of the outgoing buffers -- this is
+	 * guaranteed to leave things in a state where a flush is *required*.
+	 */
+	pEntry->Broadcast(data, NULL);
+
+	pEntry->sendingEos = true;
+
+	uint64		now = getCurrentTime();
+
+	/* now flush all of the buffers. */
+	for (int i = 0; i < pEntry->numConns; i++)
+	{
+		UDPConn *conn = pEntry->GetConn(i);
+		if (conn->stillActive)
+		{
+			if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+				LOG(DEBUG1, "sent eos to route %d tuplecount %d seq %d flags 0x%x stillActive %s icId %d %d",
+							conn->route, conn->tupleCount, conn->conn_info.seq,
+							conn->conn_info.flags, (conn->stillActive ? "true" : "false"),
+							conn->conn_info.icId, conn->msgSize);
+
+			/* prepare this for transmit */
+			conn->conn_info.flags |= UDPIC_FLAGS_EOS;
+
+			/* place it into the send queue */
+			conn->prepareXmit();
+			conn->sndQueue.append(conn->curBuff);
+			conn->sendBuffers();
+			conn->curBuff = NULL;
+			conn->pBuff = NULL;
+
+			conn->tupleCount = 0;
+			conn->msgSize = sizeof(conn->conn_info);
+			conn->deadlockCheckBeginTime = now;
+
+			activeCount++;
+		}
+	}
+
+	/*
+	 * Now waiting for acks from receivers.
+	 *
+	 * Note here waiting is done in a separate phase from the EOS sending
+	 * phase to make the processing faster when a lot of connections are slow
+	 * and have frequent packet losses. In fault injection tests, we found
+	 * this.
+	 *
+	 */
+	while (activeCount > 0)
+	{
+		activeCount = 0;
+
+		for (int i = 0; i < pEntry->numConns; i++)
+		{
+			UDPConn *conn = pEntry->GetConn(i);
+			if (conn->stillActive)
+			{
+				retry = 0;
+				ic_control_info.lastPacketSendTime = 0;
+
+				/* wait until this queue is emptied */
+				while (conn->unackQueue.length() > 0 ||
+					   conn->sndQueue.length() > 0)
+				{
+					timeout = conn->computeTimeout(retry);
+
+					if (pEntry->pollAcks(timeout))
+						pEntry->handleAcks(true);
+
+					conn->checkExceptions(retry++, timeout);
+
+					if (retry >= MAX_TRY)
+					{
+						if (conn->unackQueue.length() == 0)
+							conn->sendBuffers();
+						break;
+					}
+				}
+
+				if ((!conn->cdbProc) || (conn->unackQueue.length() == 0 &&
+										 conn->sndQueue.length() == 0))
+				{
+					conn->state = mcsEosSent;
+					conn->stillActive = false;
+				}
+				else
+					activeCount++;
+			}
+		}
+	}
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "SendEOSleaving, activeCount %d", activeCount);
+}
+
+void
+CChunkTransportStateImpl::SendStop(int16 motNodeID)
+{
+	Assert(this->activated);
+
+	TransportEntry *pEntry = GetEntry(motNodeID, true);
+
+	/*
+	 * Note: we're only concerned with receivers here.
+	 */
+	pthread_mutex_lock(&ic_control_info.lock);
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG1, "Interconnect needs no more input from slice%d; notifying senders to stop.", motNodeID);
+
+	for (int i = 0; i < pEntry->numConns; i++)
+	{
+		UDPConn *conn = pEntry->GetConn(i);
+
+		/*
+		 * Note here, the stillActive flag of a connection may have been set
+		 * to false by DeactiveConn.
+		 */
+		if (conn->stillActive)
+		{
+			if (conn->conn_info.flags & UDPIC_FLAGS_EOS)
+			{
+				/*
+				 * we have a queued packet that has EOS in it. We've acked it,
+				 * so we're done
+				 */
+				if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+					LOG(DEBUG1, "do sendstop: already have queued EOS packet, we're done. node %d route %d", motNodeID, i);
+
+				conn->stillActive = false;
+
+				/* need to drop the queues in the teardown function. */
+				while (conn->pkt_q_size > 0)
+					conn->ReleaseBuffer(NULL);
+			}
+			else
+			{
+				conn->stopRequested = true;
+				conn->conn_info.flags |= UDPIC_FLAGS_STOP;
+
+				/*
+				 * The peer addresses for incoming connections will not be set
+				 * until the first packet has arrived. However, when the lower
+				 * slice does not have data to send, the corresponding peer
+				 * address for the incoming connection will never be set. We
+				 * will skip sending ACKs to those connections.
+				 */
+
+#ifdef FAULT_INJECTOR
+				if (FaultInjector_InjectFaultIfSet(
+												   "interconnect_stop_ack_is_lost",
+												   DDLNotSpecified,
+												   "" /* databaseName */ ,
+												   "" /* tableName */ ) == FaultInjectorTypeSkip)
+				{
+					continue;
+				}
+#endif
+
+				if (conn->peer.ss_family == AF_INET || conn->peer.ss_family == AF_INET6)
+				{
+					uint32		seq = conn->conn_info.seq > 0 ? conn->conn_info.seq - 1 : 0;
+
+					conn->sendAck(UDPIC_FLAGS_STOP | UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY | conn->conn_info.flags, seq, seq);
+
+					if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+						LOG(DEBUG1, "sent stop message. node %d route %d seq %d", motNodeID, i, seq);
+				}
+				else
+				{
+					if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+						LOG(DEBUG1, "first packet did not arrive yet. don't sent stop message. node %d route %d", motNodeID, i);
+				}
+			}
+		}
+	}
+	pthread_mutex_unlock(&ic_control_info.lock);
+}
+
+void
+TransportEntry::Send(int16 targetRoute, DataBlock *db, bool broadcast, int *recount)
+{
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(DEBUG5, "SendTupleChunkToAMS: chunk length %d", db->len);
+#endif
+
+	if (broadcast)
+	{
+		this->Broadcast(db, recount);
+	}
+	else
+	{
+		if (targetRoute < 0 || targetRoute >= this->numConns)
+		{
+			std::stringstream ss;
+			ss << "FATAL: SendTupleChunkToAMS: targetRoute is " << targetRoute
+			   << ", must be between 0 and " << this->numConns << " .";
+			throw ICFatalException(ss.str(), __FILE__, __LINE__);
+		}
+
+		/* handle pt-to-pt message. Primary */
+		UDPConn *conn = this->GetConn(targetRoute);
+
+		/* only send to interested connections */
+		if (conn->stillActive)
+		{
+			conn->Send(db);
+			if (!conn->stillActive)
+				*recount = 1;
+		}
+		/* in 4.0 logical mirror xmit eliminated. */
+	}
+}
+
+bool
+TransportEntry::SendData(int16 targetRoute, DataBlock *pblocks, int num, bool broadcast)
+{
+	int recount = 0;
+
+	int payload = global_param.Gp_max_packet_size - sizeof(icpkthdr);
+
+	/*
+	 * tcItem can actually be a chain of tcItems.  we need to send out all of
+	 * them.
+	 */
+	for (int i = 0; i < num; ++i)
+	{
+		DataBlock db = *(pblocks + i);
+		while (db.len > 0)
+		{
+			DataBlock toSend;
+			toSend.len = db.len > payload ? payload : db.len;
+			toSend.pos = db.pos;
+			this->Send(targetRoute, &toSend, broadcast, &recount);
+			db.len -= toSend.len;
+			db.pos += toSend.len;
+		}
+	}
+
+	if (recount == 0)
+		return true;
+
+	/* if we don't have any connections active, return false */
+	int i = 0;
+	for (i = 0; i < this->numConns; i++)
+	{
+		UDPConn *conn = this->GetConn(i);
+		if (conn->stillActive)
+			break;
+	}
+
+	/* if we found an active connection we're not done */
+	return (i < this->numConns);
+
+}
+
+bool
+CChunkTransportStateImpl::SendData(int16 motNodeID,
+								int16 targetRoute,
+								DataBlock *pblocks,
+								int num,
+								bool broadcast)
+{
+	TransportEntry *pEntry = GetEntry(motNodeID, true);
+	return pEntry->SendData(targetRoute, pblocks, num, broadcast);
+}
+
+void
+CChunkTransportStateImpl::GetFreeSpace(int16 motNodeID, int16 targetRoute, BufferBlock *b)
+{
+	Assert(b != NULL);
+
+	TransportEntry *pEntry = GetEntry(motNodeID, true);
+
+		/* handle pt-to-pt message. Primary */
+	UDPConn *conn = pEntry->GetConn(targetRoute);
+
+	b->pos = NULL;
+	b->len = 0;
+	if (conn->stillActive)
+	{
+		b->pos = conn->pBuff + conn->msgSize;
+		Assert(global_param.Gp_max_packet_size >= conn->msgSize);
+		b->len = global_param.Gp_max_packet_size - conn->msgSize;
+	}
+}
+
+void
+CChunkTransportStateImpl::ReduceFreeSpace(int16 motNodeID, int16 targetRoute, int length)
+{
+	TransportEntry *pEntry = GetEntry(motNodeID, true);
+
+	/* handle pt-to-pt message. Primary */
+	UDPConn *conn = pEntry->GetConn(targetRoute);
+
+	/* only send to interested connections */
+	if (conn->stillActive)
+	{
+		Assert(conn->msgSize + length <= global_param.Gp_max_packet_size);
+		conn->msgSize += length;
+		conn->tupleCount++;
+	}
+}
+
+void
+CChunkTransportStateImpl::ReleaseAndAck(int motNodeID, int route)
+{
+	AckSendParam param;
+
+	TransportEntry *pEntry = GetEntry(motNodeID, true);
+	UDPConn *conn = pEntry->GetConn(route);
+
+	memset(&param, 0, sizeof(AckSendParam));
+
+	pthread_mutex_lock(&ic_control_info.lock);
+
+	if (conn->pBuff != NULL)
+	{
+		conn->ReleaseBuffer(&param);
+	}
+	else
+	{
+		pthread_mutex_unlock(&ic_control_info.lock);
+		throw ICFatalException("FATAL: Interconnect error: tried to release a NULL buffer", __FILE__, __LINE__);
+	}
+
+	pthread_mutex_unlock(&ic_control_info.lock);
+
+	/*
+	 * real ack sending is after lock release to decrease the lock holding
+	 * time.
+	 */
+	if (param.msg.len != 0)
+		UDPConn::sendAckWithParam(&param);
+}
+
+void
+CChunkTransportStateImpl::DeactiveRoute(int motNodeID, int srcRoute, const char *reason)
+{
+	TransportEntry *pEntry = GetEntry(motNodeID, true);
+	UDPConn *conn = pEntry->GetConn(srcRoute);
+
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+	{
+		LOG(DEBUG3, "Interconnect finished receiving from seg%d slice%d %s pid=%d sockfd=%d; %s",
+					conn->remoteContentId, pEntry->sendSlice->sliceIndex, conn->remoteHostAndPort,
+					conn->cdbProc->pid, conn->sockfd, reason);
+	}
+
+#ifdef AMS_VERBOSE_LOGGING
+	LOG(INFO, "deregisterReadInterest set stillactive = false for node %d route %d (%s)", motNodeID, srcRoute, reason);
+#endif
+
+	conn->DeactiveConn();
+}
+
+void*
+CChunkTransportStateImpl::GetOpaqueDataInConn(int16 motNodeID, int16 targetRoute)
+{
+	TransportEntry *pEntry = this->GetEntry(motNodeID, true);
+	UDPConn *conn = pEntry->GetConn(targetRoute);
+	return conn->opaque_data;
+}
+
+int32*
+CChunkTransportStateImpl::GetSentRecordTypmodInConn(int16 motNodeID, int16 targetRoute)
+{
+	TransportEntry *pEntry = this->GetEntry(motNodeID, true);
+	UDPConn *conn = pEntry->GetConn(targetRoute);
+	return &conn->sent_record_typmod;
+}
+
+int
+CChunkTransportStateImpl::GetConnNum(int motNodeID) {
+	TransportEntry *pEntry = this->GetEntry(motNodeID, true);
+	return pEntry->conns_.size();
+}
+
+void
+CChunkTransportStateImpl::NotifyQuit() {
+	thread_quit = true;
+}
+
+void
+CChunkTransportStateImpl::SetVectorEngineAsUser() {
+	vector_engine_is_user = true;
+}
+
+CChunkTransportStateImpl* ToDerived(CChunkTransportState *ptr) {
+	return static_cast<CChunkTransportStateImpl*>(ptr);
+}
+
+/*
+ * C++ interface wrapper class based on class CChunkTransportStateImpl;
+ */
+ICChunkTransportState*
+CChunkTransportState::SetupUDP(ICSliceTable *sliceTable,
+											  SessionMotionLayerIPCParam *param) {
+	return CChunkTransportStateImpl::SetupUDP(sliceTable, param);
+}
+
+void
+CChunkTransportState::TeardownUDP(bool hasErrors) {
+	ToDerived(this)->TeardownUDP(hasErrors);
+}
+
+void
+CChunkTransportState::RecvRoute(int16 motNodeID, int16 srcRoute,
+											GetDataLenInPacket getLen, DataBlock *data) {
+	ToDerived(this)->RecvRoute(motNodeID, srcRoute, getLen, data);
+}
+
+void
+CChunkTransportState::RecvAny(int16 motNodeID, int16 *srcRoute,
+										GetDataLenInPacket getLen, DataBlock *data) {
+	ToDerived(this)->RecvAny(motNodeID, srcRoute, getLen, data);
+}
+
+void
+CChunkTransportState::SendEOS(int motNodeID, DataBlock *data) {
+	ToDerived(this)->SendEOS(motNodeID, data);
+}
+
+void
+CChunkTransportState::SendStop(int16 motNodeID) {
+	return ToDerived(this)->SendStop(motNodeID);
+}
+
+bool
+CChunkTransportState::SendData(int16 motNodeID, int16 targetRoute, DataBlock *pblocks,
+											 int num, bool broadcast) {
+	return ToDerived(this)->SendData(motNodeID, targetRoute, pblocks, num, broadcast);
+}
+
+void
+CChunkTransportState::GetFreeSpace(int16 motNodeID, int16 targetRoute, BufferBlock *b) {
+	return ToDerived(this)->GetFreeSpace(motNodeID, targetRoute, b);
+}
+
+void
+CChunkTransportState::ReduceFreeSpace(int16 motNodeID, int16 targetRoute, int length) {
+	return ToDerived(this)->ReduceFreeSpace(motNodeID, targetRoute, length);
+}
+
+void
+CChunkTransportState::ReleaseAndAck(int motNodeID, int route) {
+	return ToDerived(this)->ReleaseAndAck(motNodeID, route);
+}
+
+void
+CChunkTransportState::DeactiveRoute(int motNodeID, int srcRoute, const char *reason) {
+	return ToDerived(this)->DeactiveRoute(motNodeID, srcRoute, reason);
+}
+
+void*
+CChunkTransportState::GetOpaqueDataInConn(int16 motNodeID, int16 targetRoute) {
+	return ToDerived(this)->GetOpaqueDataInConn(motNodeID, targetRoute);
+}
+
+int32*
+CChunkTransportState::GetSentRecordTypmodInConn(int16 motNodeID, int16 targetRoute) {
+	return ToDerived(this)->GetSentRecordTypmodInConn(motNodeID, targetRoute);
+}
+
+int
+CChunkTransportState::GetConnNum(int motNodeID) {
+	return ToDerived(this)->GetConnNum(motNodeID);
+}
+
+void
+CChunkTransportState::NotifyQuit() {
+	return ToDerived(this)->NotifyQuit();
+}
+
+void
+CChunkTransportState::SetVectorEngineAsUser() {
+	return ToDerived(this)->SetVectorEngineAsUser();
+}
+
+CChunkTransportState**
+CChunkTransportState::GetTransportState() {
+	return CChunkTransportStateImpl::GetTransportState();
+}
+
+/*
+ * C interface wrapper of UDP implement based C++ interface calss CChunkTransportState.
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static void handleException()
+{
+	try{
+		throw;
+	} catch (const std::bad_alloc &e) {
+		SetLastError(LEVEL_ERROR, "out of memory");
+	} catch (const ICFatalException &e) {
+		SetLastError(LEVEL_FATAL, e.msg());
+	} catch (const ICException &e) {
+		SetLastError(LEVEL_ERROR, e.msg());
+	} catch (const std::exception &e) {
+		SetLastError(LEVEL_ERROR, e.what());
+	} catch (...) {
+		SetLastError(LEVEL_ERROR, "something unknown wrong happened!");
+	}
+}
+
+ICChunkTransportState*
+UDP2_SetupUDP(ICSliceTable *sliceTable, SessionMotionLayerIPCParam *param)
+{
+	try {
+		return CChunkTransportState::SetupUDP(sliceTable, param);
+	} catch (...) {
+		handleException();
+	}
+
+	return NULL;
+}
+
+/*
+ * TeardownUDPIFCInterconnect
+ * 		Tear down UDP interconnect.
+ *
+ * This function is called to release the resources used by interconnect.
+ */
+void
+UDP2_TeardownUDP(ICChunkTransportState *transportStates,
+			bool hasErrors)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->TeardownUDP(hasErrors);
+	} catch (...) {
+		handleException();
+	}
+}
+
+/*
+ * RecvTupleChunkFromUDPIFC
+ * 		Receive tuple chunks from a specific route (connection)
+ */
+void
+UDP2_RecvRoute(ICChunkTransportState *transportStates,
+		  int16 motNodeID,
+		  int16 srcRoute,
+		  GetDataLenInPacket getLen,
+		  DataBlock *data)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->RecvRoute(motNodeID, srcRoute, getLen, data);
+	} catch (...) {
+		handleException();
+	}
+}
+
+/*
+ * RecvTupleChunkFromAnyUDPIFC
+ * 		Receive tuple chunks from any route (connections)
+ */
+void
+UDP2_RecvAny(ICChunkTransportState *transportStates,
+		int16 motNodeID,
+		int16 *srcRoute,
+		GetDataLenInPacket getLen,
+		DataBlock *data)
+
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->RecvAny(motNodeID, srcRoute, getLen, data);
+	} catch (...) {
+		handleException();
+	}
+}
+
+/*
+ * SendEOS
+ * 		broadcast eos messages to receivers.
+ */
+void
+UDP2_SendEOS(ICChunkTransportState *transportStates,
+			  int motNodeID,
+			  DataBlock *data)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->SendEOS(motNodeID, data);
+	} catch (...) {
+		handleException();
+	}
+}
+
+void
+UDP2_SendStop(ICChunkTransportState *transportStates,
+					  int16 motNodeID)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->SendStop(motNodeID);
+	} catch (...) {
+		handleException();
+	}
+}
+
+bool
+UDP2_SendData(ICChunkTransportState *transportStates,
+		int16 motNodeID,
+		int16 targetRoute,
+		DataBlock *pblocks,
+		int num,
+		bool broadcast)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		return cstate->SendData(motNodeID, targetRoute, pblocks, num, broadcast);
+	} catch (...) {
+		handleException();
+	}
+
+	return false;
+}
+
+/*
+ * The fetches a direct pointer into our transmit buffers, along with
+ * an indication as to how much data can be safely shoved into the
+ * buffer (started at the pointed location).
+ *
+ * This works a lot like SendTupleChunkToAMS().
+ */
+void
+UDP2_GetFreeSpace(ICChunkTransportState *transportStates,
+							int16 motNodeID,
+							int16 targetRoute,
+							BufferBlock *b)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->GetFreeSpace(motNodeID, targetRoute, b);
+	} catch (...) {
+		handleException();
+	}
+}
+
+void
+UDP2_ReduceFreeSpace(ICChunkTransportState *transportStates,
+							int16 motNodeID,
+							int16 targetRoute,
+							int length)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->ReduceFreeSpace(motNodeID, targetRoute, length);
+	} catch (...) {
+		handleException();
+	}
+}
+
+/*
+ * SendAck
+ *
+ * The cdbmotion code has discarded our pointer to the motion-conn
+ * structure, but has enough info to fully specify it.
+ */
+void
+UDP2_ReleaseAndAck(ICChunkTransportState *transportStates,
+			  int motNodeID,
+			  int route)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		cstate->ReleaseAndAck(motNodeID, route);
+	} catch (...) {
+		handleException();
+	}
+}
+
+void
+UDP2_DeactiveRoute(ICChunkTransportState *transportStates, int motNodeID, int
+		srcRoute, const char *reason) { Assert(transportStates);
+
+	try { CChunkTransportState *cstate =
+		static_cast<CChunkTransportState*>(transportStates);
+		cstate->DeactiveRoute(motNodeID, srcRoute, reason);
+	} catch (...) {
+		handleException();
+	}
+}
+
+void*
+UDP2_GetOpaqueDataInConn(ICChunkTransportState *transportStates,
+							 int16 motNodeID,
+							 int16 targetRoute)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		return cstate->GetOpaqueDataInConn(motNodeID, targetRoute);
+	} catch (...) {
+		handleException();
+	}
+
+	return NULL;
+}
+
+int32*
+UDP2_GetSentRecordTypmodInConn(ICChunkTransportState *transportStates,
+								int16 motNodeID,
+								int16 targetRoute)
+{
+	Assert(transportStates);
+
+	try {
+		CChunkTransportState *cstate = static_cast<CChunkTransportState*>(transportStates);
+		return cstate->GetSentRecordTypmodInConn(motNodeID, targetRoute);
+	} catch (...) {
+		handleException();
+	}
+
+	return NULL;
+}
+
+void
+UDP2_InitUDPIFC(GlobalMotionLayerIPCParam *param)
+{
+	if (param)
+	{
+		if (global_param.interconnect_address)
+			free(global_param.interconnect_address);
+
+		memcpy(&global_param, param, sizeof(*param));
+		global_param.interconnect_address = strdup(param->interconnect_address);
+	}
+
+	try {
+		InitMotionUDPIFC(&UDP_listenerFd, &udp_listener_port);
+
+		if (IC_DEBUG1 >= session_param.log_min_messages)
+			LOG(DEBUG1, "Interconnect listening on udp port %d ", udp_listener_port);
+
+	} catch (...) {
+		handleException();
+	}
+}
+
+void
+UDP2_CleanUpUDPIFC(void)
+{
+	if (session_param.gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG_IC)
+		LOG(DEBUG3, "Cleaning Up Motion Layer IPC...");
+
+	try {
+		CleanupMotionUDPIFC();
+	} catch (...) {
+		handleException();
+	}
+
+	if (UDP_listenerFd >= 0)
+		closesocket(UDP_listenerFd);
+
+	/* be safe and reset global state variables. */
+	udp_listener_port = 0;
+	UDP_listenerFd    = -1;
+}
+
+void
+UDP2_WaitQuitUDPIFC(void)
+{
+	/*
+	 * Just in case ic thread is waiting on the locks.
+	 */
+	pthread_mutex_unlock(&ic_control_info.lock);
+
+	ic_atomic_write_u32(&ic_control_info.shutdown, 1);
+
+	if (ic_control_info.threadCreated)
+	{
+		SendDummyPacket();
+		pthread_join(ic_control_info.threadHandle, NULL);
+	}
+	ic_control_info.threadCreated = false;
+}
+
+uint32
+UDP2_GetActiveConns(void)
+{
+	return ic_statistics.activeConnectionsNum;
+}
+
+int
+UDP2_GetICHeaderSizeUDP(void)
+{
+	return sizeof(struct icpkthdr);
+}
+
+int32
+UDP2_GetListenPortUDP(void)
+{
+	return udp_listener_port;
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/udp2/ic_udp2.h b/contrib/udp2/ic_common/udp2/ic_udp2.h
new file mode 100644
index 00000000000..e49da698b79
--- /dev/null
+++ b/contrib/udp2/ic_common/udp2/ic_udp2.h
@@ -0,0 +1,102 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_udp2.h
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/udp2/ic_udp2.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef IC_UDP2_H
+#define IC_UDP2_H
+
+#include "ic_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void UDP2_InitUDPIFC(struct GlobalMotionLayerIPCParam *param);
+extern void UDP2_CleanUpUDPIFC(void);
+extern void UDP2_WaitQuitUDPIFC(void);
+
+extern ICChunkTransportState* UDP2_SetupUDP(ICSliceTable *sliceTable,
+											SessionMotionLayerIPCParam *param);
+extern void UDP2_TeardownUDP(ICChunkTransportState *transportStates,
+							 bool hasErrors);
+
+// recv
+extern void UDP2_RecvRoute(ICChunkTransportState *transportStates,
+						   int16 motNodeID,
+						   int16 srcRoute,
+						   GetDataLenInPacket getLen,
+						   DataBlock *data);
+extern void UDP2_RecvAny(ICChunkTransportState *transportStates,
+						 int16 motNodeID,
+						 int16 *srcRoute,
+						 GetDataLenInPacket getLen,
+						 DataBlock *data);
+extern void UDP2_SendStop(ICChunkTransportState *transportStates, int16 motNodeID);
+extern void UDP2_ReleaseAndAck(ICChunkTransportState *transportStates,
+							   int motNodeID,
+							   int route);
+extern void UDP2_DeactiveRoute(ICChunkTransportState *transportStates,
+							   int motNodeID,
+							   int srcRoute,
+							   const char *reason);
+
+// send
+extern void UDP2_SendEOS(ICChunkTransportState *transportStates,
+						 int motNodeID,
+						 DataBlock *data);
+extern bool UDP2_SendData(ICChunkTransportState *transportStates,
+						  int16 motNodeID,
+						  int16 targetRoute,
+						  DataBlock *pblocks,
+						  int num,
+						  bool broadcast);
+extern void UDP2_GetFreeSpace(ICChunkTransportState *transportStates,
+							  int16 motNodeID,
+							  int16 targetRoute,
+							  BufferBlock *b);
+extern void UDP2_ReduceFreeSpace(ICChunkTransportState *transportStates,
+								 int16 motNodeID,
+								 int16 targetRoute,
+								 int length);
+
+
+// utility func
+extern void* UDP2_GetOpaqueDataInConn(ICChunkTransportState *transportStates,
+									  int16 motNodeID,
+									  int16 targetRoute);
+extern int32* UDP2_GetSentRecordTypmodInConn(ICChunkTransportState *transportStates,
+									  int16 motNodeID,
+									  int16 targetRoute);
+
+extern uint32 UDP2_GetActiveConns(void);
+extern int    UDP2_GetICHeaderSizeUDP(void);
+extern int32  UDP2_GetListenPortUDP(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // IC_UDP2_H
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/udp2/ic_udp2.hpp b/contrib/udp2/ic_common/udp2/ic_udp2.hpp
new file mode 100644
index 00000000000..a7e6356fb9c
--- /dev/null
+++ b/contrib/udp2/ic_common/udp2/ic_udp2.hpp
@@ -0,0 +1,68 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_udp2.hpp
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/udp2/ic_udp2.hpp
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef IC_UDP2_HPP
+#define IC_UDP2_HPP
+
+#include <map>
+#include <memory>
+#include <ostream>
+#include <sstream>
+#include <stdexcept>
+
+#include "ic_types.h"
+#include "ic_except.hpp"
+
+struct CChunkTransportState : public ICChunkTransportState
+{
+public:
+	static ICChunkTransportState* SetupUDP(ICSliceTable *sliceTable, SessionMotionLayerIPCParam *param);
+	void TeardownUDP(bool hasErrors);
+
+	void RecvRoute(int16 motNodeID, int16 srcRoute, GetDataLenInPacket getLen, DataBlock *data);
+	void RecvAny(int16 motNodeID, int16 *srcRoute, GetDataLenInPacket getLen, DataBlock *data);
+	void ReleaseAndAck(int motNodeID, int route);
+	void SendStop(int16 motNodeID);
+	void DeactiveRoute(int motNodeID, int srcRoute, const char *reason);
+
+	void SendEOS(int motNodeID, DataBlock *data);
+	bool SendData(int16 motNodeID, int16 targetRoute, DataBlock *pblocks, int num, bool broadcast);
+	void GetFreeSpace(int16 motNodeID, int16 targetRoute, BufferBlock *b);
+	void ReduceFreeSpace(int16 motNodeID, int16 targetRoute, int length);
+
+	void* GetOpaqueDataInConn(int16 motNodeID, int16 targetRoute);
+	int32* GetSentRecordTypmodInConn(int16 motNodeID, int16 targetRoute);
+
+	int  GetConnNum(int motNodeID);
+
+	static CChunkTransportState** GetTransportState();
+
+	/* APIs for vector engine */
+	void NotifyQuit();
+	void SetVectorEngineAsUser();
+};
+
+#endif // IC_UDP2_HPP
\ No newline at end of file
diff --git a/contrib/udp2/ic_common/udp2/ic_udp2_internal.hpp b/contrib/udp2/ic_common/udp2/ic_udp2_internal.hpp
new file mode 100644
index 00000000000..2602133a9e5
--- /dev/null
+++ b/contrib/udp2/ic_common/udp2/ic_udp2_internal.hpp
@@ -0,0 +1,1319 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_udp2_internal.hpp
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_common/udp2/ic_udp2_internal.hpp
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef IC_UDP2_INTERNAL_HPP
+#define IC_UDP2_INTERNAL_HPP
+
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+#include <sstream>
+#include <stdexcept>
+#include <thread>
+#include <atomic>
+#include <cstdarg>
+#include <vector>
+#include <map>
+
+#include <cassert>
+#include <cstring>
+#include <fcntl.h>
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <netdb.h>
+#include <poll.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "ic_udp2.hpp"
+#include "ic_utility.hpp"
+
+namespace {
+
+typedef enum MotionConnState
+{
+	mcsNull,
+	mcsAccepted,
+	mcsSetupOutgoingConnection,
+	mcsConnecting,
+	mcsRecvRegMsg,
+	mcsSendRegMsg,
+	mcsStarted,
+	mcsEosSent
+} MotionConnState;
+
+/*
+ * Structure used for keeping track of a pt-to-pt connection between two
+ * Cdb Entities (either QE or QD).
+ */
+typedef struct MotionConn
+{
+	/* socket file descriptor. */
+	int			sockfd;
+
+	/* pointer to the data buffer. */
+	uint8	   *pBuff;
+
+	/* size of the message in the buffer, if any. */
+	int32		msgSize;
+
+	/* position of message inside of buffer, "cursor" pointer */
+	uint8	   *msgPos;
+
+	/*
+	 * recv bytes: we can have more than one message/message fragment in recv
+	 * queue at once
+	 */
+	int32		recvBytes;
+
+	int			tupleCount;
+
+	/*
+	 * false means 1) received a stop message and has handled it. 2) received
+	 * EOS message or sent out EOS message 3) received a QueryFinishPending
+	 * notify and has handled it.
+	 */
+	bool		stillActive;
+
+	/*
+	 * used both by motion sender and motion receiver
+	 *
+	 * sender: true means receiver don't need to consume tuples any more,
+	 * sender is also responsible to send stop message to its senders.
+	 *
+	 * receiver: true means have sent out a stop message to its senders. The
+	 * stop message might be lost, stopRequested can also tell sender that no
+	 * more data needed in the ack message.
+	 */
+	bool		stopRequested;
+
+	MotionConnState state;
+
+	ICCdbProcess *cdbProc;
+	int			remoteContentId;
+	char		remoteHostAndPort[128]; /* Numeric IP addresses should never
+										 * be longer than about 50 chars, but
+										 * play it safe */
+
+	void *opaque_data;
+
+	/*
+	 * used by the sender.
+	 *
+	 * the typmod of last sent record type in current connection,
+	 * if the connection is for broadcasting then we only check
+	 * and update this attribute on connection 0.
+	 */
+	int32 sent_record_typmod;
+
+} MotionConn;
+
+/*
+ * Used to organize all of the information for a given motion node.
+ */
+typedef struct ChunkTransportStateEntry
+{
+	int			motNodeId;
+	bool		valid;
+
+	/* Connection array
+	 *
+	 * MUST pay attention: use getMotionConn to get MotionConn.
+	 * must not use `->conns[index]` to get MotionConn. Because the struct
+	 * MotionConn is a base structure for MotionConnTCP and
+	 * MotionConnUDP. After connection setup, the `conns` will be fill
+	 * with MotionConnUDP/MotionConnTCP, but the pointer still is
+	 * MotionConn which should use `CONTAINER_OF` to get the real object.
+	 */
+	MotionConn *conns;
+	int			numConns;
+
+	int			scanStart;
+
+	/* slice table entries */
+	struct ICExecSlice *sendSlice;
+	struct ICExecSlice *recvSlice;
+
+} ChunkTransportStateEntry;
+
+typedef struct icpkthdr
+{
+	int32		motNodeId;
+
+	/*
+	 * three pairs which seem useful for identifying packets.
+	 *
+	 * MPP-4194: It turns out that these can cause collisions; but the high
+	 * bit (1<<31) of the dstListener port is now used for disambiguation with
+	 * mirrors.
+	 */
+	int32		srcPid;
+	int32		srcListenerPort;
+
+	int32		dstPid;
+	int32		dstListenerPort;
+
+	int32		sessionId;
+	int32		icId;
+
+	int32		recvSliceIndex;
+	int32		sendSliceIndex;
+	int32		srcContentId;
+	int32		dstContentId;
+
+	/* MPP-6042: add CRC field */
+	uint32		crc;
+
+	/* packet specific info */
+	int32		flags;
+	uint32		len;
+
+	/*
+     * The usage of seq and extraSeq field
+     * a) In a normal DATA packet
+     *    seq      -> the data packet sequence number
+     *    extraSeq -> not used
+     * b) In a normal ACK message (UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY)
+     *    seq      -> the largest seq of the continuously cached packets
+     *                sometimes, it is special, for exampke, conn req ack, mismatch ack.
+     *    extraSeq -> the largest seq of the consumed packets
+     * c) In a start race NAK message (UPDIC_FLAGS_NAK)
+     *    seq      -> the seq from the pkt
+     *    extraSeq -> the extraSeq from the pkt
+     * d) In a DISORDER message (UDPIC_FLAGS_DISORDER)
+     *    seq      -> packet sequence number that triggers the disorder message
+     *    extraSeq -> the largest seq of the received packets
+     * e) In a DUPLICATE message (UDPIC_FLAGS_DUPLICATE)
+     *    seq      -> packet sequence number that triggers the duplicate message
+     *    extraSeq -> the largest seq of the continuously cached packets
+     * f) In a stop messege (UDPIC_FLAGS_STOP | UDPIC_FLAGS_ACK | UDPIC_FLAGS_CAPACITY)
+     *    seq      -> the largest seq of the continuously cached packets
+     *    extraSeq -> the largest seq of the continuously cached packets
+     *
+     *
+     * NOTE that: EOS/STOP flags are often saved in conn_info structure of a connection.
+     *			  It is possible for them to be sent together with other flags.
+     *
+     */
+	uint32		seq;
+	uint32		extraSeq;
+	uint64_t send_time;
+	uint64_t recv_time;
+	uint8_t retry_times;
+} icpkthdr;
+
+typedef struct ICBuffer ICBuffer;
+typedef struct ICBufferLink ICBufferLink;
+
+typedef enum ICBufferListType
+{
+	ICBufferListType_Primary,
+	ICBufferListType_Secondary,
+	ICBufferListType_UNDEFINED
+} ICBufferListType;
+
+struct ICBufferLink
+{
+	ICBufferLink *next;
+	ICBufferLink *prev;
+};
+
+/*
+ * ICBufferList
+ * 		ic buffer list data structure.
+ *
+ * There are two kinds of lists. The first kind of list uses the primary next/prev pointers.
+ * And the second kind uses the secondary next/prev pointers.
+ */
+struct ICBufferList
+{
+	int			len;
+	ICBufferListType type;		/* primary or secondary */
+
+	ICBufferLink head;
+
+#if defined(USE_ASSERT_CHECKING) || defined(AMS_VERBOSE_LOGGING)
+	void icBufferListLog();
+#endif
+
+#ifdef USE_ASSERT_CHECKING
+	void icBufferListCheck(const char *prefix);
+#endif
+
+	void init(ICBufferListType type);
+	void destroy();
+
+	bool is_head(ICBufferLink *link);
+	int  length();
+	ICBufferLink* first();
+
+	ICBuffer* append(ICBuffer *buf);
+	ICBuffer* remove(ICBuffer *buf);
+	ICBuffer* pop();
+
+	void release(bool inExpirationQueue);
+
+	void dump_to_file(FILE *ofile);
+};
+
+#define GET_ICBUFFER_FROM_PRIMARY(ptr) CONTAINER_OF(ptr, ICBuffer, primary)
+#define GET_ICBUFFER_FROM_SECONDARY(ptr) CONTAINER_OF(ptr, ICBuffer, secondary)
+
+/*
+ * ICBuffer
+ * 		interconnect buffer data structure.
+ *
+ * In some cases, an ICBuffer may exists in two lists/queues,
+ * thus it has two sets of pointers. For example, an ICBuffer
+ * can exist in an unack queue and an expiration queue at the same time.
+ *
+ * It is important to get the ICBuffer address when we iterate a list of
+ * ICBuffers through primary/secondary links. The Macro GET_ICBUFFER_FROM_PRIMARY
+ * and GET_ICBUFFER_FROM_SECONDARY are for this purpose.
+ *
+ */
+struct ICBuffer
+{
+	/* primary next and prev pointers */
+	ICBufferLink primary;
+
+	/* secondary next and prev pointers */
+	ICBufferLink secondary;
+
+	/* connection that this buffer belongs to */
+	MotionConn *conn;
+
+	/*
+	 * Three fields for expiration processing
+	 *
+	 * sentTime - the time this buffer was sent nRetry   - the number of send
+	 * retries unackQueueRingSlot - unack queue ring slot index
+	 */
+	uint64		sentTime;
+	int32		nRetry;
+	int32		unackQueueRingSlot;
+
+	/* real data */
+	icpkthdr	pkt[0];
+};
+
+static inline void*
+ic_malloc(size_t size)
+{
+	return malloc(size);
+}
+
+static inline void*
+ic_malloc0(size_t size)
+{
+	void *rs = ic_malloc(size);
+	if (rs)
+		memset(rs, 0, size);
+	return rs;
+}
+
+static inline void
+ic_free(void *p)
+{
+	free(p);
+}
+
+static inline void
+ic_free_clean(void **p)
+{
+	ic_free(*p);
+	*p = NULL;
+}
+
+static inline void
+ic_usleep(long microsec)
+{
+	if (microsec > 0)
+	{
+		struct timeval delay;
+
+		delay.tv_sec = microsec / 1000000L;
+		delay.tv_usec = microsec % 1000000L;
+		(void) select(0, NULL, NULL, NULL, &delay);
+	}
+}
+
+/*
+ * Put socket into nonblock mode.
+ * Returns true on success, false on failure.
+ */
+static inline bool
+ic_set_noblock(int sock)
+{
+	int			flags;
+
+	flags = fcntl(sock, F_GETFL);
+	if (flags < 0)
+		return false;
+	if (fcntl(sock, F_SETFL, (flags | O_NONBLOCK)) == -1)
+		return false;
+	return true;
+}
+
+/* ic_atomic_xxx */
+typedef struct ic_atomic_uint32
+{
+	volatile uint32 value;
+} ic_atomic_uint32;
+
+static inline void
+ic_atomic_init_u32(volatile ic_atomic_uint32 *ptr, uint32 val)
+{
+	ptr->value = val;
+}
+
+static inline uint32
+ic_atomic_read_u32(volatile ic_atomic_uint32 *ptr)
+{
+	return ptr->value;
+}
+
+static inline void
+ic_atomic_write_u32(volatile ic_atomic_uint32 *ptr, uint32 val)
+{
+	ptr->value = val;
+}
+
+static inline bool
+ic_atomic_compare_exchange_u32(volatile ic_atomic_uint32 *ptr,
+							   uint32 *expected, uint32 newval)
+{
+	/* FIXME: we can probably use a lower consistency model */
+	return __atomic_compare_exchange_n(&ptr->value, expected, newval, false,
+									   __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+}
+
+static inline uint32
+ic_atomic_add_fetch_u32(volatile ic_atomic_uint32 *ptr, int32 add_)
+{
+	return __sync_fetch_and_add(&ptr->value, add_) + add_;
+}
+
+static inline uint32
+ic_bswap32(uint32 x)
+{
+	return
+		((x << 24) & 0xff000000) |
+		((x << 8) & 0x00ff0000) |
+		((x >> 8) & 0x0000ff00) |
+		((x >> 24) & 0x000000ff);
+}
+
+#define TIMEOUT_Z
+#define RTT_SHIFT_ALPHA (3)       /* srtt (0.125) */
+#define LOSS_THRESH (3) /* Packet loss triggers Karn */
+#define RTO_MIN (5000)   /* MIN RTO(ms) */
+#define RTO_MAX (100000) /* MAX RTO(ms) */
+#define UDP_INFINITE_SSTHRESH   0x7fffffff
+
+#define SEC_TO_USEC(t)                  ((t) * 1000000)
+#define SEC_TO_MSEC(t)                  ((t) * 1000)
+#define MSEC_TO_USEC(t)                 ((t) * 1000)
+#define USEC_TO_SEC(t)                  ((t) / 1000000)
+#define TIME_TICK (1000000/HZ)/* in us */
+
+#define UDP_INITIAL_RTO                 (MSEC_TO_USEC(200))
+#define UDP_DEFAULT_MSS 1460
+
+#define RTO_HASH (3000)
+
+#define UDP_SEQ_LT(a,b) ((int32_t)((a)-(b)) < 0)
+#define UDP_SEQ_LEQ(a,b) ((int32_t)((a)-(b)) <= 0)
+#define UDP_SEQ_GT(a,b) ((int32_t)((a)-(b)) > 0)
+#define UDP_SEQ_GEQ(a,b) ((int32_t)((a)-(b)) >= 0)
+
+#define UDP_RTO_MIN ((unsigned)(HZ/5))
+
+struct UDPConn;
+struct rto_hashstore
+{
+	uint32_t    rto_now_idx;    /* pointing the hs_table_s index */
+	uint32_t    rto_now_ts;
+
+	TAILQ_HEAD(rto_head, UDPConn) rto_list[RTO_HASH + 1];
+};
+
+struct mudp_manager
+{
+	struct rto_hashstore *rto_store;     /* lists related to timeout */
+
+	int         rto_list_cnt;
+	uint32_t    cur_ts;
+};
+
+typedef struct mudp_manager* mudp_manager_t;
+
+#define MAX_TRY (11)
+#define TIMEOUT(try) ((try) < MAX_TRY ? (timeoutArray[(try)]) : (timeoutArray[MAX_TRY]))
+
+#define USECS_PER_SECOND 1000000
+#define MSECS_PER_SECOND 1000
+
+/* 1/4 sec in msec */
+#define RX_THREAD_POLL_TIMEOUT (250)
+
+/*
+ * Flags definitions for flag-field of UDP-messages
+ *
+ * We use bit operations to test these, flags are powers of two only
+ */
+#define UDPIC_FLAGS_RECEIVER_TO_SENDER  (1)
+#define UDPIC_FLAGS_ACK					(2)
+#define UDPIC_FLAGS_STOP				(4)
+#define UDPIC_FLAGS_EOS					(8)
+#define UDPIC_FLAGS_NAK					(16)
+#define UDPIC_FLAGS_DISORDER    		(32)
+#define UDPIC_FLAGS_DUPLICATE   		(64)
+#define UDPIC_FLAGS_CAPACITY    		(128)
+#define UDPIC_FLAGS_FULL                (256)
+
+#define UDPIC_MIN_BUF_SIZE (128 * 1024)
+
+/*
+ * ConnHtabBin
+ *
+ * A connection hash table bin.
+ *
+ */
+typedef struct ConnHtabBin ConnHtabBin;
+struct ConnHtabBin
+{
+	UDPConn *conn;
+	struct ConnHtabBin *next;
+};
+
+/*
+ * ConnHashTable
+ *
+ * Connection hash table definition.
+ *
+ */
+typedef struct ConnHashTable ConnHashTable;
+struct ConnHashTable
+{
+	ConnHtabBin **table;
+	int			size;
+
+	bool init();
+	bool add(UDPConn *conn);
+	UDPConn *find(icpkthdr *hdr);
+	void destroy();
+	void remove(UDPConn *conn);
+};
+
+#define CONN_HASH_VALUE(icpkt) ((uint32)((((icpkt)->srcPid ^ (icpkt)->dstPid)) + (icpkt)->dstContentId))
+#define CONN_HASH_MATCH(a, b) (((a)->motNodeId == (b)->motNodeId && \
+								(a)->dstContentId == (b)->dstContentId && \
+								(a)->srcContentId == (b)->srcContentId && \
+								(a)->recvSliceIndex == (b)->recvSliceIndex && \
+								(a)->sendSliceIndex == (b)->sendSliceIndex && \
+								(a)->srcPid == (b)->srcPid &&			\
+								(a)->dstPid == (b)->dstPid && (a)->icId == (b)->icId))
+
+/*
+ * CursorICHistoryEntry
+ *
+ * The definition of cursor IC history entry.
+ */
+typedef struct CursorICHistoryEntry CursorICHistoryEntry;
+struct CursorICHistoryEntry
+{
+	/* Interconnect instance id. */
+	uint32		icId;
+
+	/* Command id. */
+	uint32		cid;
+
+	/*
+	 * Interconnect instance status. state 1 (value 1): interconnect is setup
+	 * state 0 (value 0): interconnect was torn down.
+	 */
+	uint8		status;
+
+	/* Next entry. */
+	CursorICHistoryEntry *next;
+
+	CursorICHistoryEntry(uint32 aicId, uint32 acid):
+		icId(aicId), cid(acid),status(1){}
+};
+
+/*
+ * CursorICHistoryTable
+ *
+ * Cursor IC history table. It is a small hash table.
+ */
+typedef struct CursorICHistoryTable CursorICHistoryTable;
+struct CursorICHistoryTable
+{
+	uint32		size;
+	uint32		count;
+	CursorICHistoryEntry **table;
+
+	void init() {
+		count = 0;
+		size = session_param.Gp_interconnect_cursor_ic_table_size;
+		table = (CursorICHistoryEntry **)ic_malloc0(sizeof(CursorICHistoryEntry *) * size);
+	}
+
+	void add(uint32 icId, uint32 cid) {
+		uint32		index = icId % size;
+		CursorICHistoryEntry *p = new CursorICHistoryEntry(icId, cid);
+
+		p->next = this->table[index];
+		this->table[index] = p;
+		this->count++;
+
+		LOG(DEBUG2, "add icid %d cid %d status %d", p->icId, p->cid, p->status);
+
+		return;
+	}
+
+	/*
+	 * state 1 (value 1): interconnect is setup
+	 * state 0 (value 0): interconnect was torn down.
+	 */
+	void update(uint32 icId, uint8 status) {
+		for (CursorICHistoryEntry *p = table[icId % size]; p; p = p->next) {
+			if (p->icId == icId) {
+				p->status = status;
+				return;
+			}
+		}
+	}
+
+	CursorICHistoryEntry* get(uint32 icId) {
+		for (CursorICHistoryEntry *p = table[icId % size]; p; p = p->next) {
+			if (p->icId == icId)
+				return p;
+		}
+		return NULL;
+	}
+
+	void purge() {
+		for (uint8 index = 0; index < size; index++) {
+			while (table[index]) {
+				CursorICHistoryEntry *trash = table[index];
+				table[index] = trash->next;
+				delete trash;
+			}
+		}
+	}
+
+	void prune(uint32 icId);
+};
+
+/*
+ * Synchronization timeout values
+ *
+ * MAIN_THREAD_COND_TIMEOUT - 1/4 second
+ */
+#define MAIN_THREAD_COND_TIMEOUT_MS (250)
+
+/*
+ *  Used for synchronization between main thread (receiver) and background thread.
+ *
+ */
+typedef struct ThreadWaitingState ThreadWaitingState;
+struct ThreadWaitingState
+{
+	bool		waiting;
+	int			waitingNode;
+	int			waitingRoute;
+	int			reachRoute;
+
+	/* main_thread_waiting_query is needed to disambiguate for cursors */
+	int			waitingQuery;
+
+	void reset() {
+		waiting      = false;
+		waitingNode  = -1;
+		waitingRoute = ANY_ROUTE;
+		reachRoute   = ANY_ROUTE;
+		waitingQuery = -1;
+	}
+
+	void set(int motNodeId, int route, int icId) {
+		waiting      = true;
+		waitingNode  = motNodeId;
+		waitingRoute = route;
+		reachRoute   = ANY_ROUTE;
+		waitingQuery = icId;
+	}
+};
+
+/*
+ * ReceiveControlInfo
+ *
+ * The related control information for receiving data packets.
+ * Main thread (Receiver) and background thread use the information in
+ * this data structure to handle data packets.
+ *
+ */
+typedef struct ReceiveControlInfo ReceiveControlInfo;
+struct ReceiveControlInfo
+{
+	/* Main thread waiting state. */
+	ThreadWaitingState mainWaitingState;
+
+	/*
+	 * Buffers used to assemble disorder messages at receiver side.
+	 */
+	icpkthdr   *disorderBuffer;
+
+	/* The last interconnect instance id which is torn down. */
+	int32		lastTornIcId;
+
+	/* Cursor history table. */
+	CursorICHistoryTable cursorHistoryTable;
+
+	/*
+	 * Last distributed transaction id when SetupUDPInterconnect is called.
+	 * Coupled with cursorHistoryTable, it is used to handle multiple
+	 * concurrent cursor cases.
+	 */
+	DistributedTransactionId lastDXatId;
+};
+
+/*
+ * RxBufferPool
+ *
+ * Receive thread buffer pool definition. The implementation of
+ * receive side buffer pool is different from send side buffer pool.
+ * It is because receive side buffer pool needs a ring buffer to
+ * easily implement disorder message handling logic.
+ */
+
+typedef struct RxBufferPool RxBufferPool;
+struct RxBufferPool
+{
+	/* The max number of buffers we can get from this pool. */
+	int			maxCount;
+
+	/* The number of allocated buffers */
+	int			count;
+
+	/* The list of free buffers. */
+	char	   *freeList;
+
+	void      put(icpkthdr *buf);
+	void      release(icpkthdr *buf);
+	icpkthdr* get();
+	icpkthdr* get_free();
+};
+
+/*
+ * SendBufferPool
+ *
+ * The send side buffer pool definition.
+ *
+ */
+typedef struct SendBufferPool SendBufferPool;
+struct SendBufferPool
+{
+	/* The maximal number of buffers sender can use. */
+	int			maxCount;
+
+	/* The number of buffers sender already used. */
+	int			count;
+
+	/* The free buffer list at the sender side. */
+	ICBufferList freeList;
+
+	void init();
+	void clean();
+	ICBuffer* get(UDPConn *conn);
+};
+
+/*
+ * SendControlInfo
+ *
+ * The related control information for sending data packets and handling acks.
+ * Main thread use the information in this data structure to do ack handling
+ * and congestion control.
+ *
+ */
+typedef struct SendControlInfo SendControlInfo;
+struct SendControlInfo
+{
+	/* The buffer used for accepting acks */
+	icpkthdr   *ackBuffer;
+
+	/* congestion window */
+	float		cwnd;
+
+	/* minimal congestion control window */
+	float		minCwnd;
+
+	/* slow start threshold */
+	float		ssthresh;
+
+};
+
+/*
+ * ICGlobalControlInfo
+ *
+ * Some shared control information that is used by main thread (senders, receivers, or both)
+ * and the background thread.
+ *
+ */
+typedef struct ICGlobalControlInfo ICGlobalControlInfo;
+struct ICGlobalControlInfo
+{
+	/* The background thread handle. */
+	pthread_t	threadHandle;
+
+	/* Keep the udp socket buffer size used. */
+	uint32		socketSendBufferSize;
+	uint32		socketRecvBufferSize;
+
+	uint64		lastExpirationCheckTime;
+	uint64		lastDeadlockCheckTime;
+
+	/* Used to decide whether to retransmit for capacity based FC. */
+	uint64		lastPacketSendTime;
+
+	/*
+	 * Lock and latch for coordination between main thread and
+	 * background thread. It protects the shared data between the two threads
+	 * (the connHtab, rx buffer pool and the mainWaitingState etc.).
+	 */
+	pthread_mutex_t lock;
+
+	/* Am I a sender? */
+	bool		isSender;
+
+	/* Flag showing whether the thread is created. */
+	bool		threadCreated;
+
+	/* Error number. Actually int but we do not have ic_atomic_int32. */
+	ic_atomic_uint32 eno;
+
+	/*
+	 * Global connection htab for both sending connections and receiving
+	 * connections. Protected by the lock in this data structure.
+	 */
+	ConnHashTable connHtab;
+
+	/* The connection htab used to cache future packets. */
+	ConnHashTable startupCacheHtab;
+
+	/* Used by main thread to ask the background thread to exit. */
+	ic_atomic_uint32 shutdown;
+
+	/*Serialization
+	 * Used by ic thread in the QE to identify the current serving ic instance
+	 * and handle the mismatch packets. It is not used by QD because QD may have
+	 * cursors, QD may receive packets for open the cursors with lower instance
+	 * id, QD use cursorHistoryTable to handle packets mismatch.
+	 */
+	int32		ic_instance_id;
+};
+
+/*
+ * Macro for unack queue ring, round trip time (RTT) and expiration period (RTO)
+ *
+ * UNACK_QUEUE_RING_SLOTS_NUM - the number of slots in the unack queue ring.
+ *                              this value should be greater than or equal to 2.
+ * TIMER_SPAN                 - timer period in us
+ * TIMER_CHECKING_PERIOD      - timer checking period in us
+ * UNACK_QUEUE_RING_LENGTH    - the whole time span of the unack queue ring
+ * DEFAULT_RTT                - default rtt in us.
+ * MIN_RTT                    - min rtt in us
+ * MAX_RTT                    - max rtt in us
+ * RTT_SHIFT_COEFFICIENT      - coefficient for RTT computation
+ *
+ * DEFAULT_DEV                - default round trip standard deviation
+ * MAX_DEV                    - max dev
+ * DEV_SHIFT_COEFFICIENT      - coefficient for DEV computation
+ *
+ * MAX_EXPIRATION_PERIOD      - max expiration period in us
+ * MIN_EXPIRATION_PERIOD      - min expiration period in us
+ * MAX_TIME_NO_TIMER_CHECKING - max time without checking timer
+ * DEADLOCK_CHECKING_TIME     - deadlock checking time
+ *
+ * MAX_SEQS_IN_DISORDER_ACK   - max number of sequences that can be transmitted in a
+ *                              disordered packet ack.
+ *
+ *
+ * Considerations on the settings of the values:
+ *
+ * TIMER_SPAN and UNACK_QUEUE_RING_SLOTS_NUM define the ring period.
+ * Currently, it is UNACK_QUEUE_RING_LENGTH (default 10 seconds).
+ *
+ * The definition of UNACK_QUEUE_RING_LENGTH is quite related to the size of
+ * sender side buffer and the size we may resend in a burst for an expiration event
+ * (which may overwhelm switch or OS if it is too large).
+ * Thus, we do not want to send too much data in a single expiration event. Here, a
+ * relatively large UNACK_QUEUE_RING_SLOTS_NUM value is used to avoid that.
+ *
+ * If the sender side buffer is X (MB), then on each slot,
+ * there are about X/UNACK_QUEUE_RING_SLOTS_NUM. Even we have a very large sender buffer,
+ * for example, 100MB, there is about 96M/2000 = 50K per slot.
+ * This is fine for the OS (with buffer 2M for each socket generally) and switch.
+ *
+ * Note that even when the buffers are not evenly distributed in the ring and there are some packet
+ * losses, the congestion control mechanism, the disorder and duplicate packet handling logic will
+ * assure the number of outstanding buffers (in unack queues) to be not very large.
+ *
+ * MIN_RTT/MAX_RTT/DEFAULT_RTT/MIN_EXPIRATION_PERIOD/MAX_EXPIRATION_PERIOD gives some heuristic values about
+ * the computation of RTT and expiration period. RTT and expiration period (RTO) are not
+ * constant for various kinds of hardware and workloads. Thus, they are computed dynamically.
+ * But we also want to bound the values of RTT and MAX_EXPIRATION_PERIOD. It is
+ * because there are some faults that may make RTT a very abnormal value. Thus, RTT and
+ * expiration period are upper and lower bounded.
+ *
+ * MAX_SEQS_IN_DISORDER_ACK should be smaller than (MIN_PACKET_SIZE - sizeof(icpkthdr))/sizeof(uint32).
+ * It is due to the limitation of the ack receive buffer size.
+ *
+ */
+#define UNACK_QUEUE_RING_SLOTS_NUM (2000)
+#define TIMER_SPAN (session_param.Gp_interconnect_timer_period * 1000ULL)	/* default: 5ms */
+#define TIMER_SPAN_LOSS (session_param.Gp_interconnect_timer_period * 500ULL)     /* default: 5ms */
+#define TIMER_CHECKING_PERIOD (session_param.Gp_interconnect_timer_checking_period)	/* default: 20ms */
+#define UNACK_QUEUE_RING_LENGTH (UNACK_QUEUE_RING_SLOTS_NUM * TIMER_SPAN)
+#define UNACK_QUEUE_RING_LENGTH_LOSS (UNACK_QUEUE_RING_SLOTS_NUM * TIMER_SPAN_LOSS)
+
+#define DEFAULT_RTT (session_param.Gp_interconnect_default_rtt * 1000)	/* default: 20ms */
+#define MIN_RTT (100)			/* 0.1ms */
+#define MAX_RTT (200 * 1000)	/* 200ms */
+#define RTT_SHIFT_COEFFICIENT (3)	/* RTT_COEFFICIENT 1/8 (0.125) */
+
+#define DEFAULT_DEV (0)
+#define MIN_DEV MIN_RTT
+#define MAX_DEV MAX_RTT
+#define DEV_SHIFT_COEFFICIENT (2)	/* DEV_COEFFICIENT 1/4 (0.25) */
+
+#define MAX_EXPIRATION_PERIOD (1000 * 1000) /* 1s */
+#define MIN_EXPIRATION_PERIOD (session_param.Gp_interconnect_min_rto * 1000)	/* default: 20ms */
+
+#define MAX_TIME_NO_TIMER_CHECKING (50 * 1000)	/* 50ms */
+#define DEADLOCK_CHECKING_TIME  (512 * 1000)	/* 512ms */
+
+#define MAX_SEQS_IN_DISORDER_ACK (4)
+
+/*
+ * UnackQueueRing
+ *
+ * An unacked queue ring is used to decide which packet is expired in constant time.
+ *
+ * Each slot of the ring represents a fixed time span, for example 1ms, and
+ * each slot has a associated buffer list/queue which contains the packets
+ * which will expire in the time span.
+ *
+ * If the current time pointer (time t) points to slot 1,
+ * then slot 2 represents the time span from t + 1ms to t + 2ms.
+ * When we check whether there are some packets expired, we start from the last
+ * current time recorded, and resend all the packets in the queue
+ * until we reach the slot that the updated current time points to.
+ *
+ */
+typedef struct UnackQueueRing UnackQueueRing;
+struct UnackQueueRing
+{
+	/* save the current time when we check the time wheel for expiration */
+	uint64		currentTime;
+
+	/* the slot index corresponding to current time */
+	int			idx;
+
+	/* the number of outstanding packets in unack queue ring */
+	int			numOutStanding;
+
+	/*
+	 * the number of outstanding packets that use the shared bandwidth in the
+	 * congestion window.
+	 */
+	int			numSharedOutStanding;
+
+	/* time slots */
+	ICBufferList slots[UNACK_QUEUE_RING_SLOTS_NUM];
+#ifdef TIMEOUT_Z
+	uint32_t retrans_count;
+	uint32_t no_retrans_count;
+	uint32_t time_difference;
+	uint32_t min;
+	uint32_t max;
+#endif
+};
+
+/*
+ * AckSendParam
+ *
+ * The parameters for ack sending.
+ */
+typedef struct AckSendParam
+{
+	/* header for the ack */
+	icpkthdr	msg;
+
+	/* peer address for the ack */
+	struct sockaddr_storage peer;
+	socklen_t	peer_len;
+} AckSendParam;
+
+/*
+ * ICStatistics
+ *
+ * A structure keeping various statistics about interconnect internal.
+ *
+ * Note that the statistics for ic are not accurate for multiple cursor case on QD.
+ *
+ * totalRecvQueueSize        - receive queue size sum when main thread is trying to get a packet.
+ * recvQueueSizeCountingTime - counting times when computing totalRecvQueueSize.
+ * totalCapacity             - the capacity sum when packets are tried to be sent.
+ * capacityCountingTime      - counting times used to compute totalCapacity.
+ * totalBuffers              - total buffers available when sending packets.
+ * bufferCountingTime        - counting times when compute totalBuffers.
+ * activeConnectionsNum      - the number of active connections.
+ * retransmits               - the number of packet retransmits.
+ * mismatchNum               - the number of mismatched packets received.
+ * crcErrors                 - the number of crc errors.
+ * sndPktNum                 - the number of packets sent by sender.
+ * recvPktNum                - the number of packets received by receiver.
+ * disorderedPktNum          - disordered packet number.
+ * duplicatedPktNum          - duplicate packet number.
+ * recvAckNum                - the number of Acks received.
+ * statusQueryMsgNum         - the number of status query messages sent.
+ *
+ */
+typedef struct ICStatistics
+{
+	uint64		totalRecvQueueSize;
+	uint64		recvQueueSizeCountingTime;
+	uint64		totalCapacity;
+	uint64		capacityCountingTime;
+	uint64		totalBuffers;
+	uint64		bufferCountingTime;
+	uint32		activeConnectionsNum;
+	int32		retransmits;
+	int32		startupCachedPktNum;
+	int32		mismatchNum;
+	int32		crcErrors;
+	int32		sndPktNum;
+	int32		recvPktNum;
+	int32		disorderedPktNum;
+	int32		duplicatedPktNum;
+	int32		recvAckNum;
+	int32		statusQueryMsgNum;
+} ICStatistics;
+
+struct TransportEntry;
+
+struct udp_send_vars
+{
+	/* send sequence variables */
+	uint32_t snd_una;		/* send unacknoledged */
+	uint32_t snd_wnd;		/* send window (unscaled) */
+
+	/* retransmission timeout variables */
+	uint8_t nrtx;			/* number of retransmission */
+	uint8_t max_nrtx;		/* max number of retransmission */
+	uint32_t rto;			/* retransmission timeout */
+	uint32_t ts_rto;		/* timestamp for retransmission timeout */
+
+	/* congestion control variables */
+	uint32_t cwnd;				/* congestion window */
+	uint32_t ssthresh;			/* slow start threshold */
+
+	TAILQ_ENTRY(UDPConn) send_link;
+	TAILQ_ENTRY(UDPConn) timer_link;		/* timer link (rto list) */
+
+};
+
+/*
+ * Structure used for keeping track of a pt-to-pt connection between two
+ * Cdb Entities (either QE or QD).
+ */
+struct UDPConn : public MotionConn
+{
+public:
+	/* send side queue for packets to be sent */
+	ICBufferList sndQueue;
+	int			capacity;
+
+	/* seq already sent */
+	uint32		sentSeq;
+
+	/* ack of this seq and packets with smaller seqs have been received */
+	uint32		receivedAckSeq;
+
+	/* packets with this seq or smaller seqs have been consumed */
+	uint32		consumedSeq;
+
+	uint64		rtt;
+	uint64		dev;
+	uint64		deadlockCheckBeginTime;
+
+	ICBuffer   *curBuff;
+
+	/*
+	 * send side unacked packet queue. Since it is often accessed at the same
+	 * time with unack queue ring, it is protected with unqck queue ring lock.
+	 */
+	ICBufferList unackQueue;
+
+	uint16		route;
+
+	struct icpkthdr conn_info;
+
+	struct sockaddr_storage peer;	/* Allow for IPv4 or IPv6 */
+	socklen_t	peer_len;		/* And remember the actual length */
+
+	/* a queue of maximum length Gp_interconnect_queue_depth */
+	uint32		pkt_q_capacity; /* max capacity of the queue */
+	uint32		pkt_q_size;		/* number of packets in the queue */
+	int			pkt_q_head;
+	int			pkt_q_tail;
+	uint8	  **pkt_q;
+
+	uint64		stat_total_ack_time;
+	uint64		stat_count_acks;
+	uint64		stat_max_ack_time;
+	uint64		stat_min_ack_time;
+	uint64		stat_count_resent;
+	uint64		stat_max_resent;
+	uint64		stat_count_dropped;
+
+	struct {
+			uint32_t ts_rto;
+			uint32_t rto;
+			uint32_t srtt;
+			uint32_t rttvar;
+			uint32_t snd_una;
+			uint16_t nrtx;
+			uint16_t max_nrtx;
+			uint32_t mss;
+			uint32_t cwnd;
+			uint32_t ssthresh;
+			uint32_t fss;
+			uint8_t loss_count;
+			uint32_t mdev;
+			uint32_t mdev_max;
+			uint32_t rtt_seq;		/* sequence number to update rttvar */
+			uint32_t ts_all_rto;
+			bool karn_mode;
+	} rttvar;
+	
+	uint8_t on_timewait_list;
+	int16_t on_rto_idx;
+
+	uint32_t snd_nxt;		/* send next */
+	struct udp_send_vars sndvar;
+
+	TransportEntry *entry_;
+
+public:
+	UDPConn(TransportEntry *entry);
+
+	void GetDataInBuf(GetDataLenInPacket getLen, DataBlock *data);
+	void ReleaseBuffer(AckSendParam *param);
+
+	void setAckParam(AckSendParam *param, int32 flags, uint32 seq, uint32 extraSeq);
+	void sendAck(int32 flags, uint32 seq, uint32 extraSeq);
+	void sendDisorderAck(uint32 seq, uint32 extraSeq, uint32 lostPktCnt);
+	void sendStatusQueryMessage(uint32 seq);
+
+	uint64 computeExpirationPeriod(uint32 retry);
+
+	void freeDisorderedPackets();
+	void prepareRxConnForRead();
+	void DeactiveConn();
+
+	void handleAckedPacket(ICBuffer *buf, uint64 now, struct icpkthdr *pkt);
+	void prepareXmit();
+	void sendOnce(icpkthdr *pkt);
+	void handleStop();
+	void sendBuffers();
+
+	void handleDisorderPacket(int pos, uint32 tailSeq, icpkthdr *pkt);
+	bool handleAckForDisorderPkt(icpkthdr *pkt);
+	bool handleAckForDuplicatePkt(icpkthdr *pkt);
+	int computeTimeout(int retry);
+
+	void Send(DataBlock *data);
+
+	void checkDeadlock();
+	void checkExceptions(int retry, int timeout);
+
+	void updateRetransmitStatistics();
+	void checkExpirationCapacityFC(int timeout);
+	void checkExpiration(ICChunkTransportState *transportStates, uint64 now);
+
+	static void checkNetworkTimeout(ICBuffer *buf, uint64 now, bool *networkTimeoutIsLogged);
+
+	static void sendAckWithParam(AckSendParam *param);
+	static void sendControlMessage(icpkthdr *pkt, int fd, struct sockaddr *addr, socklen_t peerLen);
+};
+
+
+/*
+ * Used to organize all of the information for a given motion node.
+ */
+struct CChunkTransportStateEntry
+{
+	int			motNodeId;
+	bool		valid;
+
+	/* Connection array
+	 *
+	 * MUST pay attention: use getMotionConn to get MotionConn.
+	 * must not use `->conns[index]` to get MotionConn. Because the struct
+	 * MotionConn is a base structure for MotionConnTCP and
+	 * MotionConnUDP. After connection setup, the `conns` will be fill
+	 * with MotionConnUDP/MotionConnTCP, but the pointer still is
+	 * MotionConn which should use `CONTAINER_OF` to get the real object.
+	 */
+	MotionConn *conns;
+	int			numConns;
+
+	int			scanStart;
+
+	/* slice table entries */
+	struct ICExecSlice *sendSlice;
+	struct ICExecSlice *recvSlice;
+};
+
+class CChunkTransportStateImpl;
+
+class TransportEntry : public CChunkTransportStateEntry
+{
+public:
+	static std::unique_ptr<TransportEntry>
+		MakeRecvEntry(CChunkTransportStateImpl *state, int icid, ICExecSlice *sendSlice, ICExecSlice *recvSlice);
+
+	static std::unique_ptr<TransportEntry>
+		MakeSendEntry(CChunkTransportStateImpl *state, int icid, ICExecSlice *sendSlice, ICExecSlice *recvSlice);
+
+	TransportEntry(CChunkTransportStateImpl *state, int motNodeID, int numConns, ICExecSlice *sendSlice, ICExecSlice *recvSlice);
+
+	UDPConn* GetConn(int index);
+
+	void aggregateStatistics();
+
+	bool handleAcks(bool need_flush);
+	void handleStopMsgs();
+
+	bool pollAcks(int timeout);
+
+	void dumpConnections(const char *fname);
+
+	bool SendData(int16 targetRoute, DataBlock *pblocks, int num, bool broadcast);
+	void Broadcast(DataBlock *data, int *inactiveCountPtr);
+	void Send(int16 targetRoute, DataBlock *db, bool broadcast, int *recount);
+
+	void RecvAny(int16 *srcRoute, GetDataLenInPacket getLen, DataBlock *data);
+	void RecvRoute(int16 srcRoute, GetDataLenInPacket getLen, DataBlock *data);
+	void receiveChunksUDPIFC(int16 *srcRoute, UDPConn *conn, GetDataLenInPacket getLen, DataBlock *data);
+
+public:
+	/* setup info */
+	int			txfd;
+	int			txfd_family;
+	unsigned short txport;
+
+	bool		sendingEos;
+
+	/* Statistics info for this motion on the interconnect level */
+	uint64		stat_total_ack_time;
+	uint64		stat_count_acks;
+	uint64		stat_max_ack_time;
+	uint64		stat_min_ack_time;
+	uint64		stat_count_resent;
+	uint64		stat_max_resent;
+	uint64		stat_count_dropped;
+
+	std::vector<std::unique_ptr<UDPConn>> conns_;
+	CChunkTransportStateImpl *state;
+};
+
+
+class CChunkTransportStateImpl : public CChunkTransportState
+{
+public:
+	CChunkTransportStateImpl(ICSliceTable *sliceTable);
+
+	static ICChunkTransportState* SetupUDP(ICSliceTable *sliceTable, SessionMotionLayerIPCParam *param);
+	void TeardownUDP(bool hasErrors);
+
+	void RecvRoute(int16 motNodeID, int16 srcRoute, GetDataLenInPacket getLen, DataBlock *data);
+	void RecvAny(int16 motNodeID, int16 *srcRoute, GetDataLenInPacket getLen, DataBlock *data);
+	void SendStop(int16 motNodeID);
+	void ReleaseAndAck(int motNodeID, int route);
+	void DeactiveRoute(int motNodeID, int srcRoute, const char *reason);
+
+	void SendEOS(int motNodeID, DataBlock *data);
+	bool SendData(int16 motNodeID, int16 targetRoute, DataBlock *pblocks, int num, bool broadcast);
+	void GetFreeSpace(int16 motNodeID, int16 targetRoute, BufferBlock *b);
+	void ReduceFreeSpace(int16 motNodeID, int16 targetRoute, int length);
+
+	void* GetOpaqueDataInConn(int16 motNodeID, int16 targetRoute);
+	int32* GetSentRecordTypmodInConn(int16 motNodeID, int16 targetRoute);
+
+	int  GetConnNum(int motNodeID);
+
+	TransportEntry* GetEntry(int motNodeID, bool checkValid);
+
+	static CChunkTransportState **GetTransportState();
+
+	/* APIs for vector engine */
+	void NotifyQuit();
+	void SetVectorEngineAsUser();
+
+private:
+	void checkMotNodeID(int sendMotNodeID);
+	void CreateRecvEntries(ICSliceTable *sliceTable);
+	void CreateSendEntries(ICSliceTable *sliceTable);
+	void DestroyRecvEntries(bool *isReceiver);
+	void DestroySendEntries();
+	static ICChunkTransportState* setup(ICSliceTable *sliceTable);
+	void teardown(bool hasErrors);
+
+	std::vector<std::unique_ptr<TransportEntry>>  entries_;
+
+	static CChunkTransportState *state_;
+};
+
+} // namespace
+
+#endif  /* IC_UDP2_INTERNAL_HPP */
\ No newline at end of file
diff --git a/contrib/udp2/ic_modules.c b/contrib/udp2/ic_modules.c
new file mode 100644
index 00000000000..47843f08c99
--- /dev/null
+++ b/contrib/udp2/ic_modules.c
@@ -0,0 +1,88 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_modules.c
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_modules.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "cdb/ml_ipc.h"
+#include "ic_modules.h"
+#include "ic_udp2.h"
+
+PG_MODULE_MAGIC;
+
+static
+MotionIPCLayer udp2_ipc_layer = {
+    .ic_type = INTERCONNECT_TYPE_UDP2,
+    .type_name = "udp2",
+
+    .GetMaxTupleChunkSize = GetMaxTupleChunkSizeUDP2,
+    .GetListenPort        = GetListenPortUDP2,
+
+    .InitMotionLayerIPC    = InitMotionIPCLayerUDP2,
+    .CleanUpMotionLayerIPC = CleanUpMotionLayerIPCUDP2,
+    .WaitInterconnectQuit  = WaitInterconnectQuitUDPIFC2,
+    .SetupInterconnect     = SetupInterconnectUDP2,
+    .TeardownInterconnect  = TeardownInterconnectUDP2,
+
+    .SendTupleChunkToAMS = SendTupleChunkToAMSUDP2,
+    .SendChunk           = NULL,
+    .SendEOS             = SendEOSUDPIFC2,
+    .SendStopMessage     = SendStopMessageUDPIFC2,
+
+    .RecvTupleChunkFromAny = RecvTupleChunkFromAnyUDPIFC2,
+    .RecvTupleChunkFrom    = RecvTupleChunkFromUDPIFC2,
+    .RecvTupleChunk        = NULL,
+
+    .DirectPutRxBuffer = MlPutRxBufferUDPIFC2,
+
+    .DeregisterReadInterest = DeregisterReadInterestUDP2,
+    .GetActiveMotionConns   = GetActiveMotionConnsUDPIFC2,
+
+    .GetTransportDirectBuffer = GetTransportDirectBufferUDPIFC2,
+    .PutTransportDirectBuffer = PutTransportDirectBufferUDPIFC2,
+
+#ifdef ENABLE_IC_PROXY
+    .IcProxyServiceMain = ic_proxy_server_main,
+#else 
+    .IcProxyServiceMain = NULL,
+#endif
+
+    .GetMotionConnTupleRemapper = GetMotionConnTupleRemapperUDPIFC2,
+    .GetMotionSentRecordTypmod  = GetMotionSentRecordTypmodUDPIFC2,
+};
+
+void
+_PG_init(void)
+{
+	if (!process_shared_preload_libraries_in_progress)
+	{
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not load udp2 outside process shared preload")));
+	}
+
+	RegisterIPCLayerImpl(&udp2_ipc_layer);
+}
\ No newline at end of file
diff --git a/contrib/udp2/ic_modules.h b/contrib/udp2/ic_modules.h
new file mode 100644
index 00000000000..a05b65894f3
--- /dev/null
+++ b/contrib/udp2/ic_modules.h
@@ -0,0 +1,32 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_modules.h
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_modules.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef INTER_CONNECT_H
+#define INTER_CONNECT_H
+
+extern void _PG_init(void);
+
+#endif // INTER_CONNECT_H
\ No newline at end of file
diff --git a/contrib/udp2/ic_udp2.c b/contrib/udp2/ic_udp2.c
new file mode 100644
index 00000000000..0972c874941
--- /dev/null
+++ b/contrib/udp2/ic_udp2.c
@@ -0,0 +1,1028 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_udp2.c
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_udp2.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "cdb/cdbdisp.h"
+#include "cdb/cdbgang.h"
+#include "cdb/cdbmotion.h"
+#include "cdb/cdbvars.h"
+#include "cdb/tupchunklist.h"
+#include "postmaster/bgworker.h"
+#include "postmaster/postmaster.h"
+#include "storage/latch.h"
+#include "storage/pmsignal.h"
+#include "tcop/tcopprot.h"
+#include "utils/wait_event.h"
+#include "utils/memutils.h"
+
+/* local interconnect */
+#include "ic_udp2.h"
+
+/* from ic_common packeage */
+#include "ic_types.h"
+#include "udp2/ic_udp2.h"
+
+#define MAX_QUEUE_SIZE (64)
+
+#define HandleLastError() \
+do { \
+	ICError *error = GetLastError(); \
+	Assert(error); \
+	if (error->level == LEVEL_ERROR) \
+	{ \
+		Assert(error->msg); \
+		elog(ERROR, "%s", error->msg); \
+	} \
+	if (error->level == LEVEL_FATAL) \
+	{ \
+		Assert(error->msg); \
+		elog(FATAL, "%s", error->msg); \
+	} \
+} while (0)
+
+#define ML_CHECK_FOR_INTERRUPTS(teardownActive) \
+		do {if (!teardownActive && InterruptPending) CHECK_FOR_INTERRUPTS(); } while (0)
+
+/*
+ * Resource manager
+ */
+typedef void (*TeardownInterconnectCallBack)(ChunkTransportState *transportStates, bool hasErrors);
+typedef struct interconnect_handle_t
+{
+	ChunkTransportState		*interconnect_context; /* Interconnect state */
+
+	// callback for interconnect been abort
+	TeardownInterconnectCallBack teardown_cb;
+
+	ResourceOwner owner;	/* owner of this handle */
+	struct interconnect_handle_t *next;
+	struct interconnect_handle_t *prev;
+} interconnect_handle_t;
+
+static interconnect_handle_t * open_interconnect_handles;
+static bool interconnect_resowner_callback_registered;
+
+static void destroy_interconnect_handle(interconnect_handle_t *h);
+static interconnect_handle_t * allocate_interconnect_handle(TeardownInterconnectCallBack callback);
+static interconnect_handle_t * find_interconnect_handle(ChunkTransportState *icContext);
+
+
+static void SetupGlobalMotionLayerIPCParam(GlobalMotionLayerIPCParam *param);
+static void SetupSessionMotionLayerIPCParam(SessionMotionLayerIPCParam *param);
+static bool CheckPostmasterIsAlive(void);
+static void CheckCancelOnQD(ICChunkTransportState *pTransportStates);
+static void CheckInterrupts(int teardownActive);
+static void SimpleFaultInjector(const char *faultname);
+static void *CreateOpaqueData(void);
+static void DestroyOpaqueData(void **opaque);
+static ICSliceTable* ConvertToICSliceTable(SliceTable *tbl);
+static TupleChunkListItem ConvertToTupleChunk(ChunkTransportState *transportStates, DataBlock *data);
+static ChunkTransportState *CreateChunkTransportState(EState *estate, ICChunkTransportState *udp2_state);
+
+
+int
+GetMaxTupleChunkSizeUDP2(void)
+{
+	int header_size = UDP2_GetICHeaderSizeUDP();
+	return Gp_max_packet_size - header_size - TUPLE_CHUNK_HEADER_SIZE;
+}
+
+int32
+GetListenPortUDP2(void)
+{
+	return UDP2_GetListenPortUDP();
+}
+
+void
+InitMotionIPCLayerUDP2(void)
+{
+	GlobalMotionLayerIPCParam param;
+	SetupGlobalMotionLayerIPCParam(&param);
+
+	param.checkPostmasterIsAliveCallback = CheckPostmasterIsAlive;
+	param.checkInterruptsCallback        = CheckInterrupts;
+	param.simpleFaultInjectorCallback    = SimpleFaultInjector;
+
+	param.createOpaqueDataCallback       = CreateOpaqueData;
+	param.destroyOpaqueDataCallback      = DestroyOpaqueData;
+
+	param.checkCancelOnQDCallback        = CheckCancelOnQD;
+
+	ResetLastError();
+	UDP2_InitUDPIFC(&param);
+	HandleLastError();
+}
+
+void
+CleanUpMotionLayerIPCUDP2(void)
+{
+	if (gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG)
+		elog(DEBUG3, "Cleaning Up Motion Layer IPC...");
+
+	ResetLastError();
+	UDP2_CleanUpUDPIFC();
+	HandleLastError();
+}
+
+void
+WaitInterconnectQuitUDPIFC2(void)
+{
+	ResetLastError();
+	UDP2_WaitQuitUDPIFC();
+	HandleLastError();
+}
+
+void
+SetupInterconnectUDP2(EState *estate)
+{
+	int32 sliceNum = 0;
+	int32 calcQueueDepth = 0;
+	int32 calcSndDepth = 0;
+
+	if (estate->interconnect_context)
+		elog(ERROR, "SetupInterconnectUDP: already initialized.");
+
+	if (!estate->es_sliceTable)
+		elog(ERROR, "SetupInterconnectUDP: no slice table ?");
+
+	if (estate != NULL && estate->es_sliceTable != NULL)
+		sliceNum = estate->es_sliceTable->numSlices;
+	else
+		sliceNum = 1;
+
+	if (Gp_interconnect_mem_size > 0 &&
+		Gp_interconnect_queue_depth == 4 &&
+		Gp_interconnect_snd_queue_depth == 2)
+	{
+		int32 perQueue = Gp_interconnect_mem_size /
+			(Gp_max_packet_size * sliceNum);
+
+		calcSndDepth = Max(Gp_interconnect_snd_queue_depth, perQueue / 2);
+		calcQueueDepth = Max(Gp_interconnect_queue_depth, perQueue - calcSndDepth);
+
+		if (calcSndDepth > MAX_QUEUE_SIZE)
+			calcSndDepth = MAX_QUEUE_SIZE;
+
+		if (calcQueueDepth > MAX_QUEUE_SIZE)
+			calcQueueDepth = MAX_QUEUE_SIZE;
+
+		Gp_interconnect_snd_queue_depth = calcSndDepth;
+		Gp_interconnect_queue_depth = calcQueueDepth;
+
+		elog(DEBUG1, "SetupUDPIFCInterconnect: queue depth, "
+				     "queue_depth=%d, snd_queue_depth=%d, "
+				     "mem_size=%d, slices=%d, packet_size=%d",
+				     Gp_interconnect_queue_depth,
+				     Gp_interconnect_snd_queue_depth,
+				     Gp_interconnect_mem_size,
+				     sliceNum,
+				     Gp_max_packet_size);
+	}
+
+	SessionMotionLayerIPCParam param;
+	SetupSessionMotionLayerIPCParam(&param);
+
+	interconnect_handle_t *h;
+	h = allocate_interconnect_handle(TeardownInterconnectUDP2);
+
+	ICSliceTable *tbl = ConvertToICSliceTable(estate->es_sliceTable);
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state = UDP2_SetupUDP(tbl, &param);
+	HandleLastError();
+
+	Assert(udp2_state);
+	ChunkTransportState *state = CreateChunkTransportState(estate, udp2_state);
+	h->interconnect_context = state;
+
+	h->interconnect_context->estate = estate;
+	estate->interconnect_context = h->interconnect_context;
+	estate->es_interconnect_is_setup = true;
+
+	/* Check if any of the QEs has already finished with error */
+	if (Gp_role == GP_ROLE_DISPATCH)
+	{
+		ChunkTransportState *pTransportStates = h->interconnect_context;
+
+		Assert(pTransportStates);
+		Assert(pTransportStates->estate);
+
+		if (cdbdisp_checkForCancel(pTransportStates->estate->dispatcherState))
+		{
+			ereport(ERROR, (errcode(ERRCODE_GP_INTERCONNECTION_ERROR),
+					errmsg(CDB_MOTION_LOST_CONTACT_STRING)));
+			/* not reached */
+		}
+	}
+}
+
+void
+TeardownInterconnectUDP2(ChunkTransportState *transportStates, bool hasErrors)
+{
+	if (transportStates == NULL || transportStates->sliceTable == NULL)
+	{
+		elog(LOG, "TeardownUDPIFCInterconnect: missing slice table.");
+		return;
+	}
+
+	/* TODO: should pass interconnect_handle_t as arg? */
+	interconnect_handle_t *h = find_interconnect_handle(transportStates);
+
+	ResetLastError();
+	HOLD_INTERRUPTS();
+
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_TeardownUDP(udp2_state, hasErrors);
+
+	transportStates->activated = false;
+	transportStates->sliceTable = NULL;
+
+	RESUME_INTERRUPTS();
+	HandleLastError();
+
+	if (h != NULL)
+		destroy_interconnect_handle(h);
+}
+
+bool
+SendTupleChunkToAMSUDP2(ChunkTransportState *transportStates,
+						int16 motNodeID,
+						int16 targetRoute,
+						TupleChunkListItem tcItem)
+{
+	if (!transportStates)
+	{
+		elog(FATAL, "SendTupleChunkToAMS: no transport-states.");
+	}
+
+	if (!transportStates->activated)
+	{
+		elog(FATAL, "SendTupleChunkToAMS: transport states inactive");
+	}
+
+	/* check em' */
+	ML_CHECK_FOR_INTERRUPTS(transportStates->teardownActive);
+
+#ifdef AMS_VERBOSE_LOGGING
+	elog(DEBUG3, "sendtuplechunktoams: calling get_transport_state"
+		 "w/transportStates %p transportState->size %d motnodeid %d route %d",
+		 transportStates, transportStates->size, motNodeID, targetRoute);
+#endif
+
+	/* get the number of TupleChunkListItem */
+	int num = 0;
+	TupleChunkListItem item = tcItem;
+	while (item)
+	{
+		num++;
+		item = item->p_next;
+	}
+
+	/* convert to DataBlock */
+	DataBlock *pblocks = (DataBlock *)palloc0(sizeof(DataBlock) * num);
+	item = tcItem;
+	for (int i = 0; i < num; ++i)
+	{
+		pblocks[i].pos = item->chunk_data;
+		pblocks[i].len = item->chunk_length;
+
+		item = item->p_next;
+	}
+
+	bool broadcast = (targetRoute == BROADCAST_SEGIDX);
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	bool rs = UDP2_SendData(udp2_state,
+						motNodeID,
+						targetRoute,
+						pblocks,
+						num,
+						broadcast);
+	HandleLastError();
+
+	return rs;
+}
+
+void
+SendEOSUDPIFC2(ChunkTransportState *transportStates,
+			   int motNodeID,
+			   TupleChunkListItem tcItem)
+{
+	if (!transportStates)
+	{
+		elog(FATAL, "SendEOSUDPIFC: missing interconnect context.");
+	}
+	else if (!transportStates->activated && !transportStates->teardownActive)
+	{
+		elog(FATAL, "SendEOSUDPIFC: context and teardown inactive.");
+	}
+
+	/* check em' */
+	ML_CHECK_FOR_INTERRUPTS(transportStates->teardownActive);
+
+	DataBlock db;
+	db.pos = tcItem->chunk_data;
+	db.len = tcItem->chunk_length;
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_SendEOS(udp2_state, motNodeID, &db);
+	HandleLastError();
+}
+
+void
+SendStopMessageUDPIFC2(ChunkTransportState *transportStates, int16 motNodeID)
+{
+	if (!transportStates->activated)
+		return;
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_SendStop(udp2_state, motNodeID);
+	HandleLastError();
+}
+
+TupleChunkListItem
+RecvTupleChunkFromAnyUDPIFC2(ChunkTransportState *transportStates,
+							 int16 motNodeID,
+							 int16 *srcRoute)
+{
+	if (!transportStates)
+	{
+		elog(FATAL, "RecvTupleChunkFromAnyUDPIFC: missing context");
+	}
+	else if (!transportStates->activated)
+	{
+		elog(FATAL, "RecvTupleChunkFromAnyUDPIFC: interconnect context not active!");
+	}
+
+	DataBlock db = {NULL, 0};
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_RecvAny(udp2_state, motNodeID, srcRoute, NULL, &db);
+	HandleLastError();
+
+	if (db.pos == NULL)
+		return NULL;
+
+	return ConvertToTupleChunk(transportStates, &db);
+}
+
+TupleChunkListItem
+RecvTupleChunkFromUDPIFC2(ChunkTransportState *transportStates,
+						  int16 motNodeID,
+						  int16 srcRoute)
+{
+	if (!transportStates)
+	{
+		elog(FATAL, "RecvTupleChunkFromUDPIFC: missing context");
+	}
+	else if (!transportStates->activated)
+	{
+		elog(FATAL, "RecvTupleChunkFromUDPIFC: interconnect context not active!");
+	}
+
+#ifdef AMS_VERBOSE_LOGGING
+	elog(LOG, "RecvTupleChunkFromUDPIFC().");
+#endif
+
+	/* check em' */
+	ML_CHECK_FOR_INTERRUPTS(transportStates->teardownActive);
+
+#ifdef AMS_VERBOSE_LOGGING
+	elog(DEBUG5, "RecvTupleChunkFromUDPIFC(motNodID=%d, srcRoute=%d)", motNodeID, srcRoute);
+#endif
+
+	DataBlock db = {NULL, 0};
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_RecvRoute(udp2_state, motNodeID, srcRoute, NULL, &db);
+	HandleLastError();
+
+	if (db.pos == NULL)
+		return NULL;
+
+	return ConvertToTupleChunk(transportStates, &db);
+}
+
+void
+MlPutRxBufferUDPIFC2(ChunkTransportState *transportStates, int motNodeID, int route)
+{
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_ReleaseAndAck(udp2_state, motNodeID, route);
+	HandleLastError();
+}
+
+void
+DeregisterReadInterestUDP2(ChunkTransportState *transportStates,
+						   int motNodeID,
+						   int srcRoute,
+						   const char *reason)
+{
+	if (!transportStates)
+	{
+		elog(FATAL, "DeregisterReadInterestUDP: no transport states");
+	}
+
+	if (!transportStates->activated)
+		return;
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_DeactiveRoute(udp2_state, motNodeID, srcRoute, reason);
+	HandleLastError();
+}
+
+uint32
+GetActiveMotionConnsUDPIFC2(void)
+{
+	return UDP2_GetActiveConns();
+}
+
+void
+GetTransportDirectBufferUDPIFC2(ChunkTransportState * transportStates,
+								int16 motNodeID,
+								int16 targetRoute,
+								struct directTransportBuffer *b)
+{
+	if (!transportStates)
+	{
+		elog(FATAL, "GetTransportDirectBuffer: no transport states");
+	}
+	else if (!transportStates->activated)
+	{
+		elog(FATAL, "GetTransportDirectBuffer: inactive transport states");
+	}
+	else if (targetRoute == BROADCAST_SEGIDX)
+	{
+		elog(FATAL, "GetTransportDirectBuffer: can't direct-transport to broadcast");
+	}
+
+	BufferBlock buf = {NULL, 0};
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_GetFreeSpace(udp2_state, motNodeID, targetRoute, &buf);
+	HandleLastError();
+
+	b->pri    = buf.pos;
+	b->prilen = buf.len;
+}
+
+void
+PutTransportDirectBufferUDPIFC2(ChunkTransportState * transportStates,
+								int16 motNodeID,
+								int16 targetRoute,
+								int length)
+{
+	if (!transportStates)
+	{
+		elog(FATAL, "PutTransportDirectBuffer: no transport states");
+	}
+	else if (!transportStates->activated)
+	{
+		elog(FATAL, "PutTransportDirectBuffer: inactive transport states");
+	}
+	else if (targetRoute == BROADCAST_SEGIDX)
+	{
+		elog(FATAL, "PutTransportDirectBuffer: can't direct-transport to broadcast");
+	}
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	UDP2_ReduceFreeSpace(udp2_state, motNodeID, targetRoute, length);
+	HandleLastError();
+}
+
+TupleRemapper*
+GetMotionConnTupleRemapperUDPIFC2(ChunkTransportState * transportStates,
+								  int16 motNodeID,
+								  int16 targetRoute)
+{
+	TupleRemapper *remapper = NULL;
+
+	if (!transportStates)
+	{
+		elog(FATAL, "GetMotionConnTupleRemapper: no transport states");
+	}
+
+	if (!transportStates->activated)
+	{
+		elog(FATAL, "GetMotionConnTupleRemapper: inactive transport states");
+	}
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	remapper = (TupleRemapper *)UDP2_GetOpaqueDataInConn(udp2_state, motNodeID, targetRoute);
+	HandleLastError();
+
+	return remapper;
+}
+
+int32*
+GetMotionSentRecordTypmodUDPIFC2(ChunkTransportState * transportStates,
+								 int16 motNodeID,
+								 int16 targetRoute)
+{
+	int32 *rs = NULL;
+
+	if (!transportStates)
+	{
+		elog(FATAL, "GetMotionConnTupleRemapper: no transport states");
+	}
+
+	if (!transportStates->activated)
+	{
+		elog(FATAL, "GetMotionConnTupleRemapper: inactive transport states");
+	}
+
+	targetRoute = targetRoute == BROADCAST_SEGIDX ? 0 : targetRoute;
+
+	ResetLastError();
+	ICChunkTransportState *udp2_state =
+		(ICChunkTransportState *)transportStates->implement_state;
+	rs = UDP2_GetSentRecordTypmodInConn(udp2_state, motNodeID, targetRoute);
+	HandleLastError();
+
+	return rs;
+}
+
+static void
+SetupGlobalMotionLayerIPCParam(GlobalMotionLayerIPCParam *param)
+{
+	if (param == NULL)
+		return;
+
+	param->interconnect_address = interconnect_address;
+	param->Gp_role              = Gp_role;
+	param->ic_htab_size         = ic_htab_size;
+	param->segment_number       = getgpsegmentCount();
+	param->MyProcPid            = MyProcPid;
+	param->dbid                 = GpIdentity.dbid;
+	param->segindex             = GpIdentity.segindex;
+	param->MyProcPort           = MyProcPort != NULL;
+	param->myprocport_sock      = param->MyProcPort ? MyProcPort->sock : -1;
+	param->Gp_max_packet_size   = Gp_max_packet_size;
+	param->Gp_udp_bufsize_k     = Gp_udp_bufsize_k;
+	param->Gp_interconnect_address_type = Gp_interconnect_address_type;
+}
+
+static bool
+CheckPostmasterIsAlive(void)
+{
+	return PostmasterIsAlive();
+}
+
+static void
+CheckCancelOnQD(ICChunkTransportState *state)
+{
+	int				nevent = 0, nrevent = 0;
+	int				*waitFds = NULL;
+	WaitEvent		*rEvents = NULL;
+	WaitEventSet	*waitset = NULL;
+	ChunkTransportState *pTransportStates = NULL;
+
+	if (Gp_role != GP_ROLE_DISPATCH)
+		return;
+
+	pTransportStates = (ChunkTransportState *)state->clientState;
+
+	/* get all wait sock fds */
+	waitFds = cdbdisp_getWaitSocketFds(pTransportStates->estate->dispatcherState, &nevent);
+	if (waitFds == NULL)
+		return;
+
+	/* init WaitEventSet */
+	waitset = CreateWaitEventSet(CurrentMemoryContext, nevent);
+	rEvents = palloc(nevent * sizeof(WaitEvent)); /* returned events */
+	for (int i = 0; i < nevent; ++i)
+		AddWaitEventToSet(waitset, WL_SOCKET_READABLE, waitFds[i], NULL, NULL);
+
+	/* wait for event from QE */
+	nrevent = WaitEventSetWait(waitset, 0, rEvents, nevent, WAIT_EVENT_INTERCONNECT);
+
+	/* check to see if the dispatcher should cancel */
+	for (int i = 0; i < nrevent; i++)
+	{
+		if (rEvents[i].events & WL_SOCKET_READABLE)
+		{
+			/* event happened on wait fds, need to check cancel */
+			Assert(pTransportStates);
+			Assert(pTransportStates->estate);
+
+			if (cdbdisp_checkForCancel(pTransportStates->estate->dispatcherState))
+			{
+				ereport(ERROR, (errcode(ERRCODE_GP_INTERCONNECTION_ERROR),
+							errmsg(CDB_MOTION_LOST_CONTACT_STRING)));
+				/* not reached */
+			}
+			break;
+		}
+	}
+
+	if (waitset)
+		FreeWaitEventSet((WaitEventSet *)waitset);
+	if (rEvents)
+		pfree(rEvents);
+}
+
+static void
+CheckInterrupts(int teardownActive)
+{
+	ML_CHECK_FOR_INTERRUPTS(teardownActive);
+}
+
+static void
+SimpleFaultInjector(const char *faultname)
+{
+	SIMPLE_FAULT_INJECTOR((faultname));
+}
+
+static void *
+CreateOpaqueData(void)
+{
+	return CreateTupleRemapper();
+}
+
+static void
+DestroyOpaqueData(void **opaque)
+{
+	if (*opaque == NULL)
+		return;
+	*opaque = NULL;
+}
+
+static void
+SetupSessionMotionLayerIPCParam(SessionMotionLayerIPCParam *param)
+{
+	if (param == NULL)
+		return;
+
+	TransactionId localTransId = 0;
+	TransactionId subtransId = 0;
+
+	param->Gp_interconnect_queue_depth                = Gp_interconnect_queue_depth;
+	param->Gp_interconnect_snd_queue_depth            = Gp_interconnect_snd_queue_depth;
+	param->Gp_interconnect_timer_period               = Gp_interconnect_timer_period;
+	param->Gp_interconnect_timer_checking_period      = Gp_interconnect_timer_checking_period;
+	param->Gp_interconnect_default_rtt                = Gp_interconnect_default_rtt;
+	param->Gp_interconnect_min_rto                    = Gp_interconnect_min_rto;
+	param->Gp_interconnect_transmit_timeout           = Gp_interconnect_transmit_timeout;
+	param->Gp_interconnect_min_retries_before_timeout = Gp_interconnect_min_retries_before_timeout;
+	param->Gp_interconnect_debug_retry_interval       = Gp_interconnect_debug_retry_interval;
+	param->gp_interconnect_full_crc                   = gp_interconnect_full_crc;
+	param->gp_interconnect_aggressive_retry           = gp_interconnect_aggressive_retry;
+	param->gp_interconnect_cache_future_packets       = gp_interconnect_cache_future_packets;
+	param->gp_interconnect_log_stats                  = gp_interconnect_log_stats;
+	param->interconnect_setup_timeout                 = interconnect_setup_timeout;
+	param->gp_log_interconnect                        = gp_log_interconnect;
+	param->gp_session_id                              = gp_session_id;
+	param->Gp_interconnect_fc_method                  = Gp_interconnect_fc_method;
+	param->gp_command_count                           = gp_command_count;
+	param->gp_interconnect_id                         = gp_interconnect_id;
+	param->log_min_messages                           = log_min_messages;
+	GetAllTransactionXids(&param->distTransId, &localTransId, &subtransId);
+
+#ifdef USE_ASSERT_CHECKING
+	param->gp_udpic_dropseg              = gp_udpic_dropseg;
+	param->gp_udpic_dropacks_percent     = gp_udpic_dropacks_percent;
+	param->gp_udpic_dropxmit_percent     = gp_udpic_dropxmit_percent;
+	param->gp_udpic_fault_inject_percent = gp_udpic_fault_inject_percent;
+	param->gp_udpic_fault_inject_bitmap  = gp_udpic_fault_inject_bitmap;
+	param->gp_udpic_network_disable_ipv6 = gp_udpic_network_disable_ipv6;
+#endif
+}
+
+ICSliceTable*
+ConvertToICSliceTable(SliceTable *tbl)
+{
+	ICSliceTable *ic_tbl = (ICSliceTable *)malloc(sizeof(ICSliceTable));
+	memset(ic_tbl, 0, sizeof(ICSliceTable));
+
+	ic_tbl->localSlice = tbl->localSlice;
+	ic_tbl->ic_instance_id = tbl->ic_instance_id;
+
+	ic_tbl->numSlices = tbl->numSlices;
+	ic_tbl->slices = (ICExecSlice *)malloc(sizeof(ICExecSlice) * ic_tbl->numSlices);
+	memset(ic_tbl->slices, 0, sizeof(ICExecSlice) * ic_tbl->numSlices);
+
+	for (int i = 0; i < ic_tbl->numSlices; ++i)
+	{
+		ExecSlice *slice      = tbl->slices + i;
+		ICExecSlice *ic_slice = ic_tbl->slices + i;
+
+		ic_slice->sliceIndex = slice->sliceIndex;
+		ic_slice->parentIndex= slice->parentIndex;
+		ic_slice->numSegments = list_length(slice->segments);
+
+		ic_slice->numChildren = list_length(slice->children);
+		ic_slice->children = malloc(sizeof(int) * ic_slice->numChildren);
+		memset(ic_slice->children, 0, sizeof(int) * ic_slice->numChildren);
+
+		for (int i = 0; i < ic_slice->numChildren; ++i)
+			ic_slice->children[i] = list_nth_int(slice->children, i);
+
+		ic_slice->numPrimaryProcesses = list_length(slice->primaryProcesses);
+		ic_slice->primaryProcesses = malloc(sizeof(ICCdbProcess) * ic_slice->numPrimaryProcesses);
+		memset(ic_slice->primaryProcesses, 0, sizeof(ICCdbProcess) * ic_slice->numPrimaryProcesses);
+
+		for (int i = 0; i < ic_slice->numPrimaryProcesses; ++i)
+		{
+			CdbProcess *process = (CdbProcess *)list_nth(slice->primaryProcesses, i);
+			if (!process)
+				continue;
+
+			ICCdbProcess *ic_process = ic_slice->primaryProcesses + i;
+
+			ic_process->valid        = true;
+			ic_process->listenerAddr = process->listenerAddr;
+			ic_process->listenerPort = process->listenerPort;
+			ic_process->pid          = process->pid;
+			ic_process->contentid    = process->contentid;
+			ic_process->dbid         = process->dbid;
+		}
+	}
+
+	return ic_tbl;
+}
+
+/*
+ * msg MUST BE conn->msgPos, msg_size should be conn->msgSize - sizeof(icpkthdr)
+ * +----------------+-----------+--------------+------------+---+--------------+------------+
+ * | tcp/udp header | ic header | chunk header | chunk data |...| chunk header | chunk data |
+ * +----------------+-----------+--------------+------------+---+--------------+------------+
+ *                              |<-----#1 tuple chunk ----->|...|<-----#n tuple chunk ----->|
+ *                  |<------------------------- Gp_max_packet_size ------------------------>|
+ *
+ *                              |<------------------------ msg_size ----------------------->|
+ *                             msg
+ */
+TupleChunkListItem
+ConvertToTupleChunk(ChunkTransportState *transportStates, DataBlock *data)
+{
+	TupleChunkListItem tcItem;
+	TupleChunkListItem firstTcItem = NULL;
+	TupleChunkListItem lastTcItem = NULL;
+
+	uint32      tcSize;
+	int         bytesProcessed = 0;
+
+	while (bytesProcessed != data->len)
+	{
+		if (data->len - bytesProcessed < TUPLE_CHUNK_HEADER_SIZE)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_GP_INTERCONNECTION_ERROR),
+					 errmsg("interconnect error parsing message: insufficient data received"),
+					 errdetail("conn->msgSize %d bytesProcessed %d < chunk-header %d",
+						 data->len, bytesProcessed, TUPLE_CHUNK_HEADER_SIZE)));
+		}
+		tcSize = TUPLE_CHUNK_HEADER_SIZE + (*(uint16 *) (data->pos + bytesProcessed));
+
+		/* sanity check */
+		if (tcSize > Gp_max_packet_size)
+		{
+			/*
+			 * see MPP-720: it is possible that our message got messed up by a
+			 * cancellation ?
+			 */
+			ML_CHECK_FOR_INTERRUPTS(transportStates->teardownActive);
+			/*
+			 * MPP-4010: add some extra debugging.
+			 */
+			if (lastTcItem != NULL)
+				elog(LOG, "Interconnect error parsing message: last item length %d inplace %p", lastTcItem->chunk_length, lastTcItem->inplace);
+			else
+				elog(LOG, "Interconnect error parsing message: no last item");
+
+			ereport(ERROR,
+					(errcode(ERRCODE_GP_INTERCONNECTION_ERROR),
+					errmsg("interconnect error parsing message"),
+					errdetail("tcSize %d > max %d header %d processed %d/%d from %p",
+							 tcSize, Gp_max_packet_size,
+							 TUPLE_CHUNK_HEADER_SIZE, bytesProcessed,
+							 data->len, data->pos)));
+		}
+
+		Assert(tcSize <= data->len);
+
+		/*
+		 * We store the data inplace, and handle any necessary copying later
+		 * on
+		 */
+		tcItem = (TupleChunkListItem) palloc(sizeof(TupleChunkListItemData));
+		tcItem->p_next = NULL;
+		tcItem->chunk_length = tcSize;
+		tcItem->inplace = (char *) (data->pos + bytesProcessed);
+
+		bytesProcessed += tcSize;
+		if (firstTcItem == NULL)
+		{
+			firstTcItem = tcItem;
+			lastTcItem = tcItem;
+		}
+		else
+		{
+			lastTcItem->p_next = tcItem;
+			lastTcItem = tcItem;
+		}
+	}
+
+	return firstTcItem;
+}
+
+static ChunkTransportState *
+CreateChunkTransportState(EState *estate, ICChunkTransportState *udp2_state)
+{
+	MemoryContext oldContext;
+	ChunkTransportState *state;
+
+	/* init ChunkTransportState */
+	Assert(InterconnectContext != NULL);
+	oldContext = MemoryContextSwitchTo(InterconnectContext);
+	state = (ChunkTransportState *)palloc0(sizeof(ChunkTransportState));
+	MemoryContextSwitchTo(oldContext);
+
+	state->size            = 0;
+	state->states          = NULL;
+	state->activated       = udp2_state->activated;
+	state->teardownActive  = udp2_state->teardownActive;
+	state->aggressiveRetry = false;
+	state->incompleteConns = NIL;
+	state->sliceTable      = estate->es_sliceTable;
+	state->sliceId         = estate->es_sliceTable->localSlice;
+	state->estate          = estate;
+	state->proxyContext    = NULL;
+
+	state->networkTimeoutIsLogged  = false;
+
+	/* save the reference each other */
+	state->implement_state  = udp2_state;
+	udp2_state->clientState = state;
+
+	return state;
+}
+
+/*
+ * must offer an empty proxy fucntion if ic-proxy is enabled(--enable-ic-proxy).
+ */
+int
+ic_proxy_server_main(void)
+{
+	/* Establish signal handlers. */
+	pqsignal(SIGTERM, die);
+	BackgroundWorkerUnblockSignals();
+
+	/* dry run */
+	while (true)
+	{
+		pg_usleep(1000000);
+		CHECK_FOR_INTERRUPTS();
+	}
+
+	return 0;
+}
+
+/*
+ * Fucntions for Resource manager
+ */
+static void
+destroy_interconnect_handle(interconnect_handle_t * h)
+{
+	h->interconnect_context = NULL;
+	/* unlink from linked list first */
+	if (h->prev)
+		h->prev->next = h->next;
+	else
+		open_interconnect_handles = h->next;
+	if (h->next)
+		h->next->prev = h->prev;
+
+	pfree(h);
+
+	if (open_interconnect_handles == NULL)
+		MemoryContextReset(InterconnectContext);
+}
+
+static void
+cleanup_interconnect_handle(interconnect_handle_t * h)
+{
+	if (h->interconnect_context == NULL)
+	{
+		destroy_interconnect_handle(h);
+		return;
+	}
+	h->teardown_cb(h->interconnect_context, true);
+}
+
+static void
+interconnect_abort_callback(ResourceReleasePhase phase,
+							bool isCommit,
+							bool isTopLevel,
+							void *arg)
+{
+	interconnect_handle_t *curr;
+	interconnect_handle_t *next;
+
+	if (phase != RESOURCE_RELEASE_AFTER_LOCKS)
+		return;
+
+	next = open_interconnect_handles;
+	while (next)
+	{
+		curr = next;
+		next = curr->next;
+
+		if (curr->owner == CurrentResourceOwner)
+		{
+			if (isCommit)
+				elog(WARNING, "interconnect reference leak: %p still referenced", curr);
+
+			cleanup_interconnect_handle(curr);
+		}
+	}
+}
+
+static interconnect_handle_t *
+allocate_interconnect_handle(TeardownInterconnectCallBack callback)
+{
+	interconnect_handle_t *h;
+
+	if (InterconnectContext == NULL)
+		InterconnectContext = AllocSetContextCreate(TopMemoryContext,
+													"Interconnect Context",
+													ALLOCSET_DEFAULT_MINSIZE,
+													ALLOCSET_DEFAULT_INITSIZE,
+													ALLOCSET_DEFAULT_MAXSIZE);
+
+	h = MemoryContextAllocZero(InterconnectContext, sizeof(interconnect_handle_t));
+
+	h->teardown_cb = callback;
+	h->owner = CurrentResourceOwner;
+	h->next = open_interconnect_handles;
+	h->prev = NULL;
+	if (open_interconnect_handles)
+		open_interconnect_handles->prev = h;
+	open_interconnect_handles = h;
+
+	if (!interconnect_resowner_callback_registered)
+	{
+		RegisterResourceReleaseCallback(interconnect_abort_callback, NULL);
+		interconnect_resowner_callback_registered = true;
+	}
+	return h;
+}
+
+static interconnect_handle_t *
+find_interconnect_handle(ChunkTransportState * icContext)
+{
+	interconnect_handle_t *head = open_interconnect_handles;
+
+	while (head != NULL)
+	{
+		if (head->interconnect_context == icContext)
+			return head;
+		head = head->next;
+	}
+	return NULL;
+}
\ No newline at end of file
diff --git a/contrib/udp2/ic_udp2.h b/contrib/udp2/ic_udp2.h
new file mode 100644
index 00000000000..c351d2d0224
--- /dev/null
+++ b/contrib/udp2/ic_udp2.h
@@ -0,0 +1,87 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * ic_udp2.h
+ *
+ * IDENTIFICATION
+ *    contrib/udp2/ic_udp2.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef IC_UDP_H
+#define IC_UDP_H
+
+#include "cdb/cdbinterconnect.h"
+#include "nodes/execnodes.h"	/* EState, ExecSlice, SliceTable */
+
+extern int GetMaxTupleChunkSizeUDP2(void);
+extern int32 GetListenPortUDP2(void);
+
+extern void InitMotionIPCLayerUDP2(void);
+extern void CleanUpMotionLayerIPCUDP2(void);
+
+extern void WaitInterconnectQuitUDPIFC2(void);
+
+extern void SetupInterconnectUDP2(EState *estate);
+extern void TeardownInterconnectUDP2(ChunkTransportState * transportStates, bool hasErrors);
+
+extern bool SendTupleChunkToAMSUDP2(ChunkTransportState *transportStates,
+									int16 motNodeID,
+									int16 targetRoute,
+									TupleChunkListItem tcItem);
+extern void SendEOSUDPIFC2(ChunkTransportState * transportStates,
+						   int motNodeID, TupleChunkListItem tcItem);
+extern void SendStopMessageUDPIFC2(ChunkTransportState * transportStates, int16 motNodeID);
+
+extern TupleChunkListItem RecvTupleChunkFromAnyUDPIFC2(ChunkTransportState * transportStates,
+													   int16 motNodeID,
+													   int16 *srcRoute);
+extern TupleChunkListItem RecvTupleChunkFromUDPIFC2(ChunkTransportState * transportStates,
+													int16 motNodeID,
+													int16 srcRoute);
+
+void MlPutRxBufferUDPIFC2(ChunkTransportState * transportStates, int motNodeID, int route);
+
+extern void DeregisterReadInterestUDP2(ChunkTransportState * transportStates,
+									   int motNodeID,
+									   int srcRoute,
+									   const char *reason);
+
+extern uint32 GetActiveMotionConnsUDPIFC2(void);
+
+extern void GetTransportDirectBufferUDPIFC2(ChunkTransportState *transportStates,
+											int16 motNodeID,
+											int16 targetRoute,
+											struct directTransportBuffer *b);
+extern void PutTransportDirectBufferUDPIFC2(ChunkTransportState *transportStates,
+											int16 motNodeID,
+											int16 targetRoute,
+											int length);
+
+extern TupleRemapper* GetMotionConnTupleRemapperUDPIFC2(ChunkTransportState *transportStates,
+														int16 motNodeID,
+														int16 targetRoute);
+
+extern int32* GetMotionSentRecordTypmodUDPIFC2(ChunkTransportState * transportStates,
+								 				int16 motNodeID,
+								 				int16 targetRoute);
+
+extern int ic_proxy_server_main(void);
+
+#endif // IC_UDP_H
\ No newline at end of file
diff --git a/deploy/README.md b/deploy/README.md
deleted file mode 100644
index b8da77a0521..00000000000
--- a/deploy/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-> [!WARNING]
-> The files are still in progress and will be revised in the following months.
diff --git a/devops/README.md b/devops/README.md
new file mode 100644
index 00000000000..df440a2cc39
--- /dev/null
+++ b/devops/README.md
@@ -0,0 +1,108 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+# Auto-Build Apache Cloudberry from Source Code
+
+You can build Apache Cloudberry from source code in two ways: manually or automatically.
+
+For the manual build, you need to manually set up many system configurations and download third-party dependencies, which is quite cumbersome and error-prone.
+
+To make the job easier, it is recommended that you use the automated deployment method and scripts provided here. The automation method simplifies the deployment process, reduces time costs, and allows developers to focus more on business code development.
+
+## 1. Setup Docker environment
+
+Nothing special, just follow the [official documentation](https://docs.docker.com/engine/install/) to install Docker on your machine based on your OS.
+
+## 2. Create Docker build image
+
+Go to the supported OS directory, for example Rocky Linux 8:
+
+```bash
+cd devops/deploy/docker/build/rocky8/
+```
+
+And build image:
+
+```bash
+docker build -t apache-cloudberry-env .
+```
+
+The whole process usually takes about 5 minutes. You can use the created base image as many times as you want, just launch a new container for your specific task.
+
+## 3. Launch container
+
+Launch the container in detached mode with a long-running process:
+
+```bash
+docker run -h cdw -d --name cloudberry-build apache-cloudberry-env bash -c "/tmp/init_system.sh && tail -f /dev/null"
+```
+
+> [!NOTE]
+> The container will be named `cloudberry-build` and run in the background for easy reference in subsequent commands.
+> If you need to:
+>  - access the container interactively, use `docker exec -it cloudberry-build bash`
+>  - check if the container is running, use `docker ps`
+
+## 4. Checkout git repo inside container
+
+The same way you did it on your laptop
+
+```bash
+docker exec cloudberry-build bash -c "cd /home/gpadmin && git clone --recurse-submodules --branch main --depth 1 https://github.com/apache/cloudberry.git"
+```
+
+## 5. Set environment and configure build container
+
+Create direcory for store logs:
+
+```bash
+SRC_DIR=/home/gpadmin/cloudberry && docker exec cloudberry-build  bash -c "mkdir ${SRC_DIR}/build-logs"
+```
+
+Execute configure and check if system is ready for build:
+
+```bash
+SRC_DIR=/home/gpadmin/cloudberry && docker exec cloudberry-build bash -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ./devops/build/automation/cloudberry/scripts/configure-cloudberry.sh"
+```
+
+## 6. Build and install binary
+
+The building consumes all available CPU resources and can take minutes to complete:
+
+```bash
+SRC_DIR=/home/gpadmin/cloudberry && docker exec cloudberry-build bash -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ./devops/build/automation/cloudberry/scripts/build-cloudberry.sh"
+```
+
+## 7. Install binary and create demo cluster
+
+The build script above has already installed the binaries to `/usr/local/cloudberry-db` inside the container. Now create the demo cluster just launch `create-cloudberry-demo-cluster.sh`
+
+```bash
+SRC_DIR=/home/gpadmin/cloudberry && docker exec cloudberry-build bash -c "cd ${SRC_DIR} && SRC_DIR=${SRC_DIR} ./devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh"
+```
+
+## 8. Execute test query
+
+Now you could set environment and execute queries:
+
+```bash
+docker exec cloudberry-build bash -c "source /usr/local/cloudberry-db/cloudberry-env.sh && source /home/gpadmin/cloudberry/gpAux/gpdemo/gpdemo-env.sh && psql -U gpadmin -d postgres -c 'SELECT 42'"
+```
+
+All done!
diff --git a/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh b/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh
new file mode 100755
index 00000000000..4749ec76271
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/analyze_core_dumps.sh
@@ -0,0 +1,222 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: analyze_core_dumps.sh
+# Description: Automated analysis tool for core dump files using GDB
+#
+# This script automatically analyzes core dump files found in a
+# specified directory, providing stack traces and register
+# information. It's particularly useful for analyzing crashes in
+# Postgres/Cloudberry executables and Python applications.
+#
+# Features:
+# - Automatic detection of core dump files
+# - Support for both compiled executables and interpreted languages
+# - Detailed stack traces with GDB
+# - Register state analysis
+# - Assembly code context at crash point
+# - Comprehensive logging of analysis results
+#
+# Usage: analyze_core_dumps.sh [test_id]
+#   test_id: Optional identifier for the test configuration that generated cores
+#
+# Dependencies:
+#   - GDB (GNU Debugger)
+#   - file command
+#
+# Environment Variables:
+#   SRC_DIR - Base directory for operations (defaults to /tmp)
+#
+# Return Codes:
+#   0 - No core files were found
+#   1 - Core files were found and all were processed successfully
+#   2 - Error conditions:
+#       - Missing required dependencies (gdb, file)
+#       - Issues processing some or all core files
+# --------------------------------------------------------------------
+
+set -u
+
+# Configuration
+#-----------------------------------------------------------------------------
+# Use SRC_DIR if defined, otherwise default to /tmp
+SRC_DIR="${SRC_DIR:-/tmp}"
+# Define log directory and files
+LOG_DIR="${SRC_DIR}/build-logs"
+# Create log directories if they don't exist
+mkdir -p "${LOG_DIR}"
+
+# Determine log file name based on test_id argument
+if [ $# -ge 1 ]; then
+    test_id="$1"
+    log_file="${LOG_DIR}/core_analysis_${test_id}_$(date +%Y%m%d_%H%M%S).log"
+else
+    log_file="${LOG_DIR}/core_analysis_$(date +%Y%m%d_%H%M%S).log"
+fi
+echo "log_file: ${log_file}"
+
+# Directory where core dumps are located
+core_dir="/tmp/cloudberry-cores/"
+
+# Pattern to match core dump files
+core_pattern="core-*"
+
+# Function Definitions
+#-----------------------------------------------------------------------------
+# Log messages to both console and log file
+# Args:
+#   $1 - Message to log
+log_message() {
+    local message="[$(date '+%Y-%m-%d %H:%M:%S')] $1"
+    echo "$message"
+    echo "$message" >> "$log_file"
+}
+
+# Analyze a single core file
+# Args:
+#   $1 - Path to core file
+# Returns:
+#   0 on success, 1 on failure
+analyze_core_file() {
+    local core_file="$1"
+    local file_info
+
+    log_message "Analyzing core file: $core_file"
+    file_info=$(file "$core_file")
+    log_message "Core file info: $file_info"
+
+    # Extract the original command from the core file info
+    if [[ "$file_info" =~ "from '([^']+)'" ]]; then
+        local original_cmd="${BASH_REMATCH[1]}"
+        log_message "Original command: $original_cmd"
+    fi
+
+    # Extract executable path from core file info
+    if [[ "$file_info" =~ execfn:\ \'([^\']+)\' ]]; then
+        local executable="${BASH_REMATCH[1]}"
+        log_message "Executable path: $executable"
+
+        # Convert relative path to absolute if needed
+        if [[ "$executable" == "./"* ]]; then
+            executable="$PWD/${executable:2}"
+            log_message "Converted to absolute path: $executable"
+        fi
+
+        # Run GDB analysis
+        log_message "Starting GDB analysis..."
+
+        gdb -quiet \
+            --batch \
+            -ex 'set pagination off' \
+            -ex 'info target' \
+            -ex 'thread apply all bt' \
+            -ex 'print $_siginfo' \
+            -ex quit \
+            "$executable" "$core_file" 2>&1 >> "$log_file"
+
+        local gdb_rc=$?
+        if [ $gdb_rc -eq 0 ] && [ -s "$log_file" ]; then
+            log_message "GDB analysis completed successfully"
+            return 0
+        else
+            log_message "Warning: GDB analysis failed or produced no output"
+            return 1
+        fi
+    else
+        log_message "Could not find executable path in core file"
+        return 1
+    fi
+}
+
+# Function to check required commands
+check_dependencies() {
+    local missing=0
+    local required_commands=("gdb" "file")
+
+    log_message "Checking required commands..."
+    for cmd in "${required_commands[@]}"; do
+        if ! command -v "$cmd" >/dev/null 2>&1; then
+            log_message "Error: Required command '$cmd' not found"
+            missing=1
+        fi
+    done
+
+    if [ $missing -eq 1 ]; then
+        log_message "Missing required dependencies. Please install them and try again."
+        return 1
+    fi
+
+    log_message "All required commands found"
+    return 0
+}
+
+# Main Execution
+#-----------------------------------------------------------------------------
+main() {
+    local core_count=0
+    local analyzed_count=0
+    local return_code=0
+
+    log_message "Starting core dump analysis"
+    log_message "Using source directory: $SRC_DIR"
+    log_message "Using log directory: $LOG_DIR"
+
+    # Check dependencies first
+    if ! check_dependencies; then
+        return 2
+    fi
+
+    # Process all core files
+    for core_file in "$core_dir"/$core_pattern; do
+        if [[ -f "$core_file" ]]; then
+            ((core_count++))
+            if analyze_core_file "$core_file"; then
+                ((analyzed_count++))
+            fi
+        fi
+    done
+
+    # Determine return code based on results
+    if ((core_count == 0)); then
+        log_message "No core files found matching pattern $core_pattern in $core_dir"
+        return_code=0  # No cores found
+    elif ((analyzed_count == core_count)); then
+        log_message "Analysis complete. Successfully processed $analyzed_count core(s) files"
+        return_code=1  # All cores processed successfully
+    else
+        log_message "Analysis complete with errors. Processed $analyzed_count of $core_count core files"
+        return_code=2  # Some cores failed to process
+    fi
+
+    log_message "Log file: $log_file"
+
+    return $return_code
+}
+
+# Script entry point
+main
+return_code=$?
+
+if ((return_code == 0)); then
+    rm -fv "${log_file}"
+fi
+
+exit $return_code
diff --git a/devops/build/automation/cloudberry/scripts/build-cloudberry.sh b/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
new file mode 100755
index 00000000000..efa061a0f83
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/build-cloudberry.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: build-cloudberry.sh
+# Description: Builds Apache Cloudberry from source code and installs
+# it.
+#             Performs the following steps:
+#             1. Builds main Apache Cloudberry database components
+#             2. Builds contrib modules
+#             3. Installs both main and contrib components
+#             Uses parallel compilation based on available CPU cores.
+#
+# Required Environment Variables:
+#   SRC_DIR - Root source directory containing Apache Cloudberry
+#   source code
+#
+# Optional Environment Variables:
+#   LOG_DIR - Directory for logs (defaults to ${SRC_DIR}/build-logs)
+#   NPROC   - Number of parallel jobs (defaults to all available cores)
+#
+# Usage:
+#   Export required variables:
+#     export SRC_DIR=/path/to/cloudberry/source
+#   Then run:
+#     ./build-cloudberry.sh
+#
+# Prerequisites:
+#   - configure-cloudberry.sh must be run first
+#   - Required build dependencies must be installed
+#   - ${BUILD_DESTINATION}/lib (by default /usr/local/cloudberry-db/lib) must exist and be writable
+#
+# Exit Codes:
+#   0 - Build and installation completed successfully
+#   1 - Environment setup failed (missing SRC_DIR, LOG_DIR creation failed)
+#   2 - Main component build failed
+#   3 - Contrib build failed
+#   4 - Installation failed
+#
+# --------------------------------------------------------------------
+
+set -euo pipefail
+
+# Source common utilities
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${SCRIPT_DIR}/cloudberry-utils.sh"
+
+# Define log directory and files
+export LOG_DIR="${SRC_DIR}/build-logs"
+BUILD_LOG="${LOG_DIR}/build.log"
+
+# Initialize environment
+init_environment "Cloudberry Build Script" "${BUILD_LOG}"
+
+# Set environment
+log_section "Environment Setup"
+export LD_LIBRARY_PATH=${BUILD_DESTINATION}/lib:LD_LIBRARY_PATH
+log_section_end "Environment Setup"
+
+# Build process
+log_section "Build Process"
+execute_cmd make -j$(nproc) --directory ${SRC_DIR} || exit 2
+execute_cmd make -j$(nproc) --directory ${SRC_DIR}/contrib || exit 3
+log_section_end "Build Process"
+
+# Installation
+log_section "Installation"
+execute_cmd make install --directory ${SRC_DIR} || exit 4
+execute_cmd make install --directory ${SRC_DIR}/contrib || exit 4
+log_section_end "Installation"
+
+# Log completion
+log_completion "Cloudberry Build Script" "${BUILD_LOG}"
+exit 0
diff --git a/devops/build/automation/cloudberry/scripts/cloudberry-utils.sh b/devops/build/automation/cloudberry/scripts/cloudberry-utils.sh
new file mode 100755
index 00000000000..c8d0f8cc44e
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/cloudberry-utils.sh
@@ -0,0 +1,175 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Library: cloudberry-utils.sh
+# Description: Common utility functions for Apache Cloudberry build
+# and test scripts
+#
+# Required Environment Variables:
+#   SRC_DIR - Root source directory
+#
+# Optional Environment Variables:
+#   LOG_DIR - Directory for logs (defaults to ${SRC_DIR}/build-logs)
+#
+# Functions:
+#   init_environment "Script Name" "Log File"
+#     - Initialize logging and verify environment
+#     - Parameters:
+#       * script_name: Name of the calling script
+#       * log_file: Path to log file
+#     - Returns: 0 on success, 1 on failure
+#
+#   execute_cmd command [args...]
+#     - Execute command with logging
+#     - Parameters: Command and its arguments
+#     - Returns: Command's exit code
+#
+#   run_psql_cmd "sql_command"
+#     - Execute PostgreSQL command with logging
+#     - Parameters: SQL command string
+#     - Returns: psql command's exit code
+#
+#   source_cloudberry_env
+#     - Source Cloudberry environment files
+#     - Returns: 0 on success
+#
+#   log_section "section_name"
+#     - Log section start
+#     - Parameters: Name of the section
+#
+#   log_section_end "section_name"
+#     - Log section end
+#     - Parameters: Name of the section
+#
+#   log_completion "script_name" "log_file"
+#     - Log script completion
+#     - Parameters:
+#       * script_name: Name of the calling script
+#       * log_file: Path to log file
+#
+# Usage:
+#   source ./cloudberry-utils.sh
+#
+# Example:
+#   source ./cloudberry-utils.sh
+#   init_environment "My Script" "${LOG_FILE}"
+#   execute_cmd make clean
+#   log_section "Build Process"
+#   execute_cmd make -j$(nproc)
+#   log_section_end "Build Process"
+#   log_completion "My Script" "${LOG_FILE}"
+#
+# --------------------------------------------------------------------
+
+DEFAULT_BUILD_DESTINATION=/usr/local/cloudberry-db
+
+# Initialize logging and environment
+init_environment() {
+    local script_name=$1
+    local log_file=$2
+
+    init_build_destination_var
+
+    echo "=== Initializing environment for ${script_name} ==="
+    echo "${script_name} executed at $(date)" | tee -a "${log_file}"
+    echo "Whoami: $(whoami)" | tee -a "${log_file}"
+    echo "Hostname: $(hostname)" | tee -a "${log_file}"
+    echo "Working directory: $(pwd)" | tee -a "${log_file}"
+    echo "Source directory: ${SRC_DIR}" | tee -a "${log_file}"
+    echo "Log directory: ${LOG_DIR}" | tee -a "${log_file}"
+    echo "Build destination: ${BUILD_DESTINATION}" | tee -a "${log_file}"
+
+    if [ -z "${SRC_DIR:-}" ]; then
+        echo "Error: SRC_DIR environment variable is not set" | tee -a "${log_file}"
+        exit 1
+    fi
+
+    mkdir -p "${LOG_DIR}"
+}
+
+# Function to echo and execute command with logging
+execute_cmd() {
+    local cmd_str="$*"
+    local timestamp=$(date "+%Y.%m.%d-%H.%M.%S")
+    echo "Executing at ${timestamp}: $cmd_str" | tee -a "${LOG_DIR}/commands.log"
+    "$@" 2>&1 | tee -a "${LOG_DIR}/commands.log"
+    return ${PIPESTATUS[0]}
+}
+
+# Function to run psql commands with logging
+run_psql_cmd() {
+    local cmd=$1
+    local timestamp=$(date "+%Y.%m.%d-%H.%M.%S")
+    echo "Executing psql at ${timestamp}: $cmd" | tee -a "${LOG_DIR}/psql-commands.log"
+    psql -P pager=off template1 -c "$cmd" 2>&1 | tee -a "${LOG_DIR}/psql-commands.log"
+    return ${PIPESTATUS[0]}
+}
+
+# Function to source Cloudberry environment
+source_cloudberry_env() {
+    echo "=== Sourcing Cloudberry environment ===" | tee -a "${LOG_DIR}/environment.log"
+    source ${BUILD_DESTINATION}/cloudberry-env.sh
+    source ${SRC_DIR}/../cloudberry/gpAux/gpdemo/gpdemo-env.sh
+}
+
+# Function to log section start
+log_section() {
+    local section_name=$1
+    local timestamp=$(date "+%Y.%m.%d-%H.%M.%S")
+    echo "=== ${section_name} started at ${timestamp} ===" | tee -a "${LOG_DIR}/sections.log"
+}
+
+# Function to log section end
+log_section_end() {
+    local section_name=$1
+    local timestamp=$(date "+%Y.%m.%d-%H.%M.%S")
+    echo "=== ${section_name} completed at ${timestamp} ===" | tee -a "${LOG_DIR}/sections.log"
+}
+
+# Function to log script completion
+log_completion() {
+    local script_name=$1
+    local log_file=$2
+    local timestamp=$(date "+%Y.%m.%d-%H.%M.%S")
+    echo "${script_name} execution completed successfully at ${timestamp}" | tee -a "${log_file}"
+}
+
+# Function to get OS identifier
+detect_os() {
+  if [ -f /etc/os-release ]; then
+    . /etc/os-release
+    OS_ID=$ID
+    OS_VERSION=$VERSION_ID
+  else
+    echo "Unsupported system: cannot detect OS" >&2
+    exit 99
+  fi
+}
+
+# Init BUILD_DESTINATION default value if not set
+init_build_destination_var() {
+
+    if [ -z ${BUILD_DESTINATION+x} ]; then 
+      export BUILD_DESTINATION=${DEFAULT_BUILD_DESTINATION}
+      exec "$@"
+    fi
+
+}
diff --git a/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh b/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
new file mode 100755
index 00000000000..bc046695032
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/configure-cloudberry.sh
@@ -0,0 +1,178 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: configure-cloudberry.sh
+# Description: Configures Apache Cloudberry build environment and runs
+#             ./configure with optimized settings. Performs the
+#             following:
+#             1. Prepares ${BUILD_DESTINATION} (by default /usr/local/cloudberry-db) directory
+#             2. Sets up library dependencies
+#             3. Configures build with required features enabled
+#
+# Configuration Features:
+#   - Cloud Storage Integration (gpcloud)
+#   - IC Proxy Support
+#   - MapReduce Processing
+#   - Oracle Compatibility (orafce)
+#   - ORCA Query Optimizer
+#   - PAX Access Method
+#   - PXF External Table Access
+#   - Test Automation Support (tap-tests)
+#
+# System Integration:
+#   - GSSAPI Authentication
+#   - LDAP Authentication
+#   - XML Processing
+#   - LZ4 Compression
+#   - OpenSSL Support
+#   - PAM Authentication
+#   - Perl Support
+#   - Python Support
+#
+# Required Environment Variables:
+#   SRC_DIR - Root source directory
+#   BUILD_DESTINATION - Directory to build binaries
+#
+# Optional Environment Variables:
+#   LOG_DIR - Directory for logs (defaults to ${SRC_DIR}/build-logs)
+#   ENABLE_DEBUG - Enable debug build options (true/false, defaults to
+#                  false)
+#
+#                 When true, enables:
+#                   --enable-debug
+#                   --enable-profiling
+#                   --enable-cassert
+#                   --enable-debug-extensions
+#
+# Prerequisites:
+#   - System dependencies must be installed:
+#     * xerces-c development files
+#     * OpenSSL development files
+#     * Python development files
+#     * Perl development files
+#     * LDAP development files
+#   - /usr/local must be writable
+#   - User must have sudo privileges
+#
+# Usage:
+#   Export required variables:
+#     export SRC_DIR=/path/to/cloudberry/source
+#   Then run:
+#     ./configure-cloudberry.sh
+#
+# Exit Codes:
+#   0 - Configuration completed successfully
+#   1 - Environment setup failed
+#   2 - Directory preparation failed
+#   3 - Library setup failed
+#   4 - Configure command failed
+#
+# --------------------------------------------------------------------
+
+set -euo pipefail
+
+# Source common utilities
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${SCRIPT_DIR}/cloudberry-utils.sh"
+
+# Call it before conditional logic
+detect_os
+echo "Detected OS: $OS_ID $OS_VERSION"
+
+# Define log directory and files
+export LOG_DIR="${SRC_DIR}/build-logs"
+CONFIGURE_LOG="${LOG_DIR}/configure.log"
+
+# Initialize environment
+init_environment "Cloudberry Configure Script" "${CONFIGURE_LOG}"
+
+# Check if BUILD_DESTINATION is set
+if [ -z "${BUILD_DESTINATION}" ]; then
+  log_completion "BUILD_DESTINATION is empty - error with exit"
+  exit 1
+fi
+
+# Initial setup
+log_section "Initial Setup"
+execute_cmd sudo rm -rf ${BUILD_DESTINATION} || exit 2
+execute_cmd sudo chmod a+w /usr/local || exit 2
+execute_cmd sudo mkdir -p ${BUILD_DESTINATION}/lib || exit 2
+if [[ "$OS_ID" == "rocky" && "$OS_VERSION" =~ ^(8|9) ]]; then
+    execute_cmd sudo cp /usr/local/xerces-c/lib/libxerces-c.so \
+                /usr/local/xerces-c/lib/libxerces-c-3.3.so \
+                ${BUILD_DESTINATION}/lib || exit 3
+fi
+execute_cmd sudo chown -R gpadmin:gpadmin ${BUILD_DESTINATION} || exit 2
+log_section_end "Initial Setup"
+
+# Set environment
+log_section "Environment Setup"
+export LD_LIBRARY_PATH=${BUILD_DESTINATION}/lib:LD_LIBRARY_PATH
+log_section_end "Environment Setup"
+
+# Add debug options if ENABLE_DEBUG is set to "true"
+CONFIGURE_DEBUG_OPTS=""
+
+if [ "${ENABLE_DEBUG:-false}" = "true" ]; then
+    CONFIGURE_DEBUG_OPTS="--enable-debug \
+                          --enable-profiling \
+                          --enable-cassert \
+                          --enable-debug-extensions"
+fi
+
+# Configure build
+log_section "Configure"
+execute_cmd ./configure --prefix=${BUILD_DESTINATION} \
+            --disable-external-fts \
+            --enable-gpcloud \
+            --enable-ic-proxy \
+            --enable-mapreduce \
+            --enable-orafce \
+            --enable-orca \
+            --enable-pax \
+            --enable-pxf \
+            --enable-tap-tests \
+            ${CONFIGURE_DEBUG_OPTS} \
+            --with-gssapi \
+            --with-ldap \
+            --with-libxml \
+            --with-lz4 \
+            --with-openssl \
+            --with-pam \
+            --with-perl \
+            --with-pgport=5432 \
+            --with-python \
+            --with-pythonsrc-ext \
+            --with-ssl=openssl \
+            --with-openssl \
+            --with-uuid=e2fs \
+            --with-includes=/usr/local/xerces-c/include \
+            --with-libraries=${BUILD_DESTINATION}/lib || exit 4
+log_section_end "Configure"
+
+# Capture version information
+log_section "Version Information"
+execute_cmd ag "GP_VERSION | GP_VERSION_NUM | PG_VERSION | PG_VERSION_NUM | PG_VERSION_STR" src/include/pg_config.h
+log_section_end "Version Information"
+
+# Log completion
+log_completion "Cloudberry Configure Script" "${CONFIGURE_LOG}"
+exit 0
diff --git a/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh b/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
new file mode 100755
index 00000000000..ec582e80402
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/create-cloudberry-demo-cluster.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: create-cloudberry-demo-cluster.sh
+# Description: Creates and configures a demo Apache Cloudbery cluster.
+#             Performs the following steps:
+#             1. Sets up required environment variables
+#             2. Verifies SSH connectivity
+#             3. Creates demo cluster using make
+#             4. Initializes and starts the cluster
+#             5. Performs comprehensive verification checks
+#
+# Required Environment Variables:
+#   SRC_DIR - Root source directory
+#
+# Optional Environment Variables:
+#   LOG_DIR - Directory for logs (defaults to ${SRC_DIR}/build-logs)
+#
+# Prerequisites:
+#   - Apache Cloudberry must be installed (default location is /usr/local/cloudberry-db)
+#   - SSH must be configured for passwordless access to localhost
+#   - User must have permissions to create cluster directories
+#   - PostgreSQL client tools (psql) must be available
+#
+# Usage:
+#   Export required variables:
+#     export SRC_DIR=/path/to/cloudberry/source
+#   Then run:
+#     ./create-cloudberry-demo-cluster.sh
+#
+# Verification Checks:
+#   - Apache Cloudberry version
+#   - Segment configuration
+#   - Available extensions
+#   - Active sessions
+#   - Configuration history
+#   - Replication status
+#
+# Exit Codes:
+#   0 - Cluster created and verified successfully
+#   1 - Environment setup failed
+#   2 - SSH verification failed
+#   3 - Cluster creation failed
+#   4 - Cluster startup failed
+#   5 - Verification checks failed
+#
+# --------------------------------------------------------------------
+
+set -euo pipefail
+
+# Source common utilities
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${SCRIPT_DIR}/cloudberry-utils.sh"
+
+# Define log directory
+export LOG_DIR="${SRC_DIR}/build-logs"
+CLUSTER_LOG="${LOG_DIR}/cluster.log"
+
+# Initialize environment
+init_environment "Cloudberry Demo Cluster Script" "${CLUSTER_LOG}"
+
+# Setup environment
+log_section "Environment Setup"
+source ${BUILD_DESTINATION}/cloudberry-env.sh || exit 1
+log_section_end "Environment Setup"
+
+# Verify SSH access
+log_section "SSH Verification"
+execute_cmd ssh $(hostname) 'whoami; hostname' || exit 2
+log_section_end "SSH Verification"
+
+# Create demo cluster
+log_section "Demo Cluster Creation"
+execute_cmd make create-demo-cluster --directory ${SRC_DIR}/../cloudberry || exit 3
+log_section_end "Demo Cluster Creation"
+
+# Source demo environment
+log_section "Source Environment"
+source ${SRC_DIR}/../cloudberry/gpAux/gpdemo/gpdemo-env.sh || exit 1
+log_section_end "Source Environment"
+
+# Manage cluster state
+log_section "Cluster Management"
+execute_cmd gpstop -a || exit 4
+execute_cmd gpstart -a || exit 4
+execute_cmd gpstate || exit 4
+log_section_end "Cluster Management"
+
+# Verify installation
+log_section "Installation Verification"
+verification_failed=false
+run_psql_cmd "SELECT version()" || verification_failed=true
+run_psql_cmd "SELECT * from gp_segment_configuration" || verification_failed=true
+run_psql_cmd "SELECT * FROM pg_available_extensions" || verification_failed=true
+run_psql_cmd "SELECT * from pg_stat_activity" || verification_failed=true
+run_psql_cmd "SELECT * FROM gp_configuration_history" || verification_failed=true
+run_psql_cmd "SELECT * FROM gp_stat_replication" || verification_failed=true
+
+if [ "$verification_failed" = true ]; then
+    echo "One or more verification checks failed" | tee -a "${CLUSTER_LOG}"
+    exit 5
+fi
+log_section_end "Installation Verification"
+
+# Log completion
+log_completion "Cloudberry Demo Cluster Script" "${CLUSTER_LOG}"
+exit 0
diff --git a/devops/build/automation/cloudberry/scripts/destroy-cloudberry-demo-cluster.sh b/devops/build/automation/cloudberry/scripts/destroy-cloudberry-demo-cluster.sh
new file mode 100755
index 00000000000..3d4ce241979
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/destroy-cloudberry-demo-cluster.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: destroy-cloudberry-demo-cluster.sh
+# Description: Destroys and cleans up a demo Apache Cloudberry
+# cluster.
+#             Performs the following steps:
+#             1. Sources required environment variables
+#             2. Stops any running cluster processes
+#             3. Removes cluster data directories and configuration
+#             4. Cleans up any remaining cluster resources
+#
+# Required Environment Variables:
+#   SRC_DIR - Root source directory
+#
+# Optional Environment Variables:
+#   LOG_DIR - Directory for logs (defaults to ${SRC_DIR}/build-logs)
+#
+# Prerequisites:
+#   - Apache Cloudberry environment must be available
+#   - User must have permissions to remove cluster directories
+#   - No active connections to the cluster
+#
+# Usage:
+#   Export required variables:
+#     export SRC_DIR=/path/to/cloudberry/source
+#   Then run:
+#     ./destroy-cloudberry-demo-cluster.sh
+#
+# Exit Codes:
+#   0 - Cluster destroyed successfully
+#   1 - Environment setup/sourcing failed
+#   2 - Cluster destruction failed
+#
+# Related Scripts:
+#   - create-cloudberry-demo-cluster.sh: Creates a new demo cluster
+#
+# Notes:
+#   - This script will forcefully terminate all cluster processes
+#   - All cluster data will be permanently deleted
+#   - Make sure to backup any important data before running
+#
+# --------------------------------------------------------------------
+
+set -euo pipefail
+
+# Source common utilities
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${SCRIPT_DIR}/cloudberry-utils.sh"
+
+# Define log directory
+export LOG_DIR="${SRC_DIR}/build-logs"
+CLUSTER_LOG="${LOG_DIR}/destroy-cluster.log"
+
+# Initialize environment
+init_environment "Destroy Cloudberry Demo Cluster Script" "${CLUSTER_LOG}"
+
+# Source Cloudberry environment
+log_section "Environment Setup"
+source_cloudberry_env || {
+    echo "Failed to source Cloudberry environment" | tee -a "${CLUSTER_LOG}"
+    exit 1
+}
+log_section_end "Environment Setup"
+
+# Destroy demo cluster
+log_section "Destroy Demo Cluster"
+execute_cmd make destroy-demo-cluster --directory ${SRC_DIR}/../cloudberry || {
+    echo "Failed to destroy demo cluster" | tee -a "${CLUSTER_LOG}"
+    exit 2
+}
+log_section_end "Destroy Demo Cluster"
+
+# Verify cleanup
+log_section "Cleanup Verification"
+if [ -d "${SRC_DIR}/../cloudberry/gpAux/gpdemo/data" ]; then
+    echo "Warning: Data directory still exists after cleanup" | tee -a "${CLUSTER_LOG}"
+fi
+log_section_end "Cleanup Verification"
+
+# Log completion
+log_completion "Destroy Cloudberry Demo Cluster Script" "${CLUSTER_LOG}"
+exit 0
diff --git a/devops/build/automation/cloudberry/scripts/parse-results.pl b/devops/build/automation/cloudberry/scripts/parse-results.pl
new file mode 100755
index 00000000000..d09085d5fb9
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/parse-results.pl
@@ -0,0 +1,215 @@
+#!/usr/bin/env perl
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: parse_results.pl
+# Description: Processes Cloudberry test output to extract statistics
+# and results.
+#             Analyzes test log files to determine:
+#             1. Overall test status (pass/fail)
+#             2. Total number of tests run
+#             3. Number of passed, failed, and ignored tests
+#             4. Names of failed and ignored tests
+#             5. Validates test counts for consistency
+#             Results are written to a file for shell script processing.
+#
+# Arguments:
+#   log-file    Path to test log file (required)
+#
+# Input File Format:
+#   Expects test log files containing one of the following summary formats:
+#   - "All X tests passed."
+#   - "Y of X tests failed."
+#   - "X of Y tests passed, Z failed test(s) ignored."
+#   - "X of Y tests failed, Z of these failures ignored."
+#
+#   And failed or ignored test entries in format:
+#   - "test_name ... FAILED"
+#   - "test_name ... failed (ignored)"
+#
+# Output File (test_results.txt):
+#   Environment variable format:
+#   STATUS=passed|failed
+#   TOTAL_TESTS=<number>
+#   FAILED_TESTS=<number>
+#   PASSED_TESTS=<number>
+#   IGNORED_TESTS=<number>
+#   FAILED_TEST_NAMES=<comma-separated-list>
+#   IGNORED_TEST_NAMES=<comma-separated-list>
+#
+# Prerequisites:
+#   - Read access to input log file
+#   - Write access to current directory
+#   - Perl 5.x or higher
+#
+# Exit Codes:
+#   0 - All tests passed, or only ignored failures occurred
+#   1 - Some non-ignored tests failed
+#   2 - Parse error or cannot access files
+#
+# Example Usage:
+#   ./parse_results.pl test_output.log
+#
+# Error Handling:
+#   - Validates input file existence and readability
+#   - Verifies failed and ignored test counts match found entries
+#   - Reports parsing errors with detailed messages
+#
+# --------------------------------------------------------------------
+
+use strict;
+use warnings;
+
+# Exit codes
+use constant {
+    SUCCESS => 0,
+    TEST_FAILURE => 1,
+    PARSE_ERROR => 2
+};
+
+# Get log file path from command line argument
+my $file = $ARGV[0] or die "Usage: $0 LOG_FILE\n";
+print "Parsing test results from: $file\n";
+
+# Check if file exists and is readable
+unless (-e $file) {
+    print "Error: File does not exist: $file\n";
+    exit PARSE_ERROR;
+}
+unless (-r $file) {
+    print "Error: File is not readable: $file\n";
+    exit PARSE_ERROR;
+}
+
+# Open and parse the log file
+open(my $fh, '<', $file) or do {
+    print "Cannot open log file: $! (looking in $file)\n";
+    exit PARSE_ERROR;
+};
+
+# Initialize variables
+my ($status, $total_tests, $failed_tests, $ignored_tests, $passed_tests) = ('', 0, 0, 0, 0);
+my @failed_test_list = ();
+my @ignored_test_list = ();
+
+while (<$fh>) {
+    # Match the summary lines
+    if (/All (\d+) tests passed\./) {
+        $status = 'passed';
+        $total_tests = $1;
+        $passed_tests = $1;
+    }
+    elsif (/(\d+) of (\d+) tests passed, (\d+) failed test\(s\) ignored\./) {
+        $status = 'passed';
+        $passed_tests = $1;
+        $total_tests = $2;
+        $ignored_tests = $3;
+    }
+    elsif (/(\d+) of (\d+) tests failed\./) {
+        $status = 'failed';
+        $failed_tests = $1;
+        $total_tests = $2;
+        $passed_tests = $2 - $1;
+    }
+    elsif (/(\d+) of (\d+) tests failed, (\d+) of these failures ignored\./) {
+        $status = 'failed';
+        $failed_tests = $1 - $3;
+        $ignored_tests = $3;
+        $total_tests = $2;
+        $passed_tests = $2 - $1;
+    }
+
+    # Capture failed tests
+    if (/^(?:\s+|test\s+)(\S+)\s+\.\.\.\s+FAILED\s+/) {
+        push @failed_test_list, $1;
+    }
+
+    # Capture ignored tests
+    if (/^(?:\s+|test\s+)(\S+)\s+\.\.\.\s+failed \(ignored\)/) {
+        push @ignored_test_list, $1;
+    }
+}
+
+# Close the log file
+close $fh;
+
+# Validate failed test count matches found test names
+if ($status eq 'failed' && scalar(@failed_test_list) != $failed_tests) {
+    print "Error: Found $failed_tests failed tests in summary but found " . scalar(@failed_test_list) . " failed test names\n";
+    print "Failed test names found:\n";
+    foreach my $test (@failed_test_list) {
+        print "  - $test\n";
+    }
+    exit PARSE_ERROR;
+}
+
+# Validate ignored test count matches found test names
+if ($ignored_tests != scalar(@ignored_test_list)) {
+    print "Error: Found $ignored_tests ignored tests in summary but found " . scalar(@ignored_test_list) . " ignored test names\n";
+    print "Ignored test names found:\n";
+    foreach my $test (@ignored_test_list) {
+        print "  - $test\n";
+    }
+    exit PARSE_ERROR;
+}
+
+# Write results to the results file
+open my $result_fh, '>', 'test_results.txt' or die "Cannot write to results file: $!\n";
+print $result_fh "STATUS=$status\n";
+print $result_fh "TOTAL_TESTS=$total_tests\n";
+print $result_fh "PASSED_TESTS=$passed_tests\n";
+print $result_fh "FAILED_TESTS=$failed_tests\n";
+print $result_fh "IGNORED_TESTS=$ignored_tests\n";
+if (@failed_test_list) {
+    print $result_fh "FAILED_TEST_NAMES=" . join(',', @failed_test_list) . "\n";
+}
+if (@ignored_test_list) {
+    print $result_fh "IGNORED_TEST_NAMES=" . join(',', @ignored_test_list) . "\n";
+}
+close $result_fh;
+
+# Print to stdout for logging
+print "Test Results:\n";
+print "Status: $status\n";
+print "Total Tests: $total_tests\n";
+print "Failed Tests: $failed_tests\n";
+print "Ignored Tests: $ignored_tests\n";
+print "Passed Tests: $passed_tests\n";
+if (@failed_test_list) {
+    print "Failed Test Names:\n";
+    foreach my $test (@failed_test_list) {
+        print "  - $test\n";
+    }
+}
+if (@ignored_test_list) {
+    print "Ignored Test Names:\n";
+    foreach my $test (@ignored_test_list) {
+        print "  - $test\n";
+    }
+}
+
+# Exit with appropriate code
+if ($status eq 'passed') {
+    exit SUCCESS;
+} elsif ($status eq 'failed') {
+    exit TEST_FAILURE;
+} else {
+    exit PARSE_ERROR;
+}
diff --git a/devops/build/automation/cloudberry/scripts/parse-test-results.sh b/devops/build/automation/cloudberry/scripts/parse-test-results.sh
new file mode 100755
index 00000000000..ace00f63b3f
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/parse-test-results.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: parse-test-results.sh
+# Description: Parses Apache Cloudberry test results and processes the
+# output.
+#             Provides GitHub Actions integration and environment
+#             variable export functionality. This script is a wrapper
+#             around parse_results.pl, adding the following features:
+#             1. Default log file path handling
+#             2. GitHub Actions output integration
+#             3. Environment variable management
+#             4. Result file cleanup
+#
+# Arguments:
+#   [log-file] - Path to test log file
+#                (defaults to build-logs/details/make-${MAKE_NAME}.log)
+#
+# Prerequisites:
+#   - parse_results.pl must be in the same directory
+#   - Perl must be installed and in PATH
+#   - Write access to current directory (for temporary files)
+#   - Read access to test log file
+#
+# Output Variables (in GitHub Actions):
+#   status           - Test status (passed/failed)
+#   total_tests      - Total number of tests
+#   failed_tests     - Number of failed tests
+#   passed_tests     - Number of passed tests
+#   ignored_tests    - Number of ignored tests
+#   failed_test_names - Names of failed tests (comma-separated)
+#   ignored_test_names - Names of ignored tests (comma-separated)
+#
+# Usage Examples:
+#   # Parse default log file:
+#   ./parse-test-results.sh
+#
+#   # Parse specific log file:
+#   ./parse-test-results.sh path/to/test.log
+#
+#   # Use with GitHub Actions:
+#   export GITHUB_OUTPUT=/path/to/output
+#   ./parse-test-results.sh
+#
+# Exit Codes:
+#   0 - All tests passed successfully
+#   1 - Tests failed but results were properly parsed
+#   2 - Parse error, missing files, or unknown status
+#
+# Files Created/Modified:
+#   - Temporary: test_results.txt (automatically cleaned up)
+#   - If GITHUB_OUTPUT set: Appends results to specified file
+#
+# --------------------------------------------------------------------
+
+set -uo pipefail
+
+# Default log file path
+DEFAULT_LOG_PATH="build-logs/details/make-${MAKE_NAME}.log"
+LOG_FILE=${1:-$DEFAULT_LOG_PATH}
+
+# Get the directory where this script is located
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Check if log file exists
+if [ ! -f "$LOG_FILE" ]; then
+    echo "Error: Test log file not found: $LOG_FILE"
+    exit 2
+fi
+
+# Run the perl script and capture its exit code
+perl "${SCRIPT_DIR}/parse-results.pl" "$LOG_FILE"
+perl_exit_code=$?
+
+# Check if results file exists and source it if it does
+if [ ! -f test_results.txt ]; then
+    echo "Error: No results file generated"
+    exit 2
+fi
+
+# Return the perl script's exit code
+exit $perl_exit_code
diff --git a/devops/build/automation/cloudberry/scripts/test-cloudberry.sh b/devops/build/automation/cloudberry/scripts/test-cloudberry.sh
new file mode 100755
index 00000000000..411f16ca625
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/test-cloudberry.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: test-cloudberry.sh
+# Description: Executes Apache Cloudberry test suite using specified
+#             make target.  Supports different test types through make
+#             target configuration.  Sources Cloudberry environment
+#             before running tests.
+#
+# Required Environment Variables:
+#   MAKE_TARGET    - Make target to execute (e.g., installcheck-world)
+#   MAKE_DIRECTORY - Directory where make command will be executed
+#   MAKE_NAME      - Name of the make operation (for logging)
+#
+# Optional Environment Variables:
+#   LOG_DIR - Directory for logs (defaults to build-logs)
+#   PGOPTIONS - PostgreSQL server options
+#
+# Usage:
+#   Export required variables:
+#     export MAKE_TARGET=installcheck-world
+#     export MAKE_DIRECTORY="/path/to/make/dir"
+#     export MAKE_NAME="Install Check"
+#   Then run:
+#     ./test-cloudberry.sh
+#
+# Exit Codes:
+#   0 - All tests passed successfully
+#   1 - Environment setup failed (missing required variables, environment sourcing failed)
+#   2 - Test execution failed (make command returned error)
+#
+# --------------------------------------------------------------------
+
+set -euo pipefail
+
+# Source common utilities
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${SCRIPT_DIR}/cloudberry-utils.sh"
+
+# Define log directory and files
+export LOG_DIR="build-logs"
+TEST_LOG="${LOG_DIR}/test.log"
+
+# Initialize environment
+init_environment "Cloudberry Test Script" "${TEST_LOG}"
+
+# Source Cloudberry environment
+log_section "Environment Setup"
+source_cloudberry_env || exit 1
+log_section_end "Environment Setup"
+
+echo "MAKE_TARGET: ${MAKE_TARGET}"
+echo "MAKE_DIRECTORY: ${MAKE_DIRECTORY}"
+echo "PGOPTIONS: ${PGOPTIONS}"
+
+# Execute specified target
+log_section "Install Check"
+execute_cmd make ${MAKE_TARGET} ${MAKE_DIRECTORY} || exit 2
+log_section_end "Install Check"
+
+# Log completion
+log_completion "Cloudberry Test Script" "${TEST_LOG}"
+exit 0
diff --git a/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh b/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
new file mode 100755
index 00000000000..97107ea1a9f
--- /dev/null
+++ b/devops/build/automation/cloudberry/scripts/unittest-cloudberry.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership.  The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Script: unittest-cloudberry.sh
+# Description: Executes unit tests for Apache Cloudberry from source
+#             code.  Runs the 'unittest-check' make target and logs
+#             results.  Tests are executed against the compiled source
+#             without requiring a full installation.
+#
+# Required Environment Variables:
+#   SRC_DIR - Root source directory
+#
+# Optional Environment Variables:
+#   LOG_DIR - Directory for logs (defaults to ${SRC_DIR}/build-logs)
+#
+# Usage:
+#   ./unittest-cloudberry.sh
+#
+# Exit Codes:
+#   0 - All unit tests passed successfully
+#   1 - Environment setup failed (missing SRC_DIR, LOG_DIR creation failed)
+#   2 - Unit test execution failed
+#
+# --------------------------------------------------------------------
+
+set -euo pipefail
+
+# Source common utilities
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${SCRIPT_DIR}/cloudberry-utils.sh"
+
+# Define log directory and files
+export LOG_DIR="${SRC_DIR}/build-logs"
+UNITTEST_LOG="${LOG_DIR}/unittest.log"
+
+# Initialize environment
+init_environment "Cloudberry Unittest Script" "${UNITTEST_LOG}"
+
+# Set environment
+log_section "Environment Setup"
+export LD_LIBRARY_PATH=${BUILD_DESTINATION}/lib:LD_LIBRARY_PATH
+log_section_end "Environment Setup"
+
+# Unittest process
+log_section "Unittest Process"
+execute_cmd make --directory ${SRC_DIR}/../cloudberry unittest-check || exit 2
+log_section_end "Unittest Process"
+
+# Log completion
+log_completion "Cloudberry Unittest Script" "${UNITTEST_LOG}"
+exit 0
diff --git a/devops/build/packaging/deb/build-deb.sh b/devops/build/packaging/deb/build-deb.sh
new file mode 100755
index 00000000000..2e7312be53f
--- /dev/null
+++ b/devops/build/packaging/deb/build-deb.sh
@@ -0,0 +1,164 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Script Name: build-deb.sh
+#
+# Description:
+# This script automates the process of building an DEB package using a specified
+# version number. It ensures that the necessary tools are installed
+# and that the control file exists before attempting to build the DEB. The script
+# also includes error handling to provide meaningful feedback in case of failure.
+#
+# Usage:
+# ./build-deb.sh [-v <version>] [-h] [--dry-run]
+#
+# Options:
+#   -v, --version <version>    : Specify the version (required)
+#   -h, --help                 : Display this help and exit
+#   -n, --dry-run              : Show what would be done, without making any changes
+#
+# Example:
+#   ./build-deb.sh -v 1.5.5               # Build with version 1.5.5
+#
+# Prerequisites:
+# - The dpkg-buildpackage package must be installed (provides the dpkg-buildpackage command).
+# - The control file must exist at debian/control.
+#
+# Error Handling:
+# The script includes checks to ensure:
+# - The version option (-v or --version) is provided.
+# - The necessary commands are available.
+# - The control file exists at the specified location.
+# If any of these checks fail, the script exits with an appropriate error message.
+
+# Enable strict mode for better error handling
+set -euo pipefail
+
+# Default values
+VERSION=""
+RELEASE="1"
+DEBUG_BUILD=false
+
+# Function to display usage information
+usage() {
+  echo "Usage: $0 [-v <version>] [-h] [--dry-run]"
+  echo "  -v, --version <version>    : Specify the version (optional)"
+  echo "  -h, --help                 : Display this help and exit"
+  echo "  -n, --dry-run              : Show what would be done, without making any changes"
+  exit 1
+}
+
+# Function to check if required commands are available
+check_commands() {
+  local cmds=("dpkg-buildpackage")
+  for cmd in "${cmds[@]}"; do
+    if ! command -v "$cmd" &> /dev/null; then
+      echo "Error: Required command '$cmd' not found. Please install it before running the script."
+      exit 1
+    fi
+  done
+}
+
+function print_changelog() {
+cat <<EOF
+apache-cloudberry-db-incubating (${CBDB_PKG_VERSION}) stable; urgency=low
+
+  * apache-cloudberry-db autobuild
+
+ -- ${BUILD_USER} <${BUILD_USER}@$(hostname)>  $(date +'%a, %d %b %Y %H:%M:%S %z')
+EOF
+}
+
+# Parse options
+while [[ "$#" -gt 0 ]]; do
+  case $1 in
+    -v|--version)
+      VERSION="$2"
+      shift 2
+      ;;
+    -h|--help)
+      usage
+      ;;
+    -n|--dry-run)
+      DRY_RUN=true
+      shift
+      ;;
+    *)
+      echo "Unknown option: ($1)"
+      shift
+      ;;
+  esac
+done
+
+export CBDB_FULL_VERSION=$VERSION
+
+# Set version if not provided
+if [ -z "${VERSION}" ]; then
+  export CBDB_FULL_VERSION=$(./getversion | cut -d'-' -f 1 | cut -d'+' -f 1)
+fi
+
+if [[ ! $CBDB_FULL_VERSION =~ ^[0-9] ]]; then
+    export CBDB_FULL_VERSION="0.$CBDB_FULL_VERSION"
+fi
+
+if [ -z ${BUILD_NUMBER+x} ]; then
+  export BUILD_NUMBER=1
+fi
+
+if [ -z ${BUILD_USER+x} ]; then
+  export BUILD_USER=github
+fi
+
+export CBDB_PKG_VERSION=${CBDB_FULL_VERSION}-${BUILD_NUMBER}-$(git --git-dir=.git rev-list HEAD --count).$(git --git-dir=.git rev-parse --short HEAD)
+
+# Check if required commands are available
+check_commands
+
+# Define the control file path
+CONTROL_FILE=debian/control
+
+# Check if the spec file exists
+if [ ! -f "$CONTROL_FILE" ]; then
+  echo "Error: Control file not found at $CONTROL_FILE."
+  exit 1
+fi
+
+# Build the rpmbuild command based on options
+DEBBUILD_CMD="dpkg-buildpackage -us -uc"
+
+# Dry-run mode
+if [ "${DRY_RUN:-false}" = true ]; then
+  echo "Dry-run mode: This is what would be done:"
+  print_changelog
+  echo ""
+  echo "$DEBBUILD_CMD"
+  exit 0
+fi
+
+# Run debbuild with the provided options
+echo "Building DEB with Version $CBDB_FULL_VERSION ..."
+
+print_changelog > debian/changelog
+
+if ! eval "$DEBBUILD_CMD"; then
+  echo "Error: deb build failed."
+  exit 1
+fi
+
+# Print completion message
+echo "DEB build completed successfully with package $CBDB_PKG_VERSION"
diff --git a/devops/build/packaging/deb/ubuntu22.04/changelog b/devops/build/packaging/deb/ubuntu22.04/changelog
new file mode 100644
index 00000000000..211d271b88f
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/changelog
@@ -0,0 +1,5 @@
+apache-cloudberry-db-incubating (2.0.0) jammy; urgency=medium
+
+  * Initial release.
+
+ -- Cloudberry Team <dev@cloudberry.apache.org>  Wed, 26 Mar 2025 11:10:44 +0000
diff --git a/devops/build/packaging/deb/ubuntu22.04/compat b/devops/build/packaging/deb/ubuntu22.04/compat
new file mode 100644
index 00000000000..ec635144f60
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/compat
@@ -0,0 +1 @@
+9
diff --git a/devops/build/packaging/deb/ubuntu22.04/control b/devops/build/packaging/deb/ubuntu22.04/control
new file mode 100644
index 00000000000..70e4eda77d3
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/control
@@ -0,0 +1,107 @@
+Source: apache-cloudberry-db-incubating
+Maintainer: Apache Cloudberry (Incubating) <dev@cloudberry.apache.org> 
+Section: database
+Build-Depends: debhelper (>= 9),
+    bison,
+    ca-certificates-java,
+    ca-certificates,
+    cmake,
+    curl,
+    cgroup-tools,
+    flex,
+    gcc-11,
+    g++-11,
+    git,
+    krb5-multidev,
+    libapr1-dev,
+    libbz2-dev,
+    libcurl4-gnutls-dev,
+    libevent-dev,
+    libkrb5-dev,
+    libldap2-dev,
+    libperl-dev,
+    libreadline6-dev,
+    libssl-dev,
+    libxml2-dev,
+    libyaml-dev,
+    libzstd-dev,
+    libaprutil1-dev,
+    libpam0g-dev,
+    libpam0g,
+    libcgroup1,
+    libyaml-0-2,
+    libldap-2.5-0,
+    libssl3,
+    libxerces-c-dev,
+    libxerces-c3.2,
+    ninja-build,
+    quilt,
+    unzip,
+    wget,
+    zlib1g-dev,
+    libuv1-dev
+
+Package: apache-cloudberry-db-incubating
+Provides: apache-cloudberry-db
+Architecture: amd64
+Depends: curl,
+    cgroup-tools,
+    iputils-ping,
+    iproute2,
+    keyutils,
+    krb5-multidev,
+    less,
+    libapr1,
+    libbz2-1.0,
+    libcurl4,
+    libcurl3-gnutls,
+    libevent-2.1-7,
+    libreadline8,
+    libxml2,
+    libyaml-0-2,
+    libldap-2.5-0,
+    libzstd1,
+    libcgroup1,
+    libssl3,
+    libpam0g,
+    libprotobuf23,
+    libpsl5,
+    libuv1,
+    liburing2,
+    libxerces-c3.2,
+    locales,
+    lsof,
+    lz4,
+    net-tools,
+    openssh-client,
+    openssh-server,
+    openssl,
+    python3,
+    rsync,
+    wget,
+    xz-utils,
+    zlib1g
+Description: Apache Cloudberry (incubating) is an advanced, open-source, massively
+  parallel processing (MPP) data warehouse developed from PostgreSQL and
+  Greenplum. It is designed for high-performance analytics on
+  large-scale data sets, offering powerful analytical capabilities and
+  enhanced security features.
+  Key Features:
+    - Massively parallel processing for optimized performance
+    - Advanced analytics for complex data processing
+    - Integration with ETL and BI tools
+    - Compatibility with multiple data sources and formats
+    - Enhanced security features
+  Apache Cloudberry supports both batch processing and real-time data
+  warehousing, making it a versatile solution for modern data
+  environments.
+  Apache Cloudberry (incubating) is an effort undergoing incubation at
+  the Apache Software Foundation (ASF), sponsored by the Apache
+  Incubator PMC.
+  Incubation is required of all newly accepted projects until a further
+  review indicates that the infrastructure, communications, and decision
+  making process have stabilized in a manner consistent with other
+  successful ASF projects.
+  While incubation status is not necessarily a reflection of the
+  completeness or stability of the code, it does indicate that the
+  project has yet to be fully endorsed by the ASF.
diff --git a/devops/build/packaging/deb/ubuntu22.04/install b/devops/build/packaging/deb/ubuntu22.04/install
new file mode 100644
index 00000000000..3e29bb0dd35
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/install
@@ -0,0 +1 @@
+debian/build/* /usr/cloudberry-db
diff --git a/devops/build/packaging/deb/ubuntu22.04/postinst b/devops/build/packaging/deb/ubuntu22.04/postinst
new file mode 100644
index 00000000000..ccb33a54033
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/postinst
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+GPADMIN=gpadmin
+GPHOME=/usr/cloudberry-db
+
+if [ "$1" = configure ]; then
+
+  ln -sf ${GPHOME} /usr/local/cloudberry-db
+
+fi
diff --git a/devops/build/packaging/deb/ubuntu22.04/rules b/devops/build/packaging/deb/ubuntu22.04/rules
new file mode 100755
index 00000000000..6213985b48c
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/rules
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+DH_VERBOSE = 1
+DPKG_EXPORT_BUILDFLAGS = 1
+
+CBDB_BIN_PATH := /usr/local/cloudberry-db
+DEBIAN_DESTINATION := $(shell pwd)/debian/build
+
+# assumes that CWD is root of cbdb source
+CBDB_PKG_VERSION := $(CBDB_PKG_VERSION)
+PACKAGE_CBDB := $(shell cat debian/control | egrep "^Package: " | cut -d " " -f 2)
+PATH := ${DEBIAN_DESTINATION}/bin:${PATH}
+
+.PHONY: gpinstall
+
+include /usr/share/dpkg/default.mk
+
+%:
+	dh $@ --parallel
+
+gpinstall:
+	make install
+
+override_dh_auto_install: gpinstall
+	# the staging directory for creating a debian is NOT the right GPHOME.
+	# change GPHOME to point to the post-install target install directory.
+	sed -i "s#GPHOME=.*#GPHOME=${CBDB_BIN_PATH}#g" ${DEBIAN_DESTINATION}/cloudberry-env.sh
+
+override_dh_auto_build:
+	echo "Skipping build"
+
+override_dh_auto_clean:
+	echo "Skipping clean"
+
+override_dh_auto_configure:
+	echo "Skipping configure"
+
+override_dh_auto_test:
+	echo "Skipping auto test"
+
+override_dh_gencontrol:
+	echo "using version ${CBDB_PKG_VERSION} for binary Cloudberry"
+	dh_gencontrol -- -v${CBDB_PKG_VERSION} -p${PACKAGE_CBDB}
+
+override_dh_shlibdeps:
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/libfakeroot:${DEBIAN_DESTINATION}/lib dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
+clean_dev_local:
+	rm -rf ${DEBIAN_DESTINATION}
diff --git a/devops/build/packaging/deb/ubuntu22.04/source/format b/devops/build/packaging/deb/ubuntu22.04/source/format
new file mode 100644
index 00000000000..89ae9db8f88
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/devops/build/packaging/deb/ubuntu22.04/source/local-options b/devops/build/packaging/deb/ubuntu22.04/source/local-options
new file mode 100644
index 00000000000..00131ee8c41
--- /dev/null
+++ b/devops/build/packaging/deb/ubuntu22.04/source/local-options
@@ -0,0 +1,2 @@
+#abort-on-upstream-changes
+#unapply-patches
diff --git a/devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec b/devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec
new file mode 100644
index 00000000000..03fa0a34570
--- /dev/null
+++ b/devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec
@@ -0,0 +1,178 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+%define cloudberry_install_dir /usr/local/cloudberry-db
+
+# Add at the top of the spec file
+# Default to non-debug build
+%bcond_with debug
+
+# Conditional stripping based on debug flag
+%if %{with debug}
+%define __os_install_post %{nil}
+%define __strip /bin/true
+%endif
+
+Name:           apache-cloudberry-db-incubating
+Version:        %{version}
+# In the release definition section
+%if %{with debug}
+Release:        %{release}.debug%{?dist}
+%else
+Release:        %{release}%{?dist}
+%endif
+Summary:        High-performance, open-source data warehouse based on PostgreSQL/Greenplum
+
+License:        ASL 2.0
+URL:            https://cloudberry.apache.org
+Vendor:         Apache Cloudberry (Incubating)
+Group:          Applications/Databases
+Prefix:         %{cloudberry_install_dir}
+
+# Disabled as we are shipping GO programs (e.g. gpbackup)
+%define _missing_build_ids_terminate_build 0
+
+# Disable debugsource files
+%define _debugsource_template %{nil}
+
+# List runtime dependencies
+
+Requires:       bash
+Requires:       iproute
+Requires:       iputils
+Requires:       openssh
+Requires:       openssh-clients
+Requires:       openssh-server
+Requires:       rsync
+
+%if 0%{?rhel} == 8
+Requires:       apr
+Requires:       audit
+Requires:       bzip2
+Requires:       keyutils
+Requires:       libcurl
+Requires:       libevent
+Requires:       libidn2
+Requires:       libselinux
+Requires:       libstdc++
+Requires:       libuuid
+Requires:       libuv
+Requires:       libxml2
+Requires:       libyaml
+Requires:       libzstd
+Requires:       lz4
+Requires:       openldap
+Requires:       pam
+Requires:       perl
+Requires:       python3
+Requires:       readline
+%endif
+
+%if 0%{?rhel} == 9
+Requires:       apr
+Requires:       bzip2
+Requires:       glibc
+Requires:       keyutils
+Requires:       libcap
+Requires:       libcurl
+Requires:       libidn2
+Requires:       libpsl
+Requires:       libssh
+Requires:       libstdc++
+Requires:       libxml2
+Requires:       libyaml
+Requires:       libzstd
+Requires:       lz4
+Requires:       openldap
+Requires:       pam
+Requires:       pcre2
+Requires:       perl
+Requires:       readline
+Requires:       xz
+%endif
+
+%description
+
+Apache Cloudberry (Incubating) is an advanced, open-source, massively
+parallel processing (MPP) data warehouse developed from PostgreSQL and
+Greenplum. It is designed for high-performance analytics on
+large-scale data sets, offering powerful analytical capabilities and
+enhanced security features.
+
+Key Features:
+
+- Massively parallel processing for optimized performance
+- Advanced analytics for complex data processing
+- Integration with ETL and BI tools
+- Compatibility with multiple data sources and formats
+- Enhanced security features
+
+Apache Cloudberry supports both batch processing and real-time data
+warehousing, making it a versatile solution for modern data
+environments.
+
+Apache Cloudberry (Incubating) is an effort undergoing incubation at
+the Apache Software Foundation (ASF), sponsored by the Apache
+Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further
+review indicates that the infrastructure, communications, and decision
+making process have stabilized in a manner consistent with other
+successful ASF projects.
+
+While incubation status is not necessarily a reflection of the
+completeness or stability of the code, it does indicate that the
+project has yet to be fully endorsed by the ASF.
+
+%prep
+# No prep needed for binary RPM
+
+%build
+# No prep needed for binary RPM
+
+%install
+rm -rf %{buildroot}
+
+# Create the versioned directory
+mkdir -p %{buildroot}%{cloudberry_install_dir}-%{version}
+
+cp -R %{cloudberry_install_dir}/* %{buildroot}%{cloudberry_install_dir}-%{version}
+
+# Create the symbolic link
+ln -sfn %{cloudberry_install_dir}-%{version} %{buildroot}%{cloudberry_install_dir}
+
+%files
+%{prefix}-%{version}
+%{prefix}
+
+%license %{cloudberry_install_dir}-%{version}/LICENSE
+
+%debug_package
+
+%post
+# Change ownership to gpadmin.gpadmin if the gpadmin user exists
+if id "gpadmin" &>/dev/null; then
+    chown -R gpadmin:gpadmin %{cloudberry_install_dir}-%{version}
+    chown gpadmin:gpadmin %{cloudberry_install_dir}
+fi
+
+%postun
+if [ $1 -eq 0 ] ; then
+  if [ "$(readlink -f "%{cloudberry_install_dir}")" == "%{cloudberry_install_dir}-%{version}" ]; then
+    unlink "%{cloudberry_install_dir}" || true
+  fi
+fi
diff --git a/devops/build/packaging/rpm/apache-cloudberry-hll-incubating.spec b/devops/build/packaging/rpm/apache-cloudberry-hll-incubating.spec
new file mode 100644
index 00000000000..4d2d6126f74
--- /dev/null
+++ b/devops/build/packaging/rpm/apache-cloudberry-hll-incubating.spec
@@ -0,0 +1,68 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+%global cloudberry_version %{?_cloudberry_version}%{!?_cloudberry_version:1.6}
+%global cloudberry_install_dir /usr/local/cloudberry-db
+
+Name:           apache-cloudberry-hll-incubating
+Version:        2.18.0
+Release:        %{?release}%{!?release:1}
+Summary:        HyperLogLog extension for Apache Cloudberry %{cloudberry_version}
+License:        ASL 2.0
+URL:            https://github.com/citusdata/postgresql-hll
+Vendor:         Apache Cloudberry (Incubating)
+Group:          Applications/Databases
+BuildArch:      x86_64
+Requires:       apache-cloudberry-db-incubating >= %{cloudberry_version}
+Prefix:         %{cloudberry_install_dir}
+
+%description
+HLL is an open-source PostgreSQL extension (compatible with Apache
+Cloudberry (Incubating) %{cloudberry_version}) adding HyperLogLog data
+structures as a native data type. HyperLogLog is a fixed-size,
+set-like structure used for distinct value counting with tunable
+precision.
+
+%prep
+# No prep needed for binary RPM
+
+%build
+# No build needed for binary RPM
+
+%install
+mkdir -p %{buildroot}%{prefix}/lib/postgresql \
+         %{buildroot}%{prefix}/share/postgresql/extension
+
+cp -R %{cloudberry_install_dir}/lib/postgresql/hll.so \
+      %{buildroot}%{prefix}/lib/postgresql/hll.so
+
+cp -R %{cloudberry_install_dir}/share/postgresql/extension/hll* \
+      %{buildroot}%{prefix}/share/postgresql/extension
+
+%files
+%{prefix}/lib/postgresql/hll.so
+%{prefix}/share/postgresql/extension/hll--*.sql
+%{prefix}/share/postgresql/extension/hll.control
+
+%post
+echo "HLL extension for Apache Cloudberry %{cloudberry_version} has been installed in %{prefix}."
+echo "To enable it in a database, run:"
+echo "  CREATE EXTENSION hll;"
+
+%postun
+echo "HLL extension for Apache Cloudberry %{cloudberry_version} has been removed from %{prefix}."
+echo "You may need to manually clean up any database objects that were using the extension."
diff --git a/devops/build/packaging/rpm/apache-cloudberry-pgvector-incubating.spec b/devops/build/packaging/rpm/apache-cloudberry-pgvector-incubating.spec
new file mode 100644
index 00000000000..0be44308e07
--- /dev/null
+++ b/devops/build/packaging/rpm/apache-cloudberry-pgvector-incubating.spec
@@ -0,0 +1,70 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+%global cloudberry_version %{?_cloudberry_version}%{!?_cloudberry_version:1.6}
+%global cloudberry_install_dir /usr/local/cloudberry-db
+%global pgvector_version %{?_pgvector_version}%{!?_pgvector_version:0.5.1}
+
+Name:           cloudberry-pgvector
+Version:        %{pgvector_version}
+Release:        %{?release}%{!?release:1}
+Summary:        pgvector extension for Apache Cloudberry %{cloudberry_version}
+License:        PostgreSQL
+URL:            https://github.com/pgvector/pgvector
+Vendor:         Cloudberry Open Source
+Group:          Applications/Databases
+BuildArch:      x86_64
+Requires:       cloudberry-db >= %{cloudberry_version}
+Prefix:         %{cloudberry_install_dir}
+
+%description
+pgvector is an open-source vector similarity search extension for
+PostgreSQL and Apache Cloudberry %{cloudberry_version}.  It provides
+vector data types and vector similarity search functions, allowing for
+efficient similarity search operations on high-dimensional data.
+
+%prep
+# No prep needed for binary RPM
+
+%build
+# No build needed for binary RPM
+
+%install
+mkdir -p %{buildroot}%{prefix}/include/postgresql/server/extension/vector \
+         %{buildroot}%{prefix}/lib/postgresql                             \
+         %{buildroot}%{prefix}/share/postgresql/extension
+cp -R %{cloudberry_install_dir}/include/postgresql/server/extension/vector/* \
+      %{buildroot}%{prefix}/include/postgresql/server/extension/vector
+cp -R %{cloudberry_install_dir}/lib/postgresql/vector.so \
+      %{buildroot}%{prefix}/lib/postgresql/vector.so
+cp -R %{cloudberry_install_dir}/share/postgresql/extension/vector* \
+      %{buildroot}%{prefix}/share/postgresql/extension
+
+%files
+%{prefix}/include/postgresql/server/extension/vector/*
+%{prefix}/lib/postgresql/vector.so
+%{prefix}/share/postgresql/extension/vector--*.sql
+%{prefix}/share/postgresql/extension/vector.control
+
+%post
+echo "pgvector extension version %{version} for Apache Cloudberry %{cloudberry_version} has been installed in %{prefix}."
+echo "To enable it in a database, run:"
+echo "  CREATE EXTENSION vector;"
+
+%postun
+echo "pgvector extension version %{version} for Apache Cloudberry %{cloudberry_version} has been removed from %{prefix}."
+echo "You may need to manually clean up any database objects that were using the extension."
diff --git a/devops/build/packaging/rpm/build-rpm.sh b/devops/build/packaging/rpm/build-rpm.sh
new file mode 100755
index 00000000000..ceb7d18d392
--- /dev/null
+++ b/devops/build/packaging/rpm/build-rpm.sh
@@ -0,0 +1,151 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Script Name: build-rpm.sh
+#
+# Description:
+# This script automates the process of building an RPM package using a specified
+# version and release number. It ensures that the necessary tools are installed
+# and that the spec file exists before attempting to build the RPM. The script
+# also includes error handling to provide meaningful feedback in case of failure.
+#
+# Usage:
+# ./build-rpm.sh -v <version> [-r <release>] [-d|--with-debug] [-h] [--dry-run]
+#
+# Options:
+#   -v, --version <version>    : Specify the version (required)
+#   -r, --release <release>    : Specify the release (optional, default is 1)
+#   -d, --with-debug           : Build with debug symbols (optional)
+#   -h, --help                 : Display this help and exit
+#   -n, --dry-run              : Show what would be done, without making any changes
+#
+# Example:
+#   ./build-rpm.sh -v 1.5.5 -r 2          # Build with version 1.5.5 and release 2
+#   ./build-rpm.sh -v 1.5.5               # Build with version 1.5.5 and default release 1
+#   ./build-rpm.sh -v 1.5.5 --with-debug  # Build with debug symbols
+#
+# Prerequisites:
+# - The rpm-build package must be installed (provides the rpmbuild command).
+# - The spec file must exist at ~/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec.
+#
+# Error Handling:
+# The script includes checks to ensure:
+# - The version option (-v or --version) is provided.
+# - The necessary commands are available.
+# - The spec file exists at the specified location.
+# If any of these checks fail, the script exits with an appropriate error message.
+
+# Enable strict mode for better error handling
+set -euo pipefail
+
+# Default values
+VERSION=""
+RELEASE="1"
+DEBUG_BUILD=false
+
+# Function to display usage information
+usage() {
+  echo "Usage: $0 -v <version> [-r <release>] [-h] [--dry-run]"
+  echo "  -v, --version <version>    : Specify the version (required)"
+  echo "  -r, --release <release>    : Specify the release (optional, default is 1)"
+  echo "  -d, --with-debug           : Build with debug symbols (optional)"
+  echo "  -h, --help                 : Display this help and exit"
+  echo "  -n, --dry-run              : Show what would be done, without making any changes"
+  exit 1
+}
+
+# Function to check if required commands are available
+check_commands() {
+  local cmds=("rpmbuild")
+  for cmd in "${cmds[@]}"; do
+    if ! command -v "$cmd" &> /dev/null; then
+      echo "Error: Required command '$cmd' not found. Please install it before running the script."
+      exit 1
+    fi
+  done
+}
+
+# Parse options
+while [[ "$#" -gt 0 ]]; do
+  case $1 in
+    -v|--version)
+      VERSION="$2"
+      shift 2
+      ;;
+    -r|--release)
+      RELEASE="$2"
+      shift 2
+      ;;
+    -d|--with-debug)
+      DEBUG_BUILD=true
+      shift
+      ;;
+    -h|--help)
+      usage
+      ;;
+    -n|--dry-run)
+      DRY_RUN=true
+      shift
+      ;;
+    *)
+      echo "Unknown option: ($1)"
+      shift
+      ;;
+  esac
+done
+
+# Ensure version is provided
+if [ -z "$VERSION" ]; then
+  echo "Error: Version (-v or --version) is required."
+  usage
+fi
+
+# Check if required commands are available
+check_commands
+
+# Define the spec file path
+SPEC_FILE=~/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
+
+# Check if the spec file exists
+if [ ! -f "$SPEC_FILE" ]; then
+  echo "Error: Spec file not found at $SPEC_FILE."
+  exit 1
+fi
+
+# Build the rpmbuild command based on options
+RPMBUILD_CMD="rpmbuild -bb \"$SPEC_FILE\" --define \"version $VERSION\" --define \"release $RELEASE\""
+if [ "$DEBUG_BUILD" = true ]; then
+    RPMBUILD_CMD+=" --with debug"
+fi
+
+# Dry-run mode
+if [ "${DRY_RUN:-false}" = true ]; then
+  echo "Dry-run mode: This is what would be done:"
+  echo "  $RPMBUILD_CMD"
+  exit 0
+fi
+
+# Run rpmbuild with the provided options
+echo "Building RPM with Version: $VERSION, Release: $RELEASE$([ "$DEBUG_BUILD" = true ] && echo ", Debug: enabled")..."
+if ! eval "$RPMBUILD_CMD"; then
+  echo "Error: rpmbuild failed."
+  exit 1
+fi
+
+# Print completion message
+echo "RPM build completed successfully with Version: $VERSION, Release: $RELEASE"
diff --git a/devops/build/packaging/rpm/cloudberry-dev-repo.spec b/devops/build/packaging/rpm/cloudberry-dev-repo.spec
new file mode 100644
index 00000000000..45f6186cf3d
--- /dev/null
+++ b/devops/build/packaging/rpm/cloudberry-dev-repo.spec
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+Name:           cloudberry-dev-repo
+Version:        1.0
+Release:        1%{?dist}
+Summary:        Apache Cloudberry Repository Configuration
+License:        ASL 2.0
+Group:          Applications/Databases
+URL:            https://cloudberry.apache.org
+Vendor:         Cloudberry Open Source
+BuildArch:      noarch
+
+%description
+This package configures the Apache Cloudberry repository on your
+system. Apache Cloudberry is an open-source project aimed at
+providing a scalable, high-performance SQL database for
+analytics. This repository provides access to the latest RPM packages
+for Apache Cloudberry, allowing you to easily install and stay
+up-to-date with the latest developments.
+
+%install
+mkdir -p %{buildroot}%{_sysconfdir}/yum.repos.d/
+cat > %{buildroot}%{_sysconfdir}/yum.repos.d/cloudberry-dev.repo <<EOF
+[cloudberry-dev]
+name=Apache Cloudberry Repository
+baseurl=https://cloudberry-rpm-dev-bucket.s3.amazonaws.com/repo/el%{rhel}/x86_64/
+enabled=1
+gpgcheck=1
+gpgkey=https://cloudberry-rpm-dev-bucket.s3.amazonaws.com/repo/el%{rhel}/x86_64/RPM-GPG-KEY-cloudberry
+EOF
+
+%files
+%{_sysconfdir}/yum.repos.d/cloudberry-dev.repo
+
+%changelog
+* Thu Aug 21 2024 Ed Espino  eespino@gmail.com - 1.0-1
+- Initial package with repository configuration
diff --git a/devops/deploy/docker/build/rocky8/Dockerfile b/devops/deploy/docker/build/rocky8/Dockerfile
new file mode 100644
index 00000000000..45d6706e593
--- /dev/null
+++ b/devops/deploy/docker/build/rocky8/Dockerfile
@@ -0,0 +1,215 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Apache Cloudberry (Incubating) is an effort undergoing incubation at
+# the Apache Software Foundation (ASF), sponsored by the Apache
+# Incubator PMC.
+#
+# Incubation is required of all newly accepted projects until a
+# further review indicates that the infrastructure, communications,
+# and decision making process have stabilized in a manner consistent
+# with other successful ASF projects.
+#
+# While incubation status is not necessarily a reflection of the
+# completeness or stability of the code, it does indicate that the
+# project has yet to be fully endorsed by the ASF.
+#
+# --------------------------------------------------------------------
+# Dockerfile for Apache Cloudberry Build Environment
+# --------------------------------------------------------------------
+# This Dockerfile sets up a Rocky Linux 9-based container for building
+# and developing Apache Cloudberry. It installs necessary system
+# utilities, development tools, and configures the environment for SSH
+# access and systemd support.
+#
+# Key Features:
+# - Locale setup for en_US.UTF-8
+# - SSH daemon setup for remote access
+# - Essential development tools and libraries installation
+# - User configuration for 'gpadmin' with sudo privileges
+#
+# Usage:
+#   docker build -t cloudberry-db-env .
+#   docker run -h cdw -it cloudberry-db-env
+# --------------------------------------------------------------------
+
+# Base image: Rocky Linux 8
+FROM rockylinux/rockylinux:8
+
+# Argument for configuring the timezone
+ARG TIMEZONE_VAR="America/Los_Angeles"
+
+# Environment variables for locale and user
+ENV container=docker
+ENV LANG=en_US.UTF-8
+ENV USER=gpadmin
+
+# --------------------------------------------------------------------
+# Install Development Tools and Utilities
+# --------------------------------------------------------------------
+# Install various development tools, system utilities, and libraries
+# required for building and running Apache Cloudberry.
+# - EPEL repository is enabled for additional packages.
+# - Cleanup steps are added to reduce image size after installation.
+# --------------------------------------------------------------------
+RUN dnf makecache && \
+    dnf install -y \
+        epel-release \
+        rocky-release-hpc \
+        git && \
+    dnf makecache && \
+    dnf config-manager --disable epel && \
+    dnf install -y -d0 --enablerepo=epel \
+        the_silver_searcher \
+        htop && \
+    dnf install -y -d0 \
+        apr-devel \
+        autoconf \
+        bison \
+        bzip2-devel \
+        cmake3 \
+        diffutils \
+        file \
+        flex \
+        gcc \
+        gcc-c++ \
+        gdb \
+        glibc-langpack-en \
+        glibc-locale-source \
+        iproute \
+        java-11-openjdk \
+        java-11-openjdk-devel \
+        krb5-devel \
+        libcurl-devel \
+        libevent-devel \
+        libssh2-devel \
+        libuuid-devel \
+        libxml2-devel \
+        libzstd-devel \
+        lsof \
+        lz4 \
+        lz4-devel \
+        make \
+        m4 \
+        nc \
+        net-tools \
+        openldap-devel \
+        openssh-clients \
+        openssh-server \
+        openssl-devel \
+        pam-devel \
+        passwd \
+        perl-Env \
+        perl-ExtUtils-Embed \
+        perl-Test-Simple \
+        procps-ng \
+        python3 \
+        python3-devel \
+        readline-devel \
+        rsync \
+        sshpass \
+        sudo \
+        tar \
+        unzip \
+        util-linux-ng \
+        wget \
+        which \
+        rpm-build \
+        rpmdevtools \
+        zlib-devel && \
+    dnf install -y -d0 --enablerepo=devel \
+        liburing-devel \
+        libuv-devel \
+        libyaml-devel \
+        perl-IPC-Run \
+        protobuf-devel && \
+    dnf clean all && rm -rf /var/cache/dnf/* && \
+    cd && XERCES_LATEST_RELEASE=3.3.0 && \
+    wget -nv "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    echo "$(curl -sL https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz.sha256)" | sha256sum -c - && \
+    tar xf "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz"; rm "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    cd xerces-c-${XERCES_LATEST_RELEASE} && \
+    ./configure --prefix=/usr/local/xerces-c && \
+    make -j$(nproc) && \
+    make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \
+    rm -rf ~/xerces-c* && \
+    cd && GO_VERSION="go1.23.4" && \
+    ARCH=$(uname -m) && \
+    if [ "${ARCH}" = "aarch64" ]; then \
+        GO_ARCH="arm64" && \
+        GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \
+    elif [ "${ARCH}" = "x86_64" ]; then \
+        GO_ARCH="amd64" && \
+        GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \
+    else \
+        echo "Unsupported architecture: ${ARCH}" && exit 1; \
+    fi && \
+    GO_URL="https://go.dev/dl/${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    wget -nv "${GO_URL}" && \
+    echo "${GO_SHA256}  ${GO_VERSION}.linux-${GO_ARCH}.tar.gz" | sha256sum -c - && \
+    tar xf "${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    mv go "/usr/local/${GO_VERSION}" && \
+    ln -s "/usr/local/${GO_VERSION}" /usr/local/go && \
+    rm -f "${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    echo 'export PATH=$PATH:/usr/local/go/bin' | tee -a /etc/profile.d/go.sh > /dev/null
+
+# --------------------------------------------------------------------
+# Copy Configuration Files and Setup the Environment
+# --------------------------------------------------------------------
+# - Copy custom configuration files from the build context to /tmp/.
+# - Apply custom system limits and timezone.
+# - Create and configure the 'gpadmin' user with sudo privileges.
+# - Set up SSH for password-based authentication.
+# - Generate locale and set the default locale to en_US.UTF-8.
+# --------------------------------------------------------------------
+COPY ./configs/* /tmp/
+
+RUN cp /tmp/90-cbdb-limits /etc/security/limits.d/90-cbdb-limits && \
+    sed -i.bak -r 's/^(session\s+required\s+pam_limits.so)/#\1/' /etc/pam.d/* && \
+    cat /usr/share/zoneinfo/${TIMEZONE_VAR} > /etc/localtime && \
+    chmod 777 /tmp/init_system.sh && \
+    /usr/sbin/groupadd gpadmin && \
+    /usr/sbin/useradd gpadmin -g gpadmin -G wheel && \
+    setcap cap_net_raw+ep /usr/bin/ping && \
+    echo 'gpadmin ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/90-gpadmin && \
+    echo -e '\n# Add Cloudberry entries\nif [ -f /usr/local/cbdb/cloudberry-env.sh ]; then\n  source /usr/local/cbdb/cloudberry-env.sh\nfi' >> /home/gpadmin/.bashrc && \
+    ssh-keygen -A && \
+    echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config && \
+    localedef -i en_US -f UTF-8 en_US.UTF-8 && \
+    echo "LANG=en_US.UTF-8" | tee /etc/locale.conf && \
+    dnf clean all  # Final cleanup to remove unnecessary files
+
+# Install testinfra via pip
+RUN pip3 install pytest-testinfra
+
+# Example: Copying test files into the container
+COPY tests /tests
+
+# --------------------------------------------------------------------
+# Set the Default User and Command
+# --------------------------------------------------------------------
+# The default user is set to 'gpadmin', and the container starts by
+# running the init_system.sh script. The container also mounts the
+# /sys/fs/cgroup volume for systemd compatibility.
+# --------------------------------------------------------------------
+USER gpadmin
+
+VOLUME [ "/sys/fs/cgroup" ]
+CMD ["bash","-c","/tmp/init_system.sh"]
diff --git a/devops/deploy/docker/build/rocky8/configs/90-cbdb-limits b/devops/deploy/docker/build/rocky8/configs/90-cbdb-limits
new file mode 100644
index 00000000000..474957c42f6
--- /dev/null
+++ b/devops/deploy/docker/build/rocky8/configs/90-cbdb-limits
@@ -0,0 +1,32 @@
+# /etc/security/limits.d/90-db-limits
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+# Core dump file size limits for gpadmin
+gpadmin soft core unlimited
+gpadmin hard core unlimited
+
+# Open file limits for gpadmin
+gpadmin soft nofile 524288
+gpadmin hard nofile 524288
+
+# Process limits for gpadmin
+gpadmin soft nproc 131072
+gpadmin hard nproc 131072
diff --git a/devops/deploy/docker/build/rocky8/configs/gpinitsystem.conf b/devops/deploy/docker/build/rocky8/configs/gpinitsystem.conf
new file mode 100644
index 00000000000..3c0fb48b58c
--- /dev/null
+++ b/devops/deploy/docker/build/rocky8/configs/gpinitsystem.conf
@@ -0,0 +1,87 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# gpinitsystem Configuration File for Apache Cloudberry
+# --------------------------------------------------------------------
+# This configuration file is used to initialize an Apache Cloudberry
+# cluster. It defines the settings for the coordinator, primary segments,
+# and mirrors, as well as other important configuration options.
+# --------------------------------------------------------------------
+
+# Segment prefix - This prefix is used for naming the segment directories.
+# For example, the primary segment directories will be named gpseg0, gpseg1, etc.
+SEG_PREFIX=gpseg
+
+# Coordinator port - The port number where the coordinator will listen.
+# This is the port used by clients to connect to the database.
+COORDINATOR_PORT=5432
+
+# Coordinator hostname - The hostname of the machine where the coordinator
+# will be running. The $(hostname) command will automatically insert the
+# hostname of the current machine.
+COORDINATOR_HOSTNAME=$(hostname)
+
+# Coordinator data directory - The directory where the coordinator's data
+# will be stored. This directory should have enough space to store metadata
+# and system catalogs.
+COORDINATOR_DIRECTORY=/data1/coordinator
+
+# Base port for primary segments - The starting port number for the primary
+# segments. Each primary segment will use a unique port number starting from
+# this base.
+PORT_BASE=6000
+
+# Primary segment data directories - An array specifying the directories where
+# the primary segment data will be stored. Each directory corresponds to a
+# primary segment. In this case, two primary segments will be created in the
+# same directory.
+declare -a DATA_DIRECTORY=(/data1/primary /data1/primary)
+
+# Base port for mirror segments - The starting port number for the mirror
+# segments. Each mirror segment will use a unique port number starting from
+# this base.
+MIRROR_PORT_BASE=7000
+
+# Mirror segment data directories - An array specifying the directories where
+# the mirror segment data will be stored. Each directory corresponds to a
+# mirror segment. In this case, two mirror segments will be created in the
+# same directory.
+declare -a MIRROR_DATA_DIRECTORY=(/data1/mirror /data1/mirror)
+
+# Trusted shell - The shell program used for remote execution. Cloudberry uses
+# SSH to run commands on other machines in the cluster. 'ssh' is the default.
+TRUSTED_SHELL=ssh
+
+# Database encoding - The character set encoding to be used by the database.
+# 'UNICODE' is a common choice, especially for internationalization.
+ENCODING=UNICODE
+
+# Default database name - The name of the default database to be created during
+# initialization. This is also the default database that the gpadmin user will
+# connect to.
+DATABASE_NAME=gpadmin
+
+# Machine list file - A file containing the list of hostnames where the primary
+# segments will be created. Each line in the file represents a different machine.
+# This file is critical for setting up the cluster across multiple nodes.
+MACHINE_LIST_FILE=/home/gpadmin/hostfile_gpinitsystem
+
+# --------------------------------------------------------------------
+# End of gpinitsystem Configuration File
+# --------------------------------------------------------------------
diff --git a/devops/deploy/docker/build/rocky8/configs/init_system.sh b/devops/deploy/docker/build/rocky8/configs/init_system.sh
new file mode 100755
index 00000000000..cc2d5991b9d
--- /dev/null
+++ b/devops/deploy/docker/build/rocky8/configs/init_system.sh
@@ -0,0 +1,193 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# --------------------------------------------------------------------
+# Container Initialization Script
+# --------------------------------------------------------------------
+# This script sets up the environment inside the Docker container for
+# the Apache Cloudberry Build Environment. It performs the following
+# tasks:
+#
+# 1. Verifies that the container is running with the expected hostname.
+# 2. Starts the SSH daemon to allow SSH access to the container.
+# 3. Configures passwordless SSH access for the 'gpadmin' user.
+# 4. Displays a welcome banner and system information.
+# 5. Starts an interactive bash shell.
+#
+# This script is intended to be used as an entrypoint or initialization
+# script for the Docker container.
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Check if the hostname is 'cdw'
+# --------------------------------------------------------------------
+# The script checks if the container's hostname is set to 'cdw'. This is
+# a requirement for this environment, and if the hostname does not match,
+# the script will exit with an error message. This ensures consistency
+# across different environments.
+# --------------------------------------------------------------------
+if [ "$(hostname)" != "cdw" ]; then
+    echo "Error: This container must be run with the hostname 'cdw'."
+    echo "Use the following command: docker run -h cdw ..."
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Start SSH daemon and setup for SSH access
+# --------------------------------------------------------------------
+# The SSH daemon is started to allow remote access to the container via
+# SSH. This is useful for development and debugging purposes. If the SSH
+# daemon fails to start, the script exits with an error.
+# --------------------------------------------------------------------
+if ! sudo /usr/sbin/sshd; then
+    echo "Failed to start SSH daemon" >&2
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Remove /run/nologin to allow logins
+# --------------------------------------------------------------------
+# The /run/nologin file, if present, prevents users from logging into
+# the system. This file is removed to ensure that users can log in via SSH.
+# --------------------------------------------------------------------
+sudo rm -rf /run/nologin
+
+# --------------------------------------------------------------------
+# Configure passwordless SSH access for 'gpadmin' user
+# --------------------------------------------------------------------
+# The script sets up SSH key-based authentication for the 'gpadmin' user,
+# allowing passwordless SSH access. It generates a new SSH key pair if one
+# does not already exist, and configures the necessary permissions.
+# --------------------------------------------------------------------
+mkdir -p /home/gpadmin/.ssh
+chmod 700 /home/gpadmin/.ssh
+
+if [ ! -f /home/gpadmin/.ssh/id_rsa ]; then
+    ssh-keygen -t rsa -b 4096 -C gpadmin -f /home/gpadmin/.ssh/id_rsa -P "" > /dev/null 2>&1
+fi
+
+cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys
+chmod 600 /home/gpadmin/.ssh/authorized_keys
+
+# Add the container's hostname to the known_hosts file to avoid SSH warnings
+ssh-keyscan -t rsa cdw > /home/gpadmin/.ssh/known_hosts 2>/dev/null
+
+# Change to the home directory of the current user
+cd $HOME
+
+# --------------------------------------------------------------------
+# Display a Welcome Banner
+# --------------------------------------------------------------------
+# The following ASCII art and welcome message are displayed when the
+# container starts. This banner provides a visual indication that the
+# container is running in the Apache Cloudberry Build Environment.
+# --------------------------------------------------------------------
+cat <<-'EOF'
+
+======================================================================
+
+                          ++++++++++       ++++++
+                        ++++++++++++++   +++++++
+                       ++++        +++++ ++++
+                      ++++          +++++++++
+                   =+====         =============+
+                 ========       =====+      =====
+                ====  ====     ====           ====
+               ====    ===     ===             ====
+               ====            === ===         ====
+               ====            ===  ==--       ===
+                =====          ===== --       ====
+                 =====================     ======
+                   ============================
+                                     =-----=
+     ____  _                    _  _
+    / ___|| |  ___   _   _   __| || |__    ___  _ __  _ __  _   _
+   | |    | | / _ \ | | | | / _` || '_ \  / _ \| '__|| '__|| | | |
+   | |___ | || (_) || |_| || (_| || |_) ||  __/| |   | |   | |_| |
+    \____||_| \____  \__,_| \__,_||_.__/  \___||_|   |_|    \__, |
+                                                            |___/
+----------------------------------------------------------------------
+
+EOF
+
+# --------------------------------------------------------------------
+# Display System Information
+# --------------------------------------------------------------------
+# The script sources the /etc/os-release file to retrieve the operating
+# system name and version. It then displays the following information:
+# - OS name and version
+# - Current user
+# - Container hostname
+# - IP address
+# - CPU model name and number of cores
+# - Total memory available
+# This information is useful for users to understand the environment they
+# are working in.
+# --------------------------------------------------------------------
+source /etc/os-release
+
+# First, create the CPU info detection function
+get_cpu_info() {
+   ARCH=$(uname -m)
+   if [ "$ARCH" = "x86_64" ]; then
+       lscpu | grep 'Model name:' | awk '{print substr($0, index($0,$3))}'
+   elif [ "$ARCH" = "aarch64" ]; then
+       VENDOR=$(lscpu | grep 'Vendor ID:' | awk '{print $3}')
+       if [ "$VENDOR" = "Apple" ] || [ "$VENDOR" = "0x61" ]; then
+           echo "Apple Silicon ($ARCH)"
+       else
+           if [ -f /proc/cpuinfo ]; then
+               IMPL=$(grep "CPU implementer" /proc/cpuinfo | head -1 | awk '{print $3}')
+               PART=$(grep "CPU part" /proc/cpuinfo | head -1 | awk '{print $3}')
+               if [ ! -z "$IMPL" ] && [ ! -z "$PART" ]; then
+                   echo "ARM $ARCH (Implementer: $IMPL, Part: $PART)"
+               else
+                   echo "ARM $ARCH"
+               fi
+           else
+               echo "ARM $ARCH"
+           fi
+       fi
+   else
+       echo "Unknown architecture: $ARCH"
+   fi
+}
+
+cat <<-EOF
+Welcome to the Apache Cloudberry Build Environment!
+
+Container OS ........ : $NAME $VERSION
+User ................ : $(whoami)
+Container hostname .. : $(hostname)
+IP Address .......... : $(hostname -I | awk '{print $1}')
+CPU Info ............ : $(get_cpu_info)
+CPU(s) .............. : $(nproc)
+Memory .............. : $(free -h | grep Mem: | awk '{print $2}') total
+======================================================================
+
+EOF
+
+# --------------------------------------------------------------------
+# Start an interactive bash shell
+# --------------------------------------------------------------------
+# Finally, the script starts an interactive bash shell to keep the
+# container running and allow the user to interact with the environment.
+# --------------------------------------------------------------------
+/bin/bash
diff --git a/devops/deploy/docker/build/rocky8/tests/requirements.txt b/devops/deploy/docker/build/rocky8/tests/requirements.txt
new file mode 100644
index 00000000000..b9711eddac5
--- /dev/null
+++ b/devops/deploy/docker/build/rocky8/tests/requirements.txt
@@ -0,0 +1,3 @@
+testinfra
+pytest-testinfra
+paramiko
diff --git a/devops/deploy/docker/build/rocky8/tests/testinfra/test_cloudberry_db_env.py b/devops/deploy/docker/build/rocky8/tests/testinfra/test_cloudberry_db_env.py
new file mode 100644
index 00000000000..c484c5b9408
--- /dev/null
+++ b/devops/deploy/docker/build/rocky8/tests/testinfra/test_cloudberry_db_env.py
@@ -0,0 +1,126 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+import testinfra
+
+def test_installed_packages(host):
+    """
+    Test if the essential packages are installed.
+    """
+    packages = [
+        "epel-release",
+        "git",
+        "the_silver_searcher",
+        "htop",
+        "bison",
+        "gcc",
+        "gcc-c++",
+        "glibc-langpack-en",
+        "glibc-locale-source",
+        "openssh-clients",
+        "openssh-server",
+        "sudo",
+        "rsync",
+        "wget",
+        "openssl-devel",
+        "python36-devel",
+        "readline-devel",
+        "zlib-devel",
+        "libcurl-devel",
+        "libevent-devel",
+        "libxml2-devel",
+        "libuuid-devel",
+        "libzstd-devel",
+        "lz4",
+        "openldap-devel",
+        "libuv-devel",
+        "libyaml-devel"
+    ]
+    for package in packages:
+        pkg = host.package(package)
+        assert pkg.is_installed
+
+
+def test_user_gpadmin_exists(host):
+    """
+    Test if the gpadmin user exists and is configured properly.
+    """
+    user = host.user("gpadmin")
+    assert user.exists
+    assert "wheel" in user.groups
+
+
+def test_ssh_service(host):
+    """
+    Test if SSH service is configured correctly.
+    """
+    sshd_config = host.file("/etc/ssh/sshd_config")
+    assert sshd_config.exists
+
+
+def test_locale_configured(host):
+    """
+    Test if the locale is configured correctly.
+    """
+    locale_conf = host.file("/etc/locale.conf")
+    assert locale_conf.exists
+    assert locale_conf.contains("LANG=en_US.UTF-8")
+
+
+def test_timezone(host):
+    """
+    Test if the timezone is configured correctly.
+    """
+    localtime = host.file("/etc/localtime")
+    assert localtime.exists
+
+
+def test_system_limits_configured(host):
+    """
+    Test if the custom system limits are applied.
+    """
+    limits_file = host.file("/etc/security/limits.d/90-cbdb-limits")
+    assert limits_file.exists
+
+
+def test_init_system_script(host):
+    """
+    Test if the init_system.sh script is present and executable.
+    """
+    script = host.file("/tmp/init_system.sh")
+    assert script.exists
+    assert script.mode == 0o777
+
+
+def test_custom_configuration_files(host):
+    """
+    Test if custom configuration files are correctly copied.
+    """
+    config_file = host.file("/tmp/90-cbdb-limits")
+    assert config_file.exists
+
+
+def test_locale_generated(host):
+    """
+    Test if the en_US.UTF-8 locale is correctly generated.
+    """
+    locale = host.run("locale -a | grep en_US.utf8")
+    assert locale.exit_status == 0
+    assert "en_US.utf8" in locale.stdout
diff --git a/devops/deploy/docker/build/rocky9/Dockerfile b/devops/deploy/docker/build/rocky9/Dockerfile
new file mode 100644
index 00000000000..26190109ef0
--- /dev/null
+++ b/devops/deploy/docker/build/rocky9/Dockerfile
@@ -0,0 +1,218 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Apache Cloudberry (Incubating) is an effort undergoing incubation at
+# the Apache Software Foundation (ASF), sponsored by the Apache
+# Incubator PMC.
+#
+# Incubation is required of all newly accepted projects until a
+# further review indicates that the infrastructure, communications,
+# and decision making process have stabilized in a manner consistent
+# with other successful ASF projects.
+#
+# While incubation status is not necessarily a reflection of the
+# completeness or stability of the code, it does indicate that the
+# project has yet to be fully endorsed by the ASF.
+#
+# --------------------------------------------------------------------
+# Dockerfile for Apache Cloudberry Build Environment
+# --------------------------------------------------------------------
+# This Dockerfile sets up a Rocky Linux 9-based container for building
+# and developing Apache Cloudberry. It installs necessary system
+# utilities, development tools, and configures the environment for SSH
+# access and systemd support.
+#
+# Key Features:
+# - Locale setup for en_US.UTF-8
+# - SSH daemon setup for remote access
+# - Essential development tools and libraries installation
+# - User configuration for 'gpadmin' with sudo privileges
+#
+# Usage:
+#   docker build -t cloudberry-db-env .
+#   docker run -h cdw -it cloudberry-db-env
+# --------------------------------------------------------------------
+
+# Base image: Rocky Linux 9
+FROM rockylinux/rockylinux:9
+
+# Argument for configuring the timezone
+ARG TIMEZONE_VAR="America/Los_Angeles"
+
+# Environment variables for locale and user
+ENV container=docker
+ENV LANG=en_US.UTF-8
+ENV USER=gpadmin
+
+# --------------------------------------------------------------------
+# Install Development Tools and Utilities
+# --------------------------------------------------------------------
+# Install various development tools, system utilities, and libraries
+# required for building and running Apache Cloudberry.
+# - EPEL repository is enabled for additional packages.
+# - Cleanup steps are added to reduce image size after installation.
+# --------------------------------------------------------------------
+RUN dnf makecache && \
+    dnf install -y \
+        epel-release \
+        rocky-release-hpc \
+        git && \
+    dnf config-manager --disable epel-cisco-openh264 && \
+    dnf makecache && \
+    dnf config-manager --disable epel && \
+    dnf install -y --enablerepo=epel \
+        the_silver_searcher \
+        bat \
+        htop && \
+    dnf install -y \
+        bison \
+        cmake3 \
+        ed \
+        file \
+        flex \
+        gcc \
+        gcc-c++ \
+        gdb \
+        glibc-langpack-en \
+        glibc-locale-source \
+        initscripts \
+        iproute \
+        less \
+        lsof \
+        m4 \
+        net-tools \
+        openssh-clients \
+        openssh-server \
+        perl \
+        rpm-build \
+        rpmdevtools \
+        rsync \
+        sudo \
+        tar \
+        unzip \
+        util-linux-ng \
+        wget \
+        sshpass \
+        which && \
+    dnf install -y \
+        apr-devel \
+        bzip2-devel \
+        java-11-openjdk \
+        java-11-openjdk-devel \
+        krb5-devel \
+        libcurl-devel \
+        libssh2-devel \
+        libevent-devel \
+        libxml2-devel \
+        libuuid-devel \
+        libzstd-devel \
+        lz4 \
+        lz4-devel \
+        openldap-devel \
+        openssl-devel \
+        pam-devel \
+        perl-ExtUtils-Embed \
+        perl-Test-Simple \
+        perl-core \
+        python3-devel \
+        python3-pytest \
+        readline-devel \
+        zlib-devel && \
+    dnf install -y --enablerepo=crb \
+        liburing-devel \
+        libuv-devel \
+        libyaml-devel \
+        perl-IPC-Run \
+        protobuf-devel && \
+    dnf clean all && \
+    cd && XERCES_LATEST_RELEASE=3.3.0 && \
+    wget -nv "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    echo "$(curl -sL https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz.sha256)" | sha256sum -c - && \
+    tar xf "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz"; rm "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    cd xerces-c-${XERCES_LATEST_RELEASE} && \
+    ./configure --prefix=/usr/local/xerces-c && \
+    make -j$(nproc) && \
+    make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \
+    rm -rf ~/xerces-c* && \
+    cd && GO_VERSION="go1.23.4" && \
+    ARCH=$(uname -m) && \
+    if [ "${ARCH}" = "aarch64" ]; then \
+        GO_ARCH="arm64" && \
+        GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \
+    elif [ "${ARCH}" = "x86_64" ]; then \
+        GO_ARCH="amd64" && \
+        GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \
+    else \
+        echo "Unsupported architecture: ${ARCH}" && exit 1; \
+    fi && \
+    GO_URL="https://go.dev/dl/${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    wget -nv "${GO_URL}" && \
+    echo "${GO_SHA256}  ${GO_VERSION}.linux-${GO_ARCH}.tar.gz" | sha256sum -c - && \
+    tar xf "${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    mv go "/usr/local/${GO_VERSION}" && \
+    ln -s "/usr/local/${GO_VERSION}" /usr/local/go && \
+    rm -f "${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    echo 'export PATH=$PATH:/usr/local/go/bin' | tee -a /etc/profile.d/go.sh > /dev/null
+
+# --------------------------------------------------------------------
+# Copy Configuration Files and Setup the Environment
+# --------------------------------------------------------------------
+# - Copy custom configuration files from the build context to /tmp/.
+# - Apply custom system limits and timezone.
+# - Create and configure the 'gpadmin' user with sudo privileges.
+# - Set up SSH for password-based authentication.
+# - Generate locale and set the default locale to en_US.UTF-8.
+# --------------------------------------------------------------------
+
+# Copy configuration files from their respective locations
+COPY ./configs/* /tmp/
+
+RUN cp /tmp/90-cbdb-limits /etc/security/limits.d/90-cbdb-limits && \
+    sed -i.bak -r 's/^(session\s+required\s+pam_limits.so)/#\1/' /etc/pam.d/* && \
+    cat /usr/share/zoneinfo/${TIMEZONE_VAR} > /etc/localtime && \
+    chmod 777 /tmp/init_system.sh && \
+    /usr/sbin/groupadd gpadmin && \
+    /usr/sbin/useradd gpadmin -g gpadmin -G wheel && \
+    setcap cap_net_raw+ep /usr/bin/ping && \
+    echo 'gpadmin ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/90-gpadmin && \
+    echo -e '\n# Add Cloudberry entries\nif [ -f /usr/local/cbdb/cloudberry-env.sh ]; then\n  source /usr/local/cbdb/cloudberry-env.sh\nfi' >> /home/gpadmin/.bashrc && \
+    ssh-keygen -A && \
+    echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config && \
+    localedef -i en_US -f UTF-8 en_US.UTF-8 && \
+    echo "LANG=en_US.UTF-8" | tee /etc/locale.conf && \
+    dnf clean all  # Final cleanup to remove unnecessary files
+
+# Install testinfra via pip
+RUN pip3 install pytest-testinfra
+
+# Copying test files into the container
+COPY ./tests /tests
+
+# --------------------------------------------------------------------
+# Set the Default User and Command
+# --------------------------------------------------------------------
+# The default user is set to 'gpadmin', and the container starts by
+# running the init_system.sh script. The container also mounts the
+# /sys/fs/cgroup volume for systemd compatibility.
+# --------------------------------------------------------------------
+USER gpadmin
+
+VOLUME [ "/sys/fs/cgroup" ]
+CMD ["bash","-c","/tmp/init_system.sh"]
diff --git a/devops/deploy/docker/build/rocky9/configs/90-cbdb-limits b/devops/deploy/docker/build/rocky9/configs/90-cbdb-limits
new file mode 100644
index 00000000000..474957c42f6
--- /dev/null
+++ b/devops/deploy/docker/build/rocky9/configs/90-cbdb-limits
@@ -0,0 +1,32 @@
+# /etc/security/limits.d/90-db-limits
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+# Core dump file size limits for gpadmin
+gpadmin soft core unlimited
+gpadmin hard core unlimited
+
+# Open file limits for gpadmin
+gpadmin soft nofile 524288
+gpadmin hard nofile 524288
+
+# Process limits for gpadmin
+gpadmin soft nproc 131072
+gpadmin hard nproc 131072
diff --git a/devops/deploy/docker/build/rocky9/configs/gpinitsystem.conf b/devops/deploy/docker/build/rocky9/configs/gpinitsystem.conf
new file mode 100644
index 00000000000..d4d312231c5
--- /dev/null
+++ b/devops/deploy/docker/build/rocky9/configs/gpinitsystem.conf
@@ -0,0 +1,89 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# gpinitsystem Configuration File for Apache Cloudberry
+# --------------------------------------------------------------------
+# This configuration file is used to initialize an Apache Cloudberry
+# cluster. It defines the settings for the coordinator, primary segments,
+# and mirrors, as well as other important configuration options.
+# --------------------------------------------------------------------
+
+# Segment prefix - This prefix is used for naming the segment directories.
+# For example, the primary segment directories will be named gpseg0, gpseg1, etc.
+SEG_PREFIX=gpseg
+
+# Coordinator port - The port number where the coordinator will listen.
+# This is the port used by clients to connect to the database.
+COORDINATOR_PORT=5432
+
+# Coordinator hostname - The hostname of the machine where the coordinator
+# will be running. The $(hostname) command will automatically insert the
+# hostname of the current machine.
+COORDINATOR_HOSTNAME=$(hostname)
+
+# Coordinator data directory - The directory where the coordinator's data
+# will be stored. This directory should have enough space to store metadata
+# and system catalogs.
+COORDINATOR_DIRECTORY=/data1/coordinator
+
+# Base port for primary segments - The starting port number for the primary
+# segments. Each primary segment will use a unique port number starting from
+# this base.
+PORT_BASE=6000
+
+# Primary segment data directories - An array specifying the directories where
+# the primary segment data will be stored. Each directory corresponds to a
+# primary segment. In this case, two primary segments will be created in the
+# same directory.
+declare -a DATA_DIRECTORY=(/data1/primary /data1/primary)
+
+# Base port for mirror segments - The starting port number for the mirror
+# segments. Each mirror segment will use a unique port number starting from
+# this base.
+MIRROR_PORT_BASE=7000
+
+# Mirror segment data directories - An array specifying the directories where
+# the mirror segment data will be stored. Each directory corresponds to a
+# mirror segment. In this case, two mirror segments will be created in the
+# same directory.
+declare -a MIRROR_DATA_DIRECTORY=(/data1/mirror /data1/mirror)
+
+# Trusted shell - The shell program used for remote execution. Cloudberry uses
+# SSH to run commands on other machines in the cluster. 'ssh' is the default.
+TRUSTED_SHELL=ssh
+
+# Database encoding - The character set encoding to be used by the database.
+# 'UNICODE' is a common choice, especially for internationalization.
+ENCODING=UNICODE
+
+# Default database name - The name of the default database to be created during
+# initialization. This is also the default database that the gpadmin user will
+# connect to.
+DATABASE_NAME=gpadmin
+
+# Machine list file - A file containing the list of hostnames where the primary
+# segments will be created. Each line in the file represents a different machine.
+# This file is critical for setting up the cluster across multiple nodes.
+MACHINE_LIST_FILE=/home/gpadmin/hostfile_gpinitsystem
+
+# --------------------------------------------------------------------
+# End of gpinitsystem Configuration File
+# --------------------------------------------------------------------
diff --git a/devops/deploy/docker/build/rocky9/configs/init_system.sh b/devops/deploy/docker/build/rocky9/configs/init_system.sh
new file mode 100755
index 00000000000..d8c4a00b035
--- /dev/null
+++ b/devops/deploy/docker/build/rocky9/configs/init_system.sh
@@ -0,0 +1,192 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+## Container Initialization Script
+# --------------------------------------------------------------------
+## This script sets up the environment inside the Docker container for
+## the Apache Cloudberry Build Environment. It performs the following
+## tasks:
+##
+## 1. Verifies that the container is running with the expected hostname.
+## 2. Starts the SSH daemon to allow SSH access to the container.
+## 3. Configures passwordless SSH access for the 'gpadmin' user.
+## 4. Displays a welcome banner and system information.
+## 5. Starts an interactive bash shell.
+##
+## This script is intended to be used as an entrypoint or initialization
+## script for the Docker container.
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Check if the hostname is 'cdw'
+# --------------------------------------------------------------------
+# The script checks if the container's hostname is set to 'cdw'. This is
+# a requirement for this environment, and if the hostname does not match,
+# the script will exit with an error message. This ensures consistency
+# across different environments.
+# --------------------------------------------------------------------
+if [ "$(hostname)" != "cdw" ]; then
+    echo "Error: This container must be run with the hostname 'cdw'."
+    echo "Use the following command: docker run -h cdw ..."
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Start SSH daemon and setup for SSH access
+# --------------------------------------------------------------------
+# The SSH daemon is started to allow remote access to the container via
+# SSH. This is useful for development and debugging purposes. If the SSH
+# daemon fails to start, the script exits with an error.
+# --------------------------------------------------------------------
+if ! sudo /usr/sbin/sshd; then
+    echo "Failed to start SSH daemon" >&2
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Remove /run/nologin to allow logins
+# --------------------------------------------------------------------
+# The /run/nologin file, if present, prevents users from logging into
+# the system. This file is removed to ensure that users can log in via SSH.
+# --------------------------------------------------------------------
+sudo rm -rf /run/nologin
+
+# --------------------------------------------------------------------
+# Configure passwordless SSH access for 'gpadmin' user
+# --------------------------------------------------------------------
+# The script sets up SSH key-based authentication for the 'gpadmin' user,
+# allowing passwordless SSH access. It generates a new SSH key pair if one
+# does not already exist, and configures the necessary permissions.
+# --------------------------------------------------------------------
+mkdir -p /home/gpadmin/.ssh
+chmod 700 /home/gpadmin/.ssh
+
+if [ ! -f /home/gpadmin/.ssh/id_rsa ]; then
+    ssh-keygen -t rsa -b 4096 -C gpadmin -f /home/gpadmin/.ssh/id_rsa -P "" > /dev/null 2>&1
+fi
+
+cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys
+chmod 600 /home/gpadmin/.ssh/authorized_keys
+
+# Add the container's hostname to the known_hosts file to avoid SSH warnings
+ssh-keyscan -t rsa cdw > /home/gpadmin/.ssh/known_hosts 2>/dev/null
+
+# Change to the home directory of the current user
+cd $HOME
+
+# --------------------------------------------------------------------
+# Display a Welcome Banner
+# --------------------------------------------------------------------
+# The following ASCII art and welcome message are displayed when the
+# container starts. This banner provides a visual indication that the
+# container is running in the Apache Cloudberry Build Environment.
+# --------------------------------------------------------------------
+cat <<-'EOF'
+
+======================================================================
+
+                          ++++++++++       ++++++
+                        ++++++++++++++   +++++++
+                       ++++        +++++ ++++
+                      ++++          +++++++++
+                   =+====         =============+
+                 ========       =====+      =====
+                ====  ====     ====           ====
+               ====    ===     ===             ====
+               ====            === ===         ====
+               ====            ===  ==--       ===
+                =====          ===== --       ====
+                 =====================     ======
+                   ============================
+                                     =-----=
+     ____  _                    _  _
+    / ___|| |  ___   _   _   __| || |__    ___  _ __  _ __  _   _
+   | |    | | / _ \ | | | | / _` || '_ \  / _ \| '__|| '__|| | | |
+   | |___ | || (_) || |_| || (_| || |_) ||  __/| |   | |   | |_| |
+    \____||_| \____  \__,_| \__,_||_.__/  \___||_|   |_|    \__, |
+                                                            |___/
+----------------------------------------------------------------------
+
+EOF
+
+# --------------------------------------------------------------------
+# Display System Information
+# --------------------------------------------------------------------
+# The script sources the /etc/os-release file to retrieve the operating
+# system name and version. It then displays the following information:
+# - OS name and version
+# - Current user
+# - Container hostname
+# - IP address
+# - CPU model name and number of cores
+# - Total memory available
+# This information is useful for users to understand the environment they
+# are working in.
+# --------------------------------------------------------------------
+source /etc/os-release
+
+# First, create the CPU info detection function
+get_cpu_info() {
+   ARCH=$(uname -m)
+   if [ "$ARCH" = "x86_64" ]; then
+       lscpu | grep 'Model name:' | awk '{print substr($0, index($0,$3))}'
+   elif [ "$ARCH" = "aarch64" ]; then
+       VENDOR=$(lscpu | grep 'Vendor ID:' | awk '{print $3}')
+       if [ "$VENDOR" = "Apple" ] || [ "$VENDOR" = "0x61" ]; then
+           echo "Apple Silicon ($ARCH)"
+       else
+           if [ -f /proc/cpuinfo ]; then
+               IMPL=$(grep "CPU implementer" /proc/cpuinfo | head -1 | awk '{print $3}')
+               PART=$(grep "CPU part" /proc/cpuinfo | head -1 | awk '{print $3}')
+               if [ ! -z "$IMPL" ] && [ ! -z "$PART" ]; then
+                   echo "ARM $ARCH (Implementer: $IMPL, Part: $PART)"
+               else
+                   echo "ARM $ARCH"
+               fi
+           else
+               echo "ARM $ARCH"
+           fi
+       fi
+   else
+       echo "Unknown architecture: $ARCH"
+   fi
+}
+
+cat <<-EOF
+Welcome to the Apache Cloudberry Build Environment!
+
+Container OS ........ : $NAME $VERSION
+User ................ : $(whoami)
+Container hostname .. : $(hostname)
+IP Address .......... : $(hostname -I | awk '{print $1}')
+CPU Info ............ : $(get_cpu_info)
+CPU(s) .............. : $(nproc)
+Memory .............. : $(free -h | grep Mem: | awk '{print $2}') total
+======================================================================
+
+EOF
+
+# --------------------------------------------------------------------
+# Start an interactive bash shell
+# --------------------------------------------------------------------
+# Finally, the script starts an interactive bash shell to keep the
+# container running and allow the user to interact with the environment.
+# --------------------------------------------------------------------
+/bin/bash
diff --git a/devops/deploy/docker/build/rocky9/tests/requirements.txt b/devops/deploy/docker/build/rocky9/tests/requirements.txt
new file mode 100644
index 00000000000..b9711eddac5
--- /dev/null
+++ b/devops/deploy/docker/build/rocky9/tests/requirements.txt
@@ -0,0 +1,3 @@
+testinfra
+pytest-testinfra
+paramiko
diff --git a/devops/deploy/docker/build/rocky9/tests/testinfra/test_cloudberry_db_env.py b/devops/deploy/docker/build/rocky9/tests/testinfra/test_cloudberry_db_env.py
new file mode 100644
index 00000000000..9da7929ff98
--- /dev/null
+++ b/devops/deploy/docker/build/rocky9/tests/testinfra/test_cloudberry_db_env.py
@@ -0,0 +1,129 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+import testinfra
+
+def test_installed_packages(host):
+    """
+    Test if the essential packages are installed.
+    """
+    packages = [
+        "epel-release",
+        "git",
+        "the_silver_searcher",
+        "bat",
+        "htop",
+        "bison",
+        "cmake",
+        "gcc",
+        "gcc-c++",
+        "glibc-langpack-en",
+        "glibc-locale-source",
+        "openssh-clients",
+        "openssh-server",
+        "sudo",
+        "rsync",
+        "wget",
+        "openssl-devel",
+        "python3-devel",
+        "python3-pytest",
+        "readline-devel",
+        "zlib-devel",
+        "libcurl-devel",
+        "libevent-devel",
+        "libxml2-devel",
+        "libuuid-devel",
+        "libzstd-devel",
+        "lz4",
+        "openldap-devel",
+        "libuv-devel",
+        "libyaml-devel"
+    ]
+    for package in packages:
+        pkg = host.package(package)
+        assert pkg.is_installed
+
+
+def test_user_gpadmin_exists(host):
+    """
+    Test if the gpadmin user exists and is configured properly.
+    """
+    user = host.user("gpadmin")
+    assert user.exists
+    assert "wheel" in user.groups
+
+
+def test_ssh_service(host):
+    """
+    Test if SSH service is configured correctly.
+    """
+    sshd_config = host.file("/etc/ssh/sshd_config")
+    assert sshd_config.exists
+
+
+def test_locale_configured(host):
+    """
+    Test if the locale is configured correctly.
+    """
+    locale_conf = host.file("/etc/locale.conf")
+    assert locale_conf.exists
+    assert locale_conf.contains("LANG=en_US.UTF-8")
+
+
+def test_timezone(host):
+    """
+    Test if the timezone is configured correctly.
+    """
+    localtime = host.file("/etc/localtime")
+    assert localtime.exists
+
+
+def test_system_limits_configured(host):
+    """
+    Test if the custom system limits are applied.
+    """
+    limits_file = host.file("/etc/security/limits.d/90-cbdb-limits")
+    assert limits_file.exists
+
+
+def test_init_system_script(host):
+    """
+    Test if the init_system.sh script is present and executable.
+    """
+    script = host.file("/tmp/init_system.sh")
+    assert script.exists
+    assert script.mode == 0o777
+
+
+def test_custom_configuration_files(host):
+    """
+    Test if custom configuration files are correctly copied.
+    """
+    config_file = host.file("/tmp/90-cbdb-limits")
+    assert config_file.exists
+
+
+def test_locale_generated(host):
+    """
+    Test if the en_US.UTF-8 locale is correctly generated.
+    """
+    locale = host.run("locale -a | grep en_US.utf8")
+    assert locale.exit_status == 0
+    assert "en_US.utf8" in locale.stdout
diff --git a/devops/deploy/docker/build/ubuntu22.04/Dockerfile b/devops/deploy/docker/build/ubuntu22.04/Dockerfile
new file mode 100644
index 00000000000..3023a9fce67
--- /dev/null
+++ b/devops/deploy/docker/build/ubuntu22.04/Dockerfile
@@ -0,0 +1,199 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Apache Cloudberry (incubating) is an effort undergoing incubation at
+# the Apache Software Foundation (ASF), sponsored by the Apache
+# Incubator PMC.
+#
+# Incubation is required of all newly accepted projects until a
+# further review indicates that the infrastructure, communications,
+# and decision making process have stabilized in a manner consistent
+# with other successful ASF projects.
+#
+# While incubation status is not necessarily a reflection of the
+# completeness or stability of the code, it does indicate that the
+# project has yet to be fully endorsed by the ASF.
+#
+# --------------------------------------------------------------------
+# Dockerfile for Apache Cloudberry Base Environment
+# --------------------------------------------------------------------
+# This Dockerfile sets up a Ubuntu jammy 22.04 -based container to serve as
+# a base environment for evaluating the Apache Cloudberry. It installs
+# necessary system utilities, configures the environment for SSH access,
+# and sets up a 'gpadmin' user with sudo privileges. The Apache Cloudberry
+# DEB can be installed into this container for testing and
+# functional verification.
+#
+# Key Features:
+# - Locale setup for en_US.UTF-8
+# - SSH daemon setup for remote access
+# - Essential system utilities installation
+# - Separate user creation and configuration steps
+#
+# Security Considerations:
+# - This Dockerfile prioritizes ease of use for functional testing and
+#   evaluation. It includes configurations such as passwordless sudo access
+#   for the 'gpadmin' user and SSH access with password authentication.
+# - These configurations are suitable for testing and development but
+#   should NOT be used in a production environment due to potential security
+#   risks.
+#
+# Usage:
+#   docker build -t cloudberry-db-base-env .
+#   docker run -h cdw -it cloudberry-db-base-env
+# --------------------------------------------------------------------
+
+FROM ubuntu:22.04
+
+# Argument for configuring the timezone
+ARG TIMEZONE_VAR="Europe/London"
+
+# Environment variables for locale and user
+ENV container=docker
+ENV LANG=en_US.UTF-8
+ENV USER=gpadmin
+ENV TZ=${TIMEZONE_VAR}
+ENV DEBIAN_FRONTEND=noninteractive
+
+# --------------------------------------------------------------------
+# Install Development Tools and Utilities
+# --------------------------------------------------------------------
+
+RUN apt-get update && \
+    apt-get install -y -qq \
+            htop \
+            bat \
+            silversearcher-ag \
+            vim \
+            wget && \
+    apt-get install -y -qq locales && \
+    locale-gen "en_US.UTF-8" && \
+    update-locale LANG="en_US.UTF-8" && \
+    apt-get install -y -qq \
+            bison \
+            build-essential \
+            cmake \
+            dpkg-dev \
+            fakeroot \
+            flex \
+            g++-11 \
+            gcc-11 \
+            gdb \
+            git \
+            iproute2 \
+            iputils-ping \
+            libapr1-dev \
+            libbz2-dev \
+            libcurl4-gnutls-dev \
+            libevent-dev \
+            libipc-run-perl \
+            libkrb5-dev \
+            libldap-dev \
+            liblz4-dev \
+            libpam0g-dev \
+            libperl-dev \
+            libprotobuf-dev \
+            libreadline-dev \
+            libssh2-1-dev \
+            libssl-dev \
+            liburing-dev \
+            libuv1-dev \
+            libxerces-c-dev \
+            libxml2-dev \
+            libyaml-dev \
+            libzstd-dev \
+            lsof \
+            make \
+            openssh-server \
+            pkg-config \
+            protobuf-compiler \
+            python3-distutils \
+            python3-pip \
+            python3-setuptools \
+            python3.10 \
+            python3.10-dev \
+            rsync \
+            sudo \
+            tzdata \
+            zlib1g-dev && \
+    apt-get install -y -qq \
+            ca-certificates-java \
+            cgroup-tools \
+            curl \
+            debhelper \
+            libaprutil1-dev \
+            libcgroup1 \
+            ninja-build \
+            quilt \
+            unzip && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    cd && GO_VERSION="go1.23.4" && \
+    ARCH=$(uname -m) && \
+    if [ "${ARCH}" = "aarch64" ]; then \
+        GO_ARCH="arm64" && \
+        GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \
+    elif [ "${ARCH}" = "x86_64" ]; then \
+        GO_ARCH="amd64" && \
+        GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \
+    else \
+        echo "Unsupported architecture: ${ARCH}" && exit 1; \
+    fi && \
+    GO_URL="https://go.dev/dl/${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    wget -nv "${GO_URL}" && \
+    echo "${GO_SHA256}  ${GO_VERSION}.linux-${GO_ARCH}.tar.gz" | sha256sum -c - && \
+    tar xf "${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    mv go "/usr/local/${GO_VERSION}" && \
+    ln -s "/usr/local/${GO_VERSION}" /usr/local/go && \
+    rm -f "${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \
+    echo 'export PATH=$PATH:/usr/local/go/bin' | tee -a /etc/profile.d/go.sh > /dev/null
+
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 && \
+    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100 && \
+    update-alternatives --install /usr/bin/x86_64-linux-gnu-gcc x86_64-linux-gnu-gcc /usr/bin/gcc-11 100 && \
+    update-alternatives --set gcc /usr/bin/gcc-11 && \
+    update-alternatives --set g++ /usr/bin/g++-11
+
+# --------------------------------------------------------------------
+# Copy Configuration Files and Setup the Environment
+# --------------------------------------------------------------------
+
+COPY ./configs/* /tmp/
+
+RUN cp /tmp/90-cbdb-limits /etc/security/limits.d/90-cbdb-limits && \
+    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
+    echo $TZ > /etc/timezone && \
+    chmod 755 /tmp/init_system.sh && \
+    /usr/sbin/groupadd gpadmin && \
+    /usr/sbin/useradd -m -g gpadmin gpadmin -s /bin/bash && \
+    echo 'gpadmin ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/90-gpadmin && \
+    chmod 0440 /etc/sudoers.d/90-gpadmin && \
+    ssh-keygen -A && \
+    mkdir /var/run/sshd && chmod 0755 /var/run/sshd
+
+# Install testinfra via pip
+RUN pip3 install pytest-testinfra
+
+# Example: Copying test files into the container
+COPY tests /tests
+
+USER gpadmin
+WORKDIR /home/gpadmin
+
+CMD ["bash","-c","/tmp/init_system.sh"]
diff --git a/devops/deploy/docker/build/ubuntu22.04/configs/90-cbdb-limits b/devops/deploy/docker/build/ubuntu22.04/configs/90-cbdb-limits
new file mode 100644
index 00000000000..8ea1d9ed988
--- /dev/null
+++ b/devops/deploy/docker/build/ubuntu22.04/configs/90-cbdb-limits
@@ -0,0 +1,32 @@
+# /etc/security/limits.d/90-db-limits
+ # --------------------------------------------------------------------
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed
+ # with this work for additional information regarding copyright
+ # ownership. The ASF licenses this file to You under the Apache
+ # License, Version 2.0 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of the
+ # License at
+ #
+ #    http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # permissions and limitations under the License.
+ #
+ # --------------------------------------------------------------------
+ 
+ # Core dump file size limits for gpadmin
+ gpadmin soft core unlimited
+ gpadmin hard core unlimited
+ 
+ # Open file limits for gpadmin
+ gpadmin soft nofile 524288
+ gpadmin hard nofile 524288
+ 
+ # Process limits for gpadmin
+ gpadmin soft nproc 131072
+ gpadmin hard nproc 131072
diff --git a/devops/deploy/docker/build/ubuntu22.04/configs/gpinitsystem.conf b/devops/deploy/docker/build/ubuntu22.04/configs/gpinitsystem.conf
new file mode 100644
index 00000000000..d4d312231c5
--- /dev/null
+++ b/devops/deploy/docker/build/ubuntu22.04/configs/gpinitsystem.conf
@@ -0,0 +1,89 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# gpinitsystem Configuration File for Apache Cloudberry
+# --------------------------------------------------------------------
+# This configuration file is used to initialize an Apache Cloudberry
+# cluster. It defines the settings for the coordinator, primary segments,
+# and mirrors, as well as other important configuration options.
+# --------------------------------------------------------------------
+
+# Segment prefix - This prefix is used for naming the segment directories.
+# For example, the primary segment directories will be named gpseg0, gpseg1, etc.
+SEG_PREFIX=gpseg
+
+# Coordinator port - The port number where the coordinator will listen.
+# This is the port used by clients to connect to the database.
+COORDINATOR_PORT=5432
+
+# Coordinator hostname - The hostname of the machine where the coordinator
+# will be running. The $(hostname) command will automatically insert the
+# hostname of the current machine.
+COORDINATOR_HOSTNAME=$(hostname)
+
+# Coordinator data directory - The directory where the coordinator's data
+# will be stored. This directory should have enough space to store metadata
+# and system catalogs.
+COORDINATOR_DIRECTORY=/data1/coordinator
+
+# Base port for primary segments - The starting port number for the primary
+# segments. Each primary segment will use a unique port number starting from
+# this base.
+PORT_BASE=6000
+
+# Primary segment data directories - An array specifying the directories where
+# the primary segment data will be stored. Each directory corresponds to a
+# primary segment. In this case, two primary segments will be created in the
+# same directory.
+declare -a DATA_DIRECTORY=(/data1/primary /data1/primary)
+
+# Base port for mirror segments - The starting port number for the mirror
+# segments. Each mirror segment will use a unique port number starting from
+# this base.
+MIRROR_PORT_BASE=7000
+
+# Mirror segment data directories - An array specifying the directories where
+# the mirror segment data will be stored. Each directory corresponds to a
+# mirror segment. In this case, two mirror segments will be created in the
+# same directory.
+declare -a MIRROR_DATA_DIRECTORY=(/data1/mirror /data1/mirror)
+
+# Trusted shell - The shell program used for remote execution. Cloudberry uses
+# SSH to run commands on other machines in the cluster. 'ssh' is the default.
+TRUSTED_SHELL=ssh
+
+# Database encoding - The character set encoding to be used by the database.
+# 'UNICODE' is a common choice, especially for internationalization.
+ENCODING=UNICODE
+
+# Default database name - The name of the default database to be created during
+# initialization. This is also the default database that the gpadmin user will
+# connect to.
+DATABASE_NAME=gpadmin
+
+# Machine list file - A file containing the list of hostnames where the primary
+# segments will be created. Each line in the file represents a different machine.
+# This file is critical for setting up the cluster across multiple nodes.
+MACHINE_LIST_FILE=/home/gpadmin/hostfile_gpinitsystem
+
+# --------------------------------------------------------------------
+# End of gpinitsystem Configuration File
+# --------------------------------------------------------------------
diff --git a/devops/deploy/docker/build/ubuntu22.04/configs/init_system.sh b/devops/deploy/docker/build/ubuntu22.04/configs/init_system.sh
new file mode 100755
index 00000000000..52a44462c61
--- /dev/null
+++ b/devops/deploy/docker/build/ubuntu22.04/configs/init_system.sh
@@ -0,0 +1,195 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+## Container Initialization Script
+# --------------------------------------------------------------------
+## This script sets up the environment inside the Docker container for
+## the Apache Cloudberry Build Environment. It performs the following
+## tasks:
+##
+## 1. Verifies that the container is running with the expected hostname.
+## 2. Starts the SSH daemon to allow SSH access to the container.
+## 3. Configures passwordless SSH access for the 'gpadmin' user.
+## 4. Displays a welcome banner and system information.
+## 5. Starts an interactive bash shell.
+##
+## This script is intended to be used as an entrypoint or initialization
+## script for the Docker container.
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Check if the hostname is 'cdw'
+# --------------------------------------------------------------------
+# The script checks if the container's hostname is set to 'cdw'. This is
+# a requirement for this environment, and if the hostname does not match,
+# the script will exit with an error message. This ensures consistency
+# across different environments.
+# --------------------------------------------------------------------
+if [ "$(hostname)" != "cdw" ]; then
+    echo "Error: This container must be run with the hostname 'cdw'."
+    echo "Use the following command: docker run -h cdw ..."
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Start SSH daemon and setup for SSH access
+# --------------------------------------------------------------------
+# The SSH daemon is started to allow remote access to the container via
+# SSH. This is useful for development and debugging purposes. If the SSH
+# daemon fails to start, the script exits with an error.
+# --------------------------------------------------------------------
+if ! sudo /usr/sbin/sshd; then
+    echo "Failed to start SSH daemon" >&2
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Remove /run/nologin to allow logins
+# --------------------------------------------------------------------
+# The /run/nologin file, if present, prevents users from logging into
+# the system. This file is removed to ensure that users can log in via SSH.
+# --------------------------------------------------------------------
+sudo rm -rf /run/nologin
+
+# --------------------------------------------------------------------
+# Configure passwordless SSH access for 'gpadmin' user
+# --------------------------------------------------------------------
+# The script sets up SSH key-based authentication for the 'gpadmin' user,
+# allowing passwordless SSH access. It generates a new SSH key pair if one
+# does not already exist, and configures the necessary permissions.
+# --------------------------------------------------------------------
+mkdir -p /home/gpadmin/.ssh
+chmod 700 /home/gpadmin/.ssh
+
+if [ ! -f /home/gpadmin/.ssh/id_rsa ]; then
+    ssh-keygen -t rsa -b 4096 -C gpadmin -f /home/gpadmin/.ssh/id_rsa -P "" > /dev/null 2>&1
+fi
+
+cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys
+chmod 600 /home/gpadmin/.ssh/authorized_keys
+
+# Add the container's hostname to the known_hosts file to avoid SSH warnings
+ssh-keyscan -t rsa cdw > /home/gpadmin/.ssh/known_hosts 2>/dev/null
+
+# Change to the home directory of the current user
+cd $HOME
+
+# --------------------------------------------------------------------
+# Display a Welcome Banner
+# --------------------------------------------------------------------
+# The following ASCII art and welcome message are displayed when the
+# container starts. This banner provides a visual indication that the
+# container is running in the Apache Cloudberry Build Environment.
+# --------------------------------------------------------------------
+cat <<-'EOF'
+
+======================================================================
+
+                          ++++++++++       ++++++
+                        ++++++++++++++   +++++++
+                       ++++        +++++ ++++
+                      ++++          +++++++++
+                   =+====         =============+
+                 ========       =====+      =====
+                ====  ====     ====           ====
+               ====    ===     ===             ====
+               ====            === ===         ====
+               ====            ===  ==--       ===
+                =====          ===== --       ====
+                 =====================     ======
+                   ============================
+                                     =-----=
+     ____  _                    _  _
+    / ___|| |  ___   _   _   __| || |__    ___  _ __  _ __  _   _
+   | |    | | / _ \ | | | | / _` || '_ \  / _ \| '__|| '__|| | | |
+   | |___ | || (_) || |_| || (_| || |_) ||  __/| |   | |   | |_| |
+    \____||_| \____  \__,_| \__,_||_.__/  \___||_|   |_|    \__, |
+                                                            |___/
+----------------------------------------------------------------------
+
+EOF
+
+# --------------------------------------------------------------------
+# Display System Information
+# --------------------------------------------------------------------
+# The script sources the /etc/os-release file to retrieve the operating
+# system name and version. It then displays the following information:
+# - OS name and version
+# - Current user
+# - Container hostname
+# - IP address
+# - CPU model name and number of cores
+# - Total memory available
+# This information is useful for users to understand the environment they
+# are working in.
+# --------------------------------------------------------------------
+source /etc/os-release
+
+# First, create the CPU info detection function
+get_cpu_info() {
+   ARCH=$(uname -m)
+   if [ "$ARCH" = "x86_64" ]; then
+       lscpu | grep 'Model name:' | awk '{print substr($0, index($0,$3))}'
+   elif [ "$ARCH" = "aarch64" ]; then
+       VENDOR=$(lscpu | grep 'Vendor ID:' | awk '{print $3}')
+       if [ "$VENDOR" = "Apple" ] || [ "$VENDOR" = "0x61" ]; then
+           echo "Apple Silicon ($ARCH)"
+       else
+           if [ -f /proc/cpuinfo ]; then
+               IMPL=$(grep "CPU implementer" /proc/cpuinfo | head -1 | awk '{print $3}')
+               PART=$(grep "CPU part" /proc/cpuinfo | head -1 | awk '{print $3}')
+               if [ ! -z "$IMPL" ] && [ ! -z "$PART" ]; then
+                   echo "ARM $ARCH (Implementer: $IMPL, Part: $PART)"
+               else
+                   echo "ARM $ARCH"
+               fi
+           else
+               echo "ARM $ARCH"
+           fi
+       fi
+   else
+       echo "Unknown architecture: $ARCH"
+   fi
+}
+
+cat <<-EOF
+Welcome to the Apache Cloudberry Build Environment!
+
+Container OS ........ : $NAME $VERSION
+User ................ : $(whoami)
+Container hostname .. : $(hostname)
+IP Address .......... : $(hostname -I | awk '{print $1}')
+CPU Info ............ : $(get_cpu_info)
+CPU(s) .............. : $(nproc)
+Memory .............. : $(free -h | grep Mem: | awk '{print $2}') total
+======================================================================
+
+EOF
+
+# Add go to PATH
+source /etc/profile.d/go.sh
+
+# --------------------------------------------------------------------
+# Start an interactive bash shell
+# --------------------------------------------------------------------
+# Finally, the script starts an interactive bash shell to keep the
+# container running and allow the user to interact with the environment.
+# --------------------------------------------------------------------
+/bin/bash
diff --git a/devops/deploy/docker/build/ubuntu22.04/tests/requirements.txt b/devops/deploy/docker/build/ubuntu22.04/tests/requirements.txt
new file mode 100644
index 00000000000..b9711eddac5
--- /dev/null
+++ b/devops/deploy/docker/build/ubuntu22.04/tests/requirements.txt
@@ -0,0 +1,3 @@
+testinfra
+pytest-testinfra
+paramiko
diff --git a/devops/deploy/docker/build/ubuntu22.04/tests/testinfra/test_cloudberry_db_env.py b/devops/deploy/docker/build/ubuntu22.04/tests/testinfra/test_cloudberry_db_env.py
new file mode 100644
index 00000000000..d7f018ab9df
--- /dev/null
+++ b/devops/deploy/docker/build/ubuntu22.04/tests/testinfra/test_cloudberry_db_env.py
@@ -0,0 +1,128 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+import testinfra
+
+def test_installed_packages(host):
+    """
+    Test if the essential packages are installed.
+    """
+    packages = [
+        "bat",
+        "bison",
+        "cmake",
+        "flex",
+        "g++-11",
+        "gcc-11",
+        "git",
+        "htop",
+        "iproute2",
+        "iputils-ping",
+        "libapr1-dev",
+        "libbz2-dev",
+        "libcurl4-gnutls-dev",
+        "libevent-dev",
+        "libipc-run-perl",
+        "libkrb5-dev",
+        "libldap-dev",
+        "liblz4-dev",
+        "libpam0g-dev",
+        "libperl-dev",
+        "libprotobuf-dev",
+        "libreadline-dev",
+        "libssl-dev",
+        "libuv1-dev",
+        "libxerces-c-dev",
+        "libxml2-dev",
+        "libyaml-dev",
+        "libzstd-dev",
+        "locales",
+        "lsof",
+        "make",
+        "openssh-server",
+        "pkg-config",
+        "protobuf-compiler",
+        "python3-distutils",
+        "python3-pip",
+        "python3-setuptools",
+        "python3.10",
+        "python3.10-dev",
+        "rsync",
+        "silversearcher-ag",
+        "sudo",
+        "tzdata",
+        "vim",
+        "wget",
+        "zlib1g-dev"
+    ]
+    for package in packages:
+        pkg = host.package(package)
+        assert pkg.is_installed
+
+
+def test_user_gpadmin_exists(host):
+    """
+    Test if the gpadmin user exists and is configured properly.
+    """
+    user = host.user("gpadmin")
+    assert user.exists
+    assert "gpadmin" in user.groups
+
+
+def test_ssh_service(host):
+    """
+    Test if SSH service is configured correctly.
+    """
+    sshd_config = host.file("/etc/ssh/sshd_config")
+    assert sshd_config.exists
+
+
+def test_timezone(host):
+    """
+    Test if the timezone is configured correctly.
+    """
+    localtime = host.file("/etc/localtime")
+    assert localtime.exists
+
+
+def test_system_limits_configured(host):
+    """
+    Test if the custom system limits are applied.
+    """
+    limits_file = host.file("/etc/security/limits.d/90-cbdb-limits")
+    assert limits_file.exists
+
+
+def test_init_system_script(host):
+    """
+    Test if the init_system.sh script is present and executable.
+    """
+    script = host.file("/tmp/init_system.sh")
+    assert script.exists
+    assert script.mode == 0o755
+
+
+def test_locale_generated(host):
+    """
+    Test if the en_US.UTF-8 locale is correctly generated.
+    """
+    locale = host.run("locale -a | grep en_US.utf8")
+    assert locale.exit_status == 0
+    assert "en_US.utf8" in locale.stdout
diff --git a/devops/deploy/docker/test/rocky8/Dockerfile b/devops/deploy/docker/test/rocky8/Dockerfile
new file mode 100644
index 00000000000..5f6858d41ae
--- /dev/null
+++ b/devops/deploy/docker/test/rocky8/Dockerfile
@@ -0,0 +1,135 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Apache Cloudberry (Incubating) is an effort undergoing incubation at
+# the Apache Software Foundation (ASF), sponsored by the Apache
+# Incubator PMC.
+#
+# Incubation is required of all newly accepted projects until a
+# further review indicates that the infrastructure, communications,
+# and decision making process have stabilized in a manner consistent
+# with other successful ASF projects.
+#
+# While incubation status is not necessarily a reflection of the
+# completeness or stability of the code, it does indicate that the
+# project has yet to be fully endorsed by the ASF.
+#
+# --------------------------------------------------------------------
+# Dockerfile for Apache Cloudberry Base Environment
+# --------------------------------------------------------------------
+# This Dockerfile sets up a Rocky Linux 8-based container to serve as
+# a base environment for evaluating Apache Cloudberry. It installs
+# necessary system utilities, configures the environment for SSH access,
+# and sets up a 'gpadmin' user with sudo privileges. The Apache
+# Cloudberry RPM can be installed into this container for testing and
+# functional verification.
+#
+# Key Features:
+# - Locale setup for en_US.UTF-8
+# - SSH daemon setup for remote access
+# - Essential system utilities installation
+# - Separate user creation and configuration steps
+#
+# Security Considerations:
+# - This Dockerfile prioritizes ease of use for functional testing and
+#   evaluation. It includes configurations such as passwordless sudo access
+#   for the 'gpadmin' user and SSH access with password authentication.
+# - These configurations are suitable for testing and development but
+#   should NOT be used in a production environment due to potential security
+#   risks.
+#
+# Usage:
+#   docker build -t cloudberry-db-base-env .
+#   docker run -h cdw -it cloudberry-db-base-env
+# --------------------------------------------------------------------
+
+# Base image: Rocky Linux 8
+FROM rockylinux/rockylinux:8
+
+# Argument for configuring the timezone
+ARG TIMEZONE_VAR="America/Los_Angeles"
+
+# Environment variables for locale
+ENV LANG=en_US.UTF-8
+
+# --------------------------------------------------------------------
+# System Update and Installation
+# --------------------------------------------------------------------
+# Update the system and install essential system utilities required for
+# running and testing Apache Cloudberry. Cleanup the DNF cache afterward
+# to reduce the image size.
+# --------------------------------------------------------------------
+RUN dnf install -y \
+        file \
+        gdb \
+        glibc-locale-source \
+        make \
+        openssh \
+        openssh-clients \
+        openssh-server \
+        procps-ng \
+        sudo \
+        which \
+        && \
+    dnf clean all  # Clean up DNF cache after package installations
+
+# --------------------------------------------------------------------
+# User Creation and Configuration
+# --------------------------------------------------------------------
+# - Create the 'gpadmin' user and group.
+# - Configure the 'gpadmin' user with passwordless sudo privileges.
+# - Add Cloudberry-specific entries to the gpadmin's .bashrc.
+# --------------------------------------------------------------------
+RUN /usr/sbin/groupadd gpadmin && \
+    /usr/sbin/useradd gpadmin -g gpadmin -G wheel && \
+    echo 'gpadmin ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/90-gpadmin && \
+    echo -e '\n# Add Cloudberry entries\nif [ -f /usr/local/cloudberry/cloudberry-env.sh ]; then\n  source /usr/local/cloudberry/cloudberry-env.sh\n  export COORDINATOR_DATA_DIRECTORY=/data1/coordinator/gpseg-1\nfi' >> /home/gpadmin/.bashrc
+
+# --------------------------------------------------------------------
+# Copy Configuration Files and Setup the Environment
+# --------------------------------------------------------------------
+# - Copy custom configuration files from the build context to /tmp/.
+# - Apply custom system limits and timezone.
+# - Set up SSH for password-based authentication.
+# - Generate locale and set the default locale to en_US.UTF-8.
+# --------------------------------------------------------------------
+COPY ./configs/* /tmp/
+
+RUN cp /tmp/90-cbdb-limits /etc/security/limits.d/90-cbdb-limits && \
+    sed -i.bak -r 's/^(session\s+required\s+pam_limits.so)/#\1/' /etc/pam.d/* && \
+    cat /usr/share/zoneinfo/${TIMEZONE_VAR} > /etc/localtime && \
+    chmod 777 /tmp/init_system.sh && \
+    setcap cap_net_raw+ep /usr/bin/ping && \
+    ssh-keygen -A && \
+    echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config && \
+    localedef -i en_US -f UTF-8 en_US.UTF-8 && \
+    echo "LANG=en_US.UTF-8" | tee /etc/locale.conf
+
+# --------------------------------------------------------------------
+# Set the Default User and Command
+# --------------------------------------------------------------------
+# The default user is set to 'gpadmin', and the container starts by
+# running the init_system.sh script. This container serves as a base
+# environment, and the Apache Cloudberry RPM can be installed for
+# testing and functional verification.
+# --------------------------------------------------------------------
+USER gpadmin
+
+CMD ["bash","-c","/tmp/init_system.sh"]
diff --git a/devops/deploy/docker/test/rocky8/configs/90-cbdb-limits b/devops/deploy/docker/test/rocky8/configs/90-cbdb-limits
new file mode 100644
index 00000000000..474957c42f6
--- /dev/null
+++ b/devops/deploy/docker/test/rocky8/configs/90-cbdb-limits
@@ -0,0 +1,32 @@
+# /etc/security/limits.d/90-db-limits
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+# Core dump file size limits for gpadmin
+gpadmin soft core unlimited
+gpadmin hard core unlimited
+
+# Open file limits for gpadmin
+gpadmin soft nofile 524288
+gpadmin hard nofile 524288
+
+# Process limits for gpadmin
+gpadmin soft nproc 131072
+gpadmin hard nproc 131072
diff --git a/devops/deploy/docker/test/rocky8/configs/gpinitsystem.conf b/devops/deploy/docker/test/rocky8/configs/gpinitsystem.conf
new file mode 100644
index 00000000000..2676929523b
--- /dev/null
+++ b/devops/deploy/docker/test/rocky8/configs/gpinitsystem.conf
@@ -0,0 +1,87 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# gpinitsystem Configuration File for Apache Cloudberry
+# --------------------------------------------------------------------
+# This configuration file is used to initialize a Apache Cloudberry
+# cluster. It defines the settings for the coordinator, primary segments,
+# and mirrors, as well as other important configuration options.
+# --------------------------------------------------------------------
+
+# Segment prefix - This prefix is used for naming the segment directories.
+# For example, the primary segment directories will be named gpseg0, gpseg1, etc.
+SEG_PREFIX=gpseg
+
+# Coordinator port - The port number where the coordinator will listen.
+# This is the port used by clients to connect to the database.
+COORDINATOR_PORT=5432
+
+# Coordinator hostname - The hostname of the machine where the coordinator
+# will be running. The $(hostname) command will automatically insert the
+# hostname of the current machine.
+COORDINATOR_HOSTNAME=$(hostname)
+
+# Coordinator data directory - The directory where the coordinator's data
+# will be stored. This directory should have enough space to store metadata
+# and system catalogs.
+COORDINATOR_DIRECTORY=/data1/coordinator
+
+# Base port for primary segments - The starting port number for the primary
+# segments. Each primary segment will use a unique port number starting from
+# this base.
+PORT_BASE=6000
+
+# Primary segment data directories - An array specifying the directories where
+# the primary segment data will be stored. Each directory corresponds to a
+# primary segment. In this case, two primary segments will be created in the
+# same directory.
+declare -a DATA_DIRECTORY=(/data1/primary /data1/primary)
+
+# Base port for mirror segments - The starting port number for the mirror
+# segments. Each mirror segment will use a unique port number starting from
+# this base.
+MIRROR_PORT_BASE=7000
+
+# Mirror segment data directories - An array specifying the directories where
+# the mirror segment data will be stored. Each directory corresponds to a
+# mirror segment. In this case, two mirror segments will be created in the
+# same directory.
+declare -a MIRROR_DATA_DIRECTORY=(/data1/mirror /data1/mirror)
+
+# Trusted shell - The shell program used for remote execution. Cloudberry uses
+# SSH to run commands on other machines in the cluster. 'ssh' is the default.
+TRUSTED_SHELL=ssh
+
+# Database encoding - The character set encoding to be used by the database.
+# 'UNICODE' is a common choice, especially for internationalization.
+ENCODING=UNICODE
+
+# Default database name - The name of the default database to be created during
+# initialization. This is also the default database that the gpadmin user will
+# connect to.
+DATABASE_NAME=gpadmin
+
+# Machine list file - A file containing the list of hostnames where the primary
+# segments will be created. Each line in the file represents a different machine.
+# This file is critical for setting up the cluster across multiple nodes.
+MACHINE_LIST_FILE=/home/gpadmin/hostfile_gpinitsystem
+
+# --------------------------------------------------------------------
+# End of gpinitsystem Configuration File
+# --------------------------------------------------------------------
diff --git a/devops/deploy/docker/test/rocky8/configs/init_system.sh b/devops/deploy/docker/test/rocky8/configs/init_system.sh
new file mode 100755
index 00000000000..3ea7e34b0ff
--- /dev/null
+++ b/devops/deploy/docker/test/rocky8/configs/init_system.sh
@@ -0,0 +1,221 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# Container Initialization Script
+# --------------------------------------------------------------------
+# This script sets up the environment inside the Docker container for
+# the Apache Cloudberry Build Environment. It performs the following
+# tasks:
+#
+# 1. Verifies that the container is running with the expected hostname.
+# 2. Starts the SSH daemon to allow SSH access to the container.
+# 3. Configures passwordless SSH access for the 'gpadmin' user.
+# 4. Sets up the necessary directories and configuration files for
+#    Apache Cloudberry.
+# 5. Displays a welcome banner and system information.
+# 6. Starts an interactive bash shell.
+#
+# This script is intended to be used as an entrypoint or initialization
+# script for the Docker container.
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Check if the hostname is 'cdw'
+# --------------------------------------------------------------------
+# The script checks if the container's hostname is set to 'cdw'. This is
+# a requirement for this environment, and if the hostname does not match,
+# the script will exit with an error message. This ensures consistency
+# across different environments.
+# --------------------------------------------------------------------
+if [ "$(hostname)" != "cdw" ]; then
+    echo "Error: This container must be run with the hostname 'cdw'."
+    echo "Use the following command: docker run -h cdw ..."
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Start SSH daemon and setup for SSH access
+# --------------------------------------------------------------------
+# The SSH daemon is started to allow remote access to the container via
+# SSH. This is useful for development and debugging purposes. If the SSH
+# daemon fails to start, the script exits with an error.
+# --------------------------------------------------------------------
+if ! sudo /usr/sbin/sshd; then
+    echo "Failed to start SSH daemon" >&2
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Remove /run/nologin to allow logins
+# --------------------------------------------------------------------
+# The /run/nologin file, if present, prevents users from logging into
+# the system. This file is removed to ensure that users can log in via SSH.
+# --------------------------------------------------------------------
+sudo rm -rf /run/nologin
+
+# --------------------------------------------------------------------
+# Configure passwordless SSH access for 'gpadmin' user
+# --------------------------------------------------------------------
+# The script sets up SSH key-based authentication for the 'gpadmin' user,
+# allowing passwordless SSH access. It generates a new SSH key pair if one
+# does not already exist, and configures the necessary permissions.
+# --------------------------------------------------------------------
+mkdir -p /home/gpadmin/.ssh
+chmod 700 /home/gpadmin/.ssh
+
+if [ ! -f /home/gpadmin/.ssh/id_rsa ]; then
+    ssh-keygen -t rsa -b 4096 -C gpadmin -f /home/gpadmin/.ssh/id_rsa -P "" > /dev/null 2>&1
+fi
+
+cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys
+chmod 600 /home/gpadmin/.ssh/authorized_keys
+
+# Add the container's hostname to the known_hosts file to avoid SSH warnings
+ssh-keyscan -t rsa cdw > /home/gpadmin/.ssh/known_hosts 2>/dev/null
+
+# --------------------------------------------------------------------
+# Cloudberry Data Directories Setup
+# --------------------------------------------------------------------
+# The script sets up the necessary directories for Apache Cloudberry,
+# including directories for the coordinator, standby coordinator, primary
+# segments, and mirror segments. It also sets up the configuration files
+# required for initializing the database.
+# --------------------------------------------------------------------
+sudo rm -rf /data1/*
+sudo mkdir -p /data1/coordinator /data1/standby_coordinator /data1/primary /data1/mirror
+sudo chown -R gpadmin.gpadmin /data1
+
+# Copy the gpinitsystem configuration file to the home directory
+cp /tmp/gpinitsystem.conf /home/gpadmin
+
+# Set up the hostfile for cluster initialization
+echo $(hostname) > /home/gpadmin/hostfile_gpinitsystem
+
+# Change to the home directory of the current user
+cd $HOME
+
+# --------------------------------------------------------------------
+# Display a Welcome Banner
+# --------------------------------------------------------------------
+# The following ASCII art and welcome message are displayed when the
+# container starts. This banner provides a visual indication that the
+# container is running in the Apache Cloudberry Build Environment.
+# --------------------------------------------------------------------
+cat <<-'EOF'
+
+======================================================================
+
+                          ++++++++++       ++++++
+                        ++++++++++++++   +++++++
+                       ++++        +++++ ++++
+                      ++++          +++++++++
+                   =+====         =============+
+                 ========       =====+      =====
+                ====  ====     ====           ====
+               ====    ===     ===             ====
+               ====            === ===         ====
+               ====            ===  ==--       ===
+                =====          ===== --       ====
+                 =====================     ======
+                   ============================
+                                     =-----=
+     ____  _                    _  _
+    / ___|| |  ___   _   _   __| || |__    ___  _ __  _ __  _   _
+   | |    | | / _ \ | | | | / _` || '_ \  / _ \| '__|| '__|| | | |
+   | |___ | || (_) || |_| || (_| || |_) ||  __/| |   | |   | |_| |
+    \____||_| \____  \__,_| \__,_||_.__/  \___||_|   |_|    \__, |
+                                                            |___/
+----------------------------------------------------------------------
+
+EOF
+
+# --------------------------------------------------------------------
+# Display System Information
+# --------------------------------------------------------------------
+# The script sources the /etc/os-release file to retrieve the operating
+# system name and version. It then displays the following information:
+# - OS name and version
+# - Current user
+# - Container hostname
+# - IP address
+# - CPU model name and number of cores
+# - Total memory available
+# - Cloudberry version (if installed)
+# This information is useful for users to understand the environment they
+# are working in.
+# --------------------------------------------------------------------
+source /etc/os-release
+
+# First, create the CPU info detection function
+get_cpu_info() {
+   ARCH=$(uname -m)
+   if [ "$ARCH" = "x86_64" ]; then
+       lscpu | grep 'Model name:' | awk '{print substr($0, index($0,$3))}'
+   elif [ "$ARCH" = "aarch64" ]; then
+       VENDOR=$(lscpu | grep 'Vendor ID:' | awk '{print $3}')
+       if [ "$VENDOR" = "Apple" ] || [ "$VENDOR" = "0x61" ]; then
+           echo "Apple Silicon ($ARCH)"
+       else
+           if [ -f /proc/cpuinfo ]; then
+               IMPL=$(grep "CPU implementer" /proc/cpuinfo | head -1 | awk '{print $3}')
+               PART=$(grep "CPU part" /proc/cpuinfo | head -1 | awk '{print $3}')
+               if [ ! -z "$IMPL" ] && [ ! -z "$PART" ]; then
+                   echo "ARM $ARCH (Implementer: $IMPL, Part: $PART)"
+               else
+                   echo "ARM $ARCH"
+               fi
+           else
+               echo "ARM $ARCH"
+           fi
+       fi
+   else
+       echo "Unknown architecture: $ARCH"
+   fi
+}
+
+# Check if Apache Cloudberry is installed and display its version
+if rpm -q apache-cloudberry-db-incubating > /dev/null 2>&1; then
+    CBDB_VERSION=$(/usr/local/cbdb/bin/postgres --gp-version)
+else
+    CBDB_VERSION="Not installed"
+fi
+
+cat <<-EOF
+Welcome to the Apache Cloudberry Test Environment!
+
+Cloudberry version .. : $CBDB_VERSION
+Container OS ........ : $NAME $VERSION
+User ................ : $(whoami)
+Container hostname .. : $(hostname)
+IP Address .......... : $(hostname -I | awk '{print $1}')
+CPU Info ............ : $(get_cpu_info)
+CPU(s) .............. : $(nproc)
+Memory .............. : $(free -h | grep Mem: | awk '{print $2}') total
+======================================================================
+
+EOF
+
+# --------------------------------------------------------------------
+# Start an interactive bash shell
+# --------------------------------------------------------------------
+# Finally, the script starts an interactive bash shell to keep the
+# container running and allow the user to interact with the environment.
+# --------------------------------------------------------------------
+/bin/bash
diff --git a/devops/deploy/docker/test/rocky9/Dockerfile b/devops/deploy/docker/test/rocky9/Dockerfile
new file mode 100644
index 00000000000..f5e1e3fbee3
--- /dev/null
+++ b/devops/deploy/docker/test/rocky9/Dockerfile
@@ -0,0 +1,135 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Apache Cloudberry (Incubating) is an effort undergoing incubation at
+# the Apache Software Foundation (ASF), sponsored by the Apache
+# Incubator PMC.
+#
+# Incubation is required of all newly accepted projects until a
+# further review indicates that the infrastructure, communications,
+# and decision making process have stabilized in a manner consistent
+# with other successful ASF projects.
+#
+# While incubation status is not necessarily a reflection of the
+# completeness or stability of the code, it does indicate that the
+# project has yet to be fully endorsed by the ASF.
+#
+# --------------------------------------------------------------------
+# Dockerfile for Apache Cloudberry Base Environment
+# --------------------------------------------------------------------
+# This Dockerfile sets up a Rocky Linux 9-based container to serve as
+# a base environment for evaluating the Apache Cloudberry. It installs
+# necessary system utilities, configures the environment for SSH access,
+# and sets up a 'gpadmin' user with sudo privileges. The Cloudberry
+# Database RPM can be installed into this container for testing and
+# functional verification.
+#
+# Key Features:
+# - Locale setup for en_US.UTF-8
+# - SSH daemon setup for remote access
+# - Essential system utilities installation
+# - Separate user creation and configuration steps
+#
+# Security Considerations:
+# - This Dockerfile prioritizes ease of use for functional testing and
+#   evaluation. It includes configurations such as passwordless sudo access
+#   for the 'gpadmin' user and SSH access with password authentication.
+# - These configurations are suitable for testing and development but
+#   should NOT be used in a production environment due to potential security
+#   risks.
+#
+# Usage:
+#   docker build -t cloudberry-db-base-env .
+#   docker run -h cdw -it cloudberry-db-base-env
+# --------------------------------------------------------------------
+
+# Base image: Rocky Linux 9
+FROM rockylinux/rockylinux:9
+
+# Argument for configuring the timezone
+ARG TIMEZONE_VAR="America/Los_Angeles"
+
+# Environment variables for locale
+ENV LANG=en_US.UTF-8
+
+# --------------------------------------------------------------------
+# System Update and Installation
+# --------------------------------------------------------------------
+# Update the system and install essential system utilities required for
+# running and testing Apache Cloudberry. Cleanup the DNF cache afterward
+# to reduce the image size.
+# --------------------------------------------------------------------
+RUN dnf install -y \
+        file \
+        gdb \
+        glibc-locale-source \
+        make \
+        openssh \
+        openssh-clients \
+        openssh-server \
+        procps-ng \
+        sudo \
+        which \
+        && \
+    dnf clean all  # Clean up DNF cache after package installations
+
+# --------------------------------------------------------------------
+# User Creation and Configuration
+# --------------------------------------------------------------------
+# - Create the 'gpadmin' user and group.
+# - Configure the 'gpadmin' user with passwordless sudo privileges.
+# - Add Cloudberry-specific entries to the gpadmin's .bashrc.
+# --------------------------------------------------------------------
+RUN /usr/sbin/groupadd gpadmin && \
+    /usr/sbin/useradd gpadmin -g gpadmin -G wheel && \
+    echo 'gpadmin ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/90-gpadmin && \
+    echo -e '\n# Add Cloudberry entries\nif [ -f /usr/local/cloudberry/cloudberry-env.sh ]; then\n  source /usr/local/cloudberry/cloudberry-env.sh\n  export COORDINATOR_DATA_DIRECTORY=/data1/coordinator/gpseg-1\nfi' >> /home/gpadmin/.bashrc
+
+# --------------------------------------------------------------------
+# Copy Configuration Files and Setup the Environment
+# --------------------------------------------------------------------
+# - Copy custom configuration files from the build context to /tmp/.
+# - Apply custom system limits and timezone.
+# - Set up SSH for password-based authentication.
+# - Generate locale and set the default locale to en_US.UTF-8.
+# --------------------------------------------------------------------
+COPY ./configs/* /tmp/
+
+RUN cp /tmp/90-cbdb-limits /etc/security/limits.d/90-cbdb-limits && \
+    sed -i.bak -r 's/^(session\s+required\s+pam_limits.so)/#\1/' /etc/pam.d/* && \
+    cat /usr/share/zoneinfo/${TIMEZONE_VAR} > /etc/localtime && \
+    chmod 777 /tmp/init_system.sh && \
+    setcap cap_net_raw+ep /usr/bin/ping && \
+    ssh-keygen -A && \
+    echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config && \
+    localedef -i en_US -f UTF-8 en_US.UTF-8 && \
+    echo "LANG=en_US.UTF-8" | tee /etc/locale.conf
+
+# --------------------------------------------------------------------
+# Set the Default User and Command
+# --------------------------------------------------------------------
+# The default user is set to 'gpadmin', and the container starts by
+# running the init_system.sh script. This container serves as a base
+# environment, and the Apache Cloudberry RPM can be installed for
+# testing and functional verification.
+# --------------------------------------------------------------------
+USER gpadmin
+
+CMD ["bash","-c","/tmp/init_system.sh"]
diff --git a/devops/deploy/docker/test/rocky9/configs/90-cbdb-limits b/devops/deploy/docker/test/rocky9/configs/90-cbdb-limits
new file mode 100644
index 00000000000..474957c42f6
--- /dev/null
+++ b/devops/deploy/docker/test/rocky9/configs/90-cbdb-limits
@@ -0,0 +1,32 @@
+# /etc/security/limits.d/90-db-limits
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+# Core dump file size limits for gpadmin
+gpadmin soft core unlimited
+gpadmin hard core unlimited
+
+# Open file limits for gpadmin
+gpadmin soft nofile 524288
+gpadmin hard nofile 524288
+
+# Process limits for gpadmin
+gpadmin soft nproc 131072
+gpadmin hard nproc 131072
diff --git a/devops/deploy/docker/test/rocky9/configs/gpinitsystem.conf b/devops/deploy/docker/test/rocky9/configs/gpinitsystem.conf
new file mode 100644
index 00000000000..bb8f38d4f2d
--- /dev/null
+++ b/devops/deploy/docker/test/rocky9/configs/gpinitsystem.conf
@@ -0,0 +1,87 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# ----------------------------------------------------------------------
+# gpinitsystem Configuration File for Apache Cloudberry
+# ----------------------------------------------------------------------
+# This configuration file is used to initialize a Apache Cloudberry
+# cluster. It defines the settings for the coordinator, primary segments,
+# and mirrors, as well as other important configuration options.
+# ----------------------------------------------------------------------
+
+# Segment prefix - This prefix is used for naming the segment directories.
+# For example, the primary segment directories will be named gpseg0, gpseg1, etc.
+SEG_PREFIX=gpseg
+
+# Coordinator port - The port number where the coordinator will listen.
+# This is the port used by clients to connect to the database.
+COORDINATOR_PORT=5432
+
+# Coordinator hostname - The hostname of the machine where the coordinator
+# will be running. The $(hostname) command will automatically insert the
+# hostname of the current machine.
+COORDINATOR_HOSTNAME=$(hostname)
+
+# Coordinator data directory - The directory where the coordinator's data
+# will be stored. This directory should have enough space to store metadata
+# and system catalogs.
+COORDINATOR_DIRECTORY=/data1/coordinator
+
+# Base port for primary segments - The starting port number for the primary
+# segments. Each primary segment will use a unique port number starting from
+# this base.
+PORT_BASE=6000
+
+# Primary segment data directories - An array specifying the directories where
+# the primary segment data will be stored. Each directory corresponds to a
+# primary segment. In this case, two primary segments will be created in the
+# same directory.
+declare -a DATA_DIRECTORY=(/data1/primary /data1/primary)
+
+# Base port for mirror segments - The starting port number for the mirror
+# segments. Each mirror segment will use a unique port number starting from
+# this base.
+MIRROR_PORT_BASE=7000
+
+# Mirror segment data directories - An array specifying the directories where
+# the mirror segment data will be stored. Each directory corresponds to a
+# mirror segment. In this case, two mirror segments will be created in the
+# same directory.
+declare -a MIRROR_DATA_DIRECTORY=(/data1/mirror /data1/mirror)
+
+# Trusted shell - The shell program used for remote execution. Cloudberry uses
+# SSH to run commands on other machines in the cluster. 'ssh' is the default.
+TRUSTED_SHELL=ssh
+
+# Database encoding - The character set encoding to be used by the database.
+# 'UNICODE' is a common choice, especially for internationalization.
+ENCODING=UNICODE
+
+# Default database name - The name of the default database to be created during
+# initialization. This is also the default database that the gpadmin user will
+# connect to.
+DATABASE_NAME=gpadmin
+
+# Machine list file - A file containing the list of hostnames where the primary
+# segments will be created. Each line in the file represents a different machine.
+# This file is critical for setting up the cluster across multiple nodes.
+MACHINE_LIST_FILE=/home/gpadmin/hostfile_gpinitsystem
+
+# ----------------------------------------------------------------------
+# End of gpinitsystem Configuration File
+# ----------------------------------------------------------------------
diff --git a/devops/deploy/docker/test/rocky9/configs/init_system.sh b/devops/deploy/docker/test/rocky9/configs/init_system.sh
new file mode 100755
index 00000000000..3ea7e34b0ff
--- /dev/null
+++ b/devops/deploy/docker/test/rocky9/configs/init_system.sh
@@ -0,0 +1,221 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# Container Initialization Script
+# --------------------------------------------------------------------
+# This script sets up the environment inside the Docker container for
+# the Apache Cloudberry Build Environment. It performs the following
+# tasks:
+#
+# 1. Verifies that the container is running with the expected hostname.
+# 2. Starts the SSH daemon to allow SSH access to the container.
+# 3. Configures passwordless SSH access for the 'gpadmin' user.
+# 4. Sets up the necessary directories and configuration files for
+#    Apache Cloudberry.
+# 5. Displays a welcome banner and system information.
+# 6. Starts an interactive bash shell.
+#
+# This script is intended to be used as an entrypoint or initialization
+# script for the Docker container.
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Check if the hostname is 'cdw'
+# --------------------------------------------------------------------
+# The script checks if the container's hostname is set to 'cdw'. This is
+# a requirement for this environment, and if the hostname does not match,
+# the script will exit with an error message. This ensures consistency
+# across different environments.
+# --------------------------------------------------------------------
+if [ "$(hostname)" != "cdw" ]; then
+    echo "Error: This container must be run with the hostname 'cdw'."
+    echo "Use the following command: docker run -h cdw ..."
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Start SSH daemon and setup for SSH access
+# --------------------------------------------------------------------
+# The SSH daemon is started to allow remote access to the container via
+# SSH. This is useful for development and debugging purposes. If the SSH
+# daemon fails to start, the script exits with an error.
+# --------------------------------------------------------------------
+if ! sudo /usr/sbin/sshd; then
+    echo "Failed to start SSH daemon" >&2
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Remove /run/nologin to allow logins
+# --------------------------------------------------------------------
+# The /run/nologin file, if present, prevents users from logging into
+# the system. This file is removed to ensure that users can log in via SSH.
+# --------------------------------------------------------------------
+sudo rm -rf /run/nologin
+
+# --------------------------------------------------------------------
+# Configure passwordless SSH access for 'gpadmin' user
+# --------------------------------------------------------------------
+# The script sets up SSH key-based authentication for the 'gpadmin' user,
+# allowing passwordless SSH access. It generates a new SSH key pair if one
+# does not already exist, and configures the necessary permissions.
+# --------------------------------------------------------------------
+mkdir -p /home/gpadmin/.ssh
+chmod 700 /home/gpadmin/.ssh
+
+if [ ! -f /home/gpadmin/.ssh/id_rsa ]; then
+    ssh-keygen -t rsa -b 4096 -C gpadmin -f /home/gpadmin/.ssh/id_rsa -P "" > /dev/null 2>&1
+fi
+
+cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys
+chmod 600 /home/gpadmin/.ssh/authorized_keys
+
+# Add the container's hostname to the known_hosts file to avoid SSH warnings
+ssh-keyscan -t rsa cdw > /home/gpadmin/.ssh/known_hosts 2>/dev/null
+
+# --------------------------------------------------------------------
+# Cloudberry Data Directories Setup
+# --------------------------------------------------------------------
+# The script sets up the necessary directories for Apache Cloudberry,
+# including directories for the coordinator, standby coordinator, primary
+# segments, and mirror segments. It also sets up the configuration files
+# required for initializing the database.
+# --------------------------------------------------------------------
+sudo rm -rf /data1/*
+sudo mkdir -p /data1/coordinator /data1/standby_coordinator /data1/primary /data1/mirror
+sudo chown -R gpadmin.gpadmin /data1
+
+# Copy the gpinitsystem configuration file to the home directory
+cp /tmp/gpinitsystem.conf /home/gpadmin
+
+# Set up the hostfile for cluster initialization
+echo $(hostname) > /home/gpadmin/hostfile_gpinitsystem
+
+# Change to the home directory of the current user
+cd $HOME
+
+# --------------------------------------------------------------------
+# Display a Welcome Banner
+# --------------------------------------------------------------------
+# The following ASCII art and welcome message are displayed when the
+# container starts. This banner provides a visual indication that the
+# container is running in the Apache Cloudberry Build Environment.
+# --------------------------------------------------------------------
+cat <<-'EOF'
+
+======================================================================
+
+                          ++++++++++       ++++++
+                        ++++++++++++++   +++++++
+                       ++++        +++++ ++++
+                      ++++          +++++++++
+                   =+====         =============+
+                 ========       =====+      =====
+                ====  ====     ====           ====
+               ====    ===     ===             ====
+               ====            === ===         ====
+               ====            ===  ==--       ===
+                =====          ===== --       ====
+                 =====================     ======
+                   ============================
+                                     =-----=
+     ____  _                    _  _
+    / ___|| |  ___   _   _   __| || |__    ___  _ __  _ __  _   _
+   | |    | | / _ \ | | | | / _` || '_ \  / _ \| '__|| '__|| | | |
+   | |___ | || (_) || |_| || (_| || |_) ||  __/| |   | |   | |_| |
+    \____||_| \____  \__,_| \__,_||_.__/  \___||_|   |_|    \__, |
+                                                            |___/
+----------------------------------------------------------------------
+
+EOF
+
+# --------------------------------------------------------------------
+# Display System Information
+# --------------------------------------------------------------------
+# The script sources the /etc/os-release file to retrieve the operating
+# system name and version. It then displays the following information:
+# - OS name and version
+# - Current user
+# - Container hostname
+# - IP address
+# - CPU model name and number of cores
+# - Total memory available
+# - Cloudberry version (if installed)
+# This information is useful for users to understand the environment they
+# are working in.
+# --------------------------------------------------------------------
+source /etc/os-release
+
+# First, create the CPU info detection function
+get_cpu_info() {
+   ARCH=$(uname -m)
+   if [ "$ARCH" = "x86_64" ]; then
+       lscpu | grep 'Model name:' | awk '{print substr($0, index($0,$3))}'
+   elif [ "$ARCH" = "aarch64" ]; then
+       VENDOR=$(lscpu | grep 'Vendor ID:' | awk '{print $3}')
+       if [ "$VENDOR" = "Apple" ] || [ "$VENDOR" = "0x61" ]; then
+           echo "Apple Silicon ($ARCH)"
+       else
+           if [ -f /proc/cpuinfo ]; then
+               IMPL=$(grep "CPU implementer" /proc/cpuinfo | head -1 | awk '{print $3}')
+               PART=$(grep "CPU part" /proc/cpuinfo | head -1 | awk '{print $3}')
+               if [ ! -z "$IMPL" ] && [ ! -z "$PART" ]; then
+                   echo "ARM $ARCH (Implementer: $IMPL, Part: $PART)"
+               else
+                   echo "ARM $ARCH"
+               fi
+           else
+               echo "ARM $ARCH"
+           fi
+       fi
+   else
+       echo "Unknown architecture: $ARCH"
+   fi
+}
+
+# Check if Apache Cloudberry is installed and display its version
+if rpm -q apache-cloudberry-db-incubating > /dev/null 2>&1; then
+    CBDB_VERSION=$(/usr/local/cbdb/bin/postgres --gp-version)
+else
+    CBDB_VERSION="Not installed"
+fi
+
+cat <<-EOF
+Welcome to the Apache Cloudberry Test Environment!
+
+Cloudberry version .. : $CBDB_VERSION
+Container OS ........ : $NAME $VERSION
+User ................ : $(whoami)
+Container hostname .. : $(hostname)
+IP Address .......... : $(hostname -I | awk '{print $1}')
+CPU Info ............ : $(get_cpu_info)
+CPU(s) .............. : $(nproc)
+Memory .............. : $(free -h | grep Mem: | awk '{print $2}') total
+======================================================================
+
+EOF
+
+# --------------------------------------------------------------------
+# Start an interactive bash shell
+# --------------------------------------------------------------------
+# Finally, the script starts an interactive bash shell to keep the
+# container running and allow the user to interact with the environment.
+# --------------------------------------------------------------------
+/bin/bash
diff --git a/devops/deploy/docker/test/ubuntu22.04/Dockerfile b/devops/deploy/docker/test/ubuntu22.04/Dockerfile
new file mode 100644
index 00000000000..70c0f26be90
--- /dev/null
+++ b/devops/deploy/docker/test/ubuntu22.04/Dockerfile
@@ -0,0 +1,140 @@
+
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+#
+# Apache Cloudberry (incubating) is an effort undergoing incubation at
+# the Apache Software Foundation (ASF), sponsored by the Apache
+# Incubator PMC.
+#
+# Incubation is required of all newly accepted projects until a
+# further review indicates that the infrastructure, communications,
+# and decision making process have stabilized in a manner consistent
+# with other successful ASF projects.
+#
+# While incubation status is not necessarily a reflection of the
+# completeness or stability of the code, it does indicate that the
+# project has yet to be fully endorsed by the ASF.
+#
+# --------------------------------------------------------------------
+# Dockerfile for Apache Cloudberry Base Environment
+# --------------------------------------------------------------------
+# This Dockerfile sets up a Ubuntu jammy 22.04 -based container to serve as
+# a base environment for evaluating the Apache Cloudberry. It installs
+# necessary system utilities, configures the environment for SSH access,
+# and sets up a 'gpadmin' user with sudo privileges. The Apache Cloudberry
+# DEB can be installed into this container for testing and
+# functional verification.
+#
+# Key Features:
+# - Locale setup for en_US.UTF-8
+# - SSH daemon setup for remote access
+# - Essential system utilities installation
+# - Separate user creation and configuration steps
+#
+# Security Considerations:
+# - This Dockerfile prioritizes ease of use for functional testing and
+#   evaluation. It includes configurations such as passwordless sudo access
+#   for the 'gpadmin' user and SSH access with password authentication.
+# - These configurations are suitable for testing and development but
+#   should NOT be used in a production environment due to potential security
+#   risks.
+#
+# Usage:
+#   docker build -t cloudberry-db-base-env .
+#   docker run -h cdw -it cloudberry-db-base-env
+# --------------------------------------------------------------------
+
+FROM ubuntu:22.04
+
+# Argument for configuring the timezone
+ARG TIMEZONE_VAR="Europe/London"
+
+# Environment variables for locale and user
+ENV container=docker
+ENV LANG=en_US.UTF-8
+ENV USER=gpadmin
+ENV TZ=${TIMEZONE_VAR}
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DEBCONF_NOWARNINGS="yes"
+
+# --------------------------------------------------------------------
+# Install Development Tools and Utilities
+# --------------------------------------------------------------------
+
+RUN apt-get update && \
+    apt-get install -y -qq \
+            htop \
+            bat \
+            silversearcher-ag \
+            vim \
+            wget \
+            gdb \
+            git \
+            iputils-ping \
+            lsof \
+            openssh-server \
+            pkg-config \
+            python3.10 \
+            python3-distutils \
+            python3-pip \
+            python3-setuptools \
+            sudo \
+            tzdata && \
+    apt-get install -y -qq locales && \
+    locale-gen ${LANG} && \
+    update-locale LANG=${LANG} && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN ln -s /usr/bin/python3.10 /usr/bin/python
+
+# --------------------------------------------------------------------
+# User Creation and Configuration
+# --------------------------------------------------------------------
+# - Create the 'gpadmin' user and group.
+# - Configure the 'gpadmin' user with passwordless sudo privileges.
+# - Add Cloudberry-specific entries to the gpadmin's .bashrc.
+# --------------------------------------------------------------------
+RUN /usr/sbin/groupadd gpadmin && \
+    /usr/sbin/useradd -m -g gpadmin gpadmin -s /bin/bash && \
+    echo 'gpadmin ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/90-gpadmin && \
+    chmod 0440 /etc/sudoers.d/90-gpadmin && \
+    echo '\n# Add Cloudberry entries\nif [ -f /usr/local/cloudberry/cloudberry-env.sh ]; then\n  source /usr/local/cloudberry/cloudberry-env.sh\n  export COORDINATOR_DATA_DIRECTORY=/data1/coordinator/gpseg-1\nfi' >> /home/gpadmin/.bashrc
+
+# --------------------------------------------------------------------
+# Copy Configuration Files and Setup the Environment
+# --------------------------------------------------------------------
+# - Copy custom configuration files from the build context to /tmp/.
+# - Apply custom system limits and timezone.
+# - Set up SSH for password-based authentication.
+# - Generate locale and set the default locale to en_US.UTF-8.
+# --------------------------------------------------------------------
+COPY ./configs/* /tmp/
+
+RUN cp /tmp/90-cbdb-limits /etc/security/limits.d/90-cbdb-limits && \
+    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
+    echo $TZ > /etc/timezone && \
+    chmod 755 /tmp/init_system.sh && \
+    ssh-keygen -A
+
+USER gpadmin
+WORKDIR /home/gpadmin
+
+CMD ["bash","-c","/tmp/init_system.sh"]
+
diff --git a/devops/deploy/docker/test/ubuntu22.04/configs/90-cbdb-limits b/devops/deploy/docker/test/ubuntu22.04/configs/90-cbdb-limits
new file mode 100644
index 00000000000..474957c42f6
--- /dev/null
+++ b/devops/deploy/docker/test/ubuntu22.04/configs/90-cbdb-limits
@@ -0,0 +1,32 @@
+# /etc/security/limits.d/90-db-limits
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+# Core dump file size limits for gpadmin
+gpadmin soft core unlimited
+gpadmin hard core unlimited
+
+# Open file limits for gpadmin
+gpadmin soft nofile 524288
+gpadmin hard nofile 524288
+
+# Process limits for gpadmin
+gpadmin soft nproc 131072
+gpadmin hard nproc 131072
diff --git a/devops/deploy/docker/test/ubuntu22.04/configs/gpinitsystem.conf b/devops/deploy/docker/test/ubuntu22.04/configs/gpinitsystem.conf
new file mode 100644
index 00000000000..896c8c79e54
--- /dev/null
+++ b/devops/deploy/docker/test/ubuntu22.04/configs/gpinitsystem.conf
@@ -0,0 +1,87 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# ----------------------------------------------------------------------
+# gpinitsystem Configuration File for Cloudberry Database
+# ----------------------------------------------------------------------
+# This configuration file is used to initialize a Cloudberry Database
+# cluster. It defines the settings for the coordinator, primary segments,
+# and mirrors, as well as other important configuration options.
+# ----------------------------------------------------------------------
+
+# Segment prefix - This prefix is used for naming the segment directories.
+# For example, the primary segment directories will be named gpseg0, gpseg1, etc.
+SEG_PREFIX=gpseg
+
+# Coordinator port - The port number where the coordinator will listen.
+# This is the port used by clients to connect to the database.
+COORDINATOR_PORT=5432
+
+# Coordinator hostname - The hostname of the machine where the coordinator
+# will be running. The $(hostname) command will automatically insert the
+# hostname of the current machine.
+COORDINATOR_HOSTNAME=$(hostname)
+
+# Coordinator data directory - The directory where the coordinator's data
+# will be stored. This directory should have enough space to store metadata
+# and system catalogs.
+COORDINATOR_DIRECTORY=/data1/coordinator
+
+# Base port for primary segments - The starting port number for the primary
+# segments. Each primary segment will use a unique port number starting from
+# this base.
+PORT_BASE=6000
+
+# Primary segment data directories - An array specifying the directories where
+# the primary segment data will be stored. Each directory corresponds to a
+# primary segment. In this case, two primary segments will be created in the
+# same directory.
+declare -a DATA_DIRECTORY=(/data1/primary /data1/primary)
+
+# Base port for mirror segments - The starting port number for the mirror
+# segments. Each mirror segment will use a unique port number starting from
+# this base.
+MIRROR_PORT_BASE=7000
+
+# Mirror segment data directories - An array specifying the directories where
+# the mirror segment data will be stored. Each directory corresponds to a
+# mirror segment. In this case, two mirror segments will be created in the
+# same directory.
+declare -a MIRROR_DATA_DIRECTORY=(/data1/mirror /data1/mirror)
+
+# Trusted shell - The shell program used for remote execution. Cloudberry uses
+# SSH to run commands on other machines in the cluster. 'ssh' is the default.
+TRUSTED_SHELL=ssh
+
+# Database encoding - The character set encoding to be used by the database.
+# 'UNICODE' is a common choice, especially for internationalization.
+ENCODING=UNICODE
+
+# Default database name - The name of the default database to be created during
+# initialization. This is also the default database that the gpadmin user will
+# connect to.
+DATABASE_NAME=gpadmin
+
+# Machine list file - A file containing the list of hostnames where the primary
+# segments will be created. Each line in the file represents a different machine.
+# This file is critical for setting up the cluster across multiple nodes.
+MACHINE_LIST_FILE=/home/gpadmin/hostfile_gpinitsystem
+
+# ----------------------------------------------------------------------
+# End of gpinitsystem Configuration File
+# ----------------------------------------------------------------------
diff --git a/devops/deploy/docker/test/ubuntu22.04/configs/init_system.sh b/devops/deploy/docker/test/ubuntu22.04/configs/init_system.sh
new file mode 100644
index 00000000000..1928fe511d9
--- /dev/null
+++ b/devops/deploy/docker/test/ubuntu22.04/configs/init_system.sh
@@ -0,0 +1,224 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# Container Initialization Script
+# --------------------------------------------------------------------
+# This script sets up the environment inside the Docker container for
+# the Apache Cloudberry Build Environment. It performs the following
+# tasks:
+#
+# 1. Verifies that the container is running with the expected hostname.
+# 2. Starts the SSH daemon to allow SSH access to the container.
+# 3. Configures passwordless SSH access for the 'gpadmin' user.
+# 4. Sets up the necessary directories and configuration files for
+#    Apache Cloudberry.
+# 5. Displays a welcome banner and system information.
+# 6. Starts an interactive bash shell.
+#
+# This script is intended to be used as an entrypoint or initialization
+# script for the Docker container.
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Check if the hostname is 'cdw'
+# --------------------------------------------------------------------
+# The script checks if the container's hostname is set to 'cdw'. This is
+# a requirement for this environment, and if the hostname does not match,
+# the script will exit with an error message. This ensures consistency
+# across different environments.
+# --------------------------------------------------------------------
+if [ "$(hostname)" != "cdw" ]; then
+    echo "Error: This container must be run with the hostname 'cdw'."
+    echo "Use the following command: docker run -h cdw ..."
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Start SSH daemon and setup for SSH access
+# --------------------------------------------------------------------
+# The SSH daemon is started to allow remote access to the container via
+# SSH. This is useful for development and debugging purposes. If the SSH
+# daemon fails to start, the script exits with an error.
+# --------------------------------------------------------------------
+sudo mkdir -p /run/sshd
+sudo chmod 755 /run/sshd
+
+if ! sudo /usr/sbin/sshd; then
+    echo "Failed to start SSH daemon" >&2
+    exit 1
+fi
+
+# --------------------------------------------------------------------
+# Remove /run/nologin to allow logins
+# --------------------------------------------------------------------
+# The /run/nologin file, if present, prevents users from logging into
+# the system. This file is removed to ensure that users can log in via SSH.
+# --------------------------------------------------------------------
+sudo rm -rf /run/nologin
+
+# --------------------------------------------------------------------
+# Configure passwordless SSH access for 'gpadmin' user
+# --------------------------------------------------------------------
+# The script sets up SSH key-based authentication for the 'gpadmin' user,
+# allowing passwordless SSH access. It generates a new SSH key pair if one
+# does not already exist, and configures the necessary permissions.
+# --------------------------------------------------------------------
+mkdir -p /home/gpadmin/.ssh
+chmod 700 /home/gpadmin/.ssh
+
+if [ ! -f /home/gpadmin/.ssh/id_rsa ]; then
+    ssh-keygen -t rsa -b 4096 -C gpadmin -f /home/gpadmin/.ssh/id_rsa -P "" > /dev/null 2>&1
+fi
+
+cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys
+chmod 600 /home/gpadmin/.ssh/authorized_keys
+
+# Add the container's hostname to the known_hosts file to avoid SSH warnings
+ssh-keyscan -t rsa cdw > /home/gpadmin/.ssh/known_hosts 2>/dev/null
+
+# --------------------------------------------------------------------
+# Cloudberry Data Directories Setup
+# --------------------------------------------------------------------
+# The script sets up the necessary directories for Apache Cloudberry,
+# including directories for the coordinator, standby coordinator, primary
+# segments, and mirror segments. It also sets up the configuration files
+# required for initializing the database.
+# --------------------------------------------------------------------
+sudo rm -rf /data1/*
+sudo mkdir -p /data1/coordinator /data1/standby_coordinator /data1/primary /data1/mirror
+sudo chown -R gpadmin.gpadmin /data1
+
+# Copy the gpinitsystem configuration file to the home directory
+cp /tmp/gpinitsystem.conf /home/gpadmin
+
+# Set up the hostfile for cluster initialization
+echo $(hostname) > /home/gpadmin/hostfile_gpinitsystem
+
+# Change to the home directory of the current user
+cd $HOME
+
+# --------------------------------------------------------------------
+# Display a Welcome Banner
+# --------------------------------------------------------------------
+# The following ASCII art and welcome message are displayed when the
+# container starts. This banner provides a visual indication that the
+# container is running in the Apache Cloudberry Build Environment.
+# --------------------------------------------------------------------
+cat <<-'EOF'
+
+======================================================================
+
+                          ++++++++++       ++++++
+                        ++++++++++++++   +++++++
+                       ++++        +++++ ++++
+                      ++++          +++++++++
+                   =+====         =============+
+                 ========       =====+      =====
+                ====  ====     ====           ====
+               ====    ===     ===             ====
+               ====            === ===         ====
+               ====            ===  ==--       ===
+                =====          ===== --       ====
+                 =====================     ======
+                   ============================
+                                     =-----=
+     ____  _                    _  _
+    / ___|| |  ___   _   _   __| || |__    ___  _ __  _ __  _   _
+   | |    | | / _ \ | | | | / _` || '_ \  / _ \| '__|| '__|| | | |
+   | |___ | || (_) || |_| || (_| || |_) ||  __/| |   | |   | |_| |
+    \____||_| \____  \__,_| \__,_||_.__/  \___||_|   |_|    \__, |
+                                                            |___/
+----------------------------------------------------------------------
+
+EOF
+
+# --------------------------------------------------------------------
+# Display System Information
+# --------------------------------------------------------------------
+# The script sources the /etc/os-release file to retrieve the operating
+# system name and version. It then displays the following information:
+# - OS name and version
+# - Current user
+# - Container hostname
+# - IP address
+# - CPU model name and number of cores
+# - Total memory available
+# - Cloudberry version (if installed)
+# This information is useful for users to understand the environment they
+# are working in.
+# --------------------------------------------------------------------
+source /etc/os-release
+
+# First, create the CPU info detection function
+get_cpu_info() {
+   ARCH=$(uname -m)
+   if [ "$ARCH" = "x86_64" ]; then
+       lscpu | grep 'Model name:' | awk '{print substr($0, index($0,$3))}'
+   elif [ "$ARCH" = "aarch64" ]; then
+       VENDOR=$(lscpu | grep 'Vendor ID:' | awk '{print $3}')
+       if [ "$VENDOR" = "Apple" ] || [ "$VENDOR" = "0x61" ]; then
+           echo "Apple Silicon ($ARCH)"
+       else
+           if [ -f /proc/cpuinfo ]; then
+               IMPL=$(grep "CPU implementer" /proc/cpuinfo | head -1 | awk '{print $3}')
+               PART=$(grep "CPU part" /proc/cpuinfo | head -1 | awk '{print $3}')
+               if [ ! -z "$IMPL" ] && [ ! -z "$PART" ]; then
+                   echo "ARM $ARCH (Implementer: $IMPL, Part: $PART)"
+               else
+                   echo "ARM $ARCH"
+               fi
+           else
+               echo "ARM $ARCH"
+           fi
+       fi
+   else
+       echo "Unknown architecture: $ARCH"
+   fi
+}
+
+# Check if Apache Cloudberry is installed and display its version
+if dpkg -l apache-cloudberry-db-incubating > /dev/null 2>&1; then
+    CBDB_VERSION=$(/usr/local/cbdb/bin/postgres --gp-version)
+else
+    CBDB_VERSION="Not installed"
+fi
+
+cat <<-EOF
+Welcome to the Apache Cloudberry Test Environment!
+
+Cloudberry version .. : $CBDB_VERSION
+Container OS ........ : $NAME $VERSION
+User ................ : $(whoami)
+Container hostname .. : $(hostname)
+IP Address .......... : $(hostname -I | awk '{print $1}')
+CPU Info ............ : $(get_cpu_info)
+CPU(s) .............. : $(nproc)
+Memory .............. : $(free -h | grep Mem: | awk '{print $2}') total
+======================================================================
+
+EOF
+
+# --------------------------------------------------------------------
+# Start an interactive bash shell
+# --------------------------------------------------------------------
+# Finally, the script starts an interactive bash shell to keep the
+# container running and allow the user to interact with the environment.
+# --------------------------------------------------------------------
+/bin/bash
diff --git a/devops/release/cloudberry-release.sh b/devops/release/cloudberry-release.sh
new file mode 100755
index 00000000000..5fd579b481e
--- /dev/null
+++ b/devops/release/cloudberry-release.sh
@@ -0,0 +1,496 @@
+#!/usr/bin/env bash
+# ======================================================================
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ======================================================================
+#
+# cloudberry-release.sh — Apache Cloudberry (Incubating) release utility
+#
+# This script automates the preparation of an Apache Cloudberry release
+# candidate, including version validation, tag creation, and source
+# tarball assembly.
+#
+# Supported Features:
+#   - Validates version consistency across configure.ac, configure, gpversion.py, and pom.xml
+#   - Supports both final releases and release candidates (e.g., 2.0.0-incubating, 2.0.0-incubating-rc1)
+#   - Optionally reuses existing annotated Git tags if they match the current HEAD
+#   - Verifies that Git submodules are initialized (if defined in .gitmodules)
+#   - Verifies Git identity (user.name and user.email) prior to tagging
+#   - Creates a BUILD_NUMBER file (currently hardcoded as 1) in the release tarball
+#   - Recursively archives all submodules into the source tarball
+#   - Generates SHA-512 checksum (.sha512) for the source tarball
+#   - Generates GPG signature (.asc) for the source tarball, unless --skip-signing is used
+#   - Moves signed artifacts into a dedicated artifacts/ directory
+#   - Verifies integrity and authenticity of artifacts via SHA-512 checksum and GPG signature
+#   - Allows skipping of upstream remote URL validation (e.g., for forks) via --skip-remote-check
+#
+# Usage:
+#   ./cloudberry-release.sh --stage --tag 2.0.0-incubating-rc1 --gpg-user your@apache.org
+#
+# Options:
+#   -s, --stage               Stage a release candidate and generate source tarball
+#   -t, --tag <tag>           Tag to apply or validate (e.g., 2.0.0-incubating-rc1)
+#   -f, --force-tag-reuse     Allow reuse of an existing tag (must match HEAD)
+#   -r, --repo <path>         Optional path to local Cloudberry Git repository
+#   -S, --skip-remote-check   Skip validation of remote.origin.url (useful for forks/mirrors)
+#   -g, --gpg-user <key>      GPG key ID or email to use for signing (required)
+#   -k, --skip-signing        Skip GPG key validation and signature generation
+#   -h, --help                Show usage and exit
+#
+# Requirements:
+#   - Must be run from the root of a valid Apache Cloudberry Git clone,
+#     or the path must be explicitly provided using --repo
+#   - Git user.name and user.email must be configured
+#   - Repository remote must be: git@github.com:apache/cloudberry.git
+#
+# Examples:
+#   ./cloudberry-release.sh -s -t 2.0.0-incubating-rc1 --gpg-user your@apache.org
+#   ./cloudberry-release.sh -s -t 2.0.0-incubating-rc1 --skip-signing
+#   ./cloudberry-release.sh --stage --tag 2.0.0-incubating-rc2 --force-tag-reuse --gpg-user your@apache.org
+#   ./cloudberry-release.sh --stage --tag 2.0.0-incubating-rc1 -r ~/cloudberry --skip-remote-check --gpg-user your@apache.org
+#
+# Notes:
+#   - When reusing a tag, the `--force-tag-reuse` flag must be provided.
+#   - This script creates a BUILD_NUMBER file in the source root for traceability. It is included in the tarball.
+# ======================================================================
+
+set -euo pipefail
+
+confirm() {
+  read -r -p "$1 [y/N] " response
+  case "$response" in
+    [yY][eE][sS]|[yY]) true ;;
+    *) echo "Aborted."; exit 1 ;;
+  esac
+}
+
+section() {
+  echo
+  echo "================================================================="
+  echo ">> $1"
+  echo "================================================================="
+}
+
+show_help() {
+  echo "Apache Cloudberry (Incubating) Release Tool"
+  echo
+  echo "Usage:"
+  echo "  $0 --stage --tag <version-tag>"
+  echo
+  echo "Options:"
+  echo "  -s, --stage"
+  echo "      Stage a release candidate and generate source tarball"
+  echo
+  echo "  -t, --tag <tag>"
+  echo "      Required with --stage (e.g., 2.0.0-incubating-rc1)"
+  echo
+  echo "  -f, --force-tag-reuse"
+  echo "      Reuse existing tag if it matches current HEAD"
+  echo
+  echo "  -r, --repo <path>"
+  echo "      Optional path to a local Cloudberry Git repository clone"
+  echo
+  echo "  -S, --skip-remote-check"
+  echo "      Skip remote.origin.url check (use for forks or mirrors)"
+  echo "      Required for official releases:"
+  echo "        git@github.com:apache/cloudberry.git"
+  echo
+  echo "  -g, --gpg-user <key>"
+  echo "      GPG key ID or email to use for signing (required unless --skip-signing)"
+  echo
+  echo "  -k, --skip-signing"
+  echo "      Skip GPG key validation and signature generation"
+  echo
+  echo "  -h, --help"
+  echo "      Show this help message"
+  exit 1
+}
+
+# Flags
+STAGE=false
+SKIP_SIGNING=false
+TAG=""
+FORCE_TAG_REUSE=false
+REPO_ARG=""
+SKIP_REMOTE_CHECK=false
+GPG_USER=""
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -g|--gpg-user)
+      if [[ $# -lt 2 ]]; then
+        echo "ERROR: --gpg-user requires an email." >&2
+        show_help
+      fi
+      GPG_USER="$2"
+      shift 2
+      ;;
+    -s|--stage)
+      STAGE=true
+      shift
+      ;;
+    -t|--tag)
+      if [[ $# -lt 2 ]]; then
+        echo "ERROR: Missing tag value after --tag" >&2
+        show_help
+      fi
+      TAG="$2"
+      shift 2
+      ;;
+    -f|--force-tag-reuse)
+      FORCE_TAG_REUSE=true
+      shift
+      ;;
+    -r|--repo)
+      if [[ $# -lt 2 ]]; then
+        echo "ERROR: --repo requires a path." >&2
+        show_help
+      fi
+      REPO_ARG="$2"
+      shift 2
+      ;;
+    -S|--skip-remote-check)
+      SKIP_REMOTE_CHECK=true
+      shift
+      ;;
+    -k|--skip-signing)
+      SKIP_SIGNING=true
+      shift
+      ;;
+    -h|--help)
+      show_help
+      ;;
+    *)
+      echo "ERROR: Unknown option: $1" >&2
+      show_help
+      ;;
+  esac
+done
+
+# GPG signing checks
+if [[ "$SKIP_SIGNING" != true ]]; then
+  if [[ -z "$GPG_USER" ]]; then
+    echo "ERROR: --gpg-user is required for signing the release tarball." >&2
+    show_help
+  fi
+
+  if ! gpg --list-keys "$GPG_USER" > /dev/null 2>&1; then
+    echo "ERROR: GPG key '$GPG_USER' not found in your local keyring." >&2
+    echo "Please import or generate the key before proceeding." >&2
+    exit 1
+  fi
+else
+  echo "INFO: GPG signing has been intentionally skipped (--skip-signing)."
+fi
+
+if [[ -n "$REPO_ARG" ]]; then
+  if [[ -n "$REPO_ARG" ]]; then
+    if [[ ! -d "$REPO_ARG" || ! -f "$REPO_ARG/configure.ac" ]]; then
+      echo "ERROR: '$REPO_ARG' does not appear to be a valid Cloudberry source directory."
+      echo "Expected to find a 'configure.ac' file but it is missing."
+      echo
+      echo "Hint: Make sure you passed the correct --repo path to a valid Git clone."
+      exit 1
+    fi
+    cd "$REPO_ARG"
+  elif [[ ! -f configure.ac ]]; then
+    echo "ERROR: No Cloudberry source directory specified and no 'configure.ac' found in the current directory."
+    echo
+    echo "Hint: Either run this script from the root of a Cloudberry Git clone,"
+    echo "or use the --repo <path> option to specify the source directory."
+    exit 1
+  fi
+  cd "$REPO_ARG"
+
+  if [[ ! -d ".git" ]]; then
+    echo "ERROR: '$REPO_ARG' is not a valid Git repository."
+    exit 1
+  fi
+
+  if [[ "$SKIP_REMOTE_CHECK" != true ]]; then
+    REMOTE_URL=$(git config --get remote.origin.url || true)
+    if [[ "$REMOTE_URL" != "git@github.com:apache/cloudberry.git" ]]; then
+      echo "ERROR: remote.origin.url must be set to 'git@github.com:apache/cloudberry.git' for official releases."
+      echo "  Found: '${REMOTE_URL:-<unset>}'"
+      echo
+      echo "This check ensures the release is being staged from the authoritative upstream repository."
+      echo "Use --skip-remote-check only if this is a fork or non-release automation."
+      exit 1
+    fi
+  fi
+fi
+
+# If --repo was not provided, ensure we are in a valid source directory
+if [[ -z "$REPO_ARG" ]]; then
+  if [[ ! -f configure.ac || ! -f gpMgmt/bin/gppylib/gpversion.py || ! -f pom.xml ]]; then
+    echo "ERROR: You must run this script from the root of a valid Cloudberry Git clone"
+    echo "       or pass the path using --repo <source-dir>."
+    echo
+    echo "Missing one or more expected files:"
+    echo "  - configure.ac"
+    echo "  - gpMgmt/bin/gppylib/gpversion.py"
+    echo "  - pom.xml"
+    exit 1
+  fi
+fi
+
+if ! $STAGE && [[ -z "$TAG" ]]; then
+  show_help
+fi
+
+if $STAGE && [[ -z "$TAG" ]]; then
+  echo "ERROR: --tag (-t) is required when using --stage." >&2
+  show_help
+fi
+
+section "Validating Version Consistency"
+
+# Extract version from configure.ac
+CONFIGURE_AC_VERSION=$(grep "^AC_INIT" configure.ac | sed -E "s/^AC_INIT\(\[[^]]+\], \[([^]]+)\].*/\1/")
+CONFIGURE_AC_MAJOR=$(echo "$CONFIGURE_AC_VERSION" | cut -d. -f1)
+EXPECTED="[$CONFIGURE_AC_MAJOR,99]"
+
+# Validate tag format
+SEMVER_REGEX="^${CONFIGURE_AC_MAJOR}\\.[0-9]+\\.[0-9]+(-incubating(-rc[0-9]+)?)?$"
+if ! [[ "$TAG" =~ $SEMVER_REGEX ]]; then
+  echo "ERROR: Tag '$TAG' does not match expected pattern for major version $CONFIGURE_AC_MAJOR (e.g., ${CONFIGURE_AC_MAJOR}.0.0-incubating or ${CONFIGURE_AC_MAJOR}.0.0-incubating-rc1)"
+  exit 1
+fi
+
+# Check gpversion.py consistency
+PY_LINE=$(grep "^MAIN_VERSION" gpMgmt/bin/gppylib/gpversion.py | sed -E 's/#.*//' | tr -d '[:space:]')
+
+if [[ "$PY_LINE" != "MAIN_VERSION=$EXPECTED" ]]; then
+  echo "ERROR: gpversion.py MAIN_VERSION is $PY_LINE, but configure.ac suggests $EXPECTED"
+  echo "Please correct this mismatch before proceeding."
+  exit 1
+fi
+
+# For final releases (non-RC), ensure configure.ac version matches tag exactly
+if [[ "$TAG" != *-rc* && "$CONFIGURE_AC_VERSION" != "$TAG" ]]; then
+  echo "ERROR: configure.ac version ($CONFIGURE_AC_VERSION) does not match final release tag ($TAG)"
+  echo "Please update configure.ac to match the tag before proceeding."
+  exit 1
+fi
+
+# Ensure the generated 'configure' script is up to date
+CONFIGURE_VERSION_LINE=$(grep "^PACKAGE_VERSION=" configure || true)
+CONFIGURE_VERSION=$(echo "$CONFIGURE_VERSION_LINE" | sed -E "s/^PACKAGE_VERSION='([^']+)'.*/\1/")
+
+if [[ "$CONFIGURE_VERSION" != "$TAG" ]]; then
+  echo "ERROR: Version in generated 'configure' script ($CONFIGURE_VERSION) does not match release tag ($TAG)."
+  echo "This likely means autoconf was not run after updating configure.ac."
+  exit 1
+fi
+
+# Ensure xmllint is available
+if ! command -v xmllint >/dev/null 2>&1; then
+  echo "ERROR: xmllint is required but not installed."
+  exit 1
+fi
+
+# Extract version from pom.xml using xmllint with namespace stripping
+POM_VERSION=$(xmllint --xpath '//*[local-name()="project"]/*[local-name()="version"]/text()' pom.xml 2>/dev/null || true)
+
+if [[ -z "$POM_VERSION" ]]; then
+  echo "ERROR: Could not extract <version> from pom.xml"
+  exit 1
+fi
+
+if [[ "$POM_VERSION" != "$TAG" ]]; then
+  echo "ERROR: Version in pom.xml ($POM_VERSION) does not match release tag ($TAG)."
+  echo "Please update pom.xml before tagging."
+  exit 1
+fi
+
+# Ensure working tree is clean
+if ! git diff-index --quiet HEAD --; then
+  echo "ERROR: Working tree is not clean. Please commit or stash changes before proceeding."
+  exit 1
+fi
+
+echo "MAIN_VERSION verified"
+printf "    %-14s: %s\n" "Release Tag"   "$TAG"
+printf "    %-14s: %s\n" "configure.ac"  "$CONFIGURE_AC_VERSION"
+printf "    %-14s: %s\n" "configure"     "$CONFIGURE_VERSION"
+printf "    %-14s: %s\n" "pom.xml"       "$POM_VERSION"
+printf "    %-14s: %s\n" "gpversion.py"  "${EXPECTED//[\[\]]}"
+
+section "Checking the state of the Tag"
+
+# Check if the tag already exists before making any changes
+if git rev-parse "$TAG" >/dev/null 2>&1; then
+  TAG_COMMIT=$(git rev-list -n 1 "$TAG")
+  HEAD_COMMIT=$(git rev-parse HEAD)
+
+  if [[ "$TAG_COMMIT" == "$HEAD_COMMIT" && "$FORCE_TAG_REUSE" == true ]]; then
+    echo "INFO: Tag '$TAG' already exists and matches HEAD. Proceeding with reuse."
+  elif [[ "$FORCE_TAG_REUSE" == true ]]; then
+    echo "ERROR: --force-tag-reuse was specified but tag '$TAG' does not match HEAD."
+    echo "       Tags must be immutable. Cannot continue."
+    exit 1
+  else
+    echo "ERROR: Tag '$TAG' already exists and does not match HEAD."
+    echo "       Use --force-tag-reuse only when HEAD matches the tag commit."
+    exit 1
+  fi
+elif [[ "$FORCE_TAG_REUSE" == true ]]; then
+  echo "ERROR: --force-tag-reuse was specified, but tag '$TAG' does not exist."
+  echo "       You can only reuse a tag if it already exists."
+  exit 1
+else
+  echo "INFO: Tag '$TAG' does not yet exist. It will be created during staging."
+fi
+
+# Check and display submodule initialization status
+if [ -s .gitmodules ]; then
+  section "Checking Git Submodules"
+
+  UNINITIALIZED=false
+  while read -r status path rest; do
+    if [[ "$status" == "-"* ]]; then
+      echo "Uninitialized: $path"
+      UNINITIALIZED=true
+    else
+      echo "Initialized  : $path"
+    fi
+  done < <(git submodule status)
+
+  if [[ "$UNINITIALIZED" == true ]]; then
+    echo
+    echo "ERROR: One or more Git submodules are not initialized."
+    echo "Please run:"
+    echo "  git submodule update --init --recursive"
+    echo "before proceeding with the release preparation."
+    exit 1
+  fi
+fi
+
+section "Checking GIT_USER_NAME and GIT_USER_EMAIL values"
+
+if $STAGE; then
+  # Validate Git environment before performing tag operation
+  GIT_USER_NAME=$(git config --get user.name || true)
+  GIT_USER_EMAIL=$(git config --get user.email || true)
+
+  echo "Git User Info:"
+  printf "    %-14s: %s\n" "user.name"  "${GIT_USER_NAME:-<unset>}"
+  printf "    %-14s: %s\n" "user.email" "${GIT_USER_EMAIL:-<unset>}"
+
+  if [[ -z "$GIT_USER_NAME" || -z "$GIT_USER_EMAIL" ]]; then
+    echo "ERROR: Git configuration is incomplete."
+    echo
+    echo "  Detected:"
+    echo "    user.name  = ${GIT_USER_NAME:-<unset>}"
+    echo "    user.email = ${GIT_USER_EMAIL:-<unset>}"
+    echo
+    echo "  Git requires both to be set in order to create annotated tags for releases."
+    echo "  You may configure them globally using:"
+    echo "    git config --global user.name \"Your Name\""
+    echo "    git config --global user.email \"your@apache.org\""
+    echo
+    echo "  Alternatively, set them just for this repo using the same commands without --global."
+    exit 1
+  fi
+
+section "Staging release: $TAG"
+
+  if [[ "$FORCE_TAG_REUSE" == false ]]; then
+    confirm "You are about to create tag '$TAG'. Continue?"
+    git tag -a "$TAG" -m "Apache Cloudberry (Incubating) ${TAG} Release Candidate"
+  else
+    echo "INFO: Reusing existing tag '$TAG'; skipping tag creation."
+  fi
+
+  echo "Creating BUILD_NUMBER file with value of 1"
+  echo "1" > BUILD_NUMBER
+
+  echo -e "\nTag Summary"
+  TAG_OBJECT=$(git rev-parse "$TAG")
+  TAG_COMMIT=$(git rev-list -n 1 "$TAG")
+  echo "$TAG (tag object): $TAG_OBJECT"
+  echo "    Points to commit: $TAG_COMMIT"
+  git log -1 --format="%C(auto)%h %d" "$TAG"
+
+  section "Creating Source Tarball"
+
+  TAR_NAME="apache-cloudberry-${TAG}-src.tar.gz"
+  TMP_DIR=$(mktemp -d)
+  trap 'rm -rf "$TMP_DIR"' EXIT
+
+  git archive --format=tar --prefix="apache-cloudberry-${TAG}/" "$TAG" | tar -x -C "$TMP_DIR"
+  cp BUILD_NUMBER "$TMP_DIR/apache-cloudberry-${TAG}/"
+
+  # Archive submodules if any
+  if [ -s .gitmodules ]; then
+    git submodule foreach --recursive --quiet "
+      echo \"Archiving submodule: \$sm_path\"
+      fullpath=\"\$toplevel/\$sm_path\"
+      destpath=\"$TMP_DIR/apache-cloudberry-$TAG/\$sm_path\"
+      mkdir -p \"\$destpath\"
+      git -C \"\$fullpath\" archive --format=tar --prefix=\"\$sm_path/\" HEAD | tar -x -C \"$TMP_DIR/apache-cloudberry-$TAG\"
+    "
+  fi
+
+  tar -czf "$TAR_NAME" -C "$TMP_DIR" "apache-cloudberry-${TAG}"
+  rm -rf "$TMP_DIR"
+  echo -e "Archive saved to: $TAR_NAME"
+
+  # Generate SHA-512 checksum
+  section "Generating SHA-512 Checksum"
+
+  echo -e "\nGenerating SHA-512 checksum"
+  shasum -a 512 "$TAR_NAME" > "${TAR_NAME}.sha512"
+  echo "Checksum saved to: ${TAR_NAME}.sha512"
+
+  section "Signing with GPG key: $GPG_USER"
+  # Conditionally generate GPG signature
+  if [[ "$SKIP_SIGNING" != true ]]; then
+    echo -e "\nSigning tarball with GPG key: $GPG_USER"
+    gpg --armor --detach-sign --local-user "$GPG_USER" "$TAR_NAME"
+    echo "GPG signature saved to: ${TAR_NAME}.asc"
+  else
+    echo "INFO: Skipping tarball signing as requested (--skip-signing)"
+  fi
+
+  # Move artifacts to top-level artifacts directory
+
+  ARTIFACTS_DIR="$(cd "$(dirname "$REPO_ARG")" && cd .. && pwd)/artifacts"
+  mkdir -p "$ARTIFACTS_DIR"
+
+  section "Moving Artifacts to $ARTIFACTS_DIR"
+
+  echo -e "\nMoving release artifacts to: $ARTIFACTS_DIR"
+  mv -vf "$TAR_NAME" "$ARTIFACTS_DIR/"
+  mv -vf "${TAR_NAME}.sha512" "$ARTIFACTS_DIR/"
+  [[ -f "${TAR_NAME}.asc" ]] && mv -vf "${TAR_NAME}.asc" "$ARTIFACTS_DIR/"
+
+  section "Verifying sha512 ($ARTIFACTS_DIR/${TAR_NAME}.sha512) Release Artifact"
+  cd "$ARTIFACTS_DIR"
+  sha512sum -c "$ARTIFACTS_DIR/${TAR_NAME}.sha512"
+
+  section "Verifying GPG Signature ($ARTIFACTS_DIR/${TAR_NAME}.asc) Release Artifact"
+
+  if [[ "$SKIP_SIGNING" != true ]]; then
+    gpg --verify "${TAR_NAME}.asc" "$TAR_NAME"
+  else
+    echo "INFO: Signature verification skipped (--skip-signing). Signature is only available when generated via this script."
+  fi
+
+  section "Release candidate for $TAG staged successfully"
+fi
diff --git a/devops/release/generate-changelog.sh b/devops/release/generate-changelog.sh
new file mode 100755
index 00000000000..9977971179c
--- /dev/null
+++ b/devops/release/generate-changelog.sh
@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+# ======================================================================
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ======================================================================
+#
+# Generate changelog between two git references (tags/commits)
+# Usage: ./generate-changelog.sh <from_ref> <to_ref> [repo_owner/repo_name]
+#
+# Examples:
+#   ./generate-changelog.sh 1a40e1f 8178d4f
+#   ./generate-changelog.sh v1.0.0 v1.1.0
+#   ./generate-changelog.sh 1a40e1f 8178d4f apache/cloudberry
+#   ./generate-changelog.sh v1.0.0 v1.1.0 apache/cloudberry
+#
+# GitHub Token Setup:
+# 1. Go to GitHub Settings > Developer settings > Personal access tokens > Tokens (classic)
+# 2. Generate new token with 'repo' scope (for private repos) or 'public_repo' scope (for public repos)
+# 3. Export the token: export GITHUB_TOKEN=your_token_here
+
+set -e
+
+# Default values
+DEFAULT_REPO="apache/cloudberry"
+GITHUB_API_BASE="https://api.github.com"
+
+# Function to display usage
+usage() {
+    echo "Usage: $0 <from_ref> <to_ref> [repo_owner/repo_name]"
+    echo ""
+    echo "Examples:"
+    echo "  $0 1a40e1f 8178d4f"
+    echo "  $0 v1.0.0 v1.1.0"
+    echo "  $0 1a40e1f 8178d4f apache/cloudberry"
+    echo "  $0 v1.0.0 v1.1.0 apache/cloudberry"
+    echo ""
+    echo "Environment variables:"
+    echo "  GITHUB_TOKEN - GitHub personal access token (required)"
+    exit 1
+}
+
+# Check arguments
+if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+    usage
+fi
+
+FROM_REF="$1"
+TO_REF="$2"
+REPO="${3:-$DEFAULT_REPO}"
+
+# Check if GITHUB_TOKEN is set
+if [ -z "$GITHUB_TOKEN" ]; then
+    echo "Error: GITHUB_TOKEN environment variable is required"
+    echo "Please set it with: export GITHUB_TOKEN=your_token_here"
+    exit 1
+fi
+
+# Check if jq is installed
+if ! command -v jq &> /dev/null; then
+    echo "Error: jq is required but not installed"
+    echo "Please install jq using your system's package manager"
+    exit 1
+fi
+
+# Count total commits first
+total_commits=$(git log --oneline "$FROM_REF..$TO_REF" | wc -l | tr -d ' ')
+
+echo "Generating changelog for $REPO from $FROM_REF to $TO_REF..."
+echo "Found $total_commits commits to process"
+echo ""
+
+# Generate changelog
+git log --oneline --pretty=format:"%h|%H|%s|%an" "$FROM_REF..$TO_REF" | while IFS='|' read -r short_sha full_sha subject author; do
+    # Get PR number for this commit
+    pr_number=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+        "$GITHUB_API_BASE/repos/$REPO/commits/$full_sha/pulls" | \
+        jq -r '.[0].number // empty')
+
+    if [ -n "$pr_number" ]; then
+        echo "* [\`$short_sha\`](https://github.com/$REPO/commit/$full_sha) - $subject ($author) [#$pr_number](https://github.com/$REPO/pull/$pr_number)"
+    else
+        echo "* [\`$short_sha\`](https://github.com/$REPO/commit/$full_sha) - $subject ($author)"
+    fi
+done
+
+echo ""
+echo "Changelog generation completed!"
diff --git a/devops/sandbox/.env b/devops/sandbox/.env
new file mode 100644
index 00000000000..233d7c5b1b5
--- /dev/null
+++ b/devops/sandbox/.env
@@ -0,0 +1,21 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+CODEBASE_VERSION=2.0.0
+OS_VERSION=rockylinux9
diff --git a/devops/sandbox/Dockerfile.RELEASE.rockylinux9 b/devops/sandbox/Dockerfile.RELEASE.rockylinux9
new file mode 100644
index 00000000000..f9f422f57f6
--- /dev/null
+++ b/devops/sandbox/Dockerfile.RELEASE.rockylinux9
@@ -0,0 +1,287 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# Multi-stage Dockerfile for Apache Cloudberry Sandbox Environment (Release)
+# --------------------------------------------------------------------
+# This Dockerfile compiles and installs a specific release version of
+# Cloudberry, then creates a runtime environment for testing and development.
+# --------------------------------------------------------------------
+
+# --------------------------------------------------------------------
+# Build stage: Rocky Linux 9 builder to compile Cloudberry (release tarball)
+# --------------------------------------------------------------------
+FROM rockylinux/rockylinux:9.6 AS builder
+
+# Install build toolchains and development headers (avoid coreutils/curl conflicts on arm64)
+RUN dnf makecache && \
+    dnf install -y \
+        epel-release \
+        git && \
+    dnf config-manager --disable epel-cisco-openh264 && \
+    dnf makecache && \
+    dnf config-manager --disable epel && \
+    dnf install -y --enablerepo=epel \
+        the_silver_searcher \
+        bat \
+        htop && \
+    dnf install -y \
+        bison \
+        cmake3 \
+        ed \
+        file \
+        flex \
+        gcc \
+        gcc-c++ \
+        gdb \
+        glibc-langpack-en \
+        glibc-locale-source \
+        initscripts \
+        iproute \
+        less \
+        lsof \
+        m4 \
+        net-tools \
+        openssh-clients \
+        openssh-server \
+        perl \
+        rpm-build \
+        rpmdevtools \
+        rsync \
+        sudo \
+        tar \
+        unzip \
+        util-linux-ng \
+        wget \
+        sshpass \
+        which && \
+    dnf install -y \
+        apr-devel \
+        bzip2-devel \
+        java-11-openjdk \
+        java-11-openjdk-devel \
+        krb5-devel \
+        libcurl-devel \
+        libevent-devel \
+        libxml2-devel \
+        libuuid-devel \
+        libzstd-devel \
+        lz4 \
+        lz4-devel \
+        openldap-devel \
+        openssl-devel \
+        pam-devel \
+        perl-ExtUtils-Embed \
+        perl-Test-Simple \
+        perl-core \
+        python3-devel \
+        python3-pytest \
+        readline-devel \
+        zlib-devel && \
+    dnf install -y --enablerepo=crb \
+        libuv-devel \
+        libyaml-devel \
+        perl-IPC-Run \
+        protobuf-devel && \
+    dnf clean all && \
+    cd && XERCES_LATEST_RELEASE=3.3.0 && \
+    wget -nv "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    echo "$(curl -sL https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz.sha256)" | sha256sum -c - && \
+    tar xf "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz"; rm "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    cd xerces-c-${XERCES_LATEST_RELEASE} && \
+    ./configure --prefix=/usr/local/xerces-c && \
+    make -j$(nproc) && \
+    make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \
+    rm -rf ~/xerces-c*
+
+# Create gpadmin user and grant passwordless sudo in builder
+RUN groupadd -r gpadmin && \
+    useradd -m -r -g gpadmin -s /bin/bash gpadmin && \
+    echo "gpadmin ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/gpadmin && \
+    chmod 440 /etc/sudoers.d/gpadmin
+
+# Switch to gpadmin user
+USER gpadmin
+WORKDIR /home/gpadmin
+
+# Release version to build (Apache official tarball)
+ARG CB_RELEASE_VERSION=2.0.0-incubating
+
+# Download and extract the specified release version from Apache
+RUN wget -nv "https://downloads.apache.org/incubator/cloudberry/${CB_RELEASE_VERSION}/apache-cloudberry-${CB_RELEASE_VERSION}-src.tar.gz" -O /home/gpadmin/apache-cloudberry-${CB_RELEASE_VERSION}-src.tar.gz && \
+    tar -xzf /home/gpadmin/apache-cloudberry-${CB_RELEASE_VERSION}-src.tar.gz -C /home/gpadmin && \
+    rm -f /home/gpadmin/apache-cloudberry-${CB_RELEASE_VERSION}-src.tar.gz && \
+    mv /home/gpadmin/apache-cloudberry-${CB_RELEASE_VERSION} /home/gpadmin/cloudberry
+
+# Build Cloudberry using the official build scripts
+RUN cd /home/gpadmin/cloudberry && \
+    export SRC_DIR=/home/gpadmin/cloudberry && \
+    mkdir -p "${SRC_DIR}/build-logs" && \
+    # Ensure Cloudberry lib dir exists and has Xerces libs available
+    sudo rm -rf /usr/local/cloudberry-db && \
+    sudo mkdir -p /usr/local/cloudberry-db/lib && \
+    sudo cp -v /usr/local/xerces-c/lib/libxerces-c.so \
+              /usr/local/xerces-c/lib/libxerces-c-3.*.so \
+              /usr/local/cloudberry-db/lib/ && \
+    sudo chown -R gpadmin:gpadmin /usr/local/cloudberry-db && \
+    # Configure with required features and paths
+    export LD_LIBRARY_PATH=/usr/local/cloudberry-db/lib:$LD_LIBRARY_PATH && \
+    ./configure --prefix=/usr/local/cloudberry-db \
+                --disable-external-fts \
+                --enable-debug \
+                --enable-cassert \
+                --enable-debug-extensions \
+                --enable-gpcloud \
+                --enable-ic-proxy \
+                --enable-mapreduce \
+                --enable-orafce \
+                --enable-orca \
+                --enable-pax \
+                --enable-pxf \
+                --enable-tap-tests \
+                --with-gssapi \
+                --with-ldap \
+                --with-libxml \
+                --with-lz4 \
+                --with-pam \
+                --with-perl \
+                --with-pgport=5432 \
+                --with-python \
+                --with-pythonsrc-ext \
+                --with-ssl=openssl \
+                --with-uuid=e2fs \
+                --with-includes=/usr/local/xerces-c/include \
+                --with-libraries=/usr/local/cloudberry-db/lib && \
+    # Build and install
+    make -j$(nproc) --directory ${SRC_DIR} && \
+    make -j$(nproc) --directory ${SRC_DIR}/contrib && \
+    make install --directory ${SRC_DIR} && \
+    make install --directory "${SRC_DIR}/contrib"
+
+# --------------------------------------------------------------------
+# Runtime stage: Rocky Linux 9 runtime with required dependencies
+# --------------------------------------------------------------------
+FROM rockylinux/rockylinux:9.6
+
+# Install required runtime dependencies, SSH server, sudo, and tools
+# Note: Use dnf on Rocky Linux 9
+RUN dnf -y update && \
+    dnf -y install \
+      openssh-server openssh-clients \
+      sudo shadow-utils \
+      bash procps-ng \
+      ca-certificates \
+      python3 \
+      apr \
+      bzip2-libs \
+      krb5-libs \
+      libevent \
+      libicu \
+      libuuid \
+      libxml2 \
+      libyaml \
+      libzstd \
+      lz4 \
+      ncurses \
+      openldap \
+      openssl \
+      pam \
+      pcre2 \
+      perl \
+      protobuf \
+      readline \
+      zlib \
+      glibc-langpack-en \
+      libuv \
+      iproute \
+      net-tools \
+      which \
+      rsync \
+      keyutils \
+      libstdc++ && \
+    dnf clean all && rm -rf /var/cache/dnf
+
+# Create gpadmin user and group, grant passwordless sudo
+RUN groupadd -r gpadmin && \
+    useradd -m -r -g gpadmin -s /bin/bash gpadmin && \
+    echo "gpadmin ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/gpadmin && \
+    chmod 440 /etc/sudoers.d/gpadmin
+
+# Prepare SSH daemon: generate host keys, ensure runtime dir, and allow gpadmin to start it
+RUN ssh-keygen -A && mkdir -p /run/sshd && chmod u+s /usr/sbin/sshd
+
+# Copy built Cloudberry from builder stage
+COPY --from=builder /usr/local/cloudberry-db /usr/local/cloudberry-db
+
+# Bring Xerces libs into Cloudberry lib dir
+COPY --from=builder /usr/local/xerces-c/lib/libxerces-c.so /usr/local/cloudberry-db/lib/
+COPY --from=builder /usr/local/xerces-c/lib/libxerces-c-3.*.so /usr/local/cloudberry-db/lib/
+
+# Copy configuration files to their final destinations
+COPY ./configs/90-cbdb-limits.conf /etc/security/limits.d/90-cbdb-limits.conf
+COPY ./configs/90-cbdb-sysctl.conf /etc/sysctl.d/90-cbdb-sysctl.conf
+COPY ./configs/gpinitsystem_singlenode /tmp/gpinitsystem_singlenode
+COPY ./configs/gpinitsystem_multinode /tmp/gpinitsystem_multinode
+COPY ./configs/multinode-gpinit-hosts /tmp/multinode-gpinit-hosts
+COPY ./configs/init_system.sh /tmp/init_system.sh
+
+# Runtime configuration
+RUN echo "cdw" > /tmp/gpdb-hosts && \
+    chmod 755 /tmp/gpinitsystem_singlenode && \
+    chmod 755 /tmp/gpinitsystem_multinode && \
+    chmod 755 /tmp/init_system.sh && \
+    mkdir -p /data0/database/coordinator /data0/database/primary /data0/database/mirror && \
+    chown -R gpadmin:gpadmin \
+      /usr/local/cloudberry-db \
+      /tmp/gpinitsystem_singlenode \
+      /tmp/gpinitsystem_multinode \
+      /tmp/gpdb-hosts \
+      /tmp/multinode-gpinit-hosts \
+      /data0 && \
+    echo "export COORDINATOR_DATA_DIRECTORY=/data0/database/coordinator/gpseg-1" >> /home/gpadmin/.bashrc && \
+    echo -e '\n# Add Cloudberry entries\nif [ -f /usr/local/cloudberry-db/cloudberry-env.sh ]; then\n  source /usr/local/cloudberry-db/cloudberry-env.sh\nfi\n# Add Greenplum compatibility entries\nif [ -f /usr/local/cloudberry-db/greenplum_path.sh ]; then\n  source /usr/local/cloudberry-db/greenplum_path.sh\nfi' >> /home/gpadmin/.bashrc
+
+# ----------------------------------------------------------------------
+# Generate SSH keypair for gpadmin user at build time
+# ----------------------------------------------------------------------
+# WARNING: This embeds a fixed SSH keypair in the Docker image for
+# sandbox convenience. This is ONLY suitable for local testing and
+# development. DO NOT use this image in production or any environment
+# where security is a concern.
+# ----------------------------------------------------------------------
+RUN mkdir -p /home/gpadmin/.ssh && \
+    ssh-keygen -t rsa -b 4096 -N '' -C 'gpadmin@cloudberry-sandbox' \
+               -f /home/gpadmin/.ssh/id_rsa && \
+    cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys && \
+    chmod 700 /home/gpadmin/.ssh && \
+    chmod 600 /home/gpadmin/.ssh/id_rsa && \
+    chmod 644 /home/gpadmin/.ssh/id_rsa.pub && \
+    chmod 600 /home/gpadmin/.ssh/authorized_keys && \
+    chown -R gpadmin:gpadmin /home/gpadmin/.ssh
+
+# Set default user and working directory
+USER gpadmin
+WORKDIR /home/gpadmin
+
+EXPOSE 5432 22
+
+# cgroup mount (provided by compose/run)
+VOLUME [ "/sys/fs/cgroup" ]
+
+# Start the container by running the initialization script
+CMD ["bash","-c","/tmp/init_system.sh"]
diff --git a/devops/sandbox/Dockerfile.main.rockylinux9 b/devops/sandbox/Dockerfile.main.rockylinux9
new file mode 100644
index 00000000000..03619cda4ba
--- /dev/null
+++ b/devops/sandbox/Dockerfile.main.rockylinux9
@@ -0,0 +1,262 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# Multi-stage Dockerfile for Apache Cloudberry Sandbox Environment
+# --------------------------------------------------------------------
+# This Dockerfile supports two source modes:
+#   - Main branch: clone the latest main from GitHub (CODEBASE_VERSION=main)
+#   - Local source: use the repository contents from the Docker build context
+#     (CODEBASE_VERSION=local), recommended for developers working from
+#     their current checkout.
+# In both modes it compiles and installs Cloudberry, then creates a
+# runtime environment for testing and development.
+# --------------------------------------------------------------------
+
+# Build stage: Use pre-built image to compile Cloudberry
+ARG CODEBASE_VERSION=main
+FROM rockylinux/rockylinux:9.6 AS builder
+ARG CODEBASE_VERSION
+
+# Install build toolchains and development headers (avoid coreutils/curl conflicts on arm64)
+RUN dnf makecache && \
+    dnf install -y \
+        epel-release \
+        git && \
+    dnf config-manager --disable epel-cisco-openh264 && \
+    dnf makecache && \
+    dnf config-manager --disable epel && \
+    dnf install -y --enablerepo=epel \
+        the_silver_searcher \
+        bat \
+        htop && \
+    dnf install -y \
+        bison \
+        cmake3 \
+        ed \
+        file \
+        flex \
+        gcc \
+        gcc-c++ \
+        gdb \
+        glibc-langpack-en \
+        glibc-locale-source \
+        initscripts \
+        iproute \
+        less \
+        lsof \
+        m4 \
+        net-tools \
+        openssh-clients \
+        openssh-server \
+        perl \
+        rpm-build \
+        rpmdevtools \
+        rsync \
+        sudo \
+        tar \
+        unzip \
+        util-linux-ng \
+        wget \
+        sshpass \
+        which && \
+    dnf install -y \
+        apr-devel \
+        bzip2-devel \
+        java-11-openjdk \
+        java-11-openjdk-devel \
+        krb5-devel \
+        libcurl-devel \
+        libevent-devel \
+        libxml2-devel \
+        libuuid-devel \
+        libzstd-devel \
+        lz4 \
+        lz4-devel \
+        openldap-devel \
+        openssl-devel \
+        pam-devel \
+        perl-ExtUtils-Embed \
+        perl-Test-Simple \
+        perl-core \
+        python3-devel \
+        python3-pytest \
+        readline-devel \
+        zlib-devel && \
+    dnf install -y --enablerepo=crb \
+        liburing-devel \
+        libuv-devel \
+        libyaml-devel \
+        perl-IPC-Run \
+        protobuf-devel && \
+    dnf clean all && \
+    cd && XERCES_LATEST_RELEASE=3.3.0 && \
+    wget -nv "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    echo "$(curl -sL https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_LATEST_RELEASE}.tar.gz.sha256)" | sha256sum -c - && \
+    tar xf "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz"; rm "xerces-c-${XERCES_LATEST_RELEASE}.tar.gz" && \
+    cd xerces-c-${XERCES_LATEST_RELEASE} && \
+    ./configure --prefix=/usr/local/xerces-c && \
+    make -j$(nproc) && \
+    make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \
+    rm -rf ~/xerces-c*
+
+# Create gpadmin user and grant passwordless sudo in builder
+RUN groupadd -r gpadmin && \
+    useradd -m -r -g gpadmin -s /bin/bash gpadmin && \
+    echo "gpadmin ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/gpadmin && \
+    chmod 440 /etc/sudoers.d/gpadmin
+
+# Switch to gpadmin user
+USER gpadmin
+WORKDIR /home/gpadmin
+
+# Copy repository contents from build context
+# Note: This COPY always executes regardless of CODEBASE_VERSION due to Docker
+# layer caching behavior. For main branch builds, the copied content will be
+# removed and replaced by a fresh git clone in the RUN step below. This is an
+# acceptable tradeoff to keep the Dockerfile simple and maintainable.
+COPY --chown=gpadmin:gpadmin . /home/gpadmin/cloudberry
+
+# Obtain Cloudberry source code based on build mode
+RUN if [ "${CODEBASE_VERSION}" = "local" ]; then \
+        echo "Using local source from build context"; \
+    else \
+        rm -rf /home/gpadmin/cloudberry && \
+        git clone --recurse-submodules --branch main --single-branch --depth=1 https://github.com/apache/cloudberry.git; \
+    fi
+
+# Build Cloudberry using the official build scripts
+RUN cd /home/gpadmin/cloudberry && \
+    export SRC_DIR=/home/gpadmin/cloudberry && \
+    mkdir -p ${SRC_DIR}/build-logs && \
+    ./devops/build/automation/cloudberry/scripts/configure-cloudberry.sh && \
+    ./devops/build/automation/cloudberry/scripts/build-cloudberry.sh
+
+# --------------------------------------------------------------------
+# Runtime stage: Switch to a slimmer base image (Rocky Linux 9)
+# --------------------------------------------------------------------
+FROM rockylinux/rockylinux:9.6
+
+# Install required runtime dependencies, SSH server, sudo, and tools
+# Note: Use dnf on Rocky Linux 9
+RUN dnf -y update && \
+    dnf -y install \
+      openssh-server openssh-clients \
+      sudo shadow-utils \
+      bash procps-ng \
+      ca-certificates \
+      python3 \
+      apr \
+      bzip2-libs \
+      krb5-libs \
+      libevent \
+      libicu \
+      liburing \
+      libuuid \
+      libxml2 \
+      libyaml \
+      libzstd \
+      lz4 \
+      ncurses \
+      openldap \
+      openssl \
+      pam \
+      pcre2 \
+      perl \
+      protobuf \
+      readline \
+      zlib \
+      glibc-langpack-en \
+      libuv \
+      iproute \
+      net-tools \
+      which \
+      rsync \
+      keyutils \
+      libstdc++ && \
+    dnf clean all && rm -rf /var/cache/dnf
+
+# Create gpadmin user and group, grant passwordless sudo
+RUN groupadd -r gpadmin && \
+    useradd -m -r -g gpadmin -s /bin/bash gpadmin && \
+    echo "gpadmin ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/gpadmin && \
+    chmod 440 /etc/sudoers.d/gpadmin
+
+# Prepare SSH daemon: generate host keys, ensure runtime dir, and allow gpadmin to start it
+RUN ssh-keygen -A && mkdir -p /run/sshd && chmod u+s /usr/sbin/sshd
+
+# Copy built Cloudberry from builder stage
+COPY --from=builder /usr/local/cloudberry-db /usr/local/cloudberry-db
+
+# Bring Xerces libs into Cloudberry lib dir and normalize SONAME via builder-installed versioned prefix
+COPY --from=builder /usr/local/xerces-c/lib/libxerces-c.so /usr/local/cloudberry-db/lib/
+COPY --from=builder /usr/local/xerces-c/lib/libxerces-c-3.*.so /usr/local/cloudberry-db/lib/
+
+# Copy configuration files to their final destinations
+COPY devops/sandbox/configs/90-cbdb-limits.conf /etc/security/limits.d/90-cbdb-limits.conf
+COPY devops/sandbox/configs/90-cbdb-sysctl.conf /etc/sysctl.d/90-cbdb-sysctl.conf
+COPY devops/sandbox/configs/gpinitsystem_singlenode /tmp/gpinitsystem_singlenode
+COPY devops/sandbox/configs/gpinitsystem_multinode /tmp/gpinitsystem_multinode
+COPY devops/sandbox/configs/multinode-gpinit-hosts /tmp/multinode-gpinit-hosts
+COPY devops/sandbox/configs/init_system.sh /tmp/init_system.sh
+
+# Runtime configuration
+RUN echo "cdw" > /tmp/gpdb-hosts && \
+    chmod 755 /tmp/gpinitsystem_singlenode && \
+    chmod 755 /tmp/gpinitsystem_multinode && \
+    chmod 755 /tmp/init_system.sh && \
+    mkdir -p /data0/database/coordinator /data0/database/primary /data0/database/mirror && \
+    chown -R gpadmin:gpadmin \
+      /usr/local/cloudberry-db \
+      /tmp/gpinitsystem_singlenode \
+      /tmp/gpinitsystem_multinode \
+      /tmp/gpdb-hosts \
+      /tmp/multinode-gpinit-hosts \
+      /data0 && \
+    echo "export COORDINATOR_DATA_DIRECTORY=/data0/database/coordinator/gpseg-1" >> /home/gpadmin/.bashrc && \
+    echo -e '\n# Add Cloudberry entries\nif [ -f /usr/local/cloudberry-db/cloudberry-env.sh ]; then\n  source /usr/local/cloudberry-db/cloudberry-env.sh\nfi' >> /home/gpadmin/.bashrc
+
+# ----------------------------------------------------------------------
+# Generate SSH keypair for gpadmin user at build time
+# ----------------------------------------------------------------------
+# WARNING: This embeds a fixed SSH keypair in the Docker image for
+# sandbox convenience. This is ONLY suitable for local testing and
+# development. DO NOT use this image in production or any environment
+# where security is a concern.
+# ----------------------------------------------------------------------
+RUN mkdir -p /home/gpadmin/.ssh && \
+    ssh-keygen -t rsa -b 4096 -N '' -C 'gpadmin@cloudberry-sandbox' \
+               -f /home/gpadmin/.ssh/id_rsa && \
+    cat /home/gpadmin/.ssh/id_rsa.pub >> /home/gpadmin/.ssh/authorized_keys && \
+    chmod 700 /home/gpadmin/.ssh && \
+    chmod 600 /home/gpadmin/.ssh/id_rsa && \
+    chmod 644 /home/gpadmin/.ssh/id_rsa.pub && \
+    chmod 600 /home/gpadmin/.ssh/authorized_keys && \
+    chown -R gpadmin:gpadmin /home/gpadmin/.ssh
+
+# Set default user and working directory
+USER gpadmin
+WORKDIR /home/gpadmin
+
+EXPOSE 5432 22
+
+# cgroup mount (provided by compose/run)
+VOLUME [ "/sys/fs/cgroup" ]
+
+# Start the container by running the initialization script
+CMD ["bash","-c","/tmp/init_system.sh"]
diff --git a/devops/sandbox/README.md b/devops/sandbox/README.md
new file mode 100644
index 00000000000..9f475977835
--- /dev/null
+++ b/devops/sandbox/README.md
@@ -0,0 +1,232 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+---
+title: Sandbox of Apache Cloudberry
+---
+
+# Install Apache Cloudberry With Docker
+
+This document guides you on how to quickly set up and connect to Apache Cloudberry in a Docker environment. You can try out Apache Cloudberry by performing some basic operations and running SQL commands.
+
+> [!WARNING]
+> This guide is intended for testing or development. DO NOT use it for production.
+
+> [!WARNING]
+> **Security Notice: Embedded SSH Keys**
+>
+> For ease of use, this sandbox environment includes **pre-generated SSH keys embedded in the Docker image**. All containers built from the same image share the same SSH keypair, allowing passwordless SSH communication between nodes.
+>
+> **This is ONLY acceptable for local testing and development environments.** These embedded keys are **NOT secure** and must **NEVER** be used in production or any environment where security is a concern. Anyone with access to the Docker image can extract these keys.
+
+
+## Prerequisites
+
+Make sure that your environment meets the following requirements:
+
+- Platform requirement: Any platform with Docker runtime. For details, refer to [Get Started with Docker](https://www.docker.com/get-started/).
+- Other dependencies: Git, SSH, and internet connection
+
+## Build the Sandbox
+
+When building and deploying Apache Cloudberry in Docker, you will have 2 different deployment options as well as different build options.
+
+**Deployment Options**
+1. **Single Container** (Default) - With the single container option, you will have the coordinator as well as the Apache Cloudberry segments all running on a single container. This is the default behavior when deploying using the `run.sh` script provided.
+2. **Multi-Container** - Deploying with the multi-container option will give you a more realistic deployment of what actual production Apache Cloudberry clusters look like. With multi-node, you will have the coordinator, the standby coordinator, and 2 segment hosts all on their own respective containers. This is to both highlight the distributed nature of Apache Cloudberry as well as highlight how high availability (HA) features work in the event of a server (or in this case a container) failing. This is enabled by passing the -m flag to the `run.sh` script which will be highlighted below.
+
+![cloudberry Sandbox Deployments](./sandbox-deployment.jpg)
+
+**Build Options**
+
+1. **Recommended for most users** – Build directly from your current local source code using `-c local`. This is the fastest way to get started as it reuses your existing checkout, avoiding the need to download the code again inside the container. It is also ideal for developers testing local changes.
+2. Compile with the source code of the latest Apache Cloudberry (released in [Apache Cloudberry Release Page](https://github.com/apache/cloudberry/releases)). The base OS will be Rocky Linux 9 Docker image.
+3. Compile with the latest Apache Cloudberry [main](https://github.com/apache/cloudberry/tree/main) branch. The base OS will be Rocky Linux 9 Docker image.
+
+Build and deploy steps:
+
+1. Start Docker Desktop and make sure it is running properly on your host platform.
+
+2. Clone the Apache Cloudberry repository to the target machine.
+
+    ```shell
+    git clone https://github.com/apache/cloudberry.git
+    ```
+
+3. Enter the repository and run the `run.sh` script to start the Docker container. This will start the automatic installation process. Depending on your environment, you may need to run this with 'sudo' command.
+
+    - **Recommended: Build from your current local source code (single container)**
+
+        This is the most efficient option for both new users and developers. It uses your local checkout directly, saving time by skipping the code download step inside the container. It also allows you to immediately test any local code modifications.
+
+    ```shell
+    cd cloudberry/devops/sandbox
+    ./run.sh -c local
+    ```
+
+    - **Recommended: Build from your current local source code (multi-container)**
+
+        Same as above, but deploys a multi-container cluster. Ideal for testing distributed features or high availability with your local code.
+
+    ```shell
+    cd cloudberry/devops/sandbox
+    ./run.sh -c local -m
+    ```
+
+    - For latest Apache Cloudberry release running on a single container
+
+    ```shell
+    cd cloudberry/devops/sandbox
+    ./run.sh -c 2.0.0
+    ```
+
+    - For latest Apache Cloudberry release running across multiple containers
+
+    ```shell
+    cd cloudberry/devops/sandbox
+    ./run.sh -c 2.0.0 -m
+    ```
+
+    - For latest main branch running on a single container
+
+    ```shell
+    cd cloudberry/devops/sandbox
+    ./run.sh -c main
+    ```
+
+    - For latest main branch running across multiple containers
+
+    ```shell
+    cd cloudberry/devops/sandbox
+    ./run.sh -c main -m
+    ```
+
+    Once the script finishes without error, the sandbox is built and running successfully. The `docker run` and `docker compose` commands use the --detach option allowing you to ssh or access the running Apache Cloudberry instance remotely.
+
+    Please review run.sh script for additional options (e.g. setting Timezone in running container, only building container). You can also execute `./run.sh -h` to see the usage.
+
+## Connect to the database
+
+> [!NOTE]
+> When deploying the multi-container Apache Cloudberry environment it may take extra time for the database to initialize, so you may need to wait a few minutes before you can execute the psql prompt successfully. You can run `docker logs cbdb-cdw -f` to see the current state of the database initialization process, you'll know the process is finished when you see the "Deployment Successful" output.
+
+You can now connect to the database and try some basic operations.
+
+1. Connect to the Docker container from the host machine:
+
+    ```shell
+    docker exec -it cbdb-cdw /bin/bash
+    ```
+
+    If it is successful, you will see the following prompt:
+
+    ```shell
+    [gpadmin@cdw /]$
+    ```
+
+2. Log into Apache Cloudberry in Docker. See the following commands and example outputs:
+
+    ```shell
+    [gpadmin@cdw ~]$ psql  # Connects to the database with the default database name "gpadmin".
+
+    # psql (14.4, server 14.4)
+    # Type "help" for help.
+    # Note: No password is required for the gpadmin user in this sandbox environment.
+    ```
+
+    ```sql
+    gpadmin=# SELECT VERSION();  -- Checks the database version.
+
+    PostgreSQL 14.4 (Apache Cloudberry 1.0.0 build dev) on aarch64-unknown-linux-gnu, compiled by gcc (GCC) 10.2.1 20210130 (Red Hat 10.2.1-11), 64-bit compiled on Oct 24 2023 10:24:28
+    (1 row)
+    ```
+
+3. Alternatively, you can connect to the database directly from your host machine without entering the container:
+
+    The Apache Cloudberry coordinator port (default 5432) is mapped to port **15432** on your host machine. You can use the `psql` client on your host to connect directly:
+
+    ```shell
+    # Connect from host machine
+    psql -h localhost -p 15432 -d postgres -U gpadmin
+    ```
+
+    > [!NOTE]
+    > - No password is required for the `gpadmin` user in this sandbox environment.
+    > - Make sure you have PostgreSQL client (`psql`) installed on your host machine.
+    > - The port mapping is: Container port `5432` → Host port `15432`
+
+Now you have an Apache Cloudberry and can continue with [Apache Cloudberry Tutorials](https://cloudberry.apache.org/docs/)! Enjoy!
+
+## Working with your Apache Cloudberry Docker environment
+
+When working with the Apache Cloudberry Docker environment there are a few commands that will be useful to you.
+
+**Stopping Your Single Container Deployment With Docker**
+
+To stop the **single container** deployment while _keeping the data and state_ within the container, you can run the command below. This means that you can later start the container again and any changes you made to the containers will be persisted between runs.
+
+```shell
+docker stop cbdb-cdw
+```
+
+To stop the **single container** deployment and also remove the volume that belongs to the container, you can run the following command. Keep in mind this will remove the volume as well as the container associated which means any changes you've made inside of the container or any database state will be wiped and unrecoverable.
+
+```shell
+docker rm -f cbdb-cdw
+```
+
+**Stopping Your Multi-Container Deployment With Docker**
+
+To stop the **multi-container** deployment while _keeping the data and state_ within the container, you can run the command below. This means that you can later start the container again and any changes you made to the containers will be persisted between runs.
+
+```shell
+docker compose -f docker-compose-rockylinux9.yml stop
+```
+
+To stop the **multi-container** deployment and also remove the network and volumes that belong to the containers, you can run the command below. Running this command means it will delete the containers as well as remove the volumes that the containers are associated with. This means any changes you've made inside of the containers or any database state will be wiped and unrecoverable.
+
+```shell
+docker compose -f docker-compose-rockylinux9.yml down -v
+```
+
+**Starting A Stopped Single Container Apache Cloudberry Docker Deployment**
+
+If you've run any of the commands above that keep the Docker volumes persisted between shutting the containers down, you can use the following commands to bring that same deployment back up with it's previous state.
+
+To start a **single container** deployment after it was shut down, you can simply run the following
+
+```shell
+docker start cbdb-cdw
+```
+
+**Starting A Stopped Multi-Container Apache Cloudberry Docker Deployment**
+
+To start a **multi-container** deployment after it was shut down, you can run the following command.
+
+```shell
+docker compose -f docker-compose-rockylinux9.yml start
+```
+
+> [!NOTE]
+> When starting a previously stopped Apache Cloudberry Docker environment, you'll need to manually start the database back up. To do this, just run the following commands once the container(s) are back up and running. The `gpstart` command is used for starting the database, and -a is a flag saying to start the database without prompting (non-interactive).
+
+```shell
+docker exec -it cbdb-cdw /bin/bash
+
+[gpadmin@cdw /] gpstart -a
+```
\ No newline at end of file
diff --git a/devops/sandbox/configs/90-cbdb-limits.conf b/devops/sandbox/configs/90-cbdb-limits.conf
new file mode 100644
index 00000000000..33088f92278
--- /dev/null
+++ b/devops/sandbox/configs/90-cbdb-limits.conf
@@ -0,0 +1,29 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+######################
+# CBDB CONFIG PARAMS #
+######################
+
+ * soft core unlimited
+ * hard core unlimited
+ * soft nofile 524288
+ * hard nofile 524288
+ * soft nproc 131072
+ * hard nproc 131072
diff --git a/devops/sandbox/configs/90-cbdb-sysctl.conf b/devops/sandbox/configs/90-cbdb-sysctl.conf
new file mode 100644
index 00000000000..9f0b7c576e4
--- /dev/null
+++ b/devops/sandbox/configs/90-cbdb-sysctl.conf
@@ -0,0 +1,54 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+######################
+# CBDB CONFIG PARAMS #
+######################
+
+kernel.shmmax = 1000000000
+kernel.shmall = 4000000000
+kernel.shmmni = 4096
+vm.overcommit_memory = 2 
+vm.overcommit_ratio = 95
+net.ipv4.ip_local_port_range = 10000 65535
+kernel.sem = 250 2048000 200 8192
+kernel.sysrq = 1
+kernel.core_uses_pid = 1
+kernel.msgmnb = 65536
+kernel.msgmax = 65536
+kernel.msgmni = 2048
+net.ipv4.tcp_syncookies = 1
+net.ipv4.conf.default.accept_source_route = 0
+net.ipv4.tcp_max_syn_backlog = 4096
+net.ipv4.conf.all.arp_filter = 1
+net.ipv4.ipfrag_high_thresh = 41943040
+net.ipv4.ipfrag_low_thresh = 31457280
+net.ipv4.ipfrag_time = 60
+net.core.netdev_max_backlog = 10000
+net.core.rmem_max = 2097152
+net.core.wmem_max = 2097152
+vm.swappiness = 10
+vm.zone_reclaim_mode = 0
+vm.dirty_expire_centisecs = 500
+vm.dirty_writeback_centisecs = 100
+vm.dirty_background_ratio = 0
+vm.dirty_ratio = 0
+vm.dirty_background_bytes = 1610612736
+vm.dirty_bytes = 4294967296
+kernel.core_pattern=/var/core/core.%h.%t
diff --git a/devops/sandbox/configs/gpinitsystem_multinode b/devops/sandbox/configs/gpinitsystem_multinode
new file mode 100644
index 00000000000..d6a46d4d410
--- /dev/null
+++ b/devops/sandbox/configs/gpinitsystem_multinode
@@ -0,0 +1,138 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# FILE NAME: gpinitsystem_multinode
+
+# A configuration file is needed by the gpinitsystem utility.
+# This sample file initializes an Apache Cloudberry multi-node cluster
+# with one coordinator, one standby coordinator, and segment instances
+# across multiple hosts. This file is referenced when you run gpinitsystem.
+
+################################################
+# REQUIRED PARAMETERS
+################################################
+
+# A name for the array you are configuring. You can use any name you
+# like. Enclose the name in quotes if the name contains spaces.
+
+ARRAY_NAME="Sandbox: Apache Cloudberry Cluster"
+
+# This specifies the file that contains the list of segment host names
+# that comprise the Greenplum system. For a single-node system, this
+# file contains the local OS-configured hostname (as output by the
+# hostname command). If the file does not reside in the same
+# directory where the gpinitsystem utility is executed, specify
+# the absolute path to the file.
+
+MACHINE_LIST_FILE=/tmp/gpdb-hosts
+
+# This specifies a prefix that will be used to name the data directories
+# of the coordinator and segment instances. The naming convention for data
+# directories in a Apache Cloudberry system is SEG_PREFIX<number>
+# where <number> starts with 0 for segment instances and the coordinator
+# is always -1. So for example, if you choose the prefix gpsne, your
+# coordinator instance data directory would be named gpsne-1, and the segment
+# instances would be named gpsne0, gpsne1, gpsne2, gpsne3, and so on.
+
+SEG_PREFIX=gpseg
+
+# Base port number on which primary segment instances will be
+# started on a segment host. The base port number will be
+# incremented by one for each segment instance started on a host.
+
+PORT_BASE=40000
+
+# This specifies the data storage location(s) where the script will
+# create the primary segment data directories. The script creates a
+# unique data directory for each segment instance. If you want multiple
+# segment instances per host, list a data storage area for each primary
+# segment you want created. The recommended number is one primary segment
+# per CPU. It is OK to list the same data storage area multiple times
+# if you want your data directories created in the same location. The
+# number of data directory locations specified will determine the number
+# of primary segment instances created per host.
+# You must make sure that the user who runs gpinitsystem (for example,
+# the gpadmin user) has permissions to write to these directories. You
+# may want to create these directories on the segment hosts before running
+# gpinitsystem and chown them to the appropriate user.
+
+declare -a DATA_DIRECTORY=(/data0/database/primary \
+                           /data0/database/primary)
+
+# The OS-configured hostname of the Apache Cloudberry coordinator instance.
+
+COORDINATOR_HOSTNAME=cdw
+
+# The location where the data directory will be created on the
+# Greenplum coordinator host.
+# You must make sure that the user who runs gpinitsystem
+# has permissions to write to this directory. You may want to
+# create this directory on the coordinator host before running
+# gpinitsystem and chown it to the appropriate user.
+
+COORDINATOR_DIRECTORY=/data0/database/coordinator
+
+# The port number for the coordinator instance. This is the port number
+# that users and client connections will use when accessing the
+# Apache Cloudberry system.
+
+COORDINATOR_PORT=5432
+
+# The shell the gpinitsystem script uses to execute
+# commands on remote hosts. Allowed value is ssh. You must set up
+# your trusted host environment before running the gpinitsystem
+# script. You can use gpssh-exkeys to do this.
+
+TRUSTED_SHELL=ssh
+
+# Maximum distance between automatic write ahead log (WAL)
+# checkpoints, in log file segments (each segment is normally 16
+# megabytes). This will set the checkpoint_segments parameter
+# in the postgresql.conf file for each segment instance in the
+# Apache Cloudberry system.
+
+CHECK_POINT_SEGMENTS=8
+
+# The character set encoding to use. Greenplum supports the
+# same character sets as PostgreSQL. See 'Character Set Support'
+# in the PostgreSQL documentation for allowed character sets.
+# Should correspond to the OS locale specified with the
+# gpinitsystem -n option.
+
+ENCODING=UNICODE
+
+################################################
+# OPTIONAL PARAMETERS
+################################################
+
+# Optional. Uncomment to create a database of this name after the
+# system is initialized. You can always create a database later using
+# the CREATE DATABASE command or the createdb script.
+
+DATABASE_NAME=gpadmin
+
+# Mirror configuration
+
+MIRROR_PORT_BASE=50000
+
+declare -a MIRROR_DATA_DIRECTORY=(/data0/database/mirror \
+                                  /data0/database/mirror)
+
+# REPLICATION_PORT_BASE=41000
+# MIRROR_REPLICATION_PORT_BASE=51000
diff --git a/devops/sandbox/configs/gpinitsystem_singlenode b/devops/sandbox/configs/gpinitsystem_singlenode
new file mode 100644
index 00000000000..f221d81938c
--- /dev/null
+++ b/devops/sandbox/configs/gpinitsystem_singlenode
@@ -0,0 +1,140 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+# FILE NAME: gpinitsystem_singlenode
+
+# A configuration file is needed by the gpinitsystem utility.
+# This sample file initializes a Apache Cloudberry Single Node
+# Edition (SNE) system with one coordinator and  two segment instances
+# on the local host. This file is referenced when you run gpinitsystem.
+
+################################################
+# REQUIRED PARAMETERS
+################################################
+
+# A name for the array you are configuring. You can use any name you
+# like. Enclose the name in quotes if the name contains spaces.
+
+ARRAY_NAME="Sandbox: Apache Cloudberry Cluster"
+
+# This specifies the file that contains the list of segment host names
+# that comprise the Greenplum system. For a single-node system, this
+# file contains the local OS-configured hostname (as output by the
+# hostname command). If the file does not reside in the same
+# directory where the gpinitsystem utility is executed, specify
+# the absolute path to the file.
+
+MACHINE_LIST_FILE=/tmp/gpdb-hosts
+
+# This specifies a prefix that will be used to name the data directories
+# of the coordinator and segment instances. The naming convention for data
+# directories in a Apache Cloudberry system is SEG_PREFIX<number>
+# where <number> starts with 0 for segment instances and the coordinator
+# is always -1. So for example, if you choose the prefix gpsne, your
+# coordinator instance data directory would be named gpsne-1, and the segment
+# instances would be named gpsne0, gpsne1, gpsne2, gpsne3, and so on.
+
+SEG_PREFIX=gpseg
+
+# Base port number on which primary segment instances will be
+# started on a segment host. The base port number will be
+# incremented by one for each segment instance started on a host.
+
+PORT_BASE=40000
+
+# This specifies the data storage location(s) where the script will
+# create the primary segment data directories. The script creates a
+# unique data directory for each segment instance. If you want multiple
+# segment instances per host, list a data storage area for each primary
+# segment you want created. The recommended number is one primary segment
+# per CPU. It is OK to list the same data storage area multiple times
+# if you want your data directories created in the same location. The
+# number of data directory locations specified will determine the number
+# of primary segment instances created per host.
+# You must make sure that the user who runs gpinitsystem (for example,
+# the gpadmin user) has permissions to write to these directories. You
+# may want to create these directories on the segment hosts before running
+# gpinitsystem and chown them to the appropriate user.
+
+declare -a DATA_DIRECTORY=(/data0/database/primary \
+                           /data0/database/primary \
+                           /data0/database/primary)
+
+# The OS-configured hostname of the Apache Cloudberry coordinator instance.
+
+COORDINATOR_HOSTNAME=cdw
+
+# The location where the data directory will be created on the
+# Greenplum coordinator host.
+# You must make sure that the user who runs gpinitsystem
+# has permissions to write to this directory. You may want to
+# create this directory on the coordinator host before running
+# gpinitsystem and chown it to the appropriate user.
+
+COORDINATOR_DIRECTORY=/data0/database/coordinator
+
+# The port number for the coordinator instance. This is the port number
+# that users and client connections will use when accessing the
+# Apache Cloudberry system.
+
+COORDINATOR_PORT=5432
+
+# The shell the gpinitsystem script uses to execute
+# commands on remote hosts. Allowed value is ssh. You must set up
+# your trusted host environment before running the gpinitsystem
+# script. You can use gpssh-exkeys to do this.
+
+TRUSTED_SHELL=ssh
+
+# Maximum distance between automatic write ahead log (WAL)
+# checkpoints, in log file segments (each segment is normally 16
+# megabytes). This will set the checkpoint_segments parameter
+# in the postgresql.conf file for each segment instance in the
+# Apache Cloudberry system.
+
+CHECK_POINT_SEGMENTS=8
+
+# The character set encoding to use. Greenplum supports the
+# same character sets as PostgreSQL. See 'Character Set Support'
+# in the PostgreSQL documentation for allowed character sets.
+# Should correspond to the OS locale specified with the
+# gpinitsystem -n option.
+
+ENCODING=UNICODE
+
+################################################
+# OPTIONAL PARAMETERS
+################################################
+
+# Optional. Uncomment to create a database of this name after the
+# system is initialized. You can always create a database later using
+# the CREATE DATABASE command or the createdb script.
+
+DATABASE_NAME=gpadmin
+
+# Mirror configuration
+
+MIRROR_PORT_BASE=50000
+
+declare -a MIRROR_DATA_DIRECTORY=(/data0/database/mirror \
+                                  /data0/database/mirror \
+                                  /data0/database/mirror)
+
+# REPLICATION_PORT_BASE=41000
+# MIRROR_REPLICATION_PORT_BASE=51000
diff --git a/devops/sandbox/configs/init_system.sh b/devops/sandbox/configs/init_system.sh
new file mode 100755
index 00000000000..455341ff46c
--- /dev/null
+++ b/devops/sandbox/configs/init_system.sh
@@ -0,0 +1,190 @@
+#!/bin/bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+## ======================================================================
+## Container initialization script for Apache Cloudberry Sandbox
+## ======================================================================
+
+# ----------------------------------------------------------------------
+# Start SSH daemon and setup for SSH access
+# ----------------------------------------------------------------------
+# The SSH daemon is started to allow remote access to the container via
+# SSH. This is useful for development and debugging purposes.
+# ----------------------------------------------------------------------
+
+# Ensure SSH directory exists (created at build time; ignore errors if any)
+mkdir -p /run/sshd 2>/dev/null || true
+
+# Start SSH daemon directly (binary is setuid-root in the image)
+if ! /usr/sbin/sshd; then
+    echo "Failed to start SSH daemon" >&2
+    exit 1
+fi
+
+# Give SSH daemon time to start
+sleep 5
+
+# ----------------------------------------------------------------------
+# Remove /run/nologin to allow logins
+# ----------------------------------------------------------------------
+# The /run/nologin file, if present, prevents users from logging into
+# the system. This file is removed to ensure that users can log in via SSH.
+# ----------------------------------------------------------------------
+rm -f /run/nologin 2>/dev/null || true
+
+# ----------------------------------------------------------------------
+# Configure passwordless SSH access for 'gpadmin' user
+# ----------------------------------------------------------------------
+# SSH keys are already generated and configured in the Docker image at
+# build time. All containers from the same image share the same keypair,
+# which allows passwordless SSH between containers.
+#
+# This is ONLY suitable for sandbox/testing environments.
+# DO NOT use this approach in production.
+# ----------------------------------------------------------------------
+
+# Verify SSH keys exist (they should be in the image already)
+if [ ! -f /home/gpadmin/.ssh/id_rsa ]; then
+    echo "ERROR: SSH keys not found in image. This should not happen."
+    exit 1
+fi
+
+# Add container hostnames to the known_hosts file to avoid SSH warnings
+if [[ "${MULTINODE:-false}" == "true" ]]; then
+    ssh-keyscan -t rsa cdw scdw sdw1 sdw2 > /home/gpadmin/.ssh/known_hosts 2>/dev/null || true
+else
+    ssh-keyscan -t rsa cdw > /home/gpadmin/.ssh/known_hosts 2>/dev/null || true
+fi
+chmod 600 /home/gpadmin/.ssh/known_hosts
+chown gpadmin:gpadmin /home/gpadmin/.ssh/known_hosts
+
+# Load Cloudberry/Greenplum environment with fallback, then ensure PATH
+if [ -f "/usr/local/cloudberry-db/cloudberry-env.sh" ]; then
+  # shellcheck disable=SC1091
+  . /usr/local/cloudberry-db/cloudberry-env.sh
+elif [ -f "/usr/local/cloudberry-db/greenplum_path.sh" ]; then
+  # shellcheck disable=SC1091
+  . /usr/local/cloudberry-db/greenplum_path.sh
+else
+  # Fallback: minimal env to find gp* tools
+  export GPHOME="/usr/local/cloudberry-db"
+fi
+# Ensure coordinator data dir variable is set
+export COORDINATOR_DATA_DIRECTORY="${COORDINATOR_DATA_DIRECTORY:-/data0/database/coordinator/gpseg-1}"
+# Ensure PATH includes Cloudberry bin
+if [ -d "/usr/local/cloudberry-db/bin" ]; then
+  case ":$PATH:" in
+    *":/usr/local/cloudberry-db/bin:"*) : ;;
+    *) export PATH="/usr/local/cloudberry-db/bin:$PATH" ;;
+  esac
+fi
+
+# Initialize single node Cloudberry cluster
+if [[ "${MULTINODE:-false}" == "false" && "$HOSTNAME" == "cdw" ]]; then
+    gpinitsystem -a \
+                 -c /tmp/gpinitsystem_singlenode \
+                 -h /tmp/gpdb-hosts \
+                 --max_connections=100
+# Initialize multi node Cloudberry cluster
+elif [[ "${MULTINODE:-false}" == "true" && "$HOSTNAME" == "cdw" ]]; then
+    # Wait for other containers' SSH to become reachable (max 120s per host)
+    for host in sdw1 sdw2 scdw; do
+        MAX_WAIT=120
+        WAITED=0
+        until ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=5 gpadmin@${host} "echo Connected to ${host}" 2>/dev/null; do
+            if [ $WAITED -ge $MAX_WAIT ]; then
+                echo "Timeout waiting for SSH on ${host}"
+                exit 1
+            fi
+            sleep 5
+            WAITED=$((WAITED+5))
+        done
+    done
+
+    # Clean up any existing data directories to avoid conflicts
+    rm -rf /data0/database/coordinator/* /data0/database/primary/* /data0/database/mirror/* 2>/dev/null || true
+
+    # Ensure database directories exist with proper permissions
+    mkdir -p /data0/database/coordinator /data0/database/primary /data0/database/mirror
+    chmod -R 700 /data0/database
+
+    gpinitsystem -a \
+                 -c /tmp/gpinitsystem_multinode \
+                 -h /tmp/multinode-gpinit-hosts \
+                 --max_connections=100
+    gpinitstandby -s scdw -a
+    printf "sdw1\nsdw2\n" >> /tmp/gpdb-hosts
+fi
+
+# ----------------------------------------------------------------------
+# Post-initialization configuration (applies to both single and multi-node)
+# ----------------------------------------------------------------------
+# Configure pg_hba.conf to allow passwordless access from any host,
+# remove password requirement for gpadmin user, and display cluster info.
+# This section runs on the coordinator node after cluster initialization.
+# ----------------------------------------------------------------------
+if [ "$HOSTNAME" == "cdw" ]; then
+    ## Allow any host access the Cloudberry Cluster
+    echo 'host all all 0.0.0.0/0 trust' >> /data0/database/coordinator/gpseg-1/pg_hba.conf
+    gpstop -u
+
+    cat <<-'EOF'
+
+======================================================================
+	  ____ _                 _ _
+	 / ___| | ___  _   _  __| | |__   ___ _ __ _ __ _   _
+	| |   | |/ _ \| | | |/ _` | '_ \ / _ \ '__| '__| | | |
+	| |___| | (_) | |_| | (_| | |_) |  __/ |  | |  | |_| |
+	 \____|_|\___/ \__,_|\__,_|_.__/ \___|_|  |_|   \__, |
+	                                                |___/
+======================================================================
+EOF
+
+    cat <<-'EOF'
+
+======================================================================
+Sandbox: Apache Cloudberry Cluster details
+======================================================================
+
+EOF
+
+    echo "Current time: $(date)"
+    source /etc/os-release
+    echo "OS Version: ${NAME} ${VERSION}"
+
+    ## Display version and cluster configuration
+    psql -P pager=off -d template1 -c "SELECT VERSION()"
+    psql -P pager=off -d template1 -c "SELECT * FROM gp_segment_configuration ORDER BY dbid"
+    psql -P pager=off -d template1 -c "SHOW optimizer"
+fi
+
+echo """
+===========================
+=  DEPLOYMENT SUCCESSFUL  =
+===========================
+"""
+
+# ----------------------------------------------------------------------
+# Start an interactive bash shell
+# ----------------------------------------------------------------------
+# Finally, the script starts an interactive bash shell to keep the
+# container running and allow the user to interact with the environment.
+# ----------------------------------------------------------------------
+/bin/bash
diff --git a/devops/sandbox/configs/multinode-gpinit-hosts b/devops/sandbox/configs/multinode-gpinit-hosts
new file mode 100644
index 00000000000..6da00621266
--- /dev/null
+++ b/devops/sandbox/configs/multinode-gpinit-hosts
@@ -0,0 +1,2 @@
+sdw1
+sdw2
diff --git a/devops/sandbox/docker-compose-rockylinux9.yml b/devops/sandbox/docker-compose-rockylinux9.yml
new file mode 100644
index 00000000000..c37471898d1
--- /dev/null
+++ b/devops/sandbox/docker-compose-rockylinux9.yml
@@ -0,0 +1,81 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+services:
+  cbdb-coordinator:
+    container_name: cbdb-cdw
+    image: cbdb-${CODEBASE_VERSION}:${OS_VERSION}
+    ports:
+    - "15432:5432"
+    hostname: cdw
+    tty: true
+    networks:
+      interconnect:
+        ipv4_address: 10.5.0.10
+    environment:
+      MULTINODE: "true"
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+
+  cbdb-standby-coordinator:
+    container_name: cbdb-scdw
+    image: cbdb-${CODEBASE_VERSION}:${OS_VERSION}
+    hostname: scdw
+    tty: true
+    networks:
+      interconnect:
+        ipv4_address: 10.5.0.11
+    environment:
+      MULTINODE: "true"
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  cbdb-segment-host-1:
+    container_name: cbdb-sdw1
+    image: cbdb-${CODEBASE_VERSION}:${OS_VERSION}
+    hostname: sdw1
+    tty: true
+    networks:
+      interconnect:
+        ipv4_address: 10.5.0.12
+    environment:
+      MULTINODE: "true"
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  cbdb-segment-host-2:
+    container_name: cbdb-sdw2
+    image: cbdb-${CODEBASE_VERSION}:${OS_VERSION}
+    hostname: sdw2
+    tty: true
+    networks:
+      interconnect:
+        ipv4_address: 10.5.0.13
+    environment:
+      MULTINODE: "true"
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+
+networks:
+  interconnect:
+    name: cbdb-interconnect
+    driver: bridge
+    ipam:
+     config:
+       - subnet: 10.5.0.0/16
+         gateway: 10.5.0.1
diff --git a/devops/sandbox/run.sh b/devops/sandbox/run.sh
new file mode 100755
index 00000000000..7c266b8f64c
--- /dev/null
+++ b/devops/sandbox/run.sh
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+set -euo pipefail
+
+# Default values
+DEFAULT_OS_VERSION="rockylinux9"
+DEFAULT_TIMEZONE_VAR="America/Los_Angeles"
+DEFAULT_PIP_INDEX_URL_VAR="https://pypi.org/simple"
+BUILD_ONLY="false"
+MULTINODE="false"
+
+# Use environment variables if set, otherwise use default values
+# Export set for some variables to be used referenced docker compose file
+export OS_VERSION="${OS_VERSION:-$DEFAULT_OS_VERSION}"
+BUILD_ONLY="${BUILD_ONLY:-false}"
+export CODEBASE_VERSION="${CODEBASE_VERSION:-}"
+TIMEZONE_VAR="${TIMEZONE_VAR:-$DEFAULT_TIMEZONE_VAR}"
+PIP_INDEX_URL_VAR="${PIP_INDEX_URL_VAR:-$DEFAULT_PIP_INDEX_URL_VAR}"
+
+# Function to display help message
+function usage() {
+    echo "Usage: $0 [-o <os_version>] [-c <codebase_version>] [-b] [-m]"
+    echo "  -c  Codebase version (valid values: main, local, or other available version like 2.0.0)"
+    echo "  -t  Timezone (default: America/Los_Angeles, or set via TIMEZONE_VAR environment variable)"
+    echo "  -p  Python Package Index (PyPI) (default: https://pypi.org/simple, or set via PIP_INDEX_URL_VAR environment variable)"
+    echo "  -b  Build only, do not run the container (default: false, or set via BUILD_ONLY environment variable)"
+    echo "  -m  Multinode, this creates a multinode (multi-container) Cloudberry cluster using docker compose (requires compose to be installed)"
+    exit 1
+}
+
+# Parse command-line options
+while getopts "c:t:p:bmh" opt; do
+    case "${opt}" in
+        c)
+            CODEBASE_VERSION=${OPTARG}
+            ;;
+        t)
+            TIMEZONE_VAR=${OPTARG}
+            ;;
+        p)
+            PIP_INDEX_URL_VAR=${OPTARG}
+            ;;
+        b)
+            BUILD_ONLY="true"
+            ;;
+        m)
+            MULTINODE="true"
+            ;;
+        h)
+            usage
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+
+if [[ $MULTINODE == "true" ]] && ! docker compose version; then
+        echo "Error: Multinode -m flag found in run arguments but calling docker compose failed. Please install Docker Compose by following the instructions at https://docs.docker.com/compose/install/. Exiting"
+        exit 1
+fi
+
+if [[ "${MULTINODE}" == "true" && "${BUILD_ONLY}" == "true" ]]; then
+    echo "Error: Cannot pass both multinode deployment [m] and build only [b] flags together"
+    exit 1
+fi
+
+# CODEBASE_VERSION must be specified via -c argument or CODEBASE_VERSION environment variable
+if [[ -z "$CODEBASE_VERSION" ]]; then
+    echo "Error: CODEBASE_VERSION must be specified via environment variable or '-c' command line parameter."
+    usage
+fi
+
+# Validate OS_VERSION and map to appropriate Docker image
+case "${OS_VERSION}" in
+    rockylinux9)
+        OS_DOCKER_IMAGE="rockylinux9"
+        ;;
+    *)
+        echo "Invalid OS version: ${OS_VERSION}"
+        usage
+        ;;
+esac
+
+# Validate CODEBASE_VERSION
+if [[ "${CODEBASE_VERSION}" != "main" && "${CODEBASE_VERSION}" != "local" && ! "${CODEBASE_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    echo "Invalid codebase version: ${CODEBASE_VERSION}"
+    usage
+fi
+
+# Determine sandbox directory and repository root
+SANDBOX_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "${SANDBOX_DIR}/../.." && pwd)"
+
+# Ensure submodules are initialized for local builds
+if [[ "${CODEBASE_VERSION}" = "local" ]]; then
+    if [[ -d "${REPO_ROOT}/.git" ]] && command -v git >/dev/null 2>&1; then
+        # Check if any submodules are uninitialized (-), out of sync (+), or have conflicts (U)
+        if (cd "${REPO_ROOT}" && git submodule status --recursive | grep -qE "^[+-U]"); then
+            echo "Updating git submodules for local build..."
+            (cd "${REPO_ROOT}" && git submodule update --init --recursive)
+        else
+            echo "Git submodules are already up to date. Skipping update."
+        fi
+    else
+        echo "Warning: Skipping 'git submodule update --init --recursive' for local build because either '.git' directory or 'git' command is missing in ${REPO_ROOT}."
+        echo "If your Cloudberry checkout relies on git submodules, please ensure they have been populated before running with '-c local'."
+    fi
+fi
+
+
+# Build image
+if [[ "${CODEBASE_VERSION}" = "main" || "${CODEBASE_VERSION}" = "local" ]]; then
+    DOCKERFILE="${SANDBOX_DIR}/Dockerfile.main.${OS_VERSION}"
+
+    # Single image build from main or local source
+    docker build --file ${DOCKERFILE} \
+                 --build-arg TIMEZONE_VAR="${TIMEZONE_VAR}" \
+                 --build-arg CODEBASE_VERSION="${CODEBASE_VERSION}" \
+                 --tag cbdb-${CODEBASE_VERSION}:${OS_VERSION} \
+                 ${REPO_ROOT}
+else
+    DOCKERFILE="${SANDBOX_DIR}/Dockerfile.RELEASE.${OS_VERSION}"
+
+    docker build --file ${DOCKERFILE} \
+                 --build-arg TIMEZONE_VAR="${TIMEZONE_VAR}" \
+                 --build-arg CODEBASE_VERSION_VAR="${CODEBASE_VERSION}" \
+                 --tag cbdb-${CODEBASE_VERSION}:${OS_VERSION} \
+                 ${SANDBOX_DIR}
+fi
+
+# Check if build only flag is set
+if [ "${BUILD_ONLY}" == "true" ]; then
+    echo "Docker image built successfully with OS version ${OS_VERSION} and codebase version ${CODEBASE_VERSION}. Build only mode, not running the container."
+    exit 0
+fi
+
+# Deploy container(s)
+if [ "${MULTINODE}" == "true" ]; then
+    docker compose -f docker-compose-$OS_VERSION.yml up --detach
+else
+    docker run --interactive \
+           --tty \
+           --name cbdb-cdw \
+           --detach \
+           --volume /sys/fs/cgroup:/sys/fs/cgroup:ro \
+           --publish 122:22 \
+           --publish 15432:5432 \
+           --hostname cdw \
+           cbdb-${CODEBASE_VERSION}:${OS_VERSION}
+fi
diff --git a/devops/sandbox/sandbox-deployment.jpg b/devops/sandbox/sandbox-deployment.jpg
new file mode 100644
index 00000000000..bb1b2dc0741
Binary files /dev/null and b/devops/sandbox/sandbox-deployment.jpg differ
diff --git a/devops/tools/elf_rockylinux_dependency_analyzer.py b/devops/tools/elf_rockylinux_dependency_analyzer.py
new file mode 100755
index 00000000000..593dd169aa6
--- /dev/null
+++ b/devops/tools/elf_rockylinux_dependency_analyzer.py
@@ -0,0 +1,321 @@
+#!/usr/bin/env python3
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+ELF Dependency Analyzer
+
+This script analyzes ELF (Executable and Linkable Format) binaries to determine their runtime
+package dependencies. It can process individual files or recursively analyze directories.
+
+The script provides information about:
+- Required packages and their versions
+- Missing libraries
+- Custom or non-RPM libraries
+- Other special cases
+
+It also groups packages by their high-level dependencies, which can be cached for performance.
+
+Usage:
+    python3 elf_dependency_analyzer.py [--rebuild-cache] <file_or_directory> [<file_or_directory> ...]
+
+The script will automatically determine if each argument is a file or directory and process accordingly.
+Use --rebuild-cache to force rebuilding of the high-level packages cache.
+
+Requirements:
+- Python 3.6+
+- prettytable (pip install prettytable)
+- python-dateutil (pip install python-dateutil)
+- ldd (usually pre-installed on Linux systems)
+- file (usually pre-installed on Linux systems)
+- rpm (usually pre-installed on RPM-based Linux distributions)
+- repoquery (part of yum-utils package)
+
+Functions:
+- check_requirements(): Checks if all required commands are available.
+- run_command(command): Executes a shell command and returns its output.
+- parse_ldd_line(line): Parses a line of ldd output to extract the library name.
+- find_library_in_ld_library_path(lib_name): Searches for a library in LD_LIBRARY_PATH.
+- get_package_info(lib_path): Gets package information for a given library.
+- get_package_dependencies(package): Gets dependencies of a package using repoquery.
+- build_high_level_packages(grand_summary): Builds a mapping of high-level packages to their dependencies.
+- load_or_build_high_level_packages(grand_summary, force_rebuild): Loads or builds the high-level packages cache.
+- print_summary(packages, special_cases, missing_libraries, binary_path): Prints a summary for a single binary.
+- process_binary(binary_path): Processes a single binary file.
+- is_elf_binary(file_path): Checks if a file is an ELF binary.
+- print_grand_summary(...): Prints a grand summary of all processed binaries.
+- analyze_path(path, grand_summary, grand_special_cases, grand_missing_libraries): Analyzes a file or directory.
+- main(): Main function to handle command-line arguments and initiate the analysis.
+
+This script is designed to help system administrators and developers understand the dependencies
+of ELF binaries in their systems, which can be useful for troubleshooting, optimizing, or
+preparing deployment packages.
+"""
+
+import os, subprocess, re, sys, json, shutil
+from collections import defaultdict
+from datetime import datetime, timedelta
+import argparse
+from prettytable import PrettyTable
+from dateutil import parser
+
+CACHE_FILE = 'high_level_packages_cache.json'
+CACHE_EXPIRY_DAYS = 7
+
+def check_requirements():
+    required_commands = ['ldd', 'file', 'rpm', 'repoquery']
+    missing_commands = [cmd for cmd in required_commands if shutil.which(cmd) is None]
+    if missing_commands:
+        print("Error: The following required commands are missing:")
+        for cmd in missing_commands:
+            print(f"  - {cmd}")
+        print("\nPlease install these commands and try again.")
+        if 'repoquery' in missing_commands:
+            print("Note: 'repoquery' is typically part of the 'yum-utils' package.")
+        sys.exit(1)
+
+def run_command(command):
+    try:
+        return subprocess.check_output(command, stderr=subprocess.STDOUT).decode('utf-8')
+    except subprocess.CalledProcessError as e:
+        print(f"Error running command {' '.join(command)}: {e.output.decode('utf-8').strip()}")
+        return None
+
+def parse_ldd_line(line):
+    match = re.search(r'\s*(\S+) => (\S+) \((0x[0-9a-f]+)\)', line)
+    return match.group(1) if match else None
+
+def find_library_in_ld_library_path(lib_name):
+    ld_library_path = os.environ.get('LD_LIBRARY_PATH', '')
+    for directory in ld_library_path.split(':'):
+        potential_path = os.path.join(directory, lib_name)
+        if os.path.isfile(potential_path):
+            return potential_path
+    return None
+
+def get_package_info(lib_path):
+    if not os.path.isfile(lib_path):
+        lib_name = os.path.basename(lib_path)
+        lib_path = find_library_in_ld_library_path(lib_name)
+        if not lib_path:
+            return None
+    try:
+        full_package_name = run_command(['rpm', '-qf', lib_path])
+        if full_package_name:
+            package_name = full_package_name.split('-')[0]
+            return package_name, full_package_name.strip()
+    except subprocess.CalledProcessError:
+        pass
+    return None
+
+def get_package_dependencies(package):
+    try:
+        output = subprocess.check_output(['repoquery', '--requires', '--resolve', package],
+                                         universal_newlines=True, stderr=subprocess.DEVNULL)
+        return set(output.strip().split('\n'))
+    except subprocess.CalledProcessError:
+        return set()
+
+def build_high_level_packages(grand_summary):
+    all_packages = set()
+    for packages in grand_summary.values():
+        all_packages.update(package.split('-')[0] for package in packages)
+    high_level_packages = {}
+    for package in all_packages:
+        deps = get_package_dependencies(package)
+        if deps:
+            high_level_packages[package] = [dep.split('-')[0] for dep in deps]
+    return high_level_packages
+
+def load_or_build_high_level_packages(grand_summary, force_rebuild=False):
+    if not force_rebuild and os.path.exists(CACHE_FILE):
+        with open(CACHE_FILE, 'r') as f:
+            cache_data = json.load(f)
+        if datetime.now() - parser.parse(cache_data['timestamp']) < timedelta(days=CACHE_EXPIRY_DAYS):
+            return cache_data['packages']
+    packages = build_high_level_packages(grand_summary)
+    with open(CACHE_FILE, 'w') as f:
+        json.dump({'timestamp': datetime.now().isoformat(), 'packages': packages}, f)
+    return packages
+
+def print_summary(packages, special_cases, missing_libraries, binary_path):
+    print("\nSummary of unique runtime packages required:")
+    table = PrettyTable(['Package Name', 'Full Package Name'])
+    table.align['Package Name'] = 'l'
+    table.align['Full Package Name'] = 'l'
+    unique_packages = sorted(set(packages))
+    for package_name, full_package_name in unique_packages:
+        table.add_row([package_name, full_package_name])
+    print(table)
+    if missing_libraries:
+        print("\nMISSING LIBRARIES:")
+        missing_table = PrettyTable(['Missing Library', 'Referenced By'])
+        missing_table.align['Missing Library'] = 'l'
+        missing_table.align['Referenced By'] = 'l'
+        for lib in missing_libraries:
+            missing_table.add_row([lib, binary_path])
+        print(missing_table)
+    if special_cases:
+        print("\nSPECIAL CASES:")
+        special_table = PrettyTable(['Library/Case', 'Referenced By', 'Category'])
+        special_table.align['Library/Case'] = 'l'
+        special_table.align['Referenced By'] = 'l'
+        special_table.align['Category'] = 'l'
+        for case in special_cases:
+            category = "Custom/Non-RPM" if "custom or non-RPM library" in case else "Other"
+            library = case.split(" is ")[0] if " is " in case else case
+            special_table.add_row([library, binary_path, category])
+        print(special_table)
+    else:
+        print("\nSPECIAL CASES: None found")
+
+def process_binary(binary_path):
+    print(f"Binary: {binary_path}\n")
+    print("Libraries and their corresponding packages:")
+    packages, special_cases, missing_libraries = [], [], []
+    known_special_cases = ['linux-vdso.so.1', 'ld-linux-x86-64.so.2']
+    ldd_output = run_command(['ldd', binary_path])
+    if ldd_output is None:
+        return packages, special_cases, missing_libraries
+    for line in ldd_output.splitlines():
+        if any(special in line for special in known_special_cases):
+            continue
+        parts = line.split('=>')
+        lib_name = parts[0].strip()
+        if "not found" in line:
+            missing_libraries.append(lib_name)
+            print(f"MISSING: {line.strip()}")
+        else:
+            if len(parts) > 1:
+                lib_path = parts[1].split()[0]
+                if lib_path != "not":
+                    package_info = get_package_info(lib_path)
+                    if package_info:
+                        print(f"{lib_path} => {package_info[1]}")
+                        packages.append(package_info)
+                    else:
+                        if os.path.exists(lib_path):
+                            special_case = f"{lib_path} is a custom or non-RPM library"
+                            special_cases.append(special_case)
+                            print(f"{lib_path} => Custom or non-RPM library")
+                        else:
+                            special_case = f"{lib_path} is not found and might be a special case"
+                            special_cases.append(special_case)
+                            print(f"{lib_path} => Not found, might be a special case")
+                else:
+                    special_case = f"{line.strip()} is a special case or built-in library"
+                    special_cases.append(special_case)
+                    print(f"{line.strip()} => Special case or built-in library")
+            else:
+                special_case = f"{line.strip()} is a special case or built-in library"
+                special_cases.append(special_case)
+                print(f"{line.strip()} => Special case or built-in library")
+    if special_cases:
+        print(f"Special cases found for {binary_path}:")
+        for case in special_cases:
+            print(f"  - {case}")
+    else:
+        print(f"No special cases found for {binary_path}")
+    print_summary(packages, special_cases, missing_libraries, binary_path)
+    print("-------------------------------------------")
+    return packages, special_cases, missing_libraries
+
+def is_elf_binary(file_path):
+    file_output = run_command(['file', file_path])
+    return 'ELF' in file_output and ('executable' in file_output or 'shared object' in file_output)
+
+def print_grand_summary(grand_summary, grand_special_cases, grand_missing_libraries, HIGH_LEVEL_PACKAGES, PACKAGE_TO_HIGH_LEVEL):
+    if grand_summary or grand_special_cases or grand_missing_libraries:
+        print("\nGrand Summary of high-level runtime packages required across all binaries:")
+        high_level_summary = defaultdict(set)
+        for package_name, full_package_names in grand_summary.items():
+            high_level_package = PACKAGE_TO_HIGH_LEVEL.get(package_name.split('-')[0], package_name.split('-')[0])
+            high_level_summary[high_level_package].update(full_package_names)
+        table = PrettyTable(['High-Level Package', 'Included Packages'])
+        table.align['High-Level Package'] = 'l'
+        table.align['Included Packages'] = 'l'
+        for high_level_package, full_package_names in sorted(high_level_summary.items()):
+            included_packages = '\n'.join(sorted(full_package_names))
+            table.add_row([high_level_package, included_packages])
+        print(table)
+        if grand_missing_libraries:
+            print("\nGrand Summary of MISSING LIBRARIES across all binaries:")
+            missing_table = PrettyTable(['Missing Library', 'Referenced By'])
+            missing_table.align['Missing Library'] = 'l'
+            missing_table.align['Referenced By'] = 'l'
+            for lib, binaries in sorted(grand_missing_libraries.items()):
+                missing_table.add_row([lib, '\n'.join(sorted(binaries))])
+            print(missing_table)
+        print("\nGrand Summary of special cases across all binaries:")
+        if grand_special_cases:
+            special_table = PrettyTable(['Library/Case', 'Referenced By', 'Category'])
+            special_table.align['Library/Case'] = 'l'
+            special_table.align['Referenced By'] = 'l'
+            special_table.align['Category'] = 'l'
+            for case, binary in sorted(set(grand_special_cases)):
+                category = "Custom/Non-RPM" if "custom or non-RPM library" in case else "Other"
+                library = case.split(" is ")[0] if " is " in case else case
+                special_table.add_row([library, binary, category])
+            print(special_table)
+        else:
+            print("No special cases found.")
+
+def analyze_path(path, grand_summary, grand_special_cases, grand_missing_libraries):
+    if os.path.isfile(path):
+        packages, special_cases, missing_libraries = process_binary(path)
+        for package_name, full_package_name in packages:
+            grand_summary[package_name].add(full_package_name)
+        grand_special_cases.extend((case, path) for case in special_cases)
+        for lib in missing_libraries:
+            grand_missing_libraries[lib].add(path)
+    elif os.path.isdir(path):
+        for root, dirs, files in os.walk(path):
+            for file in files:
+                file_path = os.path.join(root, file)
+                if is_elf_binary(file_path):
+                    packages, special_cases, missing_libraries = process_binary(file_path)
+                    for package_name, full_package_name in packages:
+                        grand_summary[package_name].add(full_package_name)
+                    grand_special_cases.extend((case, file_path) for case in special_cases)
+                    for lib in missing_libraries:
+                        grand_missing_libraries[lib].add(file_path)
+    else:
+        print(f"Error: {path} is neither a valid file nor a directory.")
+    if grand_special_cases:
+        print(f"Accumulated special cases after processing {path}:")
+        for case, binary in grand_special_cases:
+            print(f"  - {case} (in {binary})")
+    else:
+        print(f"No special cases accumulated after processing {path}")
+
+def main():
+    check_requirements()
+    parser = argparse.ArgumentParser(description="ELF Dependency Analyzer")
+    parser.add_argument('paths', nargs='+', help="Paths to files or directories to analyze")
+    parser.add_argument('--rebuild-cache', action='store_true', help="Force rebuild of the high-level packages cache")
+    args = parser.parse_args()
+    grand_summary = defaultdict(set)
+    grand_special_cases = []
+    grand_missing_libraries = defaultdict(set)
+    for path in args.paths:
+        analyze_path(path, grand_summary, grand_special_cases, grand_missing_libraries)
+    HIGH_LEVEL_PACKAGES = load_or_build_high_level_packages(grand_summary, args.rebuild_cache)
+    PACKAGE_TO_HIGH_LEVEL = {low: high for high, lows in HIGH_LEVEL_PACKAGES.items() for low in lows}
+    print_grand_summary(grand_summary, grand_special_cases, grand_missing_libraries, HIGH_LEVEL_PACKAGES, PACKAGE_TO_HIGH_LEVEL)
+
+if __name__ == '__main__':
+    main()
diff --git a/devops/tools/elf_ubuntu_dependency_analyzer.py b/devops/tools/elf_ubuntu_dependency_analyzer.py
new file mode 100755
index 00000000000..a1741f7f888
--- /dev/null
+++ b/devops/tools/elf_ubuntu_dependency_analyzer.py
@@ -0,0 +1,303 @@
+#!/usr/bin/env python3
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+ELF Dependency Analyzer for Ubuntu
+
+This script analyzes ELF (Executable and Linkable Format) binaries to determine their runtime
+package dependencies on Ubuntu systems. It can process individual files or recursively analyze directories.
+
+The script provides information about:
+- Required packages and their versions
+- Custom or non-APT libraries
+- Core system libraries
+- Missing libraries
+- Other special cases
+
+Usage:
+    python3 elf_dependency_analyzer.py [file_or_directory] [file_or_directory] ...
+
+Requirements:
+- Python 3.6+
+- prettytable (pip install prettytable)
+- ldd (usually pre-installed on Linux systems)
+- file (usually pre-installed on Linux systems)
+- dpkg (pre-installed on Ubuntu)
+"""
+
+import os
+import subprocess
+import re
+import sys
+import argparse
+from collections import defaultdict
+from prettytable import PrettyTable
+
+def run_command(command):
+    """
+    Execute a shell command and return its output.
+
+    Args:
+    command (list): The command to execute as a list of strings.
+
+    Returns:
+    str: The output of the command, or None if an error occurred.
+    """
+    try:
+        return subprocess.check_output(command, stderr=subprocess.STDOUT).decode('utf-8')
+    except subprocess.CalledProcessError as e:
+        print(f"Error running command {' '.join(command)}: {e.output.decode('utf-8').strip()}")
+        return None
+
+def get_package_info(lib_path):
+    """
+    Get package information for a given library path.
+
+    Args:
+    lib_path (str): The path to the library.
+
+    Returns:
+    tuple: A tuple containing the package name and full package information.
+    """
+    if lib_path.startswith('/usr/local/cloudberry-db'):
+        return "cloudberry-custom", f"Cloudberry custom library: {lib_path}"
+
+    dpkg_output = run_command(['dpkg', '-S', lib_path])
+    if dpkg_output:
+        package_name = dpkg_output.split(':')[0]
+        return package_name, dpkg_output.strip()
+
+    # List of core system libraries that might not be individually tracked by dpkg
+    core_libs = {
+        'libc.so': 'libc6',
+        'libm.so': 'libc6',
+        'libdl.so': 'libc6',
+        'libpthread.so': 'libc6',
+        'libresolv.so': 'libc6',
+        'librt.so': 'libc6',
+        'libgcc_s.so': 'libgcc-s1',
+        'libstdc++.so': 'libstdc++6',
+        'libz.so': 'zlib1g',
+        'libbz2.so': 'libbz2-1.0',
+        'libpam.so': 'libpam0g',
+        'libaudit.so': 'libaudit1',
+        'libcap-ng.so': 'libcap-ng0',
+        'libkeyutils.so': 'libkeyutils1',
+        'liblzma.so': 'liblzma5',
+        'libcom_err.so': 'libcomerr2'
+    }
+
+    lib_name = os.path.basename(lib_path)
+    for core_lib, package in core_libs.items():
+        if lib_name.startswith(core_lib):
+            return package, f"Core system library: {lib_path}"
+
+    # If not a recognized core library, return as system library
+    file_output = run_command(['file', lib_path])
+    if file_output:
+        return "system-library", f"System library: {lib_path} - {file_output.strip()}"
+
+    return None
+
+def print_summary(packages, special_cases, missing_libraries, binary_path):
+    """
+    Print a summary of the dependencies for a binary.
+
+    Args:
+    packages (list): List of package tuples (package_name, full_package_name).
+    special_cases (list): List of special case strings.
+    missing_libraries (list): List of missing library names.
+    binary_path (str): Path to the binary being analyzed.
+    """
+    print("\nSummary of runtime dependencies:")
+    table = PrettyTable(['Category', 'Package/Library', 'Details'])
+    table.align['Category'] = 'l'
+    table.align['Package/Library'] = 'l'
+    table.align['Details'] = 'l'
+
+    categories = {
+        'cloudberry-custom': 'Cloudberry Custom',
+        'system-library': 'System Library',
+    }
+
+    for package_name, full_package_name in sorted(set(packages)):
+        category = categories.get(package_name, 'System Package')
+        table.add_row([category, package_name, full_package_name])
+
+    print(table)
+
+    if missing_libraries:
+        print("\nMISSING LIBRARIES:")
+        for lib in missing_libraries:
+            print(f"  - {lib}")
+
+    if special_cases:
+        print("\nSPECIAL CASES:")
+        for case in special_cases:
+            print(f"  - {case}")
+
+def process_binary(binary_path):
+    """
+    Process a single binary file to determine its dependencies.
+
+    Args:
+    binary_path (str): Path to the binary file.
+
+    Returns:
+    tuple: A tuple containing lists of packages, special cases, and missing libraries.
+    """
+    print(f"Binary: {binary_path}\n")
+    print("Libraries and their corresponding packages:")
+    packages, special_cases, missing_libraries = [], [], []
+
+    ldd_output = run_command(['ldd', binary_path])
+    if ldd_output is None:
+        return packages, special_cases, missing_libraries
+
+    for line in ldd_output.splitlines():
+        if "=>" not in line:
+            continue
+
+        parts = line.split('=>')
+        lib_name = parts[0].strip()
+        lib_path = parts[1].split()[0].strip()
+        lib_path = os.path.realpath(lib_path)
+
+        if lib_path == "not":
+            missing_libraries.append(lib_name)
+            print(f"MISSING: {line.strip()}")
+        else:
+            package_info = get_package_info(lib_path)
+            if package_info:
+                print(f"{lib_path} => {package_info[1]}")
+                packages.append(package_info)
+            else:
+                special_case = f"{lib_path} is not found and might be a special case"
+                special_cases.append(special_case)
+                print(f"{lib_path} => Not found, might be a special case")
+
+    print_summary(packages, special_cases, missing_libraries, binary_path)
+    print("-------------------------------------------")
+    return packages, special_cases, missing_libraries
+
+def is_elf_binary(file_path):
+    """
+    Check if a file is an ELF binary.
+
+    Args:
+    file_path (str): Path to the file.
+
+    Returns:
+    bool: True if the file is an ELF binary, False otherwise.
+    """
+    file_output = run_command(['file', file_path])
+    return 'ELF' in file_output and ('executable' in file_output or 'shared object' in file_output)
+
+def print_grand_summary(grand_summary, grand_special_cases, grand_missing_libraries):
+    """
+    Print a grand summary of all analyzed binaries.
+
+    Args:
+    grand_summary (dict): Dictionary of all packages and their details.
+    grand_special_cases (list): List of all special cases.
+    grand_missing_libraries (dict): Dictionary of all missing libraries.
+    """
+    if grand_summary or grand_special_cases or grand_missing_libraries:
+        print("\nGrand Summary of runtime packages required across all binaries:")
+        table = PrettyTable(['Package', 'Included Packages'])
+        table.align['Package'] = 'l'
+        table.align['Included Packages'] = 'l'
+        for package_name, full_package_names in sorted(grand_summary.items()):
+            included_packages = '\n'.join(sorted(full_package_names))
+            table.add_row([package_name, included_packages])
+        print(table)
+
+        if grand_missing_libraries:
+            print("\nGrand Summary of MISSING LIBRARIES across all binaries:")
+            missing_table = PrettyTable(['Missing Library', 'Referenced By'])
+            missing_table.align['Missing Library'] = 'l'
+            missing_table.align['Referenced By'] = 'l'
+            for lib, binaries in sorted(grand_missing_libraries.items()):
+                missing_table.add_row([lib, '\n'.join(sorted(binaries))])
+            print(missing_table)
+
+        print("\nGrand Summary of special cases across all binaries:")
+        if grand_special_cases:
+            special_table = PrettyTable(['Library/Case', 'Referenced By', 'Category'])
+            special_table.align['Library/Case'] = 'l'
+            special_table.align['Referenced By'] = 'l'
+            special_table.align['Category'] = 'l'
+            for case, binary in sorted(set(grand_special_cases)):
+                category = "System Library" if "system library" in case else "Other"
+                library = case.split(" is ")[0] if " is " in case else case
+                special_table.add_row([library, binary, category])
+            print(special_table)
+        else:
+            print("No special cases found.")
+
+def analyze_path(path, grand_summary, grand_special_cases, grand_missing_libraries):
+    """
+    Analyze a file or directory for ELF binaries and their dependencies.
+
+    Args:
+    path (str): Path to the file or directory to analyze.
+    grand_summary (dict): Dictionary to store all package information.
+    grand_special_cases (list): List to store all special cases.
+    grand_missing_libraries (dict): Dictionary to store all missing libraries.
+    """
+    if os.path.isfile(path):
+        if is_elf_binary(path):
+            packages, special_cases, missing_libraries = process_binary(path)
+            for package_name, full_package_name in packages:
+                grand_summary[package_name].add(full_package_name)
+            grand_special_cases.extend((case, path) for case in special_cases)
+            for lib in missing_libraries:
+                grand_missing_libraries[lib].add(path)
+    elif os.path.isdir(path):
+        for root, dirs, files in os.walk(path):
+            for file in files:
+                file_path = os.path.join(root, file)
+                if is_elf_binary(file_path):
+                    packages, special_cases, missing_libraries = process_binary(file_path)
+                    for package_name, full_package_name in packages:
+                        grand_summary[package_name].add(full_package_name)
+                    grand_special_cases.extend((case, file_path) for case in special_cases)
+                    for lib in missing_libraries:
+                        grand_missing_libraries[lib].add(file_path)
+    else:
+        print(f"Error: {path} is neither a valid file nor a directory.")
+
+def main():
+    """
+    Main function to handle command-line arguments and initiate the analysis.
+    """
+    parser = argparse.ArgumentParser(description="ELF Dependency Analyzer for Ubuntu")
+    parser.add_argument('paths', nargs='+', help="Paths to files or directories to analyze")
+    args = parser.parse_args()
+
+    grand_summary = defaultdict(set)
+    grand_special_cases = []
+    grand_missing_libraries = defaultdict(set)
+
+    for path in args.paths:
+        analyze_path(path, grand_summary, grand_special_cases, grand_missing_libraries)
+
+    print_grand_summary(grand_summary, grand_special_cases, grand_missing_libraries)
+
+if __name__ == '__main__':
+    main()
diff --git a/devops/tools/s3-repo-sync-and-sign.sh b/devops/tools/s3-repo-sync-and-sign.sh
new file mode 100755
index 00000000000..1cd037749c6
--- /dev/null
+++ b/devops/tools/s3-repo-sync-and-sign.sh
@@ -0,0 +1,266 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -euo pipefail
+
+# Description:
+# This script automates several tasks related to managing RPM repositories in AWS S3.
+# It handles the following operations:
+#   1. Syncing an RPM repository from an S3 bucket to a local directory.
+#   2. Signing all RPMs in the local repository with a specified GPG key.
+#   3. Updating and signing the repository metadata.
+#   4. Exporting the GPG public key and placing it in the repository for client use.
+#   5. Optionally, uploading changes back to the S3 bucket and deleting files in S3 that no longer exist locally.
+#   6. Decrypting and importing a GPG private key used for signing.
+#   7. A mode to only decrypt and import the GPG private key.
+#   8. Identifying and copying a newly built RPM to the appropriate repository.
+
+# Function to display detailed usage information
+usage() {
+  cat << EOF
+Usage: $0 [OPTIONS]
+
+This script automates several tasks related to managing RPM repositories in AWS S3.
+It can be used to sync repositories from S3, sign RPMs with a GPG key, update and sign repository metadata,
+and optionally upload changes back to S3.
+
+Options:
+  -c                            Configure AWS credentials using 'aws configure'.
+  -s <s3-bucket>                Specify the S3 bucket and path to sync (required for S3 operations).
+  -d <local-dir>                Specify the local directory to sync to (default: ~/repo).
+  -k <encrypted-key-file>       Specify the encrypted GPG private key file to import (optional).
+  -g <gpg-key-id>               Specify the GPG key ID or email to use for signing (required for signing operations).
+  --upload-with-delete          Sync local changes to S3, deleting files in S3 that no longer exist locally.
+  --s3-sync-only                Perform only the S3 sync to the local directory, inform the user, and exit.
+  --import-gpg-key-only         Decrypt and import the GPG private key, then exit. No other operations will be performed.
+  --copy-new-rpm                Copy the newly built RPM(s) to the appropriate repository directory based on architecture and version.
+  -h, --help                    Display this help message and exit.
+
+Examples:
+  # Sync an S3 repository to a local directory and sign RPMs with a GPG key
+  $0 -s s3://mybucket/repo -g mygpgkey@example.com
+
+  # Sync an S3 repository only, without signing RPMs or performing other operations
+  $0 -s s3://mybucket/repo --s3-sync-only
+
+  # Decrypt and import a GPG private key, then exit
+  $0 -k ~/path/to/encrypted-gpg-key.asc --import-gpg-key-only
+
+  # Copy newly built RPMs to the appropriate repository and sign them
+  $0 --copy-new-rpm -g mygpgkey@example.com
+
+Notes:
+  - The -s option is required for any operation that interacts with S3, such as syncing or uploading with delete.
+  - The -g option is required for any operation that involves signing RPMs or repository metadata.
+  - When using --upload-with-delete, ensure that you have the necessary permissions to delete objects in the specified S3 bucket.
+  - If you only want to perform local operations (e.g., copying RPMs, signing), you do not need to specify the -s option.
+
+EOF
+}
+
+# Parse options and arguments
+GPG_KEY_ID=""
+UPLOAD_WITH_DELETE=false
+S3_SYNC_ONLY=false
+IMPORT_GPG_KEY_ONLY=false
+COPY_NEW_RPM=false
+CONFIGURE_AWS=false
+LOCAL_DIR=~/repo
+
+# Function to check if required commands are available
+check_commands() {
+  local cmds=("aws" "gpg" "shred" "createrepo" "rpm" "find")
+  for cmd in "${cmds[@]}"; do
+    if ! command -v "$cmd" &> /dev/null; then
+      echo "Error: Required command '$cmd' not found. Please install it before running the script."
+      exit 1
+    fi
+  done
+}
+
+# Parse options
+while [[ "$#" -gt 0 ]]; do
+  case $1 in
+    -c) CONFIGURE_AWS=true; shift ;;
+    -s) S3_BUCKET="$2"; shift 2 ;;
+    -d) LOCAL_DIR="$2"; shift 2 ;;
+    -k) ENCRYPTED_KEY_FILE="$2"; shift 2 ;;
+    -g) GPG_KEY_ID="$2"; shift 2 ;;
+    --upload-with-delete) UPLOAD_WITH_DELETE=true; shift ;;
+    --s3-sync-only) S3_SYNC_ONLY=true; shift ;;
+    --import-gpg-key-only) IMPORT_GPG_KEY_ONLY=true; shift ;;
+    --copy-new-rpm) COPY_NEW_RPM=true; shift ;;
+    -h|--help) usage; exit 0 ;;
+    *) echo "Unknown option: $1"; usage; exit 1 ;;
+  esac
+done
+
+check_commands
+
+# AWS credentials configuration (optional)
+if [ "$CONFIGURE_AWS" = true ]; then
+  echo "Configuring AWS credentials..."
+  aws configure
+fi
+
+# Decrypt and import GPG private key if in import-only mode or not in sync-only mode
+if [ -n "${ENCRYPTED_KEY_FILE:-}" ]; then
+  DECRYPTED_KEY_FILE="${ENCRYPTED_KEY_FILE%.*}"
+  echo "Decrypting GPG private key..."
+  gpg --decrypt --output "$DECRYPTED_KEY_FILE" "$ENCRYPTED_KEY_FILE"
+
+  # Check if the key is already imported
+  if gpg --list-keys | grep -q "$GPG_KEY_ID"; then
+    echo "GPG key already imported."
+  else
+    gpg --import "$DECRYPTED_KEY_FILE"
+  fi
+
+  # Securely delete the decrypted key file
+  shred -u "$DECRYPTED_KEY_FILE"
+
+  # Exit if only importing GPG key
+  if [ "$IMPORT_GPG_KEY_ONLY" = true ]; then
+    echo "GPG key has been decrypted and imported successfully. Exiting."
+    exit 0
+  fi
+fi
+
+# Check access to the S3 bucket and perform sync only if needed
+if [ "$IMPORT_GPG_KEY_ONLY" = false ] && [ "$S3_SYNC_ONLY" = false ] && [ "$COPY_NEW_RPM" = false ] && [ "$UPLOAD_WITH_DELETE" = false ]; then
+  if [ -z "${S3_BUCKET:-}" ]; then
+    echo "Error: S3 bucket (-s) is required."
+    exit 1
+  fi
+
+  echo "Checking access to S3 bucket $S3_BUCKET..."
+  if ! aws s3 ls "$S3_BUCKET" &> /dev/null; then
+    echo "Error: Unable to access S3 bucket $S3_BUCKET. Please check your AWS credentials and permissions."
+    exit 1
+  fi
+
+  # Sync the S3 repository to the local directory
+  mkdir -p "$LOCAL_DIR"
+  echo "Syncing S3 repository from $S3_BUCKET to $LOCAL_DIR..."
+  aws s3 sync "$S3_BUCKET" "$LOCAL_DIR"
+
+  # Check if the operation is `s3-sync-only`
+  if [ "$S3_SYNC_ONLY" = true ]; then
+    echo "S3 sync operation completed successfully."
+    exit 0
+  fi
+fi
+
+# Copy the newly built RPM to the appropriate repository
+if [ "$COPY_NEW_RPM" = true ]; then
+  echo "Identifying the newly built RPMs..."
+
+  for ARCH in x86_64 noarch; do
+    RPM_DIR=~/rpmbuild/RPMS/$ARCH
+
+    # Check if the RPM directory exists
+    if [ ! -d "$RPM_DIR" ]; then
+      echo "Warning: Directory $RPM_DIR does not exist. Skipping $ARCH."
+      continue
+    fi
+
+    # Find all matching RPMs and copy them to the appropriate repository directory
+    NEW_RPMS=$(find "$RPM_DIR" -name "cloudberry-*.rpm" ! -name "*debuginfo*.rpm")
+    if [ -n "$NEW_RPMS" ]; then
+      for NEW_RPM in $NEW_RPMS; do
+        # Determine the repository (el8 or el9) based on the RPM filename
+        if echo "$NEW_RPM" | grep -q "\.el8\."; then
+          TARGET_REPO="$LOCAL_DIR/el8/$ARCH"
+        elif echo "$NEW_RPM" | grep -q "\.el9\."; then
+          TARGET_REPO="$LOCAL_DIR/el9/$ARCH"
+        else
+          echo "Error: Unable to determine the correct repository for $NEW_RPM. Exiting."
+          exit 1
+        fi
+
+        # Ensure the target repository directory exists
+        mkdir -p "$TARGET_REPO"
+
+        # Copy the RPM to the target repository
+        echo "Copying $NEW_RPM to $TARGET_REPO..."
+        cp "$NEW_RPM" "$TARGET_REPO/"
+        echo "Copy operation completed."
+      done
+    else
+      echo "No matching RPMs found in $RPM_DIR."
+    fi
+  done
+fi
+
+# Define the directories for `el8` and `el9` repositories
+REPO_DIRS=("$LOCAL_DIR/el8/x86_64" "$LOCAL_DIR/el8/noarch" "$LOCAL_DIR/el9/x86_64" "$LOCAL_DIR/el9/noarch")
+
+# Traverse each repository directory (el8 and el9) and sign RPMs
+for REPO_DIR in "${REPO_DIRS[@]}"; do
+  if [ -d "$REPO_DIR" ]; then
+    echo "Processing repository at $REPO_DIR..."
+
+    # Export GPG public key for clients and place it in the root of the repository
+    TEMP_GPG_KEY=$(mktemp)
+    echo "Exporting GPG public key to temporary location..."
+    gpg --armor --export "$GPG_KEY_ID" > "$TEMP_GPG_KEY"
+
+    # Import the GPG public key to RPM database
+    echo "Importing GPG public key into RPM database..."
+    sudo rpm --import "$TEMP_GPG_KEY"
+
+    # Sign each RPM in the directory
+    echo "Signing RPM packages in $REPO_DIR..."
+    find "$REPO_DIR" -name "*.rpm" -exec rpm --addsign --define "_gpg_name $GPG_KEY_ID" {} \;
+
+    # Verify that RPMs were signed successfully
+    echo "Verifying RPM signatures in $REPO_DIR..."
+    find "$REPO_DIR" -name "*.rpm" -exec rpm -Kv {} \;
+
+    # Recreate the repository metadata
+    echo "Updating repository metadata in $REPO_DIR..."
+    createrepo --update "$REPO_DIR"
+
+    # Sign the repository metadata, automatically overwriting if the file already exists
+    echo "Signing repository metadata in $REPO_DIR..."
+    gpg --batch --yes --detach-sign --armor --local-user "$GPG_KEY_ID" "$REPO_DIR/repodata/repomd.xml"
+
+    # Copy the public key to each repo
+    cp "$TEMP_GPG_KEY" "$REPO_DIR/RPM-GPG-KEY-cloudberry"
+
+    # Clean up temporary GPG key
+    rm -f "$TEMP_GPG_KEY"
+  else
+    echo "Warning: Repository directory $REPO_DIR does not exist. Skipping..."
+  fi
+done
+
+# Upload changes to S3 with --delete option if requested
+if [ "$UPLOAD_WITH_DELETE" = true ]; then
+  if [ -z "${S3_BUCKET:-}" ]; then
+    echo "Error: S3 bucket (-s) is required for upload with delete."
+    exit 1
+  fi
+
+  echo "Uploading local changes to S3 with --delete option..."
+  aws s3 sync "$LOCAL_DIR" "$S3_BUCKET" --delete
+  echo "S3 sync with --delete completed."
+fi
+
+# Print completion message
+echo "S3 repository sync, RPM signing, metadata signing, and public key export completed successfully."
diff --git a/doc/src/sgml/pgbuffercache.sgml b/doc/src/sgml/pgbuffercache.sgml
index 8f314ee8ff4..a05f010b2a5 100644
--- a/doc/src/sgml/pgbuffercache.sgml
+++ b/doc/src/sgml/pgbuffercache.sgml
@@ -21,9 +21,10 @@
  </indexterm>
 
  <para>
-  The module provides the <function>pg_buffercache_pages()</function>
-  function, wrapped in the <structname>pg_buffercache</structname> view, and
-  the <function>pg_buffercache_summary()</function> function.
+  This module provides the <function>pg_buffercache_pages()</function>
+  function (wrapped in the <structname>pg_buffercache</structname> view),
+  the <function>pg_buffercache_summary()</function> function, and the
+  <function>pg_buffercache_usage_counts()</function> function.
  </para>
 
  <para>
@@ -38,6 +39,12 @@
   row summarizing the state of the shared buffer cache.
  </para>
 
+ <para>
+  The <function>pg_buffercache_usage_counts()</function> function returns a set
+  of records, each row describing the number of buffers with a given usage
+  count.
+ </para>
+
  <para>
   By default, use is restricted to superusers and roles with privileges of the
   <literal>pg_monitor</literal> role. Access may be granted to others
@@ -242,7 +249,7 @@
        <structfield>usagecount_avg</structfield> <type>float8</type>
       </para>
       <para>
-       Average usagecount of used shared buffers
+       Average usage count of used shared buffers
       </para></entry>
      </row>
     </tbody>
@@ -266,6 +273,84 @@
  </sect2>
 
  <sect2>
+  <title>The <function>pg_buffercache_usage_counts()</function> Function</title>
+
+  <para>
+   The definitions of the columns exposed by the function are shown in
+   <xref linkend="pgbuffercache_usage_counts-columns"/>.
+  </para>
+
+  <table id="pgbuffercache_usage_counts-columns">
+   <title><function>pg_buffercache_usage_counts()</function> Output Columns</title>
+   <tgroup cols="1">
+    <thead>
+     <row>
+      <entry role="catalog_table_entry"><para role="column_definition">
+       Column Type
+      </para>
+      <para>
+       Description
+      </para></entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry role="catalog_table_entry"><para role="column_definition">
+       <structfield>usage_count</structfield> <type>int4</type>
+      </para>
+      <para>
+       A possible buffer usage count
+      </para></entry>
+     </row>
+
+     <row>
+      <entry role="catalog_table_entry"><para role="column_definition">
+       <structfield>buffers</structfield> <type>int4</type>
+      </para>
+      <para>
+       Number of buffers with the usage count
+      </para></entry>
+     </row>
+
+     <row>
+      <entry role="catalog_table_entry"><para role="column_definition">
+       <structfield>dirty</structfield> <type>int4</type>
+      </para>
+      <para>
+       Number of dirty buffers with the usage count
+      </para></entry>
+     </row>
+
+     <row>
+      <entry role="catalog_table_entry"><para role="column_definition">
+       <structfield>pinned</structfield> <type>int4</type>
+      </para>
+      <para>
+       Number of pinned buffers with the usage count
+      </para></entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+
+  <para>
+   The <function>pg_buffercache_usage_counts()</function> function returns a
+   set of rows summarizing the states of all shared buffers, aggregated over
+   the possible usage count values.  Similar and more detailed information is
+   provided by the <structname>pg_buffercache</structname> view, but
+   <function>pg_buffercache_usage_counts()</function> is significantly cheaper.
+  </para>
+
+  <para>
+   Like the <structname>pg_buffercache</structname> view,
+   <function>pg_buffercache_usage_counts()</function> does not acquire buffer
+   manager locks. Therefore concurrent activity can lead to minor inaccuracies
+   in the result.
+  </para>
+ </sect2>
+
+ <sect2 id="pgbuffercache-sample-output">
   <title>Sample Output</title>
 
 <screen>
@@ -299,6 +384,18 @@ regression=# SELECT * FROM pg_buffercache_summary();
 --------------+----------------+---------------+----------------+----------------
           248 |        2096904 |            39 |              0 |       3.141129
 (1 row)
+
+
+regression=# SELECT * FROM pg_buffercache_usage_counts();
+ usage_count | buffers | dirty | pinned
+-------------+---------+-------+--------
+           0 |   14650 |     0 |      0
+           1 |    1436 |   671 |      0
+           2 |     102 |    88 |      0
+           3 |      23 |    21 |      0
+           4 |       9 |     7 |      0
+           5 |     164 |   106 |      0
+(6 rows)
 </screen>
  </sect2>
 
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index aa0dc14c6e6..c20cf1a5a6e 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -82,7 +82,7 @@ where storage_parameter is:
    APPENDONLY={TRUE|FALSE}
    BLOCKSIZE={8192-2097152}
    ORIENTATION={COLUMN|ROW}
-   COMPRESSTYPE={ZLIB|QUICKLZ|RLE_TYPE|NONE}
+   COMPRESSTYPE={ZLIB|RLE_TYPE|NONE}
    COMPRESSLEVEL={0-9}
    CHECKSUM={TRUE|FALSE}
    FILLFACTOR={10-100}
@@ -173,7 +173,7 @@ and subpartition_element is:
 [ TABLESPACE tablespace ]
 
 where storage_directive is:
-   COMPRESSTYPE={ZLIB | QUICKLZ | RLE_TYPE | NONE} 
+   COMPRESSTYPE={ZLIB | RLE_TYPE | NONE} 
  | COMPRESSLEVEL={0-9} 
  | BLOCKSIZE={8192-2097152}
 
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index fc2df51772e..936184ed83e 100644
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -34,7 +34,7 @@ where storage_parameter is:
    APPENDONLY={TRUE|FALSE}
    BLOCKSIZE={8192-2097152}
    ORIENTATION={COLUMN|ROW}
-   COMPRESSTYPE={ZLIB|QUICKLZ|RLE_TYPE|NONE}
+   COMPRESSTYPE={ZLIB|RLE_TYPE|NONE}
    COMPRESSLEVEL={0-9}
    CHECKSUM={TRUE|FALSE}
    FILLFACTOR={10-100}
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 1dea9341f53..ca6ff8cdc65 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -863,16 +863,6 @@ PostgreSQL documentation
         and the two systems have different definitions of the collation used
         to sort the partitioning column.
        </para>
-
-       <para>
-        It is best not to use parallelism when restoring from an archive made
-        with this option, because <application>pg_restore</application> will
-        not know exactly which partition(s) a given archive data item will
-        load data into.  This could result in inefficiency due to lock
-        conflicts between parallel jobs, or perhaps even reload failures due
-        to foreign key constraints being set up before all the relevant data
-        is loaded.
-       </para>
       </listitem>
      </varlistentry>
 
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 1181e182b1a..5bde886c453 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -395,10 +395,6 @@ PostgreSQL documentation
         and the two systems have different definitions of the collation used
         to sort the partitioning column.
        </para>
-
-       <!-- Currently, we don't need pg_dump's warning about parallelism here,
-        since parallel restore from a pg_dumpall script is impossible.
-       -->
       </listitem>
      </varlistentry>
 
diff --git a/getversion b/getversion
index 76f6984ada5..b4c29112651 100755
--- a/getversion
+++ b/getversion
@@ -94,7 +94,7 @@ generate_dev_version() {
 }
 
 # Check if we're in a Git repo and git is available
-if type git >/dev/null 2>&1 && [ -d '.git' ]; then
+if type git >/dev/null 2>&1 && [ -e '.git' ]; then
     # Ensure git describe doesn't fail due to shallow clone
     if git describe --tags --long >/dev/null 2>&1; then
         if git describe --exact-match >/dev/null 2>&1; then
diff --git a/gpAux/Makefile b/gpAux/Makefile
index 6502cffd0c4..dcdc2fc5f5e 100644
--- a/gpAux/Makefile
+++ b/gpAux/Makefile
@@ -124,13 +124,13 @@ DEFPORT=5432
 
 ORCA_CONFIG=--enable-orca
 
-rhel6_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
-rhel7_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
-rhel8_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
-ubuntu18.04_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
-sles12_x86_64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
-rhel7_aarch64_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
-common_CONFIGFLAGS=--with-quicklz --with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
+rhel6_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
+rhel7_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
+rhel8_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
+ubuntu18.04_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
+sles12_x86_64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
+rhel7_aarch64_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
+common_CONFIGFLAGS=--with-lz4 --with-gssapi --enable-mapreduce --enable-orafce --enable-ic-proxy ${ORCA_CONFIG} --enable-gpcloud --with-libxml --with-ssl=openssl --with-pam --with-ldap --with-pythonsrc-ext
 #BLD_CONFIGFLAGS=$($(BLD_ARCH)_CONFIGFLAGS)
 BLD_CONFIGFLAGS=$(common_CONFIGFLAGS)
 
@@ -221,7 +221,6 @@ define BUILD_STEPS
 	cd $(BUILDDIR) && PYGRESQL_LDFLAGS=' -Wl,-rpath,\$$$$ORIGIN/.. -Wl,--enable-new-dtags ' $(MAKE) $(PARALLEL_MAKE_OPTS) install
 	cd $(BUILDDIR)/src/pl/plpython && $(MAKE) clean && $(MAKE) $(PARALLEL_MAKE_OPTS) install && cd $(BUILDDIR)
 	cd $(BUILDDIR)/src/pl/plperl && $(MAKE) clean && echo "LDFLAGS += -Wl,-rpath,$(perl_archlibexp)/CORE -Wl,--enable-new-dtags" >> GNUmakefile && echo "LDFLAGS_SL += -Wl,-rpath,$(perl_archlibexp)/CORE -Wl,--enable-new-dtags" >> GNUmakefile && $(MAKE) $(PARALLEL_MAKE_OPTS) install && cd $(BUILDDIR)
-	#@$(MAKE) greenplum_path INSTLOC=$(INSTLOC)
 	#@$(MAKE) mgmtcopy INSTLOC=$(INSTLOC)
 	@$(MAKE) copylibs INSTLOC=$(INSTLOC)
 	@$(MAKE) clients INSTLOC=$(INSTLOC) CLIENTSINSTLOC=$(CLIENTSINSTLOC)
@@ -233,7 +232,7 @@ endef
 ifeq "$(BLD_GPDB_BUILDSET)" "partial"
 define BUILD_STEPS
 	rm -rf $(INSTLOC)
-	cd $(BUILDDIR)/gpMgmt/ && $(MAKE) generate_greenplum_path_file
+	cd $(BUILDDIR)/gpMgmt/ && $(MAKE) generate_cloudberry_env_file
 	cd $(BUILDDIR)/src/backend/ && $(MAKE) ../../src/include/parser/gram.h
 	cd $(BUILDDIR)/src/backend/ && $(MAKE) ../../src/include/utils/errcodes.h
 	cd $(BUILDDIR)/src/backend/ && $(MAKE) ../../src/include/utils/fmgroids.h
diff --git a/gpAux/client/install/src/windows/CreatePackage.bat b/gpAux/client/install/src/windows/CreatePackage.bat
index 99079b11cf1..04bd76b52b7 100644
--- a/gpAux/client/install/src/windows/CreatePackage.bat
+++ b/gpAux/client/install/src/windows/CreatePackage.bat
@@ -3,7 +3,7 @@ set VERSION=%2
 echo %VERSION% > %GPDB_INSTALL_PATH%\VERSION
 copy ..\..\..\..\..\NOTICE %GPDB_INSTALL_PATH%
 copy ..\..\..\..\..\LICENSE %GPDB_INSTALL_PATH%
-copy ..\..\..\scripts\greenplum_clients_path.bat %GPDB_INSTALL_PATH%
+copy ..\..\..\scripts\cloudberry_clients_path.bat %GPDB_INSTALL_PATH%
 mkdir %GPDB_INSTALL_PATH%\lib\python\yaml
 copy ..\..\..\..\..\gpMgmt\bin\gpload.py %GPDB_INSTALL_PATH%\bin
 mkdir %GPDB_INSTALL_PATH%\bin\gppylib
@@ -15,4 +15,4 @@ REM Install PyYAML using pip instead of extracting from tarball
 pip3 install --target=%GPDB_INSTALL_PATH%\lib\python PyYAML==5.4.1
 perl -p -e "s,__VERSION_PLACEHOLDER__,%VERSION%," greenplum-clients.wxs > greenplum-clients-%VERSION%.wxs
 candle.exe -nologo greenplum-clients-%VERSION%.wxs -out greenplum-clients-%VERSION%.wixobj -dSRCDIR=%GPDB_INSTALL_PATH% -dVERSION=%VERSION%
-light.exe -nologo -sval greenplum-clients-%VERSION%.wixobj -out greenplum-clients-x86_64.msi
\ No newline at end of file
+light.exe -nologo -sval greenplum-clients-%VERSION%.wixobj -out greenplum-clients-x86_64.msi
diff --git a/gpAux/client/install/src/windows/greenplum-clients.wxs b/gpAux/client/install/src/windows/greenplum-clients.wxs
index 0f17c299112..4e8f0128d8c 100755
--- a/gpAux/client/install/src/windows/greenplum-clients.wxs
+++ b/gpAux/client/install/src/windows/greenplum-clients.wxs
@@ -1100,7 +1100,7 @@ If you want to review or change any of your installation settings, click Back. C
               <Environment Id="CLIENTS_ENV" Action="set" Permanent="no" System="yes" Part="all" Name="GPHOME_CLIENTS" Value="[BASEDIR]" />
               <Environment Id="PYTHON_ENV" Action="set" Permanent="no" System="yes" Part="last" Name="PYTHONPATH" Value="%GPHOME_CLIENTS%\lib\python" />
               <Environment Id="PATH_ENV" Action="set" Permanent="no" System="yes" Part="last" Name="PATH" Value="%GPHOME_CLIENTS%bin;%GPHOME_CLIENTS%lib" />
-              <File Id="greenplum_clients_path.bat" Name="greenplum_clients_path.bat" ShortName="BIZGRES1.BAT" Source="$(var.SRCDIR)\greenplum_clients_path.bat" />
+              <File Id="cloudberry_clients_path.bat" Name="cloudberry_clients_path.bat" ShortName="BIZGRES1.BAT" Source="$(var.SRCDIR)\cloudberry_clients_path.bat" />
               <File Id="LICENSE" Name="Pivotal License" ShortName="LICENSE" Source="$(var.SRCDIR)\LICENSE" />
               <File Id="NOTICE" Name="Thirdpary Notice" ShortName="NOTICE" Source="$(var.SRCDIR)\NOTICE" />
               <File Id="VERSION" Name="GPDB Clients Version" ShortName="VERSION" Source="$(var.SRCDIR)\VERSION" />
diff --git a/gpAux/client/scripts/greenplum_clients_path.bat b/gpAux/client/scripts/cloudberry_clients_path.bat
similarity index 100%
rename from gpAux/client/scripts/greenplum_clients_path.bat
rename to gpAux/client/scripts/cloudberry_clients_path.bat
diff --git a/gpAux/client/scripts/greenplum_clients_path.sh b/gpAux/client/scripts/cloudberry_clients_path.sh
similarity index 60%
rename from gpAux/client/scripts/greenplum_clients_path.sh
rename to gpAux/client/scripts/cloudberry_clients_path.sh
index 53dd4a286aa..f80ee53ed3f 100644
--- a/gpAux/client/scripts/greenplum_clients_path.sh
+++ b/gpAux/client/scripts/cloudberry_clients_path.sh
@@ -1,18 +1,3 @@
-# --------------------------------------------------------------------
-# NOTICE from the Apache Cloudberry PPMC
-# --------------------------------------------------------------------
-# This file uses the term 'greenplum' to maintain compatibility with
-# earlier versions of Apache Cloudberry, which was originally called
-# Greenplum. This usage does not refer to VMware Tanzu Greenplum,
-# nor does it imply that Apache Cloudberry (Incubating) is affiliated
-# with, endorsed by, or sponsored by Broadcom Inc.
-#
-# This file will be renamed in a future Apache Cloudberry release to
-# ensure compliance with Apache Software Foundation guidelines.
-# We will announce the change on the project mailing list and website.
-#
-# See: https://lists.apache.org/thread/b8o974mnnqk6zpy86dgll2pgqcvqgnwm
-# --------------------------------------------------------------------
 
 if test -n "${ZSH_VERSION:-}"; then
     # zsh
diff --git a/gpAux/gpdemo/Makefile b/gpAux/gpdemo/Makefile
index b6e794e57ab..386876b9b87 100644
--- a/gpAux/gpdemo/Makefile
+++ b/gpAux/gpdemo/Makefile
@@ -9,7 +9,7 @@
 top_builddir = ../..
 -include $(top_builddir)/src/Makefile.global
 
-SHELL := /usr/bin/bash
+SHELL := /usr/bin/env bash
 
 all:
 	$(MAKE) clean
diff --git a/gpAux/gpdemo/README b/gpAux/gpdemo/README
index 314de0d60b3..79e976fbd83 100644
--- a/gpAux/gpdemo/README
+++ b/gpAux/gpdemo/README
@@ -31,13 +31,13 @@ RUNNING GP DEMO
 
 	su - gpadmin
 
-2. Source greenplum_path.sh
+2. Source cloudberry-env.sh
 
-	. /usr/local/gpdb/greenplum_path.sh
+	. /usr/local/cloudberry-db/cloudberry-env.sh
 
    Note: There is a space between the dot and the slash.
 
-   The "." will source the greenplum_path.sh into the current
+   The "." will source the cloudberry-env.sh into the current
    shell, instead of starting a subprocess.
 
 3. Create the cluster at the current directory:
diff --git a/gpAux/gpdemo/demo_cluster.sh b/gpAux/gpdemo/demo_cluster.sh
index 8293fc687db..225bb76a5ee 100755
--- a/gpAux/gpdemo/demo_cluster.sh
+++ b/gpAux/gpdemo/demo_cluster.sh
@@ -120,7 +120,7 @@ cleanDemo(){
     ##
 
     (export COORDINATOR_DATA_DIRECTORY=$QDDIR/${SEG_PREFIX}-1;
-     source ${GPHOME}/greenplum_path.sh;
+     source ${GPHOME}/cloudberry-env.sh;
      gpstop -ai)
 
     ##
@@ -180,7 +180,7 @@ done
 if [ -z "${GPHOME}" ]; then
     echo "FATAL: The GPHOME environment variable is not set."
     echo ""
-    echo "  You can set it by sourcing the greenplum_path.sh"
+    echo "  You can set it by sourcing the cloudberry-env.sh"
     echo "  file in your Cloudberry installation directory."
     echo ""
     exit 1
diff --git a/gpAux/releng/gppkg.mk b/gpAux/releng/gppkg.mk
index 7706e7f4d8e..e93fcd1f74c 100644
--- a/gpAux/releng/gppkg.mk
+++ b/gpAux/releng/gppkg.mk
@@ -62,7 +62,7 @@ ifdef DEPENDENT_RPMS
 		cp $${dep_rpm} gppkg/deps; \
 	done
 endif
-	source $(INSTLOC)/greenplum_path.sh && gppkg --build gppkg 
+	source $(INSTLOC)/cloudberry-env.sh && gppkg --build gppkg 
 	rm -rf gppkg
 
 clean:
@@ -74,6 +74,6 @@ ifdef EXTRA_CLEAN
 endif
 
 install: $(TARGET_GPPKG)
-	source $(INSTLOC)/greenplum_path.sh && gppkg -i $(TARGET_GPPKG)
+	source $(INSTLOC)/cloudberry-env.sh && gppkg -i $(TARGET_GPPKG)
 
 .PHONY: install clean
diff --git a/gpMgmt/Makefile b/gpMgmt/Makefile
index 372dae8ed46..60abfd04cb3 100644
--- a/gpMgmt/Makefile
+++ b/gpMgmt/Makefile
@@ -6,12 +6,12 @@ SUBDIRS= sbin bin doc
 
 $(recurse)
 
-generate_greenplum_path_file:
+generate_cloudberry_env_file:
 	mkdir -p $(DESTDIR)$(prefix)
 	unset LIBPATH; \
-	bin/generate-greenplum-path.sh > $(DESTDIR)$(prefix)/greenplum_path.sh
+	bin/generate-cloudberry-env.sh > $(DESTDIR)$(prefix)/cloudberry-env.sh
 
-install: generate_greenplum_path_file
+install: generate_cloudberry_env_file
 	mkdir -p $(DESTDIR)$(prefix)/lib/python
 
 	# Setup /lib/python contents
diff --git a/gpMgmt/bin/Makefile b/gpMgmt/bin/Makefile
index 3c4b6d2b031..c5eb6ccba9c 100644
--- a/gpMgmt/bin/Makefile
+++ b/gpMgmt/bin/Makefile
@@ -90,12 +90,27 @@ PYYAML_VERSION=5.4.1
 download-python-deps:
 	@echo "--- Downloading Python dependencies for gpMgmt modules"
 	@mkdir -p $(PYLIB_SRC_EXT)
-	# Download psutil using curl
-	curl -sSL https://files.pythonhosted.org/packages/source/p/psutil/psutil-$(PSUTIL_VERSION).tar.gz -o $(PYLIB_SRC_EXT)/psutil-$(PSUTIL_VERSION).tar.gz
-	# Download PyYAML using curl
-	curl -sSL https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-$(PYYAML_VERSION).tar.gz -o $(PYLIB_SRC_EXT)/PyYAML-$(PYYAML_VERSION).tar.gz
-	# Download PyGreSQL using curl
-	curl -sSL https://files.pythonhosted.org/packages/source/P/PyGreSQL/PyGreSQL-$(PYGRESQL_VERSION).tar.gz -o $(PYLIB_SRC_EXT)/PyGreSQL-$(PYGRESQL_VERSION).tar.gz
+	# Download psutil using curl (only if not exists)
+	@if [ ! -f $(PYLIB_SRC_EXT)/psutil-$(PSUTIL_VERSION).tar.gz ]; then \
+		echo "Downloading psutil-$(PSUTIL_VERSION).tar.gz..."; \
+		curl -sSL https://files.pythonhosted.org/packages/source/p/psutil/psutil-$(PSUTIL_VERSION).tar.gz -o $(PYLIB_SRC_EXT)/psutil-$(PSUTIL_VERSION).tar.gz; \
+	else \
+		echo "psutil-$(PSUTIL_VERSION).tar.gz already exists, skipping download"; \
+	fi
+	# Download PyYAML using curl (only if not exists)
+	@if [ ! -f $(PYLIB_SRC_EXT)/PyYAML-$(PYYAML_VERSION).tar.gz ]; then \
+		echo "Downloading PyYAML-$(PYYAML_VERSION).tar.gz..."; \
+		curl -sSL https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-$(PYYAML_VERSION).tar.gz -o $(PYLIB_SRC_EXT)/PyYAML-$(PYYAML_VERSION).tar.gz; \
+	else \
+		echo "PyYAML-$(PYYAML_VERSION).tar.gz already exists, skipping download"; \
+	fi
+	# Download PyGreSQL using curl (only if not exists)
+	@if [ ! -f $(PYLIB_SRC_EXT)/PyGreSQL-$(PYGRESQL_VERSION).tar.gz ]; then \
+		echo "Downloading PyGreSQL-$(PYGRESQL_VERSION).tar.gz..."; \
+		curl -sSL https://files.pythonhosted.org/packages/source/P/PyGreSQL/PyGreSQL-$(PYGRESQL_VERSION).tar.gz -o $(PYLIB_SRC_EXT)/PyGreSQL-$(PYGRESQL_VERSION).tar.gz; \
+	else \
+		echo "PyGreSQL-$(PYGRESQL_VERSION).tar.gz already exists, skipping download"; \
+	fi
 	# Install wheel and cython for PyYAML building
 	pip3 install --user wheel "cython<3.0.0"
 
@@ -150,7 +165,12 @@ $(MOCK_BIN):
        pip3 install mock;\
     else\
        mkdir -p $(PYLIB_SRC_EXT) && \
-       curl -sSL https://files.pythonhosted.org/packages/source/m/mock/mock-$(MOCK_VERSION).zip -o $(PYLIB_SRC_EXT)/mock-$(MOCK_VERSION).zip && \
+       if [ ! -f $(PYLIB_SRC_EXT)/mock-$(MOCK_VERSION).zip ]; then \
+           echo "Downloading mock-$(MOCK_VERSION).zip..."; \
+           curl -sSL https://files.pythonhosted.org/packages/source/m/mock/mock-$(MOCK_VERSION).zip -o $(PYLIB_SRC_EXT)/mock-$(MOCK_VERSION).zip; \
+       else \
+           echo "mock-$(MOCK_VERSION).zip already exists, skipping download"; \
+       fi && \
        mkdir -p $(PYTHONSRC_INSTALL_SITE) && \
        cd $(PYLIB_SRC_EXT)/ && unzip -q $(MOCK_DIR).zip && \
        cd $(PYLIB_SRC_EXT)/$(MOCK_DIR)/ && \
diff --git a/gpMgmt/bin/README.md b/gpMgmt/bin/README.md
index e28809bd86e..3dae8248293 100644
--- a/gpMgmt/bin/README.md
+++ b/gpMgmt/bin/README.md
@@ -12,7 +12,7 @@ To run any of these python scripts, necessary libraries must be installed, and P
 PYTHONPATH="\$GPHOME/lib/python:${PYTHONPATH}"
 ```
 
-This will be set automatically with a `source $GPHOME/greenplum_path.sh`
+This will be set automatically with a `source $GPHOME/cloudberry-env.sh`
 
 
 ## Python Version
diff --git a/gpMgmt/bin/analyzedb b/gpMgmt/bin/analyzedb
index cc51e265927..48d8e16872c 100755
--- a/gpMgmt/bin/analyzedb
+++ b/gpMgmt/bin/analyzedb
@@ -37,7 +37,7 @@ try:
     from gppylib.operations.unix import CheckDir, CheckFile, MakeDir
 
 except ImportError as e:
-    sys.exit('Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 EXECNAME = 'analyzedb'
 STATEFILE_DIR = 'db_analyze'
diff --git a/gpMgmt/bin/generate-cloudberry-env.sh b/gpMgmt/bin/generate-cloudberry-env.sh
new file mode 100755
index 00000000000..7f1f9074efc
--- /dev/null
+++ b/gpMgmt/bin/generate-cloudberry-env.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+cat <<"EOF"
+if test -n "${ZSH_VERSION:-}"; then
+    # zsh
+    SCRIPT_PATH="${(%):-%x}"
+elif test -n "${BASH_VERSION:-}"; then
+    # bash
+    SCRIPT_PATH="${BASH_SOURCE[0]}"
+else
+    # Unknown shell, hope below works.
+    # Tested with dash
+    result=$(lsof -p $$ -Fn | tail --lines=1 | xargs --max-args=2 | cut --delimiter=' ' --fields=2)
+    SCRIPT_PATH=${result#n}
+fi
+
+if test -z "$SCRIPT_PATH"; then
+    echo "The shell cannot be identified. \$GPHOME may not be set correctly." >&2
+fi
+SCRIPT_DIR="$(cd "$(dirname "${SCRIPT_PATH}")" >/dev/null 2>&1 && pwd)"
+
+if [ ! -L "${SCRIPT_DIR}" ]; then
+    GPHOME=${SCRIPT_DIR}
+else
+    GPHOME=$(readlink "${SCRIPT_DIR}")
+fi
+EOF
+
+cat <<"EOF"
+PYTHONPATH="${GPHOME}/lib/python"
+PATH="${GPHOME}/bin:${PATH}"
+LD_LIBRARY_PATH="${GPHOME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+
+if [ -e "${GPHOME}/etc/openssl.cnf" ]; then
+	OPENSSL_CONF="${GPHOME}/etc/openssl.cnf"
+fi
+
+#setup JAVA_HOME
+if [ -x "${GPHOME}/ext/jdk/bin/java" ]; then
+    JAVA_HOME="${GPHOME}/ext/jdk"
+    PATH="${JAVA_HOME}/bin:${PATH}"
+    CLASSPATH=${JAVA_HOME}/lib/dt.jar:${JAVA_HOME}/lib/tool.jar
+fi
+
+export GPHOME
+export PATH
+export PYTHONPATH
+export LD_LIBRARY_PATH
+export OPENSSL_CONF
+export JAVA_HOME
+export CLASSPATH
+
+# Load the external environment variable files
+if [ -d "${GPHOME}/etc/environment.d" ]; then
+	LOGGER=$(which logger 2> /dev/null || which true)
+	set -o allexport
+	for env in $(find "${GPHOME}/etc/environment.d" -regextype sed -regex '.*\/[0-9][0-9]-.*\.conf$' -type f | sort -n); do
+		$LOGGER -t "greenplum-path.sh" "loading environment from ${env}"
+		source "${env}"
+	done
+	set +o allexport
+fi
+EOF
diff --git a/gpMgmt/bin/generate-greenplum-path.sh b/gpMgmt/bin/generate-greenplum-path.sh
deleted file mode 100755
index 5a3b6e35698..00000000000
--- a/gpMgmt/bin/generate-greenplum-path.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-# --------------------------------------------------------------------
-# NOTICE from the Apache Cloudberry PPMC
-# --------------------------------------------------------------------
-# This file uses the term 'greenplum' to maintain compatibility with
-# earlier versions of Apache Cloudberry, which was originally called
-# Greenplum. This usage does not refer to VMware Tanzu Greenplum,
-# nor does it imply that Apache Cloudberry (Incubating) is affiliated
-# with, endorsed by, or sponsored by Broadcom Inc.
-#
-# This file will be renamed in a future Apache Cloudberry release to
-# ensure compliance with Apache Software Foundation guidelines.
-# We will announce the change on the project mailing list and website.
-#
-# See: https://lists.apache.org/thread/b8o974mnnqk6zpy86dgll2pgqcvqgnwm
-# --------------------------------------------------------------------
-
-cat <<"EOF"
-if [ -n "${PS1-}" ]; then
-    echo "
-# --------------------------------------------------------------------
-# NOTICE from the Apache Cloudberry PPMC
-# --------------------------------------------------------------------
-# This file uses the term 'greenplum' to maintain compatibility with
-# earlier versions of Apache Cloudberry, which was originally called
-# Greenplum. This usage does not refer to VMware Tanzu Greenplum,
-# nor does it imply that Apache Cloudberry (Incubating) is affiliated
-# with, endorsed by, or sponsored by Broadcom Inc.
-#
-# This file will be renamed in a future Apache Cloudberry release to
-# ensure compliance with Apache Software Foundation guidelines.
-# We will announce the change on the project mailing list and website.
-#
-# See: https://lists.apache.org/thread/b8o974mnnqk6zpy86dgll2pgqcvqgnwm
-# --------------------------------------------------------------------
-"
-fi
-EOF
-
-cat <<"EOF"
-if test -n "${ZSH_VERSION:-}"; then
-    # zsh
-    SCRIPT_PATH="${(%):-%x}"
-elif test -n "${BASH_VERSION:-}"; then
-    # bash
-    SCRIPT_PATH="${BASH_SOURCE[0]}"
-else
-    # Unknown shell, hope below works.
-    # Tested with dash
-    result=$(lsof -p $$ -Fn | tail --lines=1 | xargs --max-args=2 | cut --delimiter=' ' --fields=2)
-    SCRIPT_PATH=${result#n}
-fi
-
-if test -z "$SCRIPT_PATH"; then
-    echo "The shell cannot be identified. \$GPHOME may not be set correctly." >&2
-fi
-SCRIPT_DIR="$(cd "$(dirname "${SCRIPT_PATH}")" >/dev/null 2>&1 && pwd)"
-
-if [ ! -L "${SCRIPT_DIR}" ]; then
-    GPHOME=${SCRIPT_DIR}
-else
-    GPHOME=$(readlink "${SCRIPT_DIR}")
-fi
-EOF
-
-cat <<"EOF"
-PYTHONPATH="${GPHOME}/lib/python"
-PATH="${GPHOME}/bin:${PATH}"
-LD_LIBRARY_PATH="${GPHOME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-
-if [ -e "${GPHOME}/etc/openssl.cnf" ]; then
-	OPENSSL_CONF="${GPHOME}/etc/openssl.cnf"
-fi
-
-#setup JAVA_HOME
-if [ -x "${GPHOME}/ext/jdk/bin/java" ]; then
-    JAVA_HOME="${GPHOME}/ext/jdk"
-    PATH="${JAVA_HOME}/bin:${PATH}"
-    CLASSPATH=${JAVA_HOME}/lib/dt.jar:${JAVA_HOME}/lib/tool.jar
-fi
-
-export GPHOME
-export PATH
-export PYTHONPATH
-export LD_LIBRARY_PATH
-export OPENSSL_CONF
-export JAVA_HOME
-export CLASSPATH
-
-# Load the external environment variable files
-if [ -d "${GPHOME}/etc/environment.d" ]; then
-	LOGGER=$(which logger 2> /dev/null || which true)
-	set -o allexport
-	for env in $(find "${GPHOME}/etc/environment.d" -regextype sed -regex '.*\/[0-9][0-9]-.*\.conf$' -type f | sort -n); do
-		$LOGGER -t "greenplum-path.sh" "loading environment from ${env}"
-		source "${env}"
-	done
-	set +o allexport
-fi
-EOF
diff --git a/gpMgmt/bin/gpactivatestandby b/gpMgmt/bin/gpactivatestandby
index 4c2069f0970..020ead515f3 100755
--- a/gpMgmt/bin/gpactivatestandby
+++ b/gpMgmt/bin/gpactivatestandby
@@ -33,7 +33,7 @@ try:
     from gppylib.userinput import ask_yesno
 except Exception as e:
     sys.exit('ERROR: Cannot import modules.  Please check that you '
-             'have sourced greenplum_path.sh.  Detail: ' + str(e))
+             'have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 EXECNAME = os.path.split(__file__)[-1]
 
diff --git a/gpMgmt/bin/gpcheckresgroupv2impl b/gpMgmt/bin/gpcheckresgroupv2impl
index 4e15d048eb1..e52931f7a1f 100755
--- a/gpMgmt/bin/gpcheckresgroupv2impl
+++ b/gpMgmt/bin/gpcheckresgroupv2impl
@@ -2,6 +2,8 @@
 # Copyright (c) 2017, VMware, Inc. or its affiliates.
 
 import os
+import sys
+import argparse
 from functools import reduce
 
 
@@ -26,9 +28,10 @@ class CgroupValidation(object):
 
 
 class CgroupValidationVersionTwo(CgroupValidation):
-    def __init__(self):
+    def __init__(self, cgroup_parent=None):
         self.mount_point = self.detect_cgroup_mount_point()
         self.tab = {"r": os.R_OK, "w": os.W_OK, "x": os.X_OK, "f": os.F_OK}
+        self.cgroup_parent = cgroup_parent if cgroup_parent else "gpdb.service"
 
     def validate_all(self):
         """
@@ -43,23 +46,23 @@ class CgroupValidationVersionTwo(CgroupValidation):
 
         self.validate_permission("cgroup.procs", "rw")
 
-        self.validate_permission("gpdb/", "rwx")
-        self.validate_permission("gpdb/cgroup.procs", "rw")
+        self.validate_permission(self.cgroup_parent + "/", "rwx")
+        self.validate_permission(self.cgroup_parent + "/cgroup.procs", "rw")
 
-        self.validate_permission("gpdb/cpu.max", "rw")
-        self.validate_permission("gpdb/cpu.weight", "rw")
-        self.validate_permission("gpdb/cpu.weight.nice", "rw")
-        self.validate_permission("gpdb/cpu.stat", "r")
+        self.validate_permission(self.cgroup_parent + "/cpu.max", "rw")
+        self.validate_permission(self.cgroup_parent + "/cpu.weight", "rw")
+        self.validate_permission(self.cgroup_parent + "/cpu.weight.nice", "rw")
+        self.validate_permission(self.cgroup_parent + "/cpu.stat", "r")
 
-        self.validate_permission("gpdb/cpuset.cpus", "rw")
-        self.validate_permission("gpdb/cpuset.cpus.partition", "rw")
-        self.validate_permission("gpdb/cpuset.mems", "rw")
-        self.validate_permission("gpdb/cpuset.cpus.effective", "r")
-        self.validate_permission("gpdb/cpuset.mems.effective", "r")
+        self.validate_permission(self.cgroup_parent + "/cpuset.cpus", "rw")
+        self.validate_permission(self.cgroup_parent + "/cpuset.cpus.partition", "rw")
+        self.validate_permission(self.cgroup_parent + "/cpuset.mems", "rw")
+        self.validate_permission(self.cgroup_parent + "/cpuset.cpus.effective", "r")
+        self.validate_permission(self.cgroup_parent + "/cpuset.mems.effective", "r")
 
-        self.validate_permission("gpdb/memory.current", "r")
+        self.validate_permission(self.cgroup_parent + "/memory.current", "r")
 
-        self.validate_permission("gpdb/io.max", "rw")
+        self.validate_permission(self.cgroup_parent + "/io.max", "rw")
 
     def die(self, msg):
         raise ValidationException("cgroup is not properly configured: {}".format(msg))
@@ -85,7 +88,15 @@ class CgroupValidationVersionTwo(CgroupValidation):
 
 
 if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Validate cgroup v2 configuration for resource groups')
+    parser.add_argument('--cgroup-parent',
+                        dest='cgroup_parent',
+                        default=None,
+                        help='The cgroup parent directory name (gp_resource_group_cgroup_parent value)')
+
+    args = parser.parse_args()
+
     try:
-        CgroupValidationVersionTwo().validate_all()
+        CgroupValidationVersionTwo(cgroup_parent=args.cgroup_parent).validate_all()
     except ValidationException as e:
         exit(e.message)
diff --git a/gpMgmt/bin/gpconfig b/gpMgmt/bin/gpconfig
index 7bd3023ea85..f4e3ce7c62d 100755
--- a/gpMgmt/bin/gpconfig
+++ b/gpMgmt/bin/gpconfig
@@ -15,6 +15,7 @@
 import os
 import sys
 import re
+import psutil
 
 try:
     from gppylib.gpparseopts import OptParser, OptChecker
@@ -34,7 +35,7 @@ try:
     from gpconfig_modules.parse_guc_metadata import ParseGuc
 except ImportError as err:
     sys.exit('Cannot import modules.  Please check that you have sourced '
-             'greenplum_path.sh.  Detail: ' + str(err))
+             'cloudberry-env.sh.  Detail: ' + str(err))
 
 EXECNAME = os.path.split(__file__)[-1]
 
@@ -170,6 +171,20 @@ class Guc:
                     return msg
             elif newval != "'queue'":
                 return "the value of gp_resource_manager must be 'group' or 'group-v2' or 'queue'"
+        elif self.name == "gp_resource_group_cgroup_parent":
+            base = newval.strip("'")
+            if not re.match("^[0-9a-zA-Z][-._0-9a-zA-Z]*$", base):
+                return "resource group cgroup parent can only contains alphabet, number, and non-leading . _ -"
+
+            path = None
+            for partition in psutil.disk_partitions(all=True):
+                if partition.fstype == "cgroup2":
+                    path = partition.mountpoint + "/" + base
+                    break
+            if path is None:
+                return "cannot find cgroup v2 mountpoint"
+            if not os.path.isdir(path):
+                return "'%s' doesn't exists or is not a directory" % path
 
         elif self.name == 'unix_socket_permissions':
             if newval[0] != '0':
diff --git a/gpMgmt/bin/gpdeletesystem b/gpMgmt/bin/gpdeletesystem
index 8299d86d820..3730d2758fe 100755
--- a/gpMgmt/bin/gpdeletesystem
+++ b/gpMgmt/bin/gpdeletesystem
@@ -24,7 +24,7 @@ try:
     from gppylib.operations.segment_tablespace_locations import get_tablespace_locations
 except ImportError as e:
     sys.exit('ERROR: Cannot import modules.  Please check that you '
-             'have sourced greenplum_path.sh.  Detail: ' + str(e))
+             'have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 EXECNAME = os.path.split(__file__)[-1]
 
diff --git a/gpMgmt/bin/gpdirtableload b/gpMgmt/bin/gpdirtableload
index 2ad6933059d..72f6dac9ca0 100755
--- a/gpMgmt/bin/gpdirtableload
+++ b/gpMgmt/bin/gpdirtableload
@@ -420,7 +420,7 @@ class gpdirtableload:
                                    'greenplum_loaders_path.sh')
         elif os.environ.get('GPHOME'):
             srcfile = os.path.join(os.environ.get('GPHOME'),
-                                   'greenplum_path.sh')
+                                   'cloudberry-env.sh')
         if (not (srcfile and os.path.exists(srcfile))):
             self.log(self.ERROR, 'cannot find cloudberry environment ' +
                      'file: environment misconfigured')
@@ -488,7 +488,7 @@ class gpdirtableload:
                                    'greenplum_loaders_path.sh')
         elif os.environ.get('GPHOME'):
             srcfile = os.path.join(os.environ.get('GPHOME'),
-                                   'greenplum_path.sh')
+                                   'cloudberry-env.sh')
         if (not (srcfile and os.path.exists(srcfile))):
             self.log(self.ERROR, 'cannot find cloudberry environment ' +
                      'file: environment misconfigured')
diff --git a/gpMgmt/bin/gpexpand b/gpMgmt/bin/gpexpand
index 562fad58213..dcbed918a19 100755
--- a/gpMgmt/bin/gpexpand
+++ b/gpMgmt/bin/gpexpand
@@ -44,7 +44,7 @@ try:
     from gppylib.operations.update_pg_hba_on_segments import update_pg_hba_on_segments
 
 except ImportError as e:
-    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 # constants
 MAX_PARALLEL_EXPANDS = 96
diff --git a/gpMgmt/bin/gpinitstandby b/gpMgmt/bin/gpinitstandby
index 3e0ee7516bf..ad14c04946e 100755
--- a/gpMgmt/bin/gpinitstandby
+++ b/gpMgmt/bin/gpinitstandby
@@ -22,7 +22,7 @@ try:
     from gppylib.commands.pg import PgBaseBackup
 except ImportError as e:
     sys.exit('ERROR: Cannot import modules.  Please check that you '
-             'have sourced greenplum_path.sh.  Detail: ' + str(e))
+             'have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 EXECNAME = os.path.split(__file__)[-1]
 
diff --git a/gpMgmt/bin/gpinitsystem b/gpMgmt/bin/gpinitsystem
index 1ce4132e53d..fa85d42ae3f 100755
--- a/gpMgmt/bin/gpinitsystem
+++ b/gpMgmt/bin/gpinitsystem
@@ -2271,7 +2271,7 @@ LOG_MSG "[INFO]:-Apache Cloudberry instance successfully created" 1
 LOG_MSG "[INFO]:-------------------------------------------------------" 1
 LOG_MSG "[INFO]:-To complete the environment configuration, please " 1
 LOG_MSG "[INFO]:-update $USER_NAME .bashrc file with the following" 1
-LOG_MSG "[INFO]:-1. Ensure that the greenplum_path.sh file is sourced" 1
+LOG_MSG "[INFO]:-1. Ensure that the cloudberry-env.sh file is sourced" 1
 LOG_MSG "[INFO]:-2. Add \"export COORDINATOR_DATA_DIRECTORY=${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1\"" 1
 LOG_MSG "[INFO]:-   to access the Cloudberry scripts for this instance:" 1
 LOG_MSG "[INFO]:-   or, use -d ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1 option for the Cloudberry scripts" 1
diff --git a/gpMgmt/bin/gpload b/gpMgmt/bin/gpload
index 33a0ec0e9f3..fb945286fff 100755
--- a/gpMgmt/bin/gpload
+++ b/gpMgmt/bin/gpload
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 if [ ! -z "$GPHOME" ]; then
-    . $GPHOME/greenplum_path.sh
+    . $GPHOME/cloudberry-env.sh
 fi
 if [ ! -z "$GPHOME_LOADERS" ]; then
     . $GPHOME_LOADERS/greenplum_loaders_path.sh
diff --git a/gpMgmt/bin/gpload.py b/gpMgmt/bin/gpload.py
index a1696947bbc..82a0a571166 100755
--- a/gpMgmt/bin/gpload.py
+++ b/gpMgmt/bin/gpload.py
@@ -1654,7 +1654,7 @@ def start_gpfdists(self):
                                            'greenplum_loaders_path.sh')
                     elif os.environ.get('GPHOME'):
                         srcfile = os.path.join(os.environ.get('GPHOME'),
-                                           'greenplum_path.sh')
+                                           'cloudberry-env.sh')
 
                     if (not (srcfile and os.path.exists(srcfile))):
                         self.log(self.ERROR, 'cannot find cloudberry environment ' +
diff --git a/gpMgmt/bin/gpload_test/gpload2/README b/gpMgmt/bin/gpload_test/gpload2/README
index 588812f82a2..b29c28771a0 100644
--- a/gpMgmt/bin/gpload_test/gpload2/README
+++ b/gpMgmt/bin/gpload_test/gpload2/README
@@ -2,7 +2,7 @@ The remote tests is intended to be run for remote server,
 which means you are compiling loader package on local
 machine but GPDB server is located on a separate machine.
 
-To run this test, first source greenplum_path.sh in
+To run this test, first source cloudberry-env.sh in
 cloudberry-db-devel, not the greenplum-loaders-devel,
 because loader package don't have the necessary diff tools.
 
diff --git a/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py b/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py
index 5c47e724ff3..45d885ec87a 100755
--- a/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py
+++ b/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py
@@ -95,7 +95,7 @@ def getPortCoordinatorOnly(host = 'localhost',coordinator_value = None,
     coordinator_pattern = r"Context:\s*-1\s*Value:\s*\d+"
     command = "gpconfig -s %s" % ( "port" )
 
-    cmd = "source %s/greenplum_path.sh; export COORDINATOR_DATA_DIRECTORY=%s; export PGPORT=%s; %s" \
+    cmd = "source %s/cloudberry-env.sh; export COORDINATOR_DATA_DIRECTORY=%s; export PGPORT=%s; %s" \
            % (gphome, cdd, port, command)
 
     (ok,out) = run(cmd)
diff --git a/gpMgmt/bin/gplogfilter b/gpMgmt/bin/gplogfilter
index 693fb7c2f05..a667ae34002 100755
--- a/gpMgmt/bin/gplogfilter
+++ b/gpMgmt/bin/gplogfilter
@@ -24,7 +24,7 @@ try:
     from gppylib.logfilter import *
     from gppylib.commands.gp import get_coordinatordatadir
 except ImportError as e:
-    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 # These values are from cdb-pg/src/backend/po/*.po
 TROUBLE_VALUES = [
diff --git a/gpMgmt/bin/gpmemwatcher b/gpMgmt/bin/gpmemwatcher
index 6569015bc09..1fb39adfad8 100755
--- a/gpMgmt/bin/gpmemwatcher
+++ b/gpMgmt/bin/gpmemwatcher
@@ -132,7 +132,7 @@ def launchProcess(host, workdir):
     if not gphome:
         raise Exception('Environment Variable GPHOME not set')
 
-    py_string = 'source ' + os.path.join(gphome, 'greenplum_path.sh') + '; '
+    py_string = 'source ' + os.path.join(gphome, 'cloudberry-env.sh') + '; '
 
     # Now let's just quick check the host as to whether the python version is >= 2.6
     try:
diff --git a/gpMgmt/bin/gpmovemirrors b/gpMgmt/bin/gpmovemirrors
index 7220a0f897e..c5e694399a5 100755
--- a/gpMgmt/bin/gpmovemirrors
+++ b/gpMgmt/bin/gpmovemirrors
@@ -30,7 +30,7 @@ try:
     from gppylib.operations.update_pg_hba_on_segments import update_pg_hba_for_new_mirrors
 
 except ImportError as e:
-    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 # constants
 GPDB_STOPPED = 1
diff --git a/gpMgmt/bin/gppylib/commands/base.py b/gpMgmt/bin/gppylib/commands/base.py
index 98481425071..d455c6e2d13 100755
--- a/gpMgmt/bin/gppylib/commands/base.py
+++ b/gpMgmt/bin/gppylib/commands/base.py
@@ -510,10 +510,10 @@ def execute(self, cmd, pickled=False, start_new_session=False):
         if localhost != self.targetHost:
             cmd.cmdStr = "ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 " \
                          "{targethost} \"{gphome} {cmdstr}\"".format(targethost=self.targetHost,
-                                                                     gphome=". %s/greenplum_path.sh;" % self.gphome,
+                                                                     gphome=". %s/cloudberry-env.sh;" % self.gphome,
                                                                      cmdstr=cmd.cmdStr)
         else:
-            cmd.cmdStr = "bash -c \"{gphome} {cmdstr}\"".format(gphome=". %s/greenplum_path.sh;" % self.gphome,
+            cmd.cmdStr = "bash -c \"{gphome} {cmdstr}\"".format(gphome=". %s/cloudberry-env.sh;" % self.gphome,
                                                                 cmdstr=cmd.cmdStr)
         LocalExecutionContext.execute(self, cmd, pickled=pickled, start_new_session=start_new_session)
         if (cmd.get_stderr().startswith('ssh_exchange_identification: Connection closed by remote host')):
diff --git a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py
index 6de0f145edf..9f9e6105dad 100644
--- a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py
+++ b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py
@@ -17,13 +17,13 @@ def test_RemoteExecutionContext_uses_default_gphome(self):
         self.subject = RemoteExecutionContext("myhost", "my_stdin")
         cmd = Command("dummy name", "echo 'foo'")
         self.subject.execute(cmd)
-        self.assertIn(". %s/greenplum_path.sh;" % GPHOME, cmd.cmdStr)
+        self.assertIn(". %s/cloudberry-env.sh;" % GPHOME, cmd.cmdStr)
 
     def test_RemoteExecutionContext_uses_provided_gphome_when_set(self):
         self.subject = RemoteExecutionContext(targetHost="myhost", stdin="my_stdin", gphome="other/gphome")
         cmd = Command("dummy name", "echo 'foo'")
         self.subject.execute(cmd)
-        self.assertIn(". other/gphome/greenplum_path.sh;", cmd.cmdStr)
+        self.assertIn(". other/gphome/cloudberry-env.sh;", cmd.cmdStr)
 
     def test_LocalExecutionContext_uses_no_environment(self):
         self.subject = LocalExecutionContext(None)
@@ -53,7 +53,7 @@ def test_RemoteExecutionContext_uses_ampersand_multiple(self):
         cmd.propagate_env_map['bar'] = 1
         self.subject.execute(cmd)
         self.assertEqual("bar=1 && foo=1 && ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 localhost "
-                          "\". gphome/greenplum_path.sh; bar=1 && foo=1 && ls /tmp\"", cmd.cmdStr)
+                          "\". gphome/cloudberry-env.sh; bar=1 && foo=1 && ls /tmp\"", cmd.cmdStr)
 
     @patch('gppylib.commands.base.Command.get_stderr',
            return_value="ssh_exchange_identification: Connection closed by remote host")
diff --git a/gpMgmt/bin/gppylib/gpresgroup.py b/gpMgmt/bin/gppylib/gpresgroup.py
index e66e44e7ffd..7c36659c277 100644
--- a/gpMgmt/bin/gppylib/gpresgroup.py
+++ b/gpMgmt/bin/gppylib/gpresgroup.py
@@ -8,6 +8,7 @@
 from gppylib.commands.gp import *
 from gppylib.gparray import GpArray
 from gppylib.gplog import get_default_logger
+from gppylib.db import dbconn
 
 
 class GpResGroup(object):
@@ -40,13 +41,40 @@ def validate():
 
     @staticmethod
     def validate_v2():
+        """
+        Validate cgroup v2 configuration on all hosts.
+
+        This method:
+        1. Connects to the master database to retrieve gp_resource_group_cgroup_parent
+        2. Passes this value to gpcheckresgroupv2impl on each host via command line
+        3. Each host validates its local cgroup filesystem permissions
+        """
         pool = base.WorkerPool()
         gp_array = GpArray.initFromCatalog(dbconn.DbURL(), utility=True)
         host_list = list(set(gp_array.get_hostlist(True)))
         msg = None
 
+        # Get cgroup_parent value from master database
+        cgroup_parent = None
+        try:
+            # Connect to master database to get the GUC parameter
+            master_dburl = dbconn.DbURL()
+            with dbconn.connect(master_dburl, utility=True) as conn:
+                sql = "SHOW gp_resource_group_cgroup_parent"
+                cursor = dbconn.query(conn, sql)
+                result = cursor.fetchone()
+                if result and result[0]:
+                    cgroup_parent = result[0]
+                else:
+                    return "failed to retrieve gp_resource_group_cgroup_parent parameter from master database"
+        except Exception as e:
+            return "failed to retrieve gp_resource_group_cgroup_parent parameter: {}".format(str(e))
+
+        # Build command with cgroup_parent parameter
+        cmd_str = "gpcheckresgroupv2impl --cgroup-parent '{}'".format(cgroup_parent)
+
         for h in host_list:
-            cmd = Command(h, "gpcheckresgroupv2impl", REMOTE, h)
+            cmd = Command(h, cmd_str, REMOTE, h)
             pool.addCommand(cmd)
         pool.join()
 
diff --git a/gpMgmt/bin/gppylib/operations/package.py b/gpMgmt/bin/gppylib/operations/package.py
index 2af3bfba381..f6f52a634ae 100644
--- a/gpMgmt/bin/gppylib/operations/package.py
+++ b/gpMgmt/bin/gppylib/operations/package.py
@@ -24,7 +24,7 @@
     from yaml.scanner import ScannerError
 except ImportError as ex:
     sys.exit(
-        'Operation: Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(ex))
+        'Operation: Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(ex))
 
 logger = gplog.get_default_logger()
 
diff --git a/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py b/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py
index b7018bc8a3f..81377136f83 100644
--- a/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py
+++ b/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py
@@ -378,11 +378,6 @@ def signal_handler(sig, frame):
             if not mirrorBuilder.recover_mirrors(gpEnv, gpArray):
                 if self.termination_requested:
                     self.logger.error("gprecoverseg process was interrupted by the user.")
-                if self.__options.differentialResynchronization:
-                    self.logger.error("gprecoverseg differential recovery failed. Please check the gpsegrecovery.py log"
-                                      " file and rsync log file for more details.")
-                else:
-                    self.logger.error("gprecoverseg failed. Please check the output for more details.")
                 sys.exit(1)
 
             if self.termination_requested:
diff --git a/gpMgmt/bin/gppylib/programs/gppkg.py b/gpMgmt/bin/gppylib/programs/gppkg.py
index f784386ea5f..70682b67a1c 100755
--- a/gpMgmt/bin/gppylib/programs/gppkg.py
+++ b/gpMgmt/bin/gppylib/programs/gppkg.py
@@ -20,7 +20,7 @@
     from gppylib.operations.unix import ListFilesByPattern
 
 except ImportError as ex:
-    sys.exit('Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(ex))
+    sys.exit('Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(ex))
 
 logger = gplog.get_default_logger()
 
diff --git a/gpMgmt/bin/gppylib/utils.py b/gpMgmt/bin/gppylib/utils.py
index fead818d3ac..1adb1e68cdc 100644
--- a/gpMgmt/bin/gppylib/utils.py
+++ b/gpMgmt/bin/gppylib/utils.py
@@ -290,7 +290,7 @@ def deleteBlock(fileName,beginPattern, endPattern):
             print(("IOERROR", IOError))
             sys.exit()
     else:
-        print("***********%s  file does not exits"%(fileName))
+        print("***********%s  file does not exist"%(fileName))
 
 def make_inf_hosts(hp, hstart, hend, istart, iend, hf=None):
     hfArr = []
diff --git a/gpMgmt/bin/gpshrink b/gpMgmt/bin/gpshrink
index 3f6f145d723..6a8d8f5a11f 100644
--- a/gpMgmt/bin/gpshrink
+++ b/gpMgmt/bin/gpshrink
@@ -57,7 +57,7 @@ try:
     from gppylib.operations.update_pg_hba_on_segments import update_pg_hba_on_segments
 
 except ImportError as e:
-    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 # constants
 MAX_PARALLEL_SHRINKS = 96
diff --git a/gpMgmt/bin/gpssh b/gpMgmt/bin/gpssh
index b27cb5cf47b..f3105599d21 100755
--- a/gpMgmt/bin/gpssh
+++ b/gpMgmt/bin/gpssh
@@ -211,7 +211,7 @@ def interactive():
                 GV.session.login(GV.opt['-h'], GV.USER, GV.DELAY_BEFORE_SEND, GV.PROMPT_VALIDATION_TIMEOUT, GV.SYNC_RETRIES)
                 GV.session.echoCommand = GV.opt['-e']
             if GV.opt['-s']:
-                GV.session.executeCommand("source {0}/greenplum_path.sh".format(os.environ["GPHOME"]))
+                GV.session.executeCommand("source {0}/cloudberry-env.sh".format(os.environ["GPHOME"]))
             GV.session.cmdloop()
         except pexpect.EOF:
             print('\n[Unexpected EOF from some hosts...]')
@@ -265,7 +265,7 @@ def main():
                 GV.session.login(GV.opt['-h'], GV.USER, GV.DELAY_BEFORE_SEND, GV.PROMPT_VALIDATION_TIMEOUT, GV.SYNC_RETRIES)
                 GV.session.echoCommand = GV.opt['-e']
                 if GV.opt['-s']:
-                    GV.session.executeCommand("source {0}/greenplum_path.sh".format(os.environ["GPHOME"]))
+                    GV.session.executeCommand("source {0}/cloudberry-env.sh".format(os.environ["GPHOME"]))
                 output = GV.session.executeCommand(GV.argcmd)
                 GV.session.writeCommandOutput(output)
                 if GV.session.verbose: print('[INFO] completed successfully')
diff --git a/gpMgmt/bin/gpstart b/gpMgmt/bin/gpstart
index 6937d86ac51..bc1f60b6c3d 100755
--- a/gpMgmt/bin/gpstart
+++ b/gpMgmt/bin/gpstart
@@ -34,7 +34,7 @@ try:
     from gppylib.utils import TableLogger
     from gppylib.gp_era import GpEraFile
 except ImportError as e:
-    sys.exit('Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 logger = get_default_logger()
 
@@ -902,9 +902,7 @@ class GpStart:
         
         if is_external_fts:
             if options.fts_hosts is None:
-                coordinator_data_directory = os.getenv('COORDINATOR_DATA_DIRECTORY')
-                if coordinator_data_directory is None:
-                    coordinator_data_directory = options.coordinatorDataDirectory
+                coordinator_data_directory = gp.get_coordinatordatadir()
                 options.fts_hosts = coordinator_data_directory + '/config' + '/fts_host'
 
         return GpStart(options.specialMode, options.restricted,
diff --git a/gpMgmt/bin/gpstop b/gpMgmt/bin/gpstop
index 5f89bb90b02..ab7655597c9 100755
--- a/gpMgmt/bin/gpstop
+++ b/gpMgmt/bin/gpstop
@@ -36,7 +36,7 @@ try:
     from gppylib.operations.rebalanceSegments import ReconfigDetectionSQLQueryCommand
     from gppylib.operations.detect_unreachable_hosts import get_unreachable_segment_hosts
 except ImportError as e:
-    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 DEFAULT_NUM_WORKERS = 64
 logger = get_default_logger()
@@ -959,9 +959,7 @@ class GpStop:
         
         if is_external_fts:
             if options.fts_hosts is None:
-                coordinator_data_directory = os.getenv('COORDINATOR_DATA_DIRECTORY')
-                if coordinator_data_directory is None:
-                    coordinator_data_directory = options.coordinatorDataDirectory
+                coordinator_data_directory = gp.get_coordinatordatadir()
                 
                 options.fts_hosts = coordinator_data_directory + '/config' + '/fts_host'
 
diff --git a/gpMgmt/bin/lib/gp_bash_functions.sh b/gpMgmt/bin/lib/gp_bash_functions.sh
index 2276cdb900c..de76620da2b 100755
--- a/gpMgmt/bin/lib/gp_bash_functions.sh
+++ b/gpMgmt/bin/lib/gp_bash_functions.sh
@@ -28,8 +28,8 @@ declare -a GPPATH
 GPPATH=( $GPHOME $MPPHOME $BIZHOME )
 if [ ${#GPPATH[@]} -eq 0 ];then
 	echo "[FATAL]:-GPHOME environment variable is required to run GPDB but could not be found."
-	echo "Please set it by sourcing the  greenplum_path.sh  in your GPDB installation directory."
-	echo "Example: ''. /usr/local/gpdb/greenplum_path.sh''"
+	echo "Please set it by sourcing the cloudberry-env.sh in your GPDB installation directory."
+	echo "Example: ''. /usr/local/gpdb/cloudberry-env.sh''"
 	exit 1
 fi
 
diff --git a/gpMgmt/bin/lib/gpcreateseg.sh b/gpMgmt/bin/lib/gpcreateseg.sh
index 2dfa970d864..5dd0f5b0006 100755
--- a/gpMgmt/bin/lib/gpcreateseg.sh
+++ b/gpMgmt/bin/lib/gpcreateseg.sh
@@ -222,8 +222,8 @@ CREATE_QES_MIRROR () {
             PG_HBA_ENTRIES="${PG_HBA_ENTRIES}"$'\n'"host replication ${GP_USER} ${PRIMARY_HOSTADDRESS} trust"
         fi
     fi
-    RUN_COMMAND_REMOTE ${PRIMARY_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/greenplum_path.sh; cat - >> ${PRIMARY_DIR}/pg_hba.conf; pg_ctl -D ${PRIMARY_DIR} reload" <<< "${PG_HBA_ENTRIES}"
-    RUN_COMMAND_REMOTE ${GP_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/greenplum_path.sh; rm -rf ${GP_DIR}; ${GPHOME}/bin/pg_basebackup --wal-method=stream --create-slot --slot='internal_wal_replication_slot' -R -c fast -E ./db_dumps -D ${GP_DIR} -h ${PRIMARY_HOSTADDRESS} -p ${PRIMARY_PORT} --target-gp-dbid ${GP_DBID};"
+    RUN_COMMAND_REMOTE ${PRIMARY_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/cloudberry-env.sh; cat - >> ${PRIMARY_DIR}/pg_hba.conf; pg_ctl -D ${PRIMARY_DIR} reload" <<< "${PG_HBA_ENTRIES}"
+    RUN_COMMAND_REMOTE ${GP_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/cloudberry-env.sh; rm -rf ${GP_DIR}; ${GPHOME}/bin/pg_basebackup --wal-method=stream --create-slot --slot='internal_wal_replication_slot' -R -c fast -E ./db_dumps -D ${GP_DIR} -h ${PRIMARY_HOSTADDRESS} -p ${PRIMARY_PORT} --target-gp-dbid ${GP_DBID};"
     START_QE "-w"
     RETVAL=$?
     PARA_EXIT $RETVAL "pg_basebackup of segment data directory from ${PRIMARY_HOSTADDRESS} to ${GP_HOSTADDRESS}"
diff --git a/gpMgmt/doc/gpfdist_help b/gpMgmt/doc/gpfdist_help
index 4ad1f46ce83..cdb298662fc 100755
--- a/gpMgmt/doc/gpfdist_help
+++ b/gpMgmt/doc/gpfdist_help
@@ -10,7 +10,7 @@ SYNOPSIS
 gpfdist [-d <directory>] [-p <http_port>] [-l <log_file>] [-t <timeout>] 
 [-S] [-w <time>] [-v | -V] [-m <max_length>] [--ssl <certificate_path>]
 [--ssl_verify_peer <on/off>]
-[--compress]
+[--compress] [--compress-level]
 
 gpfdist [-? | --help] | --version
 
@@ -162,6 +162,15 @@ OPTIONS
  time-intensive process, which may potentially result in reduced
  transmission speeds.
 
+--compress-level <level>
+
+ Specifies the compression level to be used with the Zstandard (zstd) compression
+ when the --compress option is enabled. The <level> parameter is an integer value
+ that controls the trade-off between compression ratio and speed. Higher values
+ typically result in better compression ratios but may require more CPU time.
+ The valid range is 1 (fastest, least compression) to 9 (slowest, best compression).
+ The default compression level is 1 if not specified.
+
 
 -v (verbose) 
 
diff --git a/gpMgmt/doc/gplogfilter_help b/gpMgmt/doc/gplogfilter_help
index 9f0c284b403..60afde9d085 100644
--- a/gpMgmt/doc/gplogfilter_help
+++ b/gpMgmt/doc/gplogfilter_help
@@ -32,7 +32,7 @@ once by running it through the gpssh utility. For example, to display
 the last three lines of each segment log file: 
 
  gpssh -f seg_host_file 
- => source /usr/local/greenplum-db/greenplum_path.sh 
+ => source /usr/local/greenplum-db/cloudberry-env.sh 
  => gplogfilter -n 3 /gpdata/*/log/gpdb*.csv 
 
 By default, the output of gplogfilter is sent to standard output. Use 
@@ -217,7 +217,7 @@ messages in the segment log files containing the string 'con6' and save
 output to a file. 
 
  gpssh -f seg_hosts_file -e 'source 
- /usr/local/greenplum-db/greenplum_path.sh ; gplogfilter -f con6 
+ /usr/local/greenplum-db/cloudberry-env.sh ; gplogfilter -f con6 
  /gpdata/*/log/gpdb*.csv' > seglog.out 
 
  
diff --git a/gpMgmt/doc/gpssh_help b/gpMgmt/doc/gpssh_help
index 8a0c7f0ffb0..fe93572bf83 100755
--- a/gpMgmt/doc/gpssh_help
+++ b/gpMgmt/doc/gpssh_help
@@ -101,7 +101,7 @@ OPTIONS
 -s
 
  Optional. If specified, before executing any commands on the target 
- host, gpssh sources the file greenplum_path.sh in the directory 
+ host, gpssh sources the file cloudberry-env.sh in the directory 
  specified by the $GPHOME environment variable. 
 
  This option is valid for both interactive mode and single command mode. 
diff --git a/gpMgmt/sbin/gpconfig_helper.py b/gpMgmt/sbin/gpconfig_helper.py
index 158e0332cb4..8313ad44e04 100755
--- a/gpMgmt/sbin/gpconfig_helper.py
+++ b/gpMgmt/sbin/gpconfig_helper.py
@@ -22,7 +22,7 @@
     from optparse import Option, OptionParser
     from gppylib.gpparseopts import OptParser, OptChecker
 except ImportError as e:
-    sys.exit('Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 _help = ["""This enables one to add, get and remove postgresql.conf configuration parameters.
 The absolute path to the postgresql.conf file is required."""]
diff --git a/gpMgmt/test/README b/gpMgmt/test/README
index 808a8946e26..bcea2a0cd98 100644
--- a/gpMgmt/test/README
+++ b/gpMgmt/test/README
@@ -5,7 +5,7 @@ if they are not already installed on your machine.
 
 To run behave:
 
-source greenplum_path.sh
+source cloudberry-env.sh
 cd gpMgmt
 
 "make -f Makefile.behave behave" will run all the integration tests.
diff --git a/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature b/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature
index 00fbd568dbf..1d69a5403ff 100644
--- a/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature
+++ b/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature
@@ -253,7 +253,7 @@ Feature: gpinitsystem tests
         And a working directory of the test as '/tmp/gpinitsystem'
         # create a dummy dca version file so that DCA specific parameters are set
         And the user runs command "touch /tmp/gpinitsystem/gpdb-appliance-version"
-        When the user runs command "source $GPHOME/greenplum_path.sh; __DCA_VERSION_FILE__=/tmp/gpinitsystem/gpdb-appliance-version $GPHOME/bin/gpinitsystem -a -c ../gpAux/gpdemo/clusterConfigFile"
+        When the user runs command "source $GPHOME/cloudberry-env.sh; __DCA_VERSION_FILE__=/tmp/gpinitsystem/gpdb-appliance-version $GPHOME/bin/gpinitsystem -a -c ../gpAux/gpdemo/clusterConfigFile"
         Then gpinitsystem should return a return code of 0
         # the log file must have the entry indicating that DCA specific configuration has been set
         And the user runs command "grep -E 'Setting DCA specific configuration values' ~/gpAdminLogs/gpinitsystem*log"
diff --git a/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py b/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py
index dfcc137fe71..5af0e37762e 100644
--- a/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py
+++ b/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py
@@ -748,7 +748,7 @@ def impl(context, command, hostname):
     run_command_remote(context,
                        command,
                        hostname,
-                       os.getenv("GPHOME") + '/greenplum_path.sh',
+                       os.getenv("GPHOME") + '/cloudberry-env.sh',
                        'export COORDINATOR_DATA_DIRECTORY=%s' % coordinator_data_dir)
     if has_exception(context):
         raise context.exception
@@ -788,7 +788,7 @@ def impl(context, HOST, port, dir, ctxt):
     remote_gphome = os.environ.get('GPHOME')
     if not dir.startswith("/"):
         dir = os.environ.get(dir)
-    gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh')
+    gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh')
     gpfdist = Gpfdist('gpfdist on host %s' % host, dir, port, os.path.join(dir, 'gpfdist.pid'), int(ctxt), host,
                       gp_source_file)
     gpfdist.startGpfdist()
@@ -801,7 +801,7 @@ def impl(context, HOST, port, dir, ctxt):
     remote_gphome = os.environ.get('GPHOME')
     if not dir.startswith("/"):
         dir = os.environ.get(dir)
-    gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh')
+    gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh')
     gpfdist = Gpfdist('gpfdist on host %s' % host, dir, port, os.path.join(dir, 'gpfdist.pid'), int(ctxt), host,
                       gp_source_file)
     gpfdist.cleanupGpfdist()
@@ -1045,7 +1045,7 @@ def impl(context, filepath):
         run_command_remote(context,
                            cmd,
                            context.standby_hostname,
-                           os.getenv("GPHOME") + '/greenplum_path.sh',
+                           os.getenv("GPHOME") + '/cloudberry-env.sh',
                            'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir,
                            validateAfter=True)
     except:
@@ -1173,7 +1173,7 @@ def impl(context, coordinator, standby):
     run_command_remote(context,
                        cmd,
                        context.coordinator_hostname,
-                       os.getenv("GPHOME") + '/greenplum_path.sh',
+                       os.getenv("GPHOME") + '/cloudberry-env.sh',
                        'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir)
 
     context.stdout_position = 0
@@ -1290,7 +1290,7 @@ def impl(context, command):
     run_command_remote(context,
                        cmd,
                        context.standby_hostname,
-                       os.getenv("GPHOME") + '/greenplum_path.sh',
+                       os.getenv("GPHOME") + '/cloudberry-env.sh',
                        'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir,
                        validateAfter=False)
 
@@ -1365,7 +1365,7 @@ def impl(context):
     run_command_remote(context,
                        cmd,
                        context.standby_hostname,
-                       os.getenv("GPHOME") + '/greenplum_path.sh',
+                       os.getenv("GPHOME") + '/cloudberry-env.sh',
                        'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir)
 
 
@@ -1444,7 +1444,7 @@ def stop_segments(context, where_clause):
         # For demo_cluster tests that run on the CI gives the error 'bash: pg_ctl: command not found'
         # Thus, need to add pg_ctl to the path when ssh'ing to a demo cluster.
         subprocess.check_call(['ssh', seg.getSegmentHostName(),
-                               'source %s/greenplum_path.sh && pg_ctl stop -m fast -D %s -w -t 120' % (
+                               'source %s/cloudberry-env.sh && pg_ctl stop -m fast -D %s -w -t 120' % (
                                    pipes.quote(os.environ.get("GPHOME")), pipes.quote(seg.getSegmentDataDirectory()))
                                ])
 
@@ -1478,7 +1478,7 @@ def stop_segments_immediate(context, where_clause):
         # For demo_cluster tests that run on the CI gives the error 'bash: pg_ctl: command not found'
         # Thus, need to add pg_ctl to the path when ssh'ing to a demo cluster.
         subprocess.check_call(['ssh', seg.getSegmentHostName(),
-                               'source %s/greenplum_path.sh && pg_ctl stop -m immediate -D %s -w' % (
+                               'source %s/cloudberry-env.sh && pg_ctl stop -m immediate -D %s -w' % (
                                    pipes.quote(os.environ.get("GPHOME")), pipes.quote(seg.getSegmentDataDirectory()))
                                ])
 
@@ -2143,7 +2143,7 @@ def impl(context, filename, contain, output):
 @given('the gpfdists occupying port {port} on host "{hostfile}"')
 def impl(context, port, hostfile):
     remote_gphome = os.environ.get('GPHOME')
-    gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh')
+    gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh')
     source_map_file = os.environ.get(hostfile)
     dir = '/tmp'
     ctxt = 2
@@ -2160,7 +2160,7 @@ def impl(context, port, hostfile):
 @then('the gpfdists running on port {port} get cleaned up from host "{hostfile}"')
 def impl(context, port, hostfile):
     remote_gphome = os.environ.get('GPHOME')
-    gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh')
+    gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh')
     source_map_file = os.environ.get(hostfile)
     dir = '/tmp'
     ctxt = 2
@@ -2293,7 +2293,7 @@ def impl(context, table, dbname, segid):
     port = port.strip()
     host = host.strip()
     user = os.environ.get('USER')
-    source_file = os.path.join(os.environ.get('GPHOME'), 'greenplum_path.sh')
+    source_file = os.path.join(os.environ.get('GPHOME'), 'cloudberry-env.sh')
     # Yes, the below line is ugly.  It looks much uglier when done with separate strings, given the multiple levels of escaping required.
     remote_cmd = """
 ssh %s "source %s; export PGUSER=%s; export PGPORT=%s; export PGOPTIONS=\\\"-c gp_role=utility\\\"; psql -d %s -c \\\"SET allow_system_table_mods=true; DELETE FROM pg_attribute where attrelid=\'%s\'::regclass::oid;\\\""
@@ -2309,7 +2309,7 @@ def impl(context, table, dbname, segid):
     port = port.strip()
     host = host.strip()
     user = os.environ.get('USER')
-    source_file = os.path.join(os.environ.get('GPHOME'), 'greenplum_path.sh')
+    source_file = os.path.join(os.environ.get('GPHOME'), 'cloudberry-env.sh')
     # Yes, the below line is ugly.  It looks much uglier when done with separate strings, given the multiple levels of escaping required.
     remote_cmd = """
 ssh %s "source %s; export PGUSER=%s; export PGPORT=%s; export PGOPTIONS=\\\"-c gp_role=utility\\\"; psql -d %s -c \\\"SET allow_system_table_mods=true; UPDATE pg_class SET relnatts=relnatts + 2 WHERE relname=\'%s\';\\\""
@@ -2619,14 +2619,14 @@ def impl(context, location):
     directory location for all hosts in the cluster.
     """
     gphome = os.environ["GPHOME"]
-    greenplum_path = path.join(gphome, 'greenplum_path.sh')
+    cloudberry_env = path.join(gphome, 'cloudberry-env.sh')
 
-    # First replace the GPHOME envvar in greenplum_path.sh.
+    # First replace the GPHOME envvar in cloudberry-env.sh.
     subprocess.check_call([
         'sed',
         '-i.bak', # we use this backup later
         '-e', r's|^GPHOME=.*$|GPHOME={}|'.format(location),
-        greenplum_path,
+        cloudberry_env,
     ])
 
     try:
@@ -2646,9 +2646,9 @@ def impl(context, location):
         ])
 
     finally:
-        # Put greenplum_path.sh back the way it was.
+        # Put cloudberry-env.sh back the way it was.
         subprocess.check_call([
-            'mv', '{}.bak'.format(greenplum_path), greenplum_path
+            'mv', '{}.bak'.format(cloudberry_env), cloudberry_env
         ])
 
 @given('all files in gpAdminLogs directory are deleted')
diff --git a/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py b/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py
index fd1626443ff..6cd502aa5a9 100755
--- a/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py
+++ b/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py
@@ -5,7 +5,7 @@
     from gppylib.commands.base import Command, LOCAL, REMOTE, WorkerPool
 except ImportError as import_exception:
     sys.exit('Cannot import modules.  Please check that you have sourced' \
-             ' greenplum_path.sh.  Detail: %s' % str(import_exception))
+             ' cloudberry-env.sh.  Detail: %s' % str(import_exception))
 import socket
 
 class Gpfdist:
@@ -13,7 +13,7 @@ class Gpfdist:
     Gpfdist class to management create and cleanup of gpfdist instance
     """
     def __init__(self, name, directory, port, pid_file,
-                 ctxt=LOCAL, remoteHost=None, remote_source_file=os.path.join(os.environ.get('GPHOME'),'greenplum_path.sh')):
+                 ctxt=LOCAL, remoteHost=None, remote_source_file=os.path.join(os.environ.get('GPHOME'),'cloudberry-env.sh')):
         """  
         name: name of the command
         dir: directory for gpfdist to use as its root directory
diff --git a/gpMgmt/test/behave_utils/utils.py b/gpMgmt/test/behave_utils/utils.py
index a61febcd9f7..bc62c15badf 100644
--- a/gpMgmt/test/behave_utils/utils.py
+++ b/gpMgmt/test/behave_utils/utils.py
@@ -231,7 +231,7 @@ def stop_primary(context, content_id):
     # For demo_cluster tests that run on the CI gives the error 'bash: pg_ctl: command not found'
     # Thus, need to add pg_ctl to the path when ssh'ing to a demo cluster.
     subprocess.check_call(['ssh', seg_host,
-                           'source %s/greenplum_path.sh && pg_ctl stop -m fast -D %s' % (
+                           'source %s/cloudberry-env.sh && pg_ctl stop -m fast -D %s' % (
                                pipes.quote(os.environ.get("GPHOME")), pipes.quote(seg_data_dir))
                            ])
 
diff --git a/gpcontrib/Makefile b/gpcontrib/Makefile
index cc61f3f8e03..60fef1778c6 100644
--- a/gpcontrib/Makefile
+++ b/gpcontrib/Makefile
@@ -36,9 +36,6 @@ endif
 ifeq "$(with_zstd)" "yes"
 	recurse_targets += zstd
 endif
-ifeq "$(with_quicklz)" "yes"
-	recurse_targets += quicklz
-endif
 $(call recurse,all install clean distclean, $(recurse_targets))
 
 all: gpcloud pxf mapreduce orafce
@@ -97,7 +94,6 @@ installcheck:
 	if [ "$(enable_orafce)" = "yes" ]; then $(MAKE) -C orafce installcheck; fi
 	if [ "$(enable_pxf)" = "yes" ]; then $(MAKE) -C pxf_fdw installcheck; fi
 	if [ "$(with_zstd)" = "yes" ]; then $(MAKE) -C zstd installcheck; fi
-	if [ "$(with_quicklz)" = "yes" ]; then $(MAKE) -C quicklz installcheck; fi
 	$(MAKE) -C gp_sparse_vector installcheck
 	$(MAKE) -C gp_toolkit installcheck
 	$(MAKE) -C gp_exttable_fdw installcheck
diff --git a/gpcontrib/gp_exttable_fdw/Makefile b/gpcontrib/gp_exttable_fdw/Makefile
index 1533fff0f04..a2b5cf9fb4f 100644
--- a/gpcontrib/gp_exttable_fdw/Makefile
+++ b/gpcontrib/gp_exttable_fdw/Makefile
@@ -3,6 +3,7 @@
 MODULE_big = gp_exttable_fdw
 OBJS = gp_exttable_fdw.o extaccess.o option.o
 
+SHLIB_LINK_INTERNAL = $(libpq)
 #SHLIB_LINK += -lcurl
 
 EXTENSION = gp_exttable_fdw
diff --git a/gpcontrib/gp_exttable_fdw/extaccess.c b/gpcontrib/gp_exttable_fdw/extaccess.c
index 08f6a431c66..c115d3583e1 100644
--- a/gpcontrib/gp_exttable_fdw/extaccess.c
+++ b/gpcontrib/gp_exttable_fdw/extaccess.c
@@ -491,6 +491,22 @@ external_getnext_init(PlanState *state)
 	return desc;
 }
 
+/*
+ * check_exec_error
+ *
+ * check CFTYPE_EXEC error after external_getnext.
+ */
+static void
+check_exec_error(FileScanDesc scan)
+{
+	char   *relname = RelationGetRelationName(scan->fs_rd);
+	if (scan->fs_file->type == CFTYPE_EXEC)
+	{
+		url_fclose(scan->fs_file, !QueryFinishPending, relname);
+		scan->fs_file = NULL;
+	}
+}
+
 /* ----------------------------------------------------------------
 *		external_getnext
 *
@@ -530,6 +546,8 @@ external_getnext(FileScanDesc scan, ScanDirection direction, ExternalSelectDesc
 	{
 		FILEDEBUG_2;			/* external_getnext returning EOS */
 
+		check_exec_error(scan);
+
 		return NULL;
 	}
 
diff --git a/gpcontrib/gp_inject_fault/Makefile b/gpcontrib/gp_inject_fault/Makefile
index b7991ac9f5b..0539a262d03 100644
--- a/gpcontrib/gp_inject_fault/Makefile
+++ b/gpcontrib/gp_inject_fault/Makefile
@@ -1,4 +1,5 @@
-MODULES = gp_inject_fault
+MODULE_big = gp_inject_fault
+OBJS = gp_inject_fault.o
 
 EXTENSION = gp_inject_fault
 DATA = gp_inject_fault--1.0.sql
@@ -6,6 +7,7 @@ DATA = gp_inject_fault--1.0.sql
 REGRESS = inject_fault_test
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
+SHLIB_LINK_INTERNAL = $(libpq)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/gpcontrib/gpcloud/src/s3utils.cpp b/gpcontrib/gpcloud/src/s3utils.cpp
index bf1ffaba4e0..7445e4dbb16 100644
--- a/gpcontrib/gpcloud/src/s3utils.cpp
+++ b/gpcontrib/gpcloud/src/s3utils.cpp
@@ -103,6 +103,15 @@ size_t find_Nth(const string &str,  // where to work
     return pos;
 }
 
+#// Suppress deprecation warnings for MD5 functions on OpenSSL >= 3.0
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 MD5Calc::MD5Calc() {
     memset(this->md5, 0, MD5_DIGEST_STRING_LENGTH);
     MD5_Init(&this->c);
@@ -126,6 +135,12 @@ const char *MD5Calc::Get() {
     return this->result.c_str();
 }
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
 Config::Config(const string &filename, const string &url, const char *datadir) : _conf(NULL) {
     if (!url.empty()) {
         this->_conf = ini_load_from_url(url.c_str(), datadir);
diff --git a/gpcontrib/gpmapreduce/input/mapred.source b/gpcontrib/gpmapreduce/input/mapred.source
index 7702abc2951..d885c974447 100644
--- a/gpcontrib/gpmapreduce/input/mapred.source
+++ b/gpcontrib/gpmapreduce/input/mapred.source
@@ -26,7 +26,7 @@ create language plpython3u;
 select * from pg_pltemplate;
 select lanname, lanispl, lanpltrusted from pg_language;
 
--- Check environment variables that should have been set by greenplum_path.sh
+-- Check environment variables that should have been set by cloudberry-env.sh
 --
 -- 1) We need to check these on all segments and on the master.
 -- 2) We do this via external table rather than perl/python in case it is part
diff --git a/gpcontrib/gpmapreduce/output/mapred.source b/gpcontrib/gpmapreduce/output/mapred.source
index 0f0779a6656..66c9f8c6e07 100644
--- a/gpcontrib/gpmapreduce/output/mapred.source
+++ b/gpcontrib/gpmapreduce/output/mapred.source
@@ -42,7 +42,7 @@ select lanname, lanispl, lanpltrusted from pg_language;
  plpython3u | t       | f
 (6 rows)
 
--- Check environment variables that should have been set by greenplum_path.sh
+-- Check environment variables that should have been set by cloudberry-env.sh
 --
 -- 1) We need to check these on all segments and on the master.
 -- 2) We do this via external table rather than perl/python in case it is part
diff --git a/gpcontrib/gpmapreduce/output/mapred_1.source b/gpcontrib/gpmapreduce/output/mapred_1.source
new file mode 100644
index 00000000000..05c29807feb
--- /dev/null
+++ b/gpcontrib/gpmapreduce/output/mapred_1.source
@@ -0,0 +1,798 @@
+--
+-- map/reduce tests
+--
+-- Some notes: the PATH variable doesn't necessarily work correctly in
+-- the regression context, so use the "gpwhich" token to get the full
+-- path from your environment (see gpstringsubs for more details).  And
+-- to make this work correctly with gpsourcify, you need to add your
+-- gpwhich token to gptokencheck.
+-- start_matchsubs
+-- m|mapreduce_\d+_run|
+-- s|mapreduce_\d+_run|mapreduce_PID_run|
+-- end_matchsubs
+--
+-- This test makes use of plperlu
+--
+-- start_ignore
+create language plperlu;
+create language plpython3u;
+-- Take a look at the installed languages, plperl and plpython should be in the list.
+--  + pg_pltemplate contains the list of languages that can be simply installed
+--  + pl_language contains the list of languages that are actually installed
+select * from pg_pltemplate;
+ tmplname  | tmpltrusted |      tmplhandler      |   tmplvalidator   |   tmpllibrary    | tmplacl 
+-----------+-------------+-----------------------+-------------------+------------------+---------
+ plpgsql   | t           | plpgsql_call_handler  | plpgsql_validator | $libdir/plpgsql  | 
+ pltcl     | t           | pltcl_call_handler    |                   | $libdir/pltcl    | 
+ pltclu    | f           | pltclu_call_handler   |                   | $libdir/pltcl    | 
+ plperl    | t           | plperl_call_handler   | plperl_validator  | $libdir/plperl   | 
+ plperlu   | f           | plperl_call_handler   | plperl_validator  | $libdir/plperl   | 
+ plpython3u | f           | plpython_call_handler |                   | $libdir/plpython | 
+ plr       | f           | plr_call_handler      |                   | $libdir/plr      | 
+(7 rows)
+
+select lanname, lanispl, lanpltrusted from pg_language;
+  lanname  | lanispl | lanpltrusted 
+-----------+---------+--------------
+ internal  | f       | f
+ c         | f       | f
+ sql       | f       | t
+ plpgsql   | t       | t
+ plperlu   | t       | f
+ plpython3u | t       | f
+(6 rows)
+
+-- Check environment variables that should have been set by greenplum_path.sh
+--
+-- 1) We need to check these on all segments and on the master.
+-- 2) We do this via external table rather than perl/python in case it is part
+--    of the cause of a mis-installed plperl/plpython.
+-- 3) It is normal for the master to have a slightly different enviornment from
+--    the segments (but perhaps not desirable?)
+--
+CREATE EXTERNAL WEB TABLE env_segment(var text, value text) 
+EXECUTE 'env | grep "^[^=]*=[^=]*$"' format 'text' (delimiter '=');
+CREATE EXTERNAL WEB TABLE env_master(var text, value text) 
+EXECUTE 'env | grep "^[^=]*=[^=]*$"' ON COORDINATOR format 'text' (delimiter '=');
+CREATE VIEW env AS
+  SELECT gp_execution_segment(), * FROM env_segment
+  UNION ALL
+  SELECT gp_execution_segment(), * FROM env_master;
+SELECT * FROM env WHERE var in (
+	   'GPHOME', 
+	   'DYLD_LIBRARY_PATH', 
+	   'LD_LIBRARY_PATH', 
+	   'PATH'
+) ORDER BY var, gp_execution_segment;
+ gp_execution_segment |        var        |                                                                      value                                                                                         
+----------------------+-------------------+----------------------------------------------------------------------------------------------------------------------------------------
+                   -1 | DYLD_LIBRARY_PATH | @gphome@/lib:@gphome@/ext/python/lib:$DYLD_LIBRARY_PATH
+                    0 | DYLD_LIBRARY_PATH | @gphome@/lib:@gphome@/ext/python/lib:
+                    1 | DYLD_LIBRARY_PATH | @gphome@/lib:@gphome@/ext/python/lib:
+                   -1 | GPHOME            | @gphome@
+                    0 | GPHOME            | @gphome@
+                    1 | GPHOME            | @gphome@
+                   -1 | LD_LIBRARY_PATH   | @gphome@/lib:@gphome@/ext/python/lib:
+                   -1 | PATH              | @gphome@/bin:/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:/usr/sbin:/sbin:/usr/texbin:/usr/X11/bin:/sw/bin:/opt/local/bin:/opt/local/sbin
+                    0 | PATH              | @gphome@/ext/python/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+                    1 | PATH              | @gphome@/ext/python/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+(10 rows)
+
+-- end_ignore
+-- start_ignore
+--
+-- Some checks to verify what versions of perl/python we have.
+-- If everything has been configured correctly this should be constant
+-- across all our installations.
+--
+-- All of these checks should return a single row because it should produce
+-- a constant across all segments and the master.
+--
+-- The current expected version is 2.6.2
+--
+CREATE OR REPLACE FUNCTION python_version() returns text as $$
+import sys
+return sys.version_info
+$$ language plpython3u NO SQL;
+SELECT python_version() FROM env GROUP BY python_version;
+    python_version     
+-----------------------
+ (2, 6, 2, 'final', 0)
+(1 row)
+
+--
+-- Same check for perl version
+--
+-- Expected version is perl 5.008xxx
+--
+CREATE OR REPLACE FUNCTION perl_version() returns text as $$
+return "Perl $]"
+$$ language plperlu NO SQL;
+SELECT perl_version() FROM env GROUP BY perl_version;
+ perl_version  
+---------------
+ Perl 5.008005
+(1 row)
+
+--
+-- The following two checks need to be put into big ignore blocks
+-- because paths can be of differing lengths
+--
+CREATE OR REPLACE FUNCTION python_path() returns text as $$
+import sys
+return sys.path[0]
+$$ language plpython3u NO SQL;
+SELECT python_path() FROM env GROUP BY python_path;
+                 python_path                 
+---------------------------------------------
+ @gphome@/lib/python
+(1 row)
+
+CREATE OR REPLACE FUNCTION perl_path() returns text as $$
+return join(':', @INC)
+$$ language plperlu NO SQL;
+SELECT perl_path() FROM env GROUP BY perl_path;
+                                                                                                                                                                                                      perl_path                                                                                                                                                                                                      
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ /System/Library/Perl/5.8.8/darwin-thread-multi-2level:/System/Library/Perl/5.8.8:/Library/Perl/5.8.8/darwin-thread-multi-2level:/Library/Perl/5.8.8:/Library/Perl:/Network/Library/Perl/5.8.8/darwin-thread-multi-2level:/Network/Library/Perl/5.8.8:/Network/Library/Perl:/System/Library/Perl/Extras/5.8.8/darwin-thread-multi-2level:/System/Library/Perl/Extras/5.8.8:/Library/Perl/5.8.6:/Library/Perl/5.8.1:.
+(1 row)
+
+-- end_ignore
+--
+-- Create a harness to run shell commands and output stderr and stdout
+--
+CREATE OR REPLACE FUNCTION execute(cmd text) returns text as $$
+import subprocess
+p = subprocess.Popen(cmd, shell=True, 
+                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+r = p.communicate()
+header = "---------------------\n"
+return header + r[0].decode()
+$$ LANGUAGE plpython3u NO SQL;
+--
+-- Create a harness to run mapreduce jobs on the correct host/port
+--
+CREATE OR REPLACE FUNCTION mapreduce(file text) returns setof text as $$
+import subprocess
+
+rv = plpy.execute("select hostname, port, user as user, " +
+   " current_database() as db from gp_segment_configuration where content=-1")
+
+cmd = ['@gpwhich_gpmapreduce@',
+       '--host=%s' % rv[0]['hostname'],
+       '--port=%s' % rv[0]['port'],
+       '--file=%s' % file,
+       rv[0]['db'], rv[0]['user'] ]
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+r = p.communicate()
+header = "---------------------"
+err = '\nSTDERR> '.join(('STDERR> ' + r[1].decode()).split('\n')).replace('\t', '   ')
+out = 'STDOUT>\n' + r[0].decode().replace('\t', ', ')
+return [header, err, out]
+$$ LANGUAGE plpython3u READS SQL DATA;
+CREATE OR REPLACE FUNCTION mapreduce(file text, keys text) returns setof text as $$
+import subprocess
+
+rv = plpy.execute("select hostname, port, user as user, " +
+   " current_database() as db from gp_segment_configuration where content=-1")
+
+cmd = ['@gpwhich_gpmapreduce@',
+       '--host=%s' % rv[0]['hostname'],
+       '--port=%s' % rv[0]['port'],
+       '--file=%s' % file,
+       rv[0]['db'], rv[0]['user'] ]
+for key in keys.split(';'):
+  cmd.append('--key=%s' % key)
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+r = p.communicate()
+header = "---------------------"
+err = '\nSTDERR> '.join(('STDERR> ' + r[1].decode()).split('\n')).replace('\t', '   ')
+out = 'STDOUT>\n' + r[0].decode().replace('\t', ', ')
+return [header, err, out]
+$$ LANGUAGE plpython3u READS SQL DATA;
+--
+-- CHECK 1) make sure plperlu is really installed:
+--
+-- Note: if not, you might need to 'export PG_LANG=true' and reconfigure/rebuild
+--
+SELECT lanname, lanispl, lanpltrusted FROM pg_language WHERE lanname = 'plperlu';
+ lanname | lanispl | lanpltrusted 
+---------+---------+--------------
+ plperlu | t       | f
+(1 row)
+
+--
+-- Since many of these tests will end up having variable length output depending
+-- on local paths we want to disable the "----" lines from psql so that our diffs
+-- look reasonable.
+--
+-- The default is "aligned" if that ever changes then we need to change how we restore
+-- it at the end of the test
+\pset format
+\pset format unaligned
+--
+-- Check 2) Find gpmapreduce and print the help file
+--
+-- start_ignore
+select execute( '@gpwhich_gpmapreduce@ --help' );
+execute
+---------------------
+@gpwhich_gpmapreduce@ - Cloudberry Map/Reduce Driver 1.00b2
+
+Usage:
+  @gpwhich_gpmapreduce@ [options] -f file.yml [dbname [username]]
+
+General options:
+  -? | --help                   show this help, then exit
+  -V | --version                show version information, then exit
+  -v | --verbose                verbose output
+  -x | --explain                do not run jobs, but produce explain plans
+  -X | --explain-analyze        run jobs and produce explain-analyze plans
+  -k | --key <name>=<value>     sets a yaml variable
+
+Connection options:
+  -h | --host <hostname>        database server host or socket directory
+  -p | --port <port>            database server port
+  -U | --username <username>    database user name
+  -W | --password               prompt for password
+
+Debug options:
+  -D | --debug                  enable some debugging output
+  -P | --print                  print-only mode, do not run jobs
+
+(1 row)
+-- end_ignore
+--
+-- TEST 1) complain about missing file
+--
+SELECT mapreduce('nosuchfile') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> Error: Could not open file 'nosuchfile'
+STDERR> 
+STDOUT>
+
+(3 rows)
+--
+-- TEST 2) Tests reading and sorting an input file;
+--
+SELECT mapreduce('@abs_srcdir@/yml/sort.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_73685_run_1
+STDERR> 
+STDOUT>
+value                    
+-------------------------
+alex, 30, (1.352,8.2)      
+belinda, 38, (8.9,1.7)     
+bertha, 88, (2.75,9.4)     
+carina, 58, (4.27,8.8)     
+carmen, 78, (3.8,8.2)      
+chris, 78, (9.78,2)        
+denise, 24, (3.78,87.90)   
+diane, 18, (5.912,5.3)     
+edna, 18, (1.53,3.5)       
+esther, 98, (5.36,7.6)     
+fanny, 08, (1.2,0.9)       
+gina, 18, (9.82,7.5)       
+jane, 58, (1.34,0.44)      
+jean, 28, (8.561,7.3)      
+jenifer, 38, (6.6,23.3)    
+joan, 18, (9.4,47.04)      
+joe, 20, (5.5,2.5)         
+juanita, 58, (4.57,35.8)   
+julie, 68, (3.6,7.2)       
+karen, 48, (8.73,0.0)      
+koko, 88, (1.7,5.5)        
+leah, 68, (0.6,3.37)       
+lita, 25, (1.3,8.7)        
+liza, 38, (9.76,6.90)      
+louise, 98, (5.0,8.7)      
+martie, 88, (8.358,.93)    
+mary, 08, (3.7,39.20)      
+melissa, 28, (3.089,087.23)
+mike, 40, (3.1,6.2)        
+nan, 28, (6.35,0.43)       
+pamela, 48, (8.21,9.3)     
+pat, 18, (1.19,0.6)        
+paula, 68, (0.5,0.5)       
+rean, 48, (8.5,5.0)        
+sally, 34, (3.8,45.8)      
+sandra, 19, (9.345,09.6)   
+sandy, 38, (3.8,0.2)       
+sarah, 88, (8.4,2.3)       
+sharon, 78, (9.237,8.8)    
+sue, 50, (8.34,7.375)      
+sumi, 38, (1.15,0.6)       
+susan, 78, (6.579,3)       
+teresa, 38, (7.7,1.8)      
+trisha, 88, (1.29,2.2)     
+trudy, 88, (6.01,0.5)      
+velma, 68, (8.8,8.9)       
+vera, 78, (9.73,6.4)       
+wendy, 78, (2.62,03.3)     
+zena, 98, (0.35,0)         
+zola, 58, (2.56,4.3)       
+(50 rows)
+
+
+(3 rows)
+--
+-- TEST 3) Tests a basic map function and parameter passing
+--
+SELECT mapreduce('@abs_srcdir@/yml/grep.yml', 'key=an') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_73691_run_1
+STDERR> 
+STDOUT>
+key|value                 
+---+----------------------
+an |diane, 18, (5.912,5.3)  
+an |fanny, 08, (1.2,0.9)    
+an |jane, 58, (1.34,0.44)   
+an |jean, 28, (8.561,7.3)   
+an |joan, 18, (9.4,47.04)   
+an |juanita, 58, (4.57,35.8)
+an |nan, 28, (6.35,0.43)    
+an |rean, 48, (8.5,5.0)     
+an |sandra, 19, (9.345,09.6)
+an |sandy, 38, (3.8,0.2)    
+an |susan, 78, (6.579,3)    
+(11 rows)
+
+
+(3 rows)
+--
+-- Test 4) Tests producing multiple columns
+--
+SELECT mapreduce('@abs_srcdir@/yml/grep2.yml', 'key=an') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_73697_run_1
+STDERR> 
+STDOUT>
+name   |age|location    
+-------+---+------------
+diane  | 18|(5.912,5.3) 
+fanny  |  8|(1.2,0.9)   
+jane   | 58|(1.34,0.44) 
+jean   | 28|(8.561,7.3) 
+joan   | 18|(9.4,47.04) 
+juanita| 58|(4.57,35.8) 
+nan    | 28|(6.35,0.43) 
+rean   | 48|(8.5,5.0)   
+sandra | 19|(9.345,09.6)
+sandy  | 38|(3.8,0.2)   
+susan  | 78|(6.579,3)   
+(11 rows)
+
+
+(3 rows)
+--
+-- Test 5) Tests a basic reduce function and the builtin counterpart
+--
+SELECT mapreduce('@abs_srcdir@/yml/agebracket.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_73703_run_1
+STDERR> 
+STDOUT>
+key            |value
+---------------+-----
+0 => age < 10  |    2
+10 => age < 20 |    6
+20 => age < 30 |    6
+30 => age < 40 |    8
+40 => age < 50 |    4
+50 => age < 60 |    5
+60 => age < 70 |    4
+70 => age < 80 |    6
+80 => age < 90 |    6
+90 => age < 100|    3
+(10 rows)
+
+
+(3 rows)
+SELECT mapreduce('@abs_srcdir@/yml/agebracket_builtin.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_73703_run_1
+STDERR> 
+STDOUT>
+key            |value
+---------------+-----
+0 => age < 10  |    2
+10 => age < 20 |    6
+20 => age < 30 |    6
+30 => age < 40 |    8
+40 => age < 50 |    4
+50 => age < 60 |    5
+60 => age < 70 |    4
+70 => age < 80 |    6
+80 => age < 90 |    6
+90 => age < 100|    3
+(10 rows)
+
+
+(3 rows)
+--
+-- Test 6) File Output tests
+--
+SELECT execute('rm @abs_builddir@/results/fileout_*.out') ORDER BY 1;
+execute
+---------------------
+
+(1 row)
+SELECT mapreduce('@abs_srcdir@/yml/fileout.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_73712_run_1
+STDERR> mapreduce_73712_run_2
+STDERR> mapreduce_73712_run_3
+STDERR> 
+STDOUT>
+
+(3 rows)
+SELECT execute('cat @abs_builddir@/results/fileout_none.out') ORDER BY 1;
+execute
+---------------------
+row 1:data 1
+row 2:data 2
+row 3:data 3
+
+(1 row)
+SELECT execute('cat @abs_builddir@/results/fileout_replace.out') ORDER BY 1;
+execute
+---------------------
+row 1|data 1
+row 2|data 2
+row 3|data 3
+
+(1 row)
+SELECT execute('cat @abs_builddir@/results/fileout_append.out') ORDER BY 1;
+execute
+---------------------
+row 1,data 1
+row 2,data 2
+row 3,data 3
+
+(1 row)
+SELECT mapreduce('@abs_srcdir@/yml/fileout.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_73721_run_1
+STDERR> mapreduce_73721_run_2
+STDERR> mapreduce_73721_run_3
+STDERR> Error: OUTPUT 'out_3': file '@abs_builddir@/results/fileout_none.out' already exists, at line 27
+STDERR> Error: Object creation Failure
+STDERR> 
+STDOUT>
+
+(3 rows)
+SELECT execute('cat @abs_builddir@/results/fileout_none.out') ORDER BY 1;
+execute
+---------------------
+row 1:data 1
+row 2:data 2
+row 3:data 3
+
+(1 row)
+SELECT execute('cat @abs_builddir@/results/fileout_replace.out') ORDER BY 1;
+execute
+---------------------
+row 1|data 1
+row 2|data 2
+row 3|data 3
+
+(1 row)
+SELECT execute('cat @abs_builddir@/results/fileout_append.out') ORDER BY 1;
+execute
+---------------------
+row 1,data 1
+row 2,data 2
+row 3,data 3
+row 1,data 1
+row 2,data 2
+row 3,data 3
+
+(1 row)
+-- 
+-- Test 7) Syntax error lineno reporting
+--
+SELECT mapreduce('@abs_srcdir@/yml/perlerror.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> ERROR:  syntax error at line 18, near "[]"
+STDERR> Execution of aborted due to compilation errors.
+STDERR> CONTEXT:  compilation of PL/Perl function "mapreduce_1977_grep_map"
+STDERR> Error: Object creation Failure
+STDERR> ERROR:  syntax error at line 28, near "[]"
+STDERR> Execution of aborted due to compilation errors.
+STDERR> CONTEXT:  compilation of PL/Perl function "mapreduce_1992_grep_map"
+STDERR> Error: Object creation Failure
+STDERR> ERROR:  syntax error at line 37, near "[]"
+STDERR> Execution of aborted due to compilation errors.
+STDERR> CONTEXT:  compilation of PL/Perl function "mapreduce_2000_grep_map"
+STDERR> Error: Object creation Failure
+STDERR> ERROR:  syntax error at line 45, near "[]"
+STDERR> Execution of aborted due to compilation errors.
+STDERR> CONTEXT:  compilation of PL/Perl function "mapreduce_2011_grep_map"
+STDERR> Error: Object creation Failure
+STDERR> ERROR:  syntax error at line 53, near "[]"
+STDERR> Execution of aborted due to compilation errors.
+STDERR> CONTEXT:  compilation of PL/Perl function "mapreduce_2020_grep_map"
+STDERR> Error: Object creation Failure
+STDERR> ERROR:  syntax error at line 67, near "}GABLECK"
+STDERR> Execution of aborted due to compilation errors.
+STDERR> CONTEXT:  compilation of PL/Perl function "mapreduce_52431_mymap"
+STDERR> Error: Object creation Failure
+STDERR> WARNING: unset parameter - myMap(key => NULL)
+STDERR> mapreduce_PID_run_1
+STDERR> ERROR:  }GABLECK!{ at line 85.
+STDERR> CONTEXT:  PL/Perl function "mapreduce_52435_mymap"
+STDERR> Error: Execution Failure
+STDERR> 
+STDOUT>
+
+(3 rows)
+SELECT mapreduce('@abs_srcdir@/yml/yamlerror.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> Error: OUTPUT 'output_table_empty': Invalid TABLE, at line 8
+STDERR> Error: OUTPUT 'output_table_empty': Invalid TABLE, at line 8
+STDERR> Error: OUTPUT 'output_table_string': Invalid TABLE, at line 11
+STDERR> Error: OUTPUT 'output_table_string': Invalid TABLE, at line 11
+STDERR> Error: OUTPUT 'output_table_number': Invalid TABLE, at line 14
+STDERR> Error: OUTPUT 'output_table_number': Invalid TABLE, at line 14
+STDERR> Error: OUTPUT 'output_table_list': Invalid TABLE, at line 17
+STDERR> Error: OUTPUT 'output_table_list': Invalid TABLE, at line 17
+STDERR> Error: OUTPUT 'output_table_mapping': Invalid TABLE, at line 20
+STDERR> Error: OUTPUT 'output_table_mapping': Invalid TABLE, at line 20
+STDERR> Error: OUTPUT 'output_table_mapping': Missing FILE or TABLE, at line 21
+STDERR> Error: INPUT 'input_columns_mapping': Invalid COLUMNS, at line 33
+STDERR> Error: Unrecognized VERSION, at line 62
+STDERR> Error: DOCUMENT: Missing VERSION, at line 98
+STDERR> Error: INPUT must contain a YAML MAPPING, at line 138
+STDERR> Error: INPUT: Missing NAME, at line 138
+STDERR> Error: INPUT: Missing FILE, GPFDIST, TABLE, QUERY, or EXEC, at line 138
+STDERR> Error: INPUT 'mystart': Duplicate QUERY for INPUT, at line 144
+STDERR> Error: parse failure
+STDERR> 
+STDOUT>
+
+(3 rows)
+-- Test 8) C functions using LIBRARY
+SELECT mapreduce('@abs_srcdir@/yml/c.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_PID_run_1
+STDERR> 
+STDOUT>
+key|value
+---+-----
+  0|  136
+  1|  401
+  3|   98
+  4| 1162
+  5|  257
+  6| 2073
+  7| 2138
+  8| 1082
+  9| 2241
+ 10|11556
+ 11| 8236
+ 12|  473
+ 13|  477
+ 14|    0
+ 15| 2287
+ 16| 2772
+ 17| 2359
+ 18|  536
+ 19|25936
+ 20|  910
+(20 rows)
+
+
+(3 rows)
+-- Test 9) PageRank
+SELECT mapreduce('@abs_srcdir@/yml/pagerank-init.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_PID_run_1
+STDERR> DONE
+STDERR> 
+STDOUT>
+
+(3 rows)
+SELECT count(*) FROM pagerank_source;
+count
+20
+(1 row)
+SELECT mapreduce('@abs_srcdir@/yml/pagerank-iter.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_PID_run_1
+STDERR> DONE
+STDERR> 
+STDOUT>
+
+(3 rows)
+SELECT mapreduce('@abs_srcdir@/yml/pagerank-final.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_PID_run_1
+STDERR> DONE
+STDERR> 
+STDOUT>
+
+(3 rows)
+CREATE OR REPLACE FUNCTION parse_pg_rank_kv(s text) returns text as $$
+i = s.index(",")
+rank = s[:i]
+neighbors = list(map(int, s[i+1:].strip().strip("()").split(",")))
+neighbors.sort()
+ns = "(" + ",".join(map(str, neighbors)) + ")"
+return ", ".join([rank, ns])
+$$ LANGUAGE plpython3u NO SQL;
+-- The result of the following test case is related to the underlying hash algorithm
+-- because the intermediate result of computing is saved as table in gpdb and hash-distributed.
+-- If you change the underlying hash algorithm, please remember to verify the answer and change
+-- here also.
+SELECT parse_pg_rank_kv(ps.value), parse_pg_rank_kv(pn.value) FROM pagerank_source ps JOIN pagerank_next pn USING (key) WHERE ps.key = '17';
+parse_pg_rank_kv|parse_pg_rank_kv
+0.85, (1,258,259,260,261,262,263,264,265,266)|0.265867988394584, (1,258,259,260,261,262,263,264,265,266)
+(1 row)
+-- Test setup
+CREATE TABLE simple (m int,n int) distributed randomly;
+INSERT INTO simple VALUES (1,10), (2,20), (2,21), (2,22), (3,30), (4,40), (5,50), (5,50), (10,100), (2,21);
+CREATE FUNCTION tran (state int, arg2 int) returns int language C AS '@abs_srcdir@/regress.so', 'tran';
+CREATE FUNCTION tran (state int) returns int language C AS '@abs_srcdir@/regress.so', 'tran';
+CREATE FUNCTION final (state int) returns int language C AS '@abs_srcdir@/regress.so', 'final';
+CREATE FUNCTION cons (state int, value int, out output int) returns int language C AS '@abs_srcdir@/regress.so', 'cons';
+CREATE FUNCTION cons_wrongtype (state int, value text) returns int language C AS '@abs_srcdir@/regress.so', 'cons';
+CREATE OR REPLACE FUNCTION retcomposite(int)
+    RETURNS SETOF __retcomposite
+    AS '@abs_srcdir@/regress.so', 'retcomposite'
+    LANGUAGE C IMMUTABLE STRICT;
+NOTICE:  type "__retcomposite" is not yet defined
+DETAIL:  Creating a shell type definition.
+CREATE FUNCTION gpmapred_scube_accum8(numeric,numeric) RETURNS numeric
+AS 'SELECT $1 + $2 * $2 * $2'
+LANGUAGE SQL
+IMMUTABLE
+RETURNS NULL ON NULL INPUT;
+CREATE AGGREGATE gpmapred_scube(numeric) (
+  SFUNC = gpmapred_scube_accum8,
+  STYPE  = numeric,
+  INITCOND = 0 );
+-- Test 10) Aggregate Function
+SELECT mapreduce('@abs_srcdir@/yml/aggFunction.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_PID_run_1
+STDERR> 
+STDOUT>
+ m|  value
+--+-------
+ 1|   1000
+ 2|  37170
+ 3|  27000
+ 4|  64000
+ 5| 250000
+10|1000000
+(6 rows)
+
+
+(3 rows)
+-- Test 11) Built-in Functions
+SELECT mapreduce('@abs_srcdir@/yml/builtinfunction.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_PID_run_1
+STDERR> mapreduce_PID_run_2
+STDERR> mapreduce_PID_run_3
+STDERR> mapreduce_PID_run_4
+STDERR> mapreduce_PID_run_5
+STDERR> 
+STDOUT>
+ m|value
+--+-----
+ 1|   10
+ 2|   20
+ 3|   30
+ 4|   40
+ 5|   50
+10|  100
+(6 rows)
+
+ m|value
+--+-----
+ 1|   10
+ 2|   22
+ 3|   30
+ 4|   40
+ 5|   50
+10|  100
+(6 rows)
+
+ m|               value
+--+--------------------
+ 1| 10.0000000000000000
+ 2| 21.0000000000000000
+ 3| 30.0000000000000000
+ 4| 40.0000000000000000
+ 5| 50.0000000000000000
+10|100.0000000000000000
+(6 rows)
+
+ m|value
+--+-----
+ 1|    1
+ 2|    4
+ 3|    1
+ 4|    1
+ 5|    2
+10|    1
+(6 rows)
+
+ m|value
+--+-----
+ 1|   10
+ 2|   20
+ 2|   21
+ 2|   21
+ 2|   22
+ 3|   30
+ 4|   40
+ 5|   50
+ 5|   50
+10|  100
+(10 rows)
+
+
+(3 rows)
+-- Test 12) Ambigious function
+SELECT mapreduce('@abs_srcdir@/yml/ambiguousfunction.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> Error: MAP 'tran': Ambiguous function, supply a function prototype for disambiguation, at line 11
+STDERR> Error: Object creation Failure
+STDERR> 
+STDOUT>
+
+(3 rows)
+-- Test 13) Parameter override
+SELECT mapreduce('@abs_srcdir@/yml/paramoverride.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> mapreduce_PID_run_1
+STDERR> 
+STDOUT>
+ m|retval
+--+------
+ 1|    20
+ 2|   168
+ 3|    60
+ 4|    80
+ 5|   200
+10|   200
+(6 rows)
+
+
+(3 rows)
+-- Test 14) Incorrect parameter type
+SELECT mapreduce('@abs_srcdir@/yml/paramdifftype.yml') ORDER BY 1;
+mapreduce
+---------------------
+STDERR> ERROR:  function cons_wrongtype(integer, integer) does not exist
+STDERR> Error: Object creation Failure
+STDERR> 
+STDOUT>
+
+(3 rows)
+--
+-- Cleanup) Restore normal formatting options
+--
+\pset format aligned
diff --git a/gpcontrib/pg_hint_plan/pg_hint_plan.c b/gpcontrib/pg_hint_plan/pg_hint_plan.c
index 033a9d01200..1d37677019c 100644
--- a/gpcontrib/pg_hint_plan/pg_hint_plan.c
+++ b/gpcontrib/pg_hint_plan/pg_hint_plan.c
@@ -428,7 +428,7 @@ pg_hint_plan_add_paths_to_joinrel(PlannerInfo *root,
 static void *external_plan_hint_hook(Query *parse);
 #endif
 static PlannedStmt *pg_hint_plan_planner(Query *parse, const char *query_string, int cursorOptions,
-										 ParamListInfo boundParams);
+										 ParamListInfo boundParams, OptimizerOptions *optimizer_options);
 static RelOptInfo *pg_hint_plan_join_search(PlannerInfo *root,
 											int levels_needed,
 											List *initial_rels);
@@ -3118,7 +3118,7 @@ pg_hint_plan_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
  */
 static PlannedStmt *
 pg_hint_plan_planner(Query *parse, const char *query_string,
-	int cursorOptions, ParamListInfo boundParams)
+	int cursorOptions, ParamListInfo boundParams, OptimizerOptions *optimizer_options)
 {
 	int				save_nestlevel;
 	PlannedStmt	   *result;
@@ -3236,9 +3236,9 @@ pg_hint_plan_planner(Query *parse, const char *query_string,
 		}
 
 		if (prev_planner)
-			result = (*prev_planner) (parse, query_string, cursorOptions, boundParams);
+			result = (*prev_planner) (parse, query_string, cursorOptions, boundParams, optimizer_options);
 		else
-			result = standard_planner(parse, query_string, cursorOptions, boundParams);
+			result = standard_planner(parse, query_string, cursorOptions, boundParams, optimizer_options);
 
 		current_hint_str = prev_hint_str;
 		recurse_level--;
@@ -3298,9 +3298,9 @@ pg_hint_plan_planner(Query *parse, const char *query_string,
 	}
 	current_hint_state = NULL;
 	if (prev_planner)
-		result =  (*prev_planner) (parse, query_string, cursorOptions, boundParams);
+		result =  (*prev_planner) (parse, query_string, cursorOptions, boundParams, optimizer_options);
 	else
-		result = standard_planner(parse, query_string, cursorOptions, boundParams);
+		result = standard_planner(parse, query_string, cursorOptions, boundParams, optimizer_options);
 
 	/* The upper-level planner still needs the current hint state */
 	if (HintStateStack != NIL)
diff --git a/gpcontrib/quicklz/.gitignore b/gpcontrib/quicklz/.gitignore
deleted file mode 100644
index 129480c0aea..00000000000
--- a/gpcontrib/quicklz/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Generated subdirectories
-/tmp_check/
-/results/
-/log/
-
-regression.diffs
-regression.out
-
-stdin
-stdout
diff --git a/gpcontrib/quicklz/Makefile b/gpcontrib/quicklz/Makefile
deleted file mode 100644
index 617c7c97651..00000000000
--- a/gpcontrib/quicklz/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Makefile for QuickLZ compressor
-
-MODULE_big = quicklz_compressor
-OBJS = quicklz_compression.o
-CFLAGS_SL += -lquicklz
-LDFLAGS_SL += -lquicklz
-
-REGRESS = AORO_quicklz AOCO_quicklz quicklz_column_compression compression_quicklz
-
-ifdef USE_PGXS
-  PGXS := $(shell pg_config --pgxs)
-  include $(PGXS)
-else
-  top_builddir = ../..
-  include $(top_builddir)/src/Makefile.global
-  include $(top_srcdir)/contrib/contrib-global.mk
-endif
-
-# when libquicklz is vendored, it is copied in to GPHOME/lib
-# the quicklz_compressor extension is located in GPHOME/lib/postgresql/
-ifdef QUICKLZ_LDFLAGS
-  LDFLAGS += $(QUICKLZ_LDFLAGS)
-endif
-
-# Install into cdb_init.d, so that the catalog changes performed by initdb,
-# and the compressor is available in all databases.
-.PHONY: install-data
-install-data:
-	$(INSTALL_DATA) quicklz_compressor.sql '$(DESTDIR)$(datadir)/cdb_init.d/quicklz_compressor.sql'
-
-install: install-data
-
-.PHONY: uninstall-data
-uninstall-data:
-	rm -f '$(DESTDIR)$(datadir)/cdb_init.d/quicklz_compressor.sql'
-
-uninstall: uninstall-data
diff --git a/gpcontrib/quicklz/expected/AOCO_quicklz.out b/gpcontrib/quicklz/expected/AOCO_quicklz.out
deleted file mode 100644
index e9c430bd48e..00000000000
--- a/gpcontrib/quicklz/expected/AOCO_quicklz.out
+++ /dev/null
@@ -1,24 +0,0 @@
--- Given that we built with and have quicklz compression available
--- Test basic create table for AO/CO table succeeds for quicklz compression
--- Given a column-oriented table with compresstype quicklz
-CREATE TABLE a_aoco_table_with_quicklz_compression(col text) WITH (APPENDONLY=true, COMPRESSTYPE=quicklz, compresslevel=1, ORIENTATION=column);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'col' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
--- Before I insert data, the size is 0 and compression ratio is unavailable (-1)
-SELECT pg_size_pretty(pg_relation_size('a_aoco_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoco_table_with_quicklz_compression');
- pg_size_pretty | get_ao_compression_ratio 
-----------------+--------------------------
- 0 bytes        |                       -1
-(1 row)
-
--- When I insert data
-INSERT INTO a_aoco_table_with_quicklz_compression values('ksjdhfksdhfksdhfksjhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh');
--- Then the data will be compressed according to a consistent compression ratio
-SELECT pg_size_pretty(pg_relation_size('a_aoco_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoco_table_with_quicklz_compression') >= 1.3 as get_ao_compression_ratio;
- pg_size_pretty | get_ao_compression_ratio 
-----------------+--------------------------
- 72 bytes       | t
-(1 row)
-
diff --git a/gpcontrib/quicklz/expected/AORO_quicklz.out b/gpcontrib/quicklz/expected/AORO_quicklz.out
deleted file mode 100644
index d02a5de2b50..00000000000
--- a/gpcontrib/quicklz/expected/AORO_quicklz.out
+++ /dev/null
@@ -1,24 +0,0 @@
--- Given that we built with and have quicklz compression available
--- Test basic create table for AO/RO table succeeds for quicklz compression
--- Given a row-oriented table with compresstype quicklz
-create table a_aoro_table_with_quicklz_compression(col text) WITH (APPENDONLY=true, COMPRESSTYPE=quicklz, compresslevel=1);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'col' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
--- Before inserting data, the size is 0 and ratio is 1 (for a row-oriented table, ends up being 1)
-select pg_size_pretty(pg_relation_size('a_aoro_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoro_table_with_quicklz_compression');
- pg_size_pretty | get_ao_compression_ratio 
-----------------+--------------------------
- 0 bytes        |                        1
-(1 row)
-
--- When I insert data
-insert into a_aoro_table_with_quicklz_compression values('ksjdhfksdhfksdhfksjhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh');
--- Then the data will be compressed according to a consistent compression ratio
-select pg_size_pretty(pg_relation_size('a_aoro_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoro_table_with_quicklz_compression');
- pg_size_pretty | get_ao_compression_ratio 
-----------------+--------------------------
- 64 bytes       |                     1.38
-(1 row)
-
diff --git a/gpcontrib/quicklz/expected/compression_quicklz.out b/gpcontrib/quicklz/expected/compression_quicklz.out
deleted file mode 100644
index 2918038aa4a..00000000000
--- a/gpcontrib/quicklz/expected/compression_quicklz.out
+++ /dev/null
@@ -1,99 +0,0 @@
--- Tests for quicklz compression.
--- Check that callbacks are registered
-SELECT * FROM pg_compression WHERE compname = 'quicklz';
- compname |    compconstructor     |    compdestructor     |   compcompressor    |   compdecompressor    |    compvalidator     | compowner 
-----------+------------------------+-----------------------+---------------------+-----------------------+----------------------+-----------
- quicklz  | gp_quicklz_constructor | gp_quicklz_destructor | gp_quicklz_compress | gp_quicklz_decompress | gp_quicklz_validator |        10
-(1 row)
-
--- Test for appendonly row oriented
-CREATE TABLE quicklztest_row (id int4, t text) WITH (appendonly=true, compresstype=quicklz, orientation=row);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
--- Check that the reloptions on the table shows compression type
--- This is order sensitive to base on the order that the options were declared in the DDL of the table.
-SELECT reloptions[1] FROM pg_class WHERE relname = 'quicklztest_row';
-      reloptions      
-----------------------
- compresstype=quicklz
-(1 row)
-
-INSERT INTO quicklztest_row SELECT g, 'foo' || g FROM generate_series(1, 100) g;
-INSERT INTO quicklztest_row SELECT g, 'bar' || g FROM generate_series(1, 100) g;
--- Check contents, at the beginning of the table and at the end.
-SELECT * FROM quicklztest_row ORDER BY id LIMIT 4 ;--order 1, none
- id |  t   
-----+------
-  1 | foo1
-  1 | bar1
-  2 | foo2
-  2 | bar2
-(4 rows)
-
-SELECT * FROM quicklztest_row ORDER BY id DESC LIMIT 4 ;--order 1, none
- id  |   t    
------+--------
- 100 | bar100
- 100 | foo100
-  99 | bar99
-  99 | foo99
-(4 rows)
-
--- Check that we actually compressed data
-SELECT get_ao_compression_ratio('quicklztest_row') >= 1.8 as get_ao_compression_ratio;
- get_ao_compression_ratio 
---------------------------
- t
-(1 row)
-
--- Test for appendonly column oriented
-CREATE TABLE quicklztest_column (id int4, t text) WITH (appendonly=true, compresstype=quicklz, orientation=column);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-INSERT INTO quicklztest_column SELECT g, 'foo' || g FROM generate_series(1, 100) g;
-INSERT INTO quicklztest_column SELECT g, 'bar' || g FROM generate_series(1, 100) g;
--- Check contents, at the beginning of the table and at the end.
-SELECT * FROM quicklztest_column ORDER BY id LIMIT 4 ;--order 1, none
- id |  t   
-----+------
-  1 | foo1
-  1 | bar1
-  2 | foo2
-  2 | bar2
-(4 rows)
-
-SELECT * FROM quicklztest_column ORDER BY id DESC LIMIT 4 ;--order 1, none
- id  |   t    
------+--------
- 100 | bar100
- 100 | foo100
-  99 | bar99
-  99 | foo99
-(4 rows)
-
--- Check that we actually compressed data
-SELECT get_ao_compression_ratio('quicklztest_column') >= 1.2 as get_ao_compression_ratio;
- get_ao_compression_ratio 
---------------------------
- t
-(1 row)
-
--- Test the bounds of compresslevel. QuickLZ compresslevel 1 is the only one that should work.
-CREATE TABLE quicklztest_invalid (id int4) WITH (appendonly=true, compresstype=quicklz, compresslevel=-1);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-ERROR:  value -1 out of bounds for option "compresslevel"
-DETAIL:  Valid values are between "0" and "19".
-CREATE TABLE quicklztest_invalid (id int4) WITH (appendonly=true, compresstype=quicklz, compresslevel=0);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-ERROR:  compresstype "quicklz" can't be used with compresslevel 0
-CREATE TABLE quicklztest_invalid (id int4) WITH (appendonly=true, compresstype=quicklz, compresslevel=3);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-ERROR:  compresslevel=3 is out of range for quicklz (should be 1)
--- CREATE TABLE for heap table with compresstype=quicklz should fail
-CREATE TABLE quicklztest_heap (id int4, t text) WITH (compresstype=quicklz);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-ERROR:  unrecognized parameter "compresstype"
diff --git a/gpcontrib/quicklz/expected/quicklz_column_compression.out b/gpcontrib/quicklz/expected/quicklz_column_compression.out
deleted file mode 100644
index 097fb31afa4..00000000000
--- a/gpcontrib/quicklz/expected/quicklz_column_compression.out
+++ /dev/null
@@ -1,99 +0,0 @@
-PREPARE attribute_encoding_check AS
-SELECT attrelid::regclass AS relname,
-attnum, attoptions FROM pg_class c, pg_attribute_encoding e
-WHERE c.relname = $1 AND c.oid=e.attrelid
-ORDER BY relname, attnum;
-create type int42;
-CREATE FUNCTION int42_in(cstring)
-RETURNS int42
-AS 'int4in'
-LANGUAGE internal IMMUTABLE STRICT;
-NOTICE:  return type int42 is only a shell
-CREATE FUNCTION int42_out(int42)
-RETURNS cstring
-AS 'int4out'
-LANGUAGE internal IMMUTABLE STRICT;
-NOTICE:  argument type int42 is only a shell
-CREATE TYPE int42 (
-internallength = 4,
-input = int42_in,
-output = int42_out,
-alignment = int4,
-default = 42,
-passedbyvalue,
-compresstype="zlib",
-blocksize=65536,
-compresslevel=1
-);
--- Ensure type has been created with compresstype zlib
-select typoptions from pg_type_encoding where typid='public.int42'::regtype;
-                     typoptions                      
------------------------------------------------------
- {compresstype=zlib,blocksize=65536,compresslevel=1}
-(1 row)
-
-alter type int42 set default encoding (compresstype=quicklz);
--- Ensure compresstype for type has been modified to be quicklz
-select typoptions from pg_type_encoding where typid='public.int42'::regtype;
-                       typoptions                       
---------------------------------------------------------
- {compresstype=quicklz,compresslevel=1,blocksize=32768}
-(1 row)
-
--- Given an AO/CO table using the int42 type with quicklz compresstype
-create table aoco_table_compressed_type (i int42) with(appendonly = true, orientation=column);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause, and no column type is suitable for a distribution key. Creating a NULL policy entry.
--- Attribute should show as compressed
-execute attribute_encoding_check('aoco_table_compressed_type');
-          relname           | attnum |                       attoptions                       
-----------------------------+--------+--------------------------------------------------------
- aoco_table_compressed_type |      1 | {compresstype=quicklz,compresslevel=1,blocksize=32768}
-(1 row)
-
--- When I insert data
-insert into aoco_table_compressed_type select '123456'::int42 from generate_series(1, 1000)i;
--- Then the data should be compressed and return a consistent compression ratio
-select get_ao_compression_ratio('aoco_table_compressed_type') >= 15 as quicklz_compress_ratio;
- quicklz_compress_ratio 
-------------------------
- t
-(1 row)
-
--- Given an AO/RO table using the int42 type with quicklz compresstype
-CREATE TABLE aoro_table_compressed_type (i int42) with(appendonly = true, orientation=row);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause, and no column type is suitable for a distribution key. Creating a NULL policy entry.
--- No results are returned from the attribute encoding check, as compression with quicklz is not supported for row-oriented tables
-execute attribute_encoding_check('aoro_table_compressed_type');
- relname | attnum | attoptions 
----------+--------+------------
-(0 rows)
-
--- Given a heap table using the int42 type with quicklz compresstype
-CREATE TABLE heap_table_compressed_type (i int42);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause, and no column type is suitable for a distribution key. Creating a NULL policy entry.
--- No results are returned from the attribute encoding check, as compression with quicklz is not supported for heap tables
-EXECUTE attribute_encoding_check('heap_table_compressed_type');
- relname | attnum | attoptions 
----------+--------+------------
-(0 rows)
-
--- Given an AO/CO table with a regular int column and a default column encoding of compresstype quicklz
-CREATE TABLE aoco_table_default_encoding (i int, default column encoding (compresstype=quicklz, compresslevel=1)) with(appendonly = true, orientation=column);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
--- Attribute should show as compressed
-execute attribute_encoding_check('aoco_table_default_encoding');
-           relname           | attnum |                       attoptions                       
------------------------------+--------+--------------------------------------------------------
- aoco_table_default_encoding |      1 | {compresstype=quicklz,compresslevel=1,blocksize=32768}
-(1 row)
-
--- When I insert data
-INSERT into aoco_table_default_encoding select 1 from generate_series(1, 100);
--- Then the data should be compressed and return a consistent compression ratio
-SELECT get_ao_compression_ratio('aoco_table_default_encoding') as quicklz_compress_ratio;
- quicklz_compress_ratio 
-------------------------
-                   6.88
-(1 row)
-
diff --git a/gpcontrib/quicklz/quicklz_compression.c b/gpcontrib/quicklz/quicklz_compression.c
deleted file mode 100644
index f257557c569..00000000000
--- a/gpcontrib/quicklz/quicklz_compression.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * quicklz_compression.c
- *	Interfaces to quicklz compression functionality.
- *
- * Portions Copyright (c) 2011, EMC Corporation
- * Portions Copyright (c) 2013-Present, VMware, Inc. or its affiliates.
- *
- * IDENTIFICATION
- *	gpcontrib/quicklz/quicklz_compression.c
- */
-
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-#include "utils/faultinjector.h"
-#include "catalog/pg_compression.h"
-
-#include "quicklz.h"
-
-PG_MODULE_MAGIC;
-
-Datum quicklz_constructor(PG_FUNCTION_ARGS);
-Datum quicklz_destructor(PG_FUNCTION_ARGS);
-Datum quicklz_compress(PG_FUNCTION_ARGS);
-Datum quicklz_decompress(PG_FUNCTION_ARGS);
-Datum quicklz_validator(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(quicklz_constructor);
-PG_FUNCTION_INFO_V1(quicklz_destructor);
-PG_FUNCTION_INFO_V1(quicklz_compress);
-PG_FUNCTION_INFO_V1(quicklz_decompress);
-PG_FUNCTION_INFO_V1(quicklz_validator);
-
-/* Internal state for quicklz */
-typedef struct quicklz_state
-{
-	void *scratch;
-
-	int level;
-	bool compress;
-
-	/*
-	 * The actual algorithms. Allows us to handle quicklz1 and quicklz3
-	 * conveniently.
-	 */
-	size_t (*compress_fn)(int level, const void *, char *, size_t, void *);
-	size_t (*decompress_fn)(int level, const char *, void *, void *);
-} quicklz_state;
-
-/*
- * quicklz helper function.
- */
-static size_t
-quicklz_desired_sz(size_t input)
-{
-	/*
-	 * From the QuickLZ manual:
-	 *
-	 *   "The destination buffer must be at least size + 400 bytes large because
-	 *   incompressible data may increase in size."
-	 *
-	 */
-	return input + 400;
-}
-
-/*
- * Wrap up the qlz functions since C's type checking is getting in the
- * way.
- */
-static size_t
-quicklz_compressor(int level, const void *source, char *destination,
-				   size_t size, void *state)
-{
-	return qlz_compress(source, destination, size,
-						(qlz_state_compress *)state);
-}
-
-static size_t
-quicklz_decompressor(int level, const char *source, void *destination,
-					 void *state)
-{
-	return qlz_decompress(source, destination,
-						  (qlz_state_decompress *)state);
-}
-
-/* ---------------------------------------------------------------------
- * Quicklz constructor and destructor
- * ---------------------------------------------------------------------
- */
-Datum
-quicklz_constructor(PG_FUNCTION_ARGS)
-{
-#ifdef FAULT_INJECTOR
-	FaultInjector_InjectFaultIfSet("malloc_failure",
-					DDLNotSpecified,
-					"", // databaseName
-					""); // tableName
-#endif
-
-	/* PG_GETARG_POINTER(0) is TupleDesc that is currently unused.
-	 * It is passed as NULL */
-
-	StorageAttributes *sa	= (StorageAttributes *) PG_GETARG_POINTER(1);
-	CompressionState *cs 	= palloc0(sizeof(CompressionState));
-	quicklz_state *state	= palloc0(sizeof(quicklz_state));
-	bool compress			= PG_GETARG_BOOL(2);
-	size_t scratchlen		= 0;
-
-	cs->opaque = (void *)state;
-
-	Assert(PointerIsValid(sa->comptype));
-	Assert(strcmp(sa->comptype, "quicklz") == 0);
-
-	state->level = sa->complevel;
-	state->compress = compress;
-	state->compress_fn = quicklz_compressor;
-	state->decompress_fn = quicklz_decompressor;
-	if (compress)
-		scratchlen = sizeof(qlz_state_compress);
-	else
-		scratchlen = sizeof(qlz_state_decompress);
-
-	state->scratch = palloc0(scratchlen);
-
-	cs->desired_sz = quicklz_desired_sz;
-
-	PG_RETURN_POINTER(cs);
-}
-
-Datum
-quicklz_destructor(PG_FUNCTION_ARGS)
-{
-	CompressionState *cs = (CompressionState *) PG_GETARG_POINTER(0);
-
-	if (cs != NULL)
-	{
-		quicklz_state *state = (quicklz_state *) cs->opaque;
-		if (state != NULL)
-		{
-			if (state->scratch != NULL)
-			{
-				pfree(state->scratch);
-			}
-			pfree(cs->opaque);
-		}
-	}
-
-	PG_RETURN_VOID();
-}
-
-/* ---------------------------------------------------------------------
- * SQL invokable compression and decompression routines for built in
- * compression algorithms. All routines have the same SQL signature:
- *
- * void fun(internal, int, internal, int, internal, internal)
- *
- * If we were to think of this as a C function it would be more like:
- *
- * void fun(void *src, size_t src_sz, void *dst, size_t dst_sz,
- *		  size_t *dst_used, void *opaque)
- *
- * The meaning of each argument is as follows:
- * src - A pointer to data to be compressed/decompressed
- * src_sz - The number of bytes to compress/decompress
- * dst - A pointer to pre-allocated memory. The data compressed or
- * 		 decompressed by the function are written here.
- * dst_sz - The amount of memory in bytes allocated at dst
- * dst_used - The number of bytes written. If dst_sz was too small to
- *			store the data, this is set to zero.
- * opaque - Internal to the compression function.
- */
-Datum
-quicklz_compress(PG_FUNCTION_ARGS)
-{
-	const void *src 		  = PG_GETARG_POINTER(0);
-	int32 src_sz				= PG_GETARG_INT32(1);
-	void *dst					  = PG_GETARG_POINTER(2);
-	int32 dst_sz		PG_USED_FOR_ASSERTS_ONLY = PG_GETARG_INT32(3);
-	int32 *dst_used			  = (int32 *) PG_GETARG_POINTER(4);
-	CompressionState *cs 	= (CompressionState *)PG_GETARG_POINTER(5);
-	quicklz_state *state	= (quicklz_state *)cs->opaque;
-
-	Assert(dst_sz >= quicklz_desired_sz(src_sz));
-
-	*dst_used = state->compress_fn(state->level, src, dst, (size_t)src_sz,
-								   state->scratch);
-
-	PG_RETURN_VOID();
-}
-
-Datum
-quicklz_decompress(PG_FUNCTION_ARGS)
-{
-	const char *src 	  	= PG_GETARG_POINTER(0);
-	int32 src_sz		PG_USED_FOR_ASSERTS_ONLY = PG_GETARG_INT32(1);
-	void *dst					= PG_GETARG_POINTER(2);
-	int32 dst_sz		PG_USED_FOR_ASSERTS_ONLY = PG_GETARG_INT32(3);
-	int32 *dst_used			  = (int32 *) PG_GETARG_POINTER(4);
-	CompressionState *cs 	= (CompressionState *)PG_GETARG_POINTER(5);
-	quicklz_state *state	= (quicklz_state *)cs->opaque;
-
-	Assert(src_sz > 0 && dst_sz > 0);
-	*dst_used = state->decompress_fn(state->level, src, dst, state->scratch);
-
-	PG_RETURN_VOID();
-}
-
-Datum
-quicklz_validator(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_VOID();
-}
-
-
diff --git a/gpcontrib/quicklz/quicklz_compressor.sql b/gpcontrib/quicklz/quicklz_compressor.sql
deleted file mode 100644
index 63e41e30e91..00000000000
--- a/gpcontrib/quicklz/quicklz_compressor.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-CREATE FUNCTION gp_quicklz_constructor(internal, internal, bool) RETURNS internal
-LANGUAGE C VOLATILE AS '$libdir/quicklz_compressor.so', 'quicklz_constructor';
-COMMENT ON FUNCTION gp_quicklz_constructor(internal, internal, bool) is 'quicklz constructor';
-
-CREATE FUNCTION gp_quicklz_destructor(internal) RETURNS void
-LANGUAGE C VOLATILE AS '$libdir/quicklz_compressor.so', 'quicklz_destructor';
-COMMENT ON FUNCTION gp_quicklz_destructor(internal) is 'quicklz destructor';
-
-CREATE FUNCTION gp_quicklz_compress(internal, int4, internal, int4, internal, internal) RETURNS void
-LANGUAGE C IMMUTABLE PARALLEL SAFE AS '$libdir/quicklz_compressor.so', 'quicklz_compress';
-COMMENT ON FUNCTION gp_quicklz_compress(internal, int4, internal, int4, internal, internal) is 'quicklz compressor';
-
-CREATE FUNCTION gp_quicklz_decompress(internal, int4, internal, int4, internal, internal) RETURNS void
-LANGUAGE C IMMUTABLE PARALLEL SAFE AS '$libdir/quicklz_compressor.so', 'quicklz_decompress';
-COMMENT ON FUNCTION gp_quicklz_decompress(internal, int4, internal, int4, internal, internal) is 'quicklz compressor';
-
-CREATE FUNCTION gp_quicklz_validator(internal) RETURNS void
-LANGUAGE C IMMUTABLE PARALLEL SAFE AS '$libdir/quicklz_compressor.so', 'quicklz_validator';
-COMMENT ON FUNCTION gp_quicklz_validator(internal) is 'quicklz compression validator';
-
--- There is no CREATE COMPRESSION command, so we have to insert the entry manually.
-INSERT INTO pg_catalog.pg_compression (compname, compconstructor, compdestructor, compcompressor, compdecompressor, compvalidator, compowner)
-VALUES ('quicklz', 'gp_quicklz_constructor', 'gp_quicklz_destructor', 'gp_quicklz_compress', 'gp_quicklz_decompress', 'gp_quicklz_validator', 10 /* BOOSTRAP_SUPERUSERID */);
diff --git a/gpcontrib/quicklz/sql/AOCO_quicklz.sql b/gpcontrib/quicklz/sql/AOCO_quicklz.sql
deleted file mode 100644
index 222170f03c0..00000000000
--- a/gpcontrib/quicklz/sql/AOCO_quicklz.sql
+++ /dev/null
@@ -1,13 +0,0 @@
--- Given that we built with and have quicklz compression available
--- Test basic create table for AO/CO table succeeds for quicklz compression
-
--- Given a column-oriented table with compresstype quicklz
-CREATE TABLE a_aoco_table_with_quicklz_compression(col text) WITH (APPENDONLY=true, COMPRESSTYPE=quicklz, compresslevel=1, ORIENTATION=column);
--- Before I insert data, the size is 0 and compression ratio is unavailable (-1)
-SELECT pg_size_pretty(pg_relation_size('a_aoco_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoco_table_with_quicklz_compression');
--- When I insert data
-INSERT INTO a_aoco_table_with_quicklz_compression values('ksjdhfksdhfksdhfksjhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh');
--- Then the data will be compressed according to a consistent compression ratio
-SELECT pg_size_pretty(pg_relation_size('a_aoco_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoco_table_with_quicklz_compression') >= 1.3 as get_ao_compression_ratio;
diff --git a/gpcontrib/quicklz/sql/AORO_quicklz.sql b/gpcontrib/quicklz/sql/AORO_quicklz.sql
deleted file mode 100644
index 5b3d6966e84..00000000000
--- a/gpcontrib/quicklz/sql/AORO_quicklz.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Given that we built with and have quicklz compression available
--- Test basic create table for AO/RO table succeeds for quicklz compression
-
--- Given a row-oriented table with compresstype quicklz
-create table a_aoro_table_with_quicklz_compression(col text) WITH (APPENDONLY=true, COMPRESSTYPE=quicklz, compresslevel=1);
--- Before inserting data, the size is 0 and ratio is 1 (for a row-oriented table, ends up being 1)
-select pg_size_pretty(pg_relation_size('a_aoro_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoro_table_with_quicklz_compression');
--- When I insert data
-insert into a_aoro_table_with_quicklz_compression values('ksjdhfksdhfksdhfksjhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh');
--- Then the data will be compressed according to a consistent compression ratio
-select pg_size_pretty(pg_relation_size('a_aoro_table_with_quicklz_compression')),
-       get_ao_compression_ratio('a_aoro_table_with_quicklz_compression');
-
diff --git a/gpcontrib/quicklz/sql/compression_quicklz.sql b/gpcontrib/quicklz/sql/compression_quicklz.sql
deleted file mode 100644
index bd7306cd4ff..00000000000
--- a/gpcontrib/quicklz/sql/compression_quicklz.sql
+++ /dev/null
@@ -1,42 +0,0 @@
--- Tests for quicklz compression.
-
--- Check that callbacks are registered
-SELECT * FROM pg_compression WHERE compname = 'quicklz';
-
--- Test for appendonly row oriented
-CREATE TABLE quicklztest_row (id int4, t text) WITH (appendonly=true, compresstype=quicklz, orientation=row);
-
--- Check that the reloptions on the table shows compression type
--- This is order sensitive to base on the order that the options were declared in the DDL of the table.
-SELECT reloptions[1] FROM pg_class WHERE relname = 'quicklztest_row';
-
-INSERT INTO quicklztest_row SELECT g, 'foo' || g FROM generate_series(1, 100) g;
-INSERT INTO quicklztest_row SELECT g, 'bar' || g FROM generate_series(1, 100) g;
-
--- Check contents, at the beginning of the table and at the end.
-SELECT * FROM quicklztest_row ORDER BY id LIMIT 4 ;--order 1, none
-SELECT * FROM quicklztest_row ORDER BY id DESC LIMIT 4 ;--order 1, none
-
--- Check that we actually compressed data
-SELECT get_ao_compression_ratio('quicklztest_row') >= 1.8 as get_ao_compression_ratio;
-
--- Test for appendonly column oriented
-CREATE TABLE quicklztest_column (id int4, t text) WITH (appendonly=true, compresstype=quicklz, orientation=column);
-
-INSERT INTO quicklztest_column SELECT g, 'foo' || g FROM generate_series(1, 100) g;
-INSERT INTO quicklztest_column SELECT g, 'bar' || g FROM generate_series(1, 100) g;
-
--- Check contents, at the beginning of the table and at the end.
-SELECT * FROM quicklztest_column ORDER BY id LIMIT 4 ;--order 1, none
-SELECT * FROM quicklztest_column ORDER BY id DESC LIMIT 4 ;--order 1, none
-
--- Check that we actually compressed data
-SELECT get_ao_compression_ratio('quicklztest_column') >= 1.2 as get_ao_compression_ratio;
-
--- Test the bounds of compresslevel. QuickLZ compresslevel 1 is the only one that should work.
-CREATE TABLE quicklztest_invalid (id int4) WITH (appendonly=true, compresstype=quicklz, compresslevel=-1);
-CREATE TABLE quicklztest_invalid (id int4) WITH (appendonly=true, compresstype=quicklz, compresslevel=0);
-CREATE TABLE quicklztest_invalid (id int4) WITH (appendonly=true, compresstype=quicklz, compresslevel=3);
-
--- CREATE TABLE for heap table with compresstype=quicklz should fail
-CREATE TABLE quicklztest_heap (id int4, t text) WITH (compresstype=quicklz);
diff --git a/gpcontrib/quicklz/sql/quicklz_column_compression.sql b/gpcontrib/quicklz/sql/quicklz_column_compression.sql
deleted file mode 100644
index 2041afdd250..00000000000
--- a/gpcontrib/quicklz/sql/quicklz_column_compression.sql
+++ /dev/null
@@ -1,63 +0,0 @@
-PREPARE attribute_encoding_check AS
-SELECT attrelid::regclass AS relname,
-attnum, attoptions FROM pg_class c, pg_attribute_encoding e
-WHERE c.relname = $1 AND c.oid=e.attrelid
-ORDER BY relname, attnum;
-
-create type int42;
-CREATE FUNCTION int42_in(cstring)
-RETURNS int42
-AS 'int4in'
-LANGUAGE internal IMMUTABLE STRICT;
-
-CREATE FUNCTION int42_out(int42)
-RETURNS cstring
-AS 'int4out'
-LANGUAGE internal IMMUTABLE STRICT;
-
-CREATE TYPE int42 (
-internallength = 4,
-input = int42_in,
-output = int42_out,
-alignment = int4,
-default = 42,
-passedbyvalue,
-compresstype="zlib",
-blocksize=65536,
-compresslevel=1
-);
-
--- Ensure type has been created with compresstype zlib
-select typoptions from pg_type_encoding where typid='public.int42'::regtype;
-
-alter type int42 set default encoding (compresstype=quicklz);
--- Ensure compresstype for type has been modified to be quicklz
-select typoptions from pg_type_encoding where typid='public.int42'::regtype;
-
--- Given an AO/CO table using the int42 type with quicklz compresstype
-create table aoco_table_compressed_type (i int42) with(appendonly = true, orientation=column);
--- Attribute should show as compressed
-execute attribute_encoding_check('aoco_table_compressed_type');
--- When I insert data
-insert into aoco_table_compressed_type select '123456'::int42 from generate_series(1, 1000)i;
--- Then the data should be compressed and return a consistent compression ratio
-select get_ao_compression_ratio('aoco_table_compressed_type') >= 15 as quicklz_compress_ratio;
-
--- Given an AO/RO table using the int42 type with quicklz compresstype
-CREATE TABLE aoro_table_compressed_type (i int42) with(appendonly = true, orientation=row);
--- No results are returned from the attribute encoding check, as compression with quicklz is not supported for row-oriented tables
-execute attribute_encoding_check('aoro_table_compressed_type');
-
--- Given a heap table using the int42 type with quicklz compresstype
-CREATE TABLE heap_table_compressed_type (i int42);
--- No results are returned from the attribute encoding check, as compression with quicklz is not supported for heap tables
-EXECUTE attribute_encoding_check('heap_table_compressed_type');
-
--- Given an AO/CO table with a regular int column and a default column encoding of compresstype quicklz
-CREATE TABLE aoco_table_default_encoding (i int, default column encoding (compresstype=quicklz, compresslevel=1)) with(appendonly = true, orientation=column);
--- Attribute should show as compressed
-execute attribute_encoding_check('aoco_table_default_encoding');
--- When I insert data
-INSERT into aoco_table_default_encoding select 1 from generate_series(1, 100);
--- Then the data should be compressed and return a consistent compression ratio
-SELECT get_ao_compression_ratio('aoco_table_default_encoding') as quicklz_compress_ratio;
diff --git a/mcp-server/README.md b/mcp-server/README.md
new file mode 100644
index 00000000000..76c8776e722
--- /dev/null
+++ b/mcp-server/README.md
@@ -0,0 +1,399 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+# Apache Cloudberry MCP Server
+
+A Model Communication Protocol (MCP) server for Apache Cloudberry database interaction, providing secure and efficient database management capabilities through AI-ready interfaces.
+
+## Features
+
+- **Database Metadata Resources**: Access schemas, tables, views, indexes, and column information
+- **Safe Query Tools**: Execute parameterized SQL queries with security validation
+- **Administrative Tools**: Table statistics, large table analysis, and query optimization
+- **Context-Aware Prompts**: Predefined prompts for common database tasks
+- **Security-First Design**: SQL injection prevention, read-only constraints, and connection pooling
+- **Async Performance**: Built with asyncpg for high-performance database operations
+
+## Prerequisites
+
+- Python 3.8+
+- uv (for dependency management)
+
+## Installation
+
+### Install uv
+
+```bash
+curl -sSfL https://astral.sh/uv/install.sh | sh
+```
+
+### Install Dependencies
+
+```bash
+cd mcp-server
+uv venv
+source .venv/bin/activate
+uv sync
+```
+
+### Install Project
+
+```bash
+uv pip install -e .
+```
+
+### Build Project
+
+```bash
+uv build
+```
+
+## Configuration
+
+Create a `.env` file in the project root:
+
+```env
+# Database Configuration
+DB_HOST=localhost
+DB_PORT=5432
+DB_NAME=postgres
+DB_USER=postgres
+DB_PASSWORD=your_password
+
+# Server Configuration
+MCP_HOST=localhost
+MCP_PORT=8000
+MCP_DEBUG=false
+```
+
+## Usage
+
+### Running the Server
+
+```bash
+# Run the MCP server
+python -m cbmcp.server
+
+# Or run with cloudberry-mcp-server
+cloudberry-mcp-server
+
+# Or run with custom configuration
+MCP_HOST=0.0.0.0 MCP_PORT=8080 python -m cbmcp.server
+```
+
+### Testing the Client
+
+```bash
+# Run the test client
+python -m cbmcp.client
+```
+
+## API Reference
+
+### Resources
+
+- `postgres://schemas` - List all database schemas
+- `postgres://database/info` - Get general database info
+- `postgres://database/summary` - Get detailed database summary
+
+### Tools
+
+#### Query Tools
+- `execute_query(query, params, readonly)` - Execute a SQL query
+- `explain_query(query, params)` - Get query execution plan
+- `get_table_stats(schema, table)` - Get table statistics
+- `list_large_tables(limit)` - List largest tables
+
+#### User & Permission Management
+- `list_users()` - List all database users
+- `list_user_permissions(username)` - List permissions for a specific user
+- `list_table_privileges(schema, table)` - List privileges for a specific table
+
+#### Schema & Structure
+- `list_constraints(schema, table)` - List constraints for a table
+- `list_foreign_keys(schema, table)` - List foreign keys for a table
+- `list_referenced_tables(schema, table)` - List tables that reference this table
+- `get_table_ddl(schema, table)` - Get DDL statement for a table
+
+#### Performance & Monitoring
+- `get_slow_queries(limit)` - List slow queries
+- `get_index_usage()` - Analyze index usage statistics
+- `get_table_bloat_info()` - Analyze table bloat information
+- `get_database_activity()` - Show current database activity
+- `get_vacuum_info()` - Get vacuum and analyze statistics
+
+#### Database Objects
+- `list_functions(schema)` - List functions in a schema
+- `get_function_definition(schema, function)` - Get function definition
+- `list_triggers(schema, table)` - List triggers for a table
+- `list_materialized_views(schema)` - List materialized views in a schema
+- `list_active_connections()` - List active database connections
+
+### Prompts
+
+- `analyze_query_performance` - Query optimization assistance
+- `suggest_indexes` - Index recommendation guidance
+- `database_health_check` - Database health assessment
+
+## Security Features
+
+- **SQL Injection Prevention**: Comprehensive query validation
+- **Read-Only Constraints**: Configurable write protection
+- **Parameterized Queries**: Safe parameter handling
+- **Connection Pooling**: Secure connection management
+- **Sensitive Table Protection**: Blocks access to system tables
+
+
+## Quick Start with Cloudberry Demo Cluster
+
+This section shows how to quickly set up and test the Cloudberry MCP Server using a local Cloudberry demo cluster. This is ideal for development and testing purposes. 
+
+Assume you already have a running [Cloudberry demo cluster](https://cloudberry.apache.org/docs/deployment/set-demo-cluster) and install & build MCP server as described above.
+
+1. Configure local connections in `pg_hba.conf`
+
+**Note**: This configuration is for demo purposes only. Do not use `trust` authentication in production environments.
+
+```bash
+[gpadmin@cdw]$ vi ~/cloudberry/gpAux/gpdemo/datadirs/qddir/demoDataDir-1/pg_hba.conf
+```
+
+Add the following lines to the end of the pg_hba.conf:
+
+```
+# IPv4 local connections
+host    all     all     127.0.0.1/32    trust
+# IPv6 local connections
+host    all     all     ::1/128         trust
+```
+
+After modifying `pg_hba.conf`, reload the configuration parameters:
+```bash
+[gpadmin@cdw]$ gpstop -u
+```
+
+2. Create environment configuration
+
+Create a `.env` in the project root directory:
+
+```
+# Database Configuration (Demo cluster defaults)
+DB_HOST=localhost
+DB_PORT=7000
+DB_NAME=postgres
+DB_USER=gpadmin
+# No password required for demo cluster
+
+# Server Configuration
+MCP_HOST=localhost
+MCP_PORT=8000
+MCP_DEBUG=false
+```
+
+3. Start the MCP server
+
+```bash
+MCP_HOST=0.0.0.0 MCP_PORT=8000 python -m cbmcp.server
+```
+
+You should see output indicating the server is running:
+```
+[09/17/25 14:07:50] INFO     Starting MCP server 'Apache Cloudberry MCP Server' with transport        server.py:1572
+                             'streamable-http' on http://0.0.0.0:8000/mcp/
+```
+
+4. Configure your MCP client.
+
+Add the following server configuration to your MCP client:
+
+- Server Type: Streamable-HTTP
+- URL: http://[YOUR_HOST_IP]:8000/mcp
+
+Replace `[YOUR_HOST_IP]` with your actual host IP address.
+
+
+## LLM Client Integration
+
+### Claude Desktop Configuration
+
+Add the following configuration to your Claude Desktop configuration file:
+
+#### Stdio Transport (Recommended)
+
+```json
+{
+  "mcpServers": {
+    "cloudberry-mcp-server": {
+      "command": "uvx",
+      "args": [
+        "--with",
+        "PATH/TO/cbmcp-0.1.0-py3-none-any.whl",
+        "python",
+        "-m",
+        "cbmcp.server",
+        "--mode",
+        "stdio"
+      ],
+      "env": {
+        "DB_HOST": "localhost",
+        "DB_PORT": "5432",
+        "DB_NAME": "dvdrental",
+        "DB_USER": "yangshengwen",
+        "DB_PASSWORD": ""
+      }
+    }
+  }
+}
+```
+
+#### HTTP Transport
+
+```json
+{
+  "mcpServers": {
+    "cloudberry-mcp-server": {
+      "type": "streamable-http",
+      "url": "https://localhost:8000/mcp/",
+      "headers": {
+        "Authorization": ""
+      }
+    }
+  }
+}
+```
+
+### Cursor Configuration
+
+For Cursor IDE, add the configuration to your `.cursor/mcp.json` file:
+
+```json
+{
+  "mcpServers": {
+    "cloudberry-mcp": {
+      "command": "uvx",
+      "args": ["--with", "cbmcp", "python", "-m", "cbmcp.server", "--mode", "stdio"],
+      "env": {
+        "DB_HOST": "localhost",
+        "DB_PORT": "5432",
+        "DB_NAME": "dvdrental",
+        "DB_USER": "postgres",
+        "DB_PASSWORD": "your_password"
+      }
+    }
+  }
+}
+```
+
+### Windsurf Configuration
+
+For Windsurf IDE, configure in your settings:
+
+```json
+{
+  "mcp": {
+    "servers": {
+      "cloudberry-mcp": {
+        "type": "stdio",
+        "command": "uvx",
+        "args": ["--with", "cbmcp", "python", "-m", "cbmcp.server", "--mode", "stdio"],
+        "env": {
+          "DB_HOST": "localhost",
+          "DB_PORT": "5432",
+          "DB_NAME": "dvdrental",
+          "DB_USER": "postgres",
+          "DB_PASSWORD": "your_password"
+        }
+      }
+    }
+  }
+}
+```
+
+### VS Code with Cline
+
+For VS Code with the Cline extension, add to your settings:
+
+```json
+{
+  "cline.mcpServers": {
+    "cloudberry-mcp": {
+      "command": "uvx",
+      "args": ["--with", "cbmcp", "python", "-m", "cbmcp.server", "--mode", "stdio"],
+      "env": {
+        "DB_HOST": "localhost",
+        "DB_PORT": "5432",
+        "DB_NAME": "dvdrental",
+        "DB_USER": "postgres",
+        "DB_PASSWORD": "your_password"
+      }
+    }
+  }
+}
+```
+
+### Installation via pip
+
+If you prefer to install the package globally instead of using uvx:
+
+```bash
+# Install the package
+pip install cbmcp-0.1.0-py3-none-any.whl
+
+# Or using pip install from source
+pip install -e .
+
+# Then use in configuration
+{
+  "command": "python",
+  "args": ["-m", "cbmcp.server", "--mode", "stdio"]
+}
+```
+
+### Environment Variables
+
+All configurations support the following environment variables:
+
+- `DB_HOST`: Database host (default: localhost)
+- `DB_PORT`: Database port (default: 5432)
+- `DB_NAME`: Database name (default: postgres)
+- `DB_USER`: Database username
+- `DB_PASSWORD`: Database password
+- `MCP_HOST`: Server host for HTTP mode (default: localhost)
+- `MCP_PORT`: Server port for HTTP mode (default: 8000)
+- `MCP_DEBUG`: Enable debug logging (default: false)
+
+### Troubleshooting
+
+#### Common Issues
+
+1. **Connection refused**: Ensure Apache Cloudberry is running and accessible
+2. **Authentication failed**: Check database credentials in environment variables
+3. **Module not found**: Ensure the package is installed correctly
+4. **Permission denied**: Check file permissions for the package
+
+#### Debug Mode
+
+Enable debug logging by setting:
+```bash
+export MCP_DEBUG=true
+```
+
+## License
+
+Apache License 2.0
\ No newline at end of file
diff --git a/mcp-server/dotenv.example b/mcp-server/dotenv.example
new file mode 100644
index 00000000000..896cb33a539
--- /dev/null
+++ b/mcp-server/dotenv.example
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Example environment configuration
+# Copy this file to .env and update with your actual values
+
+# Database Configuration
+DB_HOST=localhost
+DB_PORT=5432
+DB_NAME=postgres
+DB_USER=postgres
+DB_PASSWORD=your_password_here
+
+# Server Configuration  
+MCP_HOST=localhost
+MCP_PORT=8000
+MCP_DEBUG=false
diff --git a/mcp-server/pyproject.toml b/mcp-server/pyproject.toml
new file mode 100644
index 00000000000..984cb5e12a1
--- /dev/null
+++ b/mcp-server/pyproject.toml
@@ -0,0 +1,70 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[project]
+name = "cloudberry-mcp-server"
+version = "0.1.0"
+description = "MCP server for Apache Cloudberry database interaction"
+readme = "README.md"
+requires-python = ">=3.10"
+authors = [
+    {name = "Shengwen Yang", email = "yangshengwen@gmail.com"},
+]
+maintainers = [
+    {name = "Shengwen Yang", email = "yangshengwen@gmail.com"},
+]
+license = {text = "Apache License 2.0"}
+keywords = ["mcp", "cloudberry", "postgresql", "database", "server", "ai"]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License, Version 2.0",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Database",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Database :: Front-Ends",
+]
+dependencies = [
+    "fastmcp>=2.10.6",
+    "psycopg2-binary==2.9.10",
+    "asyncpg>=0.29.0",
+    "pydantic>=2.0.0",
+    "python-dotenv>=1.0.0",
+    "aiohttp>=3.12.15",
+    "starlette>=0.27.0",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=7.0.0",
+    "pytest-asyncio>=0.21.0",
+    "pytest-cov>=4.0.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/apache/cloudberry//tree/main/mcp-server"
+Repository = "https://github.com/apache/cloudberry"
+Documentation = "https://github.com/apache/cloudberry/mcp-server/tree/main/mcp-server/README.md"
+
+[project.scripts]
+cloudberry-mcp-server = "cbmcp.server:main"
diff --git a/mcp-server/pytest.ini b/mcp-server/pytest.ini
new file mode 100644
index 00000000000..519115d6a19
--- /dev/null
+++ b/mcp-server/pytest.ini
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[tool:pytest]
+testpaths = tests
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+addopts = 
+    -v
+    --tb=short
+    --strict-markers
+    --disable-warnings
+asyncio_mode = auto
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')
+    integration: marks tests as integration tests
+    unit: marks tests as unit tests
\ No newline at end of file
diff --git a/mcp-server/run_tests.sh b/mcp-server/run_tests.sh
new file mode 100755
index 00000000000..a47184cab9f
--- /dev/null
+++ b/mcp-server/run_tests.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+# Test script for Apache Cloudberry MCP Server
+
+echo "=== Install test dependencies ==="
+uv pip install -e ".[dev]"
+
+echo "=== Run all tests ==="
+uv run pytest tests/ -v
+
+echo "=== Run specific test patterns ==="
+echo "Run stdio mode test:"
+uv run pytest tests/test_cbmcp.py::TestCloudberryMCPClient::test_list_capabilities -v
+
+echo "Run http mode test:"
+uv run pytest tests/test_cbmcp.py::TestCloudberryMCPClient::test_list_capabilities -v
+
+echo "=== Run coverage tests ==="
+uv run pytest tests/ --cov=cbmcp --cov-report=html --cov-report=term
+
+echo "=== Test completed ==="
diff --git a/mcp-server/src/cbmcp/__init__.py b/mcp-server/src/cbmcp/__init__.py
new file mode 100644
index 00000000000..a584c415ee6
--- /dev/null
+++ b/mcp-server/src/cbmcp/__init__.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python 
+ # -*- coding: utf-8 -*- 
+ # Licensed to the Apache Software Foundation (ASF) under one 
+ # or more contributor license agreements.  See the NOTICE file 
+ # distributed with this work for additional information 
+ # regarding copyright ownership.  The ASF licenses this file 
+ # to you under the Apache License, Version 2.0 (the 
+ # "License"); you may not use this file except in compliance 
+ # with the License.  You may obtain a copy of the License at 
+ # 
+ #   http://www.apache.org/licenses/LICENSE-2.0 
+ # 
+
+"""
+Apache Cloudberry MCP Server Package
+"""
+
+from .server import CloudberryMCPServer
+from .client import CloudberryMCPClient
+from .config import DatabaseConfig, ServerConfig
+from .database import DatabaseManager
+from .security import SQLValidator
+
+__version__ = "0.1.0"
+__all__ = [
+    "CloudberryMCPServer",
+    "CloudberryMCPClient",
+    "DatabaseConfig",
+    "ServerConfig",
+    "DatabaseManager",
+    "SQLValidator",
+]
\ No newline at end of file
diff --git a/mcp-server/src/cbmcp/__main__.py b/mcp-server/src/cbmcp/__main__.py
new file mode 100644
index 00000000000..f467fb2ac53
--- /dev/null
+++ b/mcp-server/src/cbmcp/__main__.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Main entry point for the cbmcp package
+"""
+
+from .server import main
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/mcp-server/src/cbmcp/client.py b/mcp-server/src/cbmcp/client.py
new file mode 100644
index 00000000000..b88f9993bd1
--- /dev/null
+++ b/mcp-server/src/cbmcp/client.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+MCP Client for testing the Apache Cloudberry MCP Server
+
+A client using the fastmcp SDK to interact with the Apache Cloudberry MCP server implementation.
+"""
+
+from typing import Any, Dict, Optional
+from fastmcp import Client
+
+from .config import DatabaseConfig, ServerConfig
+from .server import CloudberryMCPServer
+
+class CloudberryMCPClient:
+    """MCP client for testing the Apache Cloudberry server using fastmcp SDK
+    
+    Usage:
+        # Method 1: Using async context manager
+        async with CloudberryMCPClient() as client:
+            tools = await client.list_tools()
+            resources = await client.list_resources()
+        
+        # Method 2: Using create class method
+        client = await CloudberryMCPClient.create()
+        tools = await client.list_tools()
+        await client.close()
+        
+        # Method 3: Manual initialization
+        client = CloudberryMCPClient()
+        await client.initialize()
+        tools = await client.list_tools()
+        await client.close()
+    """
+    
+    def __init__(self, mode: str = "stdio", server_url: str = "http://localhost:8000/mcp/"):
+        self.mode = mode
+        self.server_url = server_url
+        self.client: Optional[Client] = None
+    
+    @classmethod
+    async def create(cls, mode: str = "stdio", server_url: str = "http://localhost:8000/mcp/") -> "CloudberryMCPClient":
+        """Asynchronously create and initialize the client"""
+        instance = cls(mode, server_url)
+        await instance.initialize()
+        return instance
+    
+    async def initialize(self):
+        """Initialize the client connection"""
+        if self.mode == "stdio":
+            server_config = ServerConfig.from_env()
+            db_config = DatabaseConfig.from_env()
+            server = CloudberryMCPServer(server_config, db_config)
+            self.client = Client(server.mcp)
+        else:
+            self.client = Client(self.server_url)
+        
+        await self.client.__aenter__()
+    
+    async def close(self):
+        """Close the client connection"""
+        if self.client:
+            await self.client.__aexit__(None, None, None)
+            self.client = None
+    
+    async def __aenter__(self):
+        if self.mode == "stdio":
+            server_config = ServerConfig.from_env()
+            db_config = DatabaseConfig.from_env()
+            server = CloudberryMCPServer(server_config, db_config)
+            self.client = Client(server.mcp)
+        else:
+            self.client = Client(self.server_url)
+
+        await self.client.__aenter__()
+        return self
+    
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        if self.client:
+            await self.client.__aexit__(exc_type, exc_val, exc_tb)
+    
+    async def call_tool(self, tool_name: str, arguments: Dict[str, Any]) -> Any:
+        """Call a tool on the MCP server"""
+        if not self.client:
+            raise RuntimeError("Client not initialized. Use async with statement.")
+        
+        return await self.client.call_tool(tool_name, arguments)
+        
+    async def get_resource(self, resource_uri: str):
+        """Get a resource from the MCP server"""
+        if not self.client:
+            raise RuntimeError("Client not initialized. Use async with statement.")
+        
+        return await self.client.read_resource(resource_uri)
+    
+    async def get_prompt(self, prompt_name: str, params: Dict[str, Any]=None):
+        """Get a prompt from the MCP server"""
+        if not self.client:
+            raise RuntimeError("Client not initialized. Use async with statement.")
+        
+        return await self.client.get_prompt(prompt_name, params)
+    
+    async def list_tools(self) -> list:
+        """List available tools on the server"""
+        if not self.client:
+            raise RuntimeError("Client not initialized. Use async with statement.")
+        
+        return await self.client.list_tools()
+    
+    async def list_resources(self) -> list:
+        """List available resources on the server"""
+        if not self.client:
+            raise RuntimeError("Client not initialized. Use async with statement.")
+        
+        return await self.client.list_resources()
+    
+    async def list_prompts(self) -> list:
+        """List available prompts on the server"""
+        if not self.client:
+            raise RuntimeError("Client not initialized. Use async with statement.")
+        
+        return await self.client.list_prompts()
+
+
+if __name__ == "__main__":
+    import asyncio
+
+    async def main():
+        async with CloudberryMCPClient(mode="http") as client:
+            results = await client.call_tool("execute_query", {
+                "query": "SELECT * FROM film LIMIT 5"
+            })
+            print("Results:", results)
+
+            results = await client.call_tool("list_columns", {
+                "table": "film",
+                "schema": "public"
+            })
+            print("Columns:", results)
+    
+    asyncio.run(main())
\ No newline at end of file
diff --git a/mcp-server/src/cbmcp/config.py b/mcp-server/src/cbmcp/config.py
new file mode 100644
index 00000000000..a810e67ed8f
--- /dev/null
+++ b/mcp-server/src/cbmcp/config.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Configuration utilities for the Apache Cloudberry MCP server
+"""
+
+import os
+from dataclasses import dataclass
+from dotenv import load_dotenv
+
+
+@dataclass
+class DatabaseConfig:
+    """Database connection configuration"""
+    host: str
+    port: int
+    database: str
+    username: str
+    password: str
+    
+    @classmethod
+    def from_env(cls) -> "DatabaseConfig":
+        """Create config from environment variables"""
+        load_dotenv()
+        return cls(
+            host=os.getenv("DB_HOST", "localhost"),
+            port=int(os.getenv("DB_PORT", "5432")),
+            database=os.getenv("DB_NAME", "postgres"),
+            username=os.getenv("DB_USER", "postgres"),
+            password=os.getenv("DB_PASSWORD", ""),
+        )
+    
+    @property
+    def connection_string(self) -> str:
+        """Get Apache Cloudberry connection string"""
+        return f"postgresql://{self.username}:{self.password}@{self.host}:{self.port}/{self.database}"
+
+
+@dataclass
+class ServerConfig:
+    """MCP server configuration"""
+    host: str
+    port: int
+    path: str
+    debug: bool
+    
+    @classmethod
+    def from_env(cls) -> "ServerConfig":
+        """Create config from environment variables"""
+        load_dotenv()
+        return cls(
+            host=os.getenv("MCP_HOST", "localhost"),
+            port=int(os.getenv("MCP_PORT", "8000")),
+            path=os.getenv("MCP_PATH", "/mcp/"),
+            debug=os.getenv("MCP_DEBUG", "false").lower() == "true",
+        )
\ No newline at end of file
diff --git a/mcp-server/src/cbmcp/database.py b/mcp-server/src/cbmcp/database.py
new file mode 100644
index 00000000000..77cdd2b308b
--- /dev/null
+++ b/mcp-server/src/cbmcp/database.py
@@ -0,0 +1,773 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Database utilities for the Apache Cloudberry MCP server
+"""
+
+import logging
+from typing import Any, Dict, Optional
+from contextlib import asynccontextmanager
+import asyncpg
+
+from .config import DatabaseConfig
+from .security import SQLValidator
+
+
+logger = logging.getLogger(__name__)
+
+
+class DatabaseManager:
+    """Manages database connections and operations"""
+    
+    def __init__(self, config: DatabaseConfig):
+        self.config = config
+        self._connection_pool: Optional[asyncpg.Pool] = None
+    
+    @asynccontextmanager
+    async def get_connection(self):
+        """Get a database connection from the pool"""
+        if not self._connection_pool:
+            self._connection_pool = await asyncpg.create_pool(
+                host=self.config.host,
+                port=self.config.port,
+                database=self.config.database,
+                user=self.config.username,
+                password=self.config.password,
+                min_size=1,
+                max_size=10,
+                command_timeout=60.0,
+            )
+        
+        try:
+            async with self._connection_pool.acquire() as conn:
+                yield conn
+        except Exception as e:
+            logger.error(f"Database connection error: {e}")
+            raise
+    
+    async def execute_query(
+        self, 
+        query: str, 
+        params: Optional[Dict[str, Any]] = None,
+        readonly: bool = True
+    ) -> Dict[str, Any]:
+        """Execute a SQL query with safety validation"""
+        # Validate query for security
+        is_valid, error_msg = SQLValidator.validate_query(query)
+        if not is_valid:
+            return {"error": f"Query validation failed: {error_msg}"}
+        
+        # Check readonly constraint
+        if readonly and not SQLValidator.is_readonly_query(query):
+            return {"error": "Only read-only queries are allowed"}
+        
+        try:
+            async with self.get_connection() as conn:
+                if params:
+                    # Sanitize parameter names
+                    sanitized_params = {
+                        SQLValidator.sanitize_parameter_name(k): v 
+                        for k, v in params.items()
+                    }
+                    result = await conn.fetch(query, **sanitized_params)
+                else:
+                    result = await conn.fetch(query)
+                
+                if not result:
+                    return {"columns": [], "rows": [], "row_count": 0}
+                
+                columns = list(result[0].keys())
+                rows = [list(row.values()) for row in result]
+                
+                return {
+                    "columns": columns,
+                    "rows": rows,
+                    "row_count": len(rows)
+                }
+                
+        except Exception as e:
+            logger.error(f"Query execution error: {e}")
+            return {"error": f"Error executing query: {str(e)}"}
+    
+    
+    async def get_table_info(self, schema: str, table: str) -> Dict[str, Any]:
+        """Get detailed information about a table"""
+        try:
+            async with self.get_connection() as conn:
+                # Get column information
+                columns = await conn.fetch(
+                    "SELECT column_name, data_type, is_nullable, column_default "
+                    "FROM information_schema.columns "
+                    "WHERE table_schema = $1 AND table_name = $2 "
+                    "ORDER BY ordinal_position",
+                    schema, table
+                )
+                
+                # Get index information
+                indexes = await conn.fetch(
+                    "SELECT indexname, indexdef FROM pg_indexes "
+                    "WHERE schemaname = $1 AND tablename = $2 "
+                    "ORDER BY indexname",
+                    schema, table
+                )
+                
+                # Get table statistics
+                stats = await conn.fetchrow(
+                    "SELECT "
+                    "pg_size_pretty(pg_total_relation_size($1)) as total_size, "
+                    "pg_size_pretty(pg_relation_size($1)) as table_size, "
+                    "pg_size_pretty(pg_total_relation_size($1) - pg_relation_size($1)) as indexes_size, "
+                    "(SELECT COUNT(*) FROM $1) as row_count",
+                    f"{schema}.{table}"
+                )
+                
+                return {
+                    "columns": [dict(col) for col in columns],
+                    "indexes": [dict(idx) for idx in indexes],
+                    "statistics": dict(stats) if stats else {}
+                }
+                
+        except Exception as e:
+            logger.error(f"Error getting table info: {e}")
+            return {"error": str(e)}
+    
+    async def close(self):
+        """Close the connection pool"""
+        if self._connection_pool:
+            await self._connection_pool.close()
+            self._connection_pool = None
+    
+    async def list_schemas(self) -> list[str]:
+        """List all database schemas"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT schema_name FROM information_schema.schemata "
+                "WHERE schema_name NOT LIKE 'pg_%' AND schema_name != 'information_schema' "
+                "ORDER BY schema_name"
+            )
+            return [r["schema_name"] for r in records]
+    
+    async def get_database_info(self) -> dict[str, str]:
+        """Get general database information"""
+        async with self.get_connection() as conn:
+            version = await conn.fetchval("SELECT version()")
+            size = await conn.fetchval("SELECT pg_size_pretty(pg_database_size(current_database()))")
+            stats = await conn.fetchrow(
+                "SELECT COUNT(*) as total_tables FROM information_schema.tables "
+                "WHERE table_type = 'BASE TABLE' AND table_schema NOT LIKE 'pg_%'"
+            )
+            
+            return {
+                "Version": version,
+                "Size": size,
+                "Total Tables": str(stats['total_tables'])
+            }
+    
+    async def get_database_summary(self) -> dict[str, dict]:
+        """Get comprehensive database summary"""
+        summary = {}
+        
+        async with self.get_connection() as conn:
+            # Get schemas
+            schemas = await conn.fetch(
+                "SELECT schema_name FROM information_schema.schemata "
+                "WHERE schema_name NOT LIKE 'pg_%' AND schema_name != 'information_schema' "
+                "ORDER BY schema_name"
+            )
+            
+            for schema_row in schemas:
+                schema = schema_row["schema_name"]
+                summary[schema] = {}
+                
+                # Get tables
+                tables = await conn.fetch(
+                    "SELECT table_name FROM information_schema.tables "
+                    "WHERE table_schema = $1 AND table_type = 'BASE TABLE' "
+                    "ORDER BY table_name",
+                    schema
+                )
+                summary[schema]["tables"] = [t["table_name"] for t in tables]
+                
+                # Get views
+                views = await conn.fetch(
+                    "SELECT table_name FROM information_schema.views "
+                    "WHERE table_schema = $1 "
+                    "ORDER BY table_name",
+                    schema
+                )
+                summary[schema]["views"] = [v["table_name"] for v in views]
+        
+        return summary
+
+    async def list_tables(self, schema: str) -> list[str]:
+        """List tables in a specific schema"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT table_name FROM information_schema.tables "
+                "WHERE table_schema = $1 AND table_type = 'BASE TABLE' "
+                "ORDER BY table_name",
+                schema
+            )
+            return [r["table_name"] for r in records]
+
+    async def list_views(self, schema: str) -> list[str]:
+        """List views in a specific schema"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT table_name FROM information_schema.views "
+                "WHERE table_schema = $1 "
+                "ORDER BY table_name",
+                schema
+            )
+            return [r["table_name"] for r in records]
+
+    async def list_indexes(self, schema: str, table: str) -> list[dict]:
+        """List indexes for a specific table"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT indexname, indexdef FROM pg_indexes "
+                "WHERE schemaname = $1 AND tablename = $2 "
+                "ORDER BY indexname",
+                schema, table
+            )
+            return [{"indexname": r["indexname"], "indexdef": r["indexdef"]} for r in records]
+
+    async def list_columns(self, schema: str, table: str) -> list[dict]:
+        """List columns for a specific table"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT column_name, data_type, is_nullable, column_default "
+                "FROM information_schema.columns "
+                "WHERE table_schema = $1 AND table_name = $2 "
+                "ORDER BY ordinal_position",
+                schema, table
+            )
+            return [
+                {
+                    "column_name": r["column_name"],
+                    "data_type": r["data_type"],
+                    "is_nullable": r["is_nullable"],
+                    "column_default": r["column_default"]
+                }
+                for r in records
+            ]
+
+    async def get_table_stats(self, schema: str, table: str) -> dict[str, Any]:
+        """Get statistics for a table"""
+        try:
+            # Validate schema and table names to prevent SQL injection
+            if not schema.replace('_', '').replace('-', '').isalnum():
+                return {"error": "Invalid schema name"}
+            if not table.replace('_', '').replace('-', '').isalnum():
+                return {"error": "Invalid table name"}
+
+            async with self.get_connection() as conn:
+                # Use format() with proper identifier quoting
+                qualified_name = f"{schema}.{table}"
+                sql = (
+                    f"SELECT "
+                    f"pg_size_pretty(pg_total_relation_size('{qualified_name}')) as total_size, "
+                    f"pg_size_pretty(pg_relation_size('{qualified_name}')) as table_size, "
+                    f"pg_size_pretty(pg_total_relation_size('{qualified_name}') - pg_relation_size('{qualified_name}')) as indexes_size, "
+                    f"(SELECT COUNT(*) FROM {qualified_name}) as row_count"
+                )
+                result = await conn.fetchrow(sql)
+
+                if not result:
+                    return {"error": f"Table {schema}.{table} not found"}
+
+                return {
+                    "total_size": result["total_size"],
+                    "table_size": result["table_size"],
+                    "indexes_size": result["indexes_size"],
+                    "row_count": result["row_count"]
+                }
+        except Exception as e:
+            return {"error": f"Error getting table stats: {str(e)}"}
+
+    async def list_large_tables(self, limit: int = 10) -> list[dict]:
+        """List the largest tables in the database"""
+        async with self.get_connection() as conn:
+            result = await conn.fetch(
+                "SELECT "
+                "schemaname, tablename, "
+                "pg_size_pretty(pg_total_relation_size(schemaname||'.'||tablename)) as size, "
+                "pg_total_relation_size(schemaname||'.'||tablename) as size_bytes "
+                "FROM pg_tables "
+                "WHERE schemaname NOT LIKE 'pg_%' "
+                "ORDER BY pg_total_relation_size(schemaname||'.'||tablename) DESC "
+                "LIMIT $1",
+                limit
+            )
+
+            return [
+                {
+                    "schema": row["schemaname"],
+                    "table": row["tablename"],
+                    "size": row["size"],
+                    "size_bytes": row["size_bytes"]
+                }
+                for row in result
+            ]
+
+    async def list_users(self) -> list[str]:
+        """List all database users"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT usename FROM pg_user WHERE usename != 'cloudberry' "
+                "ORDER BY usename"
+            )
+            return [r["usename"] for r in records]
+
+    async def list_user_permissions(self, username: str) -> list[dict]:
+        """List permissions for a specific user"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "n.nspname as schema_name, "
+                "c.relname as object_name, "
+                "c.relkind as object_type, "
+                "p.perm as permission "
+                "FROM pg_class c "
+                "JOIN pg_namespace n ON n.oid = c.relnamespace "
+                "CROSS JOIN LATERAL aclexplode(c.relacl) p "
+                "WHERE p.grantee = (SELECT oid FROM pg_user WHERE usename = $1) "
+                "AND n.nspname NOT LIKE 'pg_%' "
+                "ORDER BY n.nspname, c.relname",
+                username
+            )
+            return [
+                {
+                    "schema": r["schema_name"],
+                    "object": r["object_name"],
+                    "type": r["object_type"],
+                    "permission": r["permission"]
+                }
+                for r in records
+            ]
+
+    async def list_table_privileges(self, schema: str, table: str) -> list[dict]:
+        """List privileges for a specific table"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "grantee, privilege_type "
+                "FROM information_schema.table_privileges "
+                "WHERE table_schema = $1 AND table_name = $2 "
+                "ORDER BY grantee, privilege_type",
+                schema, table
+            )
+            return [
+                {
+                    "user": r["grantee"],
+                    "privilege": r["privilege_type"]
+                }
+                for r in records
+            ]
+
+    async def list_constraints(self, schema: str, table: str) -> list[dict]:
+        """List constraints for a specific table"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "c.conname as constraint_name, "
+                "c.contype as constraint_type, "
+                "pg_get_constraintdef(c.oid) as constraint_definition, "
+                "f.relname as foreign_table_name, "
+                "nf.nspname as foreign_schema_name "
+                "FROM pg_constraint c "
+                "JOIN pg_class t ON t.oid = c.conrelid "
+                "JOIN pg_namespace n ON n.oid = t.relnamespace "
+                "LEFT JOIN pg_class f ON f.oid = c.confrelid "
+                "LEFT JOIN pg_namespace nf ON nf.oid = f.relnamespace "
+                "WHERE n.nspname = $1 AND t.relname = $2 "
+                "ORDER BY c.conname",
+                schema, table
+            )
+            constraints = []
+            for r in records:
+                constraint_type = {
+                    'p': 'PRIMARY KEY',
+                    'f': 'FOREIGN KEY',
+                    'u': 'UNIQUE',
+                    'c': 'CHECK',
+                    'x': 'EXCLUSION'
+                }.get(r["constraint_type"], r["constraint_type"])
+                
+                constraints.append({
+                    "name": r["constraint_name"],
+                    "type": constraint_type,
+                    "definition": r["constraint_definition"],
+                    "foreign_table": r["foreign_table_name"],
+                    "foreign_schema": r["foreign_schema_name"]
+                })
+            return constraints
+
+    async def list_foreign_keys(self, schema: str, table: str) -> list[dict]:
+        """List foreign keys for a specific table"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "tc.constraint_name, "
+                "tc.table_name, "
+                "kcu.column_name, "
+                "ccu.table_name AS foreign_table_name, "
+                "ccu.column_name AS foreign_column_name, "
+                "ccu.table_schema AS foreign_schema_name "
+                "FROM information_schema.table_constraints AS tc "
+                "JOIN information_schema.key_column_usage AS kcu "
+                "ON tc.constraint_name = kcu.constraint_name "
+                "JOIN information_schema.constraint_column_usage AS ccu "
+                "ON ccu.constraint_name = tc.constraint_name "
+                "WHERE tc.constraint_type = 'FOREIGN KEY' "
+                "AND tc.table_schema = $1 AND tc.table_name = $2 "
+                "ORDER BY tc.constraint_name",
+                schema, table
+            )
+            return [
+                {
+                    "constraint_name": r["constraint_name"],
+                    "column": r["column_name"],
+                    "foreign_schema": r["foreign_schema_name"],
+                    "foreign_table": r["foreign_table_name"],
+                    "foreign_column": r["foreign_column_name"]
+                }
+                for r in records
+            ]
+
+    async def list_referenced_tables(self, schema: str, table: str) -> list[dict]:
+        """List tables that reference this table"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "tc.table_schema, "
+                "tc.table_name, "
+                "tc.constraint_name "
+                "FROM information_schema.table_constraints AS tc "
+                "JOIN information_schema.constraint_column_usage AS ccu "
+                "ON ccu.constraint_name = tc.constraint_name "
+                "WHERE tc.constraint_type = 'FOREIGN KEY' "
+                "AND ccu.table_schema = $1 AND ccu.table_name = $2 "
+                "ORDER BY tc.table_schema, tc.table_name",
+                schema, table
+            )
+            return [
+                {
+                    "schema": r["table_schema"],
+                    "table": r["table_name"],
+                    "constraint": r["constraint_name"]
+                }
+                for r in records
+            ]
+
+    async def explain_query(self, query: str, params: Optional[dict] = None) -> str:
+        """Get the execution plan for a query"""
+        try:
+            async with self.get_connection() as conn:
+                if params:
+                    result = await conn.fetch(f"EXPLAIN (ANALYZE, BUFFERS) {query}", **params)
+                else:
+                    result = await conn.fetch(f"EXPLAIN (ANALYZE, BUFFERS) {query}")
+                
+                return "\n".join([row["QUERY PLAN"] for row in result])
+        except Exception as e:
+            return f"Error explaining query: {str(e)}"
+
+    async def get_slow_queries(self, limit: int = 10) -> list[dict]:
+        """Get slow queries from pg_stat_statements"""
+        async with self.get_connection() as conn:
+            try:
+                records = await conn.fetch(
+                    "SELECT "
+                    "query, "
+                    "calls, "
+                    "total_time, "
+                    "mean_time, "
+                    "rows "
+                    "FROM pg_stat_statements "
+                    "ORDER BY mean_time DESC "
+                    "LIMIT $1",
+                    limit
+                )
+                return [
+                    {
+                        "query": r["query"],
+                        "calls": r["calls"],
+                        "total_time": r["total_time"],
+                        "mean_time": r["mean_time"],
+                        "rows": r["rows"]
+                    }
+                    for r in records
+                ]
+            except Exception:
+                # pg_stat_statements might not be available
+                return []
+
+    async def get_index_usage(self) -> list[dict]:
+        """Get index usage statistics"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "schemaname, "
+                "relname as tablename, "
+                "indexrelname as indexname, "
+                "idx_scan, "
+                "idx_tup_read, "
+                "idx_tup_fetch "
+                "FROM pg_stat_user_indexes "
+                "WHERE schemaname NOT LIKE 'pg_%' "
+                "ORDER BY idx_scan DESC"
+            )
+            return [
+                {
+                    "schema": r["schemaname"],
+                    "table": r["tablename"],
+                    "index": r["indexname"],
+                    "scans": r["idx_scan"],
+                    "tup_read": r["idx_tup_read"],
+                    "tup_fetch": r["idx_tup_fetch"]
+                }
+                for r in records
+            ]
+
+    async def get_table_bloat_info(self) -> list[dict]:
+        """Get table bloat information"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "schemaname, "
+                "relname as tablename, "
+                "pg_size_pretty(pg_total_relation_size(schemaname||'.'||relname)) as total_size, "
+                "round(100 * (relpages - (relpages * fillfactor / 100)) / relpages, 2) as bloat_ratio "
+                "FROM pg_class c "
+                "JOIN pg_namespace n ON n.oid = c.relnamespace "
+                "JOIN pg_stat_user_tables s ON s.relid = c.oid "
+                "WHERE c.relkind = 'r' AND n.nspname NOT LIKE 'pg_%' "
+                "ORDER BY bloat_ratio DESC "
+                "LIMIT 20"
+            )
+            return [
+                {
+                    "schema": r["schemaname"],
+                    "table": r["tablename"],
+                    "total_size": r["total_size"],
+                    "bloat_ratio": r["bloat_ratio"]
+                }
+                for r in records
+            ]
+
+    async def get_database_activity(self) -> list[dict]:
+        """Get current database activity"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "pid, "
+                "usename, "
+                "application_name, "
+                "client_addr, "
+                "state, "
+                "query_start, "
+                "query "
+                "FROM pg_stat_activity "
+                "WHERE state != 'idle' AND usename != 'cloudberry' "
+                "ORDER BY query_start"
+            )
+            return [
+                {
+                    "pid": r["pid"],
+                    "username": r["usename"],
+                    "application": r["application_name"],
+                    "client_addr": str(r["client_addr"]) if r["client_addr"] else None,
+                    "state": r["state"],
+                    "query_start": str(r["query_start"]),
+                    "query": r["query"]
+                }
+                for r in records
+            ]
+
+    async def list_functions(self, schema: str) -> list[dict]:
+        """List functions in a specific schema"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "proname as function_name, "
+                "pg_get_function_identity_arguments(p.oid) as arguments, "
+                "pg_get_function_result(p.oid) as return_type, "
+                "prokind as function_type "
+                "FROM pg_proc p "
+                "JOIN pg_namespace n ON n.oid = p.pronamespace "
+                "WHERE n.nspname = $1 AND p.prokind IN ('f', 'p') "
+                "ORDER BY proname",
+                schema
+            )
+            return [
+                {
+                    "name": r["function_name"],
+                    "arguments": r["arguments"],
+                    "return_type": r["return_type"],
+                    "type": "function" if r["function_type"] == "f" else "procedure"
+                }
+                for r in records
+            ]
+
+    async def get_function_definition(self, schema: str, function_name: str) -> str:
+        """Get function definition"""
+        try:
+            async with self.get_connection() as conn:
+                definition = await conn.fetchval(
+                    "SELECT pg_get_functiondef(p.oid) "
+                    "FROM pg_proc p "
+                    "JOIN pg_namespace n ON n.oid = p.pronamespace "
+                    "WHERE n.nspname = $1 AND p.proname = $2 "
+                    "LIMIT 1",
+                    schema, function_name
+                )
+                return definition or "Function definition not found"
+        except Exception as e:
+            return f"Error getting function definition: {str(e)}"
+
+    async def list_triggers(self, schema: str, table: str) -> list[dict]:
+        """List triggers for a specific table"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "trigger_name, "
+                "event_manipulation, "
+                "action_timing, "
+                "action_statement "
+                "FROM information_schema.triggers "
+                "WHERE event_object_schema = $1 AND event_object_table = $2 "
+                "ORDER BY trigger_name",
+                schema, table
+            )
+            return [
+                {
+                    "name": r["trigger_name"],
+                    "event": r["event_manipulation"],
+                    "timing": r["action_timing"],
+                    "action": r["action_statement"]
+                }
+                for r in records
+            ]
+
+    async def get_table_ddl(self, schema: str, table: str) -> str:
+        """Get DDL statement for a table"""
+        try:
+            async with self.get_connection() as conn:
+                # Try the newer method first
+                try:
+                    ddl = await conn.fetchval(
+                        "SELECT pg_get_tabledef($1, $2, true)",
+                        schema, table
+                    )
+                    if ddl:
+                        return ddl
+                except Exception:
+                    pass
+                
+                # Fallback to a more compatible approach
+                ddl_query = """
+                SELECT 'CREATE TABLE ' || $1 || '.' || $2 || ' (' || E'\n' ||
+                       string_agg(
+                         '  ' || column_name || ' ' || 
+                         data_type || 
+                         CASE WHEN character_maximum_length IS NOT NULL 
+                              THEN '(' || character_maximum_length || ')' 
+                              ELSE '' END ||
+                         CASE WHEN is_nullable = 'NO' THEN ' NOT NULL' ELSE '' END ||
+                         CASE WHEN column_default IS NOT NULL 
+                              THEN ' DEFAULT ' || column_default 
+                              ELSE '' END,
+                         E',\n' ORDER BY ordinal_position
+                       ) || E'\n);' as ddl
+                FROM information_schema.columns
+                WHERE table_schema = $1 AND table_name = $2
+                """
+                ddl = await conn.fetchval(ddl_query, schema, table)
+                return ddl or "Table DDL not found"
+        except Exception as e:
+            return f"Error getting table DDL: {str(e)}"
+
+    async def list_materialized_views(self, schema: str) -> list[str]:
+        """List materialized views in a specific schema"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT matviewname "
+                "FROM pg_matviews "
+                "WHERE schemaname = $1 "
+                "ORDER BY matviewname",
+                schema
+            )
+            return [r["matviewname"] for r in records]
+
+    async def get_vacuum_info(self, schema: str, table: str) -> dict:
+        """Get vacuum information for a table"""
+        async with self.get_connection() as conn:
+            record = await conn.fetchrow(
+                "SELECT "
+                "last_vacuum, "
+                "last_autovacuum, "
+                "n_dead_tup, "
+                "n_live_tup, "
+                "vacuum_count, "
+                "autovacuum_count "
+                "FROM pg_stat_user_tables "
+                "WHERE schemaname = $1 AND relname = $2",
+                schema, table
+            )
+            if record:
+                return {
+                    "last_vacuum": str(record["last_vacuum"]) if record["last_vacuum"] else None,
+                    "last_autovacuum": str(record["last_autovacuum"]) if record["last_autovacuum"] else None,
+                    "dead_tuples": record["n_dead_tup"],
+                    "live_tuples": record["n_live_tup"],
+                    "vacuum_count": record["vacuum_count"],
+                    "autovacuum_count": record["autovacuum_count"]
+                }
+            return {"error": "Table not found"}
+
+    async def list_active_connections(self) -> list[dict]:
+        """List active database connections"""
+        async with self.get_connection() as conn:
+            records = await conn.fetch(
+                "SELECT "
+                "pid, "
+                "usename, "
+                "application_name, "
+                "client_addr, "
+                "state, "
+                "backend_start, "
+                "query_start "
+                "FROM pg_stat_activity "
+                "WHERE usename != 'cloudberry' "
+                "ORDER BY backend_start"
+            )
+            return [
+                {
+                    "pid": r["pid"],
+                    "username": r["usename"],
+                    "application": r["application_name"],
+                    "client_addr": str(r["client_addr"]) if r["client_addr"] else None,
+                    "state": r["state"],
+                    "backend_start": str(r["backend_start"]),
+                    "query_start": str(r["query_start"]) if r["query_start"] else None
+                }
+                for r in records
+            ]
\ No newline at end of file
diff --git a/mcp-server/src/cbmcp/prompt.py b/mcp-server/src/cbmcp/prompt.py
new file mode 100644
index 00000000000..774aabac6ba
--- /dev/null
+++ b/mcp-server/src/cbmcp/prompt.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Prompt templates for Apache Cloudberry database analysis."""
+
+ANALYZE_QUERY_PERFORMANCE_PROMPT = """Please help me analyze and optimize a PostgreSQL query.
+
+I'll provide you with:
+1. The SQL query: {sql}
+2. The EXPLAIN ANALYZE output: {explain}
+3. Table schema information: {table_info}
+
+Please analyze:
+- Query execution plan
+- Potential performance bottlenecks
+- Index usage
+- Suggested optimizations
+- Alternative query approaches
+"""
+
+SUGGEST_INDEXES_PROMPT = """Please help me suggest optimal indexes for your PostgreSQL tables.
+
+I'll provide you with:
+1. The table schema(s): {table_info}
+2. Common query patterns: {query}
+3. Current indexes: {table_info}
+4. Table size and row count: {table_stats}
+
+Please analyze:
+- Missing indexes based on query patterns
+- Index type recommendations (B-tree, GIN, GiST, etc.)
+- Composite index suggestions
+- Index maintenance considerations
+"""
+
+DATABASE_HEALTH_CHECK_PROMPT = """Let's perform a comprehensive health check of your PostgreSQL database.
+
+Please analyze:
+- Database size and growth trends
+- Large tables and indexes
+- Query performance metrics
+- Connection pool usage
+- Vacuum and analyze statistics
+- Index fragmentation
+- Table bloat
+"""
\ No newline at end of file
diff --git a/mcp-server/src/cbmcp/security.py b/mcp-server/src/cbmcp/security.py
new file mode 100644
index 00000000000..d9cd44a7e17
--- /dev/null
+++ b/mcp-server/src/cbmcp/security.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Security utilities for the Apache Cloudberry MCP server
+"""
+
+from typing import Set
+import re
+
+
+class SQLValidator:
+    """Validates SQL queries for security"""
+    
+    # Allowed SQL operations for safety
+    ALLOWED_OPERATIONS: Set[str] = {
+        "SELECT", "WITH", "SHOW", "EXPLAIN", "DESCRIBE", "PRAGMA"
+    }
+    
+    # Blocked SQL operations
+    BLOCKED_OPERATIONS: Set[str] = {
+        "INSERT", "UPDATE", "DELETE", "DROP", "CREATE", "ALTER", 
+        "TRUNCATE", "GRANT", "REVOKE", "REPLACE"
+    }
+    
+    # Sensitive tables that should not be queried
+    SENSITIVE_TABLES: Set[str] = {
+        "pg_user", "pg_shadow", "pg_authid", "pg_passfile",
+        "information_schema.user_privileges"
+    }
+    
+    @classmethod
+    def validate_query(cls, query: str) -> tuple[bool, str]:
+        """Validate a SQL query for security
+        
+        Returns:
+            tuple: (is_valid, error_message)
+        """
+        query_upper = query.upper().strip()
+        
+        # Check for blocked operations
+        for blocked in cls.BLOCKED_OPERATIONS:
+            if re.search(rf"\b{blocked}\b", query_upper):
+                return False, f"Blocked SQL operation: {blocked}"
+        
+        # Check if query starts with allowed operation
+        if not any(query_upper.startswith(op) for op in cls.ALLOWED_OPERATIONS):
+            return False, f"Query must start with one of: {', '.join(cls.ALLOWED_OPERATIONS)}"
+        
+        # Check for sensitive table access
+        for sensitive_table in cls.SENSITIVE_TABLES:
+            if re.search(rf"\b{sensitive_table}\b", query_upper):
+                return False, f"Access to sensitive table not allowed: {sensitive_table}"
+        
+        # Check for potential SQL injection patterns
+        injection_patterns = [
+            r";.*--",  # Comments after statements
+            r"/\*.*\*/",  # Block comments
+            r"'OR'1'='1",  # Basic SQL injection
+            r"'UNION.*SELECT",  # Union attacks
+            r"EXEC\s*\(",  # Dynamic SQL execution
+        ]
+        
+        for pattern in injection_patterns:
+            if re.search(pattern, query_upper):
+                return False, f"Potential SQL injection detected"
+        
+        return True, "Query is valid"
+    
+    @classmethod
+    def sanitize_parameter_name(cls, param_name: str) -> str:
+        """Sanitize parameter names to prevent injection"""
+        # Remove any non-alphanumeric characters except underscores
+        return re.sub(r"[^a-zA-Z0-9_]", "", param_name)
+    
+    @classmethod
+    def is_readonly_query(cls, query: str) -> bool:
+        """Check if a query is read-only"""
+        query_upper = query.upper().strip()
+        return query_upper.startswith(("SELECT", "WITH", "SHOW", "EXPLAIN"))
\ No newline at end of file
diff --git a/mcp-server/src/cbmcp/server.py b/mcp-server/src/cbmcp/server.py
new file mode 100644
index 00000000000..edf0b539545
--- /dev/null
+++ b/mcp-server/src/cbmcp/server.py
@@ -0,0 +1,551 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Apache Cloudberry MCP Server Implementation
+
+A Model Communication Protocol server for Apache Cloudberry database interaction
+providing resources, tools, and prompts for database management.
+"""
+
+from typing import Annotated, Any, Dict, List, Optional
+import logging
+from fastmcp import FastMCP
+from pydantic import Field
+
+from .config import DatabaseConfig, ServerConfig
+from .database import DatabaseManager
+from .prompt import (
+    ANALYZE_QUERY_PERFORMANCE_PROMPT,
+    SUGGEST_INDEXES_PROMPT,
+    DATABASE_HEALTH_CHECK_PROMPT
+)
+
+logger = logging.getLogger(__name__)
+
+class CloudberryMCPServer:
+    """Apache Cloudberry MCP Server implementation"""
+    
+    def __init__(self, server_config: ServerConfig, db_config: DatabaseConfig):
+        self.server_config = server_config
+        self.db_config = db_config
+        self.mcp = FastMCP("Apache Cloudberry MCP Server")
+        self.db_manager = DatabaseManager(db_config)
+        
+        self._setup_resources()
+        self._setup_tools()
+        self._setup_prompts()
+
+    
+    def _setup_resources(self):
+        """Setup MCP resources for database metadata"""
+        
+        @self.mcp.resource("postgres://schemas", mime_type="application/json")
+        async def list_schemas() -> List[str]:
+            """List all database schemas"""
+            logger.info("Listing schemas")
+            return await self.db_manager.list_schemas()
+        
+        @self.mcp.resource("postgres://database/info", mime_type="application/json")
+        async def database_info() -> Dict[str, str]:
+            """Get general database information"""
+            logger.info("Getting database info")
+            return await self.db_manager.get_database_info()
+        
+        @self.mcp.resource("postgres://database/summary", mime_type="application/json")
+        async def database_summary() -> Dict[str, dict]:
+            """Get comprehensive database summary"""
+            logger.info("Getting database summary")
+            return await self.db_manager.get_database_summary()
+
+            
+    def _setup_tools(self):
+        """Setup MCP tools for database operations"""
+        
+        @self.mcp.tool()
+        async def list_tables(
+            schema: Annotated[str, Field(description="The schema name to list tables from")]
+        ) -> List[str]:
+            """List tables in a specific schema"""
+            logger.info(f"Listing tables in schema: {schema}")
+            try:
+                return await self.db_manager.list_tables(schema)
+            except Exception as e:
+                return f"Error listing tables: {str(e)}"
+        
+        @self.mcp.tool()
+        async def list_views(
+            schema: Annotated[str, Field(description="The schema name to list views from")]
+        ) -> List[str]:
+            """List views in a specific schema"""
+            logger.info(f"Listing views in schema: {schema}")
+            try:
+                return await self.db_manager.list_views(schema)
+            except Exception as e:
+                return f"Error listing views: {str(e)}"
+        
+        @self.mcp.tool()
+        async def list_indexes(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name to list indexes for")]
+        ) -> List[str]:
+            """List indexes for a specific table"""
+            logger.info(f"Listing indexes for table: {schema}.{table}")
+            try:
+                indexes = await self.db_manager.list_indexes(schema, table)
+                return [f"{idx['indexname']}: {idx['indexdef']}" for idx in indexes]
+            except Exception as e:
+                return f"Error listing indexes: {str(e)}"
+        
+        @self.mcp.tool()
+        async def list_columns(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name to list columns for")]
+        ) -> List[Dict[str, Any]]:
+            """List columns for a specific table"""
+            logger.info(f"Listing columns for table: {schema}.{table}")
+            try:
+                return await self.db_manager.list_columns(schema, table)
+            except Exception as e:
+                return f"Error listing columns: {str(e)}"
+        
+        @self.mcp.tool()
+        async def execute_query(
+            query: Annotated[str, Field(description="The SQL query to execute")],
+            params: Annotated[Optional[Dict[str, Any]], Field(description="The parameters for the query")] = None,
+            readonly: Annotated[bool, Field(description="Whether the query is read-only")] = True
+        ) -> Dict[str, Any]:
+            """
+            Execute a safe SQL query with parameters
+            """
+            logger.info(f"Executing query: {query}")
+            try:
+                return await self.db_manager.execute_query(query, params, readonly)
+            except Exception as e:
+                return {"error": f"Error executing query: {str(e)}"}
+        
+        @self.mcp.tool()
+        async def explain_query(
+            query: Annotated[str, Field(description="The SQL query to explain")],
+            params: Annotated[Optional[Dict[str, Any]], Field(description="The parameters for the query")] = None
+        ) -> str:
+            """
+            Get the execution plan for a query
+            """
+            logger.info(f"Explaining query: {query}")
+            try:
+                return await self.db_manager.explain_query(query, params)
+            except Exception as e:
+                return f"Error explaining query: {str(e)}"
+        
+        @self.mcp.tool()
+        async def get_table_stats(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")],
+        ) -> Dict[str, Any]:
+            """
+            Get statistics for a table
+            """
+            logger.info(f"Getting table stats for: {schema}.{table}")
+            try:
+                result = await self.db_manager.get_table_stats(schema, table)
+                if "error" in result:
+                    return result["error"]
+                return result
+            except Exception as e:
+                return f"Error getting table stats: {str(e)}"
+        
+        @self.mcp.tool()
+        async def list_large_tables(limit: Annotated[int, Field(description="Number of tables to return")] = 10) -> List[Dict[str, Any]]:
+            """
+            List the largest tables in the database
+            """
+            logger.info(f"Listing large tables, limit: {limit}")
+            try:
+                return await self.db_manager.list_large_tables(limit)
+            except Exception as e:
+                return f"Error listing large tables: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_database_schemas() -> List[str]:
+            """Get database schemas"""
+            logger.info("Getting database schemas")
+            try:
+                return await self.db_manager.list_schemas()
+            except Exception as e:
+                return f"Error getting schemas: {str(e)}"
+        
+        @self.mcp.tool()
+        async def get_database_information() -> Dict[str, str]:
+            """Get general database information"""
+            logger.info("Getting database information")
+            try:
+                return await self.db_manager.get_database_info()
+            except Exception as e:
+                return f"Error getting database info: {str(e)}"
+        
+        @self.mcp.tool()
+        async def get_database_summary() -> Dict[str, dict]:
+            """Get detailed database summary"""
+            logger.info("Getting database summary")
+            try:
+                return await self.db_manager.get_database_summary()
+            except Exception as e:
+                return f"Error getting database summary: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_users() -> List[str]:
+            """List all database users"""
+            logger.info("Listing database users")
+            try:
+                return await self.db_manager.list_users()
+            except Exception as e:
+                return f"Error listing users: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_user_permissions(
+            username: Annotated[str, Field(description="The username to check permissions for")]
+        ) -> List[Dict[str, Any]]:
+            """List permissions for a specific user"""
+            logger.info(f"Listing permissions for user: {username}")
+            try:
+                return await self.db_manager.list_user_permissions(username)
+            except Exception as e:
+                return f"Error listing user permissions: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_table_privileges(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")]
+        ) -> List[Dict[str, Any]]:
+            """List privileges for a specific table"""
+            logger.info(f"Listing table privileges for: {schema}.{table}")
+            try:
+                return await self.db_manager.list_table_privileges(schema, table)
+            except Exception as e:
+                return f"Error listing table privileges: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_constraints(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")]
+        ) -> List[Dict[str, Any]]:
+            """List constraints for a specific table"""
+            logger.info(f"Listing constraints for table: {schema}.{table}")
+            try:
+                return await self.db_manager.list_constraints(schema, table)
+            except Exception as e:
+                return f"Error listing constraints: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_foreign_keys(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")]
+        ) -> List[Dict[str, Any]]:
+            """List foreign keys for a specific table"""
+            logger.info(f"Listing foreign keys for table: {schema}.{table}")
+            try:
+                return await self.db_manager.list_foreign_keys(schema, table)
+            except Exception as e:
+                return f"Error listing foreign keys: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_referenced_tables(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")]
+        ) -> List[Dict[str, Any]]:
+            """List tables that reference this table"""
+            logger.info(f"Listing referenced tables for: {schema}.{table}")
+            try:
+                return await self.db_manager.list_referenced_tables(schema, table)
+            except Exception as e:
+                return f"Error listing referenced tables: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_slow_queries(
+            limit: Annotated[int, Field(description="Number of slow queries to return")] = 10
+        ) -> List[Dict[str, Any]]:
+            """Get slow queries from database statistics"""
+            logger.info(f"Getting slow queries, limit: {limit}")
+            try:
+                return await self.db_manager.get_slow_queries(limit)
+            except Exception as e:
+                return f"Error getting slow queries: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_index_usage() -> List[Dict[str, Any]]:
+            """Get index usage statistics"""
+            logger.info("Getting index usage statistics")
+            try:
+                return await self.db_manager.get_index_usage()
+            except Exception as e:
+                return f"Error getting index usage: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_table_bloat_info() -> List[Dict[str, Any]]:
+            """Get table bloat information"""
+            logger.info("Getting table bloat information")
+            try:
+                return await self.db_manager.get_table_bloat_info()
+            except Exception as e:
+                return f"Error getting table bloat info: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_database_activity() -> List[Dict[str, Any]]:
+            """Get current database activity"""
+            logger.info("Getting database activity")
+            try:
+                return await self.db_manager.get_database_activity()
+            except Exception as e:
+                return f"Error getting database activity: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_functions(
+            schema: Annotated[str, Field(description="The schema name")]
+        ) -> List[Dict[str, Any]]:
+            """List functions in a specific schema"""
+            logger.info(f"Listing functions in schema: {schema}")
+            try:
+                return await self.db_manager.list_functions(schema)
+            except Exception as e:
+                return f"Error listing functions: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_function_definition(
+            schema: Annotated[str, Field(description="The schema name")],
+            function_name: Annotated[str, Field(description="The function name")]
+        ) -> str:
+            """Get function definition"""
+            logger.info(f"Getting function definition: {schema}.{function_name}")
+            try:
+                return await self.db_manager.get_function_definition(schema, function_name)
+            except Exception as e:
+                return f"Error getting function definition: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_triggers(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")]
+        ) -> List[Dict[str, Any]]:
+            """List triggers for a specific table"""
+            logger.info(f"Listing triggers for table: {schema}.{table}")
+            try:
+                return await self.db_manager.list_triggers(schema, table)
+            except Exception as e:
+                return f"Error listing triggers: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_table_ddl(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")]
+        ) -> str:
+            """Get DDL statement for a table"""
+            logger.info(f"Getting table DDL: {schema}.{table}")
+            try:
+                return await self.db_manager.get_table_ddl(schema, table)
+            except Exception as e:
+                return f"Error getting table DDL: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_materialized_views(
+            schema: Annotated[str, Field(description="The schema name")]
+        ) -> List[str]:
+            """List materialized views in a specific schema"""
+            logger.info(f"Listing materialized views in schema: {schema}")
+            try:
+                return await self.db_manager.list_materialized_views(schema)
+            except Exception as e:
+                return f"Error listing materialized views: {str(e)}"
+
+        @self.mcp.tool()
+        async def get_vacuum_info(
+            schema: Annotated[str, Field(description="The schema name")],
+            table: Annotated[str, Field(description="The table name")]
+        ) -> Dict[str, Any]:
+            """Get vacuum information for a table"""
+            logger.info(f"Getting vacuum info for table: {schema}.{table}")
+            try:
+                return await self.db_manager.get_vacuum_info(schema, table)
+            except Exception as e:
+                return f"Error getting vacuum info: {str(e)}"
+
+        @self.mcp.tool()
+        async def list_active_connections() -> List[Dict[str, Any]]:
+            """List active database connections"""
+            logger.info("Listing active connections")
+            try:
+                return await self.db_manager.list_active_connections()
+            except Exception as e:
+                return f"Error listing active connections: {str(e)}"
+    
+    def _setup_prompts(self):
+        """Setup MCP prompts for common database tasks"""
+        
+        @self.mcp.prompt()
+        def analyze_query_performance(
+            sql: Annotated[str, Field(description="The SQL query to analyze")],
+            explain: Annotated[str, Field(description="The EXPLAIN ANALYZE output")],
+            table_info: Annotated[str, Field(description="The table schema information")],
+        ) -> str:
+            """Prompt for analyzing query performance"""
+            logger.info(f"Analyzing query performance for: {sql}")
+            return ANALYZE_QUERY_PERFORMANCE_PROMPT.format(
+                sql=sql,
+                explain=explain,
+                table_info=table_info
+            )        
+        @self.mcp.prompt()
+        def suggest_indexes(
+            query: Annotated[str, Field(description="The common query pattern")],
+            table_info: Annotated[str, Field(description="The table schema information")],
+            table_stats: Annotated[str, Field(description="The table statistics")],
+        ) -> str:
+            """Prompt for suggesting indexes"""
+            logger.info(f"Suggesting indexes for query: {query}")
+            return SUGGEST_INDEXES_PROMPT.format(
+                query=query,
+                table_info=table_info,
+                table_stats=table_stats
+            )
+
+
+        @self.mcp.prompt()
+        def database_health_check() -> str:
+            """Prompt for database health check"""
+            logger.info(f"Checking database health")
+            return DATABASE_HEALTH_CHECK_PROMPT
+    
+    def run(self, mode: str="http"):
+        """Run the MCP server"""
+        if mode == "stdio":
+            return self.mcp.run(
+                transport="stdio",
+            )
+        elif mode == "http":
+            return self.mcp.run(
+                transport="streamable-http",
+                host=self.server_config.host,
+                port=self.server_config.port,
+                path=self.server_config.path,
+                stateless_http=True
+            )
+    
+    async def close(self):
+        """Close the server and cleanup resources"""
+        await self.db_manager.close()
+
+
+def main():
+    """Main entry point"""
+    import argparse
+    
+    parser = argparse.ArgumentParser(
+        description="Cloudberry MCP Server - Cloudberry database management tools",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  %(prog)s --mode stdio
+  %(prog)s --mode http --host 0.0.0.0 --port 8080
+  %(prog)s --mode http --log-level INFO
+  %(prog)s --help
+        """
+    )
+    
+    parser.add_argument(
+        "--mode",
+        choices=["stdio", "http"],
+        default="http",
+        help="Server mode: stdio for stdin/stdout communication, http for HTTP server (default: http)"
+    )
+    
+    parser.add_argument(
+        "--host",
+        default=None,
+        help="HTTP server host (default: from CLOUDBERRY_MCP_HOST env var or 127.0.0.1)"
+    )
+    
+    parser.add_argument(
+        "--port",
+        type=int,
+        default=None,
+        help="HTTP server port (default: from CLOUDBERRY_MCP_PORT env var or 8080)"
+    )
+    
+    parser.add_argument(
+        "--path",
+        default=None,
+        help="HTTP server path (default: from CLOUDBERRY_MCP_PATH env var or /mcp)"
+    )
+    
+    parser.add_argument(
+        "--log-level",
+        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
+        default="WARNING",
+        help="Logging level (default: WARNING)"
+    )
+    
+    parser.add_argument(
+        "--version",
+        action="version",
+        version="Cloudberry MCP Server 1.0.0"
+    )
+    
+    args = parser.parse_args()
+    
+    # Configure logging
+    log_level = getattr(logging, args.log_level.upper())
+    logging.basicConfig(
+        level=log_level,
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+        handlers=[
+            logging.StreamHandler()
+        ]
+    )
+    
+    # Create configurations
+    server_config = ServerConfig.from_env()
+    db_config = DatabaseConfig.from_env()
+    
+    # Override with command line arguments
+    if args.host:
+        server_config.host = args.host
+    if args.port:
+        server_config.port = args.port
+    if args.path:
+        server_config.path = args.path
+    
+    server = CloudberryMCPServer(server_config, db_config)
+    
+    try:
+        logger.info(f"Starting server in {args.mode} mode...")
+        server.run(args.mode)
+    except KeyboardInterrupt:
+        logger.error("Server stopped by user")
+    except Exception as e:
+        logger.error(f"Server error: {e}")
+        sys.exit(1)
+    finally:
+        import asyncio
+        asyncio.run(server.close())
+
+
+if __name__ == "__main__":
+    import sys
+    
+    main()
diff --git a/mcp-server/tests/README.md b/mcp-server/tests/README.md
new file mode 100644
index 00000000000..9fa69976b26
--- /dev/null
+++ b/mcp-server/tests/README.md
@@ -0,0 +1,115 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+# Apache Cloudberry MCP Testing Guide
+
+## Test Structure
+
+This project uses the `pytest` framework for testing, supporting both asynchronous testing and parameterized testing.
+
+### Test Files
+- `test_cbmcp.py` - Main test file containing all MCP client functionality tests
+
+### Test Categories
+- **Unit Tests** - Test individual features independently
+- **Integration Tests** - Test overall system functionality
+- **Parameterized Tests** - Test both stdio and http modes simultaneously
+
+## Running Tests
+
+### Install Test Dependencies
+```bash
+pip install -e ".[dev]"
+```
+
+### Run All Tests
+```bash
+pytest tests/
+```
+
+### Run Specific Tests
+```bash
+# Run specific test file
+pytest tests/test_cbmcp.py
+
+# Run specific test class
+pytest tests/test_cbmcp.py::TestCloudberryMCPClient
+
+# Run specific test method
+pytest tests/test_cbmcp.py::TestCloudberryMCPClient::test_list_capabilities
+
+# Run tests for specific mode
+pytest tests/test_cbmcp.py -k "stdio"
+```
+
+### Verbose Output
+```bash
+pytest tests/ -v
+```
+
+### Coverage Testing
+```bash
+pytest tests/ --cov=src.cbmcp --cov-report=html --cov-report=term
+```
+
+## Test Features
+
+### 1. Server Capabilities Tests
+- `test_list_capabilities` - Test tool, resource, and prompt listings
+
+### 2. Resource Tests
+- `test_get_schemas_resource` - Get database schemas
+- `test_get_tables_resource` - Get table listings
+- `test_get_database_info_resource` - Get database information
+- `test_get_database_summary_resource` - Get database summary
+
+### 3. Tool Tests
+- `test_tools` - Parameterized testing of all tool calls
+  - list_tables
+  - list_views
+  - list_columns
+  - list_indexes
+  - execute_query
+  - list_large_tables
+  - get_table_stats
+  - explain_query
+
+### 4. Prompt Tests
+- `test_analyze_query_performance_prompt` - Query performance analysis prompts
+- `test_suggest_indexes_prompt` - Index suggestion prompts
+- `test_database_health_check_prompt` - Database health check prompts
+
+## Test Modes
+
+Tests support two modes:
+- **stdio** - Standard input/output mode
+- **http** - HTTP mode
+
+## Notes
+
+1. Tests will skip inaccessible features (e.g., when database is not connected)
+2. Ensure Apache Cloudberry service is started and configured correctly
+3. Check database connection configuration in .env file
+
+## Using Scripts to Run
+
+You can use the provided script to run tests:
+```bash
+./run_tests.sh
+```
\ No newline at end of file
diff --git a/mcp-server/tests/test_cbmcp.py b/mcp-server/tests/test_cbmcp.py
new file mode 100644
index 00000000000..5560c1d84e6
--- /dev/null
+++ b/mcp-server/tests/test_cbmcp.py
@@ -0,0 +1,338 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+import pytest_asyncio
+import asyncio
+import json
+from typing import Any
+from pydantic import AnyUrl
+
+from cbmcp.client import CloudberryMCPClient
+
+
+class CustomJSONEncoder(json.JSONEncoder):
+    def default(self, obj: Any) -> Any:
+        if isinstance(obj, AnyUrl):
+            return str(obj)
+        return super().default(obj)
+
+
+@pytest.fixture
+def event_loop():
+    """Create event loop for async testing"""
+    loop = asyncio.get_event_loop_policy().new_event_loop()
+    yield loop
+    loop.close()
+
+
+@pytest_asyncio.fixture(params=["stdio", "http"])
+async def client(request):
+    """Create CloudberryMCPClient instance supporting stdio and http modes"""
+    client_instance = await CloudberryMCPClient.create(mode=request.param)
+    yield client_instance
+    await client_instance.close()
+
+
+@pytest.mark.asyncio
+class TestCloudberryMCPClient:
+    """Apache Cloudberry MCP client test class"""
+    
+    async def test_list_capabilities(self, client):
+        """Test server capabilities list"""
+        tools = await client.list_tools()
+        resources = await client.list_resources()
+        prompts = await client.list_prompts()
+        
+        assert tools is not None
+        assert resources is not None
+        assert prompts is not None
+        
+        assert isinstance(tools, list)
+        assert isinstance(resources, list)
+        assert isinstance(prompts, list)
+    
+    async def test_get_schemas_resource(self, client):
+        """Test getting database schemas resource"""
+        try:
+            schemas = await client.get_resource("postgres://schemas")
+            assert schemas is not None
+            assert isinstance(schemas, list)
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to get schemas: {e}")
+    
+    async def test_get_database_info_resource(self, client):
+        """Test getting database info resource"""
+        try:
+            db_infos = await client.get_resource("postgres://database/info")
+            assert db_infos is not None
+            assert isinstance(db_infos, list)
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to get database info: {e}")
+    
+    async def test_get_database_summary_resource(self, client):
+        """Test getting database summary resource"""
+        try:
+            db_summary = await client.get_resource("postgres://database/summary")
+            assert db_summary is not None
+            assert isinstance(db_summary, list)
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to get database summary: {e}")
+    
+    @pytest.mark.parametrize("tool_name,parameters", [
+        ("list_tables", {"schema": "public"}),
+        ("list_views", {"schema": "public"}),
+        ("list_columns", {"schema": "public", "table": "test"}),
+        ("list_indexes", {"schema": "public", "table": "test"}),
+        ("execute_query", {"query": "SELECT version()", "readonly": True}),
+        ("list_large_tables", {"limit": 5}),
+        ("get_table_stats", {"schema": "public", "table": "film"}),
+        ("explain_query", {"query": "SELECT version()"}),
+    ])
+    async def test_tools(self, client, tool_name, parameters):
+        """Test various tool calls"""
+        try:
+            result = await client.call_tool(tool_name, parameters)
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call tool {tool_name}: {e}")
+    
+    async def test_analyze_query_performance_prompt(self, client):
+        """Test query performance analysis prompt"""
+        try:
+            prompt = await client.get_prompt(
+                "analyze_query_performance",
+                params={
+                    "sql": "SELECT * FROM public.test",
+                    "explain": "public.test",
+                    "table_info": "100 rows, 10 MB"
+                }
+            )
+            assert prompt is not None
+            assert prompt.description is not None
+            assert isinstance(prompt.messages, list)
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to get analyze_query_performance prompt: {e}")
+    
+    async def test_suggest_indexes_prompt(self, client):
+        """Test index suggestion prompt"""
+        try:
+            prompt = await client.get_prompt(
+                "suggest_indexes",
+                params={
+                    "query": "public",
+                    "table_info": "public.test",
+                    "table_stats": "100 rows, 10 MB"
+                }
+            )
+            assert prompt is not None
+            assert prompt.description is not None
+            assert isinstance(prompt.messages, list)
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to get suggest_indexes prompt: {e}")
+    
+    async def test_database_health_check_prompt(self, client):
+        """Test database health check prompt"""
+        try:
+            prompt = await client.get_prompt("database_health_check")
+            assert prompt is not None
+            assert prompt.description is not None
+            assert isinstance(prompt.messages, list)
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to get database_health_check prompt: {e}")
+
+    # User and permission management tests
+    async def test_list_users(self, client):
+        """Test listing all users"""
+        try:
+            result = await client.call_tool("list_users", {})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_users tool: {e}")
+
+    async def test_list_user_permissions(self, client):
+        """Test listing user permissions"""
+        try:
+            result = await client.call_tool("list_user_permissions", {"username": "postgres"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_user_permissions tool: {e}")
+
+    async def test_list_table_privileges(self, client):
+        """Test listing table privileges"""
+        try:
+            result = await client.call_tool("list_table_privileges", {"schema": "public", "table": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_table_privileges tool: {e}")
+
+    # Constraint and relationship management tests
+    async def test_list_constraints(self, client):
+        """Test listing constraints"""
+        try:
+            result = await client.call_tool("list_constraints", {"schema": "public", "table": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_constraints tool: {e}")
+
+    async def test_list_foreign_keys(self, client):
+        """Test listing foreign keys"""
+        try:
+            result = await client.call_tool("list_foreign_keys", {"schema": "public", "table": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_foreign_keys tool: {e}")
+
+    async def test_list_referenced_tables(self, client):
+        """Test listing referenced tables"""
+        try:
+            result = await client.call_tool("list_referenced_tables", {"schema": "public", "table": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_referenced_tables tool: {e}")
+
+    # Performance monitoring and optimization tests
+    async def test_get_slow_queries(self, client):
+        """Test getting slow queries"""
+        try:
+            result = await client.call_tool("get_slow_queries", {"limit": 5})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_slow_queries tool: {e}")
+
+    async def test_get_index_usage(self, client):
+        """Test getting index usage"""
+        try:
+            result = await client.call_tool("get_index_usage", {"schema": "public"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_index_usage tool: {e}")
+
+    async def test_get_table_bloat_info(self, client):
+        """Test getting table bloat information"""
+        try:
+            result = await client.call_tool("get_table_bloat_info", {"schema": "public", "limit": 5})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_table_bloat_info tool: {e}")
+
+    async def test_get_database_activity(self, client):
+        """Test getting database activity"""
+        try:
+            result = await client.call_tool("get_database_activity", {})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_database_activity tool: {e}")
+
+    async def test_get_vacuum_info(self, client):
+        """Test getting vacuum information"""
+        try:
+            result = await client.call_tool("get_vacuum_info", {"schema": "public", "table": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_vacuum_info tool: {e}")
+
+    # Database object management tests
+    async def test_list_functions(self, client):
+        """Test listing functions"""
+        try:
+            result = await client.call_tool("list_functions", {"schema": "public"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_functions tool: {e}")
+
+    async def test_get_function_definition(self, client):
+        """Test getting function definition"""
+        try:
+            result = await client.call_tool("get_function_definition", {"schema": "public", "function_name": "now"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_function_definition tool: {e}")
+
+    async def test_list_triggers(self, client):
+        """Test listing triggers"""
+        try:
+            result = await client.call_tool("list_triggers", {"schema": "public", "table": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_triggers tool: {e}")
+
+    async def test_list_materialized_views(self, client):
+        """Test listing materialized views"""
+        try:
+            result = await client.call_tool("list_materialized_views", {"schema": "public"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_materialized_views tool: {e}")
+
+    async def test_get_materialized_view_definition(self, client):
+        """Test getting materialized view definition"""
+        try:
+            result = await client.call_tool("get_materialized_view_definition", {"schema": "public", "view_name": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_materialized_view_definition tool: {e}")
+
+    async def test_get_table_ddl(self, client):
+        """Test getting table DDL"""
+        try:
+            result = await client.call_tool("get_table_ddl", {"schema": "public", "table": "film"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call get_table_ddl tool: {e}")
+
+    async def test_list_active_connections(self, client):
+        """Test listing active connections"""
+        try:
+            result = await client.call_tool("list_active_connections", {})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping test - unable to call list_active_connections tool: {e}")
+
+
+@pytest.mark.asyncio
+async def test_client_modes():
+    """Test basic client functionality in different modes"""
+    for mode in ["stdio", "http"]:
+        client = await CloudberryMCPClient.create(mode=mode)
+        try:
+            # Basic connection test
+            tools = await client.list_tools()
+            assert isinstance(tools, list)
+        finally:
+            await client.close()
diff --git a/mcp-server/tests/test_database_tools.py b/mcp-server/tests/test_database_tools.py
new file mode 100644
index 00000000000..e0fcc644869
--- /dev/null
+++ b/mcp-server/tests/test_database_tools.py
@@ -0,0 +1,303 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Database tools test module
+Tests newly added database management tool functionality
+"""
+import pytest
+import pytest_asyncio
+import asyncio
+import json
+from typing import Any
+from pydantic import AnyUrl
+
+from cbmcp.client import CloudberryMCPClient
+
+
+class CustomJSONEncoder(json.JSONEncoder):
+    def default(self, obj: Any) -> Any:
+        if isinstance(obj, AnyUrl):
+            return str(obj)
+        return super().default(obj)
+
+
+@pytest.fixture
+def event_loop():
+    """Create event loop for async testing"""
+    loop = asyncio.get_event_loop_policy().new_event_loop()
+    yield loop
+    loop.close()
+
+
+@pytest_asyncio.fixture(params=["stdio", "http"])
+async def client(request):
+    """Create CloudberryMCPClient instance supporting stdio and http modes"""
+    client_instance = await CloudberryMCPClient.create(mode=request.param)
+    yield client_instance
+    await client_instance.close()
+
+
+@pytest.mark.asyncio
+class TestDatabaseTools:
+    """Database management tools test class"""
+    
+    # User and permission management tests
+    async def test_list_users_basic(self, client):
+        """Test basic user listing functionality"""
+        try:
+            result = await client.call_tool("list_users", {})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping user list test: {e}")
+
+    async def test_list_user_permissions(self, client):
+        """Test user permissions query"""
+        try:
+            result = await client.call_tool("list_user_permissions", {"username": "postgres"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping user permissions test: {e}")
+
+    async def test_list_table_privileges(self, client):
+        """Test table privileges query"""
+        try:
+            result = await client.call_tool("list_table_privileges", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping table privileges test: {e}")
+
+    # Constraint and relationship management tests
+    async def test_list_constraints(self, client):
+        """Test constraints query"""
+        try:
+            result = await client.call_tool("list_constraints", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping constraints query test: {e}")
+
+    async def test_list_foreign_keys(self, client):
+        """Test foreign keys query"""
+        try:
+            result = await client.call_tool("list_foreign_keys", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping foreign keys query test: {e}")
+
+    async def test_list_referenced_tables(self, client):
+        """Test referenced tables query"""
+        try:
+            result = await client.call_tool("list_referenced_tables", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping referenced tables query test: {e}")
+
+    # Performance monitoring and optimization tests
+    async def test_get_slow_queries(self, client):
+        """Test slow queries retrieval"""
+        result = await client.call_tool("get_slow_queries", {"limit": 5})
+        assert result is not None
+        assert hasattr(result, 'structured_content')
+
+    async def test_get_index_usage(self, client):
+        """Test index usage"""
+        try:
+            result = await client.call_tool("get_index_usage", {"schema": "public"})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping index usage test: {e}")
+
+    async def test_get_table_bloat_info(self, client):
+        """Test table bloat information"""
+        try:
+            result = await client.call_tool("get_table_bloat_info", {
+                "schema": "public", 
+                "limit": 5
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping table bloat info test: {e}")
+
+    async def test_get_database_activity(self, client):
+        """Test database activity monitoring"""
+        try:
+            result = await client.call_tool("get_database_activity", {})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping database activity test: {e}")
+
+    async def test_get_vacuum_info(self, client):
+        """Test vacuum information"""
+        try:
+            result = await client.call_tool("get_vacuum_info", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping vacuum info test: {e}")
+
+    # Database object management tests
+    async def test_list_functions(self, client):
+        """Test functions list"""
+        result = await client.call_tool("list_functions", {"schema": "public"})
+        assert result is not None
+        assert hasattr(result, 'structured_content')
+
+    async def test_get_function_definition(self, client):
+        """Test function definition retrieval"""
+        try:
+            result = await client.call_tool("get_function_definition", {
+                "schema": "public", 
+                "function_name": "now"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping function definition test: {e}")
+
+    async def test_list_triggers(self, client):
+        """Test triggers list"""
+        try:
+            result = await client.call_tool("list_triggers", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping triggers list test: {e}")
+
+    async def test_list_materialized_views(self, client):
+        """Test materialized views list"""
+        result = await client.call_tool("list_materialized_views", {"schema": "public"})
+        assert result is not None
+        assert hasattr(result, 'structured_content')
+
+    async def test_get_materialized_view_ddl(self, client):
+        """Test materialized view DDL"""
+        try:
+            result = await client.call_tool("get_materialized_view_ddl", {
+                "schema": "public", 
+                "view_name": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping materialized view DDL test: {e}")
+
+    async def test_get_table_ddl(self, client):
+        """Test table DDL retrieval"""
+        try:
+            result = await client.call_tool("get_table_ddl", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping table DDL test: {e}")
+
+    async def test_list_active_connections(self, client):
+        """Test active connections list"""
+        try:
+            result = await client.call_tool("list_active_connections", {})
+            assert result is not None
+            assert hasattr(result, 'structured_content')
+        except Exception as e:
+            pytest.skip(f"Skipping active connections test: {e}")
+
+    async def test_all_tools_availability(self, client):
+        """Test availability of all newly added tools"""
+        tools = await client.list_tools()
+        tool_names = [tool.name for tool in tools]
+        
+        new_tools = [
+            "list_users", "list_user_permissions", "list_table_privileges",
+            "list_constraints", "list_foreign_keys", "list_referenced_tables",
+            "get_slow_queries", "get_index_usage", "get_table_bloat_info",
+            "get_database_activity", "get_vacuum_info", "list_functions",
+            "get_function_definition", "list_triggers", "list_materialized_views",
+            "get_materialized_view_ddl", "get_table_ddl", "list_active_connections"
+        ]
+        
+        available_tools = [tool for tool in new_tools if tool in tool_names]
+        print(f"Found {len(available_tools)} new tools: {available_tools}")
+
+    async def test_tool_parameter_validation(self, client):
+        """Test tool parameter validation"""
+        try:
+            await client.call_tool("get_table_ddl", {"schema": "public"})
+        except Exception:
+            pass
+        
+        try:
+            result = await client.call_tool("get_table_ddl", {
+                "schema": "public", 
+                "table": "film"
+            })
+            assert result is not None
+        except Exception as e:
+            pytest.skip(f"Skipping DDL test: {e}")
+
+
+@pytest.mark.asyncio
+async def test_database_tools_comprehensive():
+    """Comprehensive test of all database tools"""
+    client = await CloudberryMCPClient.create()
+    try:
+        tools = await client.list_tools()
+        assert isinstance(tools, list)
+        
+        try:
+            users = await client.call_tool("list_users", {})
+            assert users is not None
+            
+            activity = await client.call_tool("get_database_activity", {})
+            assert activity is not None
+            
+            connections = await client.call_tool("list_active_connections", {})
+            assert connections is not None
+            
+        except Exception as e:
+            pytest.skip(f"Skipping comprehensive test: {e}")
+    finally:
+        await client.close()
diff --git a/pom.xml b/pom.xml
index df2ebe8693a..e171db66d74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,9 +131,7 @@ code or new licensing patterns.
 
             <exclude>gpcontrib/zstd/zstd_compression.c</exclude>
             <exclude>gpcontrib/zstd/Makefile</exclude>
-
-            <exclude>gpcontrib/quicklz/Makefile</exclude>
-
+            
             <exclude>gpcontrib/gp_toolkit/**</exclude>
 
             <exclude>gpcontrib/pg_hint_plan/**/*.source</exclude>
@@ -294,7 +292,7 @@ code or new licensing patterns.
             <exclude>gpMgmt/bin/gpsync</exclude>
             <exclude>gpMgmt/bin/gpssh-exkeys</exclude>
 
-            <exclude>gpMgmt/bin/generate-greenplum-path.sh</exclude>
+            <exclude>gpMgmt/bin/generate-cloudberry-env.sh</exclude>
             <exclude>gpMgmt/bin/ifaddrs/Makefile</exclude>
             <exclude>gpMgmt/bin/ifaddrs/main.c</exclude>
             <exclude>gpMgmt/Makefile</exclude>
@@ -558,8 +556,8 @@ code or new licensing patterns.
             <exclude>gpAux/client/install/src/windows/CreatePackage.bat</exclude>
             <exclude>gpAux/client/install/src/windows/CopyDependencies.bat</exclude>
             <exclude>gpAux/client/install/src/windows/license.rtf</exclude>
-            <exclude>gpAux/client/scripts/greenplum_clients_path.sh</exclude>
-            <exclude>gpAux/client/scripts/greenplum_clients_path.bat</exclude>
+            <exclude>gpAux/client/scripts/cloudberry_clients_path.sh</exclude>
+            <exclude>gpAux/client/scripts/cloudberry_clients_path.bat</exclude>
 
             <exclude>doc/**</exclude>
 
@@ -665,7 +663,6 @@ code or new licensing patterns.
             <exclude>src/tools/make_mkid</exclude>
             <exclude>src/tools/tidy</exclude>
             <exclude>src/tools/find_typedef</exclude>
-            <exclude>src/tools/hooks/pre-push</exclude>
             <exclude>src/tools/valgrind.supp</exclude>
             <exclude>src/tools/pgindent/perltidyrc</exclude>
             <exclude>src/tools/pgindent/README.gpdb</exclude>
@@ -999,6 +996,7 @@ code or new licensing patterns.
             <exclude>src/template/win32</exclude>
             <exclude>src/template/cygwin</exclude>
             <exclude>src/template/aix</exclude>
+            <exclude>src/backend/cdb/dispatcher/test/cdbdisp_query_test.c</exclude>
             <exclude>src/backend/cdb/cdbdistributedxid.c</exclude>
             <exclude>src/backend/cdb/test/cdbdistributedsnapshot_test.c</exclude>
             <exclude>src/backend/cdb/test/cdbbufferedread_test.c</exclude>
@@ -1242,7 +1240,6 @@ code or new licensing patterns.
             <exclude>aclocal.m4</exclude>
             <exclude>python-dependencies.txt</exclude>
 
-            
             <!-- Finally we exclude a few file types (based on
                  extension) for which comments are tough to
                  maintain. Note that this is a combination of files
@@ -1739,6 +1736,21 @@ code or new licensing patterns.
             <exclude>contrib/pax_storage/src/cpp/contrib/tabulate/.clang-format</exclude>
             <exclude>contrib/pax_storage/src/cpp/contrib/tabulate/.travis.yml</exclude>
 
+            <!-- Exclude python requirements files, since they are just a list of packages and do not support any comments
+            -->
+
+            <exclude>devops/deploy/docker/build/rocky8/tests/requirements.txt</exclude>
+            <exclude>devops/deploy/docker/build/rocky9/tests/requirements.txt</exclude>
+	    <exclude>devops/deploy/docker/build/ubuntu22.04/tests/requirements.txt</exclude>
+
+	    <!-- Exclude ubuntu debian packaging files since they do not support comments
+            -->
+            <exclude>devops/build/packaging/deb/ubuntu22.04/**</exclude>
+
+            <!-- Exclude the multinode hosts configuration file for Cloudberry sandbox
+            -->
+            <exclude>devops/sandbox/configs/multinode-gpinit-hosts</exclude>
+
           </excludes>
 
           <!--
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 8a195a39856..062ec75b039 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -230,8 +230,10 @@ enable_debug_extensions = @enable_debug_extensions@
 enable_orafce		= @enable_orafce@
 enable_mapreduce    = @enable_mapreduce@
 enable_shared_postgres_backend    = @enable_shared_postgres_backend@
+enable_link_postgres_with_shared  = @enable_link_postgres_with_shared@
 enable_gpcloud 	    = @enable_gpcloud@
 enable_ic_proxy     = @enable_ic_proxy@
+enable_ic_udp2      = @enable_ic_udp2@
 enable_pax          = @enable_pax@
 enable_tap_tests = @enable_tap_tests@
 
@@ -268,7 +270,6 @@ YAML_LIBS		= @YAML_LIBS@
 with_zstd 		= @with_zstd@
 ZSTD_CFLAGS		= @ZSTD_CFLAGS@
 ZSTD_LIBS		= @ZSTD_LIBS@
-with_quicklz		= @with_quicklz@
 EVENT_LIBS		= @EVENT_LIBS@
 
 ##########################################################################
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index b8cbc96b28b..50214226de6 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -130,7 +130,7 @@ ifeq ($(PORTNAME), darwin)
     DLSUFFIX		= .so
     LINK.shared		= $(COMPILER) -bundle -multiply_defined suppress
   endif
-  BUILD.exports		= $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
+  BUILD.exports		= $(AWK) '/^[^\043]/ {printf "_%s\n",$$1}' $< >$@
   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)
   ifneq (,$(exports_file))
     exported_symbols_list = -exported_symbols_list $(exports_file)
@@ -142,7 +142,7 @@ ifeq ($(PORTNAME), openbsd)
   ifdef soname
     LINK.shared		+= -Wl,-x,-soname,$(soname)
   endif
-  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
+  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\043]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)
   ifneq (,$(exports_file))
     LINK.shared		+= -Wl,--version-script=$(exports_file)
@@ -158,7 +158,7 @@ ifeq ($(PORTNAME), freebsd)
   ifdef soname
     LINK.shared		+= -Wl,-x,-soname,$(soname)
   endif
-  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
+  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\043]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)
   ifneq (,$(exports_file))
     LINK.shared		+= -Wl,--version-script=$(exports_file)
@@ -170,7 +170,7 @@ ifeq ($(PORTNAME), netbsd)
   ifdef soname
     LINK.shared		+= -Wl,-x,-soname,$(soname)
   endif
-  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
+  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\043]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)
   ifneq (,$(exports_file))
     LINK.shared		+= -Wl,--version-script=$(exports_file)
@@ -215,7 +215,7 @@ ifeq ($(PORTNAME), linux)
   ifdef soname
     LINK.shared		+= -Wl,-soname,$(soname)
   endif
-  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
+  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\043]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)
   ifneq (,$(exports_file))
     LINK.shared		+= -Wl,--version-script=$(exports_file)
diff --git a/src/backend/.gitignore b/src/backend/.gitignore
index fe1592c0599..051604e3cfb 100644
--- a/src/backend/.gitignore
+++ b/src/backend/.gitignore
@@ -2,3 +2,5 @@
 /postgres.def
 /postgres.imp
 /catalog-extension/
+/postgres_symbols.map
+/hide_symbols.list
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 5a41ad2f3b2..210adcccf84 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -80,19 +80,51 @@ ifneq ($(PORTNAME), cygwin)
 ifneq ($(PORTNAME), win32)
 ifneq ($(PORTNAME), aix)
 
+# Due to Cloudberry's MPP architecture, the postgres process needs to connect to
+# databases, some symbols from frontend are compiled to the postgres binary.
+# Some extensions requires frontend symbols and are dynamically linked to libpq.so.
+# However, some symbols are not safe to be exported both in the postgres binary
+# and libpq.so. E.g., some of the functions are using palloc()/pfree() to allocate
+# and free memory in backend codes while using malloc()/free() to allocate and free
+# memory in frontend codes. We use linker version script to make these symbols exported
+# in libpq.so and private in the postgres binary.
+# FIXME: Can we teach the postgres binary to dynamically link against libpq.so? So that
+# we don't need this hack.
+SAFELY_EXPORTED_SYMBOLS_PATTERN = "(pqsignal|pg_*)"
+SYMBOL_MAPPING_FLAGS =
+ifeq ($(PORTNAME), darwin)
+SYMBOL_MAP_FILE = hide_symbols.list
+$(SYMBOL_MAP_FILE): $(top_builddir)/src/interfaces/libpq/exports.txt
+	$(AWK) '/^[^\043]/ {printf "_%s\n",$$1}' $< | grep -v -E $(SAFELY_EXPORTED_SYMBOLS_PATTERN) >$@
+SYMBOL_MAPPING_FLAGS = -unexported_symbols_list $(SYMBOL_MAP_FILE)
+endif
+
+ifeq ($(PORTNAME), linux)
+SYMBOL_MAP_FILE = postgres_symbols.map
+$(SYMBOL_MAP_FILE): $(top_builddir)/src/interfaces/libpq/exports.txt
+	( echo '{ global: *; '; echo ' local:'; $(AWK) '/^[^\043]/ {printf "%s;\n",$$1}' $< | grep -v -E $(SAFELY_EXPORTED_SYMBOLS_PATTERN); echo '};' ) >$@
+SYMBOL_MAPPING_FLAGS = -Wl,--version-script=$(SYMBOL_MAP_FILE)
+endif
 ifeq ($(enable_shared_postgres_backend),yes)
-libpostgres.so: $(OBJS)
+all: libpostgres.so
+libpostgres.so: $(OBJS) $(SYMBOL_MAP_FILE)
 	$(CXX) -shared $(CXXFLAGS) $(LDFLAGS) $(LDFLAGS_SL) $(export_dynamic) \
-	  $(filter-out main/main.o, $(call expand_subsys,$^)) $(LIBS) -o $@
+	  $(filter-out main/main.o, $(call expand_subsys,$(OBJS))) $(LIBS) $(SYMBOL_MAPPING_FLAGS) -o $@
 
+# if enable-build-postgres-with-shared is yes, link postgres with shared library libpostgres.so
+ifeq ($(enable_link_postgres_with_shared),yes)
 postgres: main/main.o libpostgres.so $(top_builddir)/src/port/libpgport_srv.a $(top_builddir)/src/common/libpgcommon_srv.a
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) \
 	  main/main.o libpostgres.so $(top_builddir)/src/port/libpgport_srv.a \
 	  $(top_builddir)/src/common/libpgcommon_srv.a $(LIBS) -o $@
+else
+postgres: $(OBJS) $(SYMBOL_MAP_FILE)
+	$(CXX) $(CXXFLAGS) $(call expand_subsys,$(OBJS)) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) $(SYMBOL_MAPPING_FLAGS) -o $@
+endif
 
 else
-postgres: $(OBJS)
-	$(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) -o $@
+postgres: $(OBJS) $(SYMBOL_MAP_FILE)
+	$(CXX) $(CXXFLAGS) $(call expand_subsys,$(OBJS)) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) $(SYMBOL_MAPPING_FLAGS) -o $@
 endif
 
 endif
@@ -355,6 +387,10 @@ endif
 ifeq ($(PORTNAME), win32)
 	rm -f postgres.dll libpostgres.a $(WIN32RES)
 endif
+ifeq (,$(filter cygwin win32 aix,$(PORTNAME)))
+	rm -f postgres_symbols.map
+	rm -f hide_symbols.list
+endif
 
 distclean: clean
 	rm -f port/tas.s port/pg_sema.c port/pg_shmem.c
diff --git a/src/backend/access/aocs/aocsam.c b/src/backend/access/aocs/aocsam.c
index a3f2b597977..d5e3fd45e59 100644
--- a/src/backend/access/aocs/aocsam.c
+++ b/src/backend/access/aocs/aocsam.c
@@ -124,6 +124,11 @@ open_all_datumstreamread_segfiles(AOCSScanDesc scan, AOCSFileSegInfo *segInfo)
 
 		RelationOpenSmgr(rel);
 		open_datumstreamread_segfile(basepath, rel, segInfo, ds[attno], attno);
+
+		/* skip reading block for ANALYZE */
+		if ((scan->rs_base.rs_flags & SO_TYPE_ANALYZE) != 0)
+			continue;
+
 		datumstreamread_block(ds[attno], blockDirectory, attno);
 
 		AOCSScanDesc_UpdateTotalBytesRead(scan, attno);
@@ -467,6 +472,46 @@ close_cur_scan_seg(AOCSScanDesc scan)
 		AppendOnlyBlockDirectory_End_forInsert(scan->blockDirectory);
 }
 
+static void
+aocs_blkdirscan_init(AOCSScanDesc scan)
+{
+	if (scan->aocsfetch == NULL)
+	{
+		int natts = RelationGetNumberOfAttributes(scan->rs_base.rs_rd);
+		scan->proj = palloc(natts * sizeof(bool));
+		MemSet(scan->proj, true, natts * sizeof(bool));
+
+		scan->aocsfetch = aocs_fetch_init(scan->rs_base.rs_rd,
+										  scan->rs_base.rs_snapshot,
+										  scan->appendOnlyMetaDataSnapshot,
+										  scan->proj);
+	}
+
+	scan->blkdirscan = palloc0(sizeof(AOBlkDirScanData));
+	AOBlkDirScan_Init(scan->blkdirscan, &scan->aocsfetch->blockDirectory);
+}
+
+static void
+aocs_blkdirscan_finish(AOCSScanDesc scan)
+{
+	AOBlkDirScan_Finish(scan->blkdirscan);
+	pfree(scan->blkdirscan);
+	scan->blkdirscan = NULL;
+
+	if (scan->aocsfetch != NULL)
+	{
+		aocs_fetch_finish(scan->aocsfetch);
+		pfree(scan->aocsfetch);
+		scan->aocsfetch = NULL;
+	}
+
+	if (scan->proj != NULL)
+	{
+		pfree(scan->proj);
+		scan->proj = NULL;
+	}
+}
+
 /*
  * aocs_beginrangescan
  *
@@ -552,6 +597,7 @@ aocs_beginscan_internal(Relation relation,
 	AttrNumber		natts;
 	Oid				visimaprelid;
 	Oid				visimapidxid;
+	Oid				blkdirrelid;
 
 	scan = (AOCSScanDesc) palloc0(sizeof(AOCSScanDescData));
 	scan->rs_base.rs_rd = relation;
@@ -592,6 +638,12 @@ aocs_beginscan_internal(Relation relation,
 
 	scan->columnScanInfo.ds = NULL;
 
+	if ((flags & SO_TYPE_ANALYZE) != 0)
+	{
+		scan->segfirstrow = 0;
+		scan->targrow = 0;
+	}
+
 	GetAppendOnlyEntryAttributes(RelationGetRelid(relation),
 								 NULL,
 								 NULL,
@@ -599,16 +651,23 @@ aocs_beginscan_internal(Relation relation,
 								 NULL);
 
 	GetAppendOnlyEntryAuxOids(relation,
-							  NULL, NULL, NULL,
+							  NULL, &blkdirrelid, NULL,
 							  &visimaprelid, &visimapidxid);
 
 	if (scan->total_seg != 0)
+	{
 		AppendOnlyVisimap_Init(&scan->visibilityMap,
 							   visimaprelid,
 							   visimapidxid,
 							   AccessShareLock,
 							   appendOnlyMetaDataSnapshot);
 
+		if ((flags & SO_TYPE_ANALYZE) != 0 && OidIsValid(blkdirrelid))
+		{
+			aocs_blkdirscan_init(scan);
+		}
+	}
+
 	return scan;
 }
 
@@ -666,6 +725,9 @@ aocs_endscan(AOCSScanDesc scan)
 	if (scan->total_seg != 0)
 		AppendOnlyVisimap_Finish(&scan->visibilityMap, AccessShareLock);
 
+	if (scan->blkdirscan != NULL)
+		aocs_blkdirscan_finish(scan);
+
 	/* GPDB should backport this to upstream */
 	if (scan->rs_base.rs_flags & SO_TEMP_SNAPSHOT)
 		UnregisterSnapshot(scan->rs_base.rs_snapshot);
@@ -675,6 +737,402 @@ aocs_endscan(AOCSScanDesc scan)
 	pfree(scan);
 }
 
+static int
+aocs_locate_target_segment(AOCSScanDesc scan, int64 targrow)
+{
+	int64 rowcount;
+
+	for (int i = scan->cur_seg; i < scan->total_seg; i++)
+	{
+		if (i < 0)
+			continue;
+
+		rowcount = scan->seginfo[i]->total_tupcount;
+		if (rowcount <= 0)
+			continue;
+
+		if (scan->seginfo[i]->state == AOSEG_STATE_AWAITING_DROP)
+		{
+			/* skip this segment, it is awaiting drop */
+			continue;
+		}
+
+		if (scan->segfirstrow + rowcount - 1 >= targrow)
+		{
+			/* found the target segment */
+			return i;
+		}
+
+		/* continue next segment */
+		scan->segfirstrow += rowcount;
+		scan->segrowsprocessed = 0;
+	}
+
+	/* row is beyond the total number of rows in the relation */
+	return -1;
+}
+
+/*
+ * block directory based get_target_tuple()
+ */
+static bool
+aocs_blkdirscan_get_target_tuple(AOCSScanDesc scan, int64 targrow, TupleTableSlot *slot)
+{
+	int segno, segidx;
+	int64 rownum = -1;
+	int64 rowsprocessed;
+	AOTupleId aotid;
+	int ncols = scan->columnScanInfo.relationTupleDesc->natts;
+	AppendOnlyBlockDirectory *blkdir = &scan->aocsfetch->blockDirectory;
+
+	Assert(scan->blkdirscan != NULL);
+
+	/* locate the target segment */
+	segidx = aocs_locate_target_segment(scan, targrow);
+	if (segidx < 0)
+		return false;
+
+	/* next starting position in locating segfile */
+	scan->cur_seg = segidx;
+
+	segno = scan->seginfo[segidx]->segno;
+	Assert(segno > InvalidFileSegNumber && segno <= AOTupleId_MaxSegmentFileNum);
+
+	/*
+	 * Note: It is safe to assume that the scan's segfile array and the
+	 * blockdir's segfile array are identical. Otherwise, we should stop
+	 * processing and throw an exception to make the error visible.
+	 */
+	if (blkdir->segmentFileInfo[segidx]->segno != segno)
+	{
+		ereport(ERROR,
+				(errcode(ERRCODE_INTERNAL_ERROR),
+				 errmsg("segfile array contents in both scan descriptor "
+				 		"and block directory are not identical on "
+						"append-optimized relation '%s'",
+						RelationGetRelationName(blkdir->aoRel))));
+	}
+
+	/*
+	 * Unlike ao_row, we set currentSegmentFileNum for ao_column here
+	 * just for passing the assertion in extract_minipage() called by
+	 * AOBlkDirScan_GetRowNum().
+	 * Since we don't invoke AppendOnlyBlockDirectory_GetCachedEntry()
+	 * for ao_column, it shoule be restored back to the original value
+	 * for AppendOnlyBlockDirectory_GetEntry() working properly.
+	 */
+	int currentSegmentFileNum = blkdir->currentSegmentFileNum;
+	blkdir->currentSegmentFileNum = blkdir->segmentFileInfo[segidx]->segno;
+
+	/* locate the target row by seqscan block directory */
+	for (int col = 0; col < ncols; col++)
+	{
+		/*
+		 * "segfirstrow" should be always pointing to the first row of
+		 * a new segfile, only locate_target_segment could update
+		 * its value.
+		 * 
+		 * "segrowsprocessed" is used for tracking the position of
+		 * processed rows in the current segfile.
+		 */
+		rowsprocessed = scan->segfirstrow + scan->segrowsprocessed;
+
+		if ((scan->rs_base.rs_rd)->rd_att->attrs[col].attisdropped)
+			continue;
+
+		rownum = AOBlkDirScan_GetRowNum(scan->blkdirscan,
+										segno,
+										col,
+										targrow,
+										&rowsprocessed);
+
+		elog(DEBUG2, "AOBlkDirScan_GetRowNum(segno: %d, col: %d, targrow: %ld): "
+			 "[segfirstrow: %ld, segrowsprocessed: %ld, rownum: %ld, cached_mpentry_num: %d]",
+			 segno, col, targrow, scan->segfirstrow, scan->segrowsprocessed, rownum,
+			 blkdir->cached_mpentry_num);
+
+		if (rownum < 0)
+			continue;
+
+		scan->segrowsprocessed = rowsprocessed - scan->segfirstrow;
+
+		/*
+		 * Found a column represented in the block directory.
+		 * Here we just look for the 1st such column, no need
+		 * to read other columns within the same row.
+		 */
+		break;
+	}
+
+	/* restore to the original value as above mentioned */
+	blkdir->currentSegmentFileNum = currentSegmentFileNum;
+
+	if (rownum < 0)
+		return false;
+
+	/* form the target tuple TID */
+	AOTupleIdInit(&aotid, segno, rownum);
+
+	ExecClearTuple(slot);
+
+	/* fetch the target tuple */
+	if(!aocs_fetch(scan->aocsfetch, &aotid, slot))
+		return false;
+
+	/* OK to return this tuple */
+	ExecStoreVirtualTuple(slot);
+	pgstat_count_heap_fetch(scan->rs_base.rs_rd);
+
+	return true;
+}
+
+/*
+ * returns the segfile number in which `targrow` locates  
+ */
+static int
+aocs_getsegment(AOCSScanDesc scan, int64 targrow)
+{
+	int segno, segidx;
+
+	/* locate the target segment */
+	segidx = aocs_locate_target_segment(scan, targrow);
+	if (segidx < 0)
+	{
+		/* done reading all segments */
+		close_cur_scan_seg(scan);
+		scan->cur_seg = -1;
+		return -1;
+	}
+
+	segno = scan->seginfo[segidx]->segno;
+	Assert(segno > InvalidFileSegNumber && segno <= AOTupleId_MaxSegmentFileNum);
+
+	if (segidx > scan->cur_seg)
+	{
+		close_cur_scan_seg(scan);
+		/* adjust cur_seg to fit for open_next_scan_seg() */
+		scan->cur_seg = segidx - 1;
+		if (open_next_scan_seg(scan) >= 0)
+		{
+			/* new segment, make sure segrowsprocessed was reset */
+			Assert(scan->segrowsprocessed == 0);
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INTERNAL_ERROR),
+					 errmsg("Unexpected behavior, failed to open segno %d during scanning AOCO table %s",
+							segno, RelationGetRelationName(scan->rs_base.rs_rd))));
+		}
+	}
+	
+	return segno;
+}
+
+static inline int
+aocs_block_remaining_rows(DatumStreamRead *ds)
+{
+	return (ds->blockRowCount - ds->blockRowsProcessed);
+}
+
+/*
+ * fetches a single column value corresponding to `endrow` (equals to `targrow`)
+ */
+static bool
+aocs_gettuple_column(AOCSScanDesc scan, AttrNumber attno, int64 startrow, int64 endrow, bool chkvisimap, TupleTableSlot *slot)
+{
+	bool isSnapshotAny = (scan->rs_base.rs_snapshot == SnapshotAny);
+	DatumStreamRead *ds = scan->columnScanInfo.ds[attno];
+	int segno = scan->seginfo[scan->cur_seg]->segno;
+	AOTupleId aotid;
+	bool ret = true;
+	int64 rowstoprocess, nrows, rownum;
+	Datum *values;
+	bool *nulls;
+
+	if (ds->blockFirstRowNum <= 0)
+		elog(ERROR, "AOCO varblock->blockFirstRowNum should be greater than zero.");
+
+	Assert(segno > InvalidFileSegNumber && segno <= AOTupleId_MaxSegmentFileNum);
+	Assert(startrow <= endrow);
+
+	rowstoprocess = endrow - startrow + 1;
+	nrows = ds->blockRowsProcessed + rowstoprocess;
+	rownum = ds->blockFirstRowNum + nrows - 1;
+
+	/* form the target tuple TID */
+	AOTupleIdInit(&aotid, segno, rownum);
+
+	if (chkvisimap && !isSnapshotAny && !AppendOnlyVisimap_IsVisible(&scan->visibilityMap, &aotid))
+	{
+		if (slot != NULL)
+			ExecClearTuple(slot);
+		
+		ret = false;
+		/* must update tracking vars before return */
+		goto out;
+	}
+
+	/* rowNumInBlock = rowNum - blockFirstRowNum */
+	datumstreamread_find(ds, rownum - ds->blockFirstRowNum);
+
+	values = slot->tts_values;
+	nulls = slot->tts_isnull;
+
+	datumstreamread_get(ds, &(values[attno]), &(nulls[attno]));
+
+out:
+	/* update rows processed */
+	ds->blockRowsProcessed += rowstoprocess;
+
+	return ret;
+}
+
+/*
+ * fetches all columns of the target tuple corresponding to `targrow`
+ */
+static bool
+aocs_gettuple(AOCSScanDesc scan, int64 targrow, TupleTableSlot *slot)
+{
+	bool ret = true;
+	int64 rowcount = -1;
+	int64 rowstoprocess;
+	bool chkvisimap = true;
+
+	Assert(scan->cur_seg >= 0);
+	Assert(slot != NULL);
+
+	ExecClearTuple(slot);
+
+	rowstoprocess = targrow - scan->segfirstrow + 1;
+
+	/* read from scan->cur_seg */
+	for (AttrNumber i = 0; i < scan->columnScanInfo.num_proj_atts; i++)
+	{
+		AttrNumber attno = scan->columnScanInfo.proj_atts[i];
+		DatumStreamRead *ds = scan->columnScanInfo.ds[attno];
+		int64 startrow = scan->segfirstrow + scan->segrowsprocessed;
+
+		if (ds->blockRowCount <= 0)
+			; /* haven't read block */
+		else
+		{
+			/* block was read */
+			rowcount = aocs_block_remaining_rows(ds);
+			Assert(rowcount >= 0);
+
+			if (startrow + rowcount - 1 >= targrow)
+			{
+				if (!aocs_gettuple_column(scan, attno, startrow, targrow, chkvisimap, slot))
+				{
+					ret = false;
+					/* must update tracking vars before return */
+					goto out;
+				}
+
+				chkvisimap = false;
+				/* haven't finished scanning on current block */
+				continue;
+			}
+			else
+				startrow += rowcount; /* skip scanning remaining rows */
+		}
+
+		/*
+		 * Keep reading block headers until we find the block containing
+		 * the target row.
+		 */
+		while (true)
+		{
+			elog(DEBUG2, "aocs_gettuple(): [targrow: %ld, currow: %ld, diff: %ld, "
+				 "startrow: %ld, rowcount: %ld, segfirstrow: %ld, segrowsprocessed: %ld, nth: %d, "
+				 "blockRowCount: %d, blockRowsProcessed: %d]", targrow, startrow + rowcount - 1,
+				 startrow + rowcount - 1 - targrow, startrow, rowcount, scan->segfirstrow,
+				 scan->segrowsprocessed, datumstreamread_nth(ds), ds->blockRowCount,
+				 ds->blockRowsProcessed);
+
+			if (datumstreamread_block_info(ds))
+			{
+				rowcount = ds->blockRowCount;
+				Assert(rowcount > 0);
+
+				/* new block, reset blockRowsProcessed */
+				ds->blockRowsProcessed = 0;
+
+				if (startrow + rowcount - 1 >= targrow)
+				{
+					/* read a new buffer to consume */
+					datumstreamread_block_content(ds);
+
+					if (!aocs_gettuple_column(scan, attno, startrow, targrow, chkvisimap, slot))
+					{
+						ret = false;
+						/* must update tracking vars before return */
+						goto out;
+					}
+
+					chkvisimap = false;
+					/* done this column */
+					break;
+				}
+
+				startrow += rowcount;
+				AppendOnlyStorageRead_SkipCurrentBlock(&ds->ao_read);
+				/* continue next block */
+			}
+			else
+				pg_unreachable(); /* unreachable code */
+		}
+	}
+
+out:
+	/* update rows processed */
+	scan->segrowsprocessed = rowstoprocess;
+
+	if (ret)
+	{
+		ExecStoreVirtualTuple(slot);
+		pgstat_count_heap_getnext(scan->rs_base.rs_rd);
+	}
+
+	return ret;
+}
+
+/*
+ * Given a specific target row number 'targrow' (in the space of all row numbers
+ * physically present in the table, i.e. across all segfiles), scan and return
+ * the corresponding tuple in 'slot'.
+ *
+ * If the tuple is visible, return true. Otherwise, return false.
+ */
+bool
+aocs_get_target_tuple(AOCSScanDesc aoscan, int64 targrow, TupleTableSlot *slot)
+{
+	if (aoscan->columnScanInfo.relationTupleDesc == NULL)
+	{
+		aoscan->columnScanInfo.relationTupleDesc = slot->tts_tupleDescriptor;
+		/* Pin it! ... and of course release it upon destruction / rescan */
+		PinTupleDesc(aoscan->columnScanInfo.relationTupleDesc);
+		initscan_with_colinfo(aoscan);
+	}
+
+	if (aoscan->blkdirscan != NULL)
+		return aocs_blkdirscan_get_target_tuple(aoscan, targrow, slot);
+
+	if (aocs_getsegment(aoscan, targrow) < 0)
+	{
+		/* all done */
+		ExecClearTuple(slot);
+		return false;
+	}
+
+	/*
+	 * Unlike AO_ROW, AO_COLUMN may have different varblocks
+	 * for different columns, so we get per-column tuple directly
+	 * on the way of walking per-column varblock.
+	 */
+	return aocs_gettuple(aoscan, targrow, slot);
+}
 
 static pg_attribute_hot_inline bool
 aocs_getnext_noqual(AOCSScanDesc scan, ScanDirection direction, TupleTableSlot *slot)
@@ -689,6 +1147,9 @@ aocs_getnext_noqual(AOCSScanDesc scan, ScanDirection direction, TupleTableSlot *
 
 	Assert(ScanDirectionIsForward(direction));
 
+	/* should not be in ANALYZE - we use a different API */
+	Assert((scan->rs_base.rs_flags & SO_TYPE_ANALYZE) == 0);
+
 	if (scan->columnScanInfo.relationTupleDesc == NULL)
 	{
 		scan->columnScanInfo.relationTupleDesc = slot->tts_tupleDescriptor;
@@ -782,9 +1243,6 @@ aocs_getnext_noqual(AOCSScanDesc scan, ScanDirection direction, TupleTableSlot *
 					 * The tuple is invisible.
 					 * In `analyze`, we can simply return false
 					 */
-					if ((scan->rs_base.rs_flags & SO_TYPE_ANALYZE) != 0)
-						return false;
-
 					rowNum = INT64CONST(-1);
 					visible_pass = false;
 					continue; /* not break, need advance for other cols */
@@ -930,11 +1388,7 @@ aocs_getnext_withqual(AOCSScanDesc scan, ScanDirection direction, TupleTableSlot
 				{
 					/*
 					 * The tuple is invisible.
-					 * In `analyze`, we can simply return false
 					 */
-					if ((scan->rs_base.rs_flags & SO_TYPE_ANALYZE) != 0)
-						return false;
-
 					rowNum = INT64CONST(-1);
 					visible_pass = false;
 					continue; /* not break, need advance for other cols */
diff --git a/src/backend/access/aocs/aocsam_handler.c b/src/backend/access/aocs/aocsam_handler.c
index 504e9c0fb7a..c2faa538e10 100644
--- a/src/backend/access/aocs/aocsam_handler.c
+++ b/src/backend/access/aocs/aocsam_handler.c
@@ -47,6 +47,7 @@
 #include "utils/lsyscache.h"
 #include "utils/pg_rusage.h"
 #include "utils/guc.h"
+#include "utils/sampling.h"
 
 #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
 
@@ -269,7 +270,7 @@ remove_dml_state(const Oid relationOid)
  *
  * This function should be called exactly once per relation.
  */
-void
+static void
 aoco_dml_init(Relation relation, CmdType operation)
 {
 	init_aoco_dml_states();
@@ -279,7 +280,7 @@ aoco_dml_init(Relation relation, CmdType operation)
 /*
  * This function should be called exactly once per relation.
  */
-void
+static void
 aoco_dml_finish(Relation relation, CmdType operation)
 {
 	AOCODMLState *state;
@@ -1623,10 +1624,13 @@ static bool
 aoco_scan_analyze_next_block(TableScanDesc scan, BlockNumber blockno,
                                    BufferAccessStrategy bstrategy)
 {
-	AOCSScanDesc aoscan = (AOCSScanDesc) scan;
-	aoscan->targetTupleId = blockno;
-
-	return true;
+	/*
+	 * For append-optimized relations, we use a separate sampling
+	 * method. See table_relation_acquire_sample_rows().
+	 */
+	ereport(ERROR,
+			(errcode(ERRCODE_INTERNAL_ERROR),
+			 errmsg("API not supported for appendoptimized relations")));
 }
 
 static bool
@@ -1634,28 +1638,78 @@ aoco_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin,
                                    double *liverows, double *deadrows,
                                    TupleTableSlot *slot)
 {
-	AOCSScanDesc aoscan = (AOCSScanDesc) scan;
-	bool		ret = false;
+	/*
+	 * For append-optimized relations, we use a separate sampling
+	 * method. See table_relation_acquire_sample_rows().
+	 */
+	ereport(ERROR,
+			(errcode(ERRCODE_INTERNAL_ERROR),
+			 errmsg("API not supported for appendoptimized relations")));
+}
 
-	/* skip several tuples if they are not sampling target */
-	while (aoscan->targetTupleId > aoscan->nextTupleId)
-	{
-		aoco_getnextslot(scan, ForwardScanDirection, slot);
-		aoscan->nextTupleId++;
-	}
+static int
+aoco_acquire_sample_rows(Relation onerel, int elevel, HeapTuple *rows,
+						 int targrows, double *totalrows, double *totaldeadrows)
+{
+	int		numrows = 0;	/* # rows now in reservoir */
+	double	liverows = 0;	/* # live rows seen */
+	double	deadrows = 0;	/* # dead rows seen */
+
+	Assert(targrows > 0);
+
+	TableScanDesc scan = table_beginscan_analyze(onerel);
+	TupleTableSlot *slot = table_slot_create(onerel, NULL);
+	AOCSScanDesc aocoscan = (AOCSScanDesc) scan;
+
+	int64 totaltupcount = AOCSScanDesc_TotalTupCount(aocoscan);
+	int64 totaldeadtupcount = 0;
+	if (aocoscan->total_seg > 0 )
+		totaldeadtupcount = AppendOnlyVisimap_GetRelationHiddenTupleCount(&aocoscan->visibilityMap);
+	/*
+     * The conversion from int64 to double (53 significant bits) is safe as the
+	 * AOTupleId is 48bits, the max value of totalrows is never greater than
+	 * AOTupleId_MaxSegmentFileNum * AOTupleId_MaxRowNum (< 48 significant bits).
+	 */
+	*totalrows = (double) (totaltupcount - totaldeadtupcount);
+	*totaldeadrows = (double) totaldeadtupcount;
+
+	/* Prepare for sampling tuple numbers */
+	RowSamplerData rs;
+	RowSampler_Init(&rs, *totalrows, targrows, random());
 
-	if (aoscan->targetTupleId == aoscan->nextTupleId)
+	while (RowSampler_HasMore(&rs))
 	{
-		ret = aoco_getnextslot(scan, ForwardScanDirection, slot);
-		aoscan->nextTupleId++;
+		aocoscan->targrow = RowSampler_Next(&rs);
+
+		vacuum_delay_point();
 
-		if (ret)
-			*liverows += 1;
+		if (aocs_get_target_tuple(aocoscan, aocoscan->targrow, slot))
+		{
+			rows[numrows++] = ExecCopySlotHeapTuple(slot);
+			liverows++;
+		}
 		else
-			*deadrows += 1; /* if return an invisible tuple */
+			deadrows++;
+		
+		ExecClearTuple(slot);
 	}
 
-	return ret;
+	ExecDropSingleTupleTableSlot(slot);
+	table_endscan(scan);
+
+	/*
+	 * Emit some interesting relation info
+	 */
+	ereport(elevel,
+			(errmsg("\"%s\": scanned " INT64_FORMAT " rows, "
+					"containing %.0f live rows and %.0f dead rows; "
+					"%d rows in sample, %.0f accurate total live rows, "
+					"%.f accurate total dead rows",
+					RelationGetRelationName(onerel),
+					rs.m, liverows, deadrows, numrows,
+					*totalrows, *totaldeadrows)));
+
+	return numrows;
 }
 
 static double
@@ -2588,6 +2642,7 @@ static TableAmRoutine ao_column_methods = {
 	.relation_vacuum = aoco_vacuum_rel,
 	.scan_analyze_next_block = aoco_scan_analyze_next_block,
 	.scan_analyze_next_tuple = aoco_scan_analyze_next_tuple,
+	.relation_acquire_sample_rows = aoco_acquire_sample_rows,
 	.index_build_range_scan = aoco_index_build_range_scan,
 	.index_validate_scan = aoco_index_validate_scan,
 
@@ -2602,8 +2657,9 @@ static TableAmRoutine ao_column_methods = {
 	.scan_bitmap_next_tuple = aoco_scan_bitmap_next_tuple,
 	.scan_sample_next_block = aoco_scan_sample_next_block,
 	.scan_sample_next_tuple = aoco_scan_sample_next_tuple,
-	.acquire_sample_rows = acquire_sample_rows,
 
+	.dml_init = aoco_dml_init,
+	.dml_fini = aoco_dml_finish,
 	.amoptions = ao_amoptions,
 	.swap_relation_files = aoco_swap_relation_files,
 	.validate_column_encoding_clauses = aoco_validate_column_encoding_clauses,
diff --git a/src/backend/access/appendonly/appendonlyam.c b/src/backend/access/appendonly/appendonlyam.c
index 2f590a8678e..b5f6a17a597 100755
--- a/src/backend/access/appendonly/appendonlyam.c
+++ b/src/backend/access/appendonly/appendonlyam.c
@@ -1118,6 +1118,311 @@ getNextBlock(AppendOnlyScanDesc scan)
 	return true;
 }
 
+static int
+appendonly_locate_target_segment(AppendOnlyScanDesc scan, int64 targrow)
+{
+	int64 rowcount;
+
+	for (int i = scan->aos_segfiles_processed - 1; i < scan->aos_total_segfiles; i++)
+	{
+		if (i < 0)
+			continue;
+
+		rowcount = scan->aos_segfile_arr[i]->total_tupcount;
+		if (rowcount <= 0)
+			continue;
+
+		if (scan->aos_segfile_arr[i]->state == AOSEG_STATE_AWAITING_DROP)
+		{
+			/* skip this segment, it is awaiting drop */
+			continue;
+		}
+
+		if (scan->segfirstrow + rowcount - 1 >= targrow)
+		{
+			/* found the target segment */
+			return i;
+		}
+
+		/* continue next segment */
+		scan->segfirstrow += rowcount;
+		scan->segrowsprocessed = 0;
+	}
+
+	/* row is beyond the total number of rows in the relation */
+	return -1;
+}
+
+/*
+ * returns the segfile number in which `targrow` locates  
+ */
+static int
+appendonly_getsegment(AppendOnlyScanDesc scan, int64 targrow)
+{
+	int segidx, segno;
+
+	/* locate the target segment */
+	segidx = appendonly_locate_target_segment(scan, targrow);
+	if (segidx < 0)
+	{
+		CloseScannedFileSeg(scan);
+
+		/* done reading all segfiles */
+		Assert(scan->aos_done_all_segfiles);
+
+		return -1;
+	}
+
+	if (segidx + 1 > scan->aos_segfiles_processed)
+	{
+		/* done current segfile */
+		CloseScannedFileSeg(scan);
+		/*
+		 * Adjust aos_segfiles_processed to guide
+		 * SetNextFileSegForRead() opening next
+		 * right segfile.
+		 */
+		scan->aos_segfiles_processed = segidx;
+	}
+
+	segno = scan->aos_segfile_arr[segidx]->segno;
+	Assert(segno > InvalidFileSegNumber && segno <= AOTupleId_MaxSegmentFileNum);
+
+	if (scan->aos_need_new_segfile)
+	{
+		if (SetNextFileSegForRead(scan))
+		{
+			Assert(scan->segrowsprocessed == 0);
+			scan->needNextBuffer = true;
+		}
+		else
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_INTERNAL_ERROR),
+					 errmsg("Unexpected behavior, failed to open segno %d during scanning AO table %s",
+							segno, RelationGetRelationName(scan->aos_rd))));
+		}
+	}
+
+	return segno;
+}
+
+static inline int64
+appendonly_block_remaining_rows(AppendOnlyScanDesc scan)
+{
+	return (scan->executorReadBlock.rowCount - scan->executorReadBlock.blockRowsProcessed);
+}
+
+/*
+ * locates the block in which `targrow` exists
+ */
+static void
+appendonly_getblock(AppendOnlyScanDesc scan, int64 targrow, int64 *startrow)
+{
+	AppendOnlyExecutorReadBlock *varblock = &scan->executorReadBlock;
+	int64 rowcount = -1;
+
+	if (!scan->needNextBuffer)
+	{
+		/* we have a current block */
+		rowcount = appendonly_block_remaining_rows(scan);
+		Assert(rowcount >= 0);
+
+		if (*startrow + rowcount - 1 >= targrow)
+		{
+			/* row lies in current block, nothing to do */
+			return;
+		}
+		else
+		{
+			/* skip scanning remaining rows */
+			*startrow += rowcount;
+			scan->needNextBuffer = true;
+		}
+	}
+
+	/*
+	 * Keep reading block headers until we find the block containing
+	 * the target row.
+	 */
+	while (true)
+	{
+		elog(DEBUG2, "appendonly_getblock(): [targrow: %ld, currow: %ld, diff: %ld, "
+			 "startrow: %ld, rowcount: %ld, segfirstrow: %ld, segrowsprocessed: %ld, "
+			 "blockRowsProcessed: %ld, blockRowCount: %d]", targrow, *startrow + rowcount - 1,
+			 *startrow + rowcount - 1 - targrow, *startrow, rowcount, scan->segfirstrow,
+			 scan->segrowsprocessed, varblock->blockRowsProcessed,
+			 varblock->rowCount);
+
+		if (AppendOnlyExecutorReadBlock_GetBlockInfo(&scan->storageRead, varblock))
+		{
+			/* new block, reset blockRowsProcessed */
+			varblock->blockRowsProcessed = 0;
+			rowcount = appendonly_block_remaining_rows(scan);
+			Assert(rowcount > 0);
+			if (*startrow + rowcount - 1 >= targrow)
+			{
+				AppendOnlyExecutorReadBlock_GetContents(varblock);
+				/* got a new buffer to consume */
+				scan->needNextBuffer = false;
+				return;
+			}
+
+			*startrow += rowcount;
+			AppendOnlyExecutionReadBlock_FinishedScanBlock(varblock);
+			AppendOnlyStorageRead_SkipCurrentBlock(&scan->storageRead);
+			/* continue next block */
+		}
+		else
+			pg_unreachable(); /* unreachable code */
+	}
+}
+
+/*
+ * block directory based get_target_tuple()
+ */
+static bool
+appendonly_blkdirscan_get_target_tuple(AppendOnlyScanDesc scan, int64 targrow, TupleTableSlot *slot)
+{
+	int segno, segidx;
+	int64 rownum, rowsprocessed;
+	AOTupleId aotid;
+	AppendOnlyBlockDirectory *blkdir = &scan->aofetch->blockDirectory;
+
+	Assert(scan->blkdirscan != NULL);
+
+	/* locate the target segment */
+	segidx = appendonly_locate_target_segment(scan, targrow);
+	if (segidx < 0)
+		return false;
+
+	scan->aos_segfiles_processed = segidx + 1;
+
+	segno = scan->aos_segfile_arr[segidx]->segno;
+	Assert(segno > InvalidFileSegNumber && segno <= AOTupleId_MaxSegmentFileNum);
+
+	/*
+	 * Note: It is safe to assume that the scan's segfile array and the
+	 * blockdir's segfile array are identical. Otherwise, we should stop
+	 * processing and throw an exception to make the error visible.
+	 */
+	if (blkdir->segmentFileInfo[segidx]->segno != segno)
+	{
+		ereport(ERROR,
+				(errcode(ERRCODE_INTERNAL_ERROR),
+				 errmsg("segfile array contents in both scan descriptor "
+				 		"and block directory are not identical on "
+						"append-optimized relation '%s'",
+						RelationGetRelationName(blkdir->aoRel))));
+	}
+
+	/*
+	 * Set the current segfile info in the blkdir struct, so we can
+	 * reuse the (cached) block directory entry during the tuple fetch
+	 * operation below. See AppendOnlyBlockDirectory_GetCachedEntry().
+	 */
+	blkdir->currentSegmentFileNum = blkdir->segmentFileInfo[segidx]->segno;
+	blkdir->currentSegmentFileInfo = blkdir->segmentFileInfo[segidx];
+
+	/*
+	 * "segfirstrow" should be always pointing to the first row of
+	 * a new segfile in blkdir based ANALYZE, only locate_target_segment
+	 * could update its value.
+	 * 
+	 * "segrowsprocessed" is used for tracking the position of
+	 * processed rows in the current segfile.
+	 */
+	rowsprocessed = scan->segfirstrow + scan->segrowsprocessed;
+	/* locate the target row by seqscan block directory */
+	rownum = AOBlkDirScan_GetRowNum(scan->blkdirscan,
+									segno,
+									0,
+									targrow,
+									&rowsprocessed);
+
+	elog(DEBUG2, "AOBlkDirScan_GetRowNum(segno: %d, col: %d, targrow: %ld): "
+		 "[segfirstrow: %ld, segrowsprocessed: %ld, rownum: %ld, cached_mpentry_num: %d]",
+		 segno, 0, targrow, scan->segfirstrow, scan->segrowsprocessed, rownum,
+		 blkdir->cached_mpentry_num);
+	
+	if (rownum < 0)
+		return false;
+
+	scan->segrowsprocessed = rowsprocessed - scan->segfirstrow;
+
+	/* form the target tuple TID */
+	AOTupleIdInit(&aotid, segno, rownum);
+
+	/* ensure the target minipage entry was stored in fetch descriptor */
+	Assert(blkdir->cached_mpentry_num != InvalidEntryNum);
+	Assert(blkdir->minipages == &blkdir->minipages[0]);
+
+	/* fetch the target tuple */
+	if(!appendonly_fetch(scan->aofetch, &aotid, slot))
+		return false;
+
+	/* OK to return this tuple */
+	pgstat_count_heap_fetch(scan->aos_rd);
+
+	return true;
+}
+
+/*
+ * Given a specific target row number 'targrow' (in the space of all row numbers
+ * physically present in the table, i.e. across all segfiles), scan and return
+ * the corresponding tuple in 'slot'.
+ *
+ * If the tuple is visible, return true. Otherwise, return false.
+ */
+bool
+appendonly_get_target_tuple(AppendOnlyScanDesc aoscan, int64 targrow, TupleTableSlot *slot)
+{
+	AppendOnlyExecutorReadBlock *varblock = &aoscan->executorReadBlock;
+	bool visible;
+	int64 rowsprocessed, rownum;
+	int segno;
+	AOTupleId aotid;
+
+	if (aoscan->blkdirscan != NULL)
+		return appendonly_blkdirscan_get_target_tuple(aoscan, targrow, slot);
+
+	segno = appendonly_getsegment(aoscan, targrow);
+	if (segno < 0)
+		return false;
+
+	rowsprocessed = aoscan->segfirstrow + aoscan->segrowsprocessed;
+
+	appendonly_getblock(aoscan, targrow, &rowsprocessed);
+
+	aoscan->segrowsprocessed = rowsprocessed - aoscan->segfirstrow;
+
+	Assert(rowsprocessed + varblock->rowCount - 1 >= targrow);
+	rownum = varblock->blockFirstRowNum + (targrow - rowsprocessed);
+
+	elog(DEBUG2, "appendonly_getblock() returns: [segno: %d, rownum: %ld]", segno, rownum);
+
+	/* form the target tuple TID */
+	AOTupleIdInit(&aotid, segno, rownum);
+
+	visible = (aoscan->snapshot == SnapshotAny ||
+			   AppendOnlyVisimap_IsVisible(&aoscan->visibilityMap, &aotid));
+
+	if (visible && AppendOnlyExecutorReadBlock_FetchTuple(varblock, rownum, 0, NULL, slot))
+	{
+		/* OK to return this tuple */
+		pgstat_count_heap_fetch(aoscan->aos_rd);
+	}
+	else
+	{
+		if (slot != NULL)
+			ExecClearTuple(slot);
+		
+		return false;
+	}
+
+	return true;
+}
+
 /* ----------------
  *		appendonlygettup - fetch next appendonly tuple
  *
@@ -1138,6 +1443,8 @@ appendonlygettup(AppendOnlyScanDesc scan,
 				 TupleTableSlot *slot)
 {
 	Assert(ScanDirectionIsForward(dir));
+	/* should not be in ANALYZE - we use a different API */
+	Assert((scan->rs_base.rs_flags & SO_TYPE_ANALYZE) == 0);
 	Assert(scan->usableBlockSize > 0);
 
 	bool		isSnapshotAny = (scan->snapshot == SnapshotAny);
@@ -1178,12 +1485,7 @@ appendonlygettup(AppendOnlyScanDesc scan,
 
 			if (!isSnapshotAny && !AppendOnlyVisimap_IsVisible(&scan->visibilityMap, aoTupleId))
 			{
-				/*
-				 * The tuple is invisible.
-				 * In `analyze`, we can simply return false
-				 */
-				if ((scan->rs_base.rs_flags & SO_TYPE_ANALYZE) != 0)
-					return false;
+				/* The tuple is invisible */
 			}
 			else
 			{
@@ -1310,6 +1612,34 @@ finishWriteBlock(AppendOnlyInsertDesc aoInsertDesc)
 	Assert(!AppendOnlyStorageWrite_IsBufferAllocated(&aoInsertDesc->storageWrite));
 }
 
+static void
+appendonly_blkdirscan_init(AppendOnlyScanDesc scan)
+{
+	if (scan->aofetch == NULL)
+		scan->aofetch = appendonly_fetch_init(scan->aos_rd,
+											  scan->snapshot,
+											  scan->appendOnlyMetaDataSnapshot);
+
+	scan->blkdirscan = palloc0(sizeof(AOBlkDirScanData));
+	AOBlkDirScan_Init(scan->blkdirscan, &scan->aofetch->blockDirectory);
+}
+
+static void
+appendonly_blkdirscan_finish(AppendOnlyScanDesc scan)
+{
+	AOBlkDirScan_Finish(scan->blkdirscan);
+	pfree(scan->blkdirscan);
+	scan->blkdirscan = NULL;
+
+	if (scan->aofetch != NULL)
+	{
+		appendonly_fetch_finish(scan->aofetch);
+		pfree(scan->aofetch);
+		scan->aofetch = NULL;
+	}
+}
+
+
 /* ----------------------------------------------------------------
  *					 append-only access method interface
  * ----------------------------------------------------------------
@@ -1431,19 +1761,33 @@ appendonly_beginrangescan_internal(Relation relation,
 
 	scan->blockDirectory = NULL;
 
+	if ((flags & SO_TYPE_ANALYZE) != 0)
+	{
+		scan->segrowsprocessed = 0;
+		scan->segfirstrow = 0;
+		scan->targrow = 0;
+	}
+
 	if (segfile_count > 0)
 	{
 		Oid			visimaprelid;
 		Oid			visimapidxid;
+		Oid			blkdirrelid;
 
 		GetAppendOnlyEntryAuxOids(relation,
-								  NULL, NULL, NULL, &visimaprelid, &visimapidxid);
+								  NULL, &blkdirrelid, NULL, &visimaprelid, &visimapidxid);
 
 		AppendOnlyVisimap_Init(&scan->visibilityMap,
 							   visimaprelid,
 							   visimapidxid,
 							   AccessShareLock,
 							   appendOnlyMetaDataSnapshot);
+
+		if ((flags & SO_TYPE_ANALYZE) != 0)
+		{
+			if (OidIsValid(blkdirrelid))
+				appendonly_blkdirscan_init(scan);
+		}
 	}
 
 	scan->totalBytesRead = 0;
@@ -1519,7 +1863,7 @@ appendonly_beginscan(Relation relation,
 	 */
 	seginfo = GetAllFileSegInfo(relation,
 								appendOnlyMetaDataSnapshot, &segfile_count, NULL);
-
+	
 	aoscan = appendonly_beginrangescan_internal(relation,
 												snapshot,
 												appendOnlyMetaDataSnapshot,
@@ -1614,6 +1958,9 @@ appendonly_endscan(TableScanDesc scan)
 	if (aoscan->aos_total_segfiles > 0)
 		AppendOnlyVisimap_Finish(&aoscan->visibilityMap, AccessShareLock);
 
+	if (aoscan->blkdirscan != NULL)
+		appendonly_blkdirscan_finish(aoscan);
+
 	if (aoscan->aofetch)
 	{
 		appendonly_fetch_finish(aoscan->aofetch);
diff --git a/src/backend/access/appendonly/appendonlyam_handler.c b/src/backend/access/appendonly/appendonlyam_handler.c
index 0136d4a850f..715cebd7579 100644
--- a/src/backend/access/appendonly/appendonlyam_handler.c
+++ b/src/backend/access/appendonly/appendonlyam_handler.c
@@ -46,6 +46,7 @@
 #include "utils/lsyscache.h"
 #include "utils/pg_rusage.h"
 #include "utils/guc.h"
+#include "utils/sampling.h"
 
 #define IS_BTREE(r) ((r)->rd_rel->relam == BTREE_AM_OID)
 
@@ -227,7 +228,7 @@ remove_dml_state(const Oid relationOid)
  *
  * This function should be called exactly once per relation.
  */
-void
+static void
 appendonly_dml_init(Relation relation, CmdType operation)
 {
 	init_appendonly_dml_states();
@@ -237,7 +238,7 @@ appendonly_dml_init(Relation relation, CmdType operation)
 /*
  * This function should be called exactly once per relation.
  */
-void
+static void
 appendonly_dml_finish(Relation relation, CmdType operation)
 {
 	AppendOnlyDMLState *state;
@@ -1492,10 +1493,13 @@ static bool
 appendonly_scan_analyze_next_block(TableScanDesc scan, BlockNumber blockno,
 							   BufferAccessStrategy bstrategy)
 {
-	AppendOnlyScanDesc aoscan = (AppendOnlyScanDesc) scan;
-	aoscan->targetTupleId = blockno;
-
-	return true;
+	/*
+	 * For append-optimized relations, we use a separate sampling
+	 * method. See table_relation_acquire_sample_rows().
+	 */
+	ereport(ERROR,
+			(errcode(ERRCODE_INTERNAL_ERROR),
+			 errmsg("API not supported for appendoptimized relations")));
 }
 
 static bool
@@ -1503,30 +1507,91 @@ appendonly_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin,
 							   double *liverows, double *deadrows,
 							   TupleTableSlot *slot)
 {
+	/*
+	 * For append-optimized relations, we use a separate sampling
+	 * method. See table_relation_acquire_sample_rows().
+	 */
+	ereport(ERROR,
+			(errcode(ERRCODE_INTERNAL_ERROR),
+			 errmsg("API not supported for appendoptimized relations")));
+}
+
+/*
+ * Implementation of relation_acquire_sample_rows().
+ *
+ * As opposed to upstream's method of 2-stage sampling, here we can simply use
+ * Knuth's S algorithm (TAOCP Part 2 Section 3.4.2) as we clearly know N - the
+ * population size up front (i.e the total number of rows in the relation)
+ *
+ * Although an estimate is demanded for the total live rows and total dead rows
+ * in the table, we can actually return their exact values from aux table metadata.
+ *
+ * We intrinsically return rows in physical order, since the rows sampled by
+ * Algorithm S are in physical order.
+ */
+static int
+appendonly_acquire_sample_rows(Relation onerel, int elevel, HeapTuple *rows,
+							   int targrows, double *totalrows, double *totaldeadrows)
+{
+	int		numrows = 0;	/* # number of rows sampled */
+	double	liverows = 0;	/* # live rows seen */
+	double	deadrows = 0;	/* # dead rows seen */
+
+	Assert(targrows > 0);
+
+	TableScanDesc scan = table_beginscan_analyze(onerel);
+	TupleTableSlot *slot = table_slot_create(onerel, NULL);
 	AppendOnlyScanDesc aoscan = (AppendOnlyScanDesc) scan;
-	bool		ret = false;
 
-	/* skip several tuples if they are not sampling target */
-	while (!aoscan->aos_done_all_segfiles
-		   && aoscan->targetTupleId > aoscan->nextTupleId)
-	{
-		appendonly_getnextslot(scan, ForwardScanDirection, slot);
-		aoscan->nextTupleId++;
-	}
+	int64 totaltupcount = AppendOnlyScanDesc_TotalTupCount(aoscan);
+	int64 totaldeadtupcount = 0;
+	if (aoscan->aos_total_segfiles > 0 )
+		totaldeadtupcount = AppendOnlyVisimap_GetRelationHiddenTupleCount(&aoscan->visibilityMap);
+	/*
+     * The conversion from int64 to double (53 significant bits) is safe as the
+	 * AOTupleId is 48bits, the max value of totalrows is never greater than
+	 * AOTupleId_MaxSegmentFileNum * AOTupleId_MaxRowNum (< 48 significant bits).
+	 */
+	*totalrows = (double) (totaltupcount - totaldeadtupcount);
+	*totaldeadrows = (double) totaldeadtupcount;
 
-	if (!aoscan->aos_done_all_segfiles
-		&& aoscan->targetTupleId == aoscan->nextTupleId)
+	/* Prepare for sampling row numbers */
+	RowSamplerData rs;
+	RowSampler_Init(&rs, *totalrows, targrows, random());
+
+	while (RowSampler_HasMore(&rs))
 	{
-		ret = appendonly_getnextslot(scan, ForwardScanDirection, slot);
-		aoscan->nextTupleId++;
+		aoscan->targrow = RowSampler_Next(&rs);
 
-		if (ret)
-			*liverows += 1;
+		vacuum_delay_point();
+
+		if (appendonly_get_target_tuple(aoscan, aoscan->targrow, slot))
+		{
+			rows[numrows++] = ExecCopySlotHeapTuple(slot);
+			liverows++;
+		}
 		else
-			*deadrows += 1; /* if return an invisible tuple */
+			deadrows++;
+
+		ExecClearTuple(slot);
 	}
 
-	return ret;
+	ExecDropSingleTupleTableSlot(slot);
+	table_endscan(scan);
+
+	/*
+	 * Emit some interesting relation info
+	 */
+	ereport(elevel,
+			(errmsg("\"%s\": scanned " INT64_FORMAT " rows, "
+					"containing %.0f live rows and %.0f dead rows; "
+					"%d rows in sample, %.0f total live rows, "
+					"%.f total dead rows",
+					RelationGetRelationName(onerel),
+					rs.m, liverows, deadrows, numrows,
+					*totalrows, *totaldeadrows)));
+
+	return numrows;
 }
 
 static double
@@ -2278,6 +2343,7 @@ static const TableAmRoutine ao_row_methods = {
 	.relation_vacuum = appendonly_vacuum_rel,
 	.scan_analyze_next_block = appendonly_scan_analyze_next_block,
 	.scan_analyze_next_tuple = appendonly_scan_analyze_next_tuple,
+	.relation_acquire_sample_rows = appendonly_acquire_sample_rows,
 	.index_build_range_scan = appendonly_index_build_range_scan,
 	.index_validate_scan = appendonly_index_validate_scan,
 
@@ -2293,8 +2359,9 @@ static const TableAmRoutine ao_row_methods = {
 	.scan_bitmap_next_tuple = appendonly_scan_bitmap_next_tuple,
 	.scan_sample_next_block = appendonly_scan_sample_next_block,
 	.scan_sample_next_tuple = appendonly_scan_sample_next_tuple,
-	.acquire_sample_rows = acquire_sample_rows,
 
+	.dml_init = appendonly_dml_init,
+	.dml_fini = appendonly_dml_finish,
 	.amoptions = ao_amoptions,
 	.swap_relation_files = appendonly_swap_relation_files,
 };
diff --git a/src/backend/access/appendonly/appendonlyblockdirectory.c b/src/backend/access/appendonly/appendonlyblockdirectory.c
index b6a9b17991d..1e3e3cb4c0b 100644
--- a/src/backend/access/appendonly/appendonlyblockdirectory.c
+++ b/src/backend/access/appendonly/appendonlyblockdirectory.c
@@ -154,6 +154,8 @@ init_internal(AppendOnlyBlockDirectory *blockDirectory)
 		ItemPointerSetInvalid(&minipageInfo->tupleTid);
 	}
 
+	blockDirectory->cached_mpentry_num = InvalidEntryNum;
+
 	MemoryContextSwitchTo(oldcxt);
 }
 
@@ -515,6 +517,32 @@ set_directoryentry_range(
 	return true;
 }
 
+/*
+ * AppendOnlyBlockDirectory_GetCachedEntry
+ * 
+ * Return cached minipage entry for avoidance
+ * of double scans on block directory.
+ */
+static inline bool
+AppendOnlyBlockDirectory_GetCachedEntry(
+										AppendOnlyBlockDirectory *blockDirectory,
+										int segmentFileNum,
+										int columnGroupNo,
+										AppendOnlyBlockDirectoryEntry *directoryEntry)
+{
+	MinipagePerColumnGroup *minipageInfo PG_USED_FOR_ASSERTS_ONLY = &blockDirectory->minipages[columnGroupNo];
+
+    Assert(blockDirectory->cached_mpentry_num != InvalidEntryNum);
+	Assert(segmentFileNum == blockDirectory->currentSegmentFileNum);
+	Assert(blockDirectory->currentSegmentFileInfo != NULL);
+	Assert(minipageInfo->numMinipageEntries > 0);
+
+	return set_directoryentry_range(blockDirectory,
+									columnGroupNo,
+									blockDirectory->cached_mpentry_num,
+									directoryEntry);
+}
+
 /*
  * AppendOnlyBlockDirectory_GetEntry
  *
@@ -547,7 +575,7 @@ AppendOnlyBlockDirectory_GetEntry(
 	HeapTuple	tuple = NULL;
 	MinipagePerColumnGroup *minipageInfo =
 	&blockDirectory->minipages[columnGroupNo];
-	int			entry_no = -1;
+	int			entry_no = InvalidEntryNum;
 	int			tmpGroupNo;
 
 	if (blkdirRel == NULL || blkdirIdx == NULL)
@@ -567,6 +595,21 @@ AppendOnlyBlockDirectory_GetEntry(
 					  "(%d, %d, " INT64_FORMAT ")",
 					  columnGroupNo, segmentFileNum, rowNum)));
 
+	/*
+	 * We enable caching minipage entry only for ao_row.
+	 * 
+	 * Because ao_column requires all column values,
+	 * but the entry returned here caches for only one
+	 * column. It is unavoidable to scan blkdir again in
+	 * aocs_fetch() to extract all other column entries
+	 * for constructing the whole tuple.
+	 */
+	if (!blockDirectory->isAOCol && blockDirectory->cached_mpentry_num != InvalidEntryNum)
+		return AppendOnlyBlockDirectory_GetCachedEntry(blockDirectory,
+													   segmentFileNum,
+													   columnGroupNo,
+													   directoryEntry);
+
 	/*
 	 * If the segment file number is the same as
 	 * blockDirectory->currentSegmentFileNum, the in-memory minipage may
@@ -591,7 +634,8 @@ AppendOnlyBlockDirectory_GetEntry(
 			entry_no = find_minipage_entry(minipageInfo->minipage,
 										   minipageInfo->numMinipageEntries,
 										   rowNum);
-			if (entry_no != -1)
+
+			if (entry_no != InvalidEntryNum)
 			{
 				return set_directoryentry_range(blockDirectory,
 												columnGroupNo,
@@ -883,7 +927,7 @@ blkdir_entry_exists(AppendOnlyBlockDirectory *blockDirectory,
 		entry_no = find_minipage_entry(minipageInfo->minipage,
 									   minipageInfo->numMinipageEntries,
 									   rowNum);
-		if (entry_no != -1)
+		if (entry_no != InvalidEntryNum)
 		{
 			found = true;
 			break;
@@ -1241,7 +1285,7 @@ load_last_minipage(AppendOnlyBlockDirectory *blockDirectory,
  * find_minipage_entry
  *
  * Find the minipage entry that covers the given rowNum.
- * If such an entry does not exists, -1 is returned. Otherwise
+ * If such an entry does not exist, -1 is returned. Otherwise
  * the index to such an entry in the minipage array is returned.
  */
 static int
@@ -1282,7 +1326,7 @@ find_minipage_entry(Minipage *minipage,
 	if (start_no <= end_no)
 		return entry_no;
 	else
-		return -1;
+		return InvalidEntryNum;
 }
 
 /*
@@ -1620,3 +1664,126 @@ AppendOnlyBlockDirectory_End_forUniqueChecks(AppendOnlyBlockDirectory *blockDire
 
 	MemoryContextDelete(blockDirectory->memoryContext);
 }
+
+/*
+ * AOBlkDirScan_GetRowNum
+ * 
+ * Given a target logical row number,
+ * returns the corresponding physical rowNum,
+ * or -1 if not found.
+ * 
+ * targrow: 0-based target logical row number
+ * startrow: pointer of the start point stepping to targrow
+ * targsegno: the segfile number in which targrow locates
+ * colgroupno: current coloumn group number, always 0 for ao_row
+ */
+int64
+AOBlkDirScan_GetRowNum(AOBlkDirScan blkdirscan,
+					   int targsegno,
+					   int colgroupno,
+					   int64 targrow,
+					   int64 *startrow)
+{
+	HeapTuple tuple;
+	TupleDesc tupdesc;
+	AppendOnlyBlockDirectory *blkdir = blkdirscan->blkdir;
+	int mpentryi;
+	MinipagePerColumnGroup *mpinfo;
+	int64 rownum = -1;
+
+	Assert(targsegno >= 0);
+	Assert(blkdir != NULL);
+
+	if (blkdirscan->segno != targsegno || blkdirscan->colgroupno != colgroupno)
+	{
+		if (blkdirscan->sysscan != NULL)
+			systable_endscan_ordered(blkdirscan->sysscan);
+
+		ScanKeyData	scankeys[2];
+		
+		ScanKeyInit(&scankeys[0],
+					Anum_pg_aoblkdir_segno,
+					BTEqualStrategyNumber,
+					F_INT4EQ,
+					Int32GetDatum(targsegno));
+		
+		ScanKeyInit(&scankeys[1],
+					Anum_pg_aoblkdir_columngroupno,
+					BTEqualStrategyNumber,
+					F_INT4EQ,
+					Int32GetDatum(colgroupno));
+		
+		blkdirscan->sysscan = systable_beginscan_ordered(blkdir->blkdirRel,
+														 blkdir->blkdirIdx,
+														 blkdir->appendOnlyMetaDataSnapshot,
+														 2, /* nkeys */
+														 scankeys);
+		blkdirscan->segno = targsegno;
+		blkdirscan->colgroupno = colgroupno;
+		/* reset to InvalidEntryNum for new Minipage entry array */
+		blkdir->cached_mpentry_num = InvalidEntryNum;
+	}
+
+	mpentryi = blkdir->cached_mpentry_num;
+	mpinfo = &blkdir->minipages[colgroupno];
+
+	while (true)
+	{
+		if (mpentryi == InvalidEntryNum)
+		{
+			tuple = systable_getnext_ordered(blkdirscan->sysscan, ForwardScanDirection);
+			if (HeapTupleIsValid(tuple))
+			{
+				tupdesc = RelationGetDescr(blkdir->blkdirRel);
+				extract_minipage(blkdir, tuple, tupdesc, colgroupno);
+				/* new minipage */
+				mpentryi = 0;
+				mpinfo = &blkdir->minipages[colgroupno];
+			}
+			else
+			{	
+				/* done this < segno, colgroupno > */
+				systable_endscan_ordered(blkdirscan->sysscan);
+				blkdirscan->sysscan = NULL;
+				blkdirscan->segno = -1;
+				blkdirscan->colgroupno = 0;
+				/* always set both vars in pairs for safe */
+				mpentryi = InvalidEntryNum;
+				mpinfo = NULL;
+
+				goto out;
+			}
+		}
+
+		Assert(mpentryi != InvalidEntryNum);
+		Assert(mpinfo != NULL);
+
+		for (int i = mpentryi; i < mpinfo->numMinipageEntries; i++)
+		{
+			Minipage *mp = mpinfo->minipage;
+			MinipageEntry *entry = &(mp->entry[i]);
+
+			Assert(entry->firstRowNum > 0);
+			Assert(entry->rowCount > 0);
+
+			if (*startrow + entry->rowCount - 1 >= targrow)
+			{
+				rownum = entry->firstRowNum + (targrow - *startrow);
+				mpentryi = i;
+				goto out;
+			}
+
+			*startrow += entry->rowCount;
+		}
+
+		/* done this minipage */
+		mpentryi = InvalidEntryNum;
+		mpinfo = NULL;
+	}
+
+out:
+	/* set the result of minipage entry lookup */
+	blkdir->cached_mpentry_num = mpentryi;
+
+	return rownum;
+}
diff --git a/src/backend/access/common/reloptions_gp.c b/src/backend/access/common/reloptions_gp.c
index c15afa0b60c..fbf75fb9e10 100644
--- a/src/backend/access/common/reloptions_gp.c
+++ b/src/backend/access/common/reloptions_gp.c
@@ -954,24 +954,9 @@ validate_and_adjust_options(StdRdOptions *result,
 
 		if (result->compresstype[0] &&
 			(pg_strcasecmp(result->compresstype, "quicklz") == 0))
-		{
-#ifndef HAVE_LIBQUICKLZ
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("QuickLZ library is not supported by this build"),
-					 errhint("Compile with --with-quicklz to use QuickLZ compression.")));
-#endif
-			if (result->compresslevel != 1)
-			{
-				if (validate)
-					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-							 errmsg("compresslevel=%d is out of range for quicklz (should be 1)",
-									result->compresslevel)));
-
-				result->compresslevel = setDefaultCompressionLevel(result->compresstype);
-			}
-		}
+					 errmsg("QuickLZ compression is no longer supported. Please use 'zstd' or 'zlib' compression instead.")));
 
 		if (result->compresstype[0] &&
 			(pg_strcasecmp(result->compresstype, "rle_type") == 0) &&
@@ -1059,8 +1044,7 @@ validateAppendOnlyRelOptions(int blocksize,
 							 bool co)
 {
 	if (comptype &&
-		(pg_strcasecmp(comptype, "quicklz") == 0 ||
-		 pg_strcasecmp(comptype, "zlib") == 0 ||
+		(pg_strcasecmp(comptype, "zlib") == 0 ||
 		 pg_strcasecmp(comptype, "rle_type") == 0 ||
 		 pg_strcasecmp(comptype, "zstd") == 0))
 	{
@@ -1110,20 +1094,6 @@ validateAppendOnlyRelOptions(int blocksize,
 								complevel)));
 		}
 
-		if (comptype && (pg_strcasecmp(comptype, "quicklz") == 0))
-		{
-#ifndef HAVE_LIBQUICKLZ
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("QuickLZ library is not supported by this build"),
-					 errhint("Compile with --with-quicklz to use QuickLZ compression.")));
-#endif
-			if (complevel != 1)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("compresslevel=%d is out of range for quicklz (should be 1)",
-								complevel)));
-		}
 		if (comptype && (pg_strcasecmp(comptype, "rle_type") == 0) &&
 			(complevel < 0 || complevel > 4))
 		{
@@ -1144,7 +1114,7 @@ validateAppendOnlyRelOptions(int blocksize,
 
 /*
  * if no compressor type was specified, we set to no compression (level 0)
- * otherwise default for both zlib, quicklz, zstd and RLE to level 1.
+ * otherwise default for both zlib, zstd and RLE to level 1.
  */
 static int
 setDefaultCompressionLevel(char *compresstype)
diff --git a/src/backend/access/external/external.c b/src/backend/access/external/external.c
index 0905a576a6c..62cff75db53 100644
--- a/src/backend/access/external/external.c
+++ b/src/backend/access/external/external.c
@@ -443,7 +443,7 @@ create_external_scan_uri_list(ExtTableEntry *ext, bool *ismasteronly)
 	 * protocols only */
 	on_clause = (char *) strVal(linitial(ext->execlocations));
 	if ((strcmp(on_clause, "COORDINATOR_ONLY") == 0)
-		&& using_location && (uri->protocol != URI_CUSTOM)) {
+		&& using_location && (uri->protocol != URI_CUSTOM && uri->protocol != URI_FILE)) {
 		ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 				errmsg("\'ON COORDINATOR\' is not supported by this protocol yet")));
 	}
@@ -524,6 +524,13 @@ create_external_scan_uri_list(ExtTableEntry *ext, bool *ismasteronly)
 			found_candidate = false;
 			found_match = false;
 
+			if ((strcmp(on_clause, "COORDINATOR_ONLY") == 0) && uri->protocol == URI_FILE)
+			{
+				found_match = true;
+				segdb_file_map[0] = pstrdup(uri_str);
+				*ismasteronly = true;
+			}
+
 			/*
 			 * look through our segment database list and try to find a
 			 * database that can handle this uri.
diff --git a/src/backend/access/gin/ginpostinglist.c b/src/backend/access/gin/ginpostinglist.c
index 8b166c738c7..c614c646c2b 100644
--- a/src/backend/access/gin/ginpostinglist.c
+++ b/src/backend/access/gin/ginpostinglist.c
@@ -335,8 +335,17 @@ ginPostingListDecodeAllSegments(GinPostingList *segment, int len, int *ndecoded_
 		}
 
 		/* copy the first item */
+		/*
+		 * Keep this commented out.
+		 * See comments in itemptr_to_uint64().
+		 * 
+		 * FIXME: Correct like this in other files (e.g., ginpostinglist.c and gist.c)
+		 * if we can reproduce the cases.
+		 */
+#if 0
 		Assert(OffsetNumberIsValid(ItemPointerGetOffsetNumber(&segment->first)));
-		Assert(ndecoded == 0 || ginCompareItemPointers(&segment->first, &result[ndecoded - 1]) > 0);
+#endif
+			Assert(ndecoded == 0 || ginCompareItemPointers(&segment->first, &result[ndecoded - 1]) > 0);
 		result[ndecoded] = segment->first;
 		ndecoded++;
 
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 048ce9231a9..0003425b79f 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -530,6 +530,14 @@ heapgetpage(TableScanDesc sscan, BlockNumber page)
 
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 
+#ifdef FAULT_INJECTOR
+	FaultInjector_InjectFaultIfSet(
+								   "heapgetpage_after_unlock_buffer",
+								   DDLNotSpecified,
+								   "",	/* databaseName */
+								   RelationGetRelationName(scan->rs_base.rs_rd));	/* tableName */
+#endif
+
 	Assert(ntup <= MaxHeapTuplesPerPage);
 	scan->rs_ntuples = ntup;
 }
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 22314d15b07..4535f2fdaba 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -2686,7 +2686,6 @@ static const TableAmRoutine heapam_methods = {
 	.scan_bitmap_next_tuple = heapam_scan_bitmap_next_tuple,
 	.scan_sample_next_block = heapam_scan_sample_next_block,
 	.scan_sample_next_tuple = heapam_scan_sample_next_tuple,
-	.acquire_sample_rows = acquire_sample_rows,
 
 	.amoptions	= heapam_amoptions,
 
diff --git a/src/backend/access/heap/heaptoast.c b/src/backend/access/heap/heaptoast.c
index 2ba251efc00..5d4745341aa 100644
--- a/src/backend/access/heap/heaptoast.c
+++ b/src/backend/access/heap/heaptoast.c
@@ -106,7 +106,7 @@ heap_toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup, in
 MemTuple memtup_toast_insert_or_update(Relation rel, MemTuple newtup, MemTuple oldtup,
 									   MemTupleBinding *pbind, int toast_tuple_target, int options)
 {
-	return (MemTuple) heap_toast_insert_or_update_generic(rel, newtup, oldtup, pbind, toast_tuple_target, options, true);
+	return (MemTuple) heap_toast_insert_or_update_generic(rel, newtup, oldtup, pbind, options, toast_tuple_target, true);
 }
 
 static void *
diff --git a/src/backend/access/rmgrdesc/standbydesc.c b/src/backend/access/rmgrdesc/standbydesc.c
index 01ee7ac6d2c..899c621b240 100644
--- a/src/backend/access/rmgrdesc/standbydesc.c
+++ b/src/backend/access/rmgrdesc/standbydesc.c
@@ -66,6 +66,14 @@ standby_desc(StringInfo buf, XLogReaderState *record)
 								   xlrec->dbId, xlrec->tsId,
 								   xlrec->relcacheInitFileInval);
 	}
+	else if (info == XLOG_LATESTCOMPLETED_GXID)
+	{
+		DistributedTransactionId gxid;
+
+		gxid = *((DistributedTransactionId *) rec);
+		appendStringInfo(buf, UINT64_FORMAT, gxid);
+	}
+
 }
 
 const char *
@@ -84,6 +92,9 @@ standby_identify(uint8 info)
 		case XLOG_INVALIDATIONS:
 			id = "INVALIDATIONS";
 			break;
+		case XLOG_LATESTCOMPLETED_GXID:
+			id = "XLOG_LATESTCOMPLETED_GXID";
+			break;
 	}
 
 	return id;
diff --git a/src/backend/access/table/tableamapi.c b/src/backend/access/table/tableamapi.c
index f9008164433..8257dc92d03 100644
--- a/src/backend/access/table/tableamapi.c
+++ b/src/backend/access/table/tableamapi.c
@@ -104,6 +104,8 @@ GetTableAmRoutine(Oid amhandler)
 		   (routine->scan_bitmap_next_tuple == NULL));
 	Assert(routine->scan_sample_next_block != NULL);
 	Assert(routine->scan_sample_next_tuple != NULL);
+	/* dml_init and dml_fini should both set or ignored */
+	Assert((routine->dml_init != NULL) == (routine->dml_fini != NULL));
 
 	return routine;
 }
diff --git a/src/backend/access/transam/README b/src/backend/access/transam/README
index f3112ff3070..efac0cb505e 100644
--- a/src/backend/access/transam/README
+++ b/src/backend/access/transam/README
@@ -897,3 +897,48 @@ yet simplifies emulation of subtransactions considerably.
 
 Further details on locking mechanics in recovery are given in comments
 with the Lock rmgr code.
+
+Distributed Transaction Emulation during Recovery
+-------------------------------------
+
+In GPDB, the MVCC snapshot also includes distributed transactions (aka dtx). 
+Accordingly, on a hot standby we also emulate running dtx. The way to do that 
+is to re-use the shmCommittedGxidArray which has been used on a primary for dtx
+recovery: it tracks all the 2PC dtx that have their PREPARE phase done, 
+but for which the COMMIT phase hasn't finished (i.e. window between the
+XLOG_XACT_DISTRIBUTED_COMMIT record being written and the 
+XLOG_XACT_DISTRIBUTED_FORGET record being written on the QD). On a hot standby, 
+any dtx shown in that array are regarded as in-progress. The MVCC snapshot does 
+not really need to account for dtx not in that array: for a dtx that hasn't 
+done PREPARE, we know no segment has committed any data yet; for a dtx that 
+hasn't done COMMIT, we know all segments have committed their data.
+
+Note: dtxes that are preparing will not be tracked in this array, and thus will 
+not be included in this snapshot. This is slightly different from a primary QD, 
+where such transactions would have been included in the distributed snapshot's 
+inProgressXidArray (as we construct the inProgressXidArray from the PGXACTs that
+would contain the dummy entries for prepared transactions). However, as 
+mentioned in CreateDistributedSnapshot, including these is not a requirement for
+correctness.
+
+Note: aborted/aborting dtxes are not accounted for by the standby either. Those
+are the dtxes that encountered error during preparing. Same as the previous 
+point, the standby does not need to be aware of them for correctness. Worth also
+noting that if a dtx encountered error after being prepared, it cannot be 
+aborted anymore and must be committed by the dtx recovery process. Until 
+committed, such a dtx will be seen as in-progress to the standby.
+
+For 1PC dtx, however, there is a known limitation where the hot standby won't 
+see the last 1PC (or the last few 1PCs if they are all 1PC). This is because 
+since 1PC does not have any WAL on QD, the standby QD won't advance its 
+latestCompletedGxid, so its distributed snapshot horizon does not include the
+last 1PC - it would view the last 1PC not yet started or at best still in 
+progress. Only if another 2PC comes, the standby would advance its 
+latestCompletedGxid and its distributed snapshot will include the previous 1PC. 
+
+We don't emulate the full architecture of "running transaction" for dtx because
+that is unnecessary, at least ATM. For example, we don't create a dtx-version
+of XLOG_RUNNING_XACTS, because we already have that information as part of the
+extended checkpoint (see TMGXACT_CHECKPOINT). We also don't need to emulate 
+other members in RunningTransactionsData, like subxid or xid-pruning related 
+variables because those do not apply to dtx.
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 1b52383f556..6ce60577a2f 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -379,7 +379,10 @@ InitializeParallelDSM(ParallelContext *pcxt)
 	/* CDB: should sync some global states to workes */
 	fps->cdb_aux_state.session_id = gp_session_id;
 	fps->cdb_aux_state.num_segments = numsegmentsFromQD;
-	strcpy(fps->cdb_aux_state.interconnect_address, interconnect_address);
+	if (interconnect_address)
+		strcpy(fps->cdb_aux_state.interconnect_address, interconnect_address);
+	else
+		fps->cdb_aux_state.interconnect_address[0] = '\0';
 	fps->cdb_aux_state.ic_htab_size = ic_htab_size;
 
 	/* We can skip the rest of this if we're not budgeting for any workers. */
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index f3f2a035281..ed655baf989 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -2475,11 +2475,10 @@ StartTransaction(void)
 
 	/*
 	 * Transactions may be started while recovery is in progress, if
-	 * hot standby is enabled.  This mode is not supported in
-	 * Cloudberry yet.
+	 * hot standby is enabled.
 	 */
 	AssertImply(DistributedTransactionContext != DTX_CONTEXT_LOCAL_ONLY,
-				!s->startedInRecovery);
+				EnableHotStandby || !s->startedInRecovery);
 	/*
 	 * MPP Modification
 	 *
@@ -2526,20 +2525,39 @@ StartTransaction(void)
 
 		case DTX_CONTEXT_QE_TWO_PHASE_EXPLICIT_WRITER:
 		case DTX_CONTEXT_QE_TWO_PHASE_IMPLICIT_WRITER:
+			/*
+			 * Sanity check for the global xid.
+			 * 
+			 * Note for hot standby dispatch: the standby QEs are still 
+			 * writers, just like primary QEs for SELECT queries. But 
+			 * hot standby dispatch never has a valid gxid, so we skip
+			 * the gxid checks for the standby QEs.
+			 */
+			if (!IS_HOT_STANDBY_QE())
+			{
+				if (QEDtxContextInfo.distributedXid == InvalidDistributedTransactionId)
+					elog(ERROR,
+						 "distributed transaction id is invalid in context %s",
+						 DtxContextToString(DistributedTransactionContext));
+
+				/*
+				 * Update distributed XID info, this is only used for
+				 * debugging.
+				 */
+				LocalDistribXactData *ele = &MyProc->localDistribXactData;
+				ele->distribXid = QEDtxContextInfo.distributedXid;
+				ele->state = LOCALDISTRIBXACT_STATE_ACTIVE;
+			}
+			else
+				Assert(QEDtxContextInfo.distributedXid == InvalidDistributedTransactionId);
+
+			/* fall through */
 		case DTX_CONTEXT_QE_AUTO_COMMIT_IMPLICIT:
 		{
 			/* If we're running in test-mode insert a delay in writer. */
 			if (gp_enable_slow_writer_testmode)
 				pg_usleep(500000);
 
-			if (DistributedTransactionContext != DTX_CONTEXT_QE_AUTO_COMMIT_IMPLICIT &&
-				QEDtxContextInfo.distributedXid == InvalidDistributedTransactionId)
-			{
-				elog(ERROR,
-					 "distributed transaction id is invalid in context %s",
-					 DtxContextToString(DistributedTransactionContext));
-			}
-
 			/*
 			 * Snapshot must not be created before setting transaction
 			 * isolation level.
@@ -2552,28 +2570,14 @@ StartTransaction(void)
 			XactReadOnly = isMppTxOptions_ReadOnly(
 				QEDtxContextInfo.distributedTxnOptions);
 
+			/* a hot standby transaction must be read-only */
+			AssertImply(IS_HOT_STANDBY_QE(), XactReadOnly);
+
 			/*
 			 * MPP: we're a QE Writer.
 			 */
 			MyTmGxact->gxid = QEDtxContextInfo.distributedXid;
 
-			if (DistributedTransactionContext ==
-				DTX_CONTEXT_QE_TWO_PHASE_EXPLICIT_WRITER ||
-				DistributedTransactionContext ==
-				DTX_CONTEXT_QE_TWO_PHASE_IMPLICIT_WRITER)
-			{
-				Assert(QEDtxContextInfo.distributedXid !=
-					   InvalidDistributedTransactionId);
-
-				/*
-				 * Update distributed XID info, this is only used for
-				 * debugging.
-				 */
-				LocalDistribXactData *ele = &MyProc->localDistribXactData;
-				ele->distribXid = QEDtxContextInfo.distributedXid;
-				ele->state = LOCALDISTRIBXACT_STATE_ACTIVE;
-			}
-
 			if (SharedLocalSnapshotSlot != NULL)
 			{
 				LWLockAcquire(SharedLocalSnapshotSlot->slotLock, LW_EXCLUSIVE);
@@ -6880,8 +6884,8 @@ XactLogCommitRecord(TimestampTz commit_time,
 	xl_xact_distrib xl_distrib;
 	xl_xact_deldbs xl_deldbs;
 	XLogRecPtr recptr;
-	bool isOnePhaseQE = (Gp_role == GP_ROLE_EXECUTE && MyTmGxactLocal->isOnePhaseCommit);
 	bool isDtxPrepared = isPreparedDtxTransaction();
+	DistributedTransactionId distrib_xid = getDistributedTransactionId();
 
 	uint8		info;
 
@@ -6971,10 +6975,11 @@ XactLogCommitRecord(TimestampTz commit_time,
 		xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
 	}
 
-	if (isDtxPrepared || isOnePhaseQE)
+	/* include distributed xid if there's one */
+	if (distrib_xid != InvalidDistributedTransactionId)
 	{
 		xl_xinfo.xinfo |= XACT_XINFO_HAS_DISTRIB;
-		xl_distrib.distrib_xid = getDistributedTransactionId();
+		xl_distrib.distrib_xid = distrib_xid;
 	}
 
 #if 0
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 722bea2040b..cff69879aa1 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -114,6 +114,7 @@ int			XLogArchiveTimeout = 0;
 int			XLogArchiveMode = ARCHIVE_MODE_OFF;
 char	   *XLogArchiveCommand = NULL;
 bool		EnableHotStandby = false;
+bool		EnableHotDR = false;
 bool		fullPageWrites = true;
 bool		wal_log_hints = false;
 bool		wal_compression = false;
@@ -133,7 +134,14 @@ bool		track_wal_io_timing = false;
 int         FileEncryptionEnabled = false;
 
 /* GPDB specific */
-bool gp_pause_on_restore_point_replay = false;
+char *gp_pause_on_restore_point_replay = "";
+
+/*
+ * GPDB: Have we reached a specific continuous recovery target? We set this to
+ * true if WAL replay has found a restore point matching the GPDB-specific GUC
+ * gp_pause_on_restore_point_replay and a promotion has been requested.
+ */
+static bool reachedContinuousRecoveryTarget = false;
 
 #ifdef WAL_DEBUG
 bool		XLOG_DEBUG = false;
@@ -6012,6 +6020,59 @@ recoveryStopsBefore(XLogReaderState *record)
 	return stopsHere;
 }
 
+/*
+ * GPDB: Restore point records can act as a point of synchronization to ensure
+ * cluster-wide consistency during WAL replay. If a restore point is specified
+ * in the gp_pause_on_restore_point_replay GUC, WAL replay will be paused at
+ * that restore point until replay is explicitly resumed.
+ */
+static void
+pauseRecoveryOnRestorePoint(XLogReaderState *record)
+{
+	uint8		info;
+	uint8		rmid;
+
+	/*
+	 * Ignore recovery target settings when not in archive recovery (meaning
+	 * we are in crash recovery).
+	 */
+	if (!ArchiveRecoveryRequested)
+		return;
+
+	info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
+	rmid = XLogRecGetRmid(record);
+
+	if (rmid == RM_XLOG_ID && info == XLOG_RESTORE_POINT)
+	{
+		xl_restore_point *recordRestorePointData;
+
+		recordRestorePointData = (xl_restore_point *) XLogRecGetData(record);
+
+		if (strcmp(recordRestorePointData->rp_name, gp_pause_on_restore_point_replay) == 0)
+		{
+			ereport(LOG,
+					(errmsg("setting recovery pause at restore point \"%s\", time %s",
+							recordRestorePointData->rp_name,
+							timestamptz_to_str(recordRestorePointData->rp_time))));
+
+			SetRecoveryPause(true);
+			recoveryPausesHere(false);
+
+			/*
+			 * If we've unpaused and there is a promotion request, then we've
+			 * reached our continuous recovery target and need to immediately
+			 * promote. We piggyback on the existing recovery target logic to
+			 * do this. See recoveryStopsAfter().
+			 */
+			if (CheckForStandbyTrigger())
+			{
+				reachedContinuousRecoveryTarget = true;
+				recoveryTargetAction = RECOVERY_TARGET_ACTION_PROMOTE;
+			}
+		}
+	}
+}
+
 /*
  * Same as recoveryStopsBefore, but called after applying the record.
  *
@@ -6039,15 +6100,19 @@ recoveryStopsAfter(XLogReaderState *record)
 	/*
 	 * There can be many restore points that share the same name; we stop at
 	 * the first one.
+	 *
+	 * GPDB: If we've reached the continuous recovery target, we'll use the
+	 * below logic to immediately stop recovery.
 	 */
-	if (recoveryTarget == RECOVERY_TARGET_NAME &&
+	if ((reachedContinuousRecoveryTarget || recoveryTarget == RECOVERY_TARGET_NAME) &&
 		rmid == RM_XLOG_ID && info == XLOG_RESTORE_POINT)
 	{
 		xl_restore_point *recordRestorePointData;
 
 		recordRestorePointData = (xl_restore_point *) XLogRecGetData(record);
 
-		if (strcmp(recordRestorePointData->rp_name, recoveryTargetName) == 0)
+		if (reachedContinuousRecoveryTarget ||
+			strcmp(recordRestorePointData->rp_name, recoveryTargetName) == 0)
 		{
 			recoveryStopAfter = true;
 			recoveryStopXid = InvalidTransactionId;
@@ -6463,6 +6528,7 @@ static void
 UpdateCatalogForStandbyPromotion(void)
 {
 	GpRoleValue old_role;
+	char *fullpath;
 	/*
 	 * NOTE: The following initialization logic was borrowed from ftsprobe.
 	 */
@@ -6534,8 +6600,6 @@ UpdateCatalogForStandbyPromotion(void)
 	 */
 	RelationCacheInitializePhase2();
 
-	char *fullpath;
-
 	/*
 	 * In order to access the catalog, we need a database, and a
 	 * tablespace; our access to the heap is going to be slightly
@@ -6555,6 +6619,7 @@ UpdateCatalogForStandbyPromotion(void)
 	fullpath = GetDatabasePath(MyDatabaseId, MyDatabaseTableSpace);
 
 	SetDatabasePath(fullpath);
+	pfree(fullpath);
 
 	RelationCacheInitializePhase3();
 
@@ -7900,6 +7965,15 @@ StartupXLOG(void)
 						WalSndWakeup();
 				}
 
+				if (gp_pause_on_restore_point_replay)
+					pauseRecoveryOnRestorePoint(xlogreader);
+
+				/* Exit the recovery loop if a promotion is triggered in pauseRecoveryOnRestorePoint() */
+				if (reachedContinuousRecoveryTarget && recoveryTargetAction == RECOVERY_TARGET_ACTION_PROMOTE){
+					reachedRecoveryTarget = true;
+					break;
+				}
+
 				/* Exit loop if we reached inclusive recovery target */
 				if (recoveryStopsAfter(xlogreader))
 				{
@@ -8321,6 +8395,81 @@ StartupXLOG(void)
 			CreateCheckPoint(CHECKPOINT_END_OF_RECOVERY | CHECKPOINT_IMMEDIATE);
 	}
 
+	/*
+	 * Preallocate additional log files, if wanted.
+	 */
+	PreallocXlogFiles(EndOfLog);
+
+	/*
+	 * Okay, we're officially UP.
+	 */
+	InRecovery = false;
+
+	SIMPLE_FAULT_INJECTOR("out_of_recovery_in_startupxlog");
+
+	/*
+	 * Hook for plugins to do additional startup works.
+	 *
+	 * Allow to write any WALs in hook.
+	 */
+	if (Startup_hook)
+	{
+	    LocalSetXLogInsertAllowed();
+	    (*Startup_hook) ();
+	    LocalXLogInsertAllowed = -1;
+	}
+
+	/* start the archive_timeout timer and LSN running */
+	XLogCtl->lastSegSwitchTime = (pg_time_t) time(NULL);
+	XLogCtl->lastSegSwitchLSN = EndOfLog;
+
+	/* also initialize latestCompletedXid, to nextXid - 1 */
+	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+	ShmemVariableCache->latestCompletedXid = ShmemVariableCache->nextXid;
+	ShmemVariableCache->latestCompletedGxid = ShmemVariableCache->nextGxid;
+	FullTransactionIdRetreat(&ShmemVariableCache->latestCompletedXid);
+	if (IsNormalProcessingMode())
+		elog(LOG, "latest completed transaction id is %u and next transaction id is %u",
+			 XidFromFullTransactionId(ShmemVariableCache->latestCompletedXid),
+			 XidFromFullTransactionId(ShmemVariableCache->nextXid));
+	LWLockRelease(ProcArrayLock);
+
+	/*
+	 * Start up subtrans, if not already done for hot standby.  (commit
+	 * timestamps are started below, if necessary.)
+	 */
+	if (standbyState == STANDBY_DISABLED)
+	{
+		StartupCLOG();
+		StartupSUBTRANS(oldestActiveXID);
+		DistributedLog_Startup(oldestActiveXID,
+							   XidFromFullTransactionId(ShmemVariableCache->nextXid));
+	}
+
+	/*
+	 * Perform end of recovery actions for any SLRUs that need it.
+	 */
+	TrimCLOG();
+	TrimMultiXact();
+
+	/* Reload shared-memory state for prepared transactions */
+	RecoverPreparedTransactions();
+
+	/* Shut down xlogreader */
+	if (readFile >= 0)
+	{
+		close(readFile);
+		readFile = -1;
+	}
+	XLogReaderFree(xlogreader);
+
+	/*
+	 * If any of the critical GUCs have changed, log them before we allow
+	 * backends to write WAL.
+	 */
+	LocalSetXLogInsertAllowed();
+	XLogReportParameters();
+
 	if (ArchiveRecoveryRequested)
 	{
 		/*
@@ -8402,28 +8551,6 @@ StartupXLOG(void)
 		}
 	}
 
-	/*
-	 * Preallocate additional log files, if wanted.
-	 */
-	PreallocXlogFiles(EndOfLog);
-
-	/*
-	 * Okay, we're officially UP.
-	 */
-	InRecovery = false;
-
-	/*
-	 * Hook for plugins to do additional startup works.
-	 *
-	 * Allow to write any WALs in hook.
-	 */
-	if (Startup_hook)
-	{
-	    LocalSetXLogInsertAllowed();
-	    (*Startup_hook) ();
-	    LocalXLogInsertAllowed = -1;
-	}
-
 	/*
 	 * If we are a standby with contentid -1 and undergoing promotion,
 	 * update ourselves as the new master in catalog.  This does not
@@ -8433,60 +8560,9 @@ StartupXLOG(void)
 	bool needToPromoteCatalog = (IS_QUERY_DISPATCHER() &&
 								 ControlFile->state == DB_IN_ARCHIVE_RECOVERY);
 
-	/* start the archive_timeout timer and LSN running */
-	XLogCtl->lastSegSwitchTime = (pg_time_t) time(NULL);
-	XLogCtl->lastSegSwitchLSN = EndOfLog;
-
-	/* also initialize latestCompletedXid, to nextXid - 1 */
-	LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
-	ShmemVariableCache->latestCompletedXid = ShmemVariableCache->nextXid;
-	ShmemVariableCache->latestCompletedGxid = ShmemVariableCache->nextGxid;
-	FullTransactionIdRetreat(&ShmemVariableCache->latestCompletedXid);
-	if (IsNormalProcessingMode())
-		elog(LOG, "latest completed transaction id is %u and next transaction id is %u",
-			 XidFromFullTransactionId(ShmemVariableCache->latestCompletedXid),
-			 XidFromFullTransactionId(ShmemVariableCache->nextXid));
-	LWLockRelease(ProcArrayLock);
-
-	/*
-	 * Start up subtrans, if not already done for hot standby.  (commit
-	 * timestamps are started below, if necessary.)
-	 */
-	if (standbyState == STANDBY_DISABLED)
-	{
-		StartupCLOG();
-		StartupSUBTRANS(oldestActiveXID);
-		DistributedLog_Startup(oldestActiveXID,
-							   XidFromFullTransactionId(ShmemVariableCache->nextXid));
-	}
-
-	/*
-	 * Perform end of recovery actions for any SLRUs that need it.
-	 */
-	TrimCLOG();
-	TrimMultiXact();
-
-	/* Reload shared-memory state for prepared transactions */
-	RecoverPreparedTransactions();
-
 	if(IsNormalProcessingMode())
 		ereport(LOG, (errmsg("database system is ready")));
 
-	/* Shut down xlogreader */
-	if (readFile >= 0)
-	{
-		close(readFile);
-		readFile = -1;
-	}
-	XLogReaderFree(xlogreader);
-
-	/*
-	 * If any of the critical GUCs have changed, log them before we allow
-	 * backends to write WAL.
-	 */
-	LocalSetXLogInsertAllowed();
-	XLogReportParameters();
-
 	/*
 	 * Local WAL inserts enabled, so it's time to finish initialization of
 	 * commit timestamp.
@@ -9801,8 +9877,11 @@ CreateCheckPoint(int flags)
 	 * recovery we don't need to write running xact data.
 	 */
 	if (!shutdown && XLogStandbyInfoActive())
+	{
 		LogStandbySnapshot();
 
+	}
+
 	SIMPLE_FAULT_INJECTOR("checkpoint_after_redo_calculated");
 
 	START_CRIT_SECTION();
@@ -10685,6 +10764,9 @@ XLogRestorePoint(const char *rpName)
 	xlrec.rp_time = GetCurrentTimestamp();
 	strlcpy(xlrec.rp_name, rpName, MAXFNAMELEN);
 
+	/* LogHotStandby for the restore here */
+	LogStandbySnapshot();
+
 	XLogBeginInsert();
 	XLogRegisterData((char *) &xlrec, sizeof(xl_restore_point));
 
@@ -11126,14 +11208,7 @@ xlog_redo(XLogReaderState *record)
 	}
 	else if (info == XLOG_RESTORE_POINT)
 	{
-		/*
-		 * GPDB: Restore point records can act as a point of
-		 * synchronization to ensure cluster-wide consistency during WAL
-		 * replay. WAL replay is paused at each restore point until it is
-		 * explicitly resumed.
-		 */
-		if (gp_pause_on_restore_point_replay)
-			SetRecoveryPause(true);
+		/* nothing to do here */
 	}
 	else if (info == XLOG_FPI || info == XLOG_FPI_FOR_HINT)
 	{
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 839f5bc3e01..7243b97d467 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -879,7 +879,10 @@ XLogCompressBackupBlock(char *page, uint16 hole_offset, uint16 hole_length,
 	{
 		cxt = ZSTD_createCCtx();
 		if (!cxt)
-			elog(ERROR, "out of memory");
+		{
+			elog(LOG, "out of memory");
+			return false;
+		}
 	}
 
 	len = ZSTD_compressCCtx(cxt,
@@ -888,8 +891,11 @@ XLogCompressBackupBlock(char *page, uint16 hole_offset, uint16 hole_length,
 							COMPRESS_LEVEL);
 
 	if (ZSTD_isError(len))
-		elog(ERROR, "compression failed: %s uncompressed len %d",
+	{
+		elog(LOG, "compression failed: %s uncompressed len %d",
 			 ZSTD_getErrorName(len), orig_len);
+		len = -1;		/* failure */
+	}
 
 	/*
 	 * We recheck the actual size even if ZSTD reports success and
diff --git a/src/backend/catalog/gp_matview_aux.c b/src/backend/catalog/gp_matview_aux.c
index e62486f2488..a119f86b6e5 100644
--- a/src/backend/catalog/gp_matview_aux.c
+++ b/src/backend/catalog/gp_matview_aux.c
@@ -98,7 +98,14 @@ GetViewBaseRelids(const Query *viewQuery, bool *has_foreign)
 		return NIL;
 	}
 
-	/* As we will use views, make it strict to unmutable. */
+	/*
+	 * Use immutable functions for views to ensure strict immutability.
+	 * While STABLE functions don't modify the database and return consistent
+	 * results for the same arguments within a statement, AQUMV rewrites
+	 * the query to new SQL. The behavior with STABLE functions isn't entirely
+	 * clear in this context, so we're conservatively requiring IMMUTABLE
+	 * functions for now.
+	 */
 	if (contain_mutable_functions((Node*)viewQuery))
 		return NIL;
 
@@ -331,7 +338,8 @@ SetRelativeMatviewAuxStatus(Oid relid, char status, char direction)
 	/*
 	 * Do a quick check if relation has relative materialized views.
 	 */
-	if (get_rel_relmvrefcount(relid) <= 0)
+	if (get_rel_relmvrefcount(relid) <= 0 &&
+		!get_rel_relispartition(relid))
 		return;
 
 	mvauxRel = table_open(GpMatviewAuxId, RowExclusiveLock);
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index d754d97c781..a775f32e2b0 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -1388,7 +1388,7 @@ index_create_internal(Relation heapRelation,
 		 *
 		 * We should bring it back in the future.
 		 */
-		index_build(heapRelation, indexRelation, indexInfo, false, indexInfo->ii_ParallelWorkers != -1);
+		index_build(heapRelation, indexRelation, indexInfo, false, indexInfo->ii_ParallelWorkers > 0);
 	}
 
 	/*
diff --git a/src/backend/catalog/pg_compression.c b/src/backend/catalog/pg_compression.c
index 923978a6dee..74fe729e59e 100644
--- a/src/backend/catalog/pg_compression.c
+++ b/src/backend/catalog/pg_compression.c
@@ -508,9 +508,6 @@ compresstype_is_valid(char *comptype)
 	 * must change!
 	 */
 	static const char *const valid_comptypes[] = {
-#ifdef HAVE_LIBQUICKLZ
-			"quicklz",
-#endif
 #ifdef HAVE_LIBZ
 			"zlib",
 #endif
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 6b0b604ab5e..4cb9a9b57d6 100644
--- a/src/backend/catalog/system_views.sql
+++ b/src/backend/catalog/system_views.sql
@@ -1498,6 +1498,10 @@ rq.oid=rc.resqueueid AND rc.restypid = rt.restypid
 ORDER BY rsqname, restypid
 ;
 
+-- FIXME: we have a cluster-wide view gp_stat_database_conflicts, but that is 
+-- only showing conflicts of every segment. Some conflict might be encountered
+-- on just part of the segments. Ideally we should have a view like
+-- gp_stat_database_conflicts_summary that prints the overall conflicts and types.
 CREATE VIEW pg_stat_database_conflicts AS
     SELECT
             D.oid AS datid,
diff --git a/src/backend/cdb/cdbappendonlystorageread.c b/src/backend/cdb/cdbappendonlystorageread.c
index 67314014997..10e8c57529a 100755
--- a/src/backend/cdb/cdbappendonlystorageread.c
+++ b/src/backend/cdb/cdbappendonlystorageread.c
@@ -437,7 +437,7 @@ AppendOnlyStorageRead_CloseFile(AppendOnlyStorageRead *storageRead)
 	if (storageRead->file == -1)
 		return;
 
-	FileClose(storageRead->file);
+	storageRead->smgrAO->smgr_FileClose(storageRead->file);
 
 	storageRead->file = -1;
 	storageRead->formatVersion = -1;
diff --git a/src/backend/cdb/cdbappendonlystoragewrite.c b/src/backend/cdb/cdbappendonlystoragewrite.c
index fe99836f02f..bce2d069346 100755
--- a/src/backend/cdb/cdbappendonlystoragewrite.c
+++ b/src/backend/cdb/cdbappendonlystoragewrite.c
@@ -271,7 +271,7 @@ AppendOnlyStorageWrite_TransactionCreateFile(AppendOnlyStorageWrite *storageWrit
 	// WALREP_FIXME: Pass isRedo == true, so that you don't get an error if it
 	// exists already. That's currently OK, but in the future, other things
 	// might depend on the isRedo flag, like whether to WAL-log the creation.
-	smgrcreate_ao(*relFileNode, segmentFileNum, true);
+	smgrcreate_ao(storageWrite->smgrAO, *relFileNode, segmentFileNum, true);
 
 	/*
 	 * Create a WAL record, so that the segfile is also created after crash or
@@ -410,14 +410,14 @@ AppendOnlyStorageWrite_FlushAndCloseFile(
 	 * primary.  Temp tables are not crash safe, no need to fsync them.
 	 */
 	if (!RelFileNodeBackendIsTemp(storageWrite->relFileNode) &&
-		FileSync(storageWrite->file, WAIT_EVENT_DATA_FILE_SYNC) != 0)
+		storageWrite->smgrAO->smgr_FileSync(storageWrite->file, WAIT_EVENT_DATA_FILE_SYNC) != 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
 				 errmsg("Could not flush (fsync) Append-Only segment file '%s' to disk for relation '%s': %m",
 						storageWrite->segmentFileName,
 						storageWrite->relationName)));
 
-	FileClose(storageWrite->file);
+	storageWrite->smgrAO->smgr_FileClose(storageWrite->file);
 
 	storageWrite->file = -1;
 	storageWrite->formatVersion = -1;
diff --git a/src/backend/cdb/cdbdtxcontextinfo.c b/src/backend/cdb/cdbdtxcontextinfo.c
index 1a3c1b8f295..2994821f8df 100644
--- a/src/backend/cdb/cdbdtxcontextinfo.c
+++ b/src/backend/cdb/cdbdtxcontextinfo.c
@@ -60,7 +60,7 @@ DtxContextInfo_CreateOnMaster(DtxContextInfo *dtxContextInfo, bool inCursor,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 				 errmsg("cannot have more than 2^32-2 commands in a session")));
 
-	AssertImply(inCursor,
+	AssertImply(inCursor && !IS_HOT_STANDBY_QD(),
 				dtxContextInfo->distributedXid != InvalidDistributedTransactionId &&
 				gp_command_count == MySessionState->latestCursorCommandId);
 
diff --git a/src/backend/cdb/cdbdtxrecovery.c b/src/backend/cdb/cdbdtxrecovery.c
index 186b01ff214..605ce323ddb 100644
--- a/src/backend/cdb/cdbdtxrecovery.c
+++ b/src/backend/cdb/cdbdtxrecovery.c
@@ -202,6 +202,11 @@ recoverInDoubtTransactions(void)
 
 	for (i = 0; i < *shmNumCommittedGxacts; i++)
 	{
+		/*
+		 * No need to acquire CommittedGxidArrayLock since dtx recovery
+		 * only happens on primary, but not hot standby where concurrent 
+		 * access to this array is possible from CreateDistributedSnapshot.
+		 */
 		DistributedTransactionId gxid = shmCommittedGxidArray[i];
 		char gid[TMGIDSIZE];
 
@@ -486,7 +491,12 @@ void
 redoDistributedCommitRecord(DistributedTransactionId gxid)
 {
 	int			i;
+	bool 			is_hot_standby_qd = IS_HOT_STANDBY_QD();
 
+	/* 
+	 * Only the startup process can be modifying shmNumCommittedGxacts
+	 * and shmCommittedGxidArray. So should be OK reading the value w/o lock.
+	 */
 	for (i = 0; i < *shmNumCommittedGxacts; i++)
 	{
 		if (gxid == shmCommittedGxidArray[i])
@@ -526,7 +536,18 @@ redoDistributedCommitRecord(DistributedTransactionId gxid)
 							   "around this issue and then report a bug")));
 		}
 
+		/*
+		 * only on hot standby there might be backends that call CreateDistributedSnapshot()
+		 * to access the committed gxid array concurrently.
+		 */
+		if (is_hot_standby_qd)
+			LWLockAcquire(CommittedGxidArrayLock, LW_EXCLUSIVE);
+
 		shmCommittedGxidArray[(*shmNumCommittedGxacts)++] = gxid;
+
+		if (is_hot_standby_qd)
+			LWLockRelease(CommittedGxidArrayLock);
+
 		elog((Debug_print_full_dtm ? LOG : DEBUG5),
 			 "Crash recovery redo added committed distributed transaction gid = "UINT64_FORMAT, gxid);
 	}
@@ -539,7 +560,13 @@ void
 redoDistributedForgetCommitRecord(DistributedTransactionId gxid)
 {
 	int			i;
-
+	bool 			is_hot_standby_qd = IS_HOT_STANDBY_QD();
+	
+	SIMPLE_FAULT_INJECTOR("redoDistributedForgetCommitRecord");
+	/* 
+	 * Only the startup process can be modifying shmNumCommittedGxacts
+	 * and shmCommittedGxidArray. So should be OK reading the value w/o lock.
+	 */
 	for (i = 0; i < *shmNumCommittedGxacts; i++)
 	{
 		if (gxid == shmCommittedGxidArray[i])
@@ -550,13 +577,27 @@ redoDistributedForgetCommitRecord(DistributedTransactionId gxid)
 				 gxid);
 
 			/*
-			 * there's no concurrent access to shmCommittedGxidArray during
-			 * recovery
+			 * only on hot standby there might be backends that call CreateDistributedSnapshot()
+			 * to access the committed gxid array concurrently.
 			 */
+			if (is_hot_standby_qd)
+				LWLockAcquire(CommittedGxidArrayLock, LW_EXCLUSIVE);
+
 			(*shmNumCommittedGxacts)--;
 			if (i != *shmNumCommittedGxacts)
 				shmCommittedGxidArray[i] = shmCommittedGxidArray[*shmNumCommittedGxacts];
 
+			if (is_hot_standby_qd)
+				LWLockRelease(CommittedGxidArrayLock);
+
+			/* on the hot standby, we rely on the forget record to advance latestCompletedGxid */
+			if (is_hot_standby_qd)
+			{
+				LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+				if (gxid > ShmemVariableCache->latestCompletedGxid)
+					ShmemVariableCache->latestCompletedGxid = gxid;
+				LWLockRelease(ProcArrayLock);
+			}
 			return;
 		}
 	}
diff --git a/src/backend/cdb/cdbfts.c b/src/backend/cdb/cdbfts.c
index 754d3054cbb..de268b6f662 100644
--- a/src/backend/cdb/cdbfts.c
+++ b/src/backend/cdb/cdbfts.c
@@ -84,6 +84,10 @@ FtsNotifyProber(void)
 	int32			started;
 	int32			done;
 
+	/* Ignore if we don't have a FTS probe process, like a standby QD in a mirrored cluster. */
+	if (FtsProbePID() == 0)
+		return;
+
 	if (am_ftsprobe)
 		return;
 
diff --git a/src/backend/cdb/cdbgroupingpaths.c b/src/backend/cdb/cdbgroupingpaths.c
index a54c6452471..be2e0ad496a 100644
--- a/src/backend/cdb/cdbgroupingpaths.c
+++ b/src/backend/cdb/cdbgroupingpaths.c
@@ -67,6 +67,7 @@
 #include "optimizer/tlist.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_oper.h"
+#include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
 
@@ -142,6 +143,9 @@ typedef struct
 	 * partial_rel holds the partially aggregated results from the first stage.
 	 */
 	RelOptInfo *partial_rel;
+
+	/* is a DISTINCT?*/
+	bool		is_distinct;
 } cdb_agg_planning_context;
 
 typedef struct
@@ -226,6 +230,11 @@ recognize_dqa_type(cdb_agg_planning_context *ctx);
 static PathTarget *
 strip_aggdistinct(PathTarget *target);
 
+static void add_first_stage_group_agg_partial_path(PlannerInfo *root,
+										   Path *path,
+										   bool is_sorted,
+										   cdb_agg_planning_context *ctx);
+
 /*
  * cdb_create_multistage_grouping_paths
  *
@@ -300,6 +309,7 @@ cdb_create_multistage_grouping_paths(PlannerInfo *root,
 	 * across subroutines.
 	 */
 	memset(&ctx, 0, sizeof(ctx));
+	ctx.is_distinct = false;
 	ctx.can_sort = can_sort;
 	ctx.can_hash = can_hash;
 	ctx.target = target;
@@ -582,6 +592,7 @@ cdb_create_twostage_distinct_paths(PlannerInfo *root,
 	memset(&zero_agg_costs, 0, sizeof(zero_agg_costs));
 
 	memset(&ctx, 0, sizeof(ctx));
+	ctx.is_distinct = true;
 	ctx.can_sort = allow_sort;
 	ctx.can_hash = allow_hash;
 	ctx.target = target;
@@ -652,7 +663,7 @@ cdb_create_twostage_distinct_paths(PlannerInfo *root,
 	/*
 	 * All set, generate the two-stage paths.
 	 */
-	create_two_stage_paths(root, &ctx, input_rel, output_rel, NIL);
+	create_two_stage_paths(root, &ctx, input_rel, output_rel, input_rel->partial_pathlist);
 }
 
 /*
@@ -663,6 +674,7 @@ create_two_stage_paths(PlannerInfo *root, cdb_agg_planning_context *ctx,
 					   RelOptInfo *input_rel, RelOptInfo *output_rel, List *partial_pathlist)
 {
 	Path	   *cheapest_path = input_rel->cheapest_total_path;
+	Path       *cheapest_partial_path =  partial_pathlist ? (Path *) linitial(partial_pathlist) : NULL;
 
 	/*
 	 * Consider ways to do the first Aggregate stage.
@@ -700,6 +712,24 @@ create_two_stage_paths(PlannerInfo *root, cdb_agg_planning_context *ctx,
 			if (path == cheapest_path || is_sorted)
 				add_first_stage_group_agg_path(root, path, is_sorted, ctx);
 		}
+
+		if (ctx->is_distinct && partial_pathlist)
+		{
+			foreach(lc, partial_pathlist)
+			{
+				Path	   *path = (Path *) lfirst(lc);
+				bool		is_sorted;
+
+				if (cdbpathlocus_collocates_tlist(root, path->locus, ctx->group_tles))
+					continue;
+
+				is_sorted = pathkeys_contained_in(ctx->partial_needed_pathkeys,
+													path->pathkeys);
+
+			if (path == cheapest_partial_path|| is_sorted)
+				add_first_stage_group_agg_partial_path(root, path, is_sorted, ctx);
+			}
+		}
 	}
 
 	/*
@@ -721,14 +751,33 @@ create_two_stage_paths(PlannerInfo *root, cdb_agg_planning_context *ctx,
 
 	if (partial_pathlist)
 	{
-		ListCell   *lc;
+		ListCell *lc;
 
-		foreach(lc, partial_pathlist)
+		foreach (lc, partial_pathlist)
 		{
-			Path       *path = (Path *) lfirst(lc);
+			Path *path = (Path *)lfirst(lc);
 
 			if (cdbpathlocus_collocates_tlist(root, path->locus, ctx->group_tles))
 				continue;
+
+			if (ctx->is_distinct && ctx->can_hash)
+			{
+				double dNumGroups = estimate_num_groups_on_segment(ctx->dNumGroupsTotal,
+																	path->rows,
+																	path->locus);
+
+				path = (Path *) create_agg_path(root,
+											  ctx->partial_rel,
+											  path,
+											  ctx->partial_grouping_target,
+											  AGG_HASHED,
+											  ctx->hasAggs ? AGGSPLIT_INITIAL_SERIAL : AGGSPLIT_SIMPLE,
+											  parallel_query_use_streaming_hashagg, /* streaming */
+											  ctx->groupClause,
+											  NIL,
+											  ctx->agg_partial_costs,
+											  dNumGroups);
+			}
 			add_partial_path(ctx->partial_rel, path);
 		}
 	}
@@ -849,6 +898,7 @@ create_two_stage_paths(PlannerInfo *root, cdb_agg_planning_context *ctx,
 													  path->pathkeys);
 				else
 					is_sorted = false;
+
 				if (path == cheapest_first_stage_path || is_sorted)
 				{
 					add_second_stage_group_agg_path(root, path, is_sorted,
@@ -1214,7 +1264,7 @@ add_first_stage_hash_agg_path(PlannerInfo *root,
 										  ctx->partial_grouping_target,
 										  AGG_HASHED,
 										  ctx->hasAggs ? AGGSPLIT_INITIAL_SERIAL : AGGSPLIT_SIMPLE,
-										  false, /* streaming */
+										  gp_use_streaming_hashagg, /* streaming */
 										  ctx->groupClause,
 										  NIL,
 										  ctx->agg_partial_costs,
@@ -1249,6 +1299,7 @@ add_second_stage_hash_agg_path(PlannerInfo *root,
 	/*
 	 * Calculate the number of groups in the second stage, per segment.
 	 */
+	// consider parallel?
 	if (CdbPathLocus_IsPartitioned(group_locus))
 		dNumGroups = clamp_row_est(ctx->dNumGroupsTotal /
 								   CdbPathLocus_NumSegments(group_locus));
@@ -2600,7 +2651,7 @@ cdb_prepare_path_for_sorted_agg(PlannerInfo *root,
 		return subpath;
 	}
 
-	if (is_sorted && group_pathkeys)
+	if (is_sorted && group_pathkeys && (subpath->locus.parallel_workers <= 1))
 	{
 		/*
 		 * The input is already conveniently sorted. We could redistribute
@@ -2614,7 +2665,8 @@ cdb_prepare_path_for_sorted_agg(PlannerInfo *root,
 											 group_pathkeys,
 											 false, locus);
 	}
-	else if (!is_sorted && group_pathkeys)
+	else if ((is_sorted && group_pathkeys && (subpath->locus.parallel_workers > 1)) ||
+		(!is_sorted && group_pathkeys))
 	{
 		/*
 		 * If we need to redistribute, it's usually best to redistribute
@@ -2720,3 +2772,38 @@ cdb_prepare_path_for_hashed_agg(PlannerInfo *root,
 
 	return subpath;
 }
+
+static void add_first_stage_group_agg_partial_path(PlannerInfo *root,
+										   Path *path,
+										   bool is_sorted,
+										   cdb_agg_planning_context *ctx)
+{
+
+	if (ctx->agg_costs->distinctAggrefs ||
+		ctx->groupingSets)
+		return;
+
+	if (!is_sorted)
+	{
+		path = (Path *) create_sort_path(root,
+										 ctx->partial_rel,
+										 path,
+										 ctx->partial_sort_pathkeys,
+										 -1.0);
+	}
+
+	Assert(ctx->hasAggs || ctx->groupClause);
+	add_partial_path(ctx->partial_rel,
+		(Path *) create_agg_path(root,
+								 ctx->partial_rel,
+								 path,
+								 ctx->partial_grouping_target,
+								 ctx->groupClause ? AGG_SORTED : AGG_PLAIN,
+								 ctx->hasAggs ? AGGSPLIT_INITIAL_SERIAL : AGGSPLIT_SIMPLE,
+								 false, /* streaming */
+								 ctx->groupClause,
+								 NIL,
+								 ctx->agg_partial_costs,
+								 estimate_num_groups_on_segment(ctx->dNumGroupsTotal,
+																path->rows, path->locus)));
+}
diff --git a/src/backend/cdb/cdbllize.c b/src/backend/cdb/cdbllize.c
index 6469eb34bdf..da702806be5 100644
--- a/src/backend/cdb/cdbllize.c
+++ b/src/backend/cdb/cdbllize.c
@@ -161,6 +161,7 @@ get_partitioned_policy_from_path(PlannerInfo *root, Path *path)
 	ListCell   *dk_cell;
 	ListCell   *ec_cell;
 	ListCell   *em_cell;
+	bool duplicate_keys_detected = false;
 
 	/*
 	 * Is it a Hashed distribution?
@@ -184,6 +185,9 @@ get_partitioned_policy_from_path(PlannerInfo *root, Path *path)
 		DistributionKey *dk = lfirst(dk_cell);
 		bool		found_expr = false;
 
+		if (duplicate_keys_detected)
+			return NULL;
+
 		foreach(ec_cell, dk->dk_eclasses)
 		{
 			EquivalenceClass *ec = lfirst(ec_cell);
@@ -230,10 +234,17 @@ get_partitioned_policy_from_path(PlannerInfo *root, Path *path)
 						Assert(list_length(policykeys) < MaxPolicyAttributeNumber);
 
 						if (list_member_int(policykeys, attno))
-							ereport(ERROR,
-									(errcode(ERRCODE_DUPLICATE_COLUMN),
-									 errmsg("duplicate DISTRIBUTED BY column '%s'",
-											target->resname ? target->resname : "???")));
+						{
+							/*
+							 * Although the parser prevents duplicate distribution keys in regular grammar,
+							 * they can still occur in subqueries(e.g., window function PARTITION BY columns
+							 * with equivalent expressions).
+							 * We fall back to an alternative approach when duplicate distribution keys are detected;
+							 * the caller handles this scenario appropriately.
+							 */
+							duplicate_keys_detected = true;
+							break;
+						}
 
 						/*
 						 * We know the btree operator family corresponding to
@@ -310,7 +321,7 @@ get_partitioned_policy_from_path(PlannerInfo *root, Path *path)
  * returned in that case.
  *
  * TODO: This only handles a few cases. For example, INSERT INTO SELECT ...
- * is not handled, because the parser injects a subquery for ti which makes
+ * is not handled, because the parser injects a subquery for it which makes
  * it tricky.
  */
 CdbPathLocus
@@ -1506,6 +1517,7 @@ motion_sanity_walker(Node *node, sanity_result_t *result)
 	{
 		case T_Result:
 		case T_WindowAgg:
+		case T_WindowHashAgg:
 		case T_TableFunctionScan:
 		case T_ShareInputScan:
 		case T_Append:
diff --git a/src/backend/cdb/cdbmutate.c b/src/backend/cdb/cdbmutate.c
index 9672ce25b59..6fdf21d58ae 100644
--- a/src/backend/cdb/cdbmutate.c
+++ b/src/backend/cdb/cdbmutate.c
@@ -403,6 +403,14 @@ shareinput_walker(SHAREINPUT_MUTATOR f, Node *node, PlannerInfo *root)
 			foreach(cell, app->appendplans)
 				shareinput_walker(f, (Node *) lfirst(cell), root);
 		}
+		else if (IsA(node, MergeAppend))
+		{
+			ListCell   *cell;
+			MergeAppend *mapp = (MergeAppend *) node;
+
+			foreach(cell, mapp->mergeplans)
+				shareinput_walker(f, (Node *) lfirst(cell), root);
+		}
 		/* GPDB_14_MERGE_FIXME: double check on following logics. */
 		// else if (IsA(node, ModifyTable))
 		// {
@@ -651,6 +659,8 @@ shareinput_save_producer(ShareInputScan *plan, ApplyShareInputContext *ctxt)
 		ctxt->shared_input_count = new_shared_input_count;
 	}
 
+	plan->ref_set = true;
+
 	Assert(ctxt->shared_plans[share_id] == NULL);
 	ctxt->shared_plans[share_id] = plan->scan.plan.lefttree;
 }
@@ -817,8 +827,8 @@ shareinput_peekmot(ApplyShareInputContext *ctxt)
  * plan.
  *
  * To work around that issue, create a CTE for each shared input node, with
- * columns that match the target list of the SharedInputScan's subplan,
- * and replace the target list entries of the SharedInputScan with
+ * columns that match the target list of the ShareInputScan's subplan,
+ * and replace the target list entries of the ShareInputScan with
  * Vars that point to the CTE instead of the child plan.
  */
 Plan *
@@ -885,8 +895,8 @@ replace_shareinput_targetlists_walker(Node *node, PlannerInfo *root, bool fPop)
 		/*
 		 * Replace all the target list entries.
 		 *
-		 * SharedInputScan nodes are not projection-capable, so the target
-		 * list of the SharedInputScan matches the subplan's target list.
+		 * ShareInputScan nodes are not projection-capable, so the target
+		 * list of the ShareInputScan matches the subplan's target list.
 		 */
 		newtargetlist = NIL;
 		attno = 1;
diff --git a/src/backend/cdb/cdbpath.c b/src/backend/cdb/cdbpath.c
index e6b60509342..9e3697a3b03 100644
--- a/src/backend/cdb/cdbpath.c
+++ b/src/backend/cdb/cdbpath.c
@@ -2622,7 +2622,15 @@ create_motion_path_for_insert(PlannerInfo *root, GpPolicy *policy,
 			}
 
 		}
-		subpath = cdbpath_create_broadcast_motion_path(root, subpath, policy->numsegments);
+
+		/*
+		 * planner may have add a top Motion eariler.
+		 * Create table t1(id int) distributed randomly;
+		 * Create table t2 as select random() from t1 distributed replicated;
+		 * Avoid Motion if there was already one.
+		 */
+		if (!CdbPathLocus_IsReplicated(subpath->locus))
+			subpath = cdbpath_create_broadcast_motion_path(root, subpath, policy->numsegments);
 	}
 	else
 		elog(ERROR, "unrecognized policy type %u", policyType);
@@ -2956,7 +2964,6 @@ can_elide_explicit_motion(PlannerInfo *root, Index rti, Path *subpath,
  *  There was once an idea reseting path's parallel_works to avoid
  * 	Motion if inner and outer's parallel_workers doesn't match.
  * 	But there are a lot of issues we don't have a clear answer.
- *  See https://code.hashdata.xyz/cloudberry/cbdb-postgres-merge/-/issues/43.
  *
  * We couldn't expect the parallel_workers of outer or inner path.
  * Partial path may generate locus(parallel_workers=0) if needed, ex:
@@ -3653,7 +3660,7 @@ cdbpath_motion_for_parallel_join(PlannerInfo *root,
 		int sp; /* small rel parallel workers */
 		
 		/* Consider locus when parallel_ware. */
-		if(parallel_aware)
+		if (parallel_aware)
 		{
 			/* can't parallel join if both are Hashed, it should be in non-parallel path */
 			if (CdbPathLocus_IsHashed(outer.locus) &&
diff --git a/src/backend/cdb/cdbpathlocus.c b/src/backend/cdb/cdbpathlocus.c
index 04fba4b367a..29930085429 100644
--- a/src/backend/cdb/cdbpathlocus.c
+++ b/src/backend/cdb/cdbpathlocus.c
@@ -518,7 +518,8 @@ cdbpathlocus_from_subquery(struct PlannerInfo *root,
 											  rel->relids,
 											  usable_subtlist,
 											  new_vars,
-											  -1 /* not used */);
+											  -1 /* not used */,
+											  false/* not used */);
 				if (outer_ec)
 				{
 					outer_dk = makeNode(DistributionKey);
@@ -589,7 +590,7 @@ cdbpathlocus_get_distkey_exprs(CdbPathLocus locus,
 				EquivalenceClass *dk_eclass = (EquivalenceClass *) lfirst(ec_cell);
 
 				item = cdbpullup_findEclassInTargetList(dk_eclass, targetlist,
-														distkey->dk_opfamily);
+														distkey->dk_opfamily, NULL);
 
 				if (item)
 					break;
@@ -668,7 +669,8 @@ cdbpathlocus_pull_above_projection(struct PlannerInfo *root,
 											relids,
 											targetlist,
 											newvarlist,
-											newrelid);
+											newrelid,
+											true /* ignore RelabelType */);
 				if (new_ec)
 					break;
 			}
diff --git a/src/backend/cdb/cdbplan.c b/src/backend/cdb/cdbplan.c
index 1979ad38f8b..f48d8448338 100644
--- a/src/backend/cdb/cdbplan.c
+++ b/src/backend/cdb/cdbplan.c
@@ -694,6 +694,25 @@ plan_tree_mutator(Node *node,
 				return (Node *) newwindow;
 			}
 			break;
+		case T_WindowHashAgg:
+			{
+				WindowHashAgg  *window = (WindowHashAgg *) node;
+				WindowHashAgg  *newwindow;
+
+				FLATCOPY(newwindow, window, WindowHashAgg);
+				PLANMUTATE(newwindow, window);
+
+				COPYARRAY(newwindow, window, partNumCols, partColIdx);
+				COPYARRAY(newwindow, window, partNumCols, partOperators);
+
+				COPYARRAY(newwindow, window, ordNumCols, ordColIdx);
+				COPYARRAY(newwindow, window, ordNumCols, ordOperators);
+				MUTATE(newwindow->startOffset, window->startOffset, Node *);
+				MUTATE(newwindow->endOffset, window->endOffset, Node *);
+
+				return (Node *) newwindow;
+			}
+			break;
 
 		case T_Unique:
 			{
diff --git a/src/backend/cdb/cdbpullup.c b/src/backend/cdb/cdbpullup.c
index c6f243ae08a..a7aa6486856 100644
--- a/src/backend/cdb/cdbpullup.c
+++ b/src/backend/cdb/cdbpullup.c
@@ -241,7 +241,7 @@ cdbpullup_expr(Expr *expr, List *targetlist, List *newvarlist, Index newvarno)
  */
 Expr *
 cdbpullup_findEclassInTargetList(EquivalenceClass *eclass, List *targetlist,
-								 Oid hashOpFamily)
+								 Oid hashOpFamily, bool *relabel_stripped)
 {
 	ListCell   *lc;
 
@@ -276,7 +276,11 @@ cdbpullup_findEclassInTargetList(EquivalenceClass *eclass, List *targetlist,
 		 *-------
 		 */
 		while (IsA(key, RelabelType))
+		{
 			key = (Expr *) ((RelabelType *) key)->arg;
+			if(relabel_stripped && (!*relabel_stripped))
+				*relabel_stripped = true;
+		}
 
 		foreach(lc_tle, targetlist)
 		{
@@ -293,7 +297,11 @@ cdbpullup_findEclassInTargetList(EquivalenceClass *eclass, List *targetlist,
 			/* ignore RelabelType nodes on both sides */
 			naked_tlexpr = tlexpr;
 			while (naked_tlexpr && IsA(naked_tlexpr, RelabelType))
+			{
 				naked_tlexpr = (Node *) ((RelabelType *) naked_tlexpr)->arg;
+				if(relabel_stripped && (!*relabel_stripped))
+					*relabel_stripped = true;
+			}
 
 			if (IsA(key, Var))
 			{
@@ -342,7 +350,7 @@ cdbpullup_truncatePathKeysForTargetList(List *pathkeys, List *targetlist)
 	{
 		PathKey	   *pk = (PathKey *) lfirst(lc);
 
-		if (!cdbpullup_findEclassInTargetList(pk->pk_eclass, targetlist, InvalidOid))
+		if (!cdbpullup_findEclassInTargetList(pk->pk_eclass, targetlist, InvalidOid, NULL))
 			break;
 
 		new_pathkeys = lappend(new_pathkeys, pk);
diff --git a/src/backend/cdb/cdbsetop.c b/src/backend/cdb/cdbsetop.c
index 8be3341c9cb..3b3380704b0 100644
--- a/src/backend/cdb/cdbsetop.c
+++ b/src/backend/cdb/cdbsetop.c
@@ -88,6 +88,7 @@ choose_setop_type(List *pathlist, List *tlist_list)
 				break;
 
 			case CdbLocusType_Replicated:
+				ok_partitioned = false;
 				break;
 
 			case CdbLocusType_ReplicatedWorkers:
@@ -231,6 +232,7 @@ adjust_setop_arguments(PlannerInfo *root, List *pathlist, List *tlist_list, GpSe
 					case CdbLocusType_HashedWorkers:
 					case CdbLocusType_HashedOJ:
 					case CdbLocusType_Strewn:
+					case CdbLocusType_Replicated:
 						/* Gather to QE.  No need to keep ordering. */
 						CdbPathLocus_MakeSingleQE(&locus, getgpsegmentCount());
 						adjusted_path = cdbpath_create_motion_path(root, subpath, NULL, false,
@@ -254,7 +256,6 @@ adjust_setop_arguments(PlannerInfo *root, List *pathlist, List *tlist_list, GpSe
 
 					case CdbLocusType_Entry:
 					case CdbLocusType_Null:
-					case CdbLocusType_Replicated:
 					case CdbLocusType_ReplicatedWorkers:
 					case CdbLocusType_End:
 						ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),
diff --git a/src/backend/cdb/cdbtargeteddispatch.c b/src/backend/cdb/cdbtargeteddispatch.c
index b297164e273..da6f40c5971 100644
--- a/src/backend/cdb/cdbtargeteddispatch.c
+++ b/src/backend/cdb/cdbtargeteddispatch.c
@@ -522,6 +522,7 @@ DirectDispatchUpdateContentIdsFromPlan(PlannerInfo *root, Plan *plan)
 			DisableTargetedDispatch(&dispatchInfo);
 			break;
 		case T_WindowAgg:
+		case T_WindowHashAgg:
 		case T_TableFunctionScan:
 		case T_RecursiveUnion:
 			/* no change to dispatchInfo */
diff --git a/src/backend/cdb/cdbtm.c b/src/backend/cdb/cdbtm.c
index f0cd5fcb3f6..37550261149 100644
--- a/src/backend/cdb/cdbtm.c
+++ b/src/backend/cdb/cdbtm.c
@@ -264,6 +264,21 @@ currentDtxActivate(void)
 {
 	bool signal_dtx_recovery;
 
+	/*
+	 * A hot standby transaction does not have a valid gxid, so can skip 
+	 * most of the things in this function. We still explicitly set some 
+	 * fields that are irrelevant to hot standby for cleanness.
+	 */
+	if (IS_HOT_STANDBY_QD())
+	{
+		/* standby QD will stay in this state until transaction completed */
+		setCurrentDtxState(DTX_STATE_ACTIVE_DISTRIBUTED);
+		MyTmGxact->sessionId = gp_session_id;
+		MyTmGxact->gxid = InvalidDistributedTransactionId;
+		MyTmGxact->includeInCkpt = false;
+		return;
+	}
+
 	if (ShmemVariableCache->GxidCount <= GXID_PRETCH_THRESHOLD &&
 		(GetDtxRecoveryEvent() & DTX_RECOVERY_EVENT_BUMP_GXID) == 0)
 	{
@@ -1644,7 +1659,7 @@ isDtxQueryDispatcher(void)
 	isSharedLocalSnapshotSlotPresent = (SharedLocalSnapshotSlot != NULL);
 
 	return (Gp_role == GP_ROLE_DISPATCH &&
-			isDtmStarted &&
+			(isDtmStarted || EnableHotStandby) &&
 			isSharedLocalSnapshotSlotPresent);
 }
 
@@ -2047,6 +2062,8 @@ sendDtxExplicitBegin(void)
 static void
 performDtxProtocolPrepare(const char *gid)
 {
+	SIMPLE_FAULT_INJECTOR("qe_start_prepared");
+
 	StartTransactionCommand();
 
 	elog(DTM_DEBUG5, "performDtxProtocolCommand going to call PrepareTransactionBlock for distributed transaction (id = '%s')", gid);
@@ -2126,6 +2143,7 @@ performDtxProtocolCommitOnePhase(const char *gid)
 static void
 performDtxProtocolCommitPrepared(const char *gid, bool raiseErrorIfNotFound)
 {
+	SIMPLE_FAULT_INJECTOR("qe_start_commit_prepared");
 	Assert(Gp_role == GP_ROLE_EXECUTE);
 
 	elog(DTM_DEBUG5,
@@ -2158,6 +2176,7 @@ performDtxProtocolCommitPrepared(const char *gid, bool raiseErrorIfNotFound)
 	sendWaitGxidsToQD(waitGxids);
 
 	finishDistributedTransactionContext("performDtxProtocolCommitPrepared -- Commit Prepared", false);
+	SIMPLE_FAULT_INJECTOR("finish_commit_prepared");
 }
 
 /**
diff --git a/src/backend/cdb/cdbutil.c b/src/backend/cdb/cdbutil.c
index 1671b17223b..fbf3f8900f2 100644
--- a/src/backend/cdb/cdbutil.c
+++ b/src/backend/cdb/cdbutil.c
@@ -92,6 +92,7 @@ static int	CdbComponentDatabaseInfoCompare(const void *p1, const void *p2);
 
 static GpSegConfigEntry * readGpSegConfigFromCatalog(int *total_dbs);
 static GpSegConfigEntry * readGpSegConfigFromFTSFiles(int *total_dbs);
+static GpSegConfigEntry * readGpSegConfigFromFiles(int *total_dbs);
 
 static void getAddressesForDBid(GpSegConfigEntry *c, int elevel);
 static HTAB *hostPrimaryCountHashTableInit(void);
@@ -122,7 +123,7 @@ typedef struct HostPrimaryCountEntry
  *
  * In phase 2 of 2PC, current xact has been marked to TRANS_COMMIT/ABORT,
  * COMMIT_PREPARED or ABORT_PREPARED DTM are performed, if they failed,
- * dispather disconnect and destroy all gangs and fetch the latest segment
+ * dispatcher disconnect and destroy all gangs and fetch the latest segment
  * configurations to do RETRY_COMMIT_PREPARED or RETRY_ABORT_PREPARED,
  * however, postgres disallow catalog lookups outside of xacts.
  *
@@ -131,6 +132,15 @@ typedef struct HostPrimaryCountEntry
  */
 static GpSegConfigEntry *
 readGpSegConfigFromFTSFiles(int *total_dbs)
+{
+	Assert(!IsTransactionState() && !IS_HOT_DR_CLUSTER());
+	/* notify and wait FTS to finish a probe and update the dump file */
+	FtsNotifyProber();
+	return readGpSegConfigFromFiles(total_dbs);
+}
+
+static GpSegConfigEntry *
+readGpSegConfigFromFiles(int *total_dbs)
 {
 	FILE	*fd;
 	int		idx = 0;
@@ -142,11 +152,6 @@ readGpSegConfigFromFTSFiles(int *total_dbs)
 	char	address[MAXHOSTNAMELEN];
 	char	buf[MAXHOSTNAMELEN * 2 + 32];
 
-	Assert(!IsTransactionState());
-
-	/* notify and wait FTS to finish a probe and update the dump file */
-	FtsNotifyProber();	
-
 	fd = AllocateFile(GPSEGCONFIGDUMPFILE, "r");
 
 	if (!fd)
@@ -188,6 +193,18 @@ readGpSegConfigFromFTSFiles(int *total_dbs)
 	return configs;
 }
 
+bool
+checkGpSegConfigFtsFiles()
+{
+	FILE *fd = AllocateFile(GPSEGCONFIGDUMPFILE, "r");
+
+	if (!fd)
+		return false;
+
+	FreeFile(fd);
+	return true;
+}
+
 /*
  * writeGpSegConfigToFTSFiles() dump gp_segment_configuration to the file
  * GPSEGCONFIGDUMPFILE, in $PGDATA, only FTS process can use this function.
@@ -372,10 +389,17 @@ getCdbComponentInfo(void)
 
 	HTAB	   *hostPrimaryCountHash = hostPrimaryCountHashTableInit();
 
-	if (IsTransactionState())
-		configs = readGpSegConfigFromCatalog(&total_dbs);
+	if (EnableHotDR)
+	{
+		configs = readGpSegConfigFromFiles(&total_dbs);
+	}
 	else
-		configs = readGpSegConfigFromFTSFiles(&total_dbs);
+	{
+		if (IsTransactionState())
+			configs = readGpSegConfigFromCatalog(&total_dbs);
+		else
+			configs = readGpSegConfigFromFTSFiles(&total_dbs);
+	}
 
 	component_databases = palloc0(sizeof(CdbComponentDatabases));
 
@@ -565,7 +589,7 @@ getCdbComponentInfo(void)
 	{
 		cdbInfo = &component_databases->segment_db_info[i];
 
-		if (cdbInfo->config->role != GP_SEGMENT_CONFIGURATION_ROLE_PRIMARY)
+		if (!IS_HOT_STANDBY_QD() && cdbInfo->config->role != GP_SEGMENT_CONFIGURATION_ROLE_PRIMARY)
 			continue;
 
 		hsEntry = (HostPrimaryCountEntry *) hash_search(hostPrimaryCountHash, cdbInfo->config->hostname, HASH_FIND, &found);
@@ -577,7 +601,7 @@ getCdbComponentInfo(void)
 	{
 		cdbInfo = &component_databases->entry_db_info[i];
 
-		if (cdbInfo->config->role != GP_SEGMENT_CONFIGURATION_ROLE_PRIMARY)
+		if (!IS_HOT_STANDBY_QD() && cdbInfo->config->role != GP_SEGMENT_CONFIGURATION_ROLE_PRIMARY)
 			continue;
 
 		hsEntry = (HostPrimaryCountEntry *) hash_search(hostPrimaryCountHash, cdbInfo->config->hostname, HASH_FIND, &found);
@@ -1005,7 +1029,16 @@ cdbcomponent_getComponentInfo(int contentId)
 	/* entry db */
 	if (contentId == -1)
 	{
-		cdbInfo = &cdbs->entry_db_info[0];	
+		Assert(cdbs->total_entry_dbs == 1 || cdbs->total_entry_dbs == 2);
+		/*
+		 * For a standby QD, get the last entry db which can be the first (on
+		 * a replica cluster) or the second (on a mirrored cluster) entry.
+		 */
+		if (IS_HOT_STANDBY_QD())
+			cdbInfo = &cdbs->entry_db_info[cdbs->total_entry_dbs - 1];
+		else
+			cdbInfo = &cdbs->entry_db_info[0];	
+
 		return cdbInfo;
 	}
 
@@ -1022,10 +1055,10 @@ cdbcomponent_getComponentInfo(int contentId)
 		Assert(cdbs->total_segment_dbs == cdbs->total_segments * 2);
 		cdbInfo = &cdbs->segment_db_info[2 * contentId];
 
-		if (!SEGMENT_IS_ACTIVE_PRIMARY(cdbInfo))
-		{
+		/* use the other segment if it is not what the QD wants */
+		if ((IS_HOT_STANDBY_QD() && SEGMENT_IS_ACTIVE_PRIMARY(cdbInfo)) 
+						|| (!IS_HOT_STANDBY_QD() && !SEGMENT_IS_ACTIVE_PRIMARY(cdbInfo)))
 			cdbInfo = &cdbs->segment_db_info[2 * contentId + 1];
-		}
 
 		return cdbInfo;
 	}
@@ -1124,10 +1157,21 @@ cdb_setup(void)
 	 *
 	 * Ignore background worker because bgworker_should_start_mpp() already did
 	 * the check.
+	 *
+	 * Ignore if we are the standby coordinator started in hot standby mode.
+	 * We don't expect dtx recovery to have finished, as dtx recovery is
+	 * performed at the end of startup. In hot standby, we are recovering
+	 * continuously and should allow queries much earlier. Since a hot standby
+	 * won't proceed dtx, it is not required to wait for recovery of the dtx
+	 * that has been prepared but not committed (i.e. to commit them); on the
+	 * other hand, the recovery of any in-doubt transactions (i.e. not prepared)
+	 * won't bother a hot standby either, just like they can be recovered in the 
+	 * background when a primary instance is running.
 	 */
 	if (!IsBackgroundWorker &&
 		Gp_role == GP_ROLE_DISPATCH &&
-		!*shmDtmStarted)
+		!*shmDtmStarted &&
+		!IS_HOT_STANDBY_QD())
 	{
 		ereport(FATAL,
 				(errcode(ERRCODE_CANNOT_CONNECT_NOW),
diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c
index 9db3389e0bf..c6540a8a8d5 100644
--- a/src/backend/cdb/cdbvars.c
+++ b/src/backend/cdb/cdbvars.c
@@ -17,9 +17,11 @@
  *
  *-------------------------------------------------------------------------
  */
+#include "catalog/pg_collation_d.h"
 #include "postgres.h"
 
 #include "miscadmin.h"
+#include "regex/regex.h"
 #include "utils/guc.h"
 #include "cdb/cdbvars.h"
 #include "libpq-fe.h"
@@ -198,6 +200,8 @@ int			Gp_interconnect_queue_depth = 4;	/* max number of messages
 												 * waiting in rx-queue before
 												 * we drop. */
 int			Gp_interconnect_snd_queue_depth = 2;
+int			Gp_interconnect_mem_size = 10;
+int			Gp_interconnect_cursor_ic_table_size = 128;
 int			Gp_interconnect_timer_period = 5;
 int			Gp_interconnect_timer_checking_period = 20;
 int			Gp_interconnect_default_rtt = 20;
@@ -567,6 +571,44 @@ gpvars_show_gp_resource_manager_policy(void)
 	}
 }
 
+bool gpvars_check_gp_resource_group_cgroup_parent(char **newval, void **extra, GucSource source)
+{
+	int		  regres;
+	char	  err[128];
+	regex_t  re;
+	char	 *pattern = "^[0-9a-zA-Z][-._0-9a-zA-Z]*$";
+	pg_wchar *wpattern = palloc((strlen(pattern) + 1) * sizeof(pg_wchar));
+	int		  wlen = pg_mb2wchar_with_len(pattern, wpattern, strlen(pattern));
+	pg_wchar *data = palloc((strlen(*newval) + 1) * sizeof(pg_wchar));
+	int		  data_len = pg_mb2wchar_with_len(*newval, data, sizeof(*newval));
+	bool	  match = true;
+
+	regres = pg_regcomp(&re, wpattern, wlen, REG_ADVANCED, DEFAULT_COLLATION_OID);
+	if (regres != REG_OKAY)
+	{
+		pg_regerror(regres, &re, err, sizeof(err));
+		GUC_check_errmsg("compile regex failed: %s", err);
+
+		pfree(wpattern);
+		pfree(data);
+
+		return false;
+	}
+
+	regres = pg_regexec(&re, data, data_len, 0, NULL, 0, NULL, 0);
+	if (regres != REG_OKAY)
+	{
+		match = false;
+		GUC_check_errmsg("gp_resource_group_cgroup_parent can only contains alphabet, number and non-leading . _ -");
+	}
+
+	pg_regfree(&re);
+	pfree(wpattern);
+	pfree(data);
+
+	return match;
+}
+
 /*
  * gpvars_assign_statement_mem
  */
diff --git a/src/backend/cdb/dispatcher/cdbdisp_query.c b/src/backend/cdb/dispatcher/cdbdisp_query.c
index 99f5179e756..c21cfd935f9 100644
--- a/src/backend/cdb/dispatcher/cdbdisp_query.c
+++ b/src/backend/cdb/dispatcher/cdbdisp_query.c
@@ -138,7 +138,7 @@ static SerializedParams *serializeParamsForDispatch(QueryDesc *queryDesc,
 													ParamExecData *execParams,
 													Bitmapset *sendParams);
 
-static Bitmapset* process_epd_iud_internal(List* subtagdata);
+static List* process_epd_iud_internal(List* subtagdata);
 
 /*
  * Compose and dispatch the MPPEXEC commands corresponding to a plan tree
@@ -867,6 +867,7 @@ buildGpQueryString(DispatchCommandQueryParms *pQueryParms,
 {
 	const char *command = pQueryParms->strCommand;
 	int			command_len;
+	int			is_hs_dispatch = IS_HOT_STANDBY_QD() ? 1 : 0;
 	const char *plantree = pQueryParms->serializedPlantree;
 	int			plantree_len = pQueryParms->serializedPlantreelen;
 	const char *sddesc = pQueryParms->serializedQueryDispatchDesc;
@@ -921,6 +922,7 @@ buildGpQueryString(DispatchCommandQueryParms *pQueryParms,
 		sizeof(outerUserId) /* outerUserIsSuper */ +
 		sizeof(currentUserId) +
 		sizeof(n32) * 2 /* currentStatementStartTimestamp */ +
+		sizeof(is_hs_dispatch) +
 		sizeof(command_len) +
 		sizeof(plantree_len) +
 		sizeof(sddesc_len) +
@@ -976,6 +978,10 @@ buildGpQueryString(DispatchCommandQueryParms *pQueryParms,
 	memcpy(pos, &n32, sizeof(n32));
 	pos += sizeof(n32);
 
+	tmp = htonl(is_hs_dispatch);
+	memcpy(pos, &tmp, sizeof(is_hs_dispatch));
+	pos += sizeof(is_hs_dispatch);
+
 	tmp = htonl(command_len);
 	memcpy(pos, &tmp, sizeof(command_len));
 	pos += sizeof(command_len);
@@ -1729,7 +1735,7 @@ ConsumeExtendProtocolData(ExtendProtocolSubTag subtag)
 }
 
 void
-ConsumeAndProcessExtendProtocolData_IUD(Bitmapset **inserted, Bitmapset **updated, Bitmapset **deleted)
+ConsumeAndProcessExtendProtocolData_IUD(List **inserted, List **updated, List **deleted)
 {
 	List *ilist = NIL;
 	List *ulist = NIL;
@@ -1749,10 +1755,10 @@ ConsumeAndProcessExtendProtocolData_IUD(Bitmapset **inserted, Bitmapset **update
 	return;
 }
 
-static Bitmapset*
+static List*
 process_epd_iud_internal(List* subtagdata)
 {
-	Bitmapset	*res = NULL;
+	List		*res = NIL;
 	ListCell 	*lc;
 	int 		count;
 
@@ -1763,10 +1769,10 @@ process_epd_iud_internal(List* subtagdata)
 		data += sizeof(int);
 		for (int i = 0; i < count; i++)
 		{
-			int relid;
-			memcpy(&relid, data, sizeof(int));
-			data += sizeof(int);
-			res = bms_add_member(res, relid);
+			Oid relid;
+			memcpy(&relid, data, sizeof(Oid));
+			data += sizeof(Oid);
+			res = list_append_unique_oid(res, relid);
 		}
 	}
 	return res;
diff --git a/src/backend/cdb/dispatcher/cdbgang.c b/src/backend/cdb/dispatcher/cdbgang.c
index 780ddef0f42..87ce88504b0 100644
--- a/src/backend/cdb/dispatcher/cdbgang.c
+++ b/src/backend/cdb/dispatcher/cdbgang.c
@@ -698,8 +698,7 @@ getCdbProcessesForQD(int isPrimary)
 
 	qdinfo = cdbcomponent_getComponentInfo(MASTER_CONTENT_ID);
 
-	Assert(qdinfo->config->segindex == -1);
-	Assert(SEGMENT_IS_ACTIVE_PRIMARY(qdinfo));
+	Assert((qdinfo->config->segindex == -1 && SEGMENT_IS_ACTIVE_PRIMARY(qdinfo)) || IS_HOT_STANDBY_QD());
 	Assert(qdinfo->config->hostip != NULL);
 
 	proc = makeNode(CdbProcess);
diff --git a/src/backend/cdb/dispatcher/test/cdbdisp_query_test.c b/src/backend/cdb/dispatcher/test/cdbdisp_query_test.c
new file mode 100644
index 00000000000..6e07aebcc96
--- /dev/null
+++ b/src/backend/cdb/dispatcher/test/cdbdisp_query_test.c
@@ -0,0 +1,341 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include "cmockery.h"
+#include "postgres.h"
+
+#include "storage/ipc.h"
+#include "storage/proc.h"
+
+#include "../cdbdisp_query.c"
+
+
+#undef PG_RE_THROW
+#define PG_RE_THROW() siglongjmp(*PG_exception_stack, 1)
+
+
+int			__wrap_errmsg(const char *fmt,...);
+int			__wrap_errcode(int sqlerrcode);
+bool		__wrap_errstart(int elevel, const char *filename, int lineno,
+							const char *funcname, const char *domain);
+void		__wrap_errfinish(int dummy __attribute__((unused)),...);
+Gang	   *__wrap_cdbgang_createGang_async(List *segments, SegmentType segmentType);
+int			__wrap_pqPutMsgStart(char msg_type, bool force_len, PGconn *conn);
+int			__wrap_PQcancel(PGcancel *cancel, char *errbuf, int errbufsize);
+char	   *__wrap_serializeNode(Node *node, int *size, int *uncompressed_size_out);
+char	   *__wrap_qdSerializeDtxContextInfo(int *size, bool wantSnapshot, bool inCursor, int txnOptions, char *debugCaller);
+void		__wrap_VirtualXactLockTableInsert(VirtualTransactionId vxid);
+void		__wrap_AcceptInvalidationMessages(void);
+static void terminate_process();
+
+
+int
+__wrap_errmsg(const char *fmt,...)
+{
+	check_expected(fmt);
+	optional_assignment(fmt);
+	return (int) mock();
+}
+
+
+int
+__wrap_errcode(int sqlerrcode)
+{
+	check_expected(sqlerrcode);
+	return (int) mock();
+}
+
+
+bool
+__wrap_errstart(int elevel, const char *filename, int lineno,
+				const char *funcname, const char *domain)
+{
+	if (elevel < LOG)
+		return false;
+
+	check_expected(elevel);
+	check_expected(filename);
+	check_expected(lineno);
+	check_expected(funcname);
+	check_expected(domain);
+	optional_assignment(filename);
+	optional_assignment(funcname);
+	optional_assignment(domain);
+	return (bool) mock();
+}
+
+
+void
+__wrap_errfinish(int dummy __attribute__((unused)),...)
+{
+	PG_RE_THROW();
+}
+
+
+static void
+expect_ereport(int expect_elevel)
+{
+	expect_any(__wrap_errmsg, fmt);
+	will_be_called(__wrap_errmsg);
+
+	expect_any(__wrap_errcode, sqlerrcode);
+	will_be_called(__wrap_errcode);
+
+	expect_value(__wrap_errstart, elevel, expect_elevel);
+	expect_any(__wrap_errstart, filename);
+	expect_any(__wrap_errstart, lineno);
+	expect_any(__wrap_errstart, funcname);
+	expect_any(__wrap_errstart, domain);
+	if (expect_elevel < ERROR)
+	{
+		will_return(__wrap_errstart, false);
+	}
+	else
+	{
+		will_return(__wrap_errstart, true);
+	}
+}
+
+
+Gang *
+__wrap_cdbgang_createGang_async(List *segments, SegmentType segmentType)
+{
+	MemoryContext oldContext = MemoryContextSwitchTo(DispatcherContext);
+	Gang	   *gang = buildGangDefinition(segments, segmentType);
+
+	MemoryContextSwitchTo(oldContext);
+
+	PGconn	   *conn = (PGconn *) malloc(sizeof(PGconn));
+
+	MemSet(conn, 0, sizeof(PGconn));
+	initPQExpBuffer(&conn->errorMessage);
+	initPQExpBuffer(&conn->workBuffer);
+	gang->db_descriptors[0]->conn = conn;
+
+	return gang;
+}
+
+
+int
+__wrap_pqPutMsgStart(char msg_type, bool force_len, PGconn *conn)
+{
+	if (conn->outBuffer_shared)
+		fail_msg("Mustn't send something else during dispatch!");
+	check_expected(msg_type);
+	check_expected(force_len);
+	check_expected(conn);
+	optional_assignment(conn);
+	return (int) mock();
+}
+
+
+int
+__wrap_PQcancel(PGcancel *cancel, char *errbuf, int errbufsize)
+{
+	return (int) mock();
+}
+
+
+char *
+__wrap_serializeNode(Node *node, int *size, int *uncompressed_size_out)
+{
+	const int	alloc_size = 1024;
+
+	if (size != NULL)
+		*size = alloc_size;
+	if (uncompressed_size_out != NULL)
+		*uncompressed_size_out = alloc_size;
+
+	return (char *) palloc(alloc_size);
+}
+
+
+char *
+__wrap_qdSerializeDtxContextInfo(int *size, bool wantSnapshot, bool inCursor, int txnOptions, char *debugCaller)
+{
+	const int	alloc_size = 1024;
+
+	assert_int_not_equal(size, NULL);
+	*size = alloc_size;
+
+	return (char *) palloc(alloc_size);
+}
+
+
+void
+__wrap_VirtualXactLockTableInsert(VirtualTransactionId vxid)
+{
+	mock();
+}
+
+void
+__wrap_AcceptInvalidationMessages(void)
+{
+	mock();
+}
+
+
+static void
+terminate_process()
+{
+	die(SIGTERM);
+}
+
+/*
+ * Test query may be interrupted during plan dispatching
+ */
+static void
+test__CdbDispatchPlan_may_be_interrupted(void **state)
+{
+	PlannedStmt *plannedstmt = (PlannedStmt *) palloc(sizeof(PlannedStmt));
+
+	/* slice table is needed to allocate gang */
+	plannedstmt->slices = palloc0(sizeof(PlanSlice));
+	plannedstmt->numSlices = 1;
+	PlanSlice  *slice = &plannedstmt->slices[0];
+
+	slice->sliceIndex = 1;
+	slice->gangType = GANGTYPE_PRIMARY_READER;
+	slice->numsegments = 1;
+	slice->parentIndex = -1;
+	slice->segindex = 0;
+
+	QueryDesc  *queryDesc = (QueryDesc *) palloc(sizeof(QueryDesc));
+
+	queryDesc->plannedstmt = plannedstmt;
+	/* ddesc->secContext is filled in cdbdisp_buildPlanQueryParms() */
+	queryDesc->ddesc = (QueryDispatchDesc *) palloc(sizeof(QueryDispatchDesc));
+	/* source text is required for buildGpQueryString() */
+	queryDesc->sourceText = "select a from t1;";
+
+	queryDesc->estate = CreateExecutorState();
+
+	/* will be called multiple times in e.g. FtsNotifyProber/getCdbComponentInfo */
+	will_return_count(RecoveryInProgress, false, -1);
+
+	/* cdbcomponent_getCdbComponents() mocks */
+	will_be_called(FtsNotifyProber);
+	will_return(getFtsVersion, 1);
+	will_return(GetGpExpandVersion, 1);
+
+	/* StartTransactionCommand() mocks */
+	will_be_called(__wrap_VirtualXactLockTableInsert);
+	will_be_called(__wrap_AcceptInvalidationMessages);
+	will_be_called(initialize_wal_bytes_written);
+
+	/*
+	 * cdbdisp_dispatchToGang()
+	 *
+	 * start sending MPP query to QE inside PQsendGpQuery_shared() replace
+	 * connection buffer with the shared one
+	 */
+	expect_any(PQsendQueryStart, conn);
+	will_return(PQsendQueryStart, true);
+
+	/* first try to flush MPP query inside PQsendGpQuery_shared() */
+	expect_any(pqFlushNonBlocking, conn);
+	will_return(pqFlushNonBlocking, 1);
+
+	/*
+	 * cdbdisp_waitDispatchFinish()
+	 *
+	 * query will be interrupted before poll()
+	 */
+	expect_any_count(ResetWaitEventSet, pset, 2);
+	expect_any_count(ResetWaitEventSet, context, 2);
+	expect_any_count(ResetWaitEventSet, nevents, 2);
+	will_be_called_count(ResetWaitEventSet, 2);
+
+	expect_any(pqFlushNonBlocking, conn);
+	will_return_with_sideeffect(pqFlushNonBlocking, 1, &terminate_process, NULL);
+
+	expect_any(SetLatch, latch);
+	will_be_called(SetLatch);
+
+	expect_any(AddWaitEventToSet, set);
+	expect_any(AddWaitEventToSet, events);
+	expect_any(AddWaitEventToSet, fd);
+	expect_any(AddWaitEventToSet, latch);
+	expect_any(AddWaitEventToSet, user_data);
+	will_be_called(AddWaitEventToSet);
+
+	will_return(IsLogicalLauncher, false);
+
+	/* process was terminated by administrative command */
+	expect_ereport(FATAL);
+
+	/* QD will trying to cancel queries on QEs */
+	will_return(__wrap_PQcancel, true);
+
+	/* during close and free connection */
+	expect_any_count(pqClearAsyncResult, conn, 2);
+	will_be_called_count(pqClearAsyncResult, 2);
+
+	/*
+	 * BUT! pqPutMsgStart mustn't be called
+	 *
+	 * we can't send termination message (X) until shared message isn't sent
+	 * out the buffer completely
+	 */
+
+	/*
+	 * dirty hack. cluster topology needed to allocate gangs is loaded from
+	 * gpsegconfig_dump outside of transaction
+	 */
+	cdbcomponent_getCdbComponents();
+
+	StartTransactionCommand();
+
+	PG_TRY();
+	{
+		queryDesc->estate->es_sliceTable = InitSliceTable(queryDesc->estate, plannedstmt);
+
+		CdbDispatchPlan(queryDesc, queryDesc->estate->es_param_exec_vals,
+						false, false);
+		fail();
+	}
+	PG_CATCH();
+	{
+		/*
+		 * SIGTERM handling emulation gpdb bail out from CheckDispatchResult
+		 * without flushing unsent messages in case of process exit in
+		 * progress AtAbort_DispatcherState will be called during transaction
+		 * abort
+		 */
+		proc_exit_inprogress = true;
+
+		AtAbort_DispatcherState();
+	}
+	PG_END_TRY();
+}
+
+int
+main(int argc, char *argv[])
+{
+	cmockery_parse_arguments(argc, argv);
+
+	const		UnitTest tests[] =
+	{
+		unit_test(test__CdbDispatchPlan_may_be_interrupted)
+	};
+
+	Gp_role = GP_ROLE_DISPATCH;
+	/* to start transaction */
+	PGPROC		proc;
+
+	MyBackendId = 7;
+	proc.backendId = MyBackendId;
+	MyProc = &proc;
+	/* to build cdb components info */
+	GpIdentity.dbid = 1;
+	GpIdentity.segindex = -1;
+
+	MemoryContextInit();
+
+	/* to avoid mocking cdbtm.c functions */
+	MyTmGxactLocal = (TMGXACTLOCAL *) MemoryContextAllocZero(TopMemoryContext, sizeof(TMGXACTLOCAL));
+
+	SetSessionUserId(1000, true);
+
+	return run_tests(tests);
+}
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 7a6428627f6..0b6261dc61f 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -148,9 +148,6 @@
  */
 #define GP_HLL_ERROR_MARGIN  0.003
 
-/* Fix attr number of return record of function gp_acquire_sample_rows */
-#define FIX_ATTR_NUM  3
-
 /* Per-index data for ANALYZE */
 typedef struct AnlIndexData
 {
@@ -170,7 +167,7 @@ static BufferAccessStrategy vac_strategy;
 
 Bitmapset	**acquire_func_colLargeRowIndexes;
 double		 *acquire_func_colLargeRowLength;
-
+double		 *acquire_func_colNDVBySeg;
 
 static void do_analyze_rel(Relation onerel,
 						   VacuumParams *params, List *va_cols,
@@ -183,13 +180,22 @@ static void compute_index_stats(Relation onerel, double totalrows,
 								MemoryContext col_context);
 static VacAttrStats *examine_attribute(Relation onerel, int attnum,
 									   Node *index_expr, int elevel);
+static int acquire_sample_rows(Relation onerel, int elevel,
+							   HeapTuple *rows, int targrows,
+							   double *totalrows, double *totaldeadrows);
 static int acquire_sample_rows_dispatcher(Relation onerel, bool inh, int elevel,
 										  HeapTuple *rows, int targrows,
 										  double *totalrows, double *totaldeadrows);
+static int gp_acquire_sample_rows_func(Relation onerel, int elevel,
+									   HeapTuple *rows, int targrows,
+									   double *totalrows, double *totaldeadrows);
 static BlockNumber acquire_index_number_of_blocks(Relation indexrel, Relation tablerel);
 
 static void gp_acquire_correlations_dispatcher(Oid relOid, bool inh, float4 *correlations, bool *correlationsIsNull);
 static int	compare_rows(const void *a, const void *b);
+static int	acquire_inherited_sample_rows(Relation onerel, int elevel,
+										  HeapTuple *rows, int targrows,
+										  double *totalrows, double *totaldeadrows);
 static void update_attstats(Oid relid, bool inh,
 							int natts, VacAttrStats **vacattrstats);
 static Datum std_fetch_func(VacAttrStatsP stats, int rownum, bool *isNull);
@@ -349,16 +355,11 @@ analyze_rel_internal(Oid relid, RangeVar *relation,
 		onerel->rd_rel->relkind == RELKIND_MATVIEW ||
 		onerel->rd_rel->relkind == RELKIND_DIRECTORY_TABLE)
 	{
-		/* Regular table, so we'll use the regular row acquisition function */
-		if (onerel->rd_tableam)
-			acquirefunc = onerel->rd_tableam->acquire_sample_rows;
-
 		/*
-		 * If the TableAmRoutine's acquire_sample_rows if NULL, we use
-		 * acquire_sample_rows as default.
+		 * If the TableAmRoutine's gp_acquire_sample_rows_func if NULL, we use
+		 * gp_acquire_sample_rows_func as default.
 		 */
-		if (acquirefunc == NULL)
-			acquirefunc = acquire_sample_rows;
+		acquirefunc = gp_acquire_sample_rows_func;
 
 		/* Also get regular table's size */
 		relpages = AcquireNumberOfBlocks(onerel);
@@ -496,6 +497,7 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 
 	Bitmapset **colLargeRowIndexes;
 	double     *colLargeRowLength;
+	double     *colNDVBySeg;
 	bool		sample_needed;
 
 	int64		AnalyzePageHit = VacuumPageHit;
@@ -713,8 +715,10 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 	 * statistics target. So we may need to sample more rows and then build
 	 * the statistics with enough detail.
 	 */
-	minrows = ComputeExtStatisticsRows(onerel, attr_cnt, vacattrstats);
-	
+	if (IS_QD_OR_SINGLENODE())
+		minrows = ComputeExtStatisticsRows(onerel, attr_cnt, vacattrstats);
+	else
+		minrows = 0;
 
 	if (targrows < minrows)
 		targrows = minrows;
@@ -736,7 +740,7 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 	}
 	colLargeRowIndexes = (Bitmapset **) palloc0(sizeof(Bitmapset *) * max_natts);
 	colLargeRowLength = (double *)palloc0(sizeof(double) * max_natts);
-
+	colNDVBySeg = (double *)palloc0(sizeof(double) * max_natts);
 
 	if ((params->options & VACOPT_FULLSCAN) != 0)
 	{
@@ -770,6 +774,7 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 		 */
 		acquire_func_colLargeRowIndexes = colLargeRowIndexes;
 		acquire_func_colLargeRowLength = colLargeRowLength;
+		acquire_func_colNDVBySeg = colNDVBySeg;
 		pgstat_progress_update_param(PROGRESS_ANALYZE_PHASE,
 									 inh ? PROGRESS_ANALYZE_PHASE_ACQUIRE_SAMPLE_ROWS_INH :
 									 PROGRESS_ANALYZE_PHASE_ACQUIRE_SAMPLE_ROWS);
@@ -783,6 +788,7 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 									  &totalrows, &totaldeadrows);
 		acquire_func_colLargeRowIndexes = NULL;
 		acquire_func_colLargeRowLength = NULL;
+		acquire_func_colNDVBySeg = NULL;
 		if (ctx)
 			MemoryContextSwitchTo(anl_context);
 	}
@@ -875,6 +881,12 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 		for (i = 0; i < attr_cnt; i++)
 		{
 			VacAttrStats *stats = vacattrstats[i];
+
+			if (Gp_role == GP_ROLE_DISPATCH && GpPolicyIsPartitioned(onerel->rd_cdbpolicy))
+			{
+				stats->stadistinctbyseg = colNDVBySeg[i];
+			}
+
 			stats->tupDesc = onerel->rd_att;
 			/*
 			 * utilize hyperloglog and merge utilities to derive
@@ -994,6 +1006,11 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 					stats->stadistinct = n_distinct;
 			}
 
+			if (Gp_role == GP_ROLE_EXECUTE) {
+				Assert(ctx->stadistincts);
+				ctx->stadistincts[i] = Float8GetDatum(stats->stadistinct);
+			}
+
 			MemoryContextResetAndDeleteChildren(col_context);
 		}
 
@@ -1079,7 +1096,7 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 		if (RelationStorageIsAO(onerel))
 			relallvisible = 0;
 		else
-            		relallvisible = AcquireNumberOfAllVisibleBlocks(onerel);
+			relallvisible = AcquireNumberOfAllVisibleBlocks(onerel);
 
 		/* Update pg_class for table relation */
 		vac_update_relstats(onerel,
@@ -1608,6 +1625,36 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr, int elevel)
 	return stats;
 }
 
+/*
+ * GPDB: If we are the dispatcher, then issue analyze on the segments and
+ * collect the statistics from them.
+ */
+int
+gp_acquire_sample_rows_func(Relation onerel, int elevel,
+							   HeapTuple *rows, int targrows,
+							   double *totalrows, double *totaldeadrows)
+{
+	if (Gp_role == GP_ROLE_DISPATCH &&
+		onerel->rd_cdbpolicy && !GpPolicyIsEntry(onerel->rd_cdbpolicy))
+	{
+		/* Fetch sample from the segments. */
+		return acquire_sample_rows_dispatcher(onerel, false, elevel,
+											  rows, targrows,
+											  totalrows, totaldeadrows);
+	}
+
+	/* 
+	 * if relation_acquire_sample_rows exist, we use it directly.
+	 * Otherwise, use the acquire_sample_rows by default.
+	 */
+	if (onerel->rd_tableam->relation_acquire_sample_rows)
+		return table_relation_acquire_sample_rows(onerel, elevel, rows,
+												  targrows, totalrows, totaldeadrows);
+    
+	return acquire_sample_rows(onerel, elevel, rows,
+							   targrows, totalrows, totaldeadrows);
+}
+
 /*
  * acquire_sample_rows -- acquire a random sample of rows from the table
  *
@@ -1640,14 +1687,8 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr, int elevel)
  * unbiased estimates of the average numbers of live and dead rows per
  * block.  The previous sampling method put too much credence in the row
  * density near the start of the table.
- *
- * The returned list of tuples is in order by physical position in the table.
- * (We will rely on this later to derive correlation estimates.)
- *
- * GPDB: If we are the dispatcher, then issue analyze on the segments and
- * collect the statistics from them.
  */
-int
+static int
 acquire_sample_rows(Relation onerel, int elevel,
 					HeapTuple *rows, int targrows,
 					double *totalrows, double *totaldeadrows)
@@ -1673,27 +1714,23 @@ acquire_sample_rows(Relation onerel, int elevel,
 
 	Assert(targrows > 0);
 
-	if (Gp_role == GP_ROLE_DISPATCH &&
-		onerel->rd_cdbpolicy && !GpPolicyIsEntry(onerel->rd_cdbpolicy))
-	{
-		/* Fetch sample from the segments. */
-		return acquire_sample_rows_dispatcher(onerel, false, elevel,
-											  rows, targrows,
-											  totalrows, totaldeadrows);
-	}
-
 	/*
-	 * GPDB: Analyze does make a lot of assumptions regarding the file layout of a
-	 * relation. These assumptions are heap specific and do not hold for AO/AOCO
-	 * relations. In the case of AO/AOCO, what is actually needed and used instead
-	 * of number of blocks, is number of tuples.
-	 *
-	 * GPDB_12_MERGE_FIXME: BlockNumber is uint32 and Number of tuples is uint64.
-	 * That means that after row number UINT_MAX we will never analyze the table.
+	 * GPDB: Legacy analyze does make a lot of assumptions regarding the file
+	 * layout of a relation. These assumptions are heap specific and do not hold
+	 * for AO/AOCO relations. In the case of AO/AOCO, what is actually needed and
+	 * used instead of number of blocks, is number of tuples. Moreover, BlockNumber
+	 * is uint32 and Number of tuples is uint64. That means that after row number
+	 * UINT_MAX we will never analyze the table.
+	 * 
+	 * We introduced a tuple based sampling approach for AO/CO tables to address
+	 * above problems, all corresponding logics were moved out of here and enclosed
+	 * in table_relation_acquire_sample_rows(). So leave here an assertion to ensure
+	 * the relation should not be an AO/CO table.
 	 */
-	if (RelationIsNonblockRelation(onerel))
+	Assert(!RelationIsAppendOptimized(onerel));
+	if (RelationIsPax(onerel))
 	{
-		/* AO/CO/PAX use non-fixed block layout */
+		/* PAX use non-fixed block layout */
 		BlockNumber pages;
 		double		tuples;
 		double		allvisfrac;
@@ -1897,13 +1934,13 @@ acquire_sample_rows(Relation onerel, int elevel,
 	 * Emit some interesting relation info
 	 */
 	ereport(elevel,
-		(errmsg("\"%s\": scanned %d of %u pages, "
-				"containing %.0f live rows and %.0f dead rows; "
-				"%d rows in sample, %.0f estimated total rows",
-				RelationGetRelationName(onerel),
-				bs.m, totalblocks,
-				liverows, deadrows,
-				numrows, *totalrows)));
+			(errmsg("\"%s\": scanned %d of %u pages, "
+					"containing %.0f live rows and %.0f dead rows; "
+					"%d rows in sample, %.0f estimated total rows",
+					RelationGetRelationName(onerel),
+					bs.m, totalblocks,
+					liverows, deadrows,
+					numrows, *totalrows)));
 
 	return numrows;
 }
@@ -1918,17 +1955,12 @@ compare_rows(const void *a, const void *b)
 	HeapTuple	hb = *(const HeapTuple *) b;
 
 	/*
-	 * GPDB_12_MERGE_FIXME: For AO/AOCO tables, blocknumber does not have a
-	 * meaning and is not set. The current implementation of analyze makes
-	 * assumptions about the file layout which do not hold for these two cases.
-	 * The compare function should maintain the row order as consrtucted, hence
-	 * return 0;
-	 *
+	 * For AO/AOCO tables, blocknumber does not have a meaning and is not set.
+	 * We leave this workaround here for legacy AO/CO analyze still working.
 	 * There should be no apparent and measurable perfomance hit from calling
 	 * this function.
-	 *
-	 * One possible proper fix is to refactor analyze to use the tableam api and
-	 * this sorting should move to the specific implementation.
+	 * 
+	 * The AO/CO Fast Analyze won't reach here anymore.
 	 */
 	if (!BlockNumberIsValid(ItemPointerGetBlockNumberNoCheck(&ha->t_self)))
 		return 0;
@@ -2051,16 +2083,8 @@ acquire_inherited_sample_rows(Relation onerel, int elevel,
 			childrel->rd_rel->relkind == RELKIND_MATVIEW ||
 			childrel->rd_rel->relkind == RELKIND_DIRECTORY_TABLE)
 		{
-			/* Regular table, so use the regular row acquisition function */
-			if (childrel->rd_tableam)
-				acquirefunc = childrel->rd_tableam->acquire_sample_rows;
-
-			/*
-			 * If the TableAmRoutine's acquire_sample_rows if NULL, we use
-			 * acquire_sample_rows as default.
-			 */
-			if (acquirefunc == NULL)
-				acquirefunc = acquire_sample_rows;
+			/* use relation_acquire_sample_rows as default. */
+			acquirefunc = gp_acquire_sample_rows_func;
 
 			relpages = AcquireNumberOfBlocks(childrel);
 		}
@@ -2675,6 +2699,7 @@ process_sample_rows(Portal portal,
 	 */
 	Bitmapset **colLargeRowIndexes = acquire_func_colLargeRowIndexes;
 	double     *colLargeRowLength = acquire_func_colLargeRowLength;
+	double     *colNDVBySeg = acquire_func_colNDVBySeg;
 	TupleDesc	relDesc = RelationGetDescr(onerel);
 	TupleDesc	funcTupleDesc;
 	TupleDesc	sampleTupleDesc;
@@ -2714,12 +2739,13 @@ process_sample_rows(Portal portal,
 	 * Also create tupledesc of return record of function gp_acquire_sample_rows.
 	 */
 	sampleTupleDesc = CreateTupleDescCopy(relDesc);
-	ncolumns = numLiveColumns + FIX_ATTR_NUM;
+	ncolumns = NUM_SAMPLE_FIXED_COLS + numLiveColumns;
 	
 	funcTupleDesc = CreateTemplateTupleDesc(ncolumns);
 	TupleDescInitEntry(funcTupleDesc, (AttrNumber) 1, "", FLOAT8OID, -1, 0);
 	TupleDescInitEntry(funcTupleDesc, (AttrNumber) 2, "", FLOAT8OID, -1, 0);
 	TupleDescInitEntry(funcTupleDesc, (AttrNumber) 3, "", FLOAT8ARRAYOID, -1, 0);
+	TupleDescInitEntry(funcTupleDesc, (AttrNumber) 4, "", FLOAT8ARRAYOID, -1, 0);
 	
 	for (i = 0; i < relDesc->natts; i++)
 	{
@@ -2731,7 +2757,7 @@ process_sample_rows(Portal portal,
 
 		if (!attr->attisdropped)
 		{
-			TupleDescInitEntry(funcTupleDesc, (AttrNumber) 4 + index, "",
+			TupleDescInitEntry(funcTupleDesc, (AttrNumber) NUM_SAMPLE_FIXED_COLS + 1 + index, "",
 							   typid, attr->atttypmod, attr->attndims);
 
 			index++;
@@ -2829,10 +2855,35 @@ process_sample_rows(Portal portal,
 			if (!funcRetNulls[0])
 			{
 				/* This is a summary row. */
+				ArrayType  *arrayVal;
+				Datum	   *colndv;
+				bool	   *nulls;
+				int	    numelems;
+
+				Assert(!funcRetNulls[1] && !funcRetNulls[3]);
+
 				this_totalrows = DatumGetFloat8(funcRetValues[0]);
 				this_totaldeadrows = DatumGetFloat8(funcRetValues[1]);
 				(*totalrows) += this_totalrows;
 				(*totaldeadrows) += this_totaldeadrows;
+
+				arrayVal = DatumGetArrayTypeP(funcRetValues[3]);
+				deconstruct_array(arrayVal, FLOAT8OID, 8, true, 'd',
+								&colndv, &nulls, &numelems);
+				Assert(numelems == relDesc->natts);
+				for (i = 0; i < numelems; i++)
+				{
+					double this_colndv = DatumGetFloat8(colndv[i]);
+					if (this_colndv < 0) {
+						Assert(this_colndv >= -1);
+						colNDVBySeg[i] += fabs(this_colndv) * this_totalrows;
+					} else {
+						/* if current segment have any data, then ndv won't be 0.
+						 * if current segment have no rows, ndv is 0.
+						 */
+						colNDVBySeg[i] += DatumGetFloat8(colndv[i]);
+					}
+				}
 			}
 			else
 			{
@@ -2878,8 +2929,8 @@ process_sample_rows(Portal portal,
 						continue;
 					}
 
-					dnulls[i] = funcRetNulls[FIX_ATTR_NUM + index];
-					dvalues[i] = funcRetValues[FIX_ATTR_NUM + index];
+					dnulls[i] = funcRetNulls[NUM_SAMPLE_FIXED_COLS + index];
+					dvalues[i] = funcRetValues[NUM_SAMPLE_FIXED_COLS + index];
 					index++;	/* Move index to the next result set attribute */
 				}
 
@@ -4341,6 +4392,33 @@ compute_scalar_stats(VacAttrStatsP stats,
 				slot_idx++;
 			}
 		}
+
+		/* set the ndv from segments */
+		if (stats->stadistinctbyseg != 0 && slot_idx < STATISTIC_NUM_SLOTS - 1
+			&& !OidIsValid(stats->attrtype->typanalyze))  // should not be the array
+		{
+			MemoryContext old_context;
+			Datum	   *ndvbs;
+
+			/* Must copy the target values into anl_context */
+			old_context = MemoryContextSwitchTo(stats->anl_context);
+			ndvbs = (Datum *) palloc(sizeof(Datum));
+			ndvbs[0] = Float8GetDatum(stats->stadistinctbyseg);
+			MemoryContextSwitchTo(old_context);
+
+			stats->stakind[slot_idx] = STATISTIC_KIND_NDV_BY_SEGMENTS;
+			stats->staop[slot_idx] = mystats->ltopr;
+			stats->stacoll[slot_idx] = stats->attrcollid;
+
+			stats->statypid[slot_idx] = FLOAT8OID;
+			stats->statyplen[slot_idx] = 8;
+			stats->statypbyval[slot_idx] = true;
+			stats->statypalign[slot_idx] = TYPALIGN_DOUBLE;
+
+			stats->stavalues[slot_idx] = ndvbs;
+			stats->numvalues[slot_idx] = 1;
+			slot_idx++;
+		}
 	}
 	else if (nonnull_cnt > 0)
 	{
@@ -4883,6 +4961,37 @@ merge_leaf_stats(VacAttrStatsP stats,
 			slot_idx++;
 		}
 	}
+
+	// ndistinct by segments calculation
+	{
+		old_context = MemoryContextSwitchTo(stats->anl_context);
+		bool valid;
+		double ndinstinct_by_segs = 0;
+		Datum *ndvbs;
+
+		valid = aggregate_leaf_partition_ndvbs(
+			numPartitions, heaptupleStats, relTuples, &ndinstinct_by_segs);
+
+		if (valid)
+		{
+			ndvbs = (Datum *) palloc(sizeof(Datum));
+			ndvbs[0] = Float8GetDatum(ndinstinct_by_segs);
+
+			stats->stakind[slot_idx] = STATISTIC_KIND_NDV_BY_SEGMENTS;
+			stats->staop[slot_idx] = mystats->ltopr;
+
+			stats->statypid[slot_idx] = FLOAT8OID;
+			stats->statyplen[slot_idx] = 8;
+			stats->statypbyval[slot_idx] = true;
+			stats->statypalign[slot_idx] = TYPALIGN_DOUBLE;
+
+			stats->stavalues[slot_idx] = ndvbs;
+			stats->numvalues[slot_idx] = 1;
+			slot_idx++;
+		}
+		MemoryContextSwitchTo(old_context);
+	}
+
 	for (i = 0; i < numPartitions; i++)
 	{
 		if (HeapTupleIsValid(heaptupleStats[i]))
diff --git a/src/backend/commands/analyzefuncs.c b/src/backend/commands/analyzefuncs.c
index 8c9fd56199d..fc965259489 100644
--- a/src/backend/commands/analyzefuncs.c
+++ b/src/backend/commands/analyzefuncs.c
@@ -27,6 +27,7 @@
 #include "miscadmin.h"
 #include "funcapi.h"
 #include "utils/syscache.h"
+#include "utils/faultinjector.h"
 
 /**
  * Statistics related parameters.
@@ -130,6 +131,9 @@ gp_acquire_sample_rows(PG_FUNCTION_ARGS)
 		onerel = table_open(relOid, AccessShareLock);
 		relDesc = RelationGetDescr(onerel);
 
+		/* will be init in `analyze_rel` */
+		ctx->stadistincts = (Datum *) palloc0(relDesc->natts * sizeof(Datum));
+
 		MemSet(&params, 0, sizeof(VacuumParams));
 		params.options |= VACOPT_ANALYZE;
 		params.freeze_min_age = -1;
@@ -183,6 +187,13 @@ gp_acquire_sample_rows(PG_FUNCTION_ARGS)
 						   FLOAT8ARRAYOID,
 						   -1,
 						   0);
+		/* stadistinct for each live column */
+		TupleDescInitEntry(outDesc,
+						   4,
+						   "stadistinct_array",
+						   FLOAT8ARRAYOID,
+						   -1,
+						   0);
 
 		outattno = NUM_SAMPLE_FIXED_COLS + 1;
 		for (attno = 1; attno <= relDesc->natts; attno++)
@@ -242,7 +253,8 @@ gp_acquire_sample_rows(PG_FUNCTION_ARGS)
 		HeapTuple	relTuple = ctx->sample_rows[ctx->index];
 		int			attno;
 		int			outattno;
-		bool			has_toolarge = false;
+
+		bool	   has_toolarge = false;
 		Datum	   *relvalues = (Datum *) palloc(relDesc->natts * sizeof(Datum));
 		bool	   *relnulls = (bool *) palloc(relDesc->natts * sizeof(bool));
 		Datum      *oversized_cols_length = (Datum *) palloc0(relDesc->natts * sizeof(Datum));
@@ -299,10 +311,15 @@ gp_acquire_sample_rows(PG_FUNCTION_ARGS)
 		outvalues[1] = (Datum) 0;
 		outnulls[1] = true;
 
+		outvalues[3] = (Datum) 0;
+		outnulls[3] = true;
+
 		res = heap_form_tuple(outDesc, outvalues, outnulls);
 
 		ctx->index++;
 
+		SIMPLE_FAULT_INJECTOR("returned_sample_row");
+
 		SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(res));
 	}
 	else if (!ctx->summary_sent)
@@ -317,6 +334,11 @@ gp_acquire_sample_rows(PG_FUNCTION_ARGS)
 
 		outvalues[2] = (Datum) 0;
 		outnulls[2] = true;
+
+		outvalues[3] = PointerGetDatum(construct_array(ctx->stadistincts, relDesc->natts,
+														FLOAT8OID, 8, true, 'd'));
+		outnulls[3] = false;
+
 		for (outattno = NUM_SAMPLE_FIXED_COLS + 1; outattno <= outDesc->natts; outattno++)
 		{
 			outvalues[outattno - 1] = (Datum) 0;
diff --git a/src/backend/commands/analyzeutils.c b/src/backend/commands/analyzeutils.c
index 0876517d517..c4f9fa5dedb 100644
--- a/src/backend/commands/analyzeutils.c
+++ b/src/backend/commands/analyzeutils.c
@@ -743,6 +743,37 @@ getHistogramMCVTuple(AttStatsSlot * *histSlots, MCVFreqPair **mcvRemaining,
 	}
 }
 
+static bool
+getNdvBySegHeapTuple(AttStatsSlot * *ndvbsSlots, HeapTuple *heaptupleStats, float4 *relTuples, int nParts)
+{
+	bool valid = true;
+
+	for (int i = 0; i < nParts; i++)
+	{
+		if (!HeapTupleIsValid(heaptupleStats[i]))
+		{
+			continue;
+		}
+
+		ndvbsSlots[i] = (AttStatsSlot *) palloc(sizeof(AttStatsSlot));
+		(void) get_attstatsslot(ndvbsSlots[i], heaptupleStats[i],
+			STATISTIC_KIND_NDV_BY_SEGMENTS, InvalidOid, ATTSTATSSLOT_VALUES);
+
+		if ((InvalidOid != ndvbsSlots[i]->valuetype && // result is not empty
+			// not empty partition with invalid ndvbs
+			(relTuples[i] > 0 && DatumGetFloat8(ndvbsSlots[i]->values[0]) == 0)) ||
+			// not empty partition without ndvbs
+			(InvalidOid == ndvbsSlots[i]->valuetype && relTuples[i] > 0)) {
+			valid = false;
+			break;
+		}
+
+		Assert(ndvbsSlots[i]->valuetype == FLOAT8OID);
+		Assert(ndvbsSlots[i]->nvalues == 1);
+	}
+	return valid;
+}
+
 /*
  * Initialize heap by inserting the second histogram bound from each partition histogram.
  * Input:
@@ -1221,9 +1252,10 @@ leaf_parts_analyzed(Oid attrelid, Oid relid_exclude, List *va_cols, int elevel)
 			continue;
 
 		float4		relTuples = get_rel_reltuples(partRelid);
+		int32		relpages = get_rel_relpages(partRelid);
 
 		/* Partition is not analyzed */
-		if (relTuples < 0.0)
+		if (relTuples < 0.0 || (relTuples == 0.0 && relpages == 0))
 		{
 			if (relid_exclude == InvalidOid)
 				ereport(elevel,
@@ -1302,3 +1334,28 @@ leaf_parts_analyzed(Oid attrelid, Oid relid_exclude, List *va_cols, int elevel)
 
 	return !all_parts_empty;
 }
+
+
+bool
+aggregate_leaf_partition_ndvbs(int nParts,
+							   HeapTuple *heaptupleStats,
+							   float4 *relTuples,
+							   float8 *result)
+{
+	bool valid;
+	Assert(nParts > 0);
+	Assert(result);
+
+	AttStatsSlot **ndvbsSlots = (AttStatsSlot **) palloc0((nParts) * sizeof(AttStatsSlot *));
+	valid = getNdvBySegHeapTuple(ndvbsSlots, heaptupleStats, relTuples, nParts);
+	if (valid) {
+		for (int i = 0; i < nParts; i++)
+		{
+			if (ndvbsSlots[i]) {
+				*result += DatumGetFloat8(ndvbsSlots[i]->values[0]);
+			}
+		}
+	}
+
+	return valid;
+}
\ No newline at end of file
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 9ba76564998..47cc7f733e2 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -210,7 +210,7 @@ cluster(ParseState *pstate, ClusterStmt *stmt, bool isTopLevel)
 		table_close(rel, NoLock);
 
 		/* Do the job. */
-		/* GPDB_14_MERGE_FIXME: do we need the return value of cluster_rel to dispath ? */
+		/* GPDB_14_MERGE_FIXME: do we need the return value of cluster_rel to dispatch ? */
 		cluster_rel(tableOid, indexOid, &params);
 
 		if (Gp_role == GP_ROLE_DISPATCH)
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index efbf6a0ba39..4ccd3798067 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -1420,20 +1420,17 @@ close_program_pipes(ProgramPipes *program_pipes, bool ifThrow)
 {
 	int ret = 0;
 	StringInfoData sinfo;
-	initStringInfo(&sinfo);
 
 	/* just return if pipes not created, like when relation does not exist */
 	if (!program_pipes)
-	{
 		return;
-	}
+	
+	initStringInfo(&sinfo);
 
 	ret = pclose_with_stderr(program_pipes->pid, program_pipes->pipes, &sinfo);
 
 	if (ret == 0 || !ifThrow)
-	{
 		return;
-	}
 
 	if (ret == -1)
 	{
diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c
index 18585a27e35..9cdee90fbe5 100644
--- a/src/backend/commands/copyfrom.c
+++ b/src/backend/commands/copyfrom.c
@@ -2007,18 +2007,7 @@ CopyFrom(CopyFromState cstate)
 
 	CopyInitDataParser(cstate);
 
-	/*
-	 * GPDB_12_MERGE_FIXME: We still have to perform the initialization
-	 * here for AO relations. It is preferreable by all means to perform the
-	 * initialization via the table AP API, however it simply does not
-	 * provide a good enough interface for this yet.
-	 */
-	if (RelationIsAoRows(resultRelInfo->ri_RelationDesc))
-		appendonly_dml_init(resultRelInfo->ri_RelationDesc, CMD_INSERT);
-	else if (RelationIsAoCols(resultRelInfo->ri_RelationDesc))
-		aoco_dml_init(resultRelInfo->ri_RelationDesc, CMD_INSERT);
-	else if (ext_dml_init_hook)
-		ext_dml_init_hook(resultRelInfo->ri_RelationDesc, CMD_INSERT);
+	table_dml_init(resultRelInfo->ri_RelationDesc, CMD_INSERT);
 
 	for (;;)
 	{
@@ -2451,18 +2440,7 @@ CopyFrom(CopyFromState cstate)
 	if (bistate != NULL)
 		FreeBulkInsertState(bistate);
 
-	/*
-	 * GPDB_12_MERGE_FIXME: We still have to perform the finishment
-	 * here for AO relations. It is preferreable by all means to perform the
-	 * finishment via the table AP API, however it simply does not
-	 * provide a good enough interface for this yet.
-	 */
-	if (RelationIsAoRows(resultRelInfo->ri_RelationDesc))
-		appendonly_dml_finish(resultRelInfo->ri_RelationDesc, CMD_INSERT);
-	else if (RelationIsAoCols(resultRelInfo->ri_RelationDesc))
-		aoco_dml_finish(resultRelInfo->ri_RelationDesc, CMD_INSERT);
-	else if (ext_dml_finish_hook)
-		ext_dml_finish_hook(resultRelInfo->ri_RelationDesc, CMD_INSERT);
+	table_dml_fini(resultRelInfo->ri_RelationDesc, CMD_INSERT);
 
 	MemoryContextSwitchTo(oldcontext);
 
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index 72db9a51e7c..6822032fe0d 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -838,21 +838,8 @@ CreateIntoRelDestReceiver(IntoClause *intoClause)
 static void
 intorel_startup_dummy(DestReceiver *self, int operation, TupleDesc typeinfo)
 {
-	/*
-	 * In PostgreSQL, this is a no-op, but in GPDB, AO relations do need some
-	 * initialization of state, because the tableam API does not provide a
-	 * good enough interface for handling with this later, we need to
-	 * specifically all the init at start up.
-	 */
-
 	/* See intorel_initplan() for explanation */
-
-	if (RelationIsAoRows(((DR_intorel *)self)->rel))
-		appendonly_dml_init(((DR_intorel *)self)->rel, CMD_INSERT);
-	else if (RelationIsAoCols(((DR_intorel *)self)->rel))
-		aoco_dml_init(((DR_intorel *)self)->rel, CMD_INSERT);
-	else if (ext_dml_init_hook)
-		ext_dml_init_hook(((DR_intorel *)self)->rel, CMD_INSERT);
+	table_dml_init(((DR_intorel *)self)->rel, CMD_INSERT);
 }
 
 /*
diff --git a/src/backend/commands/dirtablecmds.c b/src/backend/commands/dirtablecmds.c
index 6f3bd94285e..7f34d46943d 100644
--- a/src/backend/commands/dirtablecmds.c
+++ b/src/backend/commands/dirtablecmds.c
@@ -136,21 +136,12 @@ CreateDirectoryTable(CreateDirectoryTableStmt *stmt, Oid relId)
 	}
 	else
 	{
-		Form_pg_class pg_class_tuple = NULL;
-		HeapTuple	class_tuple = NULL;
 		RelFileNode relFileNode = {0};
 
-		class_tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relId));
-		if (!HeapTupleIsValid(class_tuple))
-			elog(ERROR, "cache lookup failed for relation %u", relId);
-		pg_class_tuple = (Form_pg_class) GETSTRUCT(class_tuple);
-
 		relFileNode.spcNode = spcId;
 		relFileNode.dbNode = MyDatabaseId;
-		relFileNode.relNode = pg_class_tuple->relfilenode;
 
-		dirTablePath = UFileFormatPathName(&relFileNode);
-		ReleaseSysCache(class_tuple);
+		dirTablePath = UFileFormatPathName(relId, &relFileNode);
 	}
 
 	/*
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index bfd5f98219c..0d63d374128 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -134,13 +134,13 @@ static void show_tablesample(TableSampleClause *tsc, PlanState *planstate,
 							 List *ancestors, ExplainState *es);
 static void show_sort_info(SortState *sortstate, ExplainState *es);
 static void show_windowagg_keys(WindowAggState *waggstate, List *ancestors, ExplainState *es);
+static void show_aggref_info(List *targetList, const char *qlabel, ExplainState *es);
 static void show_incremental_sort_info(IncrementalSortState *incrsortstate,
 									   ExplainState *es);
 static void show_hash_info(HashState *hashstate, ExplainState *es);
 static void show_runtime_filter_info(RuntimeFilterState *rfstate,
 									 ExplainState *es);
-static void show_pushdown_runtime_filter_info(const char *qlabel,
-											  PlanState *planstate,
+static void show_pushdown_runtime_filter_info(PlanState *planstate,
 											  ExplainState *es);
 static void show_memoize_info(MemoizeState *mstate, List *ancestors,
 							  ExplainState *es);
@@ -2499,8 +2499,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
 			/* FALLTHROUGH */
 		case T_SeqScan:
 			if (gp_enable_runtime_filter_pushdown && IsA(planstate, SeqScanState))
-				show_pushdown_runtime_filter_info("Rows Removed by Pushdown Runtime Filter",
-												  planstate, es);
+				show_pushdown_runtime_filter_info(planstate, es);
 			/* FALLTHROUGH */
 		case T_DynamicSeqScan:
 		case T_ValuesScan:
@@ -2509,6 +2508,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
 		case T_WorkTableScan:
 		case T_SubqueryScan:
 			if (IsA(plan, DynamicSeqScan)) {
+				if (gp_enable_runtime_filter_pushdown)
+					show_pushdown_runtime_filter_info(planstate, es);
+
 				char *buf;
 				Oid relid;
 				relid = rt_fetch(((DynamicSeqScan *)plan)
@@ -2737,6 +2739,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
 		case T_Agg:
 			show_agg_keys(castNode(AggState, planstate), ancestors, es);
 			show_upper_qual(plan->qual, "Filter", planstate, ancestors, es);
+			show_aggref_info(plan->targetlist, "AggRefs(TargetList)", es);
 			show_hashagg_info((AggState *) planstate, es);
 			if (plan->qual)
 				show_instrumentation_count("Rows Removed by Filter", 1,
@@ -3168,6 +3171,44 @@ show_sort_keys(SortState *sortstate, List *ancestors, ExplainState *es)
 						 ancestors, es);
 }
 
+static void
+show_aggref_info(List *targetList, const char *qlabel, ExplainState *es) {
+	StringInfoData buf;
+	ListCell *lc;
+	bool already_got_one = false;
+
+	if (!Debug_print_aggref_in_explain) {
+		return;
+	}
+
+	initStringInfo(&buf);
+	appendStringInfoString(&buf, "[");
+
+	foreach (lc, targetList)
+	{
+		if (!IsA(lfirst(lc),TargetEntry)) {
+			continue;
+		}
+
+		TargetEntry *te = (TargetEntry *) lfirst(lc);
+		if (!IsA(te->expr, Aggref))
+		{
+			continue;
+		}
+
+		Aggref *aggref = (Aggref *) te->expr;
+		if (already_got_one) {
+			appendStringInfo(&buf, ", (%d, %d)", aggref->aggno, aggref->aggtransno);
+		} else {
+			appendStringInfo(&buf, "(%d, %d)", aggref->aggno, aggref->aggtransno);
+			already_got_one = true;
+		}
+	}
+	appendStringInfoString(&buf, "]");
+	
+	ExplainPropertyText(qlabel, buf.data, es);
+}
+
 static void
 show_windowagg_keys(WindowAggState *waggstate, List *ancestors, ExplainState *es)
 {
@@ -4266,7 +4307,7 @@ show_hashagg_info(AggState *aggstate, ExplainState *es)
 	}
 
 	/* Display stats for each parallel worker */
-	if (es->analyze && aggstate->shared_info != NULL)
+	if (aggstate->shared_info != NULL)
 	{
 		for (int n = 0; n < aggstate->shared_info->num_workers; n++)
 		{
@@ -4377,17 +4418,19 @@ show_instrumentation_count(const char *qlabel, int which,
  * runtime filter.
  */
 static void
-show_pushdown_runtime_filter_info(const char *qlabel,
-								  PlanState *planstate,
-								  ExplainState *es)
+show_pushdown_runtime_filter_info(PlanState *planstate, ExplainState *es)
 {
-	Assert(gp_enable_runtime_filter_pushdown && IsA(planstate, SeqScanState));
+	Assert(gp_enable_runtime_filter_pushdown && 
+		   (IsA(planstate, SeqScanState) || IsA(planstate, DynamicSeqScanState)));
 
 	if (!es->analyze || !planstate->instrument)
 		return;
 
 	if (planstate->instrument->prf_work)
-		ExplainPropertyFloat(qlabel, NULL, planstate->instrument->nfilteredPRF, 0, es);
+	{
+		ExplainPropertyFloat("Rows Removed by Pushdown Runtime Filter",
+							 NULL, planstate->instrument->nfilteredPRF, 0, es);
+	}
 }
 
 /*
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index e56e9d76fb9..1555ea9d334 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -463,7 +463,8 @@ ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString,
 	if (!stmt->skipData && RelationIsIVM(matviewRel))
 		dataQuery = rewriteQueryForIMMV(viewQuery,NIL);
 	else
-		dataQuery = viewQuery;
+		/* viewQuery maybe released in make_new_heap_with_colname. */
+		dataQuery = copyObject(viewQuery);
 
 	/*
 	 * Check that there is a unique index with no WHERE clause on one or more
@@ -965,12 +966,7 @@ transientrel_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
 	myState->bistate = GetBulkInsertState();
 	myState->processed = 0;
 
-	if (RelationIsAoRows(myState->transientrel))
-		appendonly_dml_init(myState->transientrel, CMD_INSERT);
-	else if (RelationIsAoCols(myState->transientrel))
-		aoco_dml_init(myState->transientrel, CMD_INSERT);
-	else if (ext_dml_init_hook)
-		ext_dml_init_hook(myState->transientrel, CMD_INSERT);
+	table_dml_init(myState->transientrel, CMD_INSERT);
 
 	/*
 	 * Valid smgr_targblock implies something already wrote to the relation.
diff --git a/src/backend/commands/resgroupcmds.c b/src/backend/commands/resgroupcmds.c
index 5c319e85b11..9be40eba69f 100644
--- a/src/backend/commands/resgroupcmds.c
+++ b/src/backend/commands/resgroupcmds.c
@@ -438,6 +438,12 @@ AlterResourceGroup(AlterResourceGroupStmt *stmt)
 
 	/* Load current resource group capabilities */
 	GetResGroupCapabilities(pg_resgroupcapability_rel, groupid, &oldCaps);
+	/* If io_limit not been altered, reset io_limit field to NIL */
+	if (limitType != RESGROUP_LIMIT_TYPE_IO_LIMIT && oldCaps.io_limit != NIL)
+	{
+		cgroupOpsRoutine->freeio(oldCaps.io_limit);
+		oldCaps.io_limit = NIL;
+	}
 	caps = oldCaps;
 
 	switch (limitType)
@@ -479,6 +485,7 @@ AlterResourceGroup(AlterResourceGroupStmt *stmt)
 	}
 
 	validateCapabilities(pg_resgroupcapability_rel, groupid, &caps, false);
+	AssertImply(limitType != RESGROUP_LIMIT_TYPE_IO_LIMIT, caps.io_limit == NIL);
 
 	/* cpuset & cpu_max_percent can not coexist.
 	 * if cpuset is active, then cpu_max_percent must set to CPU_RATE_LIMIT_DISABLED,
@@ -511,6 +518,16 @@ AlterResourceGroup(AlterResourceGroupStmt *stmt)
 			updateResgroupCapabilityEntry(pg_resgroupcapability_rel,
 										  groupid, RESGROUP_LIMIT_TYPE_IO_LIMIT,
 										  0, cgroupOpsRoutine->dumpio(caps.io_limit));
+		else
+		{
+			/*
+			 * When alter io_limit to -1 , the caps.io_limit will be nil.
+			 * So we should update the io_limit in capability relation to -1.
+			 */
+			updateResgroupCapabilityEntry(pg_resgroupcapability_rel,
+										  groupid, RESGROUP_LIMIT_TYPE_IO_LIMIT,
+										  0, DefaultIOLimit);
+		}
 	}
 	else
 	{
@@ -552,6 +569,8 @@ AlterResourceGroup(AlterResourceGroupStmt *stmt)
 
 /*
  * Get all the capabilities of one resource group in pg_resgroupcapability.
+ *
+ * Note: the io_limit in ResGroupCaps will be NIL if parse io_limit string failed.
  */
 void
 GetResGroupCapabilities(Relation rel, Oid groupId, ResGroupCaps *resgroupCaps)
@@ -634,9 +653,34 @@ GetResGroupCapabilities(Relation rel, Oid groupId, ResGroupCaps *resgroupCaps)
 			case RESGROUP_LIMIT_TYPE_IO_LIMIT:
 				if (cgroupOpsRoutine != NULL)
 				{
+					/* if InterruptHoldoffCount doesn't restore in PG_CATCH,
+					 * the catch will failed. */
+					int32 savedholdoffCount = InterruptHoldoffCount;
+
 					oldContext = CurrentMemoryContext;
 					MemoryContextSwitchTo(TopMemoryContext);
-					resgroupCaps->io_limit = cgroupOpsRoutine->parseio(value);
+					/*
+					 * This function will be called in InitResGroups and AlterResourceGroup which
+					 * shoud not be abort. In some circumstances, for example, the directory of a
+					 * tablespace in io_limit be removed, then parseio will throw error. If
+					 * InitResGroups be aborted, the cluster cannot launched. */
+					PG_TRY();
+					{
+						resgroupCaps->io_limit = cgroupOpsRoutine->parseio(value);
+					}
+					PG_CATCH();
+					{
+						resgroupCaps->io_limit = NIL;
+
+						InterruptHoldoffCount = savedholdoffCount;
+
+						if (elog_demote(WARNING))
+						{
+							EmitErrorReport();
+							FlushErrorState();
+						}
+					}
+					PG_END_TRY();
 					MemoryContextSwitchTo(oldContext);
 				}
 				else
@@ -1096,7 +1140,7 @@ alterResgroupCallback(XactEvent event, void *arg)
 	if (callbackCtx->caps.io_limit != NIL)
 		cgroupOpsRoutine->freeio(callbackCtx->caps.io_limit);
 
-	if (callbackCtx->caps.io_limit != NIL)
+	if (callbackCtx->oldCaps.io_limit != NIL)
 		cgroupOpsRoutine->freeio(callbackCtx->oldCaps.io_limit);
 
 	pfree(callbackCtx);
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 573c57af8de..42e00efe81d 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -7560,12 +7560,8 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 		snapshot = RegisterSnapshot(GetLatestSnapshot());
 		scan = table_beginscan(oldrel, snapshot, 0, NULL);
 
-		if (newrel && RelationIsAoRows(newrel))
-			appendonly_dml_init(newrel, CMD_INSERT);
-		else if (newrel && RelationIsAoCols(newrel))
-			aoco_dml_init(newrel, CMD_INSERT);
-		else if (newrel && ext_dml_init_hook)
-			ext_dml_init_hook(newrel, CMD_INSERT);
+		if (newrel)
+			table_dml_init(newrel, CMD_INSERT);
 
 		/*
 		 * Switch to per-tuple memory context and reset it for each tuple
@@ -21176,11 +21172,6 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
 			}
 		}
 
-		if (strategy == PARTITION_STRATEGY_HASH && type_is_enum(atttype))
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot use ENUM column \"%s\" in PARTITION BY statement for hash partitions", pelem->name)));
-
 		/*
 		 * Apply collation override if any
 		 */
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index ef8bd610e0b..9175ebfb5ba 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -97,8 +97,10 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
+#include "utils/resource_manager.h"
 #include "utils/tarrable.h"
 #include "utils/varlena.h"
+#include "utils/resgroup.h"
 
 #include "catalog/heap.h"
 #include "catalog/oid_dispatch.h"
@@ -738,6 +740,9 @@ DropTableSpace(DropTableSpaceStmt *stmt)
 				 errdetail_internal("%s", detail),
 				 errdetail_log("%s", detail_log)));
 
+	if (IsResGroupEnabled() && Gp_resource_manager_policy == RESOURCE_MANAGER_POLICY_GROUP_V2)
+		checkTablespaceInIOlimit(tablespaceoid, true);
+
 	/* DROP hook for the tablespace being removed */
 	InvokeObjectDropHook(TableSpaceRelationId, tablespaceoid, 0);
 
diff --git a/src/backend/crypto/bufenc.c b/src/backend/crypto/bufenc.c
index 4e6f244c879..2c390618a7e 100644
--- a/src/backend/crypto/bufenc.c
+++ b/src/backend/crypto/bufenc.c
@@ -36,6 +36,8 @@ static unsigned char buf_encryption_iv[BUFENC_IV_SIZE];
 
 void *BufEncCtx = NULL;
 void *BufDecCtx = NULL;
+static sm4_ctx sm4_enc_ctx;
+static sm4_ctx sm4_dec_ctx;
 
 static void set_buffer_encryption_iv(Page page, BlockNumber blkno);
 
@@ -47,16 +49,28 @@ InitializeBufferEncryption(void)
 	if (!FileEncryptionEnabled)
 		return;
 
+	/* 
+	 * To avoid memory leaks, when the postmaster resets the cluster, 
+	 * need to release the memory which was alloced at last time. 
+	 */
+	if (BufEncCtx && BufEncCtx != &sm4_enc_ctx)
+	{
+		pg_cipher_ctx_free(BufEncCtx);
+		BufEncCtx = NULL;
+	}
+	if (BufDecCtx && BufDecCtx != &sm4_dec_ctx)
+	{
+		pg_cipher_ctx_free(BufDecCtx);
+		BufDecCtx = NULL;
+	}
+	
 	key = KmgrGetKey(KMGR_KEY_ID_REL);
 
 	if (CheckIsSM4Method())
 	{
-		bool found;
-		BufEncCtx = ShmemInitStruct("sm4 encryption method encrypt ctx",
-												sizeof(sm4_ctx), &found);
+		BufEncCtx = &sm4_enc_ctx;
+		BufDecCtx = &sm4_dec_ctx;
 
-		BufDecCtx = ShmemInitStruct("sm4 encryption method decrypt ctx",
-												sizeof(sm4_ctx), &found);
 		sm4_ofb_setkey_enc((sm4_ctx *)BufEncCtx, (unsigned char *)key->key);
 		sm4_ofb_setkey_dec((sm4_ctx *)BufDecCtx, (unsigned char *)key->key);
 	}
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index b3bd749dadc..cef77dcccf4 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -4279,40 +4279,39 @@ already_under_executor_run(void)
 static void
 MaintainMaterializedViewStatus(QueryDesc *queryDesc, CmdType operation)
 {
-	Bitmapset *inserted = NULL;
-	Bitmapset *updated = NULL;
-	Bitmapset *deleted = NULL;
+	List *inserted = NULL;
+	List *updated = NULL;
+	List *deleted = NULL;
 	List		*unique_result_relations = NIL;
 	List		*rtable = queryDesc->plannedstmt->rtable;
 	int			length = list_length(rtable);
 	ListCell	*lc;
-	int relid = -1;
+	Oid relid;
 
 	/*
 	 * Process epd first to get the affected relations.
 	 */
 	ConsumeAndProcessExtendProtocolData_IUD(&inserted, &updated, &deleted);
 
-	relid = -1;
-	while((relid = bms_next_member(inserted, relid)) >= 0)
+	foreach (lc, inserted)
 	{
+		relid = lfirst_oid(lc);
 		/* Only need to transfer to UP direction. */
 		SetRelativeMatviewAuxStatus(relid, MV_DATA_STATUS_EXPIRED_INSERT_ONLY,
 										MV_DATA_STATUS_TRANSFER_DIRECTION_UP);
-
 	}
 
-	relid = -1;
-	while((relid = bms_next_member(updated, relid)) >= 0)
+	foreach (lc, updated)
 	{
+		relid = lfirst_oid(lc);
 		SetRelativeMatviewAuxStatus(relid, MV_DATA_STATUS_EXPIRED,
 										MV_DATA_STATUS_TRANSFER_DIRECTION_UP);
 
 	}
 
-	relid = -1;
-	while((relid = bms_next_member(deleted, relid)) >= 0)
+	foreach (lc, deleted)
 	{
+		relid = lfirst_oid(lc);
 		SetRelativeMatviewAuxStatus(relid, MV_DATA_STATUS_EXPIRED,
 										MV_DATA_STATUS_TRANSFER_DIRECTION_UP);
 
@@ -4338,9 +4337,9 @@ MaintainMaterializedViewStatus(QueryDesc *queryDesc, CmdType operation)
 			 * Do a second check and fall back to partitioned table
 			 * in case that if we failed to find a one.
 			 */
-			if (bms_is_empty(inserted) &&
-				bms_is_empty(updated) &&
-				bms_is_empty(deleted))
+			if ((list_length(inserted) == 0) &&
+				(list_length(updated) == 0) &&
+				(list_length(deleted) == 0))
 			{
 				ereport(WARNING,
 					(errmsg("fail to find leafs of partitioned table: %s", get_rel_name(rte->relid))));
diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c
index 679d861e485..629eca05483 100644
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -916,12 +916,7 @@ ExecInitPartitionInfo(ModifyTableState *mtstate, EState *estate,
 		lappend(estate->es_tuple_routing_result_relations,
 				leaf_part_rri);
 
-	if (RelationIsAoRows(leaf_part_rri->ri_RelationDesc))
-		appendonly_dml_init(leaf_part_rri->ri_RelationDesc, mtstate->operation);
-	else if (RelationIsAoCols(leaf_part_rri->ri_RelationDesc))
-		aoco_dml_init(leaf_part_rri->ri_RelationDesc, mtstate->operation);
-	else if (ext_dml_init_hook)
-		ext_dml_init_hook(leaf_part_rri->ri_RelationDesc, mtstate->operation);
+	table_dml_init(leaf_part_rri->ri_RelationDesc, mtstate->operation);
 
 	MemoryContextSwitchTo(oldcxt);
 
@@ -1234,12 +1229,7 @@ ExecCleanupTupleRouting(ModifyTableState *mtstate,
 		 * Only leaf node can have a valid access method.  If we find an
 		 * appendoptimized table, ensure the DML operation is finished.
 		 */
-		if (RelationIsAoRows(resultRelInfo->ri_RelationDesc))
-			appendonly_dml_finish(resultRelInfo->ri_RelationDesc, mtstate->operation);
-		else if (RelationIsAoCols(resultRelInfo->ri_RelationDesc))
-			aoco_dml_finish(resultRelInfo->ri_RelationDesc, mtstate->operation);
-		else if (ext_dml_finish_hook)
-			ext_dml_finish_hook(resultRelInfo->ri_RelationDesc, mtstate->operation);
+		table_dml_fini(resultRelInfo->ri_RelationDesc, mtstate->operation);
 
 		ExecCloseIndices(resultRelInfo);
 		table_close(resultRelInfo->ri_RelationDesc, NoLock);
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 881d09e5375..7513d11102f 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -268,6 +268,7 @@
 #include "utils/dynahash.h"
 #include "utils/expandeddatum.h"
 #include "utils/faultinjector.h"
+#include "utils/guc.h"
 #include "utils/logtape.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
@@ -481,6 +482,8 @@ static void build_pertrans_for_aggref(AggStatePerTrans pertrans,
 
 static void ExecEagerFreeAgg(AggState *node);
 
+void agg_hash_explain_extra_message(AggState *aggstate);
+
 /*
  * Select the current grouping set; affects current_set and
  * curaggcontext.
@@ -1540,6 +1543,16 @@ build_hash_tables(AggState *aggstate)
 										   memory);
 
 		build_hash_table(aggstate, setno, nbuckets);
+
+		/* initialize some statistic info of hash table */
+		perhash->num_output_groups = 0;
+		perhash->num_spill_parts = 0;
+		perhash->num_expansions = 0;
+		perhash->bucket_total = 0;
+		perhash->bucket_used = 0;
+		perhash->chain_count = 0;
+		perhash->chain_length_total = 0;
+		perhash->chain_length_max = 0;
 	}
 
 	aggstate->hash_ngroups_current = 0;
@@ -1858,6 +1871,8 @@ hash_agg_set_limits(AggState *aggstate, double hashentrysize, double input_group
 			strict_memlimit = operator_mem;
 	}
 
+	strict_memlimit = strict_memlimit * hash_mem_multiplier;
+
 	/* if not expected to spill, use all of work_mem */
 	if (input_groups * hashentrysize < strict_memlimit * 1024L)
 	{
@@ -1966,6 +1981,7 @@ hash_agg_enter_spill_mode(AggState *aggstate)
 			hashagg_spill_init(aggstate, spill, aggstate->hash_tapeinfo, 0,
 							   perhash->aggnode->numGroups,
 							   aggstate->hashentrysize);
+			perhash->num_spill_parts += spill->npartitions;
 		}
 
 		if (aggstate->ss.ps.instrument)
@@ -2019,6 +2035,12 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
 	}
 
 	/* update hashentrysize estimate based on contents */
+	/*
+	 * Greenplum doesn't use hashentrysize in the instrumentation, it will
+	 * calculate hash table chain length to get an accurate number.
+	 *
+	 * See the following code to collect hash table statistic info.
+	 */
 	if (aggstate->hash_ngroups_current > 0)
 	{
 		aggstate->hashentrysize =
@@ -2031,7 +2053,68 @@ hash_agg_update_metrics(AggState *aggstate, bool from_tape, int npartitions)
 		Instrumentation    *instrument = aggstate->ss.ps.instrument;
 
 		instrument->workmemused = aggstate->hash_mem_peak;
+
+		/*
+		 * workmemwanted to avoid scratch i/o, that how much memory is needed
+		 * if we want to load into the hashtable at once:
+		 *
+		 * 1. add meta_mem only when from_tape is false, because when we are
+		 *	  reading from tape/spilled file, we can reuse the existing hash
+		 *	  table's meta.
+		 * 2. add hash_mem every time.
+		 * 3. don't add buffer_mem since it's unnecessary when we can load into
+		 *    into the memory at once.
+		 */
+		if (!from_tape)
+			instrument->workmemwanted += meta_mem;
+		instrument->workmemwanted += hashkey_mem;
+
+		/* Scan all perhashs and collect hash table statistic info */
+		for (int setno = 0; setno < aggstate->num_hashes; setno++)
+		{
+			AggStatePerHash perhash = &aggstate->perhash[setno];
+			tuplehash_hash *hashtab = perhash->hashtable->hashtab;
+
+			Assert(hashtab);
+
+			perhash->num_expansions += hashtab->num_expansions;
+			perhash->bucket_total += hashtab->size;
+			perhash->bucket_used += hashtab->members;
+			if (hashtab->members > 0)
+			{
+				uint32  perht_chain_length_total = 0;
+				uint32  perht_chain_count = 0;
+
+				/* collect statistic info of chain length per hash table */
+				tuplehash_coll_stat(hashtab,
+									&(perhash->chain_length_max),
+									&perht_chain_length_total,
+									&perht_chain_count);
+				perhash->chain_count += perht_chain_count;
+				perhash->chain_length_total += perht_chain_length_total;
+			}
+		}
 	}
+
+#ifdef USE_ASSERT_CHECKING
+	if (unlikely(DEBUG1 >= log_min_messages) && aggstate->streaming)
+	{
+		for (int setno = 0; setno < aggstate->num_hashes; setno++)
+		{
+			AggStatePerHash perhash = &aggstate->perhash[setno];
+			if (perhash->chain_count > 0)
+			{
+				elog(DEBUG1, "hash_agg_update_metrics streaming: setno=%d, chain_length_total=%.1f, chain_length_max=%d, bucket_used=%lu, bucket_total=%lu, num_expansions=%u",
+					 setno,
+					 (double)perhash->chain_length_total / perhash->chain_count,
+					 perhash->chain_length_max,
+					 perhash->bucket_used,
+					 perhash->bucket_total,
+					 perhash->num_expansions);
+			}
+		}
+	}
+#endif
 }
 
 /*
@@ -2088,6 +2171,8 @@ hash_choose_num_partitions(AggState *aggstate, double input_groups, double hashe
 			strict_memlimit = operator_mem;
 	}
 
+	strict_memlimit = strict_memlimit * hash_mem_multiplier;
+
 	/*
 	 * Avoid creating so many partitions that the memory requirements of the
 	 * open partition files are greater than 1/4 of hash_mem.
@@ -2216,7 +2301,7 @@ lookup_hash_entries(AggState *aggstate)
 				initialize_hash_entry(aggstate, hashtable, entry);
 			pergroup[setno] = entry->additional;
 		}
-		else
+		else if (!aggstate->streaming)
 		{
 			HashAggSpill *spill = &aggstate->hash_spills[setno];
 			TupleTableSlot *slot = aggstate->tmpcontext->ecxt_outertuple;
@@ -2225,6 +2310,7 @@ lookup_hash_entries(AggState *aggstate)
 				hashagg_spill_init(aggstate, spill, aggstate->hash_tapeinfo, 0,
 								   perhash->aggnode->numGroups,
 								   aggstate->hashentrysize);
+			perhash->num_spill_parts += spill->npartitions;
 
 			hashagg_spill_tuple(aggstate, spill, slot, hash);
 			pergroup[setno] = NULL;
@@ -2277,6 +2363,13 @@ ExecAgg(PlanState *pstate)
 			return result;
 	}
 
+	/* Save statistics into the cdbexplainbuf for EXPLAIN ANALYZE */
+	if (node->ss.ps.instrument &&
+			(node->ss.ps.instrument)->need_cdb &&
+			(node->phase->aggstrategy == AGG_HASHED ||
+			node->phase->aggstrategy == AGG_MIXED))
+		agg_hash_explain_extra_message(node);
+
 	return NULL;
 }
 
@@ -2807,6 +2900,7 @@ agg_refill_hash_table(AggState *aggstate)
 				spill_initialized = true;
 				hashagg_spill_init(aggstate, &spill, tapeinfo, batch->used_bits,
 								   batch->input_card, aggstate->hashentrysize);
+				aggstate->perhash[aggstate->current_set].num_spill_parts += spill.npartitions;
 			}
 			/* no memory for a new group, spill */
 			hashagg_spill_tuple(aggstate, &spill, spillslot, hash);
@@ -2981,6 +3075,8 @@ agg_retrieve_hash_table_in_memory(AggState *aggstate)
 			}
 		}
 
+		perhash->num_output_groups++;
+
 		/*
 		 * Clear the per-output-tuple context for each group
 		 *
@@ -5139,3 +5235,77 @@ ReuseHashTable(AggState *node)
 			!node->streaming &&
 			!bms_overlap(node->ss.ps.chgParam, aggnode->aggParams));
 }
+
+/*
+ * Save statistics into the cdbexplainbuf for EXPLAIN ANALYZE
+ */
+void
+agg_hash_explain_extra_message(AggState *aggstate)
+{
+	/*
+	 * Check cdbexplain_depositStatsToNode(), Greenplum only saves extra
+	 * message text for the most interesting winning qExecs.
+	 */
+	StringInfo hbuf = aggstate->ss.ps.cdbexplainbuf;
+	uint64	sum_num_expansions = 0;
+	uint64	sum_output_groups = 0;
+	uint64	sum_spill_parts = 0;
+	uint64	sum_chain_length_total = 0;
+	uint64	sum_chain_count = 0;
+	uint32	chain_length_max = 0;
+	uint64	sum_bucket_used = 0;
+	uint64	sum_bucket_total = 0;
+
+	Assert(hbuf);
+
+	appendStringInfo(hbuf, "hash table(s): %d", aggstate->num_hashes);
+
+	/* Scan all perhashs and collect statistic info */
+	for (int setno = 0; setno < aggstate->num_hashes; setno++)
+	{
+		AggStatePerHash perhash = &aggstate->perhash[setno];
+
+		/* spill statistic info */
+		if (aggstate->hash_ever_spilled)
+		{
+			sum_output_groups += perhash->num_output_groups;
+			sum_spill_parts += perhash->num_spill_parts;
+		}
+
+		/* inner hash table statistic info */
+		if (perhash->chain_count > 0)
+		{
+			sum_chain_length_total += perhash->chain_length_total;
+			sum_chain_count += perhash->chain_count;
+			if (perhash->chain_length_max > chain_length_max)
+				chain_length_max = perhash->chain_length_max;
+			sum_bucket_used = perhash->bucket_used;
+			sum_bucket_total = perhash->bucket_total;
+			sum_num_expansions += perhash->num_expansions;
+		}
+	}
+
+	if (aggstate->hash_ever_spilled)
+	{
+		appendStringInfo(hbuf,
+			"; " UINT64_FORMAT " groups total in %d batches, " UINT64_FORMAT
+			" spill partitions; disk usage: " INT64_FORMAT "KB",
+			sum_output_groups,
+			aggstate->hash_batches_used,
+			sum_spill_parts,
+			aggstate->hash_disk_used);
+	}
+
+	if (sum_chain_count > 0)
+	{
+		appendStringInfo(hbuf,
+				"; chain length %.1f avg, %d max;"
+				" using " INT64_FORMAT " of " INT64_FORMAT " buckets;"
+				" total " INT64_FORMAT " expansions.\n",
+				(double)sum_chain_length_total / sum_chain_count,
+				chain_length_max,
+				sum_bucket_used,
+				sum_bucket_total,
+				sum_num_expansions);
+	}
+}
diff --git a/src/backend/executor/nodeDynamicSeqscan.c b/src/backend/executor/nodeDynamicSeqscan.c
index c13be0a1f1b..3380b907ba3 100644
--- a/src/backend/executor/nodeDynamicSeqscan.c
+++ b/src/backend/executor/nodeDynamicSeqscan.c
@@ -223,7 +223,16 @@ ExecDynamicSeqScan(PlanState *pstate)
 		slot = ExecProcNode(&node->seqScanState->ss.ps);
 
 		if (!TupIsNull(slot))
+		{
+			if (gp_enable_runtime_filter_pushdown
+				&& !pstate->state->useMppParallelMode
+				&& node->filters)
+			{
+				if (!PassByBloomFilter(&node->ss.ps, node->filters, slot))
+					continue;
+			}
 			break;
+		}
 
 		/* No more tuples from this partition. Move to next one. */
 		CleanupOnePartition(node);
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 53e55e26f91..62d3c2da790 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -4161,7 +4161,9 @@ PushdownRuntimeFilter(HashState *node)
 		scankeys = NIL;
 
 		attr_filter = lfirst(lc);
-		if (!IsA(attr_filter->target, SeqScanState) || attr_filter->empty)
+		if (attr_filter->empty ||
+			(!IsA(attr_filter->target, SeqScanState) &&
+			 !IsA(attr_filter->target, DynamicSeqScanState)))
 			continue;
 
 		/* bloom filter */
@@ -4190,8 +4192,21 @@ PushdownRuntimeFilter(HashState *node)
 		scankeys = lappend(scankeys, sk);
 
 		/* append new runtime filters to target node */
-		SeqScanState *sss = castNode(SeqScanState, attr_filter->target);
-		sss->filters = list_concat(sss->filters, scankeys);
+		if (IsA(attr_filter->target, SeqScanState))
+		{
+			SeqScanState *sss = castNode(SeqScanState, attr_filter->target);
+			sss->filters = list_concat(sss->filters, scankeys);
+		}
+		else if (IsA(attr_filter->target, DynamicSeqScanState))
+		{
+			DynamicSeqScanState *dsss = castNode(DynamicSeqScanState, attr_filter->target);
+			dsss->filters = list_concat(dsss->filters, scankeys);
+		}
+		else
+		{
+			/* never reach here */
+			pg_unreachable();
+		}
 	}
 }
 
@@ -4250,6 +4265,7 @@ ResetRuntimeFilter(HashState *node)
 	ListCell		*lc;
 	AttrFilter		*attr_filter;
 	SeqScanState	*sss;
+	DynamicSeqScanState *dsss;
 
 	if (!node->filters)
 		return;
@@ -4268,6 +4284,20 @@ ResetRuntimeFilter(HashState *node)
 				sss->filters = NIL;
 			}
 		}
+		else if (IsA(attr_filter->target, DynamicSeqScanState))
+		{
+			dsss = castNode(DynamicSeqScanState, attr_filter->target);
+			if (dsss->filters)
+			{
+				list_free_deep(dsss->filters);
+				dsss->filters = NIL;
+			}
+		}
+		else
+		{
+			/* never reach here */
+			pg_unreachable();
+		}
 
 		if (attr_filter->blm_filter)
 			bloom_free(attr_filter->blm_filter);
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 2a60c777184..9ec70f16e31 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -2239,7 +2239,7 @@ CreateRuntimeFilter(HashJoinState* hjstate)
 		foreach(lc, targets)
 		{
 			PlanState *target = lfirst(lc);
-			Assert(IsA(target, SeqScanState));
+			Assert(IsA(target, SeqScanState) || IsA(target, DynamicSeqScanState));
 
 			attr_filter = CreateAttrFilter(target, lattno, rattno,
 					hstate->ps.plan->plan_rows);
@@ -2334,13 +2334,25 @@ CheckTargetNode(PlanState *node, AttrNumber attno, AttrNumber *lattno)
 	Var *var;
 	TargetEntry *te;
 
-	if (!IsA(node, SeqScanState))
+	if (!IsA(node, SeqScanState) && !IsA(node, DynamicSeqScanState))
 		return false;
 
 	te = (TargetEntry *)list_nth(node->plan->targetlist, attno - 1);
 	if (!IsA(te->expr, Var))
 		return false;
 
+	if (IsA(node, DynamicSeqScanState))
+	{
+		*lattno = te->resno;
+		return true;
+	}
+
+	/*
+	 * seqscan is a special case, it's targetlist is a projection of the
+	 * relation's attributes. so we need to find the attribute number of the
+	 * column in the relation, because PassByBloomFilter runs before
+	 * projection in seqscan.
+	 */
 	var = castNode(Var, te->expr);
 
 	/* system column is not allowed */
@@ -2375,16 +2387,14 @@ FindTargetNodes(HashJoinState *hjstate, AttrNumber attno, AttrNumber *lattno)
 	targetNodes = NIL;
 	while (true)
 	{
-		/* target is seqscan */
-		if ((IsA(parent, HashJoinState) || IsA(parent, ResultState)) && IsA(child, SeqScanState))
+		/* target is seqscan or dynamic seqscan */
+		if ((IsA(parent, HashJoinState) || IsA(parent, ResultState)) && 
+			(IsA(child, SeqScanState) || IsA(child, DynamicSeqScanState)))
 		{
 			/*
 			 * hashjoin
-			 *   seqscan
-			 * or
-			 * hashjoin
-			 *   result
-			 *     seqscan
+			 *   [result]
+			 *     seqscan | dynamicseqscan
 			 */
 			if (!CheckTargetNode(child, attno, lattno))
 				return NULL;
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 3247c0cf2f1..27b48152195 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -61,16 +61,15 @@
 #include "cdb/cdbhash.h"
 #include "cdb/cdbpq.h"
 #include "cdb/cdbvars.h"
+#include "common/hashfn.h" /* hash_any */
 #include "parser/parsetree.h"
+#include "utils/hsearch.h" /* hash_destroy */
 #include "utils/lsyscache.h"
 #include "utils/snapmgr.h"
 
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 
-ext_dml_func_hook_type ext_dml_init_hook   = NULL;
-ext_dml_func_hook_type ext_dml_finish_hook = NULL;
-
 typedef struct MTTargetRelLookup
 {
 	Oid			relationOid;	/* hash key, must be first */
@@ -99,8 +98,43 @@ static TupleTableSlot *ExecPrepareTupleRouting(ModifyTableState *mtstate,
 											   TupleTableSlot *slot,
 											   ResultRelInfo **partRelInfo);
 
+typedef struct ModifiedLeafRelidsKey
+{
+	CmdType	cmd;
+	Oid		relid;
+
+} ModifiedLeafRelidsKey;
+
+typedef struct ModifiedLeafRelidsData
+{
+	ModifiedLeafRelidsKey	key;
+} ModifiedLeafRelidsData;
+
+static uint32
+modified_leaf_hash(const void *key, Size keysize)
+{
+	Assert(keysize == sizeof(ModifiedLeafRelidsKey));
+	return DatumGetUInt32(hash_any((const unsigned char*) key,
+									keysize));
+}
+
+static int
+modified_leaf_compare(const void *key1, const void *key2, Size keysize)
+{
+	Assert(keysize == sizeof(ModifiedLeafRelidsKey));
+	const ModifiedLeafRelidsKey *k1 = (ModifiedLeafRelidsKey*) key1;
+	const ModifiedLeafRelidsKey *k2 = (ModifiedLeafRelidsKey*) key2;
+
+	if ((k1->cmd == k2->cmd) &&
+		(k1->relid == k2->relid))
+	{
+		return 0;
+	}
+	return 1;
+}
+
 static void
-send_subtag(StringInfoData *buf, ExtendProtocolSubTag subtag, Bitmapset* relids);
+send_subtag(StringInfoData *buf, ExtendProtocolSubTag subtag, List *relids);
 
 static void
 notify_modified_relations_to_QD(ModifyTableState *node);
@@ -109,7 +143,7 @@ static void
 notify_modified_relations_local(ModifyTableState *node);
 
 static void
-epd_add_subtag_data(ExtendProtocolSubTag subtag, Bitmapset *relids);
+epd_add_subtag_data(ExtendProtocolSubTag subtag, List *relids);
 
 /*
  * Verify that the tuples to be produced by INSERT match the
@@ -1052,9 +1086,13 @@ ExecInsert(ModifyTableState *mtstate,
 
 	if (resultRelationDesc->rd_rel->relispartition)
 	{
-		mtstate->mt_leaf_relids_inserted =
-			bms_add_member(mtstate->mt_leaf_relids_inserted, RelationGetRelid(resultRelationDesc));
-		mtstate->has_leaf_changed = true;
+		ModifiedLeafRelidsKey	key;
+
+		MemSet(&key, 0, sizeof(key));
+		key.cmd = CMD_INSERT;
+		key.relid = RelationGetRelid(resultRelationDesc);
+
+		(void) hash_search(mtstate->modified_leaf_relids, &key, HASH_ENTER, NULL);
 	}
 
 	/*
@@ -1520,10 +1558,13 @@ ldelete:;
 
 	if (resultRelationDesc->rd_rel->relispartition)
 	{
+		ModifiedLeafRelidsKey	key;
 
-		mtstate->mt_leaf_relids_deleted =
-			bms_add_member(mtstate->mt_leaf_relids_deleted, RelationGetRelid(resultRelationDesc));
-		mtstate->has_leaf_changed = true;
+		MemSet(&key, 0, sizeof(key));
+		key.cmd = CMD_DELETE;
+		key.relid = RelationGetRelid(resultRelationDesc);
+
+		(void) hash_search(mtstate->modified_leaf_relids, &key, HASH_ENTER, NULL);
 	}
 
 	/* Tell caller that the delete actually happened. */
@@ -2170,9 +2211,13 @@ lreplace:;
 
 	if (resultRelationDesc->rd_rel->relispartition)
 	{
-		mtstate->mt_leaf_relids_updated =
-			bms_add_member(mtstate->mt_leaf_relids_updated, RelationGetRelid(resultRelationDesc));
-		mtstate->has_leaf_changed = true;
+		ModifiedLeafRelidsKey	key;
+
+		MemSet(&key, 0, sizeof(key));
+		key.cmd = CMD_UPDATE;
+		key.relid = RelationGetRelid(resultRelationDesc);
+
+		(void) hash_search(mtstate->modified_leaf_relids, &key, HASH_ENTER, NULL);
 	}
 
 	/* AFTER ROW UPDATE Triggers */
@@ -3088,6 +3133,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	ListCell   *l;
 	int			i;
 	Relation	rel;
+	HASHCTL		hash_ctl;
 
 	/* check for unsupported flags */
 	Assert(!(eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK)));
@@ -3100,10 +3146,16 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	mtstate->ps.state = estate;
 	mtstate->ps.ExecProcNode = ExecModifyTable;
 
-	mtstate->mt_leaf_relids_inserted = NULL;
-	mtstate->mt_leaf_relids_updated = NULL;
-	mtstate->mt_leaf_relids_deleted = NULL;
-	mtstate->has_leaf_changed = false;
+	MemSet(&hash_ctl, 0, sizeof(hash_ctl));
+	hash_ctl.keysize = sizeof(ModifiedLeafRelidsKey);
+	hash_ctl.entrysize = sizeof(ModifiedLeafRelidsData);
+	hash_ctl.hash = modified_leaf_hash;
+	hash_ctl.match = modified_leaf_compare;
+	hash_ctl.hcxt = CurrentMemoryContext;
+	mtstate->modified_leaf_relids = hash_create("ModifiedLeafRelids",
+												4,
+												&hash_ctl,
+												HASH_ELEM | HASH_FUNCTION | HASH_COMPARE);
 
 	mtstate->operation = operation;
 	mtstate->canSetTag = node->canSetTag;
@@ -3206,12 +3258,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 								   "supported in serializable transactions")));
 		}
 
-		if (RelationIsAoRows(resultRelInfo->ri_RelationDesc))
-			appendonly_dml_init(resultRelInfo->ri_RelationDesc, operation);
-		else if (RelationIsAoCols(resultRelInfo->ri_RelationDesc))
-			aoco_dml_init(resultRelInfo->ri_RelationDesc, operation);
-		else if (ext_dml_init_hook)
-			ext_dml_init_hook(resultRelInfo->ri_RelationDesc, operation);
+		table_dml_init(resultRelInfo->ri_RelationDesc, operation);
 
 		resultRelInfo++;
 		i++;
@@ -3662,13 +3709,7 @@ ExecEndModifyTable(ModifyTableState *node)
 			resultRelInfo->ri_FdwRoutine->EndForeignModify(node->ps.state,
 														   resultRelInfo);
 
-		if (RelationIsAoRows(resultRelInfo->ri_RelationDesc))
-			appendonly_dml_finish(resultRelInfo->ri_RelationDesc,
-								  node->operation);
-		else if (RelationIsAoCols(resultRelInfo->ri_RelationDesc))
-			aoco_dml_finish(resultRelInfo->ri_RelationDesc, node->operation);
-		else if (ext_dml_finish_hook)
-			ext_dml_finish_hook(resultRelInfo->ri_RelationDesc, node->operation);
+		table_dml_fini(resultRelInfo->ri_RelationDesc, node->operation);
 
 		/*
 		 * Cleanup the initialized batch slots. This only matters for FDWs
@@ -3716,8 +3757,11 @@ ExecEndModifyTable(ModifyTableState *node)
 	ExecEndNode(outerPlanState(node));
 
 	/* Notify modified leaf relids to QD */
-	if (GP_ROLE_EXECUTE == Gp_role && node->has_leaf_changed)
+	if (GP_ROLE_EXECUTE == Gp_role &&
+		hash_get_num_entries(node->modified_leaf_relids) > 0)
 		notify_modified_relations_to_QD(node);
+
+	hash_destroy(node->modified_leaf_relids);
 }
 
 void
@@ -3764,16 +3808,52 @@ static void
 notify_modified_relations_to_QD(ModifyTableState *node)
 {
 	StringInfoData buf;
+	HASH_SEQ_STATUS scan;
+	ModifiedLeafRelidsData *r;
+	List *inserted = NIL;
+	List *updated = NIL;
+	List *deleted = NIL;
+
+	hash_seq_init(&scan, node->modified_leaf_relids);
+
 	pq_beginmessage(&buf, PQExtendProtocol);
 
-	if (!bms_is_empty(node->mt_leaf_relids_inserted))
-		send_subtag(&buf, EP_TAG_I, node->mt_leaf_relids_inserted);
+	while ((r = (ModifiedLeafRelidsData *) hash_seq_search(&scan)) != NULL)
+	{
+		switch (r->key.cmd)
+		{
+			case CMD_INSERT:
+				inserted = lappend_oid(inserted, r->key.relid);
+				break;
+			case CMD_UPDATE:
+				updated = lappend_oid(updated, r->key.relid);
+				break;
+			case CMD_DELETE:
+				deleted = lappend_oid(deleted, r->key.relid);
+				break;
+			default:
+				Assert(false);
+				break;
+		}
+	}
 
-	if (!bms_is_empty(node->mt_leaf_relids_updated))
-		send_subtag(&buf, EP_TAG_U, node->mt_leaf_relids_updated);
+	if (inserted != NIL)
+	{
+		send_subtag(&buf, EP_TAG_I, inserted);
+		pfree(inserted);
+	}
 
-	if (!bms_is_empty(node->mt_leaf_relids_deleted))
-		send_subtag(&buf, EP_TAG_D, node->mt_leaf_relids_deleted);
+	if (updated != NIL)
+	{
+		send_subtag(&buf, EP_TAG_U, updated);
+		pfree(updated);
+	}
+
+	if (deleted != NIL)
+	{
+		send_subtag(&buf, EP_TAG_D, deleted);
+		pfree(deleted);
+	}
 
 	pq_sendint32(&buf, EP_TAG_MAX); /* Finish this run. */
 	pq_endmessage(&buf);
@@ -3787,19 +3867,19 @@ notify_modified_relations_to_QD(ModifyTableState *node)
  * while length is the length of data followed.
  */
 static void
-send_subtag(StringInfoData *buf, ExtendProtocolSubTag subtag, Bitmapset* relids)
+send_subtag(StringInfoData *buf, ExtendProtocolSubTag subtag, List *relids)
 {
-
 	bytea	*res;
 	int 	rlen;
 	char	*ptr;
 	int		rcount;
-	int		relid = -1;
+	Oid		relid;
+	ListCell	*lc;
 
 	pq_sendint32(buf, subtag); /* subtag */
 
-	rcount = bms_num_members(relids);
-	rlen = sizeof(int)/* count of relids */ + sizeof(int) * rcount;
+	rcount = list_length(relids);
+	rlen = sizeof(int)/* count of relids */ + sizeof(Oid) * rcount;
 
 	pq_sendint32(buf, rlen); /* length */
 
@@ -3808,10 +3888,12 @@ send_subtag(StringInfoData *buf, ExtendProtocolSubTag subtag, Bitmapset* relids)
 
 	memcpy(ptr, &rcount, sizeof(int));
 	ptr += sizeof(int);
-	while ((relid = bms_next_member(relids, relid)) >= 0)
+
+	foreach(lc, relids)
 	{
-		memcpy(ptr, &relid, sizeof(int));
-		ptr += sizeof(int);
+		relid = lfirst_oid(lc);
+		memcpy(ptr, &relid, sizeof(Oid));
+		ptr += sizeof(Oid);
 	}
 
 	SET_VARSIZE(res, rlen + VARHDRSZ);
@@ -3830,14 +3912,50 @@ notify_modified_relations_local(ModifyTableState *node)
 {
 	Assert(epd);
 
-	if (!bms_is_empty(node->mt_leaf_relids_inserted))
-		epd_add_subtag_data(EP_TAG_I, node->mt_leaf_relids_inserted);
+	HASH_SEQ_STATUS scan;
+	ModifiedLeafRelidsData *r;
+	List *inserted = NIL;
+	List *updated = NIL;
+	List *deleted = NIL;
 
-	if (!bms_is_empty(node->mt_leaf_relids_updated))
-		epd_add_subtag_data(EP_TAG_U, node->mt_leaf_relids_updated);
+	hash_seq_init(&scan, node->modified_leaf_relids);
 
-	if (!bms_is_empty(node->mt_leaf_relids_deleted))
-		epd_add_subtag_data(EP_TAG_D, node->mt_leaf_relids_deleted);
+	while ((r = (ModifiedLeafRelidsData *) hash_seq_search(&scan)) != NULL)
+	{
+		switch (r->key.cmd)
+		{
+			case CMD_INSERT:
+				inserted = lappend_oid(inserted, r->key.relid);
+				break;
+			case CMD_UPDATE:
+				updated = lappend_oid(updated, r->key.relid);
+				break;
+			case CMD_DELETE:
+				deleted = lappend_oid(deleted, r->key.relid);
+				break;
+			default:
+				Assert(false);
+				break;
+		}
+	}
+
+	if (inserted != NIL)
+	{
+		epd_add_subtag_data(EP_TAG_I, inserted);
+		pfree(inserted);
+	}
+
+	if (updated != NIL)
+	{
+		epd_add_subtag_data(EP_TAG_U, updated);
+		pfree(updated);
+	}
+
+	if (deleted != NIL)
+	{
+		epd_add_subtag_data(EP_TAG_D, deleted);
+		pfree(deleted);
+	}
 }
 
 /*
@@ -3849,7 +3967,7 @@ notify_modified_relations_local(ModifyTableState *node)
  * are performed under the TopTransactionContext to ensure proper memory management.
  */
 static void
-epd_add_subtag_data(ExtendProtocolSubTag subtag, Bitmapset * relids)
+epd_add_subtag_data(ExtendProtocolSubTag subtag, List *relids) 
 {
 	MemoryContext 	oldctx;
 	StringInfo		buf;
@@ -3857,20 +3975,24 @@ epd_add_subtag_data(ExtendProtocolSubTag subtag, Bitmapset * relids)
 	int 	rlen;
 	char	*ptr;
 	int		rcount;
-	int		relid = -1;
+	Oid 	relid;
+	ListCell *lc;
 
-	rcount = bms_num_members(relids);
-	rlen = sizeof(int) /* count of relids */ + sizeof(int) * rcount;
+	rcount = list_length(relids);
+	rlen = sizeof(int) /* count of relids */ + sizeof(Oid) * rcount;
 	res = palloc(rlen + VARHDRSZ);
 	ptr = VARDATA(res);
 
 	memcpy(ptr, &rcount, sizeof(int));
 	ptr += sizeof(int);
-	while ((relid = bms_next_member(relids, relid)) >= 0)
+
+	foreach(lc, relids)
 	{
-		memcpy(ptr, &relid, sizeof(int));
-		ptr += sizeof(int);
+		relid = lfirst_oid(lc);
+		memcpy(ptr, &relid, sizeof(Oid));
+		ptr += sizeof(Oid);
 	}
+
 	SET_VARSIZE(res, rlen + VARHDRSZ);
 
 	oldctx = MemoryContextSwitchTo(TopTransactionContext);
diff --git a/src/backend/executor/nodeMotion.c b/src/backend/executor/nodeMotion.c
index b6514f2a0ce..1229d460a55 100644
--- a/src/backend/executor/nodeMotion.c
+++ b/src/backend/executor/nodeMotion.c
@@ -31,7 +31,7 @@
 #include "utils/wait_event.h"
 #include "miscadmin.h"
 #include "utils/memutils.h"
-
+#include "tcop/pquery.h" /* ActivePortal */
 
 /* #define MEASURE_MOTION_TIME */
 
@@ -269,6 +269,7 @@ execMotionSender(MotionState *node)
 
 			if (node->stopRequested)
 			{
+				ActivePortal->stop_requested_in_motion = true;
 				elog(gp_workfile_caching_loglevel, "Motion calling Squelch on child node");
 				/* propagate stop notification to our children */
 				ExecSquelchNode(outerNode, true);
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 94270b8231b..7ee5a2e94cf 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -42,8 +42,6 @@
 #include "cdb/cdbvars.h"
 
 static TupleTableSlot *SeqNext(SeqScanState *node);
-
-static bool PassByBloomFilter(SeqScanState *node, TupleTableSlot *slot);
 static ScanKey ScanKeyListToArray(List *keys, int *num);
 
 /* ----------------------------------------------------------------
@@ -82,13 +80,18 @@ SeqNext(SeqScanState *node)
 		 * node->filter_in_seqscan is false means scankey need to be pushed to
 		 * AM.
 		 */
-		if (gp_enable_runtime_filter_pushdown && !node->filter_in_seqscan)
+		if (gp_enable_runtime_filter_pushdown && node->filter_in_seqscan && node->filters &&
+			(table_scan_flags(node->ss.ss_currentRelation) &
+			 (SCAN_SUPPORT_RUNTIME_FILTER)))
+		{
+			// pushdown runtime filter to AM
 			keys = ScanKeyListToArray(node->filters, &nkeys);
+		}
 
 		/*
-		* We reach here if the scan is not parallel, or if we're serially
-		* executing a scan that was planned to be parallel.
-		*/
+		 * We reach here if the scan is not parallel, or if we're serially
+		 * executing a scan that was planned to be parallel.
+		 */
 		scandesc = table_beginscan_es(node->ss.ss_currentRelation,
 									  estate->es_snapshot,
 									  nkeys, keys,
@@ -104,7 +107,8 @@ SeqNext(SeqScanState *node)
 	{
 		while (table_scan_getnextslot(scandesc, direction, slot))
 		{
-			if (!PassByBloomFilter(node, slot))
+			// TODO: later pushdown bloom filter to AM
+			if (!PassByBloomFilter(&node->ss.ps, node->filters, slot))
 				continue;
 
 			return slot;
@@ -405,8 +409,8 @@ ExecSeqScanInitializeWorker(SeqScanState *node,
 /*
  * Returns true if the element may be in the bloom filter.
  */
-static bool
-PassByBloomFilter(SeqScanState *node, TupleTableSlot *slot)
+bool
+PassByBloomFilter(PlanState *ps, List *filters, TupleTableSlot *slot)
 {
 	ScanKey	sk;
 	Datum	val;
@@ -417,12 +421,10 @@ PassByBloomFilter(SeqScanState *node, TupleTableSlot *slot)
 	/*
 	 * Mark that the pushdown runtime filter is actually taking effect.
 	 */
-	if (node->ss.ps.instrument &&
-		!node->ss.ps.instrument->prf_work &&
-		list_length(node->filters))
-		node->ss.ps.instrument->prf_work = true;
+	if (ps->instrument && !ps->instrument->prf_work && list_length(filters))
+		ps->instrument->prf_work = true;
 
-	foreach (lc, node->filters)
+	foreach (lc, filters)
 	{
 		sk = lfirst(lc);
 		if (sk->sk_flags != SK_BLOOM_FILTER)
@@ -435,7 +437,7 @@ PassByBloomFilter(SeqScanState *node, TupleTableSlot *slot)
 		blm_filter = (bloom_filter *)DatumGetPointer(sk->sk_argument);
 		if (bloom_lacks_element(blm_filter, (unsigned char *)&val, sizeof(Datum)))
 		{
-			InstrCountFilteredPRF(node, 1);
+			InstrCountFilteredPRF(ps, 1);
 			return false;
 		}
 	}
diff --git a/src/backend/executor/nodeShareInputScan.c b/src/backend/executor/nodeShareInputScan.c
index 808ae157ce8..a2ce47e192a 100644
--- a/src/backend/executor/nodeShareInputScan.c
+++ b/src/backend/executor/nodeShareInputScan.c
@@ -76,7 +76,7 @@
 /*
  * In a cross-slice ShareinputScan, the producer and consumer processes
  * communicate using shared memory. There's a hash table containing one
- * 'shareinput_share_state' for each in-progress shared input scan.
+ * 'shareinput_share_state' for each in-progress Share Input Scan.
  *
  * The hash table itself,, and the fields within every entry, are protected
  * by ShareInputScanLock. (Although some operations get away without the
@@ -631,11 +631,11 @@ ExecSquelchShareInputScan(ShareInputScanState *node, bool force)
 	ExecClearTuple(node->ss.ps.ps_ResultTupleSlot);
 
 	/*
-	 * If this SharedInputScan is shared within the same slice then its
+	 * If this ShareInputScan is shared within the same slice then its
 	 * subtree may still need to be executed and the motions in the subtree
 	 * cannot yet be stopped. Thus, don't recurse in this case.
 	 *
-	 * In squelching a cross-slice SharedInputScan writer, we need to ensure
+	 * In squelching a cross-slice ShareInputScan writer, we need to ensure
 	 * we don't block any reader on other slices as a result of not
 	 * materializing the shared plan.
 	 *
diff --git a/src/backend/fts/fts.c b/src/backend/fts/fts.c
index 719e8fbca1c..c7c1711e97f 100644
--- a/src/backend/fts/fts.c
+++ b/src/backend/fts/fts.c
@@ -102,7 +102,7 @@ sigIntHandler(SIGNAL_ARGS)
 pid_t
 FtsProbePID(void)
 {
-	return *shmFtsProbePID;
+	return shmFtsProbePID ? *shmFtsProbePID : 0;
 }
 
 bool
diff --git a/src/backend/gpopt/CGPOptimizer.cpp b/src/backend/gpopt/CGPOptimizer.cpp
index 2ab834173f1..a0253e44b41 100644
--- a/src/backend/gpopt/CGPOptimizer.cpp
+++ b/src/backend/gpopt/CGPOptimizer.cpp
@@ -45,7 +45,8 @@ PlannedStmt *
 CGPOptimizer::GPOPTOptimizedPlan(
 	Query *query,
 	bool *
-		had_unexpected_failure	// output : set to true if optimizer unexpectedly failed to produce plan
+		had_unexpected_failure,	// output : set to true if optimizer unexpectedly failed to produce plan
+	OptimizerOptions *opts
 )
 {
 	SOptContext gpopt_context;
@@ -55,15 +56,16 @@ CGPOptimizer::GPOPTOptimizedPlan(
 
 	GPOS_TRY
 	{
-		plStmt = COptTasks::GPOPTOptimizedPlan(query, &gpopt_context);
+		plStmt = COptTasks::GPOPTOptimizedPlan(query, &gpopt_context, opts);
 		// clean up context
 		gpopt_context.Free(gpopt_context.epinQuery, gpopt_context.epinPlStmt);
 	}
 	GPOS_CATCH_EX(ex)
 	{
 		// clone the error message before context free.
+		BOOL clone_failed = false;
 		CHAR *serialized_error_msg =
-			gpopt_context.CloneErrorMsg(MessageContext);
+			gpopt_context.CloneErrorMsg(MessageContext, &clone_failed);
 		// clean up context
 		gpopt_context.Free(gpopt_context.epinQuery, gpopt_context.epinPlStmt);
 
@@ -71,7 +73,7 @@ CGPOptimizer::GPOPTOptimizedPlan(
 		// we want to use the correct error code for these, in case an application
 		// tries to do something smart with them.
 
-		if (GPOS_MATCH_EX(ex, gpdxl::ExmaGPDB, gpdxl::ExmiGPDBError))
+		if (clone_failed || GPOS_MATCH_EX(ex, gpdxl::ExmaGPDB, gpdxl::ExmiGPDBError))
 		{
 			PG_RE_THROW();
 		}
@@ -199,9 +201,9 @@ CGPOptimizer::TerminateGPOPT()
 //---------------------------------------------------------------------------
 extern "C" {
 PlannedStmt *
-GPOPTOptimizedPlan(Query *query, bool *had_unexpected_failure)
+GPOPTOptimizedPlan(Query *query, bool *had_unexpected_failure, OptimizerOptions *opts)
 {
-	return CGPOptimizer::GPOPTOptimizedPlan(query, had_unexpected_failure);
+	return CGPOptimizer::GPOPTOptimizedPlan(query, had_unexpected_failure, opts);
 }
 }
 
diff --git a/src/backend/gpopt/config/CConfigParamMapping.cpp b/src/backend/gpopt/config/CConfigParamMapping.cpp
index b69d01e4074..603855c50ec 100644
--- a/src/backend/gpopt/config/CConfigParamMapping.cpp
+++ b/src/backend/gpopt/config/CConfigParamMapping.cpp
@@ -81,6 +81,14 @@ CConfigParamMapping::SConfigMappingElem CConfigParamMapping::m_elements[] = {
 	 false,	 // m_negate_param
 	 GPOS_WSZ_LIT("Prints optimization stats.")},
 
+	{EopttracePrintPreProcessResult, &optimizer_print_preprocess_result,
+		false,	 // m_negate_param
+		GPOS_WSZ_LIT("Prints the expression tree produced by the optimizer preprocess(every steps). Only worked with debug version of CBDB.")},
+
+	{EopttraceDebugCTE, &optimizer_debug_cte,
+	 false,	 // m_negate_param
+	 GPOS_WSZ_LIT("Print debug info of CTE. Only worked with debug version of CBDB.")},
+
 	{EopttraceMinidump,
 	 // GPDB_91_MERGE_FIXME: I turned optimizer_minidump from bool into
 	 // an enum-type GUC. It's a bit dirty to cast it like this..
@@ -306,8 +314,7 @@ CConfigParamMapping::SConfigMappingElem CConfigParamMapping::m_elements[] = {
 	{EopttraceEnableUseDistributionInDQA,
 	 &optimizer_enable_use_distribution_in_dqa,
 	 false,	 // m_negate_param
-	 GPOS_WSZ_LIT(
-		 "Enable use the distribution key in DQA")},
+	 GPOS_WSZ_LIT("Enable use the distribution key in DQA")},
 	{EopttraceDisableInnerHashJoin, &optimizer_enable_hashjoin,
 	 true,	// m_negate_param
 	 GPOS_WSZ_LIT("Explore hash join alternatives")},
@@ -315,6 +322,16 @@ CConfigParamMapping::SConfigMappingElem CConfigParamMapping::m_elements[] = {
 	 true,	// m_negate_param
 	 GPOS_WSZ_LIT("Enable nested loop join alternatives")},
 
+	{EopttraceDisableDynamicTableScan, &optimizer_disable_dynamic_table_scan,
+	 false,	 // m_negate_param
+	 GPOS_WSZ_LIT(
+		 "Disable the dynamic seq/bitmap/index scan in partition table")},
+
+	{EopttraceEnableWindowHashAgg, &optimizer_force_window_hash_agg,
+	 false,	 // m_negate_param
+	 GPOS_WSZ_LIT(
+		 "Enable create window hash agg")},
+	
 };
 
 //---------------------------------------------------------------------------
@@ -328,7 +345,8 @@ CConfigParamMapping::SConfigMappingElem CConfigParamMapping::m_elements[] = {
 CBitSet *
 CConfigParamMapping::PackConfigParamInBitset(
 	CMemoryPool *mp,
-	ULONG xform_id	// number of available xforms
+	ULONG xform_id,	// number of available xforms
+	BOOL create_vec_plan
 )
 {
 	CBitSet *traceflag_bitset = GPOS_NEW(mp) CBitSet(mp, EopttraceSentinel);
@@ -550,6 +568,18 @@ CConfigParamMapping::PackConfigParamInBitset(
 			GPOPT_DISABLE_XFORM_TF(CXform::ExfRightOuterJoin2HashJoin));
 	}
 
+	if (create_vec_plan) {
+		traceflag_bitset->ExchangeSet(EopttraceEnableWindowHashAgg);
+	}
+
+	if (optimizer_agg_pds_strategy == OPTIMIZER_AGG_PDS_FIRST_KEY) {
+		traceflag_bitset->ExchangeSet(EopttraceAggRRSFirstKey);
+	} else if (optimizer_agg_pds_strategy == OPTIMIZER_AGG_PDS_MINIMAL_LEN_KEY) {
+		traceflag_bitset->ExchangeSet(EopttraceAggRRSMinimalLenKey);
+	} else if (optimizer_agg_pds_strategy == OPTIMIZER_AGG_PDS_EXCLUDE_NON_FIXED) {
+		traceflag_bitset->ExchangeSet(EopttraceAggRRSExcludeNonFixedKey);
+	}
+
 	return traceflag_bitset;
 }
 
diff --git a/src/backend/gpopt/gpdbwrappers.cpp b/src/backend/gpopt/gpdbwrappers.cpp
index 3eed0ed1e40..aca95b2cc0a 100644
--- a/src/backend/gpopt/gpdbwrappers.cpp
+++ b/src/backend/gpopt/gpdbwrappers.cpp
@@ -36,17 +36,20 @@ extern "C" {
 #include "access/amapi.h"
 #include "access/external.h"
 #include "access/genam.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_inherits.h"
 #include "foreign/fdwapi.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/optimizer.h"
 #include "optimizer/plancat.h"
+#include "optimizer/prep.h"
 #include "optimizer/subselect.h"
 #include "parser/parse_agg.h"
 #include "partitioning/partdesc.h"
 #include "storage/lmgr.h"
 #include "utils/fmgroids.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/partcache.h"
 }
@@ -70,302 +73,36 @@ extern "C" {
 using namespace gpos;
 
 bool
-gpdb::BoolFromDatum(Datum d)
+gpdb::AggregateExists(Oid oid)
 {
 	GP_WRAP_START;
 	{
-		return DatumGetBool(d);
+		return aggregate_exists(oid);
 	}
 	GP_WRAP_END;
 	return false;
 }
 
-Datum
-gpdb::DatumFromBool(bool b)
-{
-	GP_WRAP_START;
-	{
-		return BoolGetDatum(b);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-char
-gpdb::CharFromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetChar(d);
-	}
-	GP_WRAP_END;
-	return '\0';
-}
-
-Datum
-gpdb::DatumFromChar(char c)
-{
-	GP_WRAP_START;
-	{
-		return CharGetDatum(c);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-int8
-gpdb::Int8FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetInt8(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromInt8(int8 i8)
-{
-	GP_WRAP_START;
-	{
-		return Int8GetDatum(i8);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-uint8
-gpdb::Uint8FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetUInt8(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromUint8(uint8 ui8)
-{
-	GP_WRAP_START;
-	{
-		return UInt8GetDatum(ui8);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-int16
-gpdb::Int16FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetInt16(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromInt16(int16 i16)
-{
-	GP_WRAP_START;
-	{
-		return Int16GetDatum(i16);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-uint16
-gpdb::Uint16FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetUInt16(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromUint16(uint16 ui16)
-{
-	GP_WRAP_START;
-	{
-		return UInt16GetDatum(ui16);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-int32
-gpdb::Int32FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetInt32(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromInt32(int32 i32)
-{
-	GP_WRAP_START;
-	{
-		return Int32GetDatum(i32);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-uint32
-gpdb::lUint32FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetUInt32(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromUint32(uint32 ui32)
-{
-	GP_WRAP_START;
-	{
-		return UInt32GetDatum(ui32);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-int64
-gpdb::Int64FromDatum(Datum d)
-{
-	Datum d2 = d;
-	GP_WRAP_START;
-	{
-		return DatumGetInt64(d2);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromInt64(int64 i64)
-{
-	int64 ii64 = i64;
-	GP_WRAP_START;
-	{
-		return Int64GetDatum(ii64);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-uint64
-gpdb::Uint64FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetUInt64(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromUint64(uint64 ui64)
-{
-	GP_WRAP_START;
-	{
-		return UInt64GetDatum(ui64);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Oid
-gpdb::OidFromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetObjectId(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-void *
-gpdb::PointerFromDatum(Datum d)
+Bitmapset *
+gpdb::BmsAddMember(Bitmapset *a, int x)
 {
 	GP_WRAP_START;
 	{
-		return DatumGetPointer(d);
+		return bms_add_member(a, x);
 	}
 	GP_WRAP_END;
 	return nullptr;
 }
 
-float4
-gpdb::Float4FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetFloat4(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-float8
-gpdb::Float8FromDatum(Datum d)
-{
-	GP_WRAP_START;
-	{
-		return DatumGetFloat8(d);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-Datum
-gpdb::DatumFromPointer(const void *p)
-{
-	GP_WRAP_START;
-	{
-		return PointerGetDatum(p);
-	}
-	GP_WRAP_END;
-	return 0;
-}
-
-bool
-gpdb::AggregateExists(Oid oid)
-{
-	GP_WRAP_START;
-	{
-		return aggregate_exists(oid);
-	}
-	GP_WRAP_END;
-	return false;
-}
-
-Bitmapset *
-gpdb::BmsAddMember(Bitmapset *a, int x)
+int
+gpdb::BmsNextMember(const Bitmapset *a, int prevbit)
 {
 	GP_WRAP_START;
 	{
-		return bms_add_member(a, x);
+		return bms_next_member(a, prevbit);
 	}
 	GP_WRAP_END;
-	return nullptr;
+	return -2;
 }
 
 void *
@@ -490,6 +227,15 @@ gpdb::TypeCollation(Oid type)
 	return 0;
 }
 
+void
+gpdb::TypLenByVal(Oid typid, int16 *typlen, bool *typbyval)
+{
+	GP_WRAP_START;
+	{
+		get_typlenbyval(typid, typlen, typbyval);
+	}
+	GP_WRAP_END;
+}
 
 List *
 gpdb::ExtractNodesPlan(Plan *pl, int node_tag, bool descend_into_subqueries)
@@ -601,6 +347,30 @@ gpdb::FuncStability(Oid funcid)
 	return '\0';
 }
 
+RegProcedure
+gpdb::FuncSupport(Oid funcid)
+{
+	GP_WRAP_START;
+	{
+		/* catalog tables: pg_proc */
+		return get_func_support(funcid);
+	}
+	GP_WRAP_END;
+	return InvalidOid;
+}
+
+Oid
+gpdb::FuncNamespace(Oid funcid)
+{
+	GP_WRAP_START;
+	{
+		/* catalog tables: pg_proc */
+		return get_func_namespace(funcid);
+	}
+	GP_WRAP_END;
+	return InvalidOid;
+}
+
 char
 gpdb::FuncExecLocation(Oid funcid)
 {
@@ -661,6 +431,126 @@ gpdb::ResolveAggregateTransType(Oid aggfnoid, Oid aggtranstype, Oid *inputTypes,
 	return 0;
 }
 
+static Datum
+GetAggInitVal(Datum textInitVal, Oid transtype)
+{
+	Oid			typinput,
+				typioparam;
+	char	   *strInitVal;
+	Datum		initVal;
+
+	getTypeInputInfo(transtype, &typinput, &typioparam);
+	strInitVal = TextDatumGetCString(textInitVal);
+	initVal = OidInputFunctionCall(typinput, strInitVal,
+								   typioparam, -1);
+	pfree(strInitVal);
+	return initVal;
+}
+
+void
+gpdb::GetAggregateInfo(Aggref *aggref, Oid *aggtransfn,
+					   Oid *aggfinalfn, Oid *aggcombinefn,
+					   Oid *aggserialfn, Oid *aggdeserialfn,
+					   Oid *aggtranstype, int *aggtransspace,
+					   Datum *initValue, bool *initValueIsNull,
+					   bool *shareable)
+{
+	GP_WRAP_START;
+	{
+		HeapTuple	aggTuple;
+		Form_pg_aggregate aggform;
+		Datum		textInitVal;
+		Oid			inputTypes[FUNC_MAX_ARGS];
+		int			numArguments;
+
+		aggTuple = SearchSysCache1(AGGFNOID,
+							   ObjectIdGetDatum(aggref->aggfnoid));
+		if (!HeapTupleIsValid(aggTuple))
+			elog(ERROR, "cache lookup failed for aggregate %u",
+				 aggref->aggfnoid);
+
+		aggform = (Form_pg_aggregate) GETSTRUCT(aggTuple);
+		*aggtransfn = aggform->aggtransfn;
+		*aggfinalfn = aggform->aggfinalfn;
+		*aggcombinefn = aggform->aggcombinefn;
+		*aggserialfn = aggform->aggserialfn;
+		*aggdeserialfn = aggform->aggdeserialfn;
+		*aggtranstype = aggform->aggtranstype;
+		*aggtransspace = aggform->aggtransspace;
+
+		/*
+		 * Resolve the possibly-polymorphic aggregate transition type.
+		 */
+		/* extract argument types (ignoring any ORDER BY expressions) */
+		numArguments = get_aggregate_argtypes(aggref, inputTypes);
+
+		/* resolve actual type of transition state, if polymorphic */
+		*aggtranstype = resolve_aggregate_transtype(aggref->aggfnoid,
+											   *aggtranstype,
+											   inputTypes,
+											   numArguments);
+
+		/* get initial value */
+		textInitVal = SysCacheGetAttr(AGGFNOID, aggTuple,
+									Anum_pg_aggregate_agginitval,
+									initValueIsNull);
+
+
+		if (*initValueIsNull)
+			*initValue = (Datum) 0;
+		else
+			*initValue = GetAggInitVal(textInitVal, *aggtranstype);
+		
+		/*
+		 * If finalfn is marked read-write, we can't share transition states; but
+		 * it is okay to share states for AGGMODIFY_SHAREABLE aggs.
+		 *
+		 * In principle, in a partial aggregate, we could share the transition
+		 * state even if the final function is marked as read-write, because the
+		 * partial aggregate doesn't execute the final function.  But it's too
+		 * early to know whether we're going perform a partial aggregate.
+		 */
+		*shareable = (aggform->aggfinalmodify != AGGMODIFY_READ_WRITE);
+
+		ReleaseSysCache(aggTuple);
+
+	}
+	GP_WRAP_END;
+}
+
+
+int
+gpdb::FindCompatibleAgg(List *agginfos, Aggref *newagg,
+						List **same_input_transnos)
+{
+
+	GP_WRAP_START;
+	{
+		return find_compatible_agg(agginfos, newagg, same_input_transnos);
+	}
+	GP_WRAP_END;
+	return -1;
+}
+
+int
+gpdb::FindCompatibleTrans(List *aggtransinfos, bool shareable,
+						  Oid aggtransfn, Oid aggtranstype,
+						  int transtypeLen, bool transtypeByVal,
+						  Oid aggcombinefn, Oid aggserialfn,
+						  Oid aggdeserialfn, Datum initValue, 
+						  bool initValueIsNull, List *transnos)
+{
+	GP_WRAP_START;
+	{
+		return find_compatible_trans(aggtransinfos, shareable, aggtransfn,
+			aggtranstype, transtypeLen, transtypeByVal, aggcombinefn, aggserialfn,
+			aggdeserialfn, initValue, initValueIsNull, transnos);
+	}
+	GP_WRAP_END;
+	return -1;
+}
+
+
 Query *
 gpdb::FlattenJoinAliasVar(Query *query, gpos::ULONG query_level)
 {
@@ -1723,7 +1613,24 @@ gpdb::IsOpHashJoinable(Oid opno, Oid inputtype)
 	GP_WRAP_START;
 	{
 		/* catalog tables: pg_operator */
-		return op_hashjoinable(opno, inputtype);
+		if (!op_hashjoinable(opno, inputtype))
+			return false;
+
+		/*
+		 * Even if oprcanhash is true, we need to verify that hash functions
+		 * actually exist for this operator. This is because oprcanhash can be
+		 * set to true while the operator is only registered in a btree opfamily
+		 * and not in a hash opfamily, which would cause execution-time errors
+		 * when trying to build hash tables.
+		 *
+		 * See get_op_hash_functions() in lsyscache.c which requires operators
+		 * to be registered in a hash opfamily (amopmethod == HASH_AM_OID).
+		 */
+		RegProcedure hash_proc;
+		if (!get_op_hash_functions(opno, &hash_proc, NULL))
+			return false;
+
+		return true;
 	}
 	GP_WRAP_END;
 	return false;
diff --git a/src/backend/gpopt/translate/CContextDXLToPlStmt.cpp b/src/backend/gpopt/translate/CContextDXLToPlStmt.cpp
index b0d7caef331..44b84abd29c 100644
--- a/src/backend/gpopt/translate/CContextDXLToPlStmt.cpp
+++ b/src/backend/gpopt/translate/CContextDXLToPlStmt.cpp
@@ -56,9 +56,11 @@ CContextDXLToPlStmt::CContextDXLToPlStmt(
 	  m_slices_list(nullptr),
 	  m_result_relation_index(0),
 	  m_distribution_policy(nullptr),
-	  m_part_selector_to_param_map(nullptr)
+	  m_part_selector_to_param_map(nullptr),
+	  m_agg_infos(nullptr),
+	  m_agg_trans_infos(nullptr)
 {
-	m_cte_consumer_info = GPOS_NEW(m_mp) HMUlCTEConsumerInfo(m_mp);
+	m_cte_producer_info = GPOS_NEW(m_mp) HMUlCTEProducerInfo(m_mp);
 	m_part_selector_to_param_map = GPOS_NEW(m_mp) UlongToUlongMap(m_mp);
 	m_used_rte_indexes = GPOS_NEW(m_mp) HMUlIndex(m_mp);
 }
@@ -73,7 +75,7 @@ CContextDXLToPlStmt::CContextDXLToPlStmt(
 //---------------------------------------------------------------------------
 CContextDXLToPlStmt::~CContextDXLToPlStmt()
 {
-	m_cte_consumer_info->Release();
+	m_cte_producer_info->Release();
 	m_part_selector_to_param_map->Release();
 	m_used_rte_indexes->Release();
 }
@@ -152,52 +154,38 @@ CContextDXLToPlStmt::GetParamTypes()
 
 //---------------------------------------------------------------------------
 //	@function:
-//		CContextDXLToPlStmt::AddCTEConsumerInfo
+//		CContextDXLToPlStmt::RegisterCTEProducerPlan
 //
 //	@doc:
-//		Add information about the newly found CTE entry
+//		Register information about the CTE producer
 //
 //---------------------------------------------------------------------------
 void
-CContextDXLToPlStmt::AddCTEConsumerInfo(ULONG cte_id,
-										ShareInputScan *share_input_scan)
+CContextDXLToPlStmt::RegisterCTEProducerInfo(
+	ULONG cte_id, ULongPtrArray *producer_output_colidx_map,
+	ShareInputScan *siscan)
 {
-	GPOS_ASSERT(nullptr != share_input_scan);
-
-	SCTEConsumerInfo *cte_info = m_cte_consumer_info->Find(&cte_id);
-	if (nullptr != cte_info)
-	{
-		cte_info->AddCTEPlan(share_input_scan);
-		return;
-	}
-
-	List *cte_plan = ListMake1(share_input_scan);
-
 	ULONG *key = GPOS_NEW(m_mp) ULONG(cte_id);
-	BOOL result GPOS_ASSERTS_ONLY = m_cte_consumer_info->Insert(
-		key, GPOS_NEW(m_mp) SCTEConsumerInfo(cte_plan));
+	BOOL result GPOS_ASSERTS_ONLY = m_cte_producer_info->Insert(
+		key, GPOS_NEW(m_mp) SCTEEntryInfo(producer_output_colidx_map, siscan));
 
 	GPOS_ASSERT(result);
 }
 
 //---------------------------------------------------------------------------
 //	@function:
-//		CContextDXLToPlStmt::GetCTEConsumerList
+//		CContextDXLToPlStmt::GetCTEProducerInfo
 //
 //	@doc:
-//		Return the list of GPDB plan nodes representing the CTE consumers
-//		with the given CTE identifier
+//		Return the producer in CTE
 //---------------------------------------------------------------------------
-List *
-CContextDXLToPlStmt::GetCTEConsumerList(ULONG cte_id) const
+std::pair<ULongPtrArray *, ShareInputScan *>
+CContextDXLToPlStmt::GetCTEProducerInfo(ULONG cte_id) const
 {
-	SCTEConsumerInfo *cte_info = m_cte_consumer_info->Find(&cte_id);
-	if (nullptr != cte_info)
-	{
-		return cte_info->m_cte_consumer_list;
-	}
+	SCTEEntryInfo *sctepinfo = m_cte_producer_info->Find(&cte_id);
+	GPOS_ASSERT(sctepinfo);
 
-	return nullptr;
+	return std::make_pair(sctepinfo->m_pidxmap, sctepinfo->m_cte_producer_plan);
 }
 
 //---------------------------------------------------------------------------
@@ -590,4 +578,40 @@ CContextDXLToPlStmt::GetRTEIndexByAssignedQueryId(
 	return gpdb::ListLength(m_rtable_entries_list) + 1;
 }
 
+void
+CContextDXLToPlStmt::AppendAggInfos(AggInfo *agginfo)
+{
+	m_agg_infos = gpdb::LAppend(m_agg_infos, agginfo);
+}
+
+void
+CContextDXLToPlStmt::AppendAggTransInfos(AggTransInfo *transinfo)
+{
+	m_agg_trans_infos = gpdb::LAppend(m_agg_trans_infos, transinfo);
+}
+
+void
+CContextDXLToPlStmt::ResetAggInfosAndTransInfos()
+{
+	ListCell *lc;
+	foreach (lc, m_agg_infos)
+	{
+		AggInfo *agginfo = (AggInfo *) lfirst(lc);
+		gpdb::GPDBFree(agginfo);
+	}
+
+	gpdb::ListFree(m_agg_infos);
+
+	foreach (lc, m_agg_trans_infos)
+	{
+		AggTransInfo *aggtransinfo = (AggTransInfo *) lfirst(lc);
+		gpdb::GPDBFree(aggtransinfo);
+	}
+
+	gpdb::ListFree(m_agg_trans_infos);
+
+	m_agg_infos = nullptr;
+	m_agg_trans_infos = nullptr;
+}
+
 // EOF
diff --git a/src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp b/src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp
index 33571f9368b..939d9f9c37b 100644
--- a/src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp
+++ b/src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp
@@ -90,7 +90,7 @@ CPartPruneStepsBuilder::CreatePartPruneInfoForOneLevel(CDXLNode *filterNode)
 			// partition did survive pruning
 			pinfo->subplan_map[i] = part_ptr;
 			pinfo->relid_map[i] = gpdb::RelationGetPartitionDesc(m_relation, true)->oids[i];
-			pinfo->present_parts = bms_add_member(pinfo->present_parts, i);
+			pinfo->present_parts = gpdb::BmsAddMember(pinfo->present_parts, i);
 			++part_ptr;
 		}
 		else
diff --git a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
index 3c21b1176b6..4acf13bd606 100644
--- a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
+++ b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
@@ -407,8 +407,13 @@ CTranslatorDXLToPlStmt::TranslateDXLOperatorToPlan(
 		}
 		case EdxlopPhysicalWindow:
 		{
-			plan = TranslateDXLWindow(dxlnode, output_context,
+			if (CDXLPhysicalWindow::Cast(dxlnode->GetOperator())->IsWindowHashAgg()) {
+				plan = TranslateDXLWindowHashAgg(dxlnode, output_context,
+									  	ctxt_translation_prev_siblings);
+			} else {
+				plan = TranslateDXLWindowAgg(dxlnode, output_context,
 									  ctxt_translation_prev_siblings);
+			}
 			break;
 		}
 		case EdxlopPhysicalSort:
@@ -2765,6 +2770,124 @@ CTranslatorDXLToPlStmt::TranslateDXLRedistributeMotionToResultHashFilters(
 	return (Plan *) result;
 }
 
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorDXLToPlStmt::TranslateAggFillInfo
+//
+//	@doc:
+//		Fill the aggregate node with aggno and aggtransno
+//
+//---------------------------------------------------------------------------
+void
+CTranslatorDXLToPlStmt::TranslateAggFillInfo(CContextDXLToPlStmt *ctx,
+											 Aggref *aggref)
+{
+	Oid aggtransfn;
+	Oid aggfinalfn;
+	Oid aggcombinefn;
+	Oid aggserialfn;
+	Oid aggdeserialfn;
+	Oid aggtranstype;
+	int32 aggtranstypmod;
+	int32 aggtransspace;
+
+	Datum initValue;
+	bool initValueIsNull;
+	List *same_input_transnos;
+
+	bool shareable;
+	int16 resulttypeLen;
+	bool resulttypeByVal;
+	int16 transtypeLen;
+	bool transtypeByVal;
+
+	int aggno, transno;
+
+	gpdb::GetAggregateInfo(aggref, &aggtransfn, &aggfinalfn,
+						   &aggcombinefn, &aggserialfn, &aggdeserialfn,
+						   &aggtranstype, &aggtransspace, &initValue,
+						   &initValueIsNull, &shareable);
+
+	/*
+	 * If transition state is of same type as first aggregated input, assume
+	 * it's the same typmod (same width) as well.  This works for cases like
+	 * MAX/MIN and is probably somewhat reasonable otherwise.
+	 */
+	aggtranstypmod = -1;
+	if (aggref->args)
+	{
+		TargetEntry *tle = (TargetEntry *) linitial(aggref->args);
+
+		if (aggtranstype == gpdb::ExprType((Node *) tle->expr))
+			aggtranstypmod = gpdb::ExprTypeMod((Node *) tle->expr);
+	}
+
+	gpdb::TypLenByVal(aggref->aggtype, &resulttypeLen, &resulttypeByVal);
+
+	/*
+	 * 1. See if this is identical to another aggregate function call that
+	 * we've seen already.
+	 */
+	aggno = gpdb::FindCompatibleAgg(ctx->GetAggInfos(), aggref,
+									&same_input_transnos);
+	if (aggno != -1)
+	{
+		AggInfo *agginfo = (AggInfo *) gpdb::ListNth(ctx->GetAggInfos(), aggno);
+
+		transno = agginfo->transno;
+	}
+	else
+	{
+		AggInfo *agginfo = (AggInfo *) gpdb::GPDBAlloc(sizeof(AggInfo));
+
+		agginfo->finalfn_oid = aggfinalfn;
+		agginfo->representative_aggref = aggref;
+		agginfo->shareable = shareable;
+
+		aggno = gpdb::ListLength(ctx->GetAggInfos());
+		ctx->AppendAggInfos(agginfo);
+
+		gpdb::TypLenByVal(aggtranstype, &transtypeLen, &transtypeByVal);
+
+		/*
+		 * 2. See if this aggregate can share transition state with another
+		 * aggregate that we've initialized already.
+		 */
+		transno = gpdb::FindCompatibleTrans(
+			ctx->GetAggTransInfos(), shareable, aggtransfn, aggtranstype,
+			transtypeLen, transtypeByVal, aggcombinefn, aggserialfn,
+			aggdeserialfn, initValue, initValueIsNull, same_input_transnos);
+		if (transno == -1)
+		{
+			AggTransInfo *transinfo =
+				(AggTransInfo *) gpdb::GPDBAlloc(sizeof(AggTransInfo));
+
+			transinfo->args = aggref->args;
+			transinfo->aggfilter = aggref->aggfilter;
+			transinfo->transfn_oid = aggtransfn;
+			transinfo->combinefn_oid = aggcombinefn;
+			transinfo->serialfn_oid = aggserialfn;
+			transinfo->deserialfn_oid = aggdeserialfn;
+			transinfo->aggtranstype = aggtranstype;
+			transinfo->aggtranstypmod = aggtranstypmod;
+			transinfo->transtypeLen = transtypeLen;
+			transinfo->transtypeByVal = transtypeByVal;
+			transinfo->aggtransspace = aggtransspace;
+			transinfo->initValue = initValue;
+			transinfo->initValueIsNull = initValueIsNull;
+
+			transno = gpdb::ListLength(ctx->GetAggTransInfos());
+			ctx->AppendAggTransInfos(transinfo);
+		}
+		agginfo->transno = transno;
+	}
+
+	// setting the aggno and transno
+	aggref->aggno = aggno;
+	aggref->aggtransno = transno;
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorDXLToPlStmt::TranslateDXLAgg
@@ -2812,44 +2935,6 @@ CTranslatorDXLToPlStmt::TranslateDXLAgg(
 							   child_contexts,	// pdxltrctxRight,
 							   &plan->targetlist, &plan->qual, output_context);
 
-	/*
-	 * GPDB_14_MERGE_FIXME: TODO Deduplicate aggregates and transition functions in orca
-	 */
-	// Set the aggsplit for the agg node
-	ListCell *lc;
-	INT aggsplit = 0;
-	int idx = 0;
-	ForEach (lc, plan->targetlist)
-	{
-		TargetEntry *te = (TargetEntry *) lfirst(lc);
-		if (IsA(te->expr, Aggref))
-		{
-			Aggref *aggref = (Aggref *) te->expr;
-
-			if (AGGSPLIT_INTERMEDIATE != aggsplit)
-			{
-				aggsplit |= aggref->aggsplit;
-			}
-
-			aggref->aggno = idx;
-			aggref->aggtransno = idx;
-			idx++;
-		}
-	}
-	agg->aggsplit = (AggSplit) aggsplit;
-
-	ForEach (lc, plan->qual)
-	{
-		Expr *expr = (Expr *) lfirst(lc);
-		if (IsA(expr, Aggref))
-		{
-			Aggref *aggref = (Aggref *) expr;
-			aggref->aggno = idx;
-			aggref->aggtransno = idx;
-			idx++;
-		}
-	}
-
 	plan->lefttree = child_plan;
 
 	// translate aggregation strategy
@@ -2919,6 +3004,39 @@ CTranslatorDXLToPlStmt::TranslateDXLAgg(
 
 	agg->numGroups =
 		std::max(1L, (long) std::min(agg->plan.plan_rows, (double) LONG_MAX));
+
+	// Set the aggsplit,aggno,aggtransno for the agg node
+	ListCell *lc;
+	INT aggsplit = 0;
+	ForEach (lc, plan->targetlist)
+	{
+		TargetEntry *te = (TargetEntry *) lfirst(lc);
+		if (IsA(te->expr, Aggref))
+		{
+			Aggref *aggref = (Aggref *) te->expr;
+
+			if (AGGSPLIT_INTERMEDIATE != aggsplit)
+			{
+				aggsplit |= aggref->aggsplit;
+			}
+			TranslateAggFillInfo(m_dxl_to_plstmt_context, aggref);
+		}
+	}
+	agg->aggsplit = (AggSplit) aggsplit;
+
+	ForEach (lc, plan->qual)
+	{
+		Expr *expr = (Expr *) lfirst(lc);
+		if (IsA(expr, Aggref))
+		{
+			Aggref *aggref = (Aggref *) expr;
+			// ORCA won't create the qual but a scalar in AGG
+			TranslateAggFillInfo(m_dxl_to_plstmt_context, aggref);
+		}
+	}
+
+	m_dxl_to_plstmt_context->ResetAggInfosAndTransInfos();
+
 	SetParamIds(plan);
 
 	// cleanup
@@ -2927,16 +3045,121 @@ CTranslatorDXLToPlStmt::TranslateDXLAgg(
 	return (Plan *) agg;
 }
 
+static
+int WindowFrameSpecToOptions(const EdxlFrameSpec &dxlFS) {
+	int winFrameOptions = 0;
+	if (EdxlfsRow == dxlFS)
+	{
+		winFrameOptions |= FRAMEOPTION_ROWS;
+	}
+	else if (EdxlfsGroups == dxlFS)
+	{
+		winFrameOptions |= FRAMEOPTION_GROUPS;
+	}
+	else
+	{
+		winFrameOptions |= FRAMEOPTION_RANGE;
+	}
+	return winFrameOptions;
+}
+
+static
+int WindowFrameExclusionStrategyToOptions(const EdxlFrameExclusionStrategy &dxlFES) {
+	int winFrameOptions = 0;
+	if (dxlFES == EdxlfesCurrentRow)
+	{
+		winFrameOptions |= FRAMEOPTION_EXCLUDE_CURRENT_ROW;
+	}
+	else if (dxlFES == EdxlfesGroup)
+	{
+		winFrameOptions |= FRAMEOPTION_EXCLUDE_GROUP;
+	}
+	else if (dxlFES == EdxlfesTies)
+	{
+		winFrameOptions |= FRAMEOPTION_EXCLUDE_TIES;
+	}
+
+	return winFrameOptions;
+}
+
+static 
+int WindowFrameStartBoundaryToOptions(const EdxlFrameBoundary &dxlFB) {
+	int winFrameOptions = 0;
+	if (dxlFB == EdxlfbUnboundedPreceding)
+	{
+		winFrameOptions |= FRAMEOPTION_START_UNBOUNDED_PRECEDING;
+	}
+	if (dxlFB == EdxlfbBoundedPreceding)
+	{
+		winFrameOptions |= FRAMEOPTION_START_OFFSET_PRECEDING;
+	}
+	if (dxlFB == EdxlfbCurrentRow)
+	{
+		winFrameOptions |= FRAMEOPTION_START_CURRENT_ROW;
+	}
+	if (dxlFB == EdxlfbBoundedFollowing)
+	{
+		winFrameOptions |= FRAMEOPTION_START_OFFSET_FOLLOWING;
+	}
+	if (dxlFB == EdxlfbUnboundedFollowing)
+	{
+		winFrameOptions |= FRAMEOPTION_START_UNBOUNDED_FOLLOWING;
+	}
+	if (dxlFB == EdxlfbDelayedBoundedPreceding)
+	{
+		winFrameOptions |= FRAMEOPTION_START_OFFSET_PRECEDING;
+	}
+	if (dxlFB == EdxlfbDelayedBoundedFollowing)
+	{
+		winFrameOptions |= FRAMEOPTION_START_OFFSET_FOLLOWING;
+	}
+	return winFrameOptions;
+}
+
+static 
+int WindowFrameEndBoundaryToOptions(const EdxlFrameBoundary &dxlFB) {
+	int winFrameOptions = 0;
+	if (dxlFB == EdxlfbUnboundedPreceding)
+	{
+		winFrameOptions |= FRAMEOPTION_END_UNBOUNDED_PRECEDING;
+	}
+	if (dxlFB == EdxlfbBoundedPreceding)
+	{
+		winFrameOptions |= FRAMEOPTION_END_OFFSET_PRECEDING;
+	}
+	if (dxlFB == EdxlfbCurrentRow)
+	{
+		winFrameOptions |= FRAMEOPTION_END_CURRENT_ROW;
+	}
+	if (dxlFB == EdxlfbBoundedFollowing)
+	{
+		winFrameOptions |= FRAMEOPTION_END_OFFSET_FOLLOWING;
+	}
+	if (dxlFB == EdxlfbUnboundedFollowing)
+	{
+		winFrameOptions |= FRAMEOPTION_END_UNBOUNDED_FOLLOWING;
+	}
+	if (dxlFB == EdxlfbDelayedBoundedPreceding)
+	{
+		winFrameOptions |= FRAMEOPTION_END_OFFSET_PRECEDING;
+	}
+	if (dxlFB == EdxlfbDelayedBoundedFollowing)
+	{
+		winFrameOptions |= FRAMEOPTION_END_OFFSET_FOLLOWING;
+	}
+	return winFrameOptions;
+}
+
 //---------------------------------------------------------------------------
 //	@function:
-//		CTranslatorDXLToPlStmt::TranslateDXLWindow
+//		CTranslatorDXLToPlStmt::TranslateDXLWindowAgg
 //
 //	@doc:
 //		Translate DXL window node into GPDB window plan node
 //
 //---------------------------------------------------------------------------
 Plan *
-CTranslatorDXLToPlStmt::TranslateDXLWindow(
+CTranslatorDXLToPlStmt::TranslateDXLWindowAgg(
 	const CDXLNode *window_dxlnode, CDXLTranslateContext *output_context,
 	CDXLTranslationContextArray *ctxt_translation_prev_siblings)
 {
@@ -2991,9 +3214,6 @@ CTranslatorDXLToPlStmt::TranslateDXLWindow(
 	const ULongPtrArray *part_by_cols_array =
 		window_dxlop->GetPartByColsArray();
 	window->partNumCols = part_by_cols_array->Size();
-	window->partColIdx = nullptr;
-	window->partOperators = nullptr;
-	window->partCollations = nullptr;
 
 	if (window->partNumCols > 0)
 	{
@@ -3003,6 +3223,10 @@ CTranslatorDXLToPlStmt::TranslateDXLWindow(
 			(Oid *) gpdb::GPDBAlloc(window->partNumCols * sizeof(Oid));
 		window->partCollations =
 			(Oid *) gpdb::GPDBAlloc(window->partNumCols * sizeof(Oid));
+	} else {
+		window->partColIdx = nullptr;
+		window->partOperators = nullptr;
+		window->partCollations = nullptr;
 	}
 
 	const ULONG num_of_part_cols = part_by_cols_array->Size();
@@ -3083,34 +3307,214 @@ CTranslatorDXLToPlStmt::TranslateDXLWindow(
 		if (nullptr != window_key->GetWindowFrame())
 		{
 			window->frameOptions = FRAMEOPTION_NONDEFAULT;
-			if (EdxlfsRow == window_frame->ParseDXLFrameSpec())
-			{
-				window->frameOptions |= FRAMEOPTION_ROWS;
-			}
-			else if (EdxlfsGroups == window_frame->ParseDXLFrameSpec())
-			{
-				window->frameOptions |= FRAMEOPTION_GROUPS;
-			}
-			else
-			{
-				window->frameOptions |= FRAMEOPTION_RANGE;
-			}
+			window->frameOptions |= WindowFrameSpecToOptions(window_frame->ParseDXLFrameSpec());
+			window->frameOptions |= WindowFrameExclusionStrategyToOptions(
+				window_frame->ParseFrameExclusionStrategy());
 
-			if (window_frame->ParseFrameExclusionStrategy() ==
-				EdxlfesCurrentRow)
-			{
-				window->frameOptions |= FRAMEOPTION_EXCLUDE_CURRENT_ROW;
-			}
-			else if (window_frame->ParseFrameExclusionStrategy() ==
-					 EdxlfesGroup)
+			// translate the CDXLNodes representing the leading and trailing edge
+			CDXLTranslationContextArray *child_contexts =
+				GPOS_NEW(m_mp) CDXLTranslationContextArray(m_mp);
+			child_contexts->Append(&child_context);
+
+			CMappingColIdVarPlStmt colid_var_mapping =
+				CMappingColIdVarPlStmt(m_mp, nullptr, child_contexts,
+									   output_context, m_dxl_to_plstmt_context);
+
+			// Translate lead boundary
+			//
+			// Note that we don't distinguish between the delayed and undelayed
+			// versions beoynd this point. Executor will make that decision
+			// without our help.
+			//
+			CDXLNode *win_frame_leading_dxlnode = window_frame->PdxlnLeading();
+			window->frameOptions |= WindowFrameStartBoundaryToOptions(
+					CDXLScalarWindowFrameEdge::Cast(win_frame_leading_dxlnode->GetOperator())
+					->ParseDXLFrameBoundary());
+			if (0 != win_frame_leading_dxlnode->Arity())
 			{
-				window->frameOptions |= FRAMEOPTION_EXCLUDE_GROUP;
+				window->startOffset =
+					(Node *) m_translator_dxl_to_scalar->TranslateDXLToScalar(
+						(*win_frame_leading_dxlnode)[0], &colid_var_mapping);
 			}
-			else if (window_frame->ParseFrameExclusionStrategy() == EdxlfesTies)
+
+			// And the same for the trail boundary
+			CDXLNode *win_frame_trailing_dxlnode =
+				window_frame->PdxlnTrailing();
+			window->frameOptions |= WindowFrameEndBoundaryToOptions(
+				CDXLScalarWindowFrameEdge::Cast(
+					win_frame_trailing_dxlnode->GetOperator())
+					->ParseDXLFrameBoundary());
+
+			if (0 != win_frame_trailing_dxlnode->Arity())
 			{
-				window->frameOptions |= FRAMEOPTION_EXCLUDE_TIES;
+				window->endOffset =
+					(Node *) m_translator_dxl_to_scalar->TranslateDXLToScalar(
+						(*win_frame_trailing_dxlnode)[0], &colid_var_mapping);
 			}
 
+			window->startInRangeFunc = window_frame->PdxlnStartInRangeFunc();
+			window->endInRangeFunc = window_frame->PdxlnEndInRangeFunc();
+			window->inRangeColl = window_frame->PdxlnInRangeColl();
+			window->inRangeAsc = window_frame->PdxlnInRangeAsc();
+			window->inRangeNullsFirst = window_frame->PdxlnInRangeNullsFirst();
+
+			// cleanup
+			child_contexts->Release();
+		}
+		else
+		{
+			window->frameOptions = FRAMEOPTION_DEFAULTS;
+		}
+	}
+
+	SetParamIds(plan);
+
+	// cleanup
+	child_contexts->Release();
+
+	return (Plan *) window;
+}
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorDXLToPlStmt::TranslateDXLWindowHashAgg
+//
+//	@doc:
+//		Translate DXL window node into GPDB window hash plan node
+//
+//---------------------------------------------------------------------------
+Plan *
+CTranslatorDXLToPlStmt::TranslateDXLWindowHashAgg(
+	const CDXLNode *window_dxlnode, CDXLTranslateContext *output_context,
+	CDXLTranslationContextArray *ctxt_translation_prev_siblings)
+{
+	WindowHashAgg *window = MakeNode(WindowHashAgg);
+
+	Plan *plan = &(window->plan);
+	plan->plan_node_id = m_dxl_to_plstmt_context->GetNextPlanId();
+
+	CDXLPhysicalWindow *window_dxlop =
+		CDXLPhysicalWindow::Cast(window_dxlnode->GetOperator());
+
+	// translate the operator costs
+	TranslatePlanCosts(window_dxlnode, plan);
+
+	// translate children
+	CDXLNode *child_dxlnode = (*window_dxlnode)[EdxlwindowIndexChild];
+	CDXLNode *project_list_dxlnode = (*window_dxlnode)[EdxlwindowIndexProjList];
+	CDXLNode *filter_dxlnode = (*window_dxlnode)[EdxlwindowIndexFilter];
+
+	CDXLTranslateContext child_context(m_mp, true,
+									   output_context->GetColIdToParamIdMap());
+	Plan *child_plan = TranslateDXLOperatorToPlan(
+		child_dxlnode, &child_context, ctxt_translation_prev_siblings);
+
+	CDXLTranslationContextArray *child_contexts =
+		GPOS_NEW(m_mp) CDXLTranslationContextArray(m_mp);
+	child_contexts->Append(&child_context);
+
+	// translate proj list and filter
+	TranslateProjListAndFilter(project_list_dxlnode, filter_dxlnode,
+							   nullptr,	 // translate context for the base table
+							   child_contexts,	// pdxltrctxRight,
+							   &plan->targetlist, &plan->qual, output_context);
+
+	ListCell *lc;
+
+	foreach (lc, plan->targetlist)
+	{
+		TargetEntry *target_entry = (TargetEntry *) lfirst(lc);
+		if (IsA(target_entry->expr, WindowFunc))
+		{
+			WindowFunc *window_func = (WindowFunc *) target_entry->expr;
+			window->winref = window_func->winref;
+			break;
+		}
+	}
+
+	plan->lefttree = child_plan;
+
+	// translate partition columns
+	const ULongPtrArray *part_by_cols_array =
+		window_dxlop->GetPartByColsArray();
+	window->partNumCols = part_by_cols_array->Size();
+
+	if (window->partNumCols > 0)
+	{
+		window->partColIdx = (AttrNumber *) gpdb::GPDBAlloc(
+			window->partNumCols * sizeof(AttrNumber));
+		window->partOperators =
+			(Oid *) gpdb::GPDBAlloc(window->partNumCols * sizeof(Oid));
+		window->partCollations =
+			(Oid *) gpdb::GPDBAlloc(window->partNumCols * sizeof(Oid));
+	} else {
+		window->partColIdx = nullptr;
+		window->partOperators = nullptr;
+		window->partCollations = nullptr;
+	}
+
+	const ULONG num_of_part_cols = part_by_cols_array->Size();
+	for (ULONG ul = 0; ul < num_of_part_cols; ul++)
+	{
+		ULONG part_colid = *((*part_by_cols_array)[ul]);
+		const TargetEntry *te_part_colid =
+			child_context.GetTargetEntry(part_colid);
+		if (nullptr == te_part_colid)
+		{
+			GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiDXL2PlStmtAttributeNotFound,
+					   part_colid);
+		}
+		window->partColIdx[ul] = te_part_colid->resno;
+
+		// Also find the equality operators to use for each partitioning key col.
+		Oid type_id = gpdb::ExprType((Node *) te_part_colid->expr);
+		window->partOperators[ul] = gpdb::GetEqualityOp(type_id);
+		Assert(window->partOperators[ul] != 0);
+		window->partCollations[ul] =
+			gpdb::ExprCollation((Node *) te_part_colid->expr);
+	}
+
+	// translate window keys
+	const ULONG size = window_dxlop->WindowKeysCount();
+	if (size > 1)
+	{
+		GpdbEreport(ERRCODE_INTERNAL_ERROR, ERROR,
+					"ORCA produced a plan with more than one window key",
+					nullptr);
+	}
+	GPOS_ASSERT(size <= 1 && "cannot have more than one window key");
+
+	if (size == 1)
+	{
+		// translate the sorting columns used in the window key
+		const CDXLWindowKey *window_key = window_dxlop->GetDXLWindowKeyAt(0);
+		const CDXLWindowFrame *window_frame = window_key->GetWindowFrame();
+		const CDXLNode *sort_col_list_dxlnode = window_key->GetSortColListDXL();
+
+		const ULONG num_of_cols = sort_col_list_dxlnode->Arity();
+
+		window->ordNumCols = num_of_cols;
+		window->ordColIdx =
+			(AttrNumber *) gpdb::GPDBAlloc(num_of_cols * sizeof(AttrNumber));
+		window->ordOperators =
+			(Oid *) gpdb::GPDBAlloc(num_of_cols * sizeof(Oid));
+		window->ordCollations =
+			(Oid *) gpdb::GPDBAlloc(num_of_cols * sizeof(Oid));
+		window->ordNullsFirst =
+			(bool *) gpdb::GPDBAlloc(num_of_cols * sizeof(bool));
+		// different with windowagg, sort should be full
+		TranslateSortCols(sort_col_list_dxlnode, &child_context,
+						  window->ordColIdx, window->ordOperators,
+						  window->ordCollations, window->ordNullsFirst);
+
+		// translate the window frame specified in the window key
+		if (nullptr != window_key->GetWindowFrame())
+		{
+			window->frameOptions = FRAMEOPTION_NONDEFAULT;
+			window->frameOptions |= WindowFrameSpecToOptions(window_frame->ParseDXLFrameSpec());
+			window->frameOptions |= WindowFrameExclusionStrategyToOptions(
+				window_frame->ParseFrameExclusionStrategy());
+
 			// translate the CDXLNodes representing the leading and trailing edge
 			CDXLTranslationContextArray *child_contexts =
 				GPOS_NEW(m_mp) CDXLTranslationContextArray(m_mp);
@@ -3127,38 +3531,9 @@ CTranslatorDXLToPlStmt::TranslateDXLWindow(
 			// without our help.
 			//
 			CDXLNode *win_frame_leading_dxlnode = window_frame->PdxlnLeading();
-			EdxlFrameBoundary lead_boundary_type =
-				CDXLScalarWindowFrameEdge::Cast(
-					win_frame_leading_dxlnode->GetOperator())
-					->ParseDXLFrameBoundary();
-			if (lead_boundary_type == EdxlfbUnboundedPreceding)
-			{
-				window->frameOptions |= FRAMEOPTION_START_UNBOUNDED_PRECEDING;
-			}
-			if (lead_boundary_type == EdxlfbBoundedPreceding)
-			{
-				window->frameOptions |= FRAMEOPTION_START_OFFSET_PRECEDING;
-			}
-			if (lead_boundary_type == EdxlfbCurrentRow)
-			{
-				window->frameOptions |= FRAMEOPTION_START_CURRENT_ROW;
-			}
-			if (lead_boundary_type == EdxlfbBoundedFollowing)
-			{
-				window->frameOptions |= FRAMEOPTION_START_OFFSET_FOLLOWING;
-			}
-			if (lead_boundary_type == EdxlfbUnboundedFollowing)
-			{
-				window->frameOptions |= FRAMEOPTION_START_UNBOUNDED_FOLLOWING;
-			}
-			if (lead_boundary_type == EdxlfbDelayedBoundedPreceding)
-			{
-				window->frameOptions |= FRAMEOPTION_START_OFFSET_PRECEDING;
-			}
-			if (lead_boundary_type == EdxlfbDelayedBoundedFollowing)
-			{
-				window->frameOptions |= FRAMEOPTION_START_OFFSET_FOLLOWING;
-			}
+			window->frameOptions |= WindowFrameStartBoundaryToOptions(
+					CDXLScalarWindowFrameEdge::Cast(win_frame_leading_dxlnode->GetOperator())
+					->ParseDXLFrameBoundary());
 			if (0 != win_frame_leading_dxlnode->Arity())
 			{
 				window->startOffset =
@@ -3169,38 +3544,11 @@ CTranslatorDXLToPlStmt::TranslateDXLWindow(
 			// And the same for the trail boundary
 			CDXLNode *win_frame_trailing_dxlnode =
 				window_frame->PdxlnTrailing();
-			EdxlFrameBoundary trail_boundary_type =
+			window->frameOptions |= WindowFrameEndBoundaryToOptions(
 				CDXLScalarWindowFrameEdge::Cast(
 					win_frame_trailing_dxlnode->GetOperator())
-					->ParseDXLFrameBoundary();
-			if (trail_boundary_type == EdxlfbUnboundedPreceding)
-			{
-				window->frameOptions |= FRAMEOPTION_END_UNBOUNDED_PRECEDING;
-			}
-			if (trail_boundary_type == EdxlfbBoundedPreceding)
-			{
-				window->frameOptions |= FRAMEOPTION_END_OFFSET_PRECEDING;
-			}
-			if (trail_boundary_type == EdxlfbCurrentRow)
-			{
-				window->frameOptions |= FRAMEOPTION_END_CURRENT_ROW;
-			}
-			if (trail_boundary_type == EdxlfbBoundedFollowing)
-			{
-				window->frameOptions |= FRAMEOPTION_END_OFFSET_FOLLOWING;
-			}
-			if (trail_boundary_type == EdxlfbUnboundedFollowing)
-			{
-				window->frameOptions |= FRAMEOPTION_END_UNBOUNDED_FOLLOWING;
-			}
-			if (trail_boundary_type == EdxlfbDelayedBoundedPreceding)
-			{
-				window->frameOptions |= FRAMEOPTION_END_OFFSET_PRECEDING;
-			}
-			if (trail_boundary_type == EdxlfbDelayedBoundedFollowing)
-			{
-				window->frameOptions |= FRAMEOPTION_END_OFFSET_FOLLOWING;
-			}
+					->ParseDXLFrameBoundary());
+
 			if (0 != win_frame_trailing_dxlnode->Arity())
 			{
 				window->endOffset =
@@ -3917,6 +4265,31 @@ CTranslatorDXLToPlStmt::TranslateDXLAppend(
 	GPOS_ASSERT(EdxlappendIndexFirstChild < arity);
 	append->appendplans = NIL;
 
+	// translate table descriptor into a range table entry
+	CDXLPhysicalAppend *phy_append_dxlop =
+		CDXLPhysicalAppend::Cast(append_dxlnode->GetOperator());
+
+	// If this append was create from a DynamicTableScan node in ORCA, it will
+	// contain the table descriptor of the root partitioned table. Add that to
+	// the range table in the PlStmt.
+	if (phy_append_dxlop->GetScanId() != gpos::ulong_max)
+	{
+		GPOS_ASSERT(nullptr != phy_append_dxlop->GetDXLTableDesc());
+
+		// translation context for column mappings in the base relation
+		CDXLTranslateContextBaseTable base_table_context(m_mp);
+
+		(void) ProcessDXLTblDescr(phy_append_dxlop->GetDXLTableDesc(),
+								  &base_table_context);
+
+		OID oid_type =
+			CMDIdGPDB::CastMdid(m_md_accessor->PtMDType<IMDTypeInt4>()->MDId())
+				->Oid();
+		append->join_prune_paramids =
+			TranslateJoinPruneParamids(phy_append_dxlop->GetSelectorIds(),
+									   oid_type, m_dxl_to_plstmt_context);
+	}
+
 	// translate children
 	CDXLTranslateContext child_context(m_mp, false,
 									   output_context->GetColIdToParamIdMap());
@@ -4072,15 +4445,16 @@ CTranslatorDXLToPlStmt::TranslateDXLCTEProducerToSharedScan(
 		CDXLPhysicalCTEProducer::Cast(cte_producer_dxlnode->GetOperator());
 	ULONG cte_id = cte_prod_dxlop->Id();
 
-	// create the shared input scan representing the CTE Producer
+	// create the Share Input Scan representing the CTE Producer
 	ShareInputScan *shared_input_scan = MakeNode(ShareInputScan);
 	shared_input_scan->share_id = cte_id;
 	shared_input_scan->discard_output = true;
+
 	Plan *plan = &(shared_input_scan->scan.plan);
 	plan->plan_node_id = m_dxl_to_plstmt_context->GetNextPlanId();
 
-	// store share scan node for the translation of CTE Consumers
-	m_dxl_to_plstmt_context->AddCTEConsumerInfo(cte_id, shared_input_scan);
+	m_dxl_to_plstmt_context->RegisterCTEProducerInfo(cte_id, 
+		cte_prod_dxlop->GetOutputColIdxMap(), shared_input_scan);
 
 	// translate cost of the producer
 	TranslatePlanCosts(cte_producer_dxlnode, plan);
@@ -4130,7 +4504,16 @@ CTranslatorDXLToPlStmt::TranslateDXLCTEConsumerToSharedScan(
 	CDXLPhysicalCTEConsumer *cte_consumer_dxlop =
 		CDXLPhysicalCTEConsumer::Cast(cte_consumer_dxlnode->GetOperator());
 	ULONG cte_id = cte_consumer_dxlop->Id();
+	ULongPtrArray *output_colidx_map = cte_consumer_dxlop->GetOutputColIdxMap();
 
+	// get the producer idx map
+	ULongPtrArray *producer_colidx_map;
+	ShareInputScan *share_input_scan_cte_producer;
+	
+	std::tie(producer_colidx_map, share_input_scan_cte_producer) 
+		= m_dxl_to_plstmt_context->GetCTEProducerInfo(cte_id);
+
+	// init the consumer plan
 	ShareInputScan *share_input_scan_cte_consumer = MakeNode(ShareInputScan);
 	share_input_scan_cte_consumer->share_id = cte_id;
 	share_input_scan_cte_consumer->discard_output = false;
@@ -4153,6 +4536,17 @@ CTranslatorDXLToPlStmt::TranslateDXLCTEConsumerToSharedScan(
 	GPOS_ASSERT(num_of_proj_list_elem == output_colids_array->Size());
 	for (ULONG ul = 0; ul < num_of_proj_list_elem; ul++)
 	{
+		AttrNumber varattno = (AttrNumber)ul + 1;
+		if (output_colidx_map) {
+			ULONG remapping_idx;
+			remapping_idx = *(*output_colidx_map)[ul];
+			if (producer_colidx_map) {
+				remapping_idx = *(*producer_colidx_map)[remapping_idx];
+			}
+			GPOS_ASSERT(remapping_idx != gpos::ulong_max);
+			varattno = (AttrNumber)remapping_idx + 1;
+		}
+
 		CDXLNode *proj_elem_dxlnode = (*project_list_dxlnode)[ul];
 		CDXLScalarProjElem *sc_proj_elem_dxlop =
 			CDXLScalarProjElem::Cast(proj_elem_dxlnode->GetOperator());
@@ -4165,7 +4559,7 @@ CTranslatorDXLToPlStmt::TranslateDXLCTEConsumerToSharedScan(
 		OID oid_type = CMDIdGPDB::CastMdid(sc_ident_dxlop->MdidType())->Oid();
 
 		Var *var =
-			gpdb::MakeVar(OUTER_VAR, (AttrNumber)(ul + 1), oid_type,
+			gpdb::MakeVar(OUTER_VAR, varattno, oid_type,
 						  sc_ident_dxlop->TypeModifier(), 0 /* varlevelsup */);
 
 		CHAR *resname = CTranslatorUtils::CreateMultiByteCharStringFromWCString(
@@ -4181,9 +4575,17 @@ CTranslatorDXLToPlStmt::TranslateDXLCTEConsumerToSharedScan(
 
 	SetParamIds(plan);
 
-	// store share scan node for the translation of CTE Consumers
-	m_dxl_to_plstmt_context->AddCTEConsumerInfo(cte_id,
-												share_input_scan_cte_consumer);
+	// DON'T REMOVE, if current consumer need projection, then we can direct add it.
+	// we still keep the path of projection in consumer
+	
+	// 	Plan *producer_plan = &(share_input_scan_cte_producer->scan.plan);
+	// if (output_colidx_map != nullptr) {
+	// 	share_input_scan_cte_consumer->need_projection = true;
+	// 	share_input_scan_cte_consumer->producer_targetlist = gpdb::ListCopy(producer_plan->targetlist);
+	// 	if (!share_input_scan_cte_consumer->producer_targetlist) {
+	// 		share_input_scan_cte_consumer->need_projection = false;
+	// 	}
+	// }
 
 	return (Plan *) share_input_scan_cte_consumer;
 }
diff --git a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
index 392f650664e..20cc6557c28 100644
--- a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
@@ -528,6 +528,11 @@ CTranslatorQueryToDXL::CheckRangeTable(Query *query)
 			GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature,
 					   GPOS_WSZ_LIT("TABLESAMPLE in the FROM clause"));
 		}
+
+		if (rte->relkind == RELKIND_PARTITIONED_TABLE && query->hasRowSecurity && GPOS_FTRACE(EopttraceDisableDynamicTableScan)) {
+			GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature,
+				GPOS_WSZ_LIT("ORCA not support row-level security if dynamic table scan is disabled."));
+		}
 	}
 }
 
@@ -2577,7 +2582,8 @@ CTranslatorQueryToDXL::CreateDXLUnionAllForGroupingSets(
 	GPOS_ASSERT(nullptr != m_dxl_cte_producers);
 
 	CDXLLogicalCTEProducer *cte_prod_dxlop = GPOS_NEW(m_mp)
-		CDXLLogicalCTEProducer(m_mp, cte_id, op_colid_array_cte_producer);
+		CDXLLogicalCTEProducer(m_mp, cte_id, op_colid_array_cte_producer,
+			false /*could_be_pruned*/);
 	CDXLNode *cte_producer_dxlnode = GPOS_NEW(m_mp)
 		CDXLNode(m_mp, cte_prod_dxlop, select_project_join_dxlnode);
 	m_dxl_cte_producers->Append(cte_producer_dxlnode);
@@ -4785,7 +4791,8 @@ CTranslatorQueryToDXL::ConstructCTEProducerList(List *cte_list,
 
 		CDXLLogicalCTEProducer *lg_cte_prod_dxlop =
 			GPOS_NEW(m_mp) CDXLLogicalCTEProducer(
-				m_mp, m_context->m_cte_id_counter->next_id(), colid_array);
+				m_mp, m_context->m_cte_id_counter->next_id(), colid_array,
+				!GPOS_FTRACE(EopttraceEnableCTEInlining) /*can_be_pruned*/);
 		CDXLNode *cte_producer_dxlnode =
 			GPOS_NEW(m_mp) CDXLNode(m_mp, lg_cte_prod_dxlop, cte_child_dxlnode);
 
diff --git a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
index 299c2881313..6a5d679a11f 100644
--- a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
@@ -20,6 +20,7 @@ extern "C" {
 #include "catalog/heap.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_am.h"
+#include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_statistic_ext.h"
@@ -413,7 +414,7 @@ CTranslatorRelcacheToDXL::RetrieveExtStatsInfo(CMemoryPool *mp, IMDId *mdid)
 		CBitSet *keys = GPOS_NEW(mp) CBitSet(mp);
 
 		int attno = -1;
-		while ((attno = bms_next_member(info->keys, attno)) >= 0)
+		while ((attno = gpdb::BmsNextMember(info->keys, attno)) >= 0)
 		{
 			keys->ExchangeSet(attno);
 		}
@@ -861,13 +862,31 @@ CTranslatorRelcacheToDXL::RetrieveRelDistributionOpFamilies(CMemoryPool *mp,
 void
 CTranslatorRelcacheToDXL::AddSystemColumns(CMemoryPool *mp,
 										   CMDColumnArray *mdcol_array,
-										   Relation /*rel*/)
+										   Relation rel)
 {
+	// Get storage type to determine which system columns are supported
+	IMDRelation::Erelstoragetype rel_storage_type = RetrieveRelStorageType(rel);
+	BOOL is_standalone_ao_table = ((rel_storage_type == IMDRelation::ErelstorageAppendOnlyRows ||
+						rel_storage_type == IMDRelation::ErelstorageAppendOnlyCols ||
+						rel_storage_type == IMDRelation::ErelstoragePAX)) &&
+						rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE &&
+						!rel->rd_rel->relispartition;
+
 	for (INT i = SelfItemPointerAttributeNumber;
 		 i > FirstLowInvalidHeapAttributeNumber; i--)
 	{
 		AttrNumber attno = AttrNumber(i);
 		GPOS_ASSERT(0 != attno);
+		// AO tables don't support MVCC-related system columns (xmin, cmin, xmax, cmax)
+		// Skip these columns for AO tables to avoid "Invalid system target list" errors
+		if (is_standalone_ao_table &&
+			(attno == MinTransactionIdAttributeNumber ||  // xmin (-2)
+			 attno == MinCommandIdAttributeNumber ||      // cmin (-3)
+			 attno == MaxTransactionIdAttributeNumber ||  // xmax (-4)
+			 attno == MaxCommandIdAttributeNumber))       // cmax (-5)
+		{
+			continue;
+		}
 
 		const FormData_pg_attribute *att_tup = SystemAttributeDefinition(attno);
 
@@ -1437,6 +1456,22 @@ CTranslatorRelcacheToDXL::LookupFuncProps(
 
 	*stability = GetFuncStability(gpdb::FuncStability(func_oid));
 
+	RegProcedure prosupport = gpdb::FuncSupport(func_oid);
+	if (OidIsValid(prosupport))
+	{
+		/*
+		  CBDB_FIXME:
+		  Check if function is NOT in pg_catalog namespace
+		  Functions outside pg_catalog are likely extension functions that unsupported yet.
+		*/
+		Oid func_namespace = gpdb::FuncNamespace(func_oid);
+		if (func_namespace != PG_CATALOG_NAMESPACE)
+		{
+			GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature,
+					   GPOS_WSZ_LIT("extension functions with prosupport unsupported"));
+		}
+	}
+
 	if (gpdb::FuncExecLocation(func_oid) != PROEXECLOCATION_ANY)
 	{
 		GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiQuery2DXLUnsupportedFeature,
@@ -1801,7 +1836,7 @@ CTranslatorRelcacheToDXL::RetrieveRelStats(CMemoryPool *mp, IMDId *mdid)
 	 * count of the partition table is -1.
 	 */
 	BOOL relation_empty = false;
-	if (num_rows == -1.0)
+	if (num_rows == -1.0 || num_rows == 0.0)
 	{
 		relation_empty = true;
 	}
@@ -2037,9 +2072,24 @@ CTranslatorRelcacheToDXL::RetrieveColStats(CMemoryPool *mp,
 			std::max(CDouble(0.0), (1 - num_freq_buckets - null_freq));
 	}
 
+	// histogram values extracted from the pg_statistic tuple for a given column
+	AttStatsSlot ndvbs_slot;
+
+	// get histogram datums from pg_statistic entry
+	(void) gpdb::GetAttrStatsSlot(&ndvbs_slot, stats_tup,
+								  STATISTIC_KIND_NDV_BY_SEGMENTS, InvalidOid,
+								  ATTSTATSSLOT_VALUES);
+	CDouble ndvbs = CHistogram::DefaultNDVBySegments;
+	if (InvalidOid != ndvbs_slot.valuetype)
+	{
+		GPOS_ASSERT(ndvbs_slot.nvalues == 1);
+		ndvbs = CDouble(gpdb::Float8FromDatum(ndvbs_slot.values[0]));
+	}
+
 	// free up allocated datum and float4 arrays
 	gpdb::FreeAttrStatsSlot(&mcv_slot);
 	gpdb::FreeAttrStatsSlot(&hist_slot);
+	gpdb::FreeAttrStatsSlot(&ndvbs_slot);
 
 	gpdb::FreeHeapTuple(stats_tup);
 
@@ -2047,8 +2097,7 @@ CTranslatorRelcacheToDXL::RetrieveColStats(CMemoryPool *mp,
 	mdid_col_stats->AddRef();
 	CDXLColStats *dxl_col_stats = GPOS_NEW(mp) CDXLColStats(
 		mp, mdid_col_stats, md_colname, width, null_freq, distinct_remaining,
-		freq_remaining, dxl_stats_bucket_array, false /* is_col_stats_missing */
-	);
+		freq_remaining, ndvbs, dxl_stats_bucket_array, false /* is_col_stats_missing */);
 
 	return dxl_col_stats;
 }
@@ -2118,7 +2167,7 @@ CTranslatorRelcacheToDXL::GenerateStatsForSystemCols(
 
 	return GPOS_NEW(mp) CDXLColStats(
 		mp, mdid_col_stats, md_colname, width, null_freq, distinct_remaining,
-		freq_remaining, dxl_stats_bucket_array, is_col_stats_missing);
+		freq_remaining, CHistogram::DefaultNDVBySegments, dxl_stats_bucket_array, is_col_stats_missing);
 }
 
 //---------------------------------------------------------------------------
@@ -3038,7 +3087,7 @@ CTranslatorRelcacheToDXL::RetrieveIndexPartitions(CMemoryPool *mp, OID rel_oid)
 	{
 		OID oid = lfirst_oid(lc);
 		partition_oids->Append(GPOS_NEW(mp)
-								   CMDIdGPDB(IMDId::EmdidGeneral, oid));
+								   CMDIdGPDB(IMDId::EmdidInd, oid));
 	}
 
 	return partition_oids;
diff --git a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp b/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp
index 83afda566bf..7256409eb54 100644
--- a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp
+++ b/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp
@@ -542,7 +542,7 @@ CTranslatorScalarToDXL::CreateScalarCmpFromOpExpr(
 	const CWStringConst *str = GetDXLArrayCmpType(mdid);
 
 	CDXLScalarComp *dxlop = GPOS_NEW(m_mp) CDXLScalarComp(
-		m_mp, mdid, GPOS_NEW(m_mp) CWStringConst(str->GetBuffer()));
+		m_mp, mdid, GPOS_NEW(m_mp) CWStringConst(m_mp, str->GetBuffer()));
 
 	// create the DXL node holding the scalar comparison operator
 	CDXLNode *dxlnode = GPOS_NEW(m_mp) CDXLNode(m_mp, dxlop);
@@ -592,7 +592,7 @@ CTranslatorScalarToDXL::TranslateOpExprToDXL(
 
 	CDXLScalarOpExpr *dxlop = GPOS_NEW(m_mp)
 		CDXLScalarOpExpr(m_mp, mdid, return_type_mdid,
-						 GPOS_NEW(m_mp) CWStringConst(str->GetBuffer()));
+						 GPOS_NEW(m_mp) CWStringConst(m_mp, str->GetBuffer()));
 
 	// create the DXL node holding the scalar opexpr
 	CDXLNode *dxlnode = GPOS_NEW(m_mp) CDXLNode(m_mp, dxlop);
@@ -702,7 +702,7 @@ CTranslatorScalarToDXL::CreateScalarArrayCompFromExpr(
 		m_mp,
 		GPOS_NEW(m_mp)
 			CMDIdGPDB(IMDId::EmdidGeneral, scalar_array_op_expr->opno),
-		GPOS_NEW(m_mp) CWStringConst(op_name->GetBuffer()), type);
+		GPOS_NEW(m_mp) CWStringConst(m_mp, op_name->GetBuffer()), type);
 
 	// create the DXL node holding the scalar opexpr
 	CDXLNode *dxlnode = GPOS_NEW(m_mp) CDXLNode(m_mp, dxlop);
diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/src/backend/gpopt/utils/COptTasks.cpp
index 0f5aadbd82a..6bd93379f0f 100644
--- a/src/backend/gpopt/utils/COptTasks.cpp
+++ b/src/backend/gpopt/utils/COptTasks.cpp
@@ -162,13 +162,34 @@ SOptContext::Free(SOptContext::EPin input, SOptContext::EPin output) const
 //
 //---------------------------------------------------------------------------
 CHAR *
-SOptContext::CloneErrorMsg(MemoryContext context) const
+SOptContext::CloneErrorMsg(MemoryContext context, BOOL *clone_failed) const
 {
+	*clone_failed = false;
+
 	if (nullptr == context || nullptr == m_error_msg)
 	{
 		return nullptr;
 	}
-	return gpdb::MemCtxtStrdup(context, m_error_msg);
+
+	CHAR *error_msg;
+	GPOS_TRY
+	{
+#ifdef FAULT_INJECTOR
+		if (gpdb::InjectFaultInOptTasks("opt_clone_error_msg") == FaultInjectorTypeSkip)
+		{
+			GpdbEreport(ERRCODE_INTERNAL_ERROR, ERROR, "Injected error", nullptr);
+		}
+#endif
+		error_msg = gpdb::MemCtxtStrdup(context, m_error_msg);
+	}
+	GPOS_CATCH_EX(ex)
+	{
+		error_msg = nullptr;
+		*clone_failed = true;
+	}
+	GPOS_CATCH_END;
+
+	return error_msg;
 }
 
 
@@ -913,7 +934,7 @@ COptTasks::OptimizeTask(void *ptr)
 	{
 		// set trace flags
 		trace_flags = CConfigParamMapping::PackConfigParamInBitset(
-			mp, CXform::ExfSentinel);
+			mp, CXform::ExfSentinel, opt_ctxt->m_create_vec_plan);
 		SetTraceflags(mp, trace_flags, &enabled_trace_flags,
 					  &disabled_trace_flags);
 
@@ -1156,13 +1177,15 @@ COptTasks::Optimize(Query *query)
 //
 //---------------------------------------------------------------------------
 PlannedStmt *
-COptTasks::GPOPTOptimizedPlan(Query *query, SOptContext *gpopt_context)
+COptTasks::GPOPTOptimizedPlan(Query *query, SOptContext *gpopt_context, OptimizerOptions *opts)
 {
 	Assert(query);
 	Assert(gpopt_context);
 
 	gpopt_context->m_query = query;
 	gpopt_context->m_should_generate_plan_stmt = true;
+	// Copy options in `OptimizerOptions` to `SOptContext`
+	gpopt_context->m_create_vec_plan = opts->create_vectorization_plan;
 	Execute(&OptimizeTask, gpopt_context);
 	return gpopt_context->m_plan_stmt;
 }
diff --git a/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h b/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h
index 9103a08ed8e..2b44693fa4e 100644
--- a/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h
+++ b/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h
@@ -107,6 +107,12 @@ class CCostModelGPDB : public ICostModel
 									 const CCostModelGPDB *pcmgpdb,
 									 const SCostingInfo *pci);
 
+	// cost of hash sequence project
+	static CCost CostHashSequenceProject(CMemoryPool *mp, 
+									CExpressionHandle &exprhdl,
+									const CCostModelGPDB *pcmgpdb,
+									const SCostingInfo *pci);
+
 	// cost of CTE producer
 	static CCost CostCTEProducer(CMemoryPool *mp, CExpressionHandle &exprhdl,
 								 const CCostModelGPDB *pcmgpdb,
diff --git a/src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp b/src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp
index a91fc4283fd..73330059c72 100644
--- a/src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp
+++ b/src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp
@@ -31,6 +31,7 @@
 #include "gpopt/operators/CPhysicalMotionBroadcast.h"
 #include "gpopt/operators/CPhysicalPartitionSelector.h"
 #include "gpopt/operators/CPhysicalSequenceProject.h"
+#include "gpopt/operators/CPhysicalHashSequenceProject.h"
 #include "gpopt/operators/CPhysicalStreamAgg.h"
 #include "gpopt/operators/CPhysicalUnionAll.h"
 #include "gpopt/operators/CPredicateUtils.h"
@@ -1594,11 +1595,17 @@ CCostModelGPDB::CostSequenceProject(CMemoryPool *mp, CExpressionHandle &exprhdl,
 	GPOS_ASSERT(COperator::EopPhysicalSequenceProject ==
 				exprhdl.Pop()->Eopid());
 
+	const CDouble dTupDefaultProcCostUnit =
+		pcmgpdb->GetCostModelParams()
+			->PcpLookup(CCostModelParamsGPDB::EcpTupDefaultProcCostUnit)
+			->Get();
+	GPOS_ASSERT(0 < dTupDefaultProcCostUnit);
+
 	CPhysicalSequenceProject *psp = CPhysicalSequenceProject::PopConvert(exprhdl.Pop());
 
-	if (GPOS_FTRACE(EopttraceForceSplitWindowFunc) && 
+	if (GPOS_FTRACE(EopttraceForceSplitWindowFunc) &&
 		psp->Pspt() == COperator::EsptypeGlobalTwoStep) {
-		return CCost(0);
+		return CCost(dTupDefaultProcCostUnit * 2);
 	}
 
 	const DOUBLE num_rows_outer = pci->PdRows()[0];
@@ -1614,12 +1621,59 @@ CCostModelGPDB::CostSequenceProject(CMemoryPool *mp, CExpressionHandle &exprhdl,
 		ulSortCols += pos->UlSortColumns();
 	}
 
+	// we process (sorted window of) input tuples to compute window function values
+	CCost costLocal =
+		CCost(pci->NumRebinds() * (ulSortCols * num_rows_outer * dWidthOuter *
+								   dTupDefaultProcCostUnit));
+	CCost costChild =
+		CostChildren(mp, exprhdl, pci, pcmgpdb->GetCostModelParams());
+	
+	return costLocal + costChild;
+}
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CCostModelGPDB::CostSequenceProject
+//
+//	@doc:
+//		Cost of sequence project
+//
+//---------------------------------------------------------------------------
+CCost
+CCostModelGPDB::CostHashSequenceProject(CMemoryPool *mp, CExpressionHandle &exprhdl,
+									const CCostModelGPDB *pcmgpdb,
+									const SCostingInfo *pci)
+{
+	GPOS_ASSERT(nullptr != pcmgpdb);
+	GPOS_ASSERT(nullptr != pci);
+	GPOS_ASSERT(COperator::EopPhysicalHashSequenceProject ==
+				exprhdl.Pop()->Eopid());
 	const CDouble dTupDefaultProcCostUnit =
 		pcmgpdb->GetCostModelParams()
 			->PcpLookup(CCostModelParamsGPDB::EcpTupDefaultProcCostUnit)
 			->Get();
 	GPOS_ASSERT(0 < dTupDefaultProcCostUnit);
 
+	CPhysicalHashSequenceProject *psp = CPhysicalHashSequenceProject::PopConvert(exprhdl.Pop());
+
+	if (GPOS_FTRACE(EopttraceForceSplitWindowFunc) && 
+		psp->Pspt() == COperator::EsptypeGlobalTwoStep) {
+		return CCost(dTupDefaultProcCostUnit);
+	}
+
+	const DOUBLE num_rows_outer = pci->PdRows()[0];
+	const DOUBLE dWidthOuter = pci->GetWidth()[0];
+
+	ULONG ulSortCols = 0;
+	COrderSpecArray *pdrgpos =
+		CPhysicalHashSequenceProject::PopConvert(psp)->Pdrgpos();
+	const ULONG ulOrderSpecs = pdrgpos->Size();
+	for (ULONG ul = 0; ul < ulOrderSpecs; ul++)
+	{
+		COrderSpec *pos = (*pdrgpos)[ul];
+		ulSortCols += pos->UlSortColumns();
+	}
+
 	// we process (sorted window of) input tuples to compute window function values
 	CCost costLocal =
 		CCost(pci->NumRebinds() * (ulSortCols * num_rows_outer * dWidthOuter *
@@ -2462,18 +2516,26 @@ CCostModelGPDB::Cost(
 			return CostSequenceProject(m_mp, exprhdl, this, pci);
 		}
 
+		case COperator::EopPhysicalHashSequenceProject:
+		{
+			return CostHashSequenceProject(m_mp, exprhdl, this, pci);
+		}
+
 		case COperator::EopPhysicalCTEProducer:
 		{
 			return CostCTEProducer(m_mp, exprhdl, this, pci);
 		}
+
 		case COperator::EopPhysicalCTEConsumer:
 		{
 			return CostCTEConsumer(m_mp, exprhdl, this, pci);
 		}
+
 		case COperator::EopPhysicalConstTableGet:
 		{
 			return CostConstTableGet(m_mp, exprhdl, this, pci);
 		}
+
 		case COperator::EopPhysicalDML:
 		{
 			return CostDML(m_mp, exprhdl, this, pci);
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h b/src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h
index 117769ddecb..bf72a444734 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h
@@ -121,6 +121,9 @@ class CCTEInfo : public CRefCount
 		// logical producer expression
 		CExpression *m_pexprCTEProducer;
 
+		// logical consumer expression array
+		CExpressionArray *m_pexprCTEConsumer;
+
 		// map columns of all created consumers of current CTE to their positions in consumer output
 		ColRefToUlongMap *m_phmcrulConsumers;
 
@@ -139,13 +142,20 @@ class CCTEInfo : public CRefCount
 		// dtor
 		~CCTEInfoEntry() override;
 
-		// CTE expression
+		// CTE producer expression
 		CExpression *
-		Pexpr() const
+		PexprProducer() const
 		{
 			return m_pexprCTEProducer;
 		}
 
+		// CTE consumer expressions array
+		CExpressionArray *
+		PexprsConsumer() const
+		{
+			return m_pexprCTEConsumer;
+		}
+
 		// is this CTE used?
 		BOOL
 		FUsed() const
@@ -170,6 +180,9 @@ class CCTEInfo : public CRefCount
 			m_fUsed = true;
 		}
 
+		// add consumer into the entry
+		void AddConsumer(CExpression * consumer);
+
 		// add given columns to consumers column map
 		void AddConsumerCols(CColRefArray *colref_array);
 
@@ -219,6 +232,12 @@ class CCTEInfo : public CRefCount
 	// consumers inside each cte/main query
 	UlongToProducerConsumerMap *m_phmulprodconsmap;
 
+	// mappings CTE consumer ColId(Not DXL id) -> CTE producer Colref
+	UlongToColRefMap *m_phmcidcrCTE;
+
+	// mappings CTE producer ColId(Not DXL id) -> CTE consumer Colref Array
+	UlongToColRefArrayMap *m_phmpidcrsCTE;
+
 	// initialize default statistics for a given CTE Producer
 	void InitDefaultStats(CExpression *pexprCTEProducer);
 
@@ -248,6 +267,9 @@ class CCTEInfo : public CRefCount
 	// number of CTE consumers of given CTE
 	ULONG UlConsumers(ULONG ulCTEId) const;
 
+	// logical cte consumer with given id
+	CExpressionArray *PexprCTEConsumer(ULONG ulCTEId) const;
+
 	// check if given CTE is used
 	BOOL FUsed(ULONG ulCTEId) const;
 
@@ -263,10 +285,31 @@ class CCTEInfo : public CRefCount
 
 	// add cte producer to hashmap
 	void AddCTEProducer(CExpression *pexprCTEProducer);
+	
+	// add cte consumer to hashmap
+	void AddCTEConsumer(CExpression *pexprCTEProducer);
 
 	// replace cte producer with given expression
 	void ReplaceCTEProducer(CExpression *pexprCTEProducer);
 
+	// get the consumer colid -> producer colref map 
+	UlongToColRefMap *
+	GetCTEConsumerMapping() const {
+		return m_phmcidcrCTE;
+	}
+
+	// get the producer colid -> consumer colref array map 
+	UlongToColRefArrayMap *
+	GetCTEProducerMapping() const {
+		return m_phmpidcrsCTE;
+	}
+
+	// exist the CTE in global CTEInfo
+	BOOL 
+	ExistCTE() const {
+		return m_ulNextCTEId > 0;
+	}
+
 	// next available CTE id
 	ULONG
 	next_id()
@@ -274,6 +317,11 @@ class CCTEInfo : public CRefCount
 		return m_ulNextCTEId++;
 	}
 
+	ULONG
+	CTESize() {
+		return m_ulNextCTEId;
+	}
+
 	// derive the statistics on the CTE producer
 	void DeriveProducerStats(
 		CLogicalCTEConsumer *popConsumer,  // CTE Consumer operator
@@ -303,6 +351,7 @@ class CCTEInfo : public CRefCount
 	// mark unused CTEs
 	void MarkUnusedCTEs();
 
+
 	// walk the producer expressions and add the mapping between computed column
 	// and their corresponding used column(s)
 	void MapComputedToUsedCols(CColumnFactory *col_factory) const;
@@ -316,7 +365,8 @@ class CCTEInfo : public CRefCount
 	// return a map from Id's of consumer columns in the given column set to their corresponding producer columns
 	UlongToColRefMap *PhmulcrConsumerToProducer(CMemoryPool *mp, ULONG ulCTEId,
 												CColRefSet *pcrs,
-												CColRefArray *pdrgpcrProducer);
+												CColRefArray *pdrgpcrProducer,
+												ULongPtrArray *pdrgpcrUnusedProducer);
 
 };	// CCTEInfo
 }  // namespace gpopt
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRef.h b/src/backend/gporca/libgpopt/include/gpopt/base/CColRef.h
index e1da4d81769..af201349334 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/base/CColRef.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/base/CColRef.h
@@ -36,6 +36,10 @@ using CColRef2dArray = CDynamicPtrArray<CColRefArray, CleanupRelease>;
 using UlongToColRefMap =
 	CHashMap<ULONG, CColRef, gpos::HashValue<ULONG>, gpos::Equals<ULONG>,
 			 CleanupDelete<ULONG>, CleanupNULL<CColRef>>;
+// hash map mapping ULONG -> CColRefArray
+using UlongToColRefArrayMap =
+	CHashMap<ULONG, CColRefArray, gpos::HashValue<ULONG>, gpos::Equals<ULONG>,
+			 CleanupDelete<ULONG>, CleanupRelease<CColRefArray>>;
 // hash map mapping ULONG -> const CColRef
 using UlongToConstColRefMap =
 	CHashMap<ULONG, const CColRef, gpos::HashValue<ULONG>, gpos::Equals<ULONG>,
@@ -82,6 +86,9 @@ class CColRef : public gpos::DbgPrintMixin<CColRef>
 	// table info
 	IMDId *m_mdid_table;
 
+	// debug function
+	const char* UsedStatusToString(EUsedStatus status) const;
+
 public:
 	CColRef(const CColRef &) = delete;
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSet.h b/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSet.h
index b4e34c62c81..1af8748a5c3 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSet.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSet.h
@@ -133,6 +133,10 @@ class CColRefSet : public CBitSet
 	// extract all column ids
 	void ExtractColIds(CMemoryPool *mp, ULongPtrArray *colids) const;
 
+	// extract the index(relative position) in current CColRefSet
+	// notice that: Whenever the current CColRefSet changes, the index will also change.
+	void ExtractIndex(const CColRef *querycr, ULONG *colidx) const;
+
 	// are the columns in the column reference set covered by the array of column ref sets
 	static BOOL FCovered(CColRefSetArray *pdrgpcrs, CColRefSet *pcrs);
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h b/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h
index d8b4919674b..d3b47b95f80 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h
@@ -179,6 +179,9 @@ class CDistributionSpec : public CPropSpec
 	}
 	// print
 	IOstream &OsPrint(IOstream &os) const override = 0;
+	virtual IOstream &OsPrintNoWrap(IOstream &os) const{
+		return OsPrint(os);
+	}
 
 	// return distribution partitioning type
 	virtual EDistributionPartitioningType Edpt() const = 0;
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h b/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h
index 306b36f4ab9..5e4de6ac62a 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h
@@ -178,7 +178,8 @@ class CDistributionSpecHashed : public CDistributionSpecRandom
 
 	// print
 	IOstream &OsPrint(IOstream &os) const override;
-	IOstream &OsPrintWithPrefix(IOstream &os, const char *prefix) const;
+	IOstream &OsPrintNoWrap(IOstream &os) const override;
+	IOstream &OsPrintWithPrefix(IOstream &os, const char *prefix, BOOL wrap = true) const;
 
 	// return a hashed distribution on the maximal hashable subset of given columns
 	static CDistributionSpecHashed *PdshashedMaximal(CMemoryPool *mp,
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CUtils.h b/src/backend/gporca/libgpopt/include/gpopt/base/CUtils.h
index b1b55e29ea8..1e873e14847 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/base/CUtils.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/base/CUtils.h
@@ -851,7 +851,9 @@ class CUtils
 	// if the passed map is not null, mappings from old to copied variables are added to it
 	static CColRefArray *PdrgpcrCopy(
 		CMemoryPool *mp, CColRefArray *colref_array, BOOL fAllComputed = false,
-		UlongToColRefMap *colref_mapping = nullptr);
+		UlongToColRefMap *colref_mapping = nullptr, UlongToColRefMap *consumer_mapping = nullptr, 
+		UlongToColRefArrayMap *producer_mapping = nullptr,
+		BOOL check_usage = false);
 
 	// equality check between two arrays of column refs. Inputs can be NULL
 	static BOOL Equals(CColRefArray *pdrgpcrFst, CColRefArray *pdrgpcrSnd);
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CWindowOids.h b/src/backend/gporca/libgpopt/include/gpopt/base/CWindowOids.h
index ba120eac015..6d20b4948c2 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/base/CWindowOids.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/base/CWindowOids.h
@@ -60,6 +60,8 @@ class CWindowOids : public CRefCount
 	CWindowOids(CMemoryPool *mp, OID row_number_oid, OID rank_oid,
 				OID dense_rank_oid);
 
+	~CWindowOids() override;
+
 	// accessor of oid value of "row_number" function
 	OID OidRowNumber() const;
 	IMDId *MDIdRowNumber() const;
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CDedupSupersetPreprocessor.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CDedupSupersetPreprocessor.h
new file mode 100644
index 00000000000..d9255212c73
--- /dev/null
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CDedupSupersetPreprocessor.h
@@ -0,0 +1,126 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * CDedupSupersetPreprocessor.h
+ *
+ * IDENTIFICATION
+ *	  src/backend/gporca/libgpopt/include/gpopt/operators/CDedupSupersetPreprocessor.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef GPOPT_CDedupSupersetPreprocessor_H
+#define GPOPT_CDedupSupersetPreprocessor_H
+
+#include "gpos/base.h"
+#include "gpos/memory/set.h"
+
+#include "gpopt/base/CColRefSet.h"
+#include "gpopt/operators/CExpression.h"
+
+namespace gpopt
+{
+
+class TableDescIdent final
+{
+public:
+	IMDId *pmdid;
+	ULONG subid;
+	ULONG ocolid;
+
+	TableDescIdent(IMDId *mdid, ULONG sid, ULONG output_colid);
+
+	~TableDescIdent();
+
+	// hash function
+	static ULONG HashFunc(const TableDescIdent *ptdi);
+
+	// equality function
+	static BOOL EqualFunc(const TableDescIdent *pltdi,
+						  const TableDescIdent *prtdi);
+};
+
+// desc to ulong map
+using TDIToUlongPtrMap =
+	CHashMap<TableDescIdent, ULONG, TableDescIdent::HashFunc,
+			 TableDescIdent::EqualFunc, CleanupDelete<TableDescIdent>,
+			 CleanupDelete<ULONG>>;
+
+// iterator
+using TDIToUlongPtrMapIter =
+	CHashMapIter<TableDescIdent, ULONG, TableDescIdent::HashFunc,
+				 TableDescIdent::EqualFunc, CleanupDelete<TableDescIdent>,
+				 CleanupDelete<ULONG>>;
+
+class CDedupSupersetPreprocessor
+{
+private:
+	// Expression is CLogicalGet,CLogicalDynamicGet or CLogicalCTEConsumer?
+	static BOOL PexprIsLogicalOutput(CExpression *pexpr);
+
+	// Get the meta id from expression
+	static IMDId *PexprGetIMDid(CMemoryPool *mp, CExpression *pexpr);
+
+	// full the maps with superset expression
+	static void ChildExprFullSuperset(CMemoryPool *mp, CExpression *pexpr,
+									  TDIToUlongPtrMap *eqcrmaps,
+									  BOOL *dedupulmasks, ULONG ul);
+
+	// full the dedups array with subset(simply logicalget)
+	static void ChildExprFullSimplySubset(CMemoryPool *mp, CExpression *pexpr,
+										  TDIToUlongPtrMap *eqcrmaps,
+										  BOOL *dedupulmasks);
+
+	// Extract the sub child from the join(inner join) expr
+	static CExpression *PexprExtractSubChildJoinExpr(CExpression *pexpr,
+													 const CColRef *subany_col);
+
+	// query the join subset
+	static ULONG *DriveFullJoinSubset(CMemoryPool *mp,
+									  TDIToUlongPtrMap *eqcrmaps,
+									  CExpression *pexpr_join,
+									  const CColRef *pcr_sbany,
+									  const CColRef *pcr_ident);
+
+	// full the dedups array with subset(inner join)
+	static void ChildExprFullJoinSubset(CMemoryPool *mp, CExpression *pexpr,
+										TDIToUlongPtrMap *eqcrmaps,
+										BOOL *dedupulmasks);
+
+	// child expr in CScalarBoolOp(ANDOP) is the superset
+	static BOOL ChildExprIsSuperset(CExpression *pexpr);
+
+	// child expr in CScalarBoolOp(ANDOP) is the simply subset
+	static BOOL ChildExprIsSimplySubset(CExpression *pexpr);
+
+	// child expr in CScalarBoolOp(ANDOP) is the inner-join subset
+	// left-semi-join won't occur in the pre-process
+	static BOOL ChildExprIsJoinSubset(CExpression *pexpr);
+
+
+public:
+	CDedupSupersetPreprocessor(const CDedupSupersetPreprocessor &) = delete;
+
+	// main driver
+	static CExpression *PexprPreprocess(CMemoryPool *mp, CExpression *pexpr);
+};
+
+}  // namespace gpopt
+
+
+#endif	// GPOPT_CDedupSupersetPreprocessor_H
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h
index 650d19544a9..80365da222b 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h
@@ -47,6 +47,13 @@ class CLogicalCTEConsumer : public CLogical
 	// create the inlined version of this consumer as well as the column mapping
 	void CreateInlinedExpr(CMemoryPool *mp);
 
+	// is pruned
+	BOOL m_pruned;
+
+	void MarkAsNotPruned() {
+		m_pruned = false;
+	}
+
 public:
 	CLogicalCTEConsumer(const CLogicalCTEConsumer &) = delete;
 
@@ -59,6 +66,12 @@ class CLogicalCTEConsumer : public CLogical
 	// dtor
 	~CLogicalCTEConsumer() override;
 
+	void MarkAsPruned() {
+		m_pruned = true;
+	}
+
+	void ApplyInline();
+
 	// ident accessors
 	EOperatorId
 	Eopid() const override
@@ -93,6 +106,7 @@ class CLogicalCTEConsumer : public CLogical
 		return m_phmulcr;
 	}
 
+	// get the inlined expression
 	CExpression *
 	PexprInlined() const
 	{
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h
index 812db8c9db7..7d25d8d7251 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h
@@ -38,6 +38,12 @@ class CLogicalCTEProducer : public CLogical
 	// output columns, same as cte columns but in CColRefSet
 	CColRefSet *m_pcrsOutput;
 
+	// can be pruned
+	BOOL m_cbp;
+
+	// used mask
+	BOOL *m_umask;
+
 public:
 	CLogicalCTEProducer(const CLogicalCTEProducer &) = delete;
 
@@ -45,7 +51,8 @@ class CLogicalCTEProducer : public CLogical
 	explicit CLogicalCTEProducer(CMemoryPool *mp);
 
 	// ctor
-	CLogicalCTEProducer(CMemoryPool *mp, ULONG id, CColRefArray *colref_array);
+	CLogicalCTEProducer(CMemoryPool *mp, ULONG id, CColRefArray *colref_array,
+		BOOL canbepruned = false);
 
 	// dtor
 	~CLogicalCTEProducer() override;
@@ -70,6 +77,29 @@ class CLogicalCTEProducer : public CLogical
 		return m_id;
 	}
 
+	void
+	MarkALLUsed() {
+		ULONG colref_size = m_pdrgpcr->Size();
+		for (ULONG index = 0; index < colref_size; index++) {
+			CColRef *col_ref = (*m_pdrgpcr)[index];
+			col_ref->MarkAsUsed();
+		}
+		m_cbp = false;
+	}
+
+
+	BOOL
+	CanBePruned() const
+	{
+		return m_cbp;
+	}
+
+	BOOL *
+	UsedMask() const
+	{
+		return m_umask;
+	}
+
 	// cte columns
 	CColRefArray *
 	Pdrgpcr() const
@@ -84,6 +114,9 @@ class CLogicalCTEProducer : public CLogical
 		return m_pcrsOutput;
 	}
 
+	// Recalculate the output columns
+	void RecalOutputColumns(BOOL *umask, ULONG sz);
+
 	// operator specific hash function
 	ULONG HashValue() const override;
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h
index 534f40ba964..ce894f2a9ba 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h
@@ -70,11 +70,6 @@ class CLogicalDynamicGetBase : public CLogical
 	static ColRefToUlongMapArray *ConstructRootColMappingPerPart(
 		CMemoryPool *mp, CColRefArray *root_cols, IMdIdArray *partition_mdids);
 
-	using ColNameToIndexMap =
-		CHashMap<const CWStringConst, ULONG, CWStringConst::HashValue,
-				 CWStringConst::Equals, CleanupNULL<const CWStringConst>,
-				 CleanupDelete<ULONG>>;
-
 public:
 	// ctors
 	explicit CLogicalDynamicGetBase(CMemoryPool *mp);
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h
index 1fe22177cd3..dc9fbeea36c 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h
@@ -87,9 +87,11 @@ class CLogicalDynamicIndexOnlyGet : public CLogicalDynamicIndexGet
 	{
 		CXformSet *xform_set = GPOS_NEW(mp) CXformSet(mp);
 
-		(void) xform_set->ExchangeSet(
-			CXform::ExfDynamicIndexOnlyGet2DynamicIndexOnlyScan);
-
+		// Append node have not implements the index only scan
+		if (!GPOS_FTRACE(EopttraceDisableDynamicTableScan)) {
+			(void) xform_set->ExchangeSet(
+				CXform::ExfDynamicIndexOnlyGet2DynamicIndexOnlyScan);
+		}
 		return xform_set;
 	}
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h
index a7f1b01c202..448f807d8a9 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h
@@ -131,6 +131,20 @@ class CLogicalGbAgg : public CLogicalUnary
 		return m_fGeneratesDuplicates;
 	}
 
+	// dose this aggregate generated by pushdown
+	BOOL
+	FAggPushdown() const
+	{
+		return m_aggpushdown;
+	}
+
+	// this aggregate generated by pushdown
+	void
+	MarkAggPushdown()
+	{
+		m_aggpushdown = true;
+	}
+
 	// match function
 	BOOL Matches(COperator *pop) const override;
 
@@ -165,6 +179,13 @@ class CLogicalGbAgg : public CLogicalUnary
 		return (COperator::EgbaggtypeGlobal == m_egbaggtype);
 	}
 
+	// is a local aggregate?
+	BOOL
+	FLocal() const
+	{
+		return (COperator::EgbaggtypeLocal == m_egbaggtype);
+	}
+
 	// minimal grouping columns accessor
 	CColRefArray *
 	PdrgpcrMinimal() const
@@ -255,7 +276,7 @@ class CLogicalGbAgg : public CLogicalUnary
 	static IStatistics *PstatsDerive(CMemoryPool *mp, IStatistics *child_stats,
 									 CColRefArray *pdrgpcrGroupingCols,
 									 ULongPtrArray *pdrgpulComputedCols,
-									 CBitSet *keys);
+									 CBitSet *keys, BOOL isLocal);
 
 	// print group by aggregate type
 	static IOstream &OsPrintGbAggType(IOstream &os,
@@ -274,6 +295,8 @@ class CLogicalGbAgg : public CLogicalUnary
 	// which type of multi-stage agg it is
 	EAggStage m_aggStage;
 
+	// is current agg pushdown?
+	BOOL m_aggpushdown;
 };	// class CLogicalGbAgg
 
 }  // namespace gpopt
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/COperator.h b/src/backend/gporca/libgpopt/include/gpopt/operators/COperator.h
index 272bba90929..657e3082ef7 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/COperator.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/COperator.h
@@ -213,6 +213,7 @@ class COperator : public CRefCount, public DbgPrintMixin<COperator>
 		EopPhysicalCTEProducer,
 		EopPhysicalCTEConsumer,
 		EopPhysicalSequenceProject,
+		EopPhysicalHashSequenceProject,
 		EopPhysicalDynamicIndexScan,
 
 		EopPhysicalInnerHashJoin,
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysical.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysical.h
index 84b1b0f8ac9..9924a3293fd 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysical.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysical.h
@@ -158,6 +158,11 @@ class CPhysical : public COperator
 	// total number of optimization requests
 	ULONG m_ulTotalOptRequests;
 
+	// use back trace generate the opt requires
+	void BackTraceOptRequests(UlongPtrArray *pdrgpulpOptReqsExpanded,
+							  const ULONG *ulOptReqs, ULONG ulOptReqsSize,
+							  ULONG_PTR *current, ULONG cursz);
+
 	// update number of requests of a given property
 	void UpdateOptRequests(ULONG ulPropIndex, ULONG ulRequests);
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h
index a5a44e61d0c..0a1c5b5000e 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h
@@ -44,6 +44,9 @@ class CPhysicalAgg : public CPhysical
 
 	CLogicalGbAgg::EAggStage m_aggStage;
 
+	// is aggregate gernerated by pushdown
+	BOOL m_aggpushdown;
+
 	// compute required distribution of the n-th child of an intermediate aggregate
 	CDistributionSpec *PdsRequiredIntermediateAgg(CMemoryPool *mp,
 												  ULONG ulOptReq) const;
@@ -111,7 +114,7 @@ class CPhysicalAgg : public CPhysical
 				 COperator::EGbAggType egbaggtype, BOOL fGeneratesDuplicates,
 				 CColRefArray *pdrgpcrArgDQA, BOOL fMultiStage,
 				 BOOL isAggFromSplitDQA, CLogicalGbAgg::EAggStage aggStage,
-				 BOOL should_enforce_distribution);
+				 BOOL isAggPushdown, BOOL should_enforce_distribution);
 
 	// is this agg generated by CXformSplitDQA
 	BOOL IsAggFromSplitDQA() const;
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h
index 0d39de496fe..0a618b51f38 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h
@@ -37,6 +37,11 @@ class CPhysicalCTEConsumer : public CPhysical
 	// hashmap for all the columns in the CTE expression
 	UlongToColRefMap *m_phmulcr;
 
+	// mapping index of colref to origin idx
+	// if current colref not used, then set -1 in the position
+	// if all used, then m_pidxmap will be nullptr
+	ULongPtrArray *m_pidxmap;
+
 public:
 	CPhysicalCTEConsumer(const CPhysicalCTEConsumer &) = delete;
 
@@ -81,6 +86,12 @@ class CPhysicalCTEConsumer : public CPhysical
 		return m_phmulcr;
 	}
 
+	ULongPtrArray *
+	PCTEIdxMap() const
+	{
+		return m_pidxmap;
+	}
+
 	// operator specific hash function
 	ULONG HashValue() const override;
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h
index fec81912bb3..e611e9403e8 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h
@@ -37,11 +37,17 @@ class CPhysicalCTEProducer : public CPhysical
 	// set representation of cte columns
 	CColRefSet *m_pcrs;
 
+	// used to record unused columns in m_pdrgpcr
+	ULongPtrArray *m_pdrgpcr_unused;
+
+	// used to mapping col index
+	ULongPtrArray *m_pidxmap;
+
 public:
 	CPhysicalCTEProducer(const CPhysicalCTEProducer &) = delete;
 
 	// ctor
-	CPhysicalCTEProducer(CMemoryPool *mp, ULONG id, CColRefArray *colref_array);
+	CPhysicalCTEProducer(CMemoryPool *mp, ULONG id, CColRefArray *colref_array, BOOL *umask);
 
 	// dtor
 	~CPhysicalCTEProducer() override;
@@ -73,6 +79,20 @@ class CPhysicalCTEProducer : public CPhysical
 		return m_pdrgpcr;
 	}
 
+	// used to make the CTE consumer colid get the right position in m_pdrgpcr.
+	// more details see the function CCTEInfo::PhmulcrConsumerToProducer()
+	ULongPtrArray *
+	PdrgpcrUnused() const
+	{
+		return m_pdrgpcr_unused;
+	}
+
+	ULongPtrArray *
+	PCTEIdxMap() const
+	{
+		return m_pidxmap;
+	}
+
 	// operator specific hash function
 	ULONG HashValue() const override;
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h
index 6fa75f7fbe1..94d7435ca05 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h
@@ -74,6 +74,9 @@ class CPhysicalDynamicTableScan : public CPhysicalDynamicScan
 	CPartitionPropagationSpec *PppsDerive(
 		CMemoryPool *mp, CExpressionHandle &exprhdl) const override;
 
+	// return rewindability property enforcing type for this operator
+	CEnfdProp::EPropEnforcingType EpetRewindability(CExpressionHandle &, const CEnfdRewindability *) const override;
+
 };	// class CPhysicalDynamicTableScan
 
 }  // namespace gpopt
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h
index 87c817d7aa2..ff63514e41f 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h
@@ -41,7 +41,7 @@ class CPhysicalHashAgg : public CPhysicalAgg
 					 BOOL fGeneratesDuplicates, CColRefArray *pdrgpcrArgDQA,
 					 BOOL fMultiStage, BOOL isAggFromSplitDQA,
 					 CLogicalGbAgg::EAggStage aggStage,
-					 BOOL should_enforce_distribution = true
+					 BOOL isAggPushdown, BOOL should_enforce_distribution
 					 // should_enforce_distribution should be set to false if
 					 // 'local' and 'global' splits don't need to have different
 					 // distributions. This flag is set to false if the local
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h
index 75fefc1535c..204a3bbe4b5 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h
@@ -42,6 +42,7 @@ class CPhysicalHashAggDeduplicate : public CPhysicalHashAgg
 								BOOL fGeneratesDuplicates, BOOL fMultiStage,
 								BOOL isAggFromSplitDQA,
 								CLogicalGbAgg::EAggStage aggStage,
+								BOOL isAggPushdown,
 								BOOL should_enforce_distribution);
 
 	// dtor
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashSequenceProject.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashSequenceProject.h
new file mode 100644
index 00000000000..288c0873b47
--- /dev/null
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashSequenceProject.h
@@ -0,0 +1,123 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * CPhysicalHashSequenceProject.h
+ *
+ * IDENTIFICATION
+ *	  src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashSequenceProject.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef GPOPT_CPhysicalHashSequenceProject_H
+#define GPOPT_CPhysicalHashSequenceProject_H
+
+#include "gpos/base.h"
+
+#include "gpopt/base/CWindowFrame.h"
+#include "gpopt/operators/CPhysicalSequenceProject.h"
+
+namespace gpopt
+{
+// fwd declarations
+class CDistributionSpec;
+
+//---------------------------------------------------------------------------
+//	@class:
+//		CPhysicalHashSequenceProject
+//
+//	@doc:
+//		Physical Hash Sequence Project operator
+//
+//---------------------------------------------------------------------------
+class CPhysicalHashSequenceProject : public CPhysicalSequenceProject
+{
+public:
+	CPhysicalHashSequenceProject(const CPhysicalHashSequenceProject &) = delete;
+
+	// ctor
+	CPhysicalHashSequenceProject(CMemoryPool *mp, ESPType m_sptype,
+								 CDistributionSpec *pds,
+								 COrderSpecArray *pdrgpos,
+								 CWindowFrameArray *pdrgpwf);
+
+	// dtor
+	~CPhysicalHashSequenceProject() override;
+
+	// ident accessors
+	EOperatorId
+	Eopid() const override
+	{
+		return EopPhysicalHashSequenceProject;
+	}
+
+	// operator name
+	const CHAR *
+	SzId() const override
+	{
+		return "CPhysicalHashSequenceProject";
+	}
+
+	// match function
+	BOOL Matches(COperator *pop) const override;
+
+	// hashing function
+	ULONG HashValue() const override;
+
+	// sensitivity to order of inputs
+	BOOL FInputOrderSensitive() const override;
+
+	// compute required sort order of the n-th child
+	COrderSpec *PosRequired(CMemoryPool *mp, CExpressionHandle &exprhdl,
+							COrderSpec *posRequired, ULONG child_index,
+							CDrvdPropArray *pdrgpdpCtxt,
+							ULONG ulOptReq) const override;
+
+	// return order property enforcing type for this operator
+	CEnfdProp::EPropEnforcingType EpetOrder(
+		CExpressionHandle &exprhdl, const CEnfdOrder *peo) const override;
+
+	// return true if operator passes through stats obtained from children,
+	// this is used when computing stats during costing
+	BOOL
+	FPassThruStats() const override
+	{
+		return true;
+	}
+
+	// print
+	IOstream &OsPrint(IOstream &os) const override;
+
+	// conversion function
+	static CPhysicalHashSequenceProject *
+	PopConvert(COperator *pop)
+	{
+		GPOS_ASSERT(nullptr != pop);
+		GPOS_ASSERT(EopPhysicalHashSequenceProject == pop->Eopid());
+
+		return dynamic_cast<CPhysicalHashSequenceProject *>(pop);
+	}
+
+};	// class CPhysicalHashSequenceProject
+
+}  // namespace gpopt
+
+#endif	// !GPOPT_CPhysicalHashSequenceProject_H
+
+// EOF
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h
index 17aee5e65d8..291b49f0732 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h
@@ -40,7 +40,8 @@ class CPhysicalScalarAgg : public CPhysicalAgg
 		CColRefArray *pdrgpcrMinimal,  // minimal grouping columns based on FD's
 		COperator::EGbAggType egbaggtype, BOOL fGeneratesDuplicates,
 		CColRefArray *pdrgpcrArgDQA, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-		CLogicalGbAgg::EAggStage aggStage, BOOL should_enforce_distribution);
+		CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+		BOOL should_enforce_distribution);
 
 	// dtor
 	~CPhysicalScalarAgg() override;
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h
index dc6afd1ecfa..e9d84d6edad 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h
@@ -31,7 +31,7 @@ class CDistributionSpec;
 //---------------------------------------------------------------------------
 class CPhysicalSequenceProject : public CPhysical
 {
-private:
+protected:
 	// window type
 	ESPType m_sptype;
 
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h
index 1cb0dbf9490..21dc3464638 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h
@@ -60,8 +60,8 @@ class CPhysicalStreamAgg : public CPhysicalAgg
 		CColRefArray *pdrgpcrMinimal,  // minimal grouping columns based on FD's
 		COperator::EGbAggType egbaggtype, BOOL fGeneratesDuplicates,
 		CColRefArray *pdrgpcrArgDQA, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-		CLogicalGbAgg::EAggStage aggStage,
-		BOOL should_enforce_distribution = true
+		CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+		BOOL should_enforce_distribution
 		// should_enforce_distribution should be set to false if
 		// 'local' and 'global' splits don't need to have different
 		// distributions. This flag is set to false if the local
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h
index 6a79c3690d3..a05479aa4bf 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h
@@ -43,6 +43,7 @@ class CPhysicalStreamAggDeduplicate : public CPhysicalStreamAgg
 								  BOOL fGeneratesDuplicates, BOOL fMultiStage,
 								  BOOL isAggFromSplitDQA,
 								  CLogicalGbAgg::EAggStage aggStage,
+								  BOOL isAggPushdown,
 								  BOOL should_enforce_distribution);
 
 	// dtor
diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h b/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h
index b68f75ae874..31b0b5f1e22 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h
@@ -59,7 +59,6 @@ using UlongToExprArrayMapIter =
 	CHashMapIter<ULONG, CExpressionArray, gpos::HashValue<ULONG>,
 				 gpos::Equals<ULONG>, CleanupDelete<ULONG>, CleanupNULL>;
 
-
 //---------------------------------------------------------------------------
 //	@class:
 //		CTranslatorDXLToExpr
@@ -348,6 +347,9 @@ class CTranslatorDXLToExpr
 	CExpression *Pexpr(const CDXLNode *dxlnode,
 					   const CDXLNodeArray *query_output_dxlnode_array,
 					   const CDXLNodeArray *cte_producers);
+	
+	// Prune the CTEs producer and consumer after DXL tree translated
+	void PruneCTEs();
 
 	// translate children of a DXL node
 	CExpressionArray *PdrgpexprChildren(const CDXLNode *dxlnode);
@@ -364,6 +366,10 @@ class CTranslatorDXLToExpr
 	// create an array of column references from an array of dxl column references
 	CColRefArray *Pdrgpcr(const CDXLColDescrArray *dxl_col_descr_array);
 
+	// construct a dynamic array of column references corresponding to the
+	// given col ids
+	CColRefArray *Pdrgpcr(const ULongPtrArray *colids);
+
 	// construct the mapping between the DXL ColId and CColRef
 	void ConstructDXLColId2ColRefMapping(
 		const CDXLColDescrArray *dxl_col_descr_array,
@@ -373,7 +379,11 @@ class CTranslatorDXLToExpr
 
 	// look up the column reference in the hash map. We raise an exception if
 	// the column is not found
-	static CColRef *LookupColRef(UlongToColRefMap *colref_mapping, ULONG colid);
+	CColRef *LookupColRef(ULONG colid, BOOL mark_used = true);
+	
+	// after the colref in CTE consumer marked used, the producer should marked 
+	// the relatived colref as used.
+	void MarkCTEConsumerColAsUsed(UlongToColRefMap *mcidcrCTE, ULONG colid);
 
 public:
 	// ctor
diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h b/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h
index e732f211e2e..73b5e054bb6 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h
@@ -75,10 +75,6 @@ class CTranslatorDXLToExprUtils
 	static CScalarBoolOp::EBoolOperator EBoolOperator(
 		EdxlBoolExprType edxlbooltype);
 
-	// construct a dynamic array of col refs corresponding to the given col ids
-	static CColRefArray *Pdrgpcr(CMemoryPool *mp,
-								 UlongToColRefMap *colref_mapping,
-								 const ULongPtrArray *colids);
 
 	// is the given expression is a scalar function that casts
 	static BOOL FCastFunc(CMDAccessor *md_accessor, const CDXLNode *dxlnode,
diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h b/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h
index 6e1ad49454b..2c50e9e812f 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h
@@ -244,7 +244,7 @@ class CTranslatorExprToDXL
 
 	CDXLNode *PdxlnWindow(CExpression *pexprSeqPrj, CColRefArray *colref_array,
 						  CDistributionSpecArray *pdrgpdsBaseTables,
-						  ULONG *pulNonGatherMotions, BOOL *pfDML);
+						  ULONG *pulNonGatherMotions, BOOL *pfDML, BOOL fWindowHashAgg);
 
 	CDXLNode *PdxlnNLJoin(CExpression *pexprNLJ, CColRefArray *colref_array,
 						  CDistributionSpecArray *pdrgpdsBaseTables,
@@ -313,6 +313,26 @@ class CTranslatorExprToDXL
 							CDistributionSpecArray *pdrgpdsBaseTables,
 							ULONG *pulNonGatherMotions, BOOL *pfDML);
 
+	// translate a dynamic seq/foreign scan to append
+	template <class PhysicalScanType>
+	CDXLNode *PdxlnDynamicScanToAppend(
+		CExpression *pexprDTS, CColRefArray *colref_array,
+		CDistributionSpecArray *pdrgpdsBaseTables, CExpression *pexprScalarCond,
+		CDXLPhysicalProperties *dxl_properties);
+	
+	// translate a dynamic index/index only scan to append
+	template <class PhysicalScanType>
+	CDXLNode *PdxlnDynamicIndexScanToAppend(CExpression *pexprDIS,
+		CColRefArray *colref_array,
+		CDXLPhysicalProperties *dxl_properties,
+		CReqdPropPlan *prpp);
+
+	// translate a dynamic bitmap scan to append
+	CDXLNode *PdxlnDynamicBitmapScanToAppend(
+		CExpression *pexprDTS, CColRefArray *colref_array,
+		CDistributionSpecArray *pdrgpdsBaseTables, CExpression *pexprScalarCond,
+		CDXLPhysicalProperties *dxl_properties);
+
 	// translate a dynamic table scan
 	CDXLNode *PdxlnDynamicTableScan(CExpression *pexprDTS,
 									CColRefArray *colref_array,
@@ -562,6 +582,16 @@ class CTranslatorExprToDXL
 									const CColRefArray *root_colrefs,
 									CExpression *pred);
 
+	CDXLNode *PdxlnBitmapIndexProbeForChildPart(
+		const ColRefToUlongMap *root_col_mapping,
+		const CColRefArray *part_colrefs, const CColRefArray *root_colrefs,
+		const IMDRelation *part, CExpression *pexprBitmapIndexProbe);
+								
+	CDXLNode *PdxlnBitmapIndexPathForChildPart(
+		const ColRefToUlongMap *root_col_mapping,
+		const CColRefArray *part_colrefs, const CColRefArray *root_colrefs,
+		const IMDRelation *part, CExpression *pexprBitmapIndexPath);
+
 	// translate a project list expression into a DXL proj list node
 	// according to the order specified in the dynamic array
 	CDXLNode *PdxlnProjList(const CExpression *pexprProjList,
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXform.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXform.h
index fc7a1c8c7e6..225371097c5 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXform.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXform.h
@@ -165,11 +165,13 @@ class CXform : public CRefCount, public DbgPrintMixin<CXform>
 		ExfPushGbWithHavingBelowJoin,
 		ExfPushGbBelowUnion,
 		ExfPushGbBelowUnionAll,
+		ExfPushPartialAggBelowJoin,
 		ExfSplitGbAgg,
 		ExfSplitGbAggDedup,
 		ExfSplitDQA,
 		ExfSequenceProject2Apply,
 		ExfImplementSequenceProject,
+		ExfImplementHashSequenceProject,
 		ExfImplementAssert,
 		ExfCTEAnchor2Sequence,
 		ExfCTEAnchor2TrivialSelect,
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementHashSequenceProject.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementHashSequenceProject.h
new file mode 100644
index 00000000000..1422a1bbaec
--- /dev/null
+++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementHashSequenceProject.h
@@ -0,0 +1,95 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * CXformImplementHashSequenceProject.h
+ *
+ * IDENTIFICATION
+ *	  src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementHashSequenceProject.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef GPOPT_CXformImplementHashSequenceProject_H
+#define GPOPT_CXformImplementHashSequenceProject_H
+
+#include "gpos/base.h"
+
+#include "gpopt/operators/CExpressionHandle.h"
+#include "gpopt/xforms/CXformImplementation.h"
+
+namespace gpopt
+{
+using namespace gpos;
+
+//---------------------------------------------------------------------------
+//	@class:
+//		CXformImplementHashSequenceProject
+//
+//	@doc:
+//		Transform Project to ComputeScalar
+//
+//---------------------------------------------------------------------------
+class CXformImplementHashSequenceProject : public CXformImplementation
+{
+private:
+public:
+	CXformImplementHashSequenceProject(
+		const CXformImplementHashSequenceProject &) = delete;
+
+	// ctor
+	explicit CXformImplementHashSequenceProject(CMemoryPool *mp);
+
+	// dtor
+	~CXformImplementHashSequenceProject() override = default;
+
+	// ident accessors
+	EXformId
+	Exfid() const override
+	{
+		return ExfImplementHashSequenceProject;
+	}
+
+	const CHAR *
+	SzId() const override
+	{
+		return "CXformImplementHashSequenceProject";
+	}
+
+	// compute xform promise for a given expression handle
+	EXformPromise
+	Exfp(CExpressionHandle &exprhdl) const override
+	{
+		if (exprhdl.DeriveHasSubquery(1))
+		{
+			return CXform::ExfpNone;
+		}
+
+		return CXform::ExfpHigh;
+	}
+
+	// actual transform
+	void Transform(CXformContext *, CXformResult *,
+				   CExpression *) const override;
+
+};	// class CXformImplementHashSequenceProject
+
+}  // namespace gpopt
+
+#endif	// !GPOPT_CXformImplementHashSequenceProject_H
+
+// EOF
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushPartialAggBelowJoin.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushPartialAggBelowJoin.h
new file mode 100644
index 00000000000..4c4d858c813
--- /dev/null
+++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushPartialAggBelowJoin.h
@@ -0,0 +1,97 @@
+//---------------------------------------------------------------------------
+//	Greenplum Database
+//	Copyright (C) 2012 EMC Corp.
+//
+//	@filename:
+//		CXformPushPartialAggBelowJoin.h
+//
+//	@doc:
+//		Push group by below join transform
+//---------------------------------------------------------------------------
+#ifndef GPOPT_CXformPushPartialAggBelowJoin_H
+#define GPOPT_CXformPushPartialAggBelowJoin_H
+
+#include <tuple>
+
+#include "gpos/base.h"
+
+#include "gpopt/xforms/CXformExploration.h"
+namespace gpopt
+{
+using namespace gpos;
+
+//---------------------------------------------------------------------------
+//	@class:
+//		CXformPushPartialAggBelowJoin
+//
+//	@doc:
+//		Push group by below join transform
+//
+//---------------------------------------------------------------------------
+class CXformPushPartialAggBelowJoin : public CXformExploration
+{
+private:
+	static BOOL FLocalGbAggAlreadyPushed(CExpression *pexprGlobalGb);
+
+	static std::pair<BOOL, BOOL> FCanPushLocalGbAggBelowJoin(
+		CMemoryPool *mp, CExpression *pexpr);
+
+	static CExpression *ExchangeGbkeyFromJoinKey(CMemoryPool *mp,
+												 CExpression *pexpr);
+	static CColRefSet *PcrsJoinKey(CMemoryPool *mp, CExpression *pexprOuter,
+								   CExpression *pexprInner,
+								   CExpression *pexprScalar);
+
+	static CExpression *PushLocalGbAggBelowJoin(CMemoryPool *mp,
+												CExpression *pexprGlobalGb);
+
+	static CColRefSet *PexprGetGbAggkey(CMemoryPool *mp,
+										CExpression *pexprGbAgg);
+
+public:
+	CXformPushPartialAggBelowJoin(const CXformPushPartialAggBelowJoin &) =
+		delete;
+
+	// ctor
+	explicit CXformPushPartialAggBelowJoin(CMemoryPool *mp);
+
+	// ctor
+	explicit CXformPushPartialAggBelowJoin(CExpression *pexprPattern);
+
+	// dtor
+	~CXformPushPartialAggBelowJoin() override = default;
+
+	// ident accessors
+	EXformId
+	Exfid() const override
+	{
+		return ExfPushPartialAggBelowJoin;
+	}
+
+	const CHAR *
+	SzId() const override
+	{
+		return "CXformPushPartialAggBelowJoin";
+	}
+
+	// Compatibility function
+	BOOL
+	FCompatible(CXform::EXformId exfid) override
+	{
+		return (CXform::ExfPushPartialAggBelowJoin != exfid);
+	}
+
+	// compute xform promise for a given expression handle
+	EXformPromise Exfp(CExpressionHandle &exprhdl) const override;
+
+	// actual transform
+	void Transform(CXformContext *pxfctxt, CXformResult *pxfres,
+				   CExpression *pexpr) const override;
+
+};	// class CXformPushPartialAggBelowJoin
+
+}  // namespace gpopt
+
+#endif	// !GPOPT_CXformPushPartialAggBelowJoin_H
+
+// EOF
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h
index 9a62c9a5d4f..4c7512b6e41 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h
@@ -117,7 +117,8 @@ class CXformSplitDQA : public CXformExploration
 	FCompatible(CXform::EXformId exfid) override
 	{
 		return (CXform::ExfSplitDQA != exfid) &&
-			   (CXform::ExfSplitGbAgg != exfid);
+			   (CXform::ExfSplitGbAgg != exfid) &&
+			   (CXform::ExfPushPartialAggBelowJoin != exfid);
 	}
 
 	// compute xform promise for a given expression handle
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h
index 65651204184..6494cfc992a 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h
@@ -82,10 +82,6 @@ class CXformUtils
 													CTableDescriptor *ptabdesc,
 													CColRefArray *colref_array);
 
-	// helper for extracting foreign key
-	static CColRefSet *PcrsFKey(CMemoryPool *mp, CExpressionArray *pdrgpexpr,
-								CColRefSet *prcsOutput, CColRefSet *pcrsKey);
-
 	// return the set of columns from the given array of columns which appear
 	// in the index included / key columns
 	static CColRefSet *PcrsIndexColumns(CMemoryPool *mp,
@@ -172,13 +168,6 @@ class CXformUtils
 													CColRefSet *prcsOutput,
 													CColRefSet *pcrsGrpCols);
 
-	// check if the preconditions for pushing down Group by through join are satisfied
-	static BOOL FCanPushGbAggBelowJoin(CColRefSet *pcrsGrpCols,
-									   CColRefSet *pcrsJoinOuterChildOutput,
-									   CColRefSet *pcrsJoinScalarUsedFromOuter,
-									   CColRefSet *pcrsGrpByOutput,
-									   CColRefSet *pcrsGrpByUsed,
-									   CColRefSet *pcrsFKey);
 	// create a dynamic operator for a btree index plan
 	template <class T>
 	static CLogical *
@@ -295,11 +284,23 @@ class CXformUtils
 	static CXform::EXformPromise ExfpExpandJoinOrder(CExpressionHandle &exprhdl,
 													 const CXform *xform);
 
+	// extract foreign key
+	static CColRefSet *PcrsFKey(CMemoryPool *mp, CExpressionArray *pdrgpexpr,
+								CColRefSet *prcsOutput, CColRefSet *pcrsKey);
+
 	// extract foreign key
 	static CColRefSet *PcrsFKey(CMemoryPool *mp, CExpression *pexprOuter,
 								CExpression *pexprInner,
 								CExpression *pexprScalar);
 
+	// check if the preconditions for pushing down Group by through join are satisfied
+	static BOOL FCanPushGbAggBelowJoin(CColRefSet *pcrsGrpCols,
+									   CColRefSet *pcrsJoinOuterChildOutput,
+									   CColRefSet *pcrsJoinScalarUsedFromOuter,
+									   CColRefSet *pcrsGrpByOutput,
+									   CColRefSet *pcrsGrpByUsed,
+									   CColRefSet *pcrsFKey);
+
 	// compute a swap of the two given joins
 	static CExpression *PexprSwapJoins(CMemoryPool *mp,
 									   CExpression *pexprTopJoin,
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/xforms.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/xforms.h
index 25e724c2128..fb5ba6b1e3c 100644
--- a/src/backend/gporca/libgpopt/include/gpopt/xforms/xforms.h
+++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/xforms.h
@@ -71,6 +71,7 @@
 #include "gpopt/xforms/CXformImplementLimit.h"
 #include "gpopt/xforms/CXformImplementSequence.h"
 #include "gpopt/xforms/CXformImplementSequenceProject.h"
+#include "gpopt/xforms/CXformImplementHashSequenceProject.h"
 #include "gpopt/xforms/CXformImplementSplit.h"
 #include "gpopt/xforms/CXformImplementTVF.h"
 #include "gpopt/xforms/CXformImplementTVFNoArgs.h"
@@ -131,6 +132,7 @@
 #include "gpopt/xforms/CXformPushGbBelowJoin.h"
 #include "gpopt/xforms/CXformPushGbBelowUnion.h"
 #include "gpopt/xforms/CXformPushGbBelowUnionAll.h"
+#include "gpopt/xforms/CXformPushPartialAggBelowJoin.h"
 #include "gpopt/xforms/CXformPushGbDedupBelowJoin.h"
 #include "gpopt/xforms/CXformPushGbWithHavingBelowJoin.h"
 #include "gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h"
diff --git a/src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp b/src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp
index be82b7882d6..b6423c0073f 100644
--- a/src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp
@@ -35,6 +35,7 @@ CCTEInfo::CCTEInfoEntry::CCTEInfoEntry(CMemoryPool *mp,
 									   CExpression *pexprCTEProducer)
 	: m_mp(mp),
 	  m_pexprCTEProducer(pexprCTEProducer),
+	  m_pexprCTEConsumer(nullptr),
 	  m_phmcrulConsumers(nullptr),
 	  m_fUsed(true),
 	  m_hasOuterReferences(false)
@@ -42,6 +43,7 @@ CCTEInfo::CCTEInfoEntry::CCTEInfoEntry(CMemoryPool *mp,
 	GPOS_ASSERT(nullptr != mp);
 	GPOS_ASSERT(nullptr != pexprCTEProducer);
 
+	m_pexprCTEConsumer = GPOS_NEW(mp) CExpressionArray(mp);
 	m_phmcrulConsumers = GPOS_NEW(mp) ColRefToUlongMap(mp);
 }
 
@@ -59,6 +61,7 @@ CCTEInfo::CCTEInfoEntry::CCTEInfoEntry(CMemoryPool *mp,
 									   BOOL fUsed)
 	: m_mp(mp),
 	  m_pexprCTEProducer(pexprCTEProducer),
+	  m_pexprCTEConsumer(nullptr),
 	  m_phmcrulConsumers(nullptr),
 	  m_fUsed(fUsed),
 	  m_hasOuterReferences(false)
@@ -66,6 +69,7 @@ CCTEInfo::CCTEInfoEntry::CCTEInfoEntry(CMemoryPool *mp,
 	GPOS_ASSERT(nullptr != mp);
 	GPOS_ASSERT(nullptr != pexprCTEProducer);
 
+	m_pexprCTEConsumer = GPOS_NEW(mp) CExpressionArray(mp);
 	m_phmcrulConsumers = GPOS_NEW(mp) ColRefToUlongMap(mp);
 }
 
@@ -81,10 +85,26 @@ CCTEInfo::CCTEInfoEntry::CCTEInfoEntry(CMemoryPool *mp,
 CCTEInfo::CCTEInfoEntry::~CCTEInfoEntry()
 {
 	m_pexprCTEProducer->Release();
+	m_pexprCTEConsumer->Release();
 	m_phmcrulConsumers->Release();
 }
 
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CCTEInfo::CCTEInfoEntry::AddConsumerCols
+//
+//	@doc:
+//		Add given consumer to the consumers array
+//
+//---------------------------------------------------------------------------
+void CCTEInfo::CCTEInfoEntry::AddConsumer(CExpression * consumer)
+{
+	GPOS_ASSERT(consumer->Pop() && consumer->Pop()->Eopid() 
+		== COperator::EopLogicalCTEConsumer);
+	m_pexprCTEConsumer->Append(consumer);
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CCTEInfo::CCTEInfoEntry::AddConsumerCols
@@ -164,11 +184,16 @@ CCTEInfo::CCTEInfo(CMemoryPool *mp)
 	: m_mp(mp),
 	  m_phmulcteinfoentry(nullptr),
 	  m_ulNextCTEId(0),
-	  m_fEnableInlining(true)
+	  m_fEnableInlining(true),
+	  m_phmulprodconsmap(nullptr),
+	  m_phmcidcrCTE(nullptr),
+	  m_phmpidcrsCTE(nullptr)
 {
 	GPOS_ASSERT(nullptr != mp);
 	m_phmulcteinfoentry = GPOS_NEW(m_mp) UlongToCTEInfoEntryMap(m_mp);
 	m_phmulprodconsmap = GPOS_NEW(m_mp) UlongToProducerConsumerMap(m_mp);
+	m_phmcidcrCTE = GPOS_NEW(m_mp) UlongToColRefMap(m_mp);
+	m_phmpidcrsCTE = GPOS_NEW(m_mp) UlongToColRefArrayMap(m_mp);
 }
 
 //---------------------------------------------------------------------------
@@ -183,6 +208,8 @@ CCTEInfo::~CCTEInfo()
 {
 	CRefCount::SafeRelease(m_phmulcteinfoentry);
 	CRefCount::SafeRelease(m_phmulprodconsmap);
+	CRefCount::SafeRelease(m_phmcidcrCTE);
+	CRefCount::SafeRelease(m_phmpidcrsCTE);
 }
 
 
@@ -246,6 +273,27 @@ CCTEInfo::AddCTEProducer(CExpression *pexprCTEProducer)
 	GPOS_ASSERT(fInserted);
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CCTEInfo::AddCTEProducer
+//
+//	@doc:
+//		Add CTE producer to hashmap
+//
+//---------------------------------------------------------------------------
+void
+CCTEInfo::AddCTEConsumer(CExpression *pexprCTEConsumer)
+{
+	COperator *pop = pexprCTEConsumer->Pop();
+	ULONG ulCTEId = CLogicalCTEConsumer::PopConvert(pop)->UlCTEId();
+
+	CCTEInfoEntry *infoentry = m_phmulcteinfoentry->Find(&ulCTEId);
+	// must exist
+	GPOS_ASSERT(infoentry);
+	pexprCTEConsumer->AddRef();
+	infoentry->AddConsumer(pexprCTEConsumer);
+}
+
 
 //---------------------------------------------------------------------------
 //	@function:
@@ -265,7 +313,7 @@ CCTEInfo::ReplaceCTEProducer(CExpression *pexprCTEProducer)
 	GPOS_ASSERT(nullptr != pcteinfoentry);
 
 #ifdef GPOS_DBUG
-	CExpression *pexprCTEProducerOld = pcteinfoentry->Pexpr();
+	CExpression *pexprCTEProducerOld = pcteinfoentry->PexprProducer();
 	COperator *popCTEProducerOld = pexprCTEProducerOld->Pop();
 	GPOS_ASSERT(ulCTEId ==
 				CLogicalCTEProducer::PopConvert(popCTEProducerOld)->UlCTEId());
@@ -321,7 +369,7 @@ CCTEInfo::DeriveProducerStats(CLogicalCTEConsumer *popConsumer,
 	CCTEInfoEntry *pcteinfoentry = m_phmulcteinfoentry->Find(&ulCTEId);
 	GPOS_ASSERT(nullptr != pcteinfoentry);
 
-	CExpression *pexprCTEProducer = pcteinfoentry->Pexpr();
+	CExpression *pexprCTEProducer = pcteinfoentry->PexprProducer();
 
 	// Given the subset of CTE consumer columns needed for statistics derivation,
 	// compute its corresponding set of columns in the CTE Producer
@@ -351,7 +399,17 @@ CCTEInfo::PexprCTEProducer(ULONG ulCTEId) const
 	const CCTEInfoEntry *pcteinfoentry = m_phmulcteinfoentry->Find(&ulCTEId);
 	GPOS_ASSERT(nullptr != pcteinfoentry);
 
-	return pcteinfoentry->Pexpr();
+	return pcteinfoentry->PexprProducer();
+}
+
+// logical cte consumer with given id
+CExpressionArray *
+CCTEInfo::PexprCTEConsumer(ULONG ulCTEId) const
+{
+	const CCTEInfoEntry *pcteinfoentry = m_phmulcteinfoentry->Find(&ulCTEId);
+	GPOS_ASSERT(nullptr != pcteinfoentry);
+
+	return pcteinfoentry->PexprsConsumer();
 }
 
 
@@ -544,7 +602,7 @@ CCTEInfo::PdrgPexpr(CMemoryPool *mp) const
 	UlongToCTEInfoEntryMapIter hmulei(m_phmulcteinfoentry);
 	while (hmulei.Advance())
 	{
-		CExpression *pexpr = hmulei.Value()->Pexpr();
+		CExpression *pexpr = hmulei.Value()->PexprProducer();
 		pexpr->AddRef();
 		pdrgpexpr->Append(pexpr);
 	}
@@ -568,7 +626,7 @@ CCTEInfo::MapComputedToUsedCols(CColumnFactory *col_factory) const
 	UlongToCTEInfoEntryMapIter hmulei(m_phmulcteinfoentry);
 	while (hmulei.Advance())
 	{
-		CExpression *pexprProducer = hmulei.Value()->Pexpr();
+		CExpression *pexprProducer = hmulei.Value()->PexprProducer();
 		GPOS_ASSERT(nullptr != pexprProducer);
 		CQueryContext::MapComputedToUsedCols(col_factory, pexprProducer);
 	}
@@ -714,8 +772,9 @@ CCTEInfo::MarkUnusedCTEs()
 UlongToColRefMap *
 CCTEInfo::PhmulcrConsumerToProducer(
 	CMemoryPool *mp, ULONG ulCTEId,
-	CColRefSet *pcrs,			   // set of columns to check
-	CColRefArray *pdrgpcrProducer  // producer columns
+	CColRefSet *pcrs,			    // set of columns to check
+	CColRefArray *pdrgpcrProducer,  // producer columns
+	ULongPtrArray *pdrgpcrUnusedProducer // producer unused columns
 )
 {
 	GPOS_ASSERT(nullptr != pcrs);
@@ -727,13 +786,23 @@ CCTEInfo::PhmulcrConsumerToProducer(
 	while (crsi.Advance())
 	{
 		CColRef *colref = crsi.Pcr();
+		// pruned colref no need do the mapping
+		if (colref->GetUsage(true, true) != CColRef::EUsed) {
+			continue;
+		}
 		ULONG ulPos = UlConsumerColPos(ulCTEId, colref);
 
 		if (gpos::ulong_max != ulPos)
 		{
-			GPOS_ASSERT(ulPos < pdrgpcrProducer->Size());
-
-			CColRef *pcrProducer = (*pdrgpcrProducer)[ulPos];
+			ULONG remapUlPos = ulPos;
+			if (pdrgpcrUnusedProducer) {
+				GPOS_ASSERT(ulPos < pdrgpcrUnusedProducer->Size());
+				remapUlPos = ulPos - *(*pdrgpcrUnusedProducer)[ulPos];
+				GPOS_ASSERT(remapUlPos < pdrgpcrProducer->Size());
+			}
+
+			CColRef *pcrProducer = (*pdrgpcrProducer)[remapUlPos];
+			pcrProducer->MarkAsUsed();
 			BOOL fSuccess GPOS_ASSERTS_ONLY = colref_mapping->Insert(
 				GPOS_NEW(mp) ULONG(colref->Id()), pcrProducer);
 			GPOS_ASSERT(fSuccess);
diff --git a/src/backend/gporca/libgpopt/src/base/CColRef.cpp b/src/backend/gporca/libgpopt/src/base/CColRef.cpp
index 7cf0e2299ea..32a923cf890 100644
--- a/src/backend/gporca/libgpopt/src/base/CColRef.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CColRef.cpp
@@ -107,11 +107,25 @@ IOstream &
 CColRef::OsPrint(IOstream &os) const
 {
 	m_pname->OsPrint(os);
-	os << " (" << Id() << ")";
+	os << " (" << Id() << "," << UsedStatusToString(m_used) << ")";
 
 	return os;
 }
 
+const char* 
+CColRef::UsedStatusToString(CColRef::EUsedStatus status) const {
+	switch (status) {
+		case EUsed: return "Used";
+		case EUnused: return "Unused";
+		case EUnknown: return "Unknown";
+		case ESentinel: return "Invalid";
+		default: 
+			return "Invalid";
+	}
+
+	return "Invalid";
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CColRef::Pdrgpul
diff --git a/src/backend/gporca/libgpopt/src/base/CColRefSet.cpp b/src/backend/gporca/libgpopt/src/base/CColRefSet.cpp
index 09459441e5c..0555a7f2efd 100644
--- a/src/backend/gporca/libgpopt/src/base/CColRefSet.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CColRefSet.cpp
@@ -403,6 +403,33 @@ CColRefSet::ExtractColIds(CMemoryPool *mp, ULongPtrArray *colids) const
 	}
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CColRefSet::ExtractColIds
+//
+//	@doc:
+//		extract the index(relative position) in current CColRefSet
+//		notice that: Whenever the current CColRefSet changes, the index will also change.
+//
+//---------------------------------------------------------------------------
+void
+CColRefSet::ExtractIndex(const CColRef *querycr, ULONG *colidx) const
+{
+	GPOS_ASSERT(nullptr != querycr);
+	GPOS_ASSERT(FMember(querycr));
+	*colidx = 0;
+	CColRefSetIter crsi(*this);
+	while (crsi.Advance())
+	{
+		CColRef *colref = crsi.Pcr();
+		if (colref == querycr) {
+			return;
+		}
+		*colidx += 1;
+	}
+	*colidx = gpos::ulong_max;
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CColRefSet::FContained
diff --git a/src/backend/gporca/libgpopt/src/base/CCostContext.cpp b/src/backend/gporca/libgpopt/src/base/CCostContext.cpp
index d5bcf38df70..2d69d1d7072 100644
--- a/src/backend/gporca/libgpopt/src/base/CCostContext.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CCostContext.cpp
@@ -751,7 +751,9 @@ CCostContext::DRowsPerHost() const
 		CStatisticsConfig *stats_config =
 			poptctxt->GetOptimizerConfig()->GetStatsConf();
 		CDouble dNDVs = CStatisticsUtils::Groups(m_mp, Pstats(), stats_config,
-												 pdrgpul, nullptr /*keys*/);
+												 pdrgpul, nullptr /*keys*/, 
+												 false /* is_partial, current distinct key is the distribution key */ 
+												 );
 		pdrgpul->Release();
 
 		if (dNDVs < ulHosts)
diff --git a/src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp b/src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp
index 7b141e767bc..0fe4481953d 100644
--- a/src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp
@@ -42,7 +42,13 @@ CDatumSortedSet::CDatumSortedSet(CMemoryPool *mp, CExpression *pexprArray,
 	{
 		return;
 	}
-	aprngdatum->Sort(&CUtils::IDatumCmp);
+	// Only sort if not already sorted - IsSorted is O(n-1) comparisons,
+	// while Sort is O(n log n), so this optimization helps when data
+	// is already sorted (common case for IN lists in queries)
+	if (!aprngdatum->IsSorted(&CUtils::IDatumCmp))
+	{
+		aprngdatum->Sort(&CUtils::IDatumCmp);
+	}
 
 	// de-duplicate
 	const ULONG ulRangeArrayArity = aprngdatum->Size();
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp b/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp
index 7636b0d74d4..0adf07022d8 100644
--- a/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp
@@ -858,9 +858,16 @@ CDistributionSpecHashed::OsPrint(IOstream &os) const
 	return OsPrintWithPrefix(os, "");
 }
 
+IOstream &
+CDistributionSpecHashed::OsPrintNoWrap(IOstream &os) const
+{
+	return OsPrintWithPrefix(os, "", false);
+}
+
 IOstream &
 CDistributionSpecHashed::OsPrintWithPrefix(IOstream &os,
-										   const char *prefix) const
+										   const char *prefix,
+										   BOOL wrap) const
 {
 	os << this->SzId() << ": [ ";
 	const ULONG length = m_pdrgpexpr->Size();
@@ -876,7 +883,7 @@ CDistributionSpecHashed::OsPrintWithPrefix(IOstream &os,
 		}
 		else
 		{
-			os << *(hash_expr);
+			hash_expr->OsPrint(os);
 			// the expression added a newline, indent the following with the prefix
 			os << prefix;
 		}
@@ -912,7 +919,8 @@ CDistributionSpecHashed::OsPrintWithPrefix(IOstream &os,
 	if (nullptr != m_equiv_hash_exprs && m_equiv_hash_exprs->Size() > 0 &&
 		GPOS_FTRACE(EopttracePrintEquivDistrSpecs))
 	{
-		os << "," << std::endl;
+		os << ",";
+		if (wrap) os << std::endl;
 		for (ULONG ul = 0; ul < m_equiv_hash_exprs->Size(); ul++)
 		{
 			CExpressionArray *equiv_distribution_exprs =
diff --git a/src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp b/src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp
index 954dd96a8c1..c718a1c50f9 100644
--- a/src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp
+++ b/src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp
@@ -415,7 +415,7 @@ COptimizationContext::PrppCTEProducer(CMemoryPool *mp,
 	UlongToColRefMap *colref_mapping =
 		COptCtxt::PoctxtFromTLS()->Pcteinfo()->PhmulcrConsumerToProducer(
 			mp, popProducer->UlCTEId(), pcrsInnerOutput,
-			popProducer->Pdrgpcr());
+			popProducer->Pdrgpcr(), popProducer->PdrgpcrUnused());
 	CReqdPropPlan *prppProducer = CReqdPropPlan::PrppRemapForCTE(
 		mp, pocProducer->Prpp(), pccProducer->Pdpplan(), pccConsumer->Pdpplan(),
 		colref_mapping);
diff --git a/src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp b/src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp
index f0cfa78c6a5..177d409a2de 100644
--- a/src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp
@@ -422,15 +422,13 @@ CReqdPropPlan::PrppEmpty(CMemoryPool *mp)
 IOstream &
 CReqdPropPlan::OsPrint(IOstream &os) const
 {
-	if (GPOS_FTRACE(EopttracePrintRequiredColumns))
+
+	os << "req cols: [";
+	if (nullptr != m_pcrs)
 	{
-		os << "req cols: [";
-		if (nullptr != m_pcrs)
-		{
-			os << (*m_pcrs);
-		}
-		os << "], ";
+		os << (*m_pcrs);
 	}
+	os << "], ";
 
 	os << "req CTEs: [";
 	if (nullptr != m_pcter)
diff --git a/src/backend/gporca/libgpopt/src/base/CUtils.cpp b/src/backend/gporca/libgpopt/src/base/CUtils.cpp
index e41a04c5782..b5f847b817a 100644
--- a/src/backend/gporca/libgpopt/src/base/CUtils.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CUtils.cpp
@@ -3657,7 +3657,9 @@ CUtils::PdrgpcrExactCopy(CMemoryPool *mp, CColRefArray *colref_array)
 // from old to copied variables are added to it.
 CColRefArray *
 CUtils::PdrgpcrCopy(CMemoryPool *mp, CColRefArray *colref_array,
-					BOOL fAllComputed, UlongToColRefMap *colref_mapping)
+					BOOL fAllComputed, UlongToColRefMap *colref_mapping,
+					UlongToColRefMap *consumer_mapping, UlongToColRefArrayMap *producer_mapping,
+					 BOOL check_usage)
 {
 	// get column factory from optimizer context object
 	CColumnFactory *col_factory = COptCtxt::PoctxtFromTLS()->Pcf();
@@ -3678,13 +3680,63 @@ CUtils::PdrgpcrCopy(CMemoryPool *mp, CColRefArray *colref_array,
 			new_colref = col_factory->PcrCopy(colref);
 		}
 
+		if (check_usage) {
+			CColRef::EUsedStatus colref_status = colref->GetUsage(true, true);
+			switch(colref_status) {
+				case CColRef::EUsedStatus::EUsed:
+				{
+					new_colref->MarkAsUsed();
+					break;
+				}
+				case CColRef::EUsedStatus::EUnused:
+				{
+					new_colref->MarkAsUnused();
+					break;
+				}
+				case CColRef::EUsedStatus::EUnknown:
+				{
+					new_colref->MarkAsUnknown();
+					break;
+				}
+				default:
+					GPOS_ASSERT(false);
+			}
+		}
+
 		pdrgpcrNew->Append(new_colref);
+
 		if (nullptr != colref_mapping)
 		{
 			BOOL fInserted GPOS_ASSERTS_ONLY = colref_mapping->Insert(
 				GPOS_NEW(mp) ULONG(colref->Id()), new_colref);
 			GPOS_ASSERT(fInserted);
 		}
+
+		if (nullptr != consumer_mapping) {
+			BOOL fInserted GPOS_ASSERTS_ONLY = consumer_mapping->Insert(
+				GPOS_NEW(mp) ULONG(new_colref->Id()), colref);
+			GPOS_ASSERT(fInserted);
+		}
+
+		if (nullptr != producer_mapping) {
+			ULONG *producer_cid = GPOS_NEW(mp) ULONG(colref->Id());
+
+			const CColRefArray *crarray = producer_mapping->Find(producer_cid);
+			if (nullptr == crarray)
+			{
+				CColRefArray *crarray_new = GPOS_NEW(mp) CColRefArray(mp);
+				crarray_new->Append(new_colref);
+
+				BOOL fInserted GPOS_ASSERTS_ONLY =
+					producer_mapping->Insert(producer_cid, crarray_new);
+				GPOS_ASSERT(fInserted);
+			}
+			else
+			{
+				(const_cast<CColRefArray *>(crarray))
+					->Append(new_colref);
+			}
+		}
 	}
 
 	return pdrgpcrNew;
diff --git a/src/backend/gporca/libgpopt/src/base/CWindowOids.cpp b/src/backend/gporca/libgpopt/src/base/CWindowOids.cpp
index da744a018d9..e2f326d3aaf 100644
--- a/src/backend/gporca/libgpopt/src/base/CWindowOids.cpp
+++ b/src/backend/gporca/libgpopt/src/base/CWindowOids.cpp
@@ -18,6 +18,13 @@ CWindowOids::CWindowOids(CMemoryPool *mp, OID row_number_oid, OID rank_oid,
 	m_MDDenseRank = GPOS_NEW(mp) CMDIdGPDB(IMDId::EmdidGeneral, m_oidDenseRank);
 }
 
+CWindowOids::~CWindowOids()
+{
+	CRefCount::SafeRelease(m_MDIdRowNumber);
+	CRefCount::SafeRelease(m_MDIdRank);
+	CRefCount::SafeRelease(m_MDDenseRank);
+}
+
 OID
 CWindowOids::OidRowNumber() const
 {
diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp b/src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp
index e8c7fa1b19f..78a33f93676 100644
--- a/src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp
+++ b/src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp
@@ -1192,10 +1192,12 @@ CMDAccessor::GetHistogram(CMemoryPool *mp, IMDId *mdid_type,
 	CDouble null_freq = pmdcolstats->GetNullFreq();
 	CDouble distinct_remaining = pmdcolstats->GetDistinctRemain();
 	CDouble freq_remaining = pmdcolstats->GetFreqRemain();
+	CDouble distinct_by_segs = pmdcolstats->GetDistinctBySegs();
 
 	CHistogram *histogram = GPOS_NEW(mp)
 		CHistogram(mp, buckets, true /*is_well_defined*/, null_freq,
-				   distinct_remaining, freq_remaining, is_col_stats_missing);
+				   distinct_remaining, freq_remaining, distinct_by_segs,
+				   is_col_stats_missing);
 	GPOS_ASSERT_IMP(fBoolType,
 					3 >= histogram->GetNumDistinct() - CStatistics::Epsilon);
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CDedupSupersetPreprocessor.cpp b/src/backend/gporca/libgpopt/src/operators/CDedupSupersetPreprocessor.cpp
new file mode 100644
index 00000000000..a0678af79ab
--- /dev/null
+++ b/src/backend/gporca/libgpopt/src/operators/CDedupSupersetPreprocessor.cpp
@@ -0,0 +1,551 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * CDedupSupersetPreprocessor.cpp
+ *
+ * IDENTIFICATION
+ *	  src/backend/gporca/libgpopt/src/operators/CDedupSupersetPreprocessor.cpp
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "gpopt/operators/CDedupSupersetPreprocessor.h"
+
+#include <limits>
+
+#include "gpopt/operators/CExpression.h"
+#include "gpopt/operators/CLogicalCTEAnchor.h"
+#include "gpopt/operators/CLogicalCTEConsumer.h"
+#include "gpopt/operators/CLogicalCTEProducer.h"
+#include "gpopt/operators/CLogicalDynamicGet.h"
+#include "gpopt/operators/CLogicalGet.h"
+#include "gpopt/operators/CLogicalInnerJoin.h"
+#include "gpopt/operators/CLogicalNAryJoin.h"
+#include "gpopt/operators/CScalarCmp.h"
+#include "gpopt/operators/CScalarIdent.h"
+#include "gpopt/operators/CScalarSubqueryAny.h"
+#include "gpopt/optimizer/COptimizerConfig.h"
+
+using namespace gpopt;
+
+#define CTEID_TO_OID_START 60000
+
+TableDescIdent::TableDescIdent(IMDId *mdid, ULONG sid, ULONG output_colid)
+	: pmdid(mdid), subid(sid), ocolid(output_colid)
+{
+	GPOS_ASSERT(nullptr != mdid);
+}
+
+TableDescIdent::~TableDescIdent()
+{
+	pmdid->Release();
+}
+
+ULONG
+TableDescIdent::HashFunc(const TableDescIdent *ptdi)
+{
+	GPOS_ASSERT(nullptr != ptdi);
+
+	return gpos::CombineHashes(
+		ptdi->pmdid->HashValue(),
+		gpos::CombineHashes(gpos::HashValue(&ptdi->subid),
+							gpos::HashValue(&ptdi->ocolid)));
+}
+
+// equality function
+BOOL
+TableDescIdent::EqualFunc(const TableDescIdent *pltdi,
+						  const TableDescIdent *prtdi)
+{
+	GPOS_ASSERT(nullptr != pltdi && nullptr != prtdi);
+	return pltdi->pmdid->Equals(prtdi->pmdid) && pltdi->subid == prtdi->subid &&
+		   pltdi->ocolid == prtdi->ocolid;
+}
+
+
+// expr is CLogicalGet,CLogicalDynamicGet or CLogicalCTEConsumer ?
+BOOL
+CDedupSupersetPreprocessor::PexprIsLogicalOutput(CExpression *pexpr)
+{
+	GPOS_ASSERT(pexpr);
+	COperator *pop = pexpr->Pop();
+	return pop->Eopid() == COperator::EopLogicalGet ||
+		   pop->Eopid() == COperator::EopLogicalDynamicGet ||
+		   pop->Eopid() == COperator::EopLogicalCTEConsumer;
+}
+
+// Get the meta id from expression
+// The expression must be CLogicalGet/CLogicalDynamicGet/CLogicalCTEConsumer
+// for the CLogicalGet/CLogicalDynamicGet, we can direct get the meta id by table desc.
+// But for the CLogicalCTEConsumer, we will create a meta id from CTEid
+IMDId *
+CDedupSupersetPreprocessor::PexprGetIMDid(CMemoryPool *mp, CExpression *pexpr)
+{
+	GPOS_ASSERT(pexpr);
+	COperator *poper = pexpr->Pop();
+	IMDId *pmdid = nullptr;
+	switch (poper->Eopid())
+	{
+		case COperator::EopLogicalGet:
+		{
+			CLogicalGet *pop_get = CLogicalGet::PopConvert(poper);
+			if (pop_get->Ptabdesc())
+			{
+				pmdid = pop_get->Ptabdesc()->MDId()->Copy(mp);
+			}
+			break;
+		}
+		case COperator::EopLogicalDynamicGet:
+		{
+			CLogicalDynamicGet *pop_dynamicget =
+				CLogicalDynamicGet::PopConvert(poper);
+			if (pop_dynamicget->Ptabdesc())
+			{
+				pmdid = pop_dynamicget->Ptabdesc()->MDId()->Copy(mp);
+			}
+			break;
+		}
+		case COperator::EopLogicalCTEConsumer:
+		{
+			CLogicalCTEConsumer *pop_cc =
+				CLogicalCTEConsumer::PopConvert(poper);
+			pmdid = GPOS_NEW(mp) CMDIdGPDB(
+				IMDId::EmdidGeneral, pop_cc->UlCTEId() + CTEID_TO_OID_START);
+			break;
+		}
+		default:
+			break;
+	}
+
+	return pmdid;
+}
+
+// full the maps with superset expression
+void
+CDedupSupersetPreprocessor::ChildExprFullSuperset(CMemoryPool *mp,
+												  CExpression *pexpr,
+												  TDIToUlongPtrMap *eqcrmaps,
+												  BOOL *dedupulmasks, ULONG ul)
+{
+	CScalarSubqueryAny *pop_subany =
+		CScalarSubqueryAny::PopConvert(pexpr->Pop());
+	CExpression *pexpr_child0 = (*pexpr)[0];
+	IMDId *tdimid = PexprGetIMDid(mp, pexpr_child0);
+	CScalarIdent *pop_ident = CScalarIdent::PopConvert((*pexpr)[1]->Pop());
+	ULONG ulidx_subany;
+
+	if (nullptr == tdimid)
+	{
+		// skip
+		return;
+	}
+	CColRefSet *colrefsets = pexpr_child0->DeriveOutputColumns();
+
+	// The colref(in CScalarSubqueryAny) must in the output
+	(void) colrefsets->ExtractIndex(pop_subany->Pcr(), &ulidx_subany);
+	GPOS_ASSERT(ulidx_subany != gpos::ulong_max);
+
+	TableDescIdent tdikey =
+		TableDescIdent(tdimid, ulidx_subany, pop_ident->Pcr()->Id());
+	ULONG *pul = eqcrmaps->Find(&tdikey);
+	if (!pul)
+	{
+		// new find superset, register it
+		eqcrmaps->Insert(GPOS_NEW(mp) TableDescIdent(tdimid, ulidx_subany,
+													 pop_ident->Pcr()->Id()),
+						 GPOS_NEW(mp) ULONG(ul));
+	}
+	else
+	{
+		// already register the same superset expr, direct remove it
+		//
+		// ex.
+		//   select * from t1,t2 where
+		//   t1.v1 in (select v3 from t2)  <- colref(v3)
+		//   and
+		//   t1.v1 in (select v3 from t2); <- same colref(v3) but id is different
+		dedupulmasks[ul] = false;
+	}
+}
+
+// full the dedups array with subset(simply logicalget)
+void
+CDedupSupersetPreprocessor::ChildExprFullSimplySubset(
+	CMemoryPool *mp, CExpression *pexpr, TDIToUlongPtrMap *eqcrmaps,
+	BOOL *dedupulmasks)
+{
+	CScalarSubqueryAny *pop_subany =
+		CScalarSubqueryAny::PopConvert(pexpr->Pop());
+	CExpression *pexpr_subchild0 = (*(*pexpr)[0])[0];
+	IMDId *tdimid = PexprGetIMDid(mp, pexpr_subchild0);
+	CScalarIdent *pop_ident = CScalarIdent::PopConvert((*pexpr)[1]->Pop());
+	ULONG ulidx_subany;
+	GPOS_ASSERT(PexprIsLogicalOutput(pexpr_subchild0));
+
+	if (nullptr == tdimid)
+	{
+		// skip current subset
+		return;
+	}
+
+	CColRefSet *colrefsets = pexpr_subchild0->DeriveOutputColumns();
+	// The colref(in CScalarSubqueryAny) must in the output
+	(void) colrefsets->ExtractIndex(pop_subany->Pcr(), &ulidx_subany);
+	GPOS_ASSERT(ulidx_subany != gpos::ulong_max);
+
+	TableDescIdent tdikey =
+		TableDescIdent(tdimid, ulidx_subany, pop_ident->Pcr()->Id());
+	ULONG *pul = eqcrmaps->Find(&tdikey);
+	if (pul)
+	{
+		// remove the expression in ul
+		dedupulmasks[*pul] = false;
+	}
+}
+
+// Extract the sub child from the join(inner join) expr
+//
+// 	|--CLogicalNAryJoin
+//     |  |--CLogicalGet "t2" || CLogicalDynamicGet "t2" || CLogicalCTEConsumer (0) <- extract the expression if colref belong child0
+//     |  |--CLogicalGet "t3" || CLogicalDynamicGet "t3" || CLogicalCTEConsumer (1) <- extract the expression if colref belong child1
+//     |  +--Scalar
+CExpression *
+CDedupSupersetPreprocessor::PexprExtractSubChildJoinExpr(
+	CExpression *pexpr, const CColRef *subany_col)
+{
+	GPOS_ASSERT(pexpr);
+	COperator *poper = pexpr->Pop();
+	CExpression *child_pexpr = nullptr;
+
+	if (poper->Eopid() == COperator::EopLogicalNAryJoin)
+	{
+		GPOS_ASSERT(pexpr->Arity() >= 2);
+		CExpression *pexpr_child0 = (*pexpr)[0];
+		CExpression *pexpr_child1 = (*pexpr)[1];
+
+		if (PexprIsLogicalOutput(pexpr_child0) &&
+			pexpr_child0->DeriveOutputColumns()->FMember(subany_col))
+		{
+			child_pexpr = pexpr_child0;
+		}
+		else if (PexprIsLogicalOutput(pexpr_child1) &&
+				 pexpr_child1->DeriveOutputColumns()->FMember(subany_col))
+		{
+			child_pexpr = pexpr_child1;
+		}
+	}
+
+	return child_pexpr;
+}
+
+ULONG *
+CDedupSupersetPreprocessor::DriveFullJoinSubset(CMemoryPool *mp,
+												TDIToUlongPtrMap *eqcrmaps,
+												CExpression *pexpr_join,
+												const CColRef *pcr_sbany,
+												const CColRef *pcr_ident)
+{
+	CExpression *pexpr_join_child;
+	IMDId *tdimid = nullptr;
+	ULONG ulidx_subany;
+
+	pexpr_join_child = PexprExtractSubChildJoinExpr(pexpr_join, pcr_sbany);
+
+	if (nullptr == pexpr_join_child)
+	{
+		return nullptr;
+	}
+
+	GPOS_ASSERT(PexprIsLogicalOutput(pexpr_join_child));
+	tdimid = PexprGetIMDid(mp, pexpr_join_child);
+	if (nullptr == tdimid)
+	{
+		return nullptr;
+	}
+
+	CColRefSet *colrefsets = pexpr_join_child->DeriveOutputColumns();
+	// The colref(in CScalarSubqueryAny) must in the output
+	(void) colrefsets->ExtractIndex(pcr_sbany, &ulidx_subany);
+	GPOS_ASSERT(ulidx_subany != gpos::ulong_max);
+
+	TableDescIdent tdikey =
+		TableDescIdent(tdimid, ulidx_subany, pcr_ident->Id());
+
+	return eqcrmaps->Find(&tdikey);
+}
+
+// full the dedups array with subset(inner join)
+void
+CDedupSupersetPreprocessor::ChildExprFullJoinSubset(CMemoryPool *mp,
+													CExpression *pexpr,
+													TDIToUlongPtrMap *eqcrmaps,
+													BOOL *dedupulmasks)
+{
+	CScalarSubqueryAny *pop_subany =
+		CScalarSubqueryAny::PopConvert(pexpr->Pop());
+	CExpression *pexpr_join = (*pexpr)[0];
+	CScalarIdent *pop_ident = CScalarIdent::PopConvert((*pexpr)[1]->Pop());
+
+	ULONG *pul = DriveFullJoinSubset(mp, eqcrmaps, pexpr_join,
+									 pop_subany->Pcr(), pop_ident->Pcr());
+	if (pul)
+	{
+		// remove the expression in ul
+		dedupulmasks[*pul] = false;
+		return;
+	}
+
+	// not match, we can try the join key.
+	// ex.
+	//   t1(v1 int, v2 int)
+	//   t2(v1 int, v2 int)
+	//   t3(v1 int, v2 int)
+	//
+	//   select v1 from t1 where v1 in (select t2.v1 from t2) and v1 in (select t3.v1 from t2,t3 where t3.v1 = t2.v1);
+	//
+	// In this case, we still can use the v3.v1 as the subset key
+	if (pexpr_join->Arity() == 3 &&
+		(*pexpr_join)[2]->Pop()->Eopid() == COperator::EopScalarCmp)
+	{
+		CExpression *pexpr_cmp = (*pexpr_join)[2];
+		CScalarCmp *pop_cmp = CScalarCmp::PopConvert(pexpr_cmp->Pop());
+		if (pop_cmp->ParseCmpType() != IMDType::EcmptEq ||
+			pexpr_cmp->Arity() != 2 ||
+			(*pexpr_cmp)[0]->Pop()->Eopid() != COperator::EopScalarIdent ||
+			(*pexpr_cmp)[1]->Pop()->Eopid() != COperator::EopScalarIdent)
+		{
+			// do nothing
+			return;
+		}
+		CScalarIdent *pop_id1 =
+			CScalarIdent::PopConvert((*pexpr_cmp)[0]->Pop());
+		CScalarIdent *pop_id2 =
+			CScalarIdent::PopConvert((*pexpr_cmp)[1]->Pop());
+		ULONG *pul = nullptr;
+
+		if (pop_id1->Pcr() == pop_subany->Pcr())
+		{
+			pul = DriveFullJoinSubset(mp, eqcrmaps, pexpr_join, pop_id2->Pcr(),
+									  pop_ident->Pcr());
+		}
+		else if (pop_id2->Pcr() == pop_subany->Pcr())
+		{
+			pul = DriveFullJoinSubset(mp, eqcrmaps, pexpr_join, pop_id1->Pcr(),
+									  pop_ident->Pcr());
+		}
+
+		if (pul)
+		{
+			// remove the expression in ul
+			dedupulmasks[*pul] = false;
+		}
+	}
+}
+
+// child expr in CScalarBoolOp(ANDOP) is the superset
+//
+// |--CScalarSubqueryAny(=)["v3" (20)] ... <- it's a superset
+//    |--CLogicalGet "t2"/CLogicalDynamicGet "t2"/CLogicalCTEConsumer (0) <- all fine
+//    +--CScalarIdent "v1" ... <- get the output
+BOOL
+CDedupSupersetPreprocessor::ChildExprIsSuperset(CExpression *pexpr)
+{
+	return pexpr->Pop()->Eopid() == COperator::EopScalarSubqueryAny &&
+		   pexpr->Arity() == 2 && PexprIsLogicalOutput((*pexpr)[0]) &&
+		   (*pexpr)[1]->Pop()->Eopid() == COperator::EopScalarIdent;
+}
+
+// child expr in CScalarBoolOp(ANDOP) is the simply subset
+//
+// --CScalarSubqueryAny(=)["v3" (30)] <- it's a subset
+// |--CLogicalSelect
+// |  |--CLogicalGet "t2" || CLogicalDynamicGet "t2" || CLogicalCTEConsumer (0) <- all fine
+// |  +--CScalar           <- ANY scalar
+// +--CScalarIdent "v1" (0)
+BOOL
+CDedupSupersetPreprocessor::ChildExprIsSimplySubset(CExpression *pexpr)
+{
+	GPOS_ASSERT(pexpr);
+	return pexpr->Pop()->Eopid() == COperator::EopScalarSubqueryAny &&
+		   pexpr->Arity() == 2 &&
+		   (*pexpr)[0]->Pop()->Eopid() == COperator::EopLogicalSelect &&
+		   (*pexpr)[1]->Pop()->Eopid() == COperator::EopScalarIdent &&
+		   (*pexpr)[0]->Arity() > 0 && PexprIsLogicalOutput((*(*pexpr)[0])[0]);
+}
+
+// child expr in CScalarBoolOp(ANDOP) is the inner-join subset
+// left-semi-join won't occur in the pre-process
+//
+// +--CScalarSubqueryAny(=)["v3" (20)] <- it's a subset
+// 	|--CLogicalNAryJoin <- inner or smei join. Although semi join(EopLogicalLeftSemiJoin) is supported, but no semi join will occur at pre-process.
+//     |  |--CLogicalGet "t2" || CLogicalDynamicGet "t2" || CLogicalCTEConsumer (0) <- all fine
+//     |  |--CLogicalGet "t3" ("t3")
+//     |  +--CScalarCmp (=) 			<- ANY scalar(won't be full/cross join condition)
+//     |     |--CScalarIdent "v4" (21)
+//     |     +--CScalarIdent "v6" (31)
+//     +--CScalarIdent "v1" (0)
+BOOL
+CDedupSupersetPreprocessor::ChildExprIsJoinSubset(CExpression *pexpr)
+{
+	GPOS_ASSERT(pexpr);
+	return pexpr->Pop()->Eopid() == COperator::EopScalarSubqueryAny &&
+		   pexpr->Arity() == 2 &&
+		   (*pexpr)[0]->Pop()->Eopid() ==
+			   COperator::EopLogicalNAryJoin &&	 // inner join
+		   (*pexpr)[1]->Pop()->Eopid() == COperator::EopScalarIdent &&
+		   (*pexpr)[0]->Arity() >= 2 &&	 // at least left and right
+		   (PexprIsLogicalOutput((*(*pexpr)[0])[0]) ||
+			PexprIsLogicalOutput((*(*pexpr)[0])[1]));
+}
+
+// mian driver
+// If the same key in the current scalar has the following conditions:
+// - select a superset in {table A}
+// - select a subset in {table A}
+//	 - the subset can be the get/dynamicget/cteconsumer or a inner join
+//
+// Then the scalar(superset in {table A}) can be removed.
+//
+//	Example, for the schema: t1(v1, v2), t2(v3, v4)
+//
+//  The query:
+//    select * from t1,t2 where t1.v1 in (select v3 from t2) and t1.v1 in (select v3 from t2 where v3 < 100);
+//  equivalent to:
+//    select * from t1,t2 where t1.v1 t1.v1 in (select v3 from t2 where v3 < 100);
+//
+//  Similarly, CTE also can removed duplicate scalar
+//    with cte_t as (...)
+//    select * from t1 where v1 in (select v2 from cte_1) and v1 in (select v2 from cte_1 where {any condition});
+//  equivalent to:
+//    select * from t where a in (select count(i) from s group by j);
+//
+//  Also it also satisfies the cross join condition.
+//    select * from t1,t2 where t1.v1 in (select v2 from t2) and t1.v1 in (select v2 from t2 where v2 < 100);
+//  equivalent to:
+//    select * from t1,t2 where t1.v1 in (select v2 from t2 where v2 < 100);
+//
+//  And the inner join can be the subset.
+//    select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6);
+//  equivalent to:
+//    select * from t1 where v1 v1 in (select v3 from t2,t3 where v4=v6);
+CExpression *
+CDedupSupersetPreprocessor::PexprPreprocess(CMemoryPool *mp, CExpression *pexpr)
+{
+	GPOS_CHECK_STACK_SIZE;
+	GPOS_ASSERT(nullptr != mp);
+	GPOS_ASSERT(nullptr != pexpr);
+
+	// operator, possibly altered below if we need to change the operator
+	COperator *pop = pexpr->Pop();
+
+	if (pop->Eopid() == COperator::EopScalarBoolOp)
+	{
+		const ULONG arity = pexpr->Arity();
+		BOOL *ulmasks = GPOS_NEW_ARRAY(mp, BOOL, arity);
+		BOOL *dedupulmasks = GPOS_NEW_ARRAY(mp, BOOL, arity);
+		clib::Memset(ulmasks, true, arity * sizeof(BOOL));
+		clib::Memset(dedupulmasks, true, arity * sizeof(BOOL));
+
+		// TableDescIdent(table desc mdid, subany index, ident colid) -> ULONG(index of current )
+		TDIToUlongPtrMap *eqcrmaps = GPOS_NEW(mp) TDIToUlongPtrMap(mp);
+
+		if (arity < 2 || CScalarBoolOp::PopConvert(pop)->Eboolop() !=
+							 CScalarBoolOp::EboolopAnd)
+		{
+			goto not_match;
+		}
+
+		for (ULONG ul = 0; ul < arity; ul++)
+		{
+			CExpression *child_pexpr = (*pexpr)[ul];
+			if (ChildExprIsSuperset(child_pexpr))
+			{
+				ChildExprFullSuperset(mp, child_pexpr, eqcrmaps, dedupulmasks,
+									  ul);
+				// no need check this expression in next loop
+				ulmasks[ul] = false;
+			}
+		}
+
+		// not found any superset expression
+		if (eqcrmaps->Size() == 0)
+		{
+			goto not_match;
+		}
+
+		for (ULONG ul = 0; ul < arity; ul++)
+		{
+			// current is superset
+			if (!ulmasks[ul])
+			{
+				continue;
+			}
+
+			CExpression *child_pexpr = (*pexpr)[ul];
+
+			if (ChildExprIsSimplySubset(child_pexpr))
+			{
+				ChildExprFullSimplySubset(mp, child_pexpr, eqcrmaps,
+										  dedupulmasks);
+				continue;
+			}
+
+			if (ChildExprIsJoinSubset(child_pexpr))
+			{
+				ChildExprFullJoinSubset(mp, child_pexpr, eqcrmaps,
+										dedupulmasks);
+			}
+		}
+
+	not_match:
+		CExpressionArray *pdrgpexprChildren = GPOS_NEW(mp) CExpressionArray(mp);
+
+		for (ULONG ul = 0; ul < arity; ul++)
+		{
+			if (!dedupulmasks[ul])
+			{
+				continue;
+			}
+
+			(*pexpr)[ul]->AddRef();
+			pdrgpexprChildren->Append((*pexpr)[ul]);
+		}
+
+		pop->AddRef();
+
+		GPOS_DELETE_ARRAY(ulmasks);
+		GPOS_DELETE_ARRAY(dedupulmasks);
+		eqcrmaps->Release();
+
+		return GPOS_NEW(mp) CExpression(mp, pop, pdrgpexprChildren);
+	}
+	// FIXME: should we consider remove the CTE consumer from CTEINFO?
+
+	const ULONG arity = pexpr->Arity();
+	CExpressionArray *pdrgpexprChildren = GPOS_NEW(mp) CExpressionArray(mp);
+
+	for (ULONG ul = 0; ul < arity; ul++)
+	{
+		CExpression *pexprChild = PexprPreprocess(mp, (*pexpr)[ul]);
+
+		pdrgpexprChildren->Append(pexprChild);
+	}
+
+	pop->AddRef();
+	return GPOS_NEW(mp) CExpression(mp, pop, pdrgpexprChildren);
+}
\ No newline at end of file
diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp b/src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp
index 324e766f73d..e1c46c9fc8e 100644
--- a/src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp
@@ -24,6 +24,7 @@
 #include "gpopt/base/CUtils.h"
 #include "gpopt/exception.h"
 #include "gpopt/mdcache/CMDAccessor.h"
+#include "gpopt/operators/CDedupSupersetPreprocessor.h"
 #include "gpopt/operators/CExpressionFactorizer.h"
 #include "gpopt/operators/CExpressionUtils.h"
 #include "gpopt/operators/CJoinOrderHintsPreprocessor.h"
@@ -2232,6 +2233,7 @@ CExpressionPreprocessor::CollectCTEPredicates(CMemoryPool *mp,
 				CLogicalCTEProducer::PopConvert(pexprProducer->Pop());
 			UlongToColRefMap *colref_mapping = CUtils::PhmulcrMapping(
 				mp, popConsumer->Pdrgpcr(), popProducer->Pdrgpcr());
+				
 			CExpression *pexprRemappedScalar =
 				pexprScalar->PexprCopyWithRemappedColumns(mp, colref_mapping,
 														  true /*must_exist*/);
@@ -3292,6 +3294,34 @@ CExpressionPreprocessor::ConvertSplitUpdateToInPlaceUpdate(CMemoryPool *mp,
 	return pexpr;
 }
 
+#if GPOS_DEBUG
+
+#define TRCAE_PREPROCESS_BEGIN(inpexpr) \
+	if (GPOS_FTRACE(EopttracePrintPreProcessResult)) { \
+		atio << "Begin pre-process. Input: " << std::endl; \
+		inpexpr->OsPrint(atio) << std::endl; \
+	}
+
+
+#define TRCAE_PREPROCESS_STEP(output, desc) \
+	if (GPOS_FTRACE(EopttracePrintPreProcessResult)) {    \
+		atio << "PreProcess(" << desc << ")"; \
+		atio << "  Output: " << std::endl; \
+		output->OsPrint(atio) << std::endl; \
+	}
+
+#define TRCAE_PREPROCESS_END() \
+	if (GPOS_FTRACE(EopttracePrintPreProcessResult)) { \
+		atio << "End pre-process." << std::endl; \
+	}
+
+#else
+#define TRCAE_PREPROCESS_BEGIN(inpexpr)
+#define TRCAE_PREPROCESS_STEP(output, desc)
+#define TRCAE_PREPROCESS_END()
+
+#endif	// GPOS_DEBUG
+
 // main driver, pre-processing of input logical expression
 CExpression *
 CExpressionPreprocessor::PexprPreprocess(
@@ -3305,6 +3335,12 @@ CExpressionPreprocessor::PexprPreprocess(
 
 	CAutoTimer at("\n[OPT]: Expression Preprocessing Time",
 				  GPOS_FTRACE(EopttracePrintOptimizationStatistics));
+#if GPOS_DEBUG
+	CAutoTrace atr(mp);
+	IOstream & atio = atr.Os();
+#endif
+
+	TRCAE_PREPROCESS_BEGIN(pexpr);
 
 	// remove unused CTE anchors
 	CCTEInfo *pcteinfo = COptCtxt::PoctxtFromTLS()->Pcteinfo();
@@ -3312,29 +3348,46 @@ CExpressionPreprocessor::PexprPreprocess(
 
 	CExpression *pexprNoUnusedCTEs = PexprRemoveUnusedCTEs(mp, pexpr);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprNoUnusedCTEs, "Remove unused CTEs");
 
 	// remove intermediate superfluous limit
 	CExpression *pexprSimplifiedLimit =
 		PexprRemoveSuperfluousLimit(mp, pexprNoUnusedCTEs);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprSimplifiedLimit,
+		"Remove intermediate superfluous limit");
 	pexprNoUnusedCTEs->Release();
 
 	// remove intermediate superfluous distinct
 	CExpression *pexprSimplifiedDistinct =
 		PexprRemoveSuperfluousDistinctInDQA(mp, pexprSimplifiedLimit);
+	TRCAE_PREPROCESS_STEP(pexprSimplifiedDistinct,
+		"Remove intermediate superfluous distinct");
 	GPOS_CHECK_ABORT;
 	pexprSimplifiedLimit->Release();
 
+	// remove dedup superset scalar
+	CExpression *pexprRmDupSupersetScalar =
+		CDedupSupersetPreprocessor::PexprPreprocess(mp, pexprSimplifiedDistinct);
+	TRCAE_PREPROCESS_STEP(pexprRmDupSupersetScalar,
+		"Remove the dedup the superset");
+	GPOS_CHECK_ABORT;
+	pexprSimplifiedDistinct->Release();
+
 	// trim unnecessary existential subqueries
 	CExpression *pexprTrimmed =
-		PexprTrimExistentialSubqueries(mp, pexprSimplifiedDistinct);
+		PexprTrimExistentialSubqueries(mp, pexprRmDupSupersetScalar);
+	TRCAE_PREPROCESS_STEP(pexprTrimmed,
+		"Trim unnecessary existential subqueries");
 	GPOS_CHECK_ABORT;
-	pexprSimplifiedDistinct->Release();
+	pexprRmDupSupersetScalar->Release();
 
 	// collapse cascaded union / union all
 	CExpression *pexprNaryUnionUnionAll =
 		PexprCollapseUnionUnionAll(mp, pexprTrimmed);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprNaryUnionUnionAll, 
+		"Collapse cascaded union / union all");
 	pexprTrimmed->Release();
 
 	// remove superfluous outer references from the order spec in limits, grouping columns in GbAgg, and
@@ -3342,12 +3395,16 @@ CExpressionPreprocessor::PexprPreprocess(
 	CExpression *pexprOuterRefsEleminated =
 		PexprRemoveSuperfluousOuterRefs(mp, pexprNaryUnionUnionAll);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprOuterRefsEleminated, 
+		"Remove superfluous outer references from the order spec in limits");
 	pexprNaryUnionUnionAll->Release();
 
 	// remove superfluous equality
 	CExpression *pexprTrimmed2 =
 		PexprPruneSuperfluousEquality(mp, pexprOuterRefsEleminated);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprTrimmed2, 
+		"Remove superfluous equality");
 	pexprOuterRefsEleminated->Release();
 
 	// substitute constant predicates
@@ -3355,10 +3412,12 @@ CExpressionPreprocessor::PexprPreprocess(
 	CExpression *pexprPredWithConstReplaced =
 		PexprReplaceColWithConst(mp, pexprTrimmed2, phmExprToConst, true);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprPredWithConstReplaced, 
+		"substitute constant predicates");
 	phmExprToConst->Release();
 	pexprTrimmed2->Release();
 
-	//  reorder the children of scalar cmp operator to ensure that left
+	// reorder the children of scalar cmp operator to ensure that left
 	// child is scalar ident and right child is scalar const
 	//
 	// Must happen after "substitute constant predicates" step which can insert scalar cmp children with inversed
@@ -3367,24 +3426,32 @@ CExpressionPreprocessor::PexprPreprocess(
 	CExpression *pexprReorderedScalarCmpChildren =
 		PexprReorderScalarCmpChildren(mp, pexprPredWithConstReplaced);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprReorderedScalarCmpChildren, 
+		"Reorder the children of scalar cmp operator to ensure that left child is scalar ident and right child is scalar const");
 	pexprPredWithConstReplaced->Release();
 
 	// simplify quantified subqueries
 	CExpression *pexprSubqSimplified =
 		PexprSimplifyQuantifiedSubqueries(mp, pexprReorderedScalarCmpChildren);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprSubqSimplified, 
+		"Simplify quantified subqueries");
 	pexprReorderedScalarCmpChildren->Release();
 
 	// do preliminary unnesting of scalar subqueries
 	CExpression *pexprSubqUnnested =
 		PexprUnnestScalarSubqueries(mp, pexprSubqSimplified);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprSubqUnnested, 
+		"Do preliminary unnesting of scalar subqueries");
 	pexprSubqSimplified->Release();
 
 	// unnest AND/OR/NOT predicates
 	CExpression *pexprUnnested =
 		CExpressionUtils::PexprUnnest(mp, pexprSubqUnnested);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprUnnested, 
+		"Unnest AND/OR/NOT predicates");
 	pexprSubqUnnested->Release();
 
 	CExpression *pexprConvert2In = pexprUnnested;
@@ -3405,117 +3472,158 @@ CExpressionPreprocessor::PexprPreprocess(
 		CLeftJoinPruningPreprocessor::PexprPreprocess(mp, pexprConvert2In,
 													  pcrsOutputAndOrderCols);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprJoinPruned, 
+		"Left Outer Join Pruning");
 	pexprConvert2In->Release();
 
 	// infer predicates from constraints
 	CExpression *pexprInferredPreds = PexprInferPredicates(mp, pexprJoinPruned);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprInferredPreds, 
+		"Infer predicates from constraints");
 	pexprJoinPruned->Release();
 
 	// eliminate self comparisons
 	CExpression *pexprSelfCompEliminated = PexprEliminateSelfComparison(
 		mp, pexprInferredPreds, pexprInferredPreds->DeriveNotNullColumns());
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprSelfCompEliminated, 
+		"Eliminate self comparisons");
 	pexprInferredPreds->Release();
 
 	// remove duplicate AND/OR children
 	CExpression *pexprDeduped =
 		CExpressionUtils::PexprDedupChildren(mp, pexprSelfCompEliminated);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprDeduped, 
+		"Remove duplicate AND/OR children");
 	pexprSelfCompEliminated->Release();
 
 	// factorize common expressions
 	CExpression *pexprFactorized =
 		CExpressionFactorizer::PexprFactorize(mp, pexprDeduped);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprFactorized, 
+		"Factorize common expressions");
 	pexprDeduped->Release();
 
 	// infer filters out of components of disjunctive filters
 	CExpression *pexprPrefiltersExtracted =
 		CExpressionFactorizer::PexprExtractInferredFilters(mp, pexprFactorized);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprPrefiltersExtracted, 
+		"Infer filters out of components of disjunctive filters");
 	pexprFactorized->Release();
 
 	// pre-process ordered agg functions
 	CExpression *pexprOrderedAggPreprocessed =
 		COrderedAggPreprocessor::PexprPreprocess(mp, pexprPrefiltersExtracted);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprOrderedAggPreprocessed, 
+		"Pre-process ordered agg functions");
 	pexprPrefiltersExtracted->Release();
 
 	// eliminate unused computed columns
 	CExpression *pexprNoUnusedPrEl = PexprPruneUnusedComputedCols(
 		mp, pexprOrderedAggPreprocessed, pcrsOutputAndOrderCols);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprNoUnusedPrEl, 
+		"Eliminate unused computed columns");
 	pexprOrderedAggPreprocessed->Release();
 
 	// normalize expression
 	CExpression *pexprNormalized1 =
 		CNormalizer::PexprNormalize(mp, pexprNoUnusedPrEl);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprNormalized1, 
+		"Normalize expression");
 	pexprNoUnusedPrEl->Release();
 
 	// transform outer join into inner join whenever possible
 	CExpression *pexprLOJToIJ = PexprOuterJoinToInnerJoin(mp, pexprNormalized1);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprLOJToIJ, 
+		"Transform outer join into inner join whenever possible");
 	pexprNormalized1->Release();
 
 	// collapse cascaded inner and left outer joins
 	CExpression *pexprCollapsed = PexprCollapseJoins(mp, pexprLOJToIJ);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprCollapsed, 
+		"Collapse cascaded inner and left outer joins");
 	pexprLOJToIJ->Release();
 
 	// after transforming outer joins to inner joins, we may be able to generate more predicates from constraints
 	CExpression *pexprWithPreds =
 		PexprAddPredicatesFromConstraints(mp, pexprCollapsed);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprWithPreds, 
+		"After transforming outer joins to inner joins, we may be able to generate more predicates from constraints");
 	pexprCollapsed->Release();
 
 	// eliminate empty subtrees
 	CExpression *pexprPruned = PexprPruneEmptySubtrees(mp, pexprWithPreds);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprPruned, 
+		"Eliminate empty subtrees");
 	pexprWithPreds->Release();
 
 	// collapse cascade of projects
 	CExpression *pexprCollapsedProjects =
 		PexprCollapseProjects(mp, pexprPruned);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprCollapsedProjects, 
+		"Collapse cascade of projects");
 	pexprPruned->Release();
 
 	// insert dummy project when the scalar subquery is under a project and returns an outer reference
 	CExpression *pexprSubquery = PexprProjBelowSubquery(
 		mp, pexprCollapsedProjects, false /* fUnderPrList */);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprSubquery, 
+		"Insert dummy project when the scalar subquery is under a project and returns an outer reference");
 	pexprCollapsedProjects->Release();
 
 	// rewrite IN subquery to EXIST subquery with a predicate
 	CExpression *pexprExistWithPredFromINSubq =
 		PexprExistWithPredFromINSubq(mp, pexprSubquery);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprExistWithPredFromINSubq, 
+		"Rewrite IN subquery to EXIST subquery with a predicate");
 	pexprSubquery->Release();
 
 	// prune partitions
 	CExpression *pexprPrunedPartitions =
 		PrunePartitions(mp, pexprExistWithPredFromINSubq);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprPrunedPartitions, 
+		"Prune partitions");
 	pexprExistWithPredFromINSubq->Release();
 
 	// swap logical select over logical project
 	CExpression *pexprTransposeSelectAndProject =
 		PexprTransposeSelectAndProject(mp, pexprPrunedPartitions);
+	TRCAE_PREPROCESS_STEP(pexprTransposeSelectAndProject, 
+		"Swap logical select over logical project");
 	pexprPrunedPartitions->Release();
 
 	// convert split update to inplace update
 	CExpression *pexprSplitUpdateToInplace =
 		ConvertSplitUpdateToInPlaceUpdate(mp, pexprTransposeSelectAndProject);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprSplitUpdateToInplace, 
+		"Convert split update to inplace update");
 	pexprTransposeSelectAndProject->Release();
 
 	// normalize expression again
 	CExpression *pexprNormalized2 =
 		CNormalizer::PexprNormalize(mp, pexprSplitUpdateToInplace);
 	GPOS_CHECK_ABORT;
+	TRCAE_PREPROCESS_STEP(pexprNormalized2, 
+		"Normalize expression");
 	pexprSplitUpdateToInplace->Release();
 
+	// join hint
 	CPlanHint *planhint =
 		COptCtxt::PoctxtFromTLS()->GetOptimizerConfig()->GetPlanHint();
 	if (nullptr != planhint)
@@ -3525,11 +3633,15 @@ CExpressionPreprocessor::PexprPreprocess(
 			CJoinOrderHintsPreprocessor::PexprPreprocess(
 				mp, pexprNormalized2, nullptr /* joinnode */);
 		GPOS_CHECK_ABORT;
+		TRCAE_PREPROCESS_STEP(pexprJoinHintsApplied, 
+			"Apply join order hints");
 		pexprNormalized2->Release();
 
+		TRCAE_PREPROCESS_END();
 		return pexprJoinHintsApplied;
 	}
 
+	TRCAE_PREPROCESS_END();
 	return pexprNormalized2;
 }
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp
index bf7accbbf53..d1557f5454d 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp
@@ -36,7 +36,8 @@ CLogicalCTEConsumer::CLogicalCTEConsumer(CMemoryPool *mp)
 	  m_pdrgpcr(nullptr),
 	  m_pexprInlined(nullptr),
 	  m_phmulcr(nullptr),
-	  m_pcrsOutput(nullptr)
+	  m_pcrsOutput(nullptr),
+	  m_pruned(false)
 {
 	m_fPattern = true;
 }
@@ -55,7 +56,8 @@ CLogicalCTEConsumer::CLogicalCTEConsumer(CMemoryPool *mp, ULONG id,
 	  m_id(id),
 	  m_pdrgpcr(colref_array),
 	  m_pexprInlined(nullptr),
-	  m_phmulcr(nullptr)
+	  m_phmulcr(nullptr),
+	  m_pruned(false)
 {
 	GPOS_ASSERT(nullptr != colref_array);
 	m_pcrsOutput = GPOS_NEW(mp) CColRefSet(mp, m_pdrgpcr);
@@ -107,6 +109,38 @@ CLogicalCTEConsumer::CreateInlinedExpr(CMemoryPool *mp)
 		mp, m_phmulcr, true /*must_exist*/);
 }
 
+void 
+CLogicalCTEConsumer::ApplyInline() {
+	// do nothing 
+	if (!m_pruned) {
+		return;
+	}
+	CCTEInfo *pcteinfo = COptCtxt::PoctxtFromTLS()->Pcteinfo();
+	CExpressionArray *pcexprs = pcteinfo->PexprCTEConsumer(m_id);
+	ULONG cpexrssz = pcexprs->Size();
+	UlongToColRefMap *pcmpulcr = pcteinfo->GetCTEConsumerMapping();
+
+	for (ULONG ulPos = 0; ulPos < cpexrssz; ulPos++) {
+		CExpression *cepxr = (*pcexprs)[ulPos];
+		CLogicalCTEConsumer *pcoper = CLogicalCTEConsumer::PopConvert(cepxr->Pop());
+		CColRefArray *colrefs = pcoper->Pdrgpcr();
+
+		for (ULONG ulcrPos = 0; ulcrPos < colrefs->Size(); ulcrPos++) {
+			CColRef *colref = (*colrefs)[ulcrPos];
+			ULONG colid = colref->Id();
+			colref->MarkAsUsed();
+
+			CColRef *producer_colref = nullptr;
+			producer_colref = pcmpulcr->Find(&colid);
+			if (producer_colref) {
+				producer_colref->MarkAsUsed();
+			}
+		}
+
+		pcoper->MarkAsNotPruned();
+	}
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CLogicalCTEConsumer::DeriveOutputColumns
@@ -120,6 +154,7 @@ CLogicalCTEConsumer::DeriveOutputColumns(CMemoryPool *,		  //mp,
 										 CExpressionHandle &  //exprhdl
 )
 {
+	// It's fine if we not prune the pcrsOutput
 	m_pcrsOutput->AddRef();
 	return m_pcrsOutput;
 }
@@ -320,17 +355,48 @@ CLogicalCTEConsumer::PopCopyWithRemappedColumns(
 	CMemoryPool *mp, UlongToColRefMap *colref_mapping, BOOL must_exist)
 {
 	CColRefArray *colref_array = nullptr;
+	CCTEInfo *cteinfo = COptCtxt::PoctxtFromTLS()->Pcteinfo();
+
 	if (must_exist)
 	{
-		colref_array =
-			CUtils::PdrgpcrRemapAndCreate(mp, m_pdrgpcr, colref_mapping);
+		UlongToColRefMap *consumer_mapping;
+		ULONG colid;
+		ULONG colref_size;
+
+		colref_array = CUtils::PdrgpcrRemapAndCreate(mp, m_pdrgpcr, colref_mapping);
+
+		colref_size = colref_array->Size();
+		GPOS_ASSERT(colref_size == colref_array->Size());
+
+		consumer_mapping = cteinfo->GetCTEConsumerMapping();
+		for (ULONG ul = 0; ul < colref_size; ul++) {
+			CColRef *old_colref = (*m_pdrgpcr)[ul];
+			CColRef *new_colref = (*colref_array)[ul];
+			
+			colid = old_colref->Id();
+			CColRef *p_colref = consumer_mapping->Find(&colid);
+			if (nullptr == p_colref) {
+				GPOS_RAISE(
+					CException::ExmaInvalid, CException::ExmiInvalid,
+					GPOS_WSZ_LIT(
+						"Not found CTE consumer colid regsiterd in consumer mapping"));
+			}
+			
+			consumer_mapping->Insert(
+				GPOS_NEW(mp) ULONG(new_colref->Id()), p_colref);
+		}
 	}
 	else
 	{
 		colref_array =
 			CUtils::PdrgpcrRemap(mp, m_pdrgpcr, colref_mapping, must_exist);
 	}
-	return GPOS_NEW(mp) CLogicalCTEConsumer(mp, m_id, colref_array);
+
+	CExpression *new_pexpr = GPOS_NEW(mp) CExpression(
+		mp, GPOS_NEW(mp) CLogicalCTEConsumer(mp, m_id, colref_array));
+
+	cteinfo->AddCTEConsumer(new_pexpr);
+	return new_pexpr->Pop();
 }
 
 //---------------------------------------------------------------------------
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp
index c1bdcf0d2f2..a1f9a5420f4 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp
@@ -27,7 +27,8 @@ using namespace gpopt;
 //
 //---------------------------------------------------------------------------
 CLogicalCTEProducer::CLogicalCTEProducer(CMemoryPool *mp)
-	: CLogical(mp), m_id(0), m_pdrgpcr(nullptr), m_pcrsOutput(nullptr)
+	: CLogical(mp), m_id(0), m_pdrgpcr(nullptr), m_pcrsOutput(nullptr), 
+	  m_cbp(false), m_umask(nullptr)
 {
 	m_fPattern = true;
 }
@@ -41,8 +42,10 @@ CLogicalCTEProducer::CLogicalCTEProducer(CMemoryPool *mp)
 //
 //---------------------------------------------------------------------------
 CLogicalCTEProducer::CLogicalCTEProducer(CMemoryPool *mp, ULONG id,
-										 CColRefArray *colref_array)
-	: CLogical(mp), m_id(id), m_pdrgpcr(colref_array)
+										 CColRefArray *colref_array,
+										 BOOL canbepruned)
+	: CLogical(mp), m_id(id), m_pdrgpcr(colref_array), 
+	  m_pcrsOutput(nullptr), m_cbp(canbepruned), m_umask(nullptr)
 {
 	GPOS_ASSERT(nullptr != colref_array);
 
@@ -52,6 +55,22 @@ CLogicalCTEProducer::CLogicalCTEProducer(CMemoryPool *mp, ULONG id,
 	m_pcrsLocalUsed->Include(m_pdrgpcr);
 }
 
+void 
+CLogicalCTEProducer::RecalOutputColumns(BOOL *umask, ULONG sz) {
+	CRefCount::SafeRelease(m_pcrsOutput);
+
+	GPOS_ASSERT(m_pdrgpcr->Size() == sz);
+
+	m_pcrsOutput = GPOS_NEW(m_mp) CColRefSet(m_mp);
+	for (ULONG ul = 0; ul < sz; ul++) {
+		if (umask[ul]) {
+			m_pcrsOutput->Include((*m_pdrgpcr)[ul]);
+		}
+	}
+
+	m_umask = umask;
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CLogicalCTEProducer::~CLogicalCTEProducer
@@ -64,6 +83,9 @@ CLogicalCTEProducer::~CLogicalCTEProducer()
 {
 	CRefCount::SafeRelease(m_pdrgpcr);
 	CRefCount::SafeRelease(m_pcrsOutput);
+	if (m_umask) {
+		GPOS_DELETE_ARRAY(m_umask);
+	}
 }
 
 //---------------------------------------------------------------------------
@@ -95,7 +117,8 @@ CColRefSet *
 CLogicalCTEProducer::DeriveNotNullColumns(CMemoryPool *mp,
 										  CExpressionHandle &exprhdl) const
 {
-	CColRefSet *pcrs = GPOS_NEW(mp) CColRefSet(mp, m_pdrgpcr);
+	CColRefSet *pcrs = GPOS_NEW(mp) CColRefSet(mp);
+	pcrs->Include(m_pcrsOutput);
 	pcrs->Intersection(exprhdl.DeriveNotNullColumns(0));
 
 	return pcrs;
@@ -162,7 +185,8 @@ CLogicalCTEProducer::Matches(COperator *pop) const
 	CLogicalCTEProducer *popCTEProducer = CLogicalCTEProducer::PopConvert(pop);
 
 	return m_id == popCTEProducer->UlCTEId() &&
-		   m_pdrgpcr->Equals(popCTEProducer->Pdrgpcr());
+		   m_pdrgpcr->Equals(popCTEProducer->Pdrgpcr()) && 
+		   m_cbp == popCTEProducer->CanBePruned();
 }
 
 //---------------------------------------------------------------------------
@@ -178,6 +202,7 @@ CLogicalCTEProducer::HashValue() const
 {
 	ULONG ulHash = gpos::CombineHashes(COperator::HashValue(), m_id);
 	ulHash = gpos::CombineHashes(ulHash, CUtils::UlHashColArray(m_pdrgpcr));
+	ulHash = gpos::CombineHashes(ulHash, (ULONG)m_cbp);
 
 	return ulHash;
 }
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp
index 788feefd5f4..c60cd4f5ac0 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp
@@ -174,7 +174,8 @@ CLogicalDifference::PstatsDerive(CMemoryPool *mp, CExpressionHandle &exprhdl,
 		mp, LASJ_stats,
 		(*m_pdrgpdrgpcrInput)[0],  // we group by the columns of the first child
 		pdrgpulComputedCols,	   // no computed columns for set ops
-		nullptr					   // no keys, use all grouping cols
+		nullptr,				   // no keys, use all grouping cols
+		false // is local agg?
 	);
 
 	// clean up
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp
index d841d868477..7413d7b8b80 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp
@@ -236,15 +236,6 @@ CLogicalDynamicGetBase::ConstructRootColMappingPerPart(
 	CMDAccessor *mda = COptCtxt::PoctxtFromTLS()->Pmda();
 
 	ColRefToUlongMapArray *part_maps = GPOS_NEW(mp) ColRefToUlongMapArray(mp);
-
-	// Build hashmap of colname to the index
-	ColNameToIndexMap *root_mapping = GPOS_NEW(mp) ColNameToIndexMap(mp);
-	for (ULONG i = 0; i < root_cols->Size(); ++i)
-	{
-		CColRef *root_colref = (*root_cols)[i];
-		root_mapping->Insert(root_colref->Name().Pstr(), GPOS_NEW(mp) ULONG(i));
-	}
-
 	for (ULONG ul = 0; ul < partition_mdids->Size(); ++ul)
 	{
 		IMDId *part_mdid = (*partition_mdids)[ul];
@@ -253,28 +244,35 @@ CLogicalDynamicGetBase::ConstructRootColMappingPerPart(
 		GPOS_ASSERT(nullptr != partrel);
 
 		ColRefToUlongMap *mapping = GPOS_NEW(mp) ColRefToUlongMap(mp);
-		// The root mapping cannot contain dropped columns, but may be
-		// in a different order than the child cols.Iterate through each of the child
-		// cols, and retrieve the corresponding index in the parent table
-		for (ULONG j = 0; j < partrel->ColumnCount(); ++j)
+
+		for (ULONG i = 0; i < root_cols->Size(); ++i)
 		{
-			const IMDColumn *coldesc = partrel->GetMdCol(j);
-			const CWStringConst *colname = coldesc->Mdname().GetMDName();
+			CColRef *root_colref = (*root_cols)[i];
 
-			if (coldesc->IsDropped())
+			BOOL found_mapping = false;
+			for (ULONG j = 0, idx = 0; j < partrel->ColumnCount(); ++j, ++idx)
 			{
-				continue;
+				const IMDColumn *coldesc = partrel->GetMdCol(j);
+				const CWStringConst *colname = coldesc->Mdname().GetMDName();
+
+				if (coldesc->IsDropped())
+				{
+					--idx;
+					continue;
+				}
+
+				if (colname->Equals(root_colref->Name().Pstr()))
+				{
+					// Found the corresponding column in the child partition
+					// Save the index in the mapping
+					mapping->Insert(root_colref, GPOS_NEW(mp) ULONG(idx));
+					found_mapping = true;
+					break;
+				}
 			}
 
-			ULONG *root_idx = root_mapping->Find(colname);
-			if (nullptr != root_idx)
-			{
-				mapping->Insert((*root_cols)[*root_idx],
-								GPOS_NEW(mp) ULONG(*root_idx));
-			}
-			else
+			if (!found_mapping)
 			{
-				root_mapping->Release();
 				GPOS_RAISE(
 					CException::ExmaInvalid, CException::ExmiInvalid,
 					GPOS_WSZ_LIT(
@@ -283,6 +281,5 @@ CLogicalDynamicGetBase::ConstructRootColMappingPerPart(
 		}
 		part_maps->Append(mapping);
 	}
-	root_mapping->Release();
 	return part_maps;
 }
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp
index 12a367dba3e..55f060b160a 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp
@@ -40,7 +40,8 @@ CLogicalGbAgg::CLogicalGbAgg(CMemoryPool *mp)
 	  m_pdrgpcr(nullptr),
 	  m_pdrgpcrMinimal(nullptr),
 	  m_egbaggtype(COperator::EgbaggtypeSentinel),
-	  m_aggStage(EasOthers)
+	  m_aggStage(EasOthers),
+	  m_aggpushdown(false)
 {
 	m_fPattern = true;
 }
@@ -62,7 +63,8 @@ CLogicalGbAgg::CLogicalGbAgg(CMemoryPool *mp, CColRefArray *colref_array,
 	  m_pdrgpcr(colref_array),
 	  m_pdrgpcrMinimal(nullptr),
 	  m_egbaggtype(egbaggtype),
-	  m_aggStage(EasOthers)
+	  m_aggStage(EasOthers),
+	  m_aggpushdown(false)
 {
 	if (COperator::EgbaggtypeLocal == egbaggtype)
 	{
@@ -86,7 +88,8 @@ CLogicalGbAgg::CLogicalGbAgg(CMemoryPool *mp, CColRefArray *colref_array,
 	  m_pdrgpcr(colref_array),
 	  m_pdrgpcrMinimal(nullptr),
 	  m_egbaggtype(egbaggtype),
-	  m_aggStage(aggStage)
+	  m_aggStage(aggStage),
+	  m_aggpushdown(false)
 {
 	if (COperator::EgbaggtypeLocal == egbaggtype)
 	{
@@ -120,7 +123,8 @@ CLogicalGbAgg::CLogicalGbAgg(CMemoryPool *mp, CColRefArray *colref_array,
 	  m_pdrgpcr(colref_array),
 	  m_pdrgpcrMinimal(nullptr),
 	  m_egbaggtype(egbaggtype),
-	  m_aggStage(EasOthers)
+	  m_aggStage(EasOthers),
+	  m_aggpushdown(false)
 {
 	GPOS_ASSERT(nullptr != colref_array);
 	GPOS_ASSERT(COperator::EgbaggtypeSentinel > egbaggtype);
@@ -142,7 +146,8 @@ CLogicalGbAgg::CLogicalGbAgg(CMemoryPool *mp, CColRefArray *colref_array,
 	  m_pdrgpcr(colref_array),
 	  m_pdrgpcrMinimal(nullptr),
 	  m_egbaggtype(egbaggtype),
-	  m_aggStage(aggStage)
+	  m_aggStage(aggStage),
+	  m_aggpushdown(false)
 {
 	GPOS_ASSERT(nullptr != colref_array);
 	GPOS_ASSERT(COperator::EgbaggtypeSentinel > egbaggtype);
@@ -171,7 +176,8 @@ CLogicalGbAgg::CLogicalGbAgg(CMemoryPool *mp, CColRefArray *colref_array,
 	  m_pdrgpcr(colref_array),
 	  m_pdrgpcrMinimal(pdrgpcrMinimal),
 	  m_egbaggtype(egbaggtype),
-	  m_aggStage(EasOthers)
+	  m_aggStage(EasOthers),
+	  m_aggpushdown(false)
 {
 	GPOS_ASSERT(nullptr != colref_array);
 	GPOS_ASSERT(COperator::EgbaggtypeSentinel > egbaggtype);
@@ -209,7 +215,8 @@ CLogicalGbAgg::CLogicalGbAgg(CMemoryPool *mp, CColRefArray *colref_array,
 	  m_pdrgpcr(colref_array),
 	  m_pdrgpcrMinimal(pdrgpcrMinimal),
 	  m_egbaggtype(egbaggtype),
-	  m_aggStage(EasOthers)
+	  m_aggStage(EasOthers),
+	  m_aggpushdown(false)
 {
 	GPOS_ASSERT(nullptr != colref_array);
 	GPOS_ASSERT(COperator::EgbaggtypeSentinel > egbaggtype);
@@ -592,6 +599,7 @@ CLogicalGbAgg::PxfsCandidates(CMemoryPool *mp) const
 	(void) xform_set->ExchangeSet(CXform::ExfPushGbBelowUnionAll);
 	if (FGlobal())
 	{
+		(void) xform_set->ExchangeSet(CXform::ExfPushPartialAggBelowJoin);
 		(void) xform_set->ExchangeSet(CXform::ExfSplitGbAgg);
 	}
 	(void) xform_set->ExchangeSet(CXform::ExfSplitDQA);
@@ -617,7 +625,9 @@ CLogicalGbAgg::PxfsCandidates(CMemoryPool *mp) const
 IStatistics *
 CLogicalGbAgg::PstatsDerive(CMemoryPool *mp, IStatistics *child_stats,
 							CColRefArray *pdrgpcrGroupingCols,
-							ULongPtrArray *pdrgpulComputedCols, CBitSet *keys)
+							ULongPtrArray *pdrgpulComputedCols, 
+							CBitSet *keys,
+							BOOL isLocal)
 {
 	const ULONG ulGroupingCols = pdrgpcrGroupingCols->Size();
 
@@ -631,7 +641,7 @@ CLogicalGbAgg::PstatsDerive(CMemoryPool *mp, IStatistics *child_stats,
 
 	IStatistics *stats = CGroupByStatsProcessor::CalcGroupByStats(
 		mp, dynamic_cast<CStatistics *>(child_stats), pdrgpulGroupingCols,
-		pdrgpulComputedCols, keys);
+		pdrgpulComputedCols, keys, isLocal);
 
 	// clean up
 	pdrgpulGroupingCols->Release();
@@ -661,7 +671,8 @@ CLogicalGbAgg::PstatsDerive(CMemoryPool *mp, CExpressionHandle &exprhdl,
 	exprhdl.DeriveDefinedColumns(1)->ExtractColIds(mp, pdrgpulComputedCols);
 
 	IStatistics *stats = PstatsDerive(mp, child_stats, Pdrgpcr(),
-									  pdrgpulComputedCols, nullptr /*keys*/);
+									  pdrgpulComputedCols, nullptr /*keys*/,
+									  FLocal());
 
 	pdrgpulComputedCols->Release();
 
@@ -698,7 +709,7 @@ CLogicalGbAgg::OsPrint(IOstream &os) const
 
 	os << SzId() << "( ";
 	OsPrintGbAggType(os, m_egbaggtype);
-	os << " )";
+	os << (m_aggpushdown ? ", pushdown )" : " )");
 	os << " Grp Cols: [";
 	CUtils::OsPrintDrgPcr(os, m_pdrgpcr);
 	os << "]"
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp
index cd42cc813ab..aafce73d352 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp
@@ -255,7 +255,8 @@ CLogicalGbAggDeduplicate::PstatsDerive(CMemoryPool *mp,
 	}
 
 	IStatistics *stats = CLogicalGbAgg::PstatsDerive(mp, child_stats, Pdrgpcr(),
-													 pdrgpulComputedCols, keys);
+													 pdrgpulComputedCols, keys,
+													 FLocal());
 	keys->Release();
 	pdrgpulComputedCols->Release();
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp
index efb9691a2db..23e5ee7f30b 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp
@@ -163,7 +163,8 @@ CLogicalIntersect::PstatsDerive(CMemoryPool *mp, CExpressionHandle &exprhdl,
 		mp, pstatsIntersectAll,
 		(*m_pdrgpdrgpcrInput)[0],  // we group by the columns of the first child
 		pdrgpulComputedCols,	   // no computed columns for set ops
-		nullptr					   // no keys, use all grouping cols
+		nullptr,				   // no keys, use all grouping cols
+		false
 	);
 	// clean up
 	pdrgpulComputedCols->Release();
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp
index f0018ea02a8..4d20c7c5e26 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp
@@ -369,6 +369,8 @@ CLogicalSequenceProject::PxfsCandidates(CMemoryPool *mp) const
 	CXformSet *xform_set = GPOS_NEW(mp) CXformSet(mp);
 	(void) xform_set->ExchangeSet(CXform::ExfSequenceProject2Apply);
 	(void) xform_set->ExchangeSet(CXform::ExfImplementSequenceProject);
+	if (GPOS_FTRACE(EopttraceEnableWindowHashAgg))
+		(void) xform_set->ExchangeSet(CXform::ExfImplementHashSequenceProject);
 
 	return xform_set;
 }
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp b/src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp
index 178f4ad521e..1a9aaa3314f 100644
--- a/src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp
@@ -150,7 +150,8 @@ CLogicalUnion::PstatsDerive(CMemoryPool *mp, CExpressionHandle &exprhdl,
 		mp, pstatsUnionAll,
 		m_pdrgpcrOutput,	  // we group by the output columns
 		pdrgpulComputedCols,  // no computed columns for set ops
-		nullptr				  // no keys, use all grouping cols
+		nullptr,			  // no keys, use all grouping cols
+		false
 	);
 
 	// clean up
diff --git a/src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp b/src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp
index ada9508a6f0..ed1c3420697 100644
--- a/src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp
@@ -475,11 +475,13 @@ COrderedAggPreprocessor::CreateCTE(CMemoryPool *mp, CExpression *pexprChild,
 		mp, GPOS_NEW(mp) CLogicalCTEConsumer(
 				mp, ulCTEId, CUtils::PdrgpcrCopy(mp, pdrgpcrProducerOutput)));
 	pcteinfo->IncrementConsumers(ulCTEId);
+	pcteinfo->AddCTEConsumer(*ppexprFirstConsumer);
 	pdrgpcrProducerOutput->Release();
 
 	// second consumer reuses the same output columns of SeqPrj child to be able to provide any requested columns upstream
 	*ppexprSecondConsumer = GPOS_NEW(mp) CExpression(
 		mp, GPOS_NEW(mp) CLogicalCTEConsumer(mp, ulCTEId, pdrgpcrChildOutput));
+	pcteinfo->AddCTEConsumer(*ppexprSecondConsumer);
 	pcteinfo->IncrementConsumers(ulCTEId);
 }
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysical.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysical.cpp
index 3f17280221c..bbc1650a357 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysical.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysical.cpp
@@ -59,6 +59,35 @@ CPhysical::CPhysical(CMemoryPool *mp)
 }
 
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CPhysical::BackTraceOptRequests
+//
+//	@doc:
+//		Use back trace to generated the
+//
+//---------------------------------------------------------------------------
+void
+CPhysical::BackTraceOptRequests(UlongPtrArray *pdrgpulpOptReqsExpanded,
+								const ULONG *ulOptReqs, ULONG ulOptReqsSize,
+								ULONG_PTR *current, ULONG cursz)
+{
+	if (cursz == ulOptReqsSize)
+	{
+		ULONG_PTR *copyOne = GPOS_NEW_ARRAY(m_mp, ULONG_PTR, GPOPT_PLAN_PROPS);
+		clib::Memcpy(copyOne, current, GPOPT_PLAN_PROPS * sizeof(ULONG_PTR));
+		pdrgpulpOptReqsExpanded->Append(copyOne);
+		return;
+	}
+
+	for (ULONG i = 0; i < ulOptReqs[cursz]; i++)
+	{
+		current[cursz] = i;
+		BackTraceOptRequests(pdrgpulpOptReqsExpanded, ulOptReqs, ulOptReqsSize,
+							 current, cursz + 1);
+	}
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CPhysical::UpdateOptRequests
@@ -88,37 +117,17 @@ CPhysical::UpdateOptRequests(ULONG ulPropIndex, ULONG ulRequests)
 	m_ulTotalOptRequests = ulOptReqs;
 
 	// update expanded requests
-	const ULONG ulOrderRequests = UlOrderRequests();
-	const ULONG ulDistrRequests = UlDistrRequests();
-	const ULONG ulRewindRequests = UlRewindRequests();
-	const ULONG ulPartPropagateRequests = UlPartPropagateRequests();
+	ULONG ulaOptReqs[GPOPT_PLAN_PROPS] = {UlOrderRequests(), UlDistrRequests(),
+										  UlRewindRequests(),
+										  UlPartPropagateRequests()};
 
 	CRefCount::SafeRelease(m_pdrgpulpOptReqsExpanded);
-	m_pdrgpulpOptReqsExpanded = nullptr;
 	m_pdrgpulpOptReqsExpanded = GPOS_NEW(m_mp) UlongPtrArray(m_mp);
-	for (ULONG ulOrder = 0; ulOrder < ulOrderRequests; ulOrder++)
-	{
-		for (ULONG ulDistr = 0; ulDistr < ulDistrRequests; ulDistr++)
-		{
-			for (ULONG ulRewind = 0; ulRewind < ulRewindRequests; ulRewind++)
-			{
-				for (ULONG ulPartPropagate = 0;
-					 ulPartPropagate < ulPartPropagateRequests;
-					 ulPartPropagate++)
-				{
-					ULONG_PTR *pulpRequest =
-						GPOS_NEW_ARRAY(m_mp, ULONG_PTR, GPOPT_PLAN_PROPS);
-
-					pulpRequest[0] = ulOrder;
-					pulpRequest[1] = ulDistr;
-					pulpRequest[2] = ulRewind;
-					pulpRequest[3] = ulPartPropagate;
 
-					m_pdrgpulpOptReqsExpanded->Append(pulpRequest);
-				}
-			}
-		}
-	}
+	ULONG_PTR *pulpRequest = GPOS_NEW_ARRAY(m_mp, ULONG_PTR, GPOPT_PLAN_PROPS);
+	BackTraceOptRequests(m_pdrgpulpOptReqsExpanded, ulaOptReqs,
+						 GPOPT_PLAN_PROPS, pulpRequest, 0);
+	GPOS_DELETE_ARRAY(pulpRequest);
 }
 
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp
index e8f39bc59b8..d4e9a72649d 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp
@@ -8,7 +8,6 @@
 //	@doc:
 //		Implementation of basic aggregate operator
 //---------------------------------------------------------------------------
-
 #include "gpopt/operators/CPhysicalAgg.h"
 
 #include "gpos/base.h"
@@ -39,12 +38,14 @@ CPhysicalAgg::CPhysicalAgg(
 	CColRefArray *pdrgpcrMinimal,  // minimal grouping columns based on FD's
 	COperator::EGbAggType egbaggtype, BOOL fGeneratesDuplicates,
 	CColRefArray *pdrgpcrArgDQA, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-	CLogicalGbAgg::EAggStage aggStage, BOOL should_enforce_distribution)
+	CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+	BOOL should_enforce_distribution)
 	: CPhysical(mp),
 	  m_pdrgpcr(colref_array),
 	  m_egbaggtype(egbaggtype),
 	  m_isAggFromSplitDQA(isAggFromSplitDQA),
 	  m_aggStage(aggStage),
+	  m_aggpushdown(isAggPushdown),
 	  m_pdrgpcrMinimal(nullptr),
 	  m_fGeneratesDuplicates(fGeneratesDuplicates),
 	  m_pdrgpcrArgDQA(pdrgpcrArgDQA),
@@ -293,11 +294,65 @@ CDistributionSpec *
 CPhysicalAgg::PdsMaximalHashed(CMemoryPool *mp, CColRefArray *colref_array)
 {
 	GPOS_ASSERT(nullptr != colref_array);
+	CColRefArray *pcraResHashs = nullptr;
+
+	if (GPOS_FTRACE(EopttraceAggRRSFirstKey)) {
+		pcraResHashs = GPOS_NEW(mp) CColRefArray(mp);
+		if (colref_array->Size() > 0) {
+			CColRef *colref = (*colref_array)[0];
+			pcraResHashs->Append(colref);
+		}
+	} else if (GPOS_FTRACE(EopttraceAggRRSMinimalLenKey)) {
+		ULONG ulsz = colref_array->Size();
+		pcraResHashs = GPOS_NEW(mp) CColRefArray(mp);
+
+		LINT minimal_typlen = gpos::lint_max; // less than minimal typlen
+		LINT minimal_typlen_ul = -1;
+		for (ULONG ul = 0; ul < ulsz; ul++) {
+			CColRef *pcr =(*colref_array)[ul];
+			const gpmd::IMDType *pmdtyp = pcr->RetrieveType();
+			LINT typlen = pmdtyp->IsFixedLength() ? pmdtyp->Length() : (gpos::lint_max - 1);
+
+			if (typlen < minimal_typlen) {
+				minimal_typlen = typlen;
+				minimal_typlen_ul = ul;
+			}
+		}
+
+		if (minimal_typlen_ul != -1) {
+			pcraResHashs->Append((*colref_array)[minimal_typlen_ul]);
+		}
+	} else if (GPOS_FTRACE(EopttraceAggRRSExcludeNonFixedKey)) {
+		ULONG ulsz = colref_array->Size();
+		pcraResHashs = GPOS_NEW(mp) CColRefArray(mp);
+
+		for (ULONG ul = 0; ul < ulsz; ul++) {
+			CColRef *pcr =(*colref_array)[ul];
+			const gpmd::IMDType *pmdtyp = pcr->RetrieveType();
+			if (pmdtyp->IsFixedLength()) {
+				pcraResHashs->Append(pcr);
+			}
+		}
+
+		// no key in result
+		if (pcraResHashs->Size() == 0) {
+			colref_array->AddRef();
+			pcraResHashs = colref_array;
+		}
+	} else {
+		colref_array->AddRef();
+		pcraResHashs = colref_array;
+	}
+
+	GPOS_ASSERT(nullptr != pcraResHashs);
+	GPOS_ASSERT_IMP(colref_array->Size() > 0, pcraResHashs->Size() > 0);
 
 	CDistributionSpecHashed *pdshashedMaximal =
 		CDistributionSpecHashed::PdshashedMaximal(
-			mp, colref_array, true /*fNullsColocated*/
+			mp, pcraResHashs, true /*fNullsColocated*/
 		);
+
+	pcraResHashs->Release();
 	if (nullptr != pdshashedMaximal)
 	{
 		return pdshashedMaximal;
@@ -696,6 +751,10 @@ CPhysicalAgg::OsPrint(IOstream &os) const
 	{
 		os << ", multi-stage";
 	}
+	if (m_aggpushdown)
+	{
+		os << ", pushdown";
+	}
 	os << " )";
 
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp
index ddd32ab723b..d7a51950fa4 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp
@@ -34,11 +34,29 @@ CPhysicalCTEConsumer::CPhysicalCTEConsumer(CMemoryPool *mp, ULONG id,
 										   UlongToColRefMap *colref_mapping)
 	: CPhysical(mp),
 	  m_id(id),
-	  m_pdrgpcr(colref_array),
-	  m_phmulcr(colref_mapping)
+	  m_pdrgpcr(nullptr),
+	  m_phmulcr(colref_mapping),
+	  m_pidxmap(nullptr)
 {
 	GPOS_ASSERT(nullptr != colref_array);
 	GPOS_ASSERT(nullptr != colref_mapping);
+
+	ULONG colref_size = colref_array->Size();
+	m_pdrgpcr = GPOS_NEW(mp) CColRefArray(mp);
+	m_pidxmap = GPOS_NEW(mp) ULongPtrArray(mp);
+
+	for (ULONG index = 0; index < colref_size; index++) {
+		CColRef *col_ref = (*colref_array)[index];
+		if (col_ref->GetUsage(true, true) == CColRef::EUsed) {
+			m_pdrgpcr->Append(col_ref);
+			m_pidxmap->Append(GPOS_NEW(m_mp) ULONG(index));
+		} 
+	}
+
+	if (m_pidxmap->Size() == colref_size) {
+		m_pidxmap->Release();
+		m_pidxmap = nullptr;
+	}
 }
 
 //---------------------------------------------------------------------------
@@ -53,6 +71,7 @@ CPhysicalCTEConsumer::~CPhysicalCTEConsumer()
 {
 	m_pdrgpcr->Release();
 	m_phmulcr->Release();
+	CRefCount::SafeRelease(m_pidxmap);
 }
 
 //---------------------------------------------------------------------------
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp
index 95fe39e0260..c6be21f87cd 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp
@@ -30,11 +30,49 @@ using namespace gpopt;
 //
 //---------------------------------------------------------------------------
 CPhysicalCTEProducer::CPhysicalCTEProducer(CMemoryPool *mp, ULONG id,
-										   CColRefArray *colref_array)
-	: CPhysical(mp), m_id(id), m_pdrgpcr(colref_array), m_pcrs(nullptr)
+										   CColRefArray *colref_array,
+										   BOOL *umask)
+	: CPhysical(mp), m_id(id), m_pdrgpcr(nullptr), m_pcrs(nullptr), m_pdrgpcr_unused(nullptr), m_pidxmap(nullptr)
 {
 	GPOS_ASSERT(nullptr != colref_array);
-	m_pcrs = GPOS_NEW(mp) CColRefSet(mp, m_pdrgpcr);
+
+#ifdef GPOS_DEBUG
+	if (umask) {
+		ULONG colref_size = colref_array->Size();
+		for (ULONG ul = 0; ul < colref_size; ul++) {
+			CColRef *col_ref = (*colref_array)[ul];
+			if (col_ref->GetUsage(true, true) != CColRef::EUsed) {
+				GPOS_ASSERT(!umask[ul]);
+			}
+		}
+	}
+#endif 
+
+	if (umask) {
+		ULONG colref_size = colref_array->Size();
+		ULONG unused_inc = 0;
+		m_pcrs = GPOS_NEW(mp) CColRefSet(mp);
+		m_pdrgpcr = GPOS_NEW(mp) CColRefArray(mp);
+		m_pdrgpcr_unused = GPOS_NEW(mp) ULongPtrArray(mp, colref_size);
+		m_pidxmap = GPOS_NEW(mp) ULongPtrArray(mp, colref_size);
+
+		for (ULONG ul = 0; ul < colref_size; ul++) {
+			CColRef *col_ref = (*colref_array)[ul];
+			m_pdrgpcr_unused->Append(GPOS_NEW(m_mp) ULONG(unused_inc));
+			if (umask[ul]) {
+				m_pidxmap->Append(GPOS_NEW(m_mp) ULONG(m_pdrgpcr->Size()));
+				m_pdrgpcr->Append(col_ref);
+				m_pcrs->Include(col_ref);
+			} else {
+				m_pidxmap->Append(GPOS_NEW(m_mp) ULONG(gpos::ulong_max));
+				unused_inc++;
+			}
+		}
+		
+	} else {
+		m_pdrgpcr = colref_array;
+		m_pcrs = GPOS_NEW(mp) CColRefSet(mp, m_pdrgpcr);
+	}
 }
 
 //---------------------------------------------------------------------------
@@ -49,6 +87,8 @@ CPhysicalCTEProducer::~CPhysicalCTEProducer()
 {
 	m_pdrgpcr->Release();
 	m_pcrs->Release();
+	CRefCount::SafeRelease(m_pdrgpcr_unused);
+	CRefCount::SafeRelease(m_pidxmap);
 }
 
 //---------------------------------------------------------------------------
@@ -69,12 +109,20 @@ CPhysicalCTEProducer::PcrsRequired(CMemoryPool *mp, CExpressionHandle &exprhdl,
 	GPOS_ASSERT(0 == child_index);
 	GPOS_ASSERT(0 == pcrsRequired->Size());
 
-	CColRefSet *pcrs = GPOS_NEW(mp) CColRefSet(mp, *m_pcrs);
+	CColRefSet *pcrs = GPOS_NEW(mp) CColRefSet(mp);
+	ULONG ccr_size = m_pdrgpcr->Size();
+	for (ULONG index = 0; index < ccr_size; index++) {
+		CColRef *col_ref = (*m_pdrgpcr)[index];
+		GPOS_ASSERT(col_ref->GetUsage() != CColRef::EUnknown);
+		if (col_ref->GetUsage() == CColRef::EUsed) {
+			pcrs->Include(col_ref);
+		}
+	}
+
 	pcrs->Union(pcrsRequired);
 	CColRefSet *pcrsChildReqd =
 		PcrsChildReqd(mp, exprhdl, pcrs, child_index, gpos::ulong_max);
 
-	GPOS_ASSERT(pcrsChildReqd->Size() == m_pdrgpcr->Size());
 	pcrs->Release();
 
 	return pcrsChildReqd;
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp
index b768d623963..6b7788a22a2 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp
@@ -91,4 +91,19 @@ CPhysicalDynamicTableScan::PppsDerive(CMemoryPool *mp,
 	return pps;
 }
 
+
+CEnfdProp::EPropEnforcingType
+CPhysicalDynamicTableScan::EpetRewindability(CExpressionHandle &exprhdl,
+											 const CEnfdRewindability *per) const
+{
+	CRewindabilitySpec *prs = CDrvdPropPlan::Pdpplan(exprhdl.Pdp())->Prs();
+	if (per->FCompatible(prs))
+	{
+		// required rewindability is already provided
+		return CEnfdProp::EpetUnnecessary;
+	}
+
+	return CEnfdProp::EpetRequired;
+}
+
 // EOF
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp
index 198f1e8f7c2..82fd5d09799 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp
@@ -33,10 +33,12 @@ CPhysicalHashAgg::CPhysicalHashAgg(
 	CMemoryPool *mp, CColRefArray *colref_array, CColRefArray *pdrgpcrMinimal,
 	COperator::EGbAggType egbaggtype, BOOL fGeneratesDuplicates,
 	CColRefArray *pdrgpcrArgDQA, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-	CLogicalGbAgg::EAggStage aggStage, BOOL should_enforce_distribution)
+	CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+	BOOL should_enforce_distribution)
 	: CPhysicalAgg(mp, colref_array, pdrgpcrMinimal, egbaggtype,
 				   fGeneratesDuplicates, pdrgpcrArgDQA, fMultiStage,
-				   isAggFromSplitDQA, aggStage, should_enforce_distribution)
+				   isAggFromSplitDQA, aggStage, isAggPushdown,
+				   should_enforce_distribution)
 {
 }
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp
index 089f431e261..41aab57db29 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp
@@ -33,11 +33,12 @@ CPhysicalHashAggDeduplicate::CPhysicalHashAggDeduplicate(
 	CMemoryPool *mp, CColRefArray *colref_array, CColRefArray *pdrgpcrMinimal,
 	COperator::EGbAggType egbaggtype, CColRefArray *pdrgpcrKeys,
 	BOOL fGeneratesDuplicates, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-	CLogicalGbAgg::EAggStage aggStage, BOOL should_enforce_distribution)
+	CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+	BOOL should_enforce_distribution)
 	: CPhysicalHashAgg(mp, colref_array, pdrgpcrMinimal, egbaggtype,
 					   fGeneratesDuplicates, nullptr /*pdrgpcrGbMinusDistinct*/,
 					   fMultiStage, isAggFromSplitDQA, aggStage,
-					   should_enforce_distribution),
+					   isAggPushdown, should_enforce_distribution),
 	  m_pdrgpcrKeys(pdrgpcrKeys)
 {
 	GPOS_ASSERT(nullptr != pdrgpcrKeys);
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashSequenceProject.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalHashSequenceProject.cpp
new file mode 100644
index 00000000000..4a6fee19a81
--- /dev/null
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalHashSequenceProject.cpp
@@ -0,0 +1,151 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * CPhysicalHashSequenceProject.cpp
+ *
+ * IDENTIFICATION
+ *	  src/backend/gporca/libgpopt/src/operators/CPhysicalHashSequenceProject.cpp
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "gpopt/operators/CPhysicalHashSequenceProject.h"
+
+#include "gpos/base.h"
+
+#include "gpopt/base/CDistributionSpecAny.h"
+#include "gpopt/base/CDistributionSpecHashed.h"
+#include "gpopt/base/CDistributionSpecReplicated.h"
+#include "gpopt/base/CDistributionSpecSingleton.h"
+#include "gpopt/base/COptCtxt.h"
+#include "gpopt/base/CUtils.h"
+#include "gpopt/base/CWindowFrame.h"
+#include "gpopt/cost/ICostModel.h"
+#include "gpopt/operators/CExpressionHandle.h"
+#include "gpopt/operators/CLogicalSequenceProject.h"
+#include "gpopt/operators/CScalarIdent.h"
+
+using namespace gpopt;
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CPhysicalHashSequenceProject::CPhysicalHashSequenceProject
+//
+//	@doc:
+//		Ctor
+//
+//---------------------------------------------------------------------------
+CPhysicalHashSequenceProject::CPhysicalHashSequenceProject(CMemoryPool *mp,
+												   ESPType sptype,
+												   CDistributionSpec *pds,
+												   COrderSpecArray *pdrgpos,
+												   CWindowFrameArray *pdrgpwf)
+	: CPhysicalSequenceProject(mp, sptype, pds, pdrgpos, pdrgpwf) 
+{}
+
+CPhysicalHashSequenceProject::~CPhysicalHashSequenceProject() {}
+
+COrderSpec *
+CPhysicalHashSequenceProject::PosRequired(CMemoryPool *mp,
+									  CExpressionHandle &,	// exprhdl
+									  COrderSpec *,			// posRequired
+									  ULONG
+#ifdef GPOS_DEBUG
+										  child_index
+#endif	// GPOS_DEBUG
+									  ,
+									  CDrvdPropArray *,	 // pdrgpdpCtxt
+									  ULONG				 // ulOptReq
+) const
+{
+	GPOS_ASSERT(0 == child_index);
+	return GPOS_NEW(mp) COrderSpec(mp);
+}
+
+// match function
+BOOL 
+CPhysicalHashSequenceProject::Matches(COperator *pop) const
+{
+	GPOS_ASSERT(nullptr != pop);
+	if (Eopid() == pop->Eopid())
+	{
+		CPhysicalHashSequenceProject *popHashSequenceProject =
+			CPhysicalHashSequenceProject::PopConvert(pop);
+		return m_sptype == popHashSequenceProject->Pspt() &&
+			   m_pds->Matches(popHashSequenceProject->Pds()) &&
+			   CWindowFrame::Equals(m_pdrgpwf,
+									popHashSequenceProject->Pdrgpwf()) &&
+			   COrderSpec::Equals(m_pdrgpos,
+								  popHashSequenceProject->Pdrgpos());
+	}
+
+	return false;
+}
+
+// hashing function
+
+ULONG
+CPhysicalHashSequenceProject::HashValue() const
+{
+	BOOL ltrue = true;
+	ULONG ulHash = CPhysicalSequenceProject::HashValue();
+	
+	ulHash = gpos::CombineHashes(ulHash, m_pds->HashValue());
+	// combine a true hash value
+	ulHash = gpos::CombineHashes(ulHash, gpos::HashValue<BOOL>(&ltrue));
+
+	return ulHash;
+}
+
+BOOL
+CPhysicalHashSequenceProject::FInputOrderSensitive() const {
+	return false;
+}
+
+CEnfdProp::EPropEnforcingType
+CPhysicalHashSequenceProject::EpetOrder(CExpressionHandle &/*exprhdl*/,
+									const CEnfdOrder *
+#ifdef GPOS_DEBUG
+									peo
+#endif	// GPOS_DEBUG
+) const
+{
+	GPOS_ASSERT(nullptr != peo);
+	GPOS_ASSERT(!peo->PosRequired()->IsEmpty());
+
+	return CEnfdProp::EpetRequired;
+}
+
+
+IOstream &CPhysicalHashSequenceProject::OsPrint(IOstream &os) const
+{
+	os << SzId() << " (";
+	CLogicalSequenceProject::OsPrintWindowType(os, m_sptype);
+	os << ", hashed) (";
+	(void) m_pds->OsPrint(os);
+	os << ", ";
+	(void) COrderSpec::OsPrint(os, m_pdrgpos);
+	os << ", ";
+	(void) CWindowFrame::OsPrint(os, m_pdrgpwf);
+
+	return os << ")";
+}
+
+
+// EOF
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp
index 6b1f54fdfb4..c63f2790376 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp
@@ -33,10 +33,12 @@ CPhysicalScalarAgg::CPhysicalScalarAgg(
 	CMemoryPool *mp, CColRefArray *colref_array, CColRefArray *pdrgpcrMinimal,
 	COperator::EGbAggType egbaggtype, BOOL fGeneratesDuplicates,
 	CColRefArray *pdrgpcrArgDQA, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-	CLogicalGbAgg::EAggStage aggStage, BOOL should_enforce_distribution)
+	CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+	BOOL should_enforce_distribution)
 	: CPhysicalAgg(mp, colref_array, pdrgpcrMinimal, egbaggtype,
 				   fGeneratesDuplicates, pdrgpcrArgDQA, fMultiStage,
-				   isAggFromSplitDQA, aggStage, should_enforce_distribution)
+				   isAggFromSplitDQA, aggStage, isAggPushdown,
+				   should_enforce_distribution)
 {
 }
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp
index 4b663137cf4..3c5aade6eb9 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp
@@ -563,13 +563,12 @@ CPhysicalSequenceProject::OsPrint(IOstream &os) const
 {
 	os << SzId() << " (";
 	CLogicalSequenceProject::OsPrintWindowType(os, m_sptype);
-	os << ") (";
-	(void) m_pds->OsPrint(os);
+	os << ", non-hashed) (";
+	(void) m_pds->OsPrintNoWrap(os);
 	os << ", ";
 	(void) COrderSpec::OsPrint(os, m_pdrgpos);
 	os << ", ";
 	(void) CWindowFrame::OsPrint(os, m_pdrgpwf);
-
 	return os << ")";
 }
 
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp
index 156f24d92ee..4f4b31de650 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp
@@ -36,10 +36,12 @@ CPhysicalStreamAgg::CPhysicalStreamAgg(
 	CMemoryPool *mp, CColRefArray *colref_array, CColRefArray *pdrgpcrMinimal,
 	COperator::EGbAggType egbaggtype, BOOL fGeneratesDuplicates,
 	CColRefArray *pdrgpcrArgDQA, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-	CLogicalGbAgg::EAggStage aggStage, BOOL should_enforce_distribution)
+	CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+	BOOL should_enforce_distribution)
 	: CPhysicalAgg(mp, colref_array, pdrgpcrMinimal, egbaggtype,
 				   fGeneratesDuplicates, pdrgpcrArgDQA, fMultiStage,
-				   isAggFromSplitDQA, aggStage, should_enforce_distribution),
+				   isAggFromSplitDQA, aggStage, isAggPushdown,
+				   should_enforce_distribution),
 	  m_pos(nullptr)
 {
 	GPOS_ASSERT(nullptr != m_pdrgpcrMinimal);
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp
index 500c9cdcb8e..8af573b6285 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp
@@ -31,11 +31,12 @@ CPhysicalStreamAggDeduplicate::CPhysicalStreamAggDeduplicate(
 	CMemoryPool *mp, CColRefArray *colref_array, CColRefArray *pdrgpcrMinimal,
 	COperator::EGbAggType egbaggtype, CColRefArray *pdrgpcrKeys,
 	BOOL fGeneratesDuplicates, BOOL fMultiStage, BOOL isAggFromSplitDQA,
-	CLogicalGbAgg::EAggStage aggStage, BOOL should_enforce_distribution)
+	CLogicalGbAgg::EAggStage aggStage, BOOL isAggPushdown,
+	BOOL should_enforce_distribution)
 	: CPhysicalStreamAgg(
 		  mp, colref_array, pdrgpcrMinimal, egbaggtype, fGeneratesDuplicates,
 		  nullptr /*pdrgpcrGbMinusDistinct*/, fMultiStage, isAggFromSplitDQA,
-		  aggStage, should_enforce_distribution),
+		  aggStage, isAggPushdown, should_enforce_distribution),
 	  m_pdrgpcrKeys(pdrgpcrKeys)
 {
 	GPOS_ASSERT(nullptr != pdrgpcrKeys);
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp b/src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp
index 1b553bfd48f..b083905d0ab 100644
--- a/src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp
+++ b/src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp
@@ -100,7 +100,10 @@ CPhysicalTableScan::OsPrint(IOstream &os) const
 	// actual name of table in catalog and columns
 	os << " (";
 	m_ptabdesc->Name().OsPrint(os);
-	os << ")";
+	os << "), Columns: [";
+
+	CUtils::OsPrintDrgPcr(os, m_pdrgpcrOutput);
+	os << "]";
 
 	return os;
 }
diff --git a/src/backend/gporca/libgpopt/src/operators/Makefile b/src/backend/gporca/libgpopt/src/operators/Makefile
index c495244b032..faa0f9a70d6 100644
--- a/src/backend/gporca/libgpopt/src/operators/Makefile
+++ b/src/backend/gporca/libgpopt/src/operators/Makefile
@@ -130,6 +130,7 @@ OBJS        = CExpression.o \
               CPhysicalScan.o \
               CPhysicalSequence.o \
               CPhysicalSequenceProject.o \
+              CPhysicalHashSequenceProject.o \
               CPhysicalSerialUnionAll.o \
               CPhysicalSort.o \
               CPhysicalSplit.o \
@@ -189,7 +190,8 @@ OBJS        = CExpression.o \
               CStrictHashedDistributions.o \
               COrderedAggPreprocessor.o \
               CLeftJoinPruningPreprocessor.o \
-              CJoinOrderHintsPreprocessor.o
+              CJoinOrderHintsPreprocessor.o \
+              CDedupSupersetPreprocessor.o
 
 include $(top_srcdir)/src/backend/common.mk
 
diff --git a/src/backend/gporca/libgpopt/src/search/CGroup.cpp b/src/backend/gporca/libgpopt/src/search/CGroup.cpp
index ed317dc302f..18b4cf44e5b 100644
--- a/src/backend/gporca/libgpopt/src/search/CGroup.cpp
+++ b/src/backend/gporca/libgpopt/src/search/CGroup.cpp
@@ -861,6 +861,12 @@ CGroup::AppendStats(CMemoryPool *mp, IStatistics *stats)
 	GPOS_ASSERT(nullptr != stats);
 	GPOS_ASSERT(nullptr != Pstats());
 
+	if (FDuplicateGroup())
+	{
+		PgroupDuplicate()->AppendStats(mp, stats);
+		return;
+	}
+
 	IStatistics *stats_copy = Pstats()->CopyStats(mp);
 	stats_copy->AppendStats(mp, stats);
 
diff --git a/src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp b/src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp
index 0ff250dd0a0..dffd10cb35f 100644
--- a/src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp
+++ b/src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp
@@ -1098,6 +1098,16 @@ CGroupExpression::OsPrintCostContexts(IOstream &os, const CHAR *szPrefix) const
 // 4: CLogicalInnerJoin [ 6 7 3 ] Origin: (xform: CXformExpandNAryJoinGreedy, Grp: 4, GrpExpr: 3)
 //
 // Group 0 (#GExprs: 0, Duplicate Group: 4):
+//
+// There is also a chance that one of the group's expressions refers to the same group.
+// This can happen if one of the groups has a link to another group, which in turn is its duplicate.
+// Example: Group 0 is a duplicate of group 12, while it has an expression 1
+// that refers to group 12. After the groups merge, this expression will end up
+// in group 12, which will lead to a cyclical relationship.
+// Group 0 (#GExprs: 3, Duplicate Group: 12):
+//  0: CLogicalCTEConsumer (1), Columns: ["a" (98), "b" (99), "c" (100)] [ ]
+//  1: CLogicalSelect [ 12 3 ]
+//  2: CLogicalNAryJoin [ 13 14 15 ]
 BOOL
 CGroupExpression::ContainsCircularDependencies()
 {
@@ -1118,6 +1128,14 @@ CGroupExpression::ContainsCircularDependencies()
 		{
 			continue;
 		}
+
+		if (child_group->Id() == m_pgroup->Id())
+		{
+			m_ecirculardependency = CGroupExpression::ecdCircularDependency;
+			GPOS_ASSERT(Pgroup()->UlGExprs() > 1);
+			break;
+		}
+
 		CGroup *child_duplicate_group = child_group->PgroupDuplicate();
 		if (child_duplicate_group != nullptr)
 		{
diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp b/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp
index bad4b1e8123..c592a7ab7f3 100644
--- a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp
+++ b/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp
@@ -18,6 +18,7 @@
 #include "gpopt/base/CAutoOptCtxt.h"
 #include "gpopt/base/CColRef.h"
 #include "gpopt/base/CColRefSet.h"
+#include "gpopt/base/CColRefSetIter.h"
 #include "gpopt/base/CColumnFactory.h"
 #include "gpopt/base/CDistributionSpecAny.h"
 #include "gpopt/base/CEnfdDistribution.h"
@@ -173,8 +174,6 @@ CTranslatorDXLToExpr::CTranslatorDXLToExpr(CMemoryPool *mp,
 {
 	// initialize hash tables
 	m_phmulcr = GPOS_NEW(m_mp) UlongToColRefMap(m_mp);
-
-	// initialize hash tables
 	m_phmululCTE = GPOS_NEW(m_mp) UlongToUlongMap(m_mp);
 
 	if (fInitColumnFactory)
@@ -278,7 +277,7 @@ CTranslatorDXLToExpr::Pexpr(const CDXLNode *dxlnode,
 		const ULONG colid = dxl_colref->Id();
 
 		// get its column reference from the hash map
-		const CColRef *colref = LookupColRef(m_phmulcr, colid);
+		const CColRef *colref = LookupColRef(colid);
 
 		if (fGenerateRequiredColumns)
 		{
@@ -294,9 +293,105 @@ CTranslatorDXLToExpr::Pexpr(const CDXLNode *dxlnode,
 		}
 	}
 
+	// Finally, prune the unused output in CTE producer and consumer
+	(void) PruneCTEs();
 	return pexpr;
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorDXLToExpr::Pexpr
+//
+//	@doc:
+//		prune the CTEs producer and consumer after DXL tree translated
+//
+//---------------------------------------------------------------------------
+void CTranslatorDXLToExpr::PruneCTEs() 
+{
+	CCTEInfo *pcteinfo = COptCtxt::PoctxtFromTLS()->Pcteinfo();
+	ULONG group_of_ctes = pcteinfo->CTESize();
+	if (group_of_ctes > 0) {
+		for (ULONG ulCTEId = 0; ulCTEId < group_of_ctes; ulCTEId++){
+			BOOL *umask;
+
+			CExpression *ppexpr = pcteinfo->PexprCTEProducer(ulCTEId);
+			CLogicalCTEProducer *poper = CLogicalCTEProducer::PopConvert(ppexpr->Pop());
+			ULONG pprgpcrsz = poper->Pdrgpcr()->Size();
+			
+			// the producer can't be prune
+			if (!poper->CanBePruned()) {
+				continue;
+			}
+
+			CExpressionArray *cexprs = pcteinfo->PexprCTEConsumer(ulCTEId);
+			ULONG cpexrssz = cexprs->Size();
+
+			// The current consumer is likely to be inlined
+			// So just not prune it.
+			if (pcteinfo->UlConsumers(poper->UlCTEId()) == 1) {
+				for (ULONG ulPos = 0; ulPos < cpexrssz; ulPos++) {
+					CExpression *cepxr = (*cexprs)[ulPos];
+					CLogicalCTEConsumer *coper = CLogicalCTEConsumer::PopConvert(cepxr->Pop());
+					CColRefArray *colrefs = coper->Pdrgpcr();
+					for (ULONG ulcrPos = 0; ulcrPos < colrefs->Size(); ulcrPos++) {
+						CColRef *colref = (*colrefs)[ulcrPos];
+						colref->MarkAsUsed();
+						MarkCTEConsumerColAsUsed(pcteinfo->GetCTEConsumerMapping(), colref->Id());
+					}
+				}
+				continue;
+			}
+			
+			// Calculate the columns of the current consumer requested
+			umask = GPOS_NEW_ARRAY(m_mp, BOOL, pprgpcrsz);
+			clib::Memset(umask, false, pprgpcrsz * sizeof(BOOL));
+
+			for (ULONG ulPos = 0; ulPos < cpexrssz; ulPos++) {
+				CExpression *cepxr = (*cexprs)[ulPos];
+				CLogicalCTEConsumer *coper = CLogicalCTEConsumer::PopConvert(cepxr->Pop());
+				CColRefArray *colrefs = coper->Pdrgpcr();
+
+				GPOS_ASSERT(pprgpcrsz == colrefs->Size());
+
+				for (ULONG ulcrPos = 0; ulcrPos < pprgpcrsz; ulcrPos++) {
+					if ((*colrefs)[ulcrPos]->GetUsage(true, true) == CColRef::EUsed) {
+						umask[ulcrPos] = true;	
+					}
+				}
+
+				coper->MarkAsPruned();
+			}
+
+			// Recalculate the producer's output columns
+			// no need relase umask 
+			poper->RecalOutputColumns(umask, pprgpcrsz);
+
+			// Align consumer and producer output columns.
+			// In fact, we can support the column projection in consumer(ShareInputScan).
+			// However, non-requested columns in consumer(which from producer) may be added to the consumer, 
+			// which will make the plan for consumer(support projection) very complicated. 
+			//
+			// In addition, the performance gain is not significant when the consumer supports projection.
+			CColRefSet *pcrs = poper->DeriveOutputColumns();
+			for (ULONG ulPos = 0; ulPos < cpexrssz; ulPos++) {
+				CExpression *cepxr = (*cexprs)[ulPos];
+				CLogicalCTEConsumer *coper = CLogicalCTEConsumer::PopConvert(cepxr->Pop());
+				UlongToColRefMap *colmaping = coper->Phmulcr();
+
+				CColRefSetIter crsi(*pcrs);
+				while (crsi.Advance())
+				{
+					ULONG colid = crsi.Pcr()->Id();
+					CColRef *consumer_colref = colmaping->Find(&colid);
+					GPOS_ASSERT(consumer_colref);
+					consumer_colref->MarkAsUsed();
+				}
+
+			}
+		}
+	}
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorDXLToExpr::Pexpr
@@ -721,8 +816,7 @@ CTranslatorDXLToExpr::PexprLogicalSetOp(const CDXLNode *dxlnode)
 		PdrgpexprPreprocessSetOpInputs(dxlnode, pdrgdrgpcrInput, pdrgpulOutput);
 
 	// create an array of output column references
-	CColRefArray *pdrgpcrOutput = CTranslatorDXLToExprUtils::Pdrgpcr(
-		m_mp, m_phmulcr, pdrgpulOutput /*array of colids of the first child*/);
+	CColRefArray *pdrgpcrOutput = Pdrgpcr(pdrgpulOutput /*array of colids of the first child*/);
 
 	pdrgpulOutput->Release();
 
@@ -879,7 +973,7 @@ CTranslatorDXLToExpr::BuildSetOpChild(
 	{
 		// column identifier of the input column
 		ULONG colid = *(*pdrgpulInput)[ulColPos];
-		const CColRef *colref = LookupColRef(m_phmulcr, colid);
+		const CColRef *colref = LookupColRef(colid);
 
 		// corresponding output column descriptor
 		const CDXLColDescr *pdxlcdOutput = dxl_op->GetColumnDescrAt(ulColPos);
@@ -1033,6 +1127,22 @@ CTranslatorDXLToExpr::FCastingUnknownType(IMDId *pmdidSource, IMDId *mdid_dest)
 			 mdid_dest->Equals(&CMDIdGPDB::m_mdid_unknown)));
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorDXLToExpr::MarkCTEConsumerColAsUsed
+//
+//	@doc:
+//		after the colref in CTE consumer marked used, the producer should marked 
+//		the relatived colref as used.
+//---------------------------------------------------------------------------
+void 
+CTranslatorDXLToExpr::MarkCTEConsumerColAsUsed(UlongToColRefMap *mcidcrCTE, ULONG colid) {
+	CColRef *producer_colref = nullptr;
+	producer_colref = mcidcrCTE->Find(&colid);
+	if (producer_colref) {
+		producer_colref->MarkAsUsed();
+	}
+}
 
 //---------------------------------------------------------------------------
 //	@function:
@@ -1043,24 +1153,28 @@ CTranslatorDXLToExpr::FCastingUnknownType(IMDId *pmdidSource, IMDId *mdid_dest)
 //		the column is not found
 //---------------------------------------------------------------------------
 CColRef *
-CTranslatorDXLToExpr::LookupColRef(UlongToColRefMap *colref_mapping,
-								   ULONG colid)
+CTranslatorDXLToExpr::LookupColRef(ULONG colid, BOOL mark_used)
 {
-	GPOS_ASSERT(nullptr != colref_mapping);
+	CColRef *colref = nullptr;
 	GPOS_ASSERT(gpos::ulong_max != colid);
 
-	// get its column reference from the hash map
-	CColRef *colref = colref_mapping->Find(&colid);
+	colref = m_phmulcr->Find(&colid);
 	if (nullptr == colref)
 	{
 		GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiDXL2ExprAttributeNotFound, colid);
 	}
 
-	colref->MarkAsUsed();
+	auto pcteinfo = COptCtxt::PoctxtFromTLS()->Pcteinfo();
+
+	if (pcteinfo->ExistCTE()) {
+		MarkCTEConsumerColAsUsed(pcteinfo->GetCTEConsumerMapping(), colref->Id());
+	}
+
+	if (mark_used)
+		colref->MarkAsUsed();
 	return colref;
 }
 
-
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorDXLToExpr::PcrCreate
@@ -1120,6 +1234,35 @@ CTranslatorDXLToExpr::Pdrgpcr(const CDXLColDescrArray *dxl_col_descr_array)
 	return pdrgpcrOutput;
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorDXLToExpr::Pdrgpcr
+//
+//	@doc:
+// 		Construct a dynamic array of column references corresponding to the
+//		given col ids
+//
+//---------------------------------------------------------------------------
+CColRefArray *
+CTranslatorDXLToExpr::Pdrgpcr(const ULongPtrArray *colids)
+{
+	GPOS_ASSERT(nullptr != colids);
+
+	CColRefArray *colref_array = GPOS_NEW(m_mp) CColRefArray(m_mp);
+
+	for (ULONG ul = 0; ul < colids->Size(); ul++)
+	{
+		ULONG *pulColId = (*colids)[ul];
+		CColRef *colref = LookupColRef(*pulColId, true);
+		GPOS_ASSERT(nullptr != colref);
+
+		colref_array->Append(colref);
+	}
+
+	return colref_array;
+}
+
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorDXLToExpr::ConstructDXLColId2ColRefMapping
@@ -1288,6 +1431,7 @@ CTranslatorDXLToExpr::PexprLogicalCTEProducer(const CDXLNode *dxlnode)
 	CDXLLogicalCTEProducer *pdxlopCTEProducer =
 		CDXLLogicalCTEProducer::Cast(dxlnode->GetOperator());
 	ULONG id = UlMapCTEId(pdxlopCTEProducer->Id());
+	BOOL cbp = pdxlopCTEProducer->CouldBePruned();
 
 	// translate the child dxl node
 	CExpression *pexprChild = PexprLogical((*dxlnode)[0]);
@@ -1303,12 +1447,28 @@ CTranslatorDXLToExpr::PexprLogicalCTEProducer(const CDXLNode *dxlnode)
 
 	ULongPtrArray *pdrgpulCols = pdxlopCTEProducer->GetOutputColIdsArray();
 	const ULONG length = pdrgpulCols->Size();
+
+#ifdef GPOS_DEBUG
+	CAutoTrace at(m_mp);
+	auto & io_stream = at.Os();
+	if (GPOS_FTRACE(EopttraceDebugCTE)) {
+		io_stream << "PexprLogicalCTEProducer, output col lengths: " << length << "" << std::endl;
+	}
+#endif
+
 	for (ULONG ul = 0; ul < length; ul++)
 	{
 		ULONG *pulColId = (*pdrgpulCols)[ul];
-		CColRef *colref = LookupColRef(m_phmulcr, *pulColId);
+		CColRef *colref = LookupColRef(*pulColId, !cbp /* mark_used */);
 		GPOS_ASSERT(nullptr != colref);
 
+#ifdef GPOS_DEBUG
+		if (GPOS_FTRACE(EopttraceDebugCTE)) {
+			io_stream << "DXL id: " << *pulColId << ", col: ";
+			colref->OsPrint(io_stream);
+			io_stream << std::endl;
+		}
+#endif
 		if (pcrsProducer->FMember(colref))
 		{
 			// the column was previously used, so introduce a project node to relabel
@@ -1343,7 +1503,7 @@ CTranslatorDXLToExpr::PexprLogicalCTEProducer(const CDXLNode *dxlnode)
 	pcrsProducer->Release();
 
 	return GPOS_NEW(m_mp) CExpression(
-		m_mp, GPOS_NEW(m_mp) CLogicalCTEProducer(m_mp, id, colref_array),
+		m_mp, GPOS_NEW(m_mp) CLogicalCTEProducer(m_mp, id, colref_array, cbp),
 		pexprChild);
 }
 
@@ -1370,10 +1530,12 @@ CTranslatorDXLToExpr::PexprLogicalCTEConsumer(const CDXLNode *dxlnode)
 	CCTEInfo *pcteinfo = COptCtxt::PoctxtFromTLS()->Pcteinfo();
 	CExpression *pexprProducer = pcteinfo->PexprCTEProducer(id);
 	GPOS_ASSERT(nullptr != pexprProducer);
+	CLogicalCTEProducer *popProducer= CLogicalCTEProducer::PopConvert(pexprProducer->Pop());
 
-	CColRefArray *pdrgpcrProducer =
-		CLogicalCTEProducer::PopConvert(pexprProducer->Pop())->Pdrgpcr();
-	CColRefArray *pdrgpcrConsumer = CUtils::PdrgpcrCopy(m_mp, pdrgpcrProducer);
+	CColRefArray *pdrgpcrProducer = popProducer->Pdrgpcr();
+	BOOL can_pruned = popProducer->CanBePruned();
+	CColRefArray *pdrgpcrConsumer = CUtils::PdrgpcrCopy(m_mp, pdrgpcrProducer, 
+		false, nullptr, pcteinfo->GetCTEConsumerMapping(), nullptr, can_pruned);
 
 	// add new colrefs to mapping
 	const ULONG num_cols = pdrgpcrConsumer->Size();
@@ -1383,13 +1545,40 @@ CTranslatorDXLToExpr::PexprLogicalCTEConsumer(const CDXLNode *dxlnode)
 		ULONG *pulColId = GPOS_NEW(m_mp) ULONG(*(*pdrgpulCols)[ul]);
 		CColRef *colref = (*pdrgpcrConsumer)[ul];
 
+		// reset consumer col array to unknown
+		if (can_pruned)
+			colref->MarkAsUnknown();
+
 		BOOL result GPOS_ASSERTS_ONLY = m_phmulcr->Insert(pulColId, colref);
 		GPOS_ASSERT(result);
+
+#ifdef GPOS_DEBUG
+		CAutoTrace at(m_mp);
+		auto & io_stream = at.Os();
+		if (GPOS_FTRACE(EopttraceDebugCTE)) {
+		
+			io_stream << "m_phmulcr->Insert: " << *pulColId << ",";
+			colref->OsPrint(io_stream);
+			io_stream << std::endl;
+			io_stream << "PexprLogicalCTEConsumer m_phmulcr: " << std::endl;
+			UlongToColRefMapIter iter(m_phmulcr);
+			while (iter.Advance())
+			{
+				CColRef *colref = m_phmulcr->Find(iter.Key());
+				io_stream << "key: " << *iter.Key() << ", value: ";
+				colref->OsPrint(io_stream);
+				io_stream << " .";
+			}
+		}
+#endif
 	}
 
-	pcteinfo->IncrementConsumers(id, m_ulCTEId);
-	return GPOS_NEW(m_mp) CExpression(
+	CExpression *pexprcs =  GPOS_NEW(m_mp) CExpression(
 		m_mp, GPOS_NEW(m_mp) CLogicalCTEConsumer(m_mp, id, pdrgpcrConsumer));
+	pcteinfo->IncrementConsumers(id, m_ulCTEId);
+	pcteinfo->AddCTEConsumer(pexprcs);
+
+	return pexprcs;
 }
 
 //---------------------------------------------------------------------------
@@ -1440,8 +1629,7 @@ CTranslatorDXLToExpr::PexprLogicalInsert(const CDXLNode *dxlnode)
 	CTableDescriptor *ptabdesc = Ptabdesc(pdxlopInsert->GetDXLTableDescr());
 
 	ULongPtrArray *pdrgpulSourceCols = pdxlopInsert->GetSrcColIdsArray();
-	CColRefArray *colref_array =
-		CTranslatorDXLToExprUtils::Pdrgpcr(m_mp, m_phmulcr, pdrgpulSourceCols);
+	CColRefArray *colref_array = Pdrgpcr(pdrgpulSourceCols);
 
 	return GPOS_NEW(m_mp) CExpression(
 		m_mp, GPOS_NEW(m_mp) CLogicalInsert(m_mp, ptabdesc, colref_array),
@@ -1478,12 +1666,11 @@ CTranslatorDXLToExpr::PexprLogicalDelete(const CDXLNode *dxlnode)
 	ULONG ctid_colid = pdxlopDelete->GetCtIdColId();
 	ULONG segid_colid = pdxlopDelete->GetSegmentIdColId();
 
-	CColRef *pcrCtid = LookupColRef(m_phmulcr, ctid_colid);
-	CColRef *pcrSegmentId = LookupColRef(m_phmulcr, segid_colid);
+	CColRef *pcrCtid = LookupColRef(ctid_colid);
+	CColRef *pcrSegmentId = LookupColRef(segid_colid);
 
 	ULongPtrArray *pdrgpulCols = pdxlopDelete->GetDeletionColIdArray();
-	CColRefArray *colref_array =
-		CTranslatorDXLToExprUtils::Pdrgpcr(m_mp, m_phmulcr, pdrgpulCols);
+	CColRefArray *colref_array = Pdrgpcr(pdrgpulCols);
 
 	return GPOS_NEW(m_mp) CExpression(
 		m_mp,
@@ -1542,16 +1729,16 @@ CTranslatorDXLToExpr::PexprLogicalUpdate(const CDXLNode *dxlnode)
 	ULONG ctid_colid = pdxlopUpdate->GetCtIdColId();
 	ULONG segid_colid = pdxlopUpdate->GetSegmentIdColId();
 
-	CColRef *pcrCtid = LookupColRef(m_phmulcr, ctid_colid);
-	CColRef *pcrSegmentId = LookupColRef(m_phmulcr, segid_colid);
+	CColRef *pcrCtid = LookupColRef(ctid_colid);
+	CColRef *pcrSegmentId = LookupColRef(segid_colid);
 
 	ULongPtrArray *pdrgpulInsertCols = pdxlopUpdate->GetInsertionColIdArray();
 	CColRefArray *pdrgpcrInsert =
-		CTranslatorDXLToExprUtils::Pdrgpcr(m_mp, m_phmulcr, pdrgpulInsertCols);
+		Pdrgpcr(pdrgpulInsertCols);
 
 	ULongPtrArray *pdrgpulDeleteCols = pdxlopUpdate->GetDeletionColIdArray();
 	CColRefArray *pdrgpcrDelete =
-		CTranslatorDXLToExprUtils::Pdrgpcr(m_mp, m_phmulcr, pdrgpulDeleteCols);
+		Pdrgpcr(pdrgpulDeleteCols);
 
 	return GPOS_NEW(m_mp)
 		CExpression(m_mp,
@@ -1583,8 +1770,7 @@ CTranslatorDXLToExpr::PexprLogicalCTAS(const CDXLNode *dxlnode)
 	CTableDescriptor *ptabdesc = PtabdescFromCTAS(pdxlopCTAS);
 
 	ULongPtrArray *pdrgpulSourceCols = pdxlopCTAS->GetSrcColidsArray();
-	CColRefArray *colref_array =
-		CTranslatorDXLToExprUtils::Pdrgpcr(m_mp, m_phmulcr, pdrgpulSourceCols);
+	CColRefArray *colref_array = Pdrgpcr(pdrgpulSourceCols);
 
 	return GPOS_NEW(m_mp) CExpression(
 		m_mp, GPOS_NEW(m_mp) CLogicalInsert(m_mp, ptabdesc, colref_array),
@@ -1616,8 +1802,7 @@ CTranslatorDXLToExpr::PexprLogicalGroupBy(const CDXLNode *dxlnode)
 	CExpression *pexprProjList = PexprScalarProjList(pdxlnPrL);
 
 	// translate grouping columns
-	CColRefArray *pdrgpcrGroupingCols = CTranslatorDXLToExprUtils::Pdrgpcr(
-		m_mp, m_phmulcr, pdxlopGrpby->GetGroupingColidArray());
+	CColRefArray *pdrgpcrGroupingCols = Pdrgpcr(pdxlopGrpby->GetGroupingColidArray());
 
 	if (0 != pexprProjList->Arity())
 	{
@@ -1908,7 +2093,7 @@ CTranslatorDXLToExpr::PdrgpcrPartitionByCol(
 		const ULONG *pulColId = (*partition_by_colid_array)[ul];
 
 		// get its column reference from the hash map
-		CColRef *colref = LookupColRef(m_phmulcr, *pulColId);
+		CColRef *colref = LookupColRef(*pulColId);
 		colref_array->Append(colref);
 	}
 
@@ -2533,7 +2718,7 @@ CTranslatorDXLToExpr::PexprScalarSubqueryQuantified(
 	CExpression *pexprScalarChild = Pexpr(pdxlnScalarChild);
 
 	// get colref for subquery colid
-	const CColRef *colref = LookupColRef(m_phmulcr, colid);
+	const CColRef *colref = LookupColRef(colid);
 
 	CScalar *popScalarSubquery = nullptr;
 	if (EdxlopScalarSubqueryAny == edxlopid)
@@ -3490,7 +3675,7 @@ CTranslatorDXLToExpr::PexprScalarIdent(const CDXLNode *pdxlnIdent)
 	const ULONG colid = dxl_colref->Id();
 
 	// get its column reference from the hash map
-	const CColRef *colref = LookupColRef(m_phmulcr, colid);
+	const CColRef *colref = LookupColRef(colid);
 	CExpression *pexpr = GPOS_NEW(m_mp)
 		CExpression(m_mp, GPOS_NEW(m_mp) CScalarIdent(m_mp, colref));
 
@@ -3955,7 +4140,7 @@ CTranslatorDXLToExpr::PexprScalarSubquery(const CDXLNode *pdxlnSubquery)
 
 	// get subquery colref for colid
 	ULONG colid = pdxlopSubquery->GetColId();
-	const CColRef *colref = LookupColRef(m_phmulcr, colid);
+	const CColRef *colref = LookupColRef(colid);
 
 	CScalarSubquery *popScalarSubquery = GPOS_NEW(m_mp)
 		CScalarSubquery(m_mp, colref, false /*fGeneratedByExist*/,
@@ -4080,7 +4265,7 @@ CTranslatorDXLToExpr::Pos(const CDXLNode *dxlnode)
 		const ULONG colid = dxl_op->GetColId();
 
 		// get its column reference from the hash map
-		CColRef *colref = LookupColRef(m_phmulcr, colid);
+		CColRef *colref = LookupColRef(colid);
 
 		IMDId *sort_op_id = dxl_op->GetMdIdSortOp();
 		sort_op_id->AddRef();
diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp b/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp
index ef35ace4a97..b487c979761 100644
--- a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp
+++ b/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp
@@ -213,37 +213,6 @@ CTranslatorDXLToExprUtils::EBoolOperator(EdxlBoolExprType edxlbooltype)
 	return eboolop;
 }
 
-//---------------------------------------------------------------------------
-//	@function:
-//		CTranslatorDXLToExprUtils::Pdrgpcr
-//
-//	@doc:
-// 		Construct a dynamic array of column references corresponding to the
-//		given col ids
-//
-//---------------------------------------------------------------------------
-CColRefArray *
-CTranslatorDXLToExprUtils::Pdrgpcr(CMemoryPool *mp,
-								   UlongToColRefMap *colref_mapping,
-								   const ULongPtrArray *colids)
-{
-	GPOS_ASSERT(nullptr != colids);
-
-	CColRefArray *colref_array = GPOS_NEW(mp) CColRefArray(mp);
-
-	for (ULONG ul = 0; ul < colids->Size(); ul++)
-	{
-		ULONG *pulColId = (*colids)[ul];
-		CColRef *colref = colref_mapping->Find(pulColId);
-		colref->MarkAsUsed();
-		GPOS_ASSERT(nullptr != colref);
-
-		colref_array->Append(colref);
-	}
-
-	return colref_array;
-}
-
 
 //---------------------------------------------------------------------------
 //	@function:
diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp b/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp
index 07b6b54ecc5..6119e2ba71f 100644
--- a/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp
+++ b/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp
@@ -58,6 +58,7 @@
 #include "gpopt/operators/CPhysicalPartitionSelector.h"
 #include "gpopt/operators/CPhysicalScalarAgg.h"
 #include "gpopt/operators/CPhysicalSequenceProject.h"
+#include "gpopt/operators/CPhysicalHashSequenceProject.h"
 #include "gpopt/operators/CPhysicalSort.h"
 #include "gpopt/operators/CPhysicalSplit.h"
 #include "gpopt/operators/CPhysicalSpool.h"
@@ -313,8 +314,6 @@ CTranslatorExprToDXL::PdxlnTranslate(CExpression *pexpr,
 		pdxlnPrL->ReplaceChild(ul, pdxlnPrElNew);
 	}
 
-
-
 	if (0 == ulNonGatherMotions)
 	{
 		CTranslatorExprToDXLUtils::SetDirectDispatchInfo(
@@ -409,10 +408,11 @@ CTranslatorExprToDXL::CreateDXLNode(CExpression *pexpr,
 				pexpr, colref_array, pdrgpdsBaseTables, pulNonGatherMotions,
 				pfDML);
 			break;
+		case COperator::EopPhysicalHashSequenceProject:
 		case COperator::EopPhysicalSequenceProject:
 			dxlnode = CTranslatorExprToDXL::PdxlnWindow(
 				pexpr, colref_array, pdrgpdsBaseTables, pulNonGatherMotions,
-				pfDML);
+				pfDML, pexpr->Pop()->Eopid() == COperator::EopPhysicalHashSequenceProject);
 			break;
 		case COperator::EopPhysicalInnerNLJoin:
 		case COperator::EopPhysicalInnerIndexNLJoin:
@@ -1351,6 +1351,11 @@ CTranslatorExprToDXL::PdxlnDynamicTableScan(
 	GPOS_ASSERT(nullptr != pexprDTS);
 	GPOS_ASSERT_IFF(nullptr != pexprScalarCond, nullptr != dxl_properties);
 
+	if (GPOS_FTRACE(EopttraceDisableDynamicTableScan)) {
+		return PdxlnDynamicScanToAppend<CPhysicalDynamicTableScan>(pexprDTS, colref_array, 
+			pdrgpdsBaseTables, pexprScalarCond, dxl_properties);
+	}
+
 	CPhysicalDynamicTableScan *popDTS =
 		CPhysicalDynamicTableScan::PopConvert(pexprDTS->Pop());
 	CColRefArray *pdrgpcrOutput = popDTS->PdrgpcrOutput();
@@ -1429,6 +1434,425 @@ CTranslatorExprToDXL::PdxlnDynamicTableScan(
 	return pdxlnDTS;
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorExprToDXL::PdxlnDynamicScanToAppend
+//
+//	@doc:
+//		Create a DXL Append node from an optimizer
+//		dynamic scan or foreign scan node.
+//
+//---------------------------------------------------------------------------
+template <class PhysicalScanType>
+CDXLNode *
+CTranslatorExprToDXL::PdxlnDynamicScanToAppend(CExpression *pexprDTS,
+	CColRefArray *colref_array,
+	CDistributionSpecArray *pdrgpdsBaseTables,
+	CExpression *pexprScalarCond,
+	CDXLPhysicalProperties *dxl_properties) {
+	
+	PhysicalScanType *popDTS =
+		PhysicalScanType::PopConvert(pexprDTS->Pop());
+
+	ULongPtrArray *selector_ids = GPOS_NEW(m_mp) ULongPtrArray(m_mp);
+	CPartitionPropagationSpec *pps_reqd =
+		pexprDTS->Prpp()->Pepp()->PppsRequired();
+	if (pps_reqd->Contains(popDTS->ScanId()))
+	{
+		const CBitSet *bs = pps_reqd->SelectorIds(popDTS->ScanId());
+		CBitSetIter bsi(*bs);
+		for (ULONG ul = 0; bsi.Advance(); ul++)
+		{
+			selector_ids->Append(GPOS_NEW(m_mp) ULONG(bsi.Bit()));
+		}
+	}
+
+	// construct plan costs
+	CDXLPhysicalProperties *pdxlpropDTS = GetProperties(pexprDTS);
+
+	if (nullptr != dxl_properties)
+	{
+		CWStringDynamic *rows_out_str = GPOS_NEW(m_mp) CWStringDynamic(
+			m_mp,
+			dxl_properties->GetDXLOperatorCost()->GetRowsOutStr()->GetBuffer());
+		CWStringDynamic *pstrCost = GPOS_NEW(m_mp)
+			CWStringDynamic(m_mp, dxl_properties->GetDXLOperatorCost()
+									->GetTotalCostStr()
+									->GetBuffer());
+
+		pdxlpropDTS->GetDXLOperatorCost()->SetRows(rows_out_str);
+		pdxlpropDTS->GetDXLOperatorCost()->SetCost(pstrCost);
+		dxl_properties->Release();
+	}
+	GPOS_ASSERT(nullptr != pexprDTS->Prpp());
+
+	// construct projection list for top-level Append node
+	CColRefSet *pcrsOutput = pexprDTS->Prpp()->PcrsRequired();
+	CDXLNode *pdxlnPrLAppend = PdxlnProjList(pcrsOutput, colref_array);
+	CDXLTableDescr *root_dxl_table_descr = MakeDXLTableDescr(
+		popDTS->Ptabdesc(), popDTS->PdrgpcrOutput(), pexprDTS->Prpp());
+
+	// Construct the Append node - even when there is only one child partition.
+	// This is done for two reasons:
+	// * Dynamic partition pruning
+	//   Even if one partition is present in the statically pruned plan, we could
+	//   still dynamically prune it away. This needs an Append node.
+	// * Col mappings issues
+	//   When the first selected child partition's cols have different types/order
+	//   than the root partition, we can no longer re-use the colrefs of the root
+	//   partition, since colrefs are immutable. Thus, we create new colrefs for
+	//   this partition. But, if there is no Append (in case of just one selected
+	//   partition), then we also go through update all references above the DTS
+	//   with the new colrefs. For simplicity, we decided to keep the Append
+	//   around to maintain this projection (mapping) from the old root colrefs
+	//   to the first selected partition colrefs.
+	//
+	// GPDB_12_MERGE_FIXME: An Append on a single TableScan can be removed in
+	// CTranslatorDXLToPlstmt since these points do not apply there.
+	CDXLNode *pdxlnAppend = GPOS_NEW(m_mp) CDXLNode(
+		m_mp,
+		GPOS_NEW(m_mp) CDXLPhysicalAppend(m_mp, false, false, popDTS->ScanId(),
+										root_dxl_table_descr, selector_ids));
+	pdxlnAppend->SetProperties(pdxlpropDTS);
+	pdxlnAppend->AddChild(pdxlnPrLAppend);
+	pdxlnAppend->AddChild(PdxlnFilter(nullptr));
+
+	IMdIdArray *part_mdids = popDTS->GetPartitionMdids();
+	for (ULONG ul = 0; ul < part_mdids->Size(); ++ul)
+	{
+		IMDId *part_mdid = (*part_mdids)[ul];
+		const IMDRelation *part = m_pmda->RetrieveRel(part_mdid);
+
+		CTableDescriptor *part_tabdesc =
+			MakeTableDescForPart(part, popDTS->Ptabdesc());
+
+		// Create new colrefs for the child partition. The ColRefs from root
+		// DTS, which may be used in any parent node, can no longer be exported
+		// by a child of the Append node. Thus it is exported by the Append
+		// node itself, and new colrefs are created here.
+		CColRefArray *part_colrefs = GPOS_NEW(m_mp) CColRefArray(m_mp);
+		for (ULONG ul_col = 0; ul_col < part_tabdesc->ColumnCount(); ++ul_col)
+		{
+			const CColumnDescriptor *cd = part_tabdesc->Pcoldesc(ul_col);
+			CColRef *cr = m_pcf->PcrCreate(cd->RetrieveType(),
+										cd->TypeModifier(), cd->Name());
+			part_colrefs->Append(cr);
+		}
+
+		CDXLTableDescr *dxl_table_descr =
+			MakeDXLTableDescr(part_tabdesc, part_colrefs, pexprDTS->Prpp());
+		part_tabdesc->Release();
+
+		CDXLNode *dxlnode = GPOS_NEW(m_mp) CDXLNode(
+			m_mp, GPOS_NEW(m_mp) CDXLPhysicalTableScan(m_mp, dxl_table_descr));
+
+		// GPDB_12_MERGE_FIXME: Compute stats & properties per scan
+		pdxlpropDTS->AddRef();
+		dxlnode->SetProperties(pdxlpropDTS);
+
+		// ColRef -> index in child table desc (per partition)
+		auto root_col_mapping = (*popDTS->GetRootColMappingPerPart())[ul];
+
+		// construct projection list, re-ordered to match root DTS
+		CDXLNode *pdxlnPrL = PdxlnProjListForChildPart(
+			root_col_mapping, part_colrefs, pcrsOutput, colref_array);
+		dxlnode->AddChild(pdxlnPrL);  // project list
+
+		// construct the filter
+		CDXLNode *filter_dxlnode = PdxlnFilter(
+			PdxlnCondForChildPart(root_col_mapping, part_colrefs,
+								popDTS->PdrgpcrOutput(), pexprScalarCond));
+		dxlnode->AddChild(filter_dxlnode);	// filter
+
+		// add to the other scans under the created Append node
+		pdxlnAppend->AddChild(dxlnode);
+
+		// cleanup
+		part_colrefs->Release();
+	}
+
+	CDistributionSpec *pds = pexprDTS->GetDrvdPropPlan()->Pds();
+	pds->AddRef();
+	pdrgpdsBaseTables->Append(pds);
+
+	GPOS_ASSERT(pdxlnAppend);
+	return pdxlnAppend;
+}
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorExprToDXL::PdxlnDynamicIndexScanToAppend
+//
+//	@doc:
+//		Create a DXL Append node from an optimizer dynamic index scan node.
+//
+//---------------------------------------------------------------------------
+template <class PhysicalScanType>
+CDXLNode *CTranslatorExprToDXL::PdxlnDynamicIndexScanToAppend(CExpression *pexprDIS,
+	CColRefArray *colref_array,
+	CDXLPhysicalProperties *dxl_properties,
+	CReqdPropPlan *prpp) {
+	GPOS_ASSERT(nullptr != pexprDIS);
+	GPOS_ASSERT(nullptr != dxl_properties);
+	GPOS_ASSERT(nullptr != prpp);
+
+	CPhysicalDynamicIndexScan *popDIS =
+		PhysicalScanType::PopConvert(pexprDIS->Pop());
+
+	// construct projection list
+	CColRefSet *pcrsOutput = prpp->PcrsRequired();
+	CDXLNode *pdxlnPrLAppend = PdxlnProjList(pcrsOutput, colref_array);
+	IMdIdArray *part_mdids = popDIS->GetPartitionMdids();
+
+	CDXLNode *pdxlnResult = GPOS_NEW(m_mp)
+		CDXLNode(m_mp, GPOS_NEW(m_mp) CDXLPhysicalAppend(m_mp, false, false));
+
+	pdxlnResult->SetProperties(dxl_properties);
+	pdxlnResult->AddChild(pdxlnPrLAppend);
+	pdxlnResult->AddChild(PdxlnFilter(nullptr));
+	
+	// construct set of child indexes from parent list of child indexes
+	IMDId *pmdidIndex = popDIS->Pindexdesc()->MDId();
+	const IMDIndex *md_index = m_pmda->RetrieveIndex(pmdidIndex);
+	IMdIdArray *child_indexes = md_index->ChildIndexMdids();
+	
+	MdidHashSet *child_index_mdids_set = GPOS_NEW(m_mp) MdidHashSet(m_mp);
+	for (ULONG ul = 0; ul < child_indexes->Size(); ul++)
+	{
+		(*child_indexes)[ul]->AddRef();
+		child_index_mdids_set->Insert((*child_indexes)[ul]);
+	}
+
+	for (ULONG ul = 0; ul < part_mdids->Size(); ++ul)
+	{
+		IMDId *part_mdid = (*part_mdids)[ul];
+		const IMDRelation *part = m_pmda->RetrieveRel(part_mdid);
+
+		CPhysicalDynamicIndexScan *popDIS =
+			CPhysicalDynamicIndexScan::PopConvert(pexprDIS->Pop());
+
+		CTableDescriptor *part_tabdesc =
+			MakeTableDescForPart(part, popDIS->Ptabdesc());
+
+		// create new colrefs for every child partition
+		CColRefArray *part_colrefs = GPOS_NEW(m_mp) CColRefArray(m_mp);
+		for (ULONG ul = 0; ul < part_tabdesc->ColumnCount(); ++ul)
+		{
+			const CColumnDescriptor *cd = part_tabdesc->Pcoldesc(ul);
+			CColRef *cr = m_pcf->PcrCreate(cd->RetrieveType(),
+											cd->TypeModifier(), cd->Name());
+			part_colrefs->Append(cr);
+		}
+
+		CDXLTableDescr *dxl_table_descr =
+			MakeDXLTableDescr(part_tabdesc, part_colrefs, pexprDIS->Prpp());
+		part_tabdesc->Release();
+
+		CIndexDescriptor *pindexdesc = popDIS->Pindexdesc();
+		CDXLIndexDescr *dxl_index_descr = PdxlnIndexDescForPart(
+			m_mp, child_index_mdids_set, part, pindexdesc->Name().Pstr());
+	
+		// Finally create the IndexScan DXL node
+		CDXLNode *dxlnode = GPOS_NEW(m_mp) CDXLNode(
+			m_mp, GPOS_NEW(m_mp) CDXLPhysicalIndexScan(
+					m_mp, dxl_table_descr, dxl_index_descr, EdxlisdForward));
+
+		dxl_properties->AddRef();
+		dxlnode->SetProperties(dxl_properties);
+
+		// construct projection list
+		auto root_col_mapping = (*popDIS->GetRootColMappingPerPart())[ul];
+
+		CDXLNode *pdxlnPrL = PdxlnProjListForChildPart(
+			root_col_mapping, part_colrefs, pcrsOutput, colref_array);
+		dxlnode->AddChild(pdxlnPrL);  // project list
+
+		CDXLNode *filter_dxlnode;
+		if (2 == pexprDIS->Arity())
+		{
+			// translate residual predicates into the filter node
+			CExpression *pexprResidualCond = (*pexprDIS)[1];
+	
+			if (COperator::EopScalarConst != pexprResidualCond->Pop()->Eopid())
+			{
+				// construct the filter
+				filter_dxlnode = PdxlnFilter(PdxlnCondForChildPart(
+					root_col_mapping, part_colrefs, popDIS->PdrgpcrOutput(),
+					pexprResidualCond));
+			}
+			else
+			{
+				filter_dxlnode = PdxlnFilter(nullptr);
+			}
+		}
+		else
+		{
+			// construct an empty filter
+			filter_dxlnode = PdxlnFilter(nullptr);
+		}
+		dxlnode->AddChild(filter_dxlnode);	// filter
+
+		// translate index predicates
+		CExpression *pexprCond = (*pexprDIS)[0];
+		CDXLNode *pdxlnIndexCondList = GPOS_NEW(m_mp)
+			CDXLNode(m_mp, GPOS_NEW(m_mp) CDXLScalarIndexCondList(m_mp));
+
+		CExpressionArray *pdrgpexprConds =
+			CPredicateUtils::PdrgpexprConjuncts(m_mp, pexprCond);
+		const ULONG length = pdrgpexprConds->Size();
+		for (ULONG ul = 0; ul < length; ul++)
+		{
+			CExpression *pexprIndexCond = (*pdrgpexprConds)[ul];
+			// construct the condition as a filter
+			CDXLNode *pdxlnIndexCond =
+				PdxlnCondForChildPart(root_col_mapping, part_colrefs,
+									  popDIS->PdrgpcrOutput(), pexprIndexCond);
+			pdxlnIndexCondList->AddChild(pdxlnIndexCond);
+		}
+		pdrgpexprConds->Release();
+		dxlnode->AddChild(pdxlnIndexCondList);
+
+		// add to the other scans under the created Append node
+		pdxlnResult->AddChild(dxlnode);
+
+		// cleanup
+		part_colrefs->Release();
+	}
+	child_index_mdids_set->Release();
+
+	return pdxlnResult;
+}
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorExprToDXL::PdxlnDynamicBitmapScanToAppend
+//
+//	@doc:
+//		Create a DXL append node from an optimizer
+//		dynamic bitmap table scan node.
+//
+//---------------------------------------------------------------------------
+CDXLNode *
+CTranslatorExprToDXL::PdxlnDynamicBitmapScanToAppend(
+	CExpression *pexprScan, CColRefArray *colref_array,
+	CDistributionSpecArray *pdrgpdsBaseTables, CExpression *pexprScalar,
+	CDXLPhysicalProperties *dxl_properties)
+{
+	GPOS_ASSERT(nullptr != pexprScan);
+	CPhysicalDynamicBitmapTableScan *popDBTS =
+		CPhysicalDynamicBitmapTableScan::PopConvert(pexprScan->Pop());
+
+	// construct projection list
+	CColRefSet *pcrsOutput = pexprScan->Prpp()->PcrsRequired();
+	CDXLNode *pdxlnPrLAppend = PdxlnProjList(pcrsOutput, colref_array);
+
+	CDXLNode *pdxlnResult = GPOS_NEW(m_mp)
+		CDXLNode(m_mp, GPOS_NEW(m_mp) CDXLPhysicalAppend(m_mp, false, false));
+	// GPDB_12_MERGE_FIXME: set plan costs
+	pdxlnResult->SetProperties(dxl_properties);
+	pdxlnResult->AddChild(pdxlnPrLAppend);
+	pdxlnResult->AddChild(PdxlnFilter(nullptr));
+
+	IMdIdArray *part_mdids = popDBTS->GetPartitionMdids();
+
+	COptCtxt::PoctxtFromTLS()->AddDirectDispatchableFilterCandidate(pexprScan);
+
+	for (ULONG ul = 0; ul < part_mdids->Size(); ++ul)
+	{
+		IMDId *part_mdid = (*part_mdids)[ul];
+		const IMDRelation *part = m_pmda->RetrieveRel(part_mdid);
+
+		// translate table descriptor
+		CTableDescriptor *part_tabdesc =
+			MakeTableDescForPart(part, popDBTS->Ptabdesc());
+
+		// Create new colrefs for the child partition. The ColRefs from root
+		// DTS, which may be used in any parent node, can no longer be exported
+		// by a child of the Append node. Thus it is exported by the Append
+		// node itself, and new colrefs are created here.
+		CColRefArray *part_colrefs = GPOS_NEW(m_mp) CColRefArray(m_mp);
+		for (ULONG ul = 0; ul < part_tabdesc->ColumnCount(); ++ul)
+		{
+			const CColumnDescriptor *cd = part_tabdesc->Pcoldesc(ul);
+			CColRef *cr = m_pcf->PcrCreate(cd->RetrieveType(),
+										   cd->TypeModifier(), cd->Name());
+			part_colrefs->Append(cr);
+		}
+
+		CDXLTableDescr *dxl_table_descr =
+			MakeDXLTableDescr(part_tabdesc, part_colrefs, pexprScan->Prpp());
+		part_tabdesc->Release();
+
+		CDXLNode *pdxlnBitmapTableScan = GPOS_NEW(m_mp) CDXLNode(
+			m_mp,
+			GPOS_NEW(m_mp) CDXLPhysicalBitmapTableScan(m_mp, dxl_table_descr));
+
+		// set properties
+		// construct plan costs, if there are not passed as a parameter
+		if (nullptr == dxl_properties)
+		{
+			dxl_properties = GetProperties(pexprScan);
+		}
+		dxl_properties->AddRef();
+		pdxlnBitmapTableScan->SetProperties(dxl_properties);
+
+		// build projection list
+		auto *root_col_mapping = (*popDBTS->GetRootColMappingPerPart())[ul];
+
+		// translate scalar predicate into DXL filter only if it is not redundant
+		CExpression *pexprRecheckCond = (*pexprScan)[0];
+		CDXLNode *pdxlnCond = nullptr;
+		if (nullptr != pexprScalar && !CUtils::FScalarConstTrue(pexprScalar) &&
+			!pexprScalar->Matches(pexprRecheckCond))
+		{
+			pdxlnCond =
+				PdxlnCondForChildPart(root_col_mapping, part_colrefs,
+									  popDBTS->PdrgpcrOutput(), pexprScalar);
+		}
+
+		CDXLNode *filter_dxlnode = PdxlnFilter(pdxlnCond);
+
+		CDXLNode *pdxlnRecheckCond =
+			PdxlnCondForChildPart(root_col_mapping, part_colrefs,
+								  popDBTS->PdrgpcrOutput(), pexprRecheckCond);
+		CDXLNode *pdxlnRecheckCondFilter = GPOS_NEW(m_mp)
+			CDXLNode(m_mp, GPOS_NEW(m_mp) CDXLScalarRecheckCondFilter(m_mp),
+					 pdxlnRecheckCond);
+
+		AddBitmapFilterColumns(m_mp, popDBTS, pexprRecheckCond, pexprScalar,
+							   pcrsOutput);
+
+		CDXLNode *proj_list_dxlnode = PdxlnProjListForChildPart(
+			root_col_mapping, part_colrefs, pcrsOutput, colref_array);
+
+		// translate bitmap access path
+		CExpression *pexprBitmapIndexPath = (*pexprScan)[1];
+
+		CDXLNode *pdxlnBitmapIndexPath = PdxlnBitmapIndexPathForChildPart(
+			root_col_mapping, part_colrefs, popDBTS->PdrgpcrOutput(), part,
+			pexprBitmapIndexPath);
+
+		pdxlnBitmapTableScan->AddChild(proj_list_dxlnode);
+		pdxlnBitmapTableScan->AddChild(filter_dxlnode);
+		pdxlnBitmapTableScan->AddChild(pdxlnRecheckCondFilter);
+		pdxlnBitmapTableScan->AddChild(pdxlnBitmapIndexPath);
+#ifdef GPOS_DEBUG
+		pdxlnBitmapTableScan->GetOperator()->AssertValid(
+			pdxlnBitmapTableScan, false /*validate_children*/);
+#endif
+
+		pdxlnResult->AddChild(pdxlnBitmapTableScan);
+
+		// cleanup
+		part_colrefs->Release();
+	}
+
+	CDistributionSpec *pds = pexprScan->GetDrvdPropPlan()->Pds();
+	pds->AddRef();
+	pdrgpdsBaseTables->Append(pds);
+	return pdxlnResult;
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorExprToDXL::PdxlnDynamicBitmapTableScan
@@ -1470,6 +1894,11 @@ CTranslatorExprToDXL::PdxlnDynamicBitmapTableScan(
 {
 	GPOS_ASSERT(nullptr != pexprScan);
 
+	if (GPOS_FTRACE(EopttraceDisableDynamicTableScan)) {
+		return PdxlnDynamicBitmapScanToAppend(pexprScan, colref_array, 
+			pdrgpdsBaseTables, pexprScalar, dxl_properties);
+	}
+
 	CPhysicalDynamicBitmapTableScan *pop =
 		CPhysicalDynamicBitmapTableScan::PopConvert(pexprScan->Pop());
 	CColRefArray *pdrgpcrOutput = pop->PdrgpcrOutput();
@@ -1566,15 +1995,14 @@ CTranslatorExprToDXL::PdxlnDynamicIndexScan(
 	GPOS_ASSERT(nullptr != dxl_properties);
 	GPOS_ASSERT(nullptr != prpp);
 
-	CPhysicalDynamicIndexScan *popDIS = nullptr;
-	if (indexOnly)
-	{
-		popDIS = CPhysicalDynamicIndexOnlyScan::PopConvert(pexprDIS->Pop());
-	}
-	else
-	{
-		popDIS = CPhysicalDynamicIndexScan::PopConvert(pexprDIS->Pop());
+	if (GPOS_FTRACE(EopttraceDisableDynamicTableScan)) {
+		return indexOnly ? PdxlnDynamicIndexScanToAppend<CPhysicalDynamicIndexOnlyScan>(pexprDIS, colref_array, 
+			dxl_properties, prpp) : PdxlnDynamicIndexScanToAppend<CPhysicalDynamicIndexScan>(pexprDIS, colref_array, 
+				dxl_properties, prpp);
 	}
+
+	CPhysicalDynamicIndexScan *popDIS = indexOnly ? CPhysicalDynamicIndexOnlyScan::PopConvert(pexprDIS->Pop())
+		: CPhysicalDynamicIndexScan::PopConvert(pexprDIS->Pop());
 	CColRefArray *pdrgpcrOutput = popDIS->PdrgpcrOutput();
 
 	// translate table descriptor
@@ -1763,6 +2191,11 @@ CTranslatorExprToDXL::PdxlnDynamicForeignScan(
 	GPOS_ASSERT(nullptr != pexprDFS);
 	GPOS_ASSERT_IFF(nullptr != pexprScalarCond, nullptr != dxl_properties);
 
+	if (GPOS_FTRACE(EopttraceDisableDynamicTableScan)) {
+		return PdxlnDynamicScanToAppend<CPhysicalDynamicForeignScan>(pexprDFS, colref_array, 
+			pdrgpdsBaseTables, pexprScalarCond, dxl_properties);
+	}
+
 	CPhysicalDynamicForeignScan *popDFS =
 		CPhysicalDynamicForeignScan::PopConvert(pexprDFS->Pop());
 	CColRefArray *pdrgpcrOutput = popDFS->PdrgpcrOutput();
@@ -1841,6 +2274,7 @@ CTranslatorExprToDXL::PdxlnDynamicForeignScan(
 
 	return pdxlnDFS;
 }
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorExprToDXL::PdxlnResult
@@ -2399,8 +2833,13 @@ CTranslatorExprToDXL::PdxlnCTEProducer(
 	CDXLNode *pdxlnPrL = PdxlnProjList(pcrsOutput, pdrgpcrRequired);
 	pcrsOutput->Release();
 
+	ULongPtrArray *producer_idx_map =  popCTEProducer->PCTEIdxMap();
+	if (producer_idx_map) {
+		producer_idx_map->AddRef();
+	}
+
 	CDXLNode *pdxlnCTEProducer = GPOS_NEW(m_mp) CDXLNode(
-		m_mp, GPOS_NEW(m_mp) CDXLPhysicalCTEProducer(m_mp, ulCTEId, colids),
+		m_mp, GPOS_NEW(m_mp) CDXLPhysicalCTEProducer(m_mp, ulCTEId, colids, producer_idx_map),
 		pdxlnPrL, child_dxlnode);
 
 	pdxlnCTEProducer->SetProperties(dxl_properties);
@@ -2444,9 +2883,13 @@ CTranslatorExprToDXL::PdxlnCTEConsumer(
 
 	// translate relational child expression
 	CDXLNode *pdxlnPrL = PdxlnProjList(pcrsOutput, colref_array);
+	ULongPtrArray *pidxmap = popCTEConsumer->PCTEIdxMap();
+	if (pidxmap) {
+		pidxmap->AddRef();
+	}
 
 	CDXLNode *pdxlnCTEConsumer = GPOS_NEW(m_mp) CDXLNode(
-		m_mp, GPOS_NEW(m_mp) CDXLPhysicalCTEConsumer(m_mp, ulCTEId, colids),
+		m_mp, GPOS_NEW(m_mp) CDXLPhysicalCTEConsumer(m_mp, ulCTEId, colids, pidxmap),
 		pdxlnPrL);
 
 	pcrsOutput->Release();
@@ -6411,11 +6854,13 @@ CDXLNode *
 CTranslatorExprToDXL::PdxlnWindow(CExpression *pexprSeqPrj,
 								  CColRefArray *colref_array,
 								  CDistributionSpecArray *pdrgpdsBaseTables,
-								  ULONG *pulNonGatherMotions, BOOL *pfDML)
+								  ULONG *pulNonGatherMotions, BOOL *pfDML,
+								  BOOL fWindowHashAgg)
 {
 	GPOS_ASSERT(nullptr != pexprSeqPrj);
 
-	CPhysicalSequenceProject *popSeqPrj =
+	CPhysicalSequenceProject *popSeqPrj = fWindowHashAgg ? 
+		CPhysicalHashSequenceProject::PopConvert(pexprSeqPrj->Pop()) :
 		CPhysicalSequenceProject::PopConvert(pexprSeqPrj->Pop());
 	CDistributionSpec *pds = popSeqPrj->Pds();
 	ULongPtrArray *colids = GPOS_NEW(m_mp) ULongPtrArray(m_mp);
@@ -6497,7 +6942,8 @@ CTranslatorExprToDXL::PdxlnWindow(CExpression *pexprSeqPrj,
 
 	// construct a Window node
 	CDXLPhysicalWindow *pdxlopWindow =
-		GPOS_NEW(m_mp) CDXLPhysicalWindow(m_mp, colids, pdrgpdxlwk);
+		GPOS_NEW(m_mp) CDXLPhysicalWindow(m_mp, colids, pdrgpdxlwk,
+			fWindowHashAgg);
 	CDXLNode *pdxlnWindow = GPOS_NEW(m_mp) CDXLNode(m_mp, pdxlopWindow);
 	pdxlnWindow->SetProperties(dxl_properties);
 
@@ -6515,7 +6961,6 @@ CTranslatorExprToDXL::PdxlnWindow(CExpression *pexprSeqPrj,
 	return pdxlnWindow;
 }
 
-
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorExprToDXL::PdxlnArray
@@ -7084,6 +7529,140 @@ CTranslatorExprToDXL::PdxlnCondForChildPart(
 	return pdxlnCond;
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorExprToDXL::PdxlnBitmapIndexProbeForChildPart
+//
+//	@doc:
+//		Create a DXL scalar bitmap index probe from an optimizer
+//		scalar bitmap index probe operator for a child partition.
+//
+//		GPDB_12_MERGE_FIXME: this function should always keep parity
+//		with PdxlnBitmapIndexProbe(). We did not extract the duplicate
+//		code into a common function because the handlings for child
+//		partition are also all over this function.
+//---------------------------------------------------------------------------
+CDXLNode *
+CTranslatorExprToDXL::PdxlnBitmapIndexProbeForChildPart(
+	const ColRefToUlongMap *root_col_mapping, const CColRefArray *part_colrefs,
+	const CColRefArray *root_colrefs, const IMDRelation *part,
+	CExpression *pexprBitmapIndexProbe)
+{
+	GPOS_ASSERT(nullptr != pexprBitmapIndexProbe);
+	CScalarBitmapIndexProbe *pop =
+		CScalarBitmapIndexProbe::PopConvert(pexprBitmapIndexProbe->Pop());
+
+	// create index descriptor
+	CIndexDescriptor *pindexdesc = pop->Pindexdesc();
+	IMDId *pmdidIndex = pindexdesc->MDId();
+
+	// construct set of child indexes from parent list of child indexes
+	const IMDIndex *md_index = m_pmda->RetrieveIndex(pmdidIndex);
+	IMdIdArray *child_indexes = md_index->ChildIndexMdids();
+
+	MdidHashSet *child_index_mdids_set = GPOS_NEW(m_mp) MdidHashSet(m_mp);
+	for (ULONG ul = 0; ul < child_indexes->Size(); ul++)
+	{
+		(*child_indexes)[ul]->AddRef();
+		child_index_mdids_set->Insert((*child_indexes)[ul]);
+	}
+
+	CDXLIndexDescr *dxl_index_descr = PdxlnIndexDescForPart(
+		m_mp, child_index_mdids_set, part, pindexdesc->Name().Pstr());
+
+	child_index_mdids_set->Release();
+
+	CDXLScalarBitmapIndexProbe *dxl_op =
+		GPOS_NEW(m_mp) CDXLScalarBitmapIndexProbe(m_mp, dxl_index_descr);
+	CDXLNode *pdxlnBitmapIndexProbe = GPOS_NEW(m_mp) CDXLNode(m_mp, dxl_op);
+
+	// translate index predicates
+	CExpression *pexprCond = (*pexprBitmapIndexProbe)[0];
+	CDXLNode *pdxlnIndexCondList = GPOS_NEW(m_mp)
+		CDXLNode(m_mp, GPOS_NEW(m_mp) CDXLScalarIndexCondList(m_mp));
+	CExpressionArray *pdrgpexprConds =
+		CPredicateUtils::PdrgpexprConjuncts(m_mp, pexprCond);
+	const ULONG length = pdrgpexprConds->Size();
+	for (ULONG ul = 0; ul < length; ul++)
+	{
+		CExpression *pexprIndexCond = (*pdrgpexprConds)[ul];
+		CDXLNode *pdxlnIndexCond = PdxlnCondForChildPart(
+			root_col_mapping, part_colrefs, root_colrefs, pexprIndexCond);
+		pdxlnIndexCondList->AddChild(pdxlnIndexCond);
+	}
+	pdrgpexprConds->Release();
+	pdxlnBitmapIndexProbe->AddChild(pdxlnIndexCondList);
+
+#ifdef GPOS_DEBUG
+	pdxlnBitmapIndexProbe->GetOperator()->AssertValid(
+		pdxlnBitmapIndexProbe, false /*validate_children*/);
+#endif
+
+	return pdxlnBitmapIndexProbe;
+}
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CTranslatorExprToDXL::PdxlnBitmapIndexPathForChildPart
+//
+//	@doc:
+//		Construct a DXL BitmapTableScan's bitmap index path child
+//		DLX node for a child partition.
+//
+//---------------------------------------------------------------------------
+CDXLNode *
+CTranslatorExprToDXL::PdxlnBitmapIndexPathForChildPart(
+	const ColRefToUlongMap *root_col_mapping, const CColRefArray *part_colrefs,
+	const CColRefArray *root_colrefs, const IMDRelation *part,
+	CExpression *pexprBitmapIndexPath)
+{
+	GPOS_CHECK_STACK_SIZE;
+
+	switch (pexprBitmapIndexPath->Pop()->Eopid())
+	{
+		case COperator::EopScalarBitmapIndexProbe:
+			return PdxlnBitmapIndexProbeForChildPart(
+				root_col_mapping, part_colrefs, root_colrefs, part,
+				pexprBitmapIndexPath);
+		case COperator::EopScalarBitmapBoolOp:
+		{
+			GPOS_ASSERT(nullptr != pexprBitmapIndexPath);
+			GPOS_ASSERT(2 == pexprBitmapIndexPath->Arity());
+
+			CScalarBitmapBoolOp *popBitmapBoolOp =
+				CScalarBitmapBoolOp::PopConvert(pexprBitmapIndexPath->Pop());
+			CExpression *pexprLeft = (*pexprBitmapIndexPath)[0];
+			CExpression *pexprRight = (*pexprBitmapIndexPath)[1];
+
+			CDXLNode *dxlnode_left = PdxlnBitmapIndexPathForChildPart(
+				root_col_mapping, part_colrefs, root_colrefs, part, pexprLeft);
+			CDXLNode *dxlnode_right = PdxlnBitmapIndexPathForChildPart(
+				root_col_mapping, part_colrefs, root_colrefs, part, pexprRight);
+
+			IMDId *mdid_type = popBitmapBoolOp->MdidType();
+			mdid_type->AddRef();
+
+			CDXLScalarBitmapBoolOp::EdxlBitmapBoolOp edxlbitmapop =
+				CDXLScalarBitmapBoolOp::EdxlbitmapAnd;
+
+			if (CScalarBitmapBoolOp::EbitmapboolOr ==
+				popBitmapBoolOp->Ebitmapboolop())
+			{
+				edxlbitmapop = CDXLScalarBitmapBoolOp::EdxlbitmapOr;
+			}
+
+			return GPOS_NEW(m_mp) CDXLNode(
+				m_mp,
+				GPOS_NEW(m_mp)
+					CDXLScalarBitmapBoolOp(m_mp, mdid_type, edxlbitmapop),
+				dxlnode_left, dxlnode_right);
+		}
+		default:
+			GPOS_RAISE(gpopt::ExmaGPOPT, gpopt::ExmiUnsupportedOp,
+					   pexprBitmapIndexPath->Pop()->SzId());
+	}
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CTranslatorExprToDXL::PdxlnProjList
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp
index f5169e25c7d..9f3270d9d8c 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp
@@ -77,6 +77,12 @@ CXformDynamicGet2DynamicTableScan::Transform(CXformContext *pxfctxt,
 		return;
 	}
 
+	// Append implemention of dynamic any scan not support row-level security
+	if (GPOS_FTRACE(EopttraceDisableDynamicTableScan) && popGet->HasSecurityQuals()) 
+	{
+		return;
+	}
+
 	CMemoryPool *mp = pxfctxt->Pmp();
 
 	// create/extract components for alternative
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp
index 82d69dfb7e3..0f2b274a3e5 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp
@@ -95,17 +95,18 @@ CXformExpandFullOuterJoin::Transform(CXformContext *pxfctxt,
 	GPOS_ASSERT(FCheckPattern(pexpr));
 
 	CMemoryPool *mp = pxfctxt->Pmp();
+	CCTEInfo *pcteinfo = COptCtxt::PoctxtFromTLS()->Pcteinfo();
 
 	CExpression *pexprA = (*pexpr)[0];
 	CExpression *pexprB = (*pexpr)[1];
 	CExpression *pexprScalar = (*pexpr)[2];
 
 	// 1. create the CTE producers
-	const ULONG ulCTEIdA = COptCtxt::PoctxtFromTLS()->Pcteinfo()->next_id();
+	const ULONG ulCTEIdA = pcteinfo->next_id();
 	CColRefArray *pdrgpcrOutA = pexprA->DeriveOutputColumns()->Pdrgpcr(mp);
 	(void) CXformUtils::PexprAddCTEProducer(mp, ulCTEIdA, pdrgpcrOutA, pexprA);
 
-	const ULONG ulCTEIdB = COptCtxt::PoctxtFromTLS()->Pcteinfo()->next_id();
+	const ULONG ulCTEIdB = pcteinfo->next_id();
 	CColRefArray *pdrgpcrOutB = pexprB->DeriveOutputColumns()->Pdrgpcr(mp);
 	(void) CXformUtils::PexprAddCTEProducer(mp, ulCTEIdB, pdrgpcrOutB, pexprB);
 
@@ -194,11 +195,13 @@ CXformExpandFullOuterJoin::PexprLogicalJoinOverCTEs(
 		GPOS_NEW(mp) CLogicalCTEConsumer(mp, ulLeftCTEId, pdrgpcrLeft);
 	CExpression *pexprLeft = GPOS_NEW(mp) CExpression(mp, popConsumerLeft);
 	pcteinfo->IncrementConsumers(ulLeftCTEId);
+	pcteinfo->AddCTEConsumer(pexprLeft);
 
 	CLogicalCTEConsumer *popConsumerRight =
 		GPOS_NEW(mp) CLogicalCTEConsumer(mp, ulRightCTEId, pdrgpcrRight);
 	CExpression *pexprRight = GPOS_NEW(mp) CExpression(mp, popConsumerRight);
 	pcteinfo->IncrementConsumers(ulRightCTEId);
+	pcteinfo->AddCTEConsumer(pexprRight);
 
 	pdrgpexprChildren->Append(pexprLeft);
 	pdrgpexprChildren->Append(pexprRight);
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp
index 27267cc39c8..e21c24511dd 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp
@@ -243,11 +243,13 @@ CXformFactory::Instantiate()
 	Add(GPOS_NEW(m_mp) CXformPushGbWithHavingBelowJoin(m_mp));
 	Add(GPOS_NEW(m_mp) CXformPushGbBelowUnion(m_mp));
 	Add(GPOS_NEW(m_mp) CXformPushGbBelowUnionAll(m_mp));
+	Add(GPOS_NEW(m_mp) CXformPushPartialAggBelowJoin(m_mp));
 	Add(GPOS_NEW(m_mp) CXformSplitGbAgg(m_mp));
 	Add(GPOS_NEW(m_mp) CXformSplitGbAggDedup(m_mp));
 	Add(GPOS_NEW(m_mp) CXformSplitDQA(m_mp));
 	Add(GPOS_NEW(m_mp) CXformSequenceProject2Apply(m_mp));
 	Add(GPOS_NEW(m_mp) CXformImplementSequenceProject(m_mp));
+	Add(GPOS_NEW(m_mp) CXformImplementHashSequenceProject(m_mp));
 	Add(GPOS_NEW(m_mp) CXformImplementAssert(m_mp));
 	Add(GPOS_NEW(m_mp) CXformCTEAnchor2Sequence(m_mp));
 	Add(GPOS_NEW(m_mp) CXformCTEAnchor2TrivialSelect(m_mp));
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp
index c94a6bdff55..f739779762c 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp
@@ -135,6 +135,7 @@ CXformGbAgg2HashAgg::Transform(CXformContext *pxfctxt, CXformResult *pxfres,
 			popAgg->FGeneratesDuplicates(), pdrgpcrArgDQA,
 			CXformUtils::FMultiStageAgg(pexpr),
 			CXformUtils::FAggGenBySplitDQAXform(pexpr), popAgg->AggStage(),
+			popAgg->FAggPushdown(),
 			!CXformUtils::FLocalAggCreatedByEagerAggXform(pexpr)),
 		pexprRel, pexprScalar);
 
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp
index b270371663a..7564d830d46 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp
@@ -107,6 +107,7 @@ CXformGbAgg2ScalarAgg::Transform(CXformContext *pxfctxt, CXformResult *pxfres,
 			popAgg->FGeneratesDuplicates(), pdrgpcrArgDQA,
 			CXformUtils::FMultiStageAgg(pexpr),
 			CXformUtils::FAggGenBySplitDQAXform(pexpr), popAgg->AggStage(),
+			popAgg->FAggPushdown(),
 			!CXformUtils::FLocalAggCreatedByEagerAggXform(pexpr)),
 		pexprRel, pexprScalar);
 
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp
index a4875cf222c..2cca4071ce2 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp
@@ -121,6 +121,7 @@ CXformGbAgg2StreamAgg::Transform(CXformContext *pxfctxt, CXformResult *pxfres,
 			popAgg->FGeneratesDuplicates(), pdrgpcrArgDQA,
 			CXformUtils::FMultiStageAgg(pexpr),
 			CXformUtils::FAggGenBySplitDQAXform(pexpr), popAgg->AggStage(),
+			popAgg->FAggPushdown(),
 			!CXformUtils::FLocalAggCreatedByEagerAggXform(pexpr)),
 		pexprRel, pexprScalar);
 
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp
index b139e6c9f63..2c7994869c5 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp
@@ -83,6 +83,7 @@ CXformGbAggDedup2HashAggDedup::Transform(CXformContext *pxfctxt,
 			popAggDedup->FGeneratesDuplicates(),
 			CXformUtils::FMultiStageAgg(pexpr),
 			CXformUtils::FAggGenBySplitDQAXform(pexpr), popAggDedup->AggStage(),
+			popAggDedup->FAggPushdown(),
 			!CXformUtils::FLocalAggCreatedByEagerAggXform(pexpr)),
 		pexprRel, pexprScalar);
 
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp
index 388e6eed2a0..f6341a96eec 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp
@@ -84,6 +84,7 @@ CXformGbAggDedup2StreamAggDedup::Transform(CXformContext *pxfctxt,
 			popAggDedup->FGeneratesDuplicates(),
 			CXformUtils::FMultiStageAgg(pexpr),
 			CXformUtils::FAggGenBySplitDQAXform(pexpr), popAggDedup->AggStage(),
+			popAggDedup->FAggPushdown(),
 			!CXformUtils::FLocalAggCreatedByEagerAggXform(pexpr)),
 		pexprRel, pexprScalar);
 
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp
index 14041f41dc2..0ca823a499c 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp
@@ -113,6 +113,7 @@ CXformGbAggWithMDQA2Join::PexprMDQAs2Join(CMemoryPool *mp, CExpression *pexpr)
 	CExpression *pexprConsumer = GPOS_NEW(mp) CExpression(
 		mp, GPOS_NEW(mp) CLogicalCTEConsumer(mp, ulCTEId, pdrgpcrChildOutput));
 	pcteinfo->IncrementConsumers(ulCTEId);
+	pcteinfo->AddCTEConsumer(pexprConsumer);
 
 	// finalize GbAgg expression by replacing its child with CTE consumer
 	pexpr->Pop()->AddRef();
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp
index baccad23b76..a9151baba18 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp
@@ -86,7 +86,7 @@ CXformImplementCTEProducer::Transform(CXformContext *pxfctxt,
 
 	// create physical CTE Producer
 	CExpression *pexprAlt = GPOS_NEW(mp)
-		CExpression(mp, GPOS_NEW(mp) CPhysicalCTEProducer(mp, id, colref_array),
+		CExpression(mp, GPOS_NEW(mp) CPhysicalCTEProducer(mp, id, colref_array, popCTEProducer->UsedMask()),
 					pexprChild);
 
 	// add alternative to transformation result
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementHashSequenceProject.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformImplementHashSequenceProject.cpp
new file mode 100644
index 00000000000..e01f95377fb
--- /dev/null
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformImplementHashSequenceProject.cpp
@@ -0,0 +1,112 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * CXformImplementHashSequenceProject.cpp
+ *
+ * IDENTIFICATION
+ *	  src/backend/gporca/libgpopt/src/xforms/CXformImplementHashSequenceProject.cpp
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "gpopt/xforms/CXformImplementHashSequenceProject.h"
+
+#include "gpos/base.h"
+
+#include "gpopt/operators/CLogicalSequenceProject.h"
+#include "gpopt/operators/CPatternLeaf.h"
+#include "gpopt/operators/CPhysicalHashSequenceProject.h"
+
+
+using namespace gpopt;
+
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CXformImplementHashSequenceProject::CXformImplementHashSequenceProject
+//
+//	@doc:
+//		Ctor
+//
+//---------------------------------------------------------------------------
+CXformImplementHashSequenceProject::CXformImplementHashSequenceProject(
+	CMemoryPool *mp)
+	:  // pattern
+	  CXformImplementation(GPOS_NEW(mp) CExpression(
+		  mp, GPOS_NEW(mp) CLogicalSequenceProject(mp),
+		  GPOS_NEW(mp) CExpression(
+			  mp, GPOS_NEW(mp) CPatternLeaf(mp)),  // relational child
+		  GPOS_NEW(mp)
+			  CExpression(mp, GPOS_NEW(mp) CPatternLeaf(mp))  // scalar child
+		  ))
+{
+}
+
+
+//---------------------------------------------------------------------------
+//	@function:
+//		CXformImplementHashSequenceProject::Transform
+//
+//	@doc:
+//		Actual transformation
+//
+//---------------------------------------------------------------------------
+void
+CXformImplementHashSequenceProject::Transform(CXformContext *pxfctxt,
+											  CXformResult *pxfres,
+											  CExpression *pexpr) const
+{
+	GPOS_ASSERT(nullptr != pxfctxt);
+	GPOS_ASSERT(FPromising(pxfctxt->Pmp(), this, pexpr));
+	GPOS_ASSERT(FCheckPattern(pexpr));
+
+	CMemoryPool *mp = pxfctxt->Pmp();
+
+	// extract components
+	CExpression *pexprRelational = (*pexpr)[0];
+	CExpression *pexprScalar = (*pexpr)[1];
+
+	// addref all children
+	pexprRelational->AddRef();
+	pexprScalar->AddRef();
+
+	// extract members of logical sequence project operator
+	CLogicalSequenceProject *popLogicalSequenceProject =
+		CLogicalSequenceProject::PopConvert(pexpr->Pop());
+	COperator::ESPType sptype = popLogicalSequenceProject->Pspt();
+	CDistributionSpec *pds = popLogicalSequenceProject->Pds();
+	COrderSpecArray *pdrgpos = popLogicalSequenceProject->Pdrgpos();
+	CWindowFrameArray *pdrgpwf = popLogicalSequenceProject->Pdrgpwf();
+	pds->AddRef();
+	pdrgpos->AddRef();
+	pdrgpwf->AddRef();
+
+	// assemble physical operator
+	CExpression *pexprSequenceProject = GPOS_NEW(mp) CExpression(
+		mp,
+		GPOS_NEW(mp)
+			CPhysicalHashSequenceProject(mp, sptype, pds, pdrgpos, pdrgpwf),
+		pexprRelational, pexprScalar);
+
+	// add alternative to results
+	pxfres->Add(pexprSequenceProject);
+}
+
+
+// EOF
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp
index 2ad700dfa05..f03efdacf89 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp
@@ -84,6 +84,7 @@ CXformInlineCTEConsumer::Transform(CXformContext *
 	// inline the consumer
 	CLogicalCTEConsumer *popConsumer =
 		CLogicalCTEConsumer::PopConvert(pexpr->Pop());
+	(void) popConsumer->ApplyInline();
 	CExpression *pexprAlt = popConsumer->PexprInlined();
 	pexprAlt->AddRef();
 	// add alternative to xform result
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp
index 509355d14e6..8b1ddfc7117 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp
@@ -103,6 +103,7 @@ CXformInlineCTEConsumerUnderSelect::Transform(CXformContext *pxfctxt,
 
 	// inline consumer
 	GPOS_ASSERT(nullptr != popConsumer->Phmulcr());
+	(void) popConsumer->ApplyInline();
 	CExpression *pexprInlinedConsumer = popConsumer->PexprInlined();
 	pexprInlinedConsumer->AddRef();
 	pexprScalar->AddRef();
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushPartialAggBelowJoin.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformPushPartialAggBelowJoin.cpp
new file mode 100644
index 00000000000..f551b4a3aef
--- /dev/null
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformPushPartialAggBelowJoin.cpp
@@ -0,0 +1,422 @@
+//---------------------------------------------------------------------------
+//	Greenplum Database
+//	Copyright (C) 2012 EMC Corp.
+//
+//	@filename:
+//		CXformPushPartialAggBelowJoin.cpp
+//
+//	@doc:
+//		Implementation of pushing group by below join transform
+//---------------------------------------------------------------------------
+
+#include "gpopt/xforms/CXformPushPartialAggBelowJoin.h"
+
+#include "gpos/base.h"
+
+#include "gpopt/operators/CLogicalGbAgg.h"
+#include "gpopt/operators/CLogicalInnerJoin.h"
+#include "gpopt/operators/CPatternLeaf.h"
+#include "gpopt/xforms/CXformUtils.h"
+
+using namespace gpopt;
+
+// ctor
+CXformPushPartialAggBelowJoin::CXformPushPartialAggBelowJoin(CMemoryPool *mp)
+	:  // pattern
+	  CXformExploration(GPOS_NEW(mp) CExpression(
+		  mp, GPOS_NEW(mp) CLogicalGbAgg(mp),  // global-stage agg
+		  GPOS_NEW(mp) CExpression(
+			  mp, GPOS_NEW(mp) CLogicalGbAgg(mp),  // local-stage agg
+			  GPOS_NEW(mp) CExpression(
+				  mp, GPOS_NEW(mp) CLogicalInnerJoin(mp),
+				  GPOS_NEW(mp) CExpression(
+					  mp, GPOS_NEW(mp) CPatternLeaf(mp)),  // join outer child
+				  GPOS_NEW(mp) CExpression(
+					  mp, GPOS_NEW(mp) CPatternLeaf(mp)),  // join inner child
+				  GPOS_NEW(mp) CExpression(
+					  mp, GPOS_NEW(mp) CPatternTree(mp))  // join predicate
+				  ),
+			  GPOS_NEW(mp) CExpression(
+				  mp,
+				  GPOS_NEW(mp) CPatternTree(mp))  // local scalar project list
+			  ),
+		  GPOS_NEW(mp) CExpression(
+			  mp, GPOS_NEW(mp) CPatternTree(mp))  // global scalar project list
+		  ))
+{
+}
+
+// ctor
+CXformPushPartialAggBelowJoin::CXformPushPartialAggBelowJoin(
+	CExpression *pexprPattern)
+	: CXformExploration(pexprPattern)
+{
+}
+
+
+BOOL
+CXformPushPartialAggBelowJoin::FLocalGbAggAlreadyPushed(
+	CExpression *pexprGlobalGb)
+{
+	CExpression *pexprLocalGb = (*pexprGlobalGb)[0];
+	CExpression *pexprJoin = (*pexprLocalGb)[0];
+	CExpression *pexprOuter = (*pexprJoin)[0];
+	return pexprOuter->Pop()->Eopid() == COperator::EopLogicalGbAgg &&
+		   CLogicalGbAgg::PopConvert(pexprOuter->Pop())->Egbaggtype() ==
+			   COperator::EgbaggtypeLocal;
+}
+
+
+// compute xform promise for a given expression handle
+CXform::EXformPromise
+CXformPushPartialAggBelowJoin::Exfp(CExpressionHandle &exprhdl) const
+{
+	CLogicalGbAgg *popGbAgg = CLogicalGbAgg::PopConvert(exprhdl.Pop());
+	if (!popGbAgg->FGlobal())  // multi-stage-but-local-agg
+	{
+		return CXform::ExfpNone;
+	}
+
+	return CXform::ExfpHigh;
+}
+
+CColRefSet *
+CXformPushPartialAggBelowJoin::PexprGetGbAggkey(CMemoryPool *mp,
+												CExpression *pexprGbAgg)
+{
+	// get the group by key set
+	CLogicalGbAgg *popGbAgg = CLogicalGbAgg::PopConvert(pexprGbAgg->Pop());
+
+	CColRefSet *pcrsGbKey = GPOS_NEW(mp) CColRefSet(mp);
+	CColRefArray *colref_array = popGbAgg->PdrgpcrMinimal();
+	if (nullptr == colref_array)
+	{
+		colref_array = popGbAgg->Pdrgpcr();
+	}
+	pcrsGbKey->Include(colref_array);
+	return pcrsGbKey;
+}
+
+// always get the outer join key
+CColRefSet *
+CXformPushPartialAggBelowJoin::PcrsJoinKey(CMemoryPool *mp,
+										   CExpression *pexprOuter,
+										   CExpression *pexprInner,
+										   CExpression *pexprScalar)
+{
+	CColRefSet *prcsOuterOutput = pexprOuter->DeriveOutputColumns();
+	CColRefSet *prcsInnerOutput = pexprInner->DeriveOutputColumns();
+	CColRefSet *pcrsFKey = GPOS_NEW(mp) CColRefSet(mp);
+
+	CExpressionArray *pdrgpexpr =
+		CPredicateUtils::PdrgpexprConjuncts(mp, pexprScalar);
+
+	const ULONG ulConjuncts = pdrgpexpr->Size();
+	for (ULONG ul = 0; ul < ulConjuncts; ul++)
+	{
+		CExpression *pexprConjunct = (*pdrgpexpr)[ul];
+		if (!CPredicateUtils::FPlainEquality(pexprConjunct))
+		{
+			continue;
+		}
+
+		CColRef *pcrFst = const_cast<CColRef *>(
+			CScalarIdent::PopConvert((*pexprConjunct)[0]->Pop())->Pcr());
+		CColRef *pcrSnd = const_cast<CColRef *>(
+			CScalarIdent::PopConvert((*pexprConjunct)[1]->Pop())->Pcr());
+		if (prcsOuterOutput->FMember(pcrFst) &&
+			prcsInnerOutput->FMember(pcrSnd))
+		{
+			pcrsFKey->Include(pcrFst);
+		}
+		else if (prcsOuterOutput->FMember(pcrSnd) &&
+				 prcsInnerOutput->FMember(pcrFst))
+		{
+			pcrsFKey->Include(pcrSnd);
+		}
+	}
+
+	pdrgpexpr->Release();
+	if (pcrsFKey->Size() == 0)
+	{
+		pcrsFKey->Release();
+		pcrsFKey = nullptr;
+	}
+
+	return pcrsFKey;
+}
+
+
+// Different with CXformUtils::PexprPushGbBelowJoin(will pushdown the one-stage agg)
+// Push the partial agg only follow the three rules:
+//  1. The keyset of group by in(contains all) the keyset of join
+//  2. The output from join outer child contains the scalar from groupby
+//    - the scalar from groupby is not the groupby key, but it's the output of agg
+//  3. The output of group by contains(all) the join scalar used from outer child
+//
+// Partial agg cannot be pushed through join because
+// (1) no group by keysets in(contains all) join keysets, or
+// (3) Gb uses columns from both join children, or
+// (4) Gb hides columns required for the join scalar child
+//
+// not like the CXformUtils::PexprPushGbBelowJoin, pushdown a partial agg **NO REQUIRED**
+// the unique key in the key of join inner child.
+//
+// Also we should **NEVER** pushdown the multi-stage agg from `CXformSplitDQA`(the DISTINCT case).
+//
+std::pair<BOOL, BOOL>
+CXformPushPartialAggBelowJoin::FCanPushLocalGbAggBelowJoin(
+	CMemoryPool *mp, CExpression *pexprGlobalGb)
+{
+	// safe to direct extract the child expressions
+	CExpression *pexprLocalGb = (*pexprGlobalGb)[0];
+
+	CExpression *pexprJoin = (*pexprLocalGb)[0];
+	CExpression *pexprLocalPrjList = (*pexprLocalGb)[1];
+
+	CExpression *pexprOuter = (*pexprJoin)[0];
+	CExpression *pexprInner = (*pexprJoin)[1];
+	CExpression *pexprScalar = (*pexprJoin)[2];
+
+	// prepare the args for the `FCanPushGbAggBelowJoin`
+	CColRefSet *pcrsJoinOuterChildOutput = pexprOuter->DeriveOutputColumns();
+	CColRefSet *pcrsGrpByUsed = pexprLocalPrjList->DeriveUsedColumns();
+	CColRefSet *pcrsGrpByOutput = pexprLocalGb->DeriveOutputColumns();
+
+	BOOL fCanPush;
+
+	// current agg form DQA, can't be pushed, otherwise the result may be wrong
+	if (!pexprLocalPrjList->PdrgPexpr() ||
+		pexprLocalPrjList->PdrgPexpr()->Size() == 0 ||
+		CLogicalGbAgg::PopConvert(pexprLocalGb->Pop())->PdrgpcrArgDQA() !=
+			nullptr)
+	{
+		return std::make_pair(false, true);
+	}
+
+	// get the group by key set
+	CColRefSet *pcrsGbKey = PexprGetGbAggkey(mp, pexprLocalGb);
+
+	// get the keyset group by key in join key
+	CColRefSet *pcrsGbInJoinKey =
+		PcrsJoinKey(mp, pexprOuter, pexprInner, pexprScalar);
+
+	// get the join scalar used from outer child
+	CColRefSet *pcrsJoinScalarUsedFromOuter =
+		GPOS_NEW(mp) CColRefSet(mp, *(pexprScalar->DeriveUsedColumns()));
+	pcrsJoinScalarUsedFromOuter->Intersection(pcrsJoinOuterChildOutput);
+
+	// check can we pushdown the local agg
+	fCanPush = CXformUtils::FCanPushGbAggBelowJoin(
+		pcrsGbKey, pcrsJoinOuterChildOutput, pcrsJoinScalarUsedFromOuter,
+		pcrsGrpByOutput, pcrsGrpByUsed, pcrsGbInJoinKey);
+
+	pcrsJoinScalarUsedFromOuter->Release();
+	pcrsGbKey->Release();
+	CRefCount::SafeRelease(pcrsGbInJoinKey);
+	return std::make_pair(fCanPush, false);
+}
+
+CExpression *
+CXformPushPartialAggBelowJoin::PushLocalGbAggBelowJoin(
+	CMemoryPool *mp, CExpression *pexprGlobalGb)
+{
+	CExpression *pexprLocalGb = (*pexprGlobalGb)[0];
+	CLogicalGbAgg *popGbAgg = CLogicalGbAgg::PopConvert(pexprLocalGb->Pop());
+	CExpression *pexprGlobalPrjList = (*pexprGlobalGb)[1];
+
+	CExpression *pexprJoin = (*pexprLocalGb)[0];
+	CExpression *pexprLocalPrjList = (*pexprLocalGb)[1];
+
+	CExpression *pexprOuter = (*pexprJoin)[0];
+	CExpression *pexprInner = (*pexprJoin)[1];
+	CExpression *pexprScalar = (*pexprJoin)[2];
+
+	// get the group by key set
+	CColRefSet *pcrsGbKey = PexprGetGbAggkey(mp, pexprLocalGb);
+
+	CColRefSet *pcrsJoinOuterChildOutput = pexprOuter->DeriveOutputColumns();
+	CLogicalGbAgg *popGbAggNew;
+
+	if (!pcrsJoinOuterChildOutput->ContainsAll(pcrsGbKey))
+	{
+		CColRefSet *pcrsGrpColsNew = GPOS_NEW(mp) CColRefSet(mp);
+		pcrsGrpColsNew->Include(pcrsGbKey);
+		pcrsGrpColsNew->Intersection(pcrsJoinOuterChildOutput);
+
+		popGbAggNew = GPOS_NEW(mp)
+			CLogicalGbAgg(mp, pcrsGrpColsNew->Pdrgpcr(mp),
+						  popGbAgg->Egbaggtype(), popGbAgg->AggStage());
+
+		pcrsGrpColsNew->Release();
+	}
+	else
+	{
+		popGbAgg->AddRef();
+		popGbAggNew = popGbAgg;
+	}
+
+	pcrsGbKey->Release();
+
+	// recreate a local agg below join, above the join outer expression
+	pexprOuter->AddRef();
+	pexprLocalPrjList->AddRef();
+
+	popGbAggNew->MarkAggPushdown();
+	CExpression *pexprNewGb = GPOS_NEW(mp)
+		CExpression(mp, popGbAggNew, pexprOuter, pexprLocalPrjList);
+
+	// recreate the join which outer is the local agg
+	COperator *popJoin = pexprJoin->Pop();
+	popJoin->AddRef();
+	pexprInner->AddRef();
+	pexprScalar->AddRef();
+	CExpression *pexprNewJoin = GPOS_NEW(mp)
+		CExpression(mp, popJoin, pexprNewGb, pexprInner, pexprScalar);
+
+	// recreate the global agg below the join
+	CLogicalGbAgg *popGlobalGb =
+		CLogicalGbAgg::PopConvert(pexprGlobalGb->Pop());
+	popGlobalGb->Pdrgpcr()->AddRef();
+	CLogicalGbAgg *popGlobalGbNew = GPOS_NEW(mp)
+		CLogicalGbAgg(mp, popGlobalGb->Pdrgpcr(), popGlobalGb->Egbaggtype(),
+					  popGlobalGb->AggStage());
+	popGlobalGbNew->MarkAggPushdown();
+
+	pexprGlobalPrjList->AddRef();
+	return GPOS_NEW(mp)
+		CExpression(mp, popGlobalGbNew, pexprNewJoin, pexprGlobalPrjList);
+}
+
+
+// Used to exchange the group by key with join key
+// Current groupby should not equal with outer join key but equal with inner join key.
+// Also should not be the multi groupby key.
+// Then exchange the local agg group by key to the outer join key
+CExpression *
+CXformPushPartialAggBelowJoin::ExchangeGbkeyFromJoinKey(
+	CMemoryPool *mp, CExpression *pexprGlobalGb)
+{
+	CExpression *pexprLocalGb = (*pexprGlobalGb)[0];
+	CLogicalGbAgg *popGbAgg = CLogicalGbAgg::PopConvert(pexprLocalGb->Pop());
+	CExpression *pexprGlobalPrjList = (*pexprGlobalGb)[1];
+
+	CExpression *pexprJoin = (*pexprLocalGb)[0];
+	CExpression *pexprLocalPrjList = (*pexprLocalGb)[1];
+
+	CExpression *pexprOuter = (*pexprJoin)[0];
+	CExpression *pexprInner = (*pexprJoin)[1];
+	CExpression *pexprScalar = (*pexprJoin)[2];
+
+	CExpression *pexprNew = nullptr;
+
+	// get the group by key set
+	CColRefSet *pcrsGbKey = PexprGetGbAggkey(mp, pexprLocalGb);
+	CColRefSet *pcrsGbInJoinKey =
+		PcrsJoinKey(mp, pexprOuter, pexprInner, pexprScalar);
+
+	if (pcrsGbKey->Size() == 1 && pcrsGbInJoinKey &&
+		pcrsGbInJoinKey->Size() == 1)
+	{
+		CColRefSet *pcrsJoinInnerKey =
+			PcrsJoinKey(mp, pexprInner, pexprOuter, pexprScalar);
+
+		// current group by not in outer and inner join key
+		if (!pcrsJoinInnerKey || !pcrsGbKey->ContainsAll(pcrsJoinInnerKey))
+		{
+			pcrsGbKey->Release();
+			CRefCount::SafeRelease(pcrsJoinInnerKey);
+			CRefCount::SafeRelease(pcrsGbInJoinKey);
+			return nullptr;
+		}
+		else
+		{
+			CRefCount::SafeRelease(pcrsJoinInnerKey);
+		}
+
+		CColRefArray *pcraGbInJoinKey = pcrsGbInJoinKey->Pdrgpcr(mp);
+
+		// change group by to the join key(another side)mak
+		CLogicalGbAgg *popGbAggNew = GPOS_NEW(mp) CLogicalGbAgg(
+			mp, pcraGbInJoinKey, popGbAgg->Egbaggtype(), popGbAgg->AggStage());
+
+		pexprJoin->AddRef();
+		pexprLocalPrjList->AddRef();
+
+		CExpression *pexprNewLocalGb = GPOS_NEW(mp)
+			CExpression(mp, popGbAggNew, pexprJoin, pexprLocalPrjList);
+
+		// recreate the global agg also exchange the group by key
+		CLogicalGbAgg *popGlobalGb =
+			CLogicalGbAgg::PopConvert(pexprGlobalGb->Pop());
+		popGlobalGb->Pdrgpcr()->AddRef();
+		COperator *popGlobalGbNew = GPOS_NEW(mp)
+			CLogicalGbAgg(mp, popGlobalGb->Pdrgpcr(), popGlobalGb->Egbaggtype(),
+						  popGlobalGb->AggStage());
+
+		pexprGlobalPrjList->AddRef();
+		pexprNew = GPOS_NEW(mp) CExpression(mp, popGlobalGbNew, pexprNewLocalGb,
+											pexprGlobalPrjList);
+	}
+
+	pcrsGbKey->Release();
+	CRefCount::SafeRelease(pcrsGbInJoinKey);
+
+	return pexprNew;
+}
+
+// actual transform
+void
+CXformPushPartialAggBelowJoin::Transform(CXformContext *pxfctxt,
+										 CXformResult *pxfres,
+										 CExpression *pexpr) const
+{
+	GPOS_ASSERT(nullptr != pxfctxt);
+	GPOS_ASSERT(FPromising(pxfctxt->Pmp(), this, pexpr));
+	GPOS_ASSERT(FCheckPattern(pexpr));
+
+	BOOL fCanPush;
+	BOOL fFailDueDQA;
+	CMemoryPool *mp = pxfctxt->Pmp();
+
+	// check current agg already been pushdowned
+	if (FLocalGbAggAlreadyPushed(pexpr))
+	{
+		return;
+	}
+
+	CExpression *pexprResult = nullptr;
+	std::tie(fCanPush, fFailDueDQA) = FCanPushLocalGbAggBelowJoin(mp, pexpr);
+
+	// check the expression can do the pushdown.
+	if (fCanPush)
+	{
+		// do the pushdown
+		pexprResult = PushLocalGbAggBelowJoin(mp, pexpr);
+		GPOS_ASSERT(pexprResult);
+	}
+	else if (!fFailDueDQA)	// no DQA, we can exchange the gb key and try again
+	{
+		// exchange the groupby by key
+		CExpression *pexprNew = ExchangeGbkeyFromJoinKey(mp, pexpr);
+		if (pexprNew)
+		{
+			std::tie(fCanPush, fFailDueDQA) =
+				FCanPushLocalGbAggBelowJoin(mp, pexprNew);
+
+			// should not fail due the DQA
+			GPOS_ASSERT(!fFailDueDQA);
+			if (fCanPush)
+			{
+				pexprResult = PushLocalGbAggBelowJoin(mp, pexprNew);
+				GPOS_ASSERT(pexprResult);
+			}
+		}
+
+		// release the expression
+		CRefCount::SafeRelease(pexprNew);
+	}
+
+	if (pexprResult)
+		pxfres->Add(pexprResult);
+}
\ No newline at end of file
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp
index 3abb4ffa69a..b7483342bff 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp
@@ -61,9 +61,8 @@ CXformSimplifyGbAgg::Exfp(CExpressionHandle &exprhdl) const
 {
 	CLogicalGbAgg *popAgg = CLogicalGbAgg::PopConvert(exprhdl.Pop());
 
-	GPOS_ASSERT(COperator::EgbaggtypeGlobal == popAgg->Egbaggtype());
-
-	if (0 == popAgg->Pdrgpcr()->Size() || nullptr != popAgg->PdrgpcrMinimal())
+	if (0 == popAgg->Pdrgpcr()->Size() || nullptr != popAgg->PdrgpcrMinimal()
+		|| popAgg->Egbaggtype() != COperator::EgbaggtypeGlobal)
 	{
 		return CXform::ExfpNone;
 	}
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp
index a5ad355f5d3..c4008a885f3 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp
@@ -62,9 +62,11 @@ CXformSplitDQA::CXformSplitDQA(CMemoryPool *mp)
 CXform::EXformPromise
 CXformSplitDQA::Exfp(CExpressionHandle &exprhdl) const
 {
+	CLogicalGbAgg *popGbAgg = CLogicalGbAgg::PopConvert(exprhdl.Pop());
 	// do not split aggregate if it is not a global aggregate,  has no distinct aggs, has MDQAs, has outer references,
 	// or return types of Agg functions are ambiguous
-	if (!CLogicalGbAgg::PopConvert(exprhdl.Pop())->FGlobal() ||
+	if (!popGbAgg->FGlobal() ||
+		popGbAgg->FAggPushdown() ||
 		0 == exprhdl.DeriveTotalDistinctAggs(1) ||
 		exprhdl.DeriveHasMultipleDistinctAggs(1) ||
 		0 < exprhdl.DeriveOuterReferences()->Size() ||
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp
index 2a55afdc752..25a46d1519a 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp
@@ -76,9 +76,11 @@ CXformSplitGbAgg::CXformSplitGbAgg(CExpression *pexprPattern)
 CXform::EXformPromise
 CXformSplitGbAgg::Exfp(CExpressionHandle &exprhdl) const
 {
+	CLogicalGbAgg *popGbAgg = CLogicalGbAgg::PopConvert(exprhdl.Pop());
 	// do not split aggregate if it is a local aggregate, has distinct aggs, has outer references,
 	// or return types of Agg functions are ambiguous
-	if (!CLogicalGbAgg::PopConvert(exprhdl.Pop())->FGlobal() ||
+	if (!popGbAgg->FGlobal() ||
+		popGbAgg->FAggPushdown() || // current agg have been pushdown
 		0 < exprhdl.DeriveTotalDistinctAggs(1) ||
 		0 < exprhdl.DeriveOuterReferences()->Size() ||
 		nullptr == exprhdl.PexprScalarExactChild(1) ||
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp
index 1623c81de94..d7eaa60e118 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp
@@ -222,6 +222,7 @@ CXformUnnestTVF::Transform(CXformContext *pxfctxt, CXformResult *pxfres,
 		GPOS_NEW(mp) CLogicalCTEConsumer(mp, ulCTEId, pdrgpcrConsumerOutput);
 	CExpression *pexprCTECons = GPOS_NEW(mp) CExpression(mp, popConsumer);
 	pcteinfo->IncrementConsumers(ulCTEId);
+	pcteinfo->AddCTEConsumer(pexprCTECons);
 	pdrgpcrProducerOutput->Release();
 
 	// find columns corresponding to subqueries in consumer's output
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp b/src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp
index cce598d386b..b810b058f4d 100644
--- a/src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp
+++ b/src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp
@@ -560,6 +560,7 @@ CXformUtils::PexprPushGbBelowJoin(CMemoryPool *mp, CExpression *pexpr)
 
 	pexprOuter->AddRef();
 	pexprPrjList->AddRef();
+	popGbAggNew->MarkAggPushdown();
 	CExpression *pexprNewGb =
 		GPOS_NEW(mp) CExpression(mp, popGbAggNew, pexprOuter, pexprPrjList);
 
@@ -3652,11 +3653,14 @@ CExpression *
 CXformUtils::PexprCTEConsumer(CMemoryPool *mp, ULONG ulCTEId,
 							  CColRefArray *colref_array)
 {
+	CExpression *pexpr;
 	CLogicalCTEConsumer *popConsumer =
 		GPOS_NEW(mp) CLogicalCTEConsumer(mp, ulCTEId, colref_array);
-	COptCtxt::PoctxtFromTLS()->Pcteinfo()->IncrementConsumers(ulCTEId);
 
-	return GPOS_NEW(mp) CExpression(mp, popConsumer);
+	pexpr = GPOS_NEW(mp) CExpression(mp, popConsumer);
+	COptCtxt::PoctxtFromTLS()->Pcteinfo()->IncrementConsumers(ulCTEId);
+	COptCtxt::PoctxtFromTLS()->Pcteinfo()->AddCTEConsumer(pexpr);
+	return pexpr;
 }
 
 
@@ -4050,6 +4054,7 @@ CXformUtils::PexprGbAggOnCTEConsumer2Join(CMemoryPool *mp,
 				CExpression(mp, GPOS_NEW(mp) CLogicalCTEConsumer(
 									mp, ulCTEId, pdrgpcrNewConsumerOutput));
 			pcteinfo->IncrementConsumers(ulCTEId);
+			pcteinfo->AddCTEConsumer(pexprNewConsumer);
 
 			// fix Aggs arguments to use new consumer output column
 			UlongToColRefMap *colref_mapping = CUtils::PhmulcrMapping(
diff --git a/src/backend/gporca/libgpopt/src/xforms/Makefile b/src/backend/gporca/libgpopt/src/xforms/Makefile
index 4283daedb4c..03f6293b36d 100644
--- a/src/backend/gporca/libgpopt/src/xforms/Makefile
+++ b/src/backend/gporca/libgpopt/src/xforms/Makefile
@@ -58,6 +58,7 @@ OBJS        = CDecorrelator.o \
               CXformImplementLimit.o \
               CXformImplementSequence.o \
               CXformImplementSequenceProject.o \
+              CXformImplementHashSequenceProject.o \
               CXformImplementSplit.o \
               CXformImplementTVF.o \
               CXformImplementTVFNoArgs.o \
@@ -113,6 +114,7 @@ OBJS        = CDecorrelator.o \
               CXformPushGbBelowJoin.o \
               CXformPushGbDedupBelowJoin.o \
               CXformPushGbWithHavingBelowJoin.o \
+              CXformPushPartialAggBelowJoin.o \
               CXformRemoveSubqDistinct.o \
               CXformResult.o \
               CXformRightOuterJoin2HashJoin.o \
diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringConst.h b/src/backend/gporca/libgpos/include/gpos/string/CWStringConst.h
index 448dd34e29b..96421a5b6bb 100644
--- a/src/backend/gporca/libgpos/include/gpos/string/CWStringConst.h
+++ b/src/backend/gporca/libgpos/include/gpos/string/CWStringConst.h
@@ -57,6 +57,9 @@ class CWStringConst : public CWStringBase
 
 	// checks whether the string is byte-wise equal to another string
 	BOOL Equals(const CWStringBase *str) const override;
+
+	// bring base class Equals(const WCHAR*) into scope to avoid hiding
+	using CWStringBase::Equals;
 };
 }  // namespace gpos
 
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h
index 6ce5567dbb7..04611ac2258 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h
@@ -34,12 +34,14 @@ class CDXLLogicalCTEProducer : public CDXLLogical
 	// output column ids
 	ULongPtrArray *m_output_colids_array;
 
+	BOOL m_could_be_pruned;
+
 public:
 	CDXLLogicalCTEProducer(CDXLLogicalCTEProducer &) = delete;
 
 	// ctor
 	CDXLLogicalCTEProducer(CMemoryPool *mp, ULONG id,
-						   ULongPtrArray *output_colids_array);
+						   ULongPtrArray *output_colids_array, BOOL could_be_pruned);
 
 	// dtor
 	~CDXLLogicalCTEProducer() override;
@@ -63,6 +65,12 @@ class CDXLLogicalCTEProducer : public CDXLLogical
 		return m_output_colids_array;
 	}
 
+	BOOL
+	CouldBePruned() const
+	{
+		return m_could_be_pruned;
+	}
+
 	// serialize operator in DXL format
 	void SerializeToDXL(CXMLSerializer *xml_serializer,
 						const CDXLNode *dxlnode) const override;
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h
index 3dff2dc5d6d..2b547015447 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h
@@ -49,12 +49,29 @@ class CDXLPhysicalAppend : public CDXLPhysical
 	// TODO:  - Apr 12, 2011; find a better name (and comments) for this variable
 	BOOL m_is_zapped = false;
 
+	// scan id from the CPhysicalDynamicTableScan (a.k.a part_index_id)
+	// when m_scan_id != gpos::ulong_max
+	ULONG m_scan_id = gpos::ulong_max;
+
+	// table descr of the root partitioned table (when translated from a CPhysicalDynamicTableScan)
+	CDXLTableDescr *m_dxl_table_descr = nullptr;
+
+	ULongPtrArray *m_selector_ids = nullptr;
+
 public:
 	CDXLPhysicalAppend(const CDXLPhysicalAppend &) = delete;
 
 	// ctor/dtor
 	CDXLPhysicalAppend(CMemoryPool *mp, BOOL fIsTarget, BOOL fIsZapped);
 
+	// ctor for partitioned table scan
+	CDXLPhysicalAppend(CMemoryPool *mp, BOOL fIsTarget, BOOL fIsZapped,
+					   ULONG scan_id, CDXLTableDescr *dxl_table_desc,
+					   ULongPtrArray *selector_ids);
+
+	// dtor
+	~CDXLPhysicalAppend() override;
+
 	// accessors
 	Edxlopid GetDXLOperator() const override;
 	const CWStringConst *GetOpNameStr() const override;
@@ -62,6 +79,30 @@ class CDXLPhysicalAppend : public CDXLPhysical
 	BOOL IsUsedInUpdDel() const;
 	BOOL IsZapped() const;
 
+	CDXLTableDescr *
+	GetDXLTableDesc() const
+	{
+		return m_dxl_table_descr;
+	}
+
+	void
+	SetDXLTableDesc(CDXLTableDescr *dxl_table_desc)
+	{
+		m_dxl_table_descr = dxl_table_desc;
+	}
+
+	ULONG
+	GetScanId() const
+	{
+		return m_scan_id;
+	}
+
+	const ULongPtrArray *
+	GetSelectorIds() const
+	{
+		return m_selector_ids;
+	}
+
 	// serialize operator in DXL format
 	void SerializeToDXL(CXMLSerializer *xml_serializer,
 						const CDXLNode *dxlnode) const override;
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h
index d17ddf7af53..dc6ae75ee2e 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h
@@ -35,12 +35,16 @@ class CDXLPhysicalCTEConsumer : public CDXLPhysical
 	// output column ids
 	ULongPtrArray *m_output_colids_array;
 
+	// output column index mapping
+	ULongPtrArray *m_output_colidx_map;
+
 public:
 	CDXLPhysicalCTEConsumer(CDXLPhysicalCTEConsumer &) = delete;
 
 	// ctor
 	CDXLPhysicalCTEConsumer(CMemoryPool *mp, ULONG id,
-							ULongPtrArray *output_colids_array);
+							ULongPtrArray *output_colids_array,
+							ULongPtrArray *output_colidx_map);
 
 	// dtor
 	~CDXLPhysicalCTEConsumer() override;
@@ -64,6 +68,12 @@ class CDXLPhysicalCTEConsumer : public CDXLPhysical
 		return m_output_colids_array;
 	}
 
+	ULongPtrArray *
+	GetOutputColIdxMap() const
+	{
+		return m_output_colidx_map;
+	}
+
 	// serialize operator in DXL format
 	void SerializeToDXL(CXMLSerializer *xml_serializer,
 						const CDXLNode *dxlnode) const override;
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h
index e03b4889451..9d8735e9b94 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h
@@ -35,12 +35,16 @@ class CDXLPhysicalCTEProducer : public CDXLPhysical
 	// output column ids
 	ULongPtrArray *m_output_colids_array;
 
+	// output column index mapping
+	ULongPtrArray *m_output_colidx_map;
+
 public:
 	CDXLPhysicalCTEProducer(CDXLPhysicalCTEProducer &) = delete;
 
 	// ctor
 	CDXLPhysicalCTEProducer(CMemoryPool *mp, ULONG id,
-							ULongPtrArray *output_colids_array);
+							ULongPtrArray *output_colids_array,
+							ULongPtrArray *output_colidx_map);
 
 	// dtor
 	~CDXLPhysicalCTEProducer() override;
@@ -64,6 +68,13 @@ class CDXLPhysicalCTEProducer : public CDXLPhysical
 		return m_output_colids_array;
 	}
 
+
+	ULongPtrArray *
+	GetOutputColIdxMap() const
+	{
+		return m_output_colidx_map;
+	}
+
 	// serialize operator in DXL format
 	void SerializeToDXL(CXMLSerializer *xml_serializer,
 						const CDXLNode *dxlnode) const override;
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h
index 4df4c3bc27a..a1d304af502 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h
@@ -46,12 +46,14 @@ class CDXLPhysicalWindow : public CDXLPhysical
 	// window keys
 	CDXLWindowKeyArray *m_dxl_window_key_array;
 
+	BOOL m_window_hash_agg;
+
 public:
 	CDXLPhysicalWindow(CDXLPhysicalWindow &) = delete;
 
 	//ctor
 	CDXLPhysicalWindow(CMemoryPool *mp, ULongPtrArray *part_by_colid_array,
-					   CDXLWindowKeyArray *window_key_array);
+					   CDXLWindowKeyArray *window_key_array, BOOL fWindowHashAgg);
 
 	//dtor
 	~CDXLPhysicalWindow() override;
@@ -76,6 +78,9 @@ class CDXLPhysicalWindow : public CDXLPhysical
 	// return the window key at a given position
 	CDXLWindowKey *GetDXLWindowKeyAt(ULONG ulPos) const;
 
+	// is windowagg implements by window hash agg
+	BOOL IsWindowHashAgg() const;
+
 	// serialize operator in DXL format
 	void SerializeToDXL(CXMLSerializer *xml_serializer,
 						const CDXLNode *dxlnode) const override;
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h
index 9a8c7ddeafd..e594d8cabc7 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h
@@ -62,6 +62,9 @@ class CParseHandlerColStats : public CParseHandlerMetadataObject
 	// is the column statistics missing in the database
 	BOOL m_is_column_stats_missing;
 
+	// ndistinct generated by segments
+	CDouble m_distinct_by_segs;
+
 	// process the start of an element
 	void StartElement(
 		const XMLCh *const element_uri,			// URI of element's namespace
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h
index 1a8ce378d03..6dc5604de63 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h
@@ -50,6 +50,9 @@ class CParseHandlerStatsDerivedColumn : public CParseHandlerBase
 	// frequency of remaining tuples
 	CDouble m_freq_remaining;
 
+	// ndistinct generated by segments
+	CDouble m_distinct_by_segs;
+
 	// derived column stats
 	CDXLStatsDerivedColumn *m_dxl_stats_derived_col;
 
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h b/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h
index 9c21027c05b..5a61801511a 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h
@@ -132,6 +132,8 @@ enum Edxltoken
 
 	EdxltokenDuplicateSensitive,
 
+	EdxltokenPartIndexId,
+	EdxltokenPartIndexIdPrintable,
 	EdxltokenSegmentIdCol,
 
 	EdxltokenScalar,
@@ -235,6 +237,7 @@ enum Edxltoken
 	EdxltokenScalarWindowFrameTrailingEdge,
 	EdxltokenWindowKeyList,
 	EdxltokenWindowKey,
+	EdxltokenWindowHashAgg,
 
 	EdxltokenWindowSpecList,
 	EdxltokenWindowSpec,
@@ -354,6 +357,7 @@ enum Edxltoken
 
 	EdxltokenColDescr,
 	EdxltokenColRef,
+	EdxltokenColIdxmap,
 
 	EdxltokenColumns,
 	EdxltokenColumn,
@@ -367,6 +371,7 @@ enum Edxltoken
 	EdxltokenColNdvRemain,
 	EdxltokenColFreqRemain,
 	EdxltokenColStatsMissing,
+	EdxltokenColNdvBySeg,
 
 	EdxltokenParamId,
 
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h b/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h
index e3d60d288f4..d9c4f0c6416 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h
@@ -69,6 +69,9 @@ class CDXLColStats : public IMDColStats
 	// is column statistics missing in the database
 	BOOL m_is_col_stats_missing;
 
+	// ndistinct generated by segments
+	CDouble m_distinct_by_segs;
+
 	// DXL string for object
 	CWStringDynamic *m_dxl_str = nullptr;
 
@@ -79,7 +82,7 @@ class CDXLColStats : public IMDColStats
 	CDXLColStats(CMemoryPool *mp, CMDIdColStats *mdid_col_stats,
 				 CMDName *mdname, CDouble width, CDouble null_freq,
 				 CDouble distinct_remaining, CDouble freq_remaining,
-				 CDXLBucketArray *dxl_stats_bucket_array,
+				 CDouble distinct_by_segs, CDXLBucketArray *dxl_stats_bucket_array,
 				 BOOL is_col_stats_missing);
 
 	// dtor
@@ -132,6 +135,12 @@ class CDXLColStats : public IMDColStats
 		return m_is_col_stats_missing;
 	}
 
+	CDouble
+	GetDistinctBySegs() const override
+	{
+		return m_distinct_by_segs;
+	}
+
 	// get the bucket at the given position
 	const CDXLBucket *GetDXLBucketAt(ULONG ul) const override;
 
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h b/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h
index 73c121494c7..bce04068762 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h
@@ -54,6 +54,9 @@ class CDXLStatsDerivedColumn : public CRefCount
 	// frequency of remaining tuples
 	CDouble m_freq_remaining;
 
+	// ndistinct generated by segments
+	CDouble m_distinct_by_segs;
+
 	CDXLBucketArray *m_dxl_stats_bucket_array;
 
 public:
@@ -62,7 +65,7 @@ class CDXLStatsDerivedColumn : public CRefCount
 	// ctor
 	CDXLStatsDerivedColumn(ULONG colid, CDouble width, CDouble null_freq,
 						   CDouble distinct_remaining, CDouble freq_remaining,
-						   CDXLBucketArray *dxl_stats_bucket_array);
+						   CDouble distinct_by_segs, CDXLBucketArray *dxl_stats_bucket_array);
 
 	// dtor
 	~CDXLStatsDerivedColumn() override;
@@ -102,6 +105,13 @@ class CDXLStatsDerivedColumn : public CRefCount
 		return m_freq_remaining;
 	}
 
+	// ndistinct generated by segments
+	CDouble
+	GetDistinctBySeg() const
+	{
+		return m_distinct_by_segs;
+	}
+
 	const CDXLBucketArray *TransformHistogramToDXLBucketArray() const;
 
 	// serialize bucket in DXL format
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColStats.h b/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColStats.h
index fbc6a08d39e..7fa5b8aacff 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColStats.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColStats.h
@@ -60,6 +60,9 @@ class IMDColStats : public IMDCacheObject
 	// is the columns statistics missing in the database
 	virtual BOOL IsColStatsMissing() const = 0;
 
+	// ndistinct generated by segment
+	virtual CDouble GetDistinctBySegs() const = 0;
+
 	// get the bucket at the given position
 	virtual const CDXLBucket *GetDXLBucketAt(ULONG ul) const = 0;
 };
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h
index 6a0008d67a2..832e8782c6a 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h
@@ -24,7 +24,8 @@ class CGroupByStatsProcessor
 	static CStatistics *CalcGroupByStats(CMemoryPool *mp,
 										 const CStatistics *input_stats,
 										 ULongPtrArray *GCs,
-										 ULongPtrArray *aggs, CBitSet *keys);
+										 ULongPtrArray *aggs, CBitSet *keys,
+										 BOOL is_partial);
 };
 }  // namespace gpnaucrates
 
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h
index ccc3258a43d..a67944ce697 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h
@@ -83,6 +83,9 @@ class CHistogram : public gpos::DbgPrintMixin<CHistogram>
 	// frequency of tuples not covered in the buckets
 	CDouble m_freq_remaining;
 
+	// ndistinct generated by segments
+	CDouble m_distinct_by_segs;
+
 	// has histogram skew been measures
 	BOOL m_skew_was_measured;
 
@@ -232,6 +235,7 @@ class CHistogram : public gpos::DbgPrintMixin<CHistogram>
 	CHistogram(CMemoryPool *mp, CBucketArray *histogram_buckets,
 			   BOOL is_well_defined, CDouble null_freq,
 			   CDouble distinct_remaining, CDouble freq_remaining,
+			   CDouble distinct_by_segs,
 			   BOOL is_col_stats_missing = false);
 
 	// set null frequency
@@ -353,6 +357,11 @@ class CHistogram : public gpos::DbgPrintMixin<CHistogram>
 	// total number of distinct values
 	CDouble GetNumDistinct() const;
 
+	// total number of distinct values
+	CDouble GetDistinctBySegs() const {
+		return m_distinct_by_segs;
+	}
+
 	// is histogram well formed
 	BOOL IsValid() const;
 
@@ -474,6 +483,9 @@ class CHistogram : public gpos::DbgPrintMixin<CHistogram>
 
 	// default frequency of NDV remain
 	static const CDouble DefaultNDVFreqRemain;
+
+	// default NDV by segments
+	static const CDouble DefaultNDVBySegments;
 };	// class CHistogram
 
 }  // namespace gpnaucrates
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h
index 77523590ae6..24cedd6672b 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h
@@ -109,13 +109,15 @@ class CStatisticsUtils
 	static void AddNdvForAllGrpCols(
 		CMemoryPool *mp, const CStatistics *input_stats,
 		const ULongPtrArray *grouping_columns,
-		CDoubleArray *output_ndvs  // output array of NDV
+		CDoubleArray *output_ndvs,  // output array of NDV
+		BOOL is_partial
 	);
 
 	// compute max number of groups when grouping on columns from the given source
 	static CDouble MaxNumGroupsForGivenSrcGprCols(
 		CMemoryPool *mp, const CStatisticsConfig *stats_config,
-		CStatistics *input_stats, const ULongPtrArray *src_grouping_cols);
+		CStatistics *input_stats, const ULongPtrArray *src_grouping_cols,
+		BOOL is_partial);
 
 	// check to see if any one of the grouping columns has been capped
 	static BOOL CappedGrpColExists(const CStatistics *stats,
@@ -245,13 +247,15 @@ class CStatisticsUtils
 		CMemoryPool *mp, const CStatisticsConfig *stats_config,
 		const IStatistics *stats,
 		CColRefSet *grp_cols_refset,  // grouping columns
-		CBitSet *keys				  // keys derived during optimization
+		CBitSet *keys,				  // keys derived during optimization
+		BOOL is_partial
 	);
 
 	// compute the cumulative number of groups for the given set of grouping columns
 	static CDouble Groups(CMemoryPool *mp, IStatistics *stats,
 						  const CStatisticsConfig *stats_config,
-						  ULongPtrArray *grouping_cols, CBitSet *keys);
+						  ULongPtrArray *grouping_cols, CBitSet *keys,
+						  BOOL is_partial);
 
 	// return the default number of distinct values
 	static CDouble
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h b/src/backend/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h
index c5d4ab38957..25682a21399 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h
@@ -58,10 +58,16 @@ using UlongToDoubleMapIter =
 	CHashMapIter<ULONG, CDouble, gpos::HashValue<ULONG>, gpos::Equals<ULONG>,
 				 CleanupDelete<ULONG>, CleanupDelete<CDouble>>;
 
+// hash map from column ULONG to ULONG
 using UlongToUlongMap =
 	CHashMap<ULONG, ULONG, gpos::HashValue<ULONG>, gpos::Equals<ULONG>,
 			 CleanupDelete<ULONG>, CleanupDelete<ULONG>>;
 
+// iterator
+using UlongToUlongMapIter =
+	CHashMapIter<ULONG, ULONG, gpos::HashValue<ULONG>, gpos::Equals<ULONG>,
+				 CleanupDelete<ULONG>, CleanupDelete<ULONG>>;
+
 // hash maps mapping INT -> ULONG
 using IntToUlongMap =
 	CHashMap<INT, ULONG, gpos::HashValue<INT>, gpos::Equals<INT>,
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h b/src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h
index b4aea06ac8f..2e489f214e5 100644
--- a/src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h
+++ b/src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h
@@ -71,15 +71,18 @@ enum EOptTraceFlag
 	// print MEMO during property enforcement process
 	EopttracePrintMemoEnforcement = 101015,
 
-	// print required columns
-	EopttracePrintRequiredColumns = 101016,
-
 	// print equivalent distribution specs
 	EopttracePrintEquivDistrSpecs = 101017,
 
 	// log results of hint parsing
 	EopttracePrintPgHintPlanLog = 101018,
 
+	// print result of preprocess
+	EopttracePrintPreProcessResult = 101019,
+
+	// print debug info of CTE
+	EopttraceDebugCTE = 101020,
+
 	///////////////////////////////////////////////////////
 	////////////////// transformations flags //////////////
 	///////////////////////////////////////////////////////
@@ -232,6 +235,21 @@ enum EOptTraceFlag
 	// Force split the window function
 	EopttraceForceSplitWindowFunc = 103048,
 
+	// Disable dynamic seq/bitmap/index scan
+	EopttraceDisableDynamicTableScan = 103049,
+
+	// Enable window hash agg
+	EopttraceEnableWindowHashAgg = 103050,
+
+	// Use the first key in AGG Pds
+	EopttraceAggRRSFirstKey = 103051,
+
+	// Use the minimal length key in AGG Pds
+	EopttraceAggRRSMinimalLenKey = 103052,
+
+	// Use the all key exclude the non-fixed key in AGG pds
+	EopttraceAggRRSExcludeNonFixedKey = 103053,
+
 	///////////////////////////////////////////////////////
 	///////////////////// statistics flags ////////////////
 	//////////////////////////////////////////////////////
@@ -274,6 +292,8 @@ enum EOptTraceFlag
 	// is nestloop params enabled, it is only enabled in GPDB 6.x onwards.
 	EopttraceIndexedNLJOuterRefAsParams = 106000,
 
+	// 
+
 	// max
 	EopttraceSentinel = 199999
 };
diff --git a/src/backend/gporca/libnaucrates/src/CDXLUtils.cpp b/src/backend/gporca/libnaucrates/src/CDXLUtils.cpp
index 43e627c0335..b1c1bad0322 100644
--- a/src/backend/gporca/libnaucrates/src/CDXLUtils.cpp
+++ b/src/backend/gporca/libnaucrates/src/CDXLUtils.cpp
@@ -621,13 +621,15 @@ CDXLUtils::ParseDXLToOptimizerStatisticObjArray(
 			CDouble distinct_remaining =
 				dxl_derived_col_stats->GetDistinctRemain();
 			CDouble freq_remaining = dxl_derived_col_stats->GetFreqRemain();
+			CDouble distinct_by_segs = dxl_derived_col_stats->GetDistinctBySeg();
 
 			CBucketArray *stats_buckets_array =
 				CDXLUtils::ParseDXLToBucketsArray(mp, md_accessor,
 												  dxl_derived_col_stats);
 			CHistogram *histogram = GPOS_NEW(mp)
 				CHistogram(mp, stats_buckets_array, true /*is_well_defined*/,
-						   null_freq, distinct_remaining, freq_remaining);
+						   null_freq, distinct_remaining, freq_remaining,
+						   distinct_by_segs);
 
 			column_id_histogram_map->Insert(GPOS_NEW(mp) ULONG(column_id),
 											histogram);
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp b/src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp
index 39c346c169b..20da011b5e6 100644
--- a/src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp
+++ b/src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp
@@ -33,7 +33,7 @@ using namespace gpmd;
 CDXLColStats::CDXLColStats(CMemoryPool *mp, CMDIdColStats *mdid_col_stats,
 						   CMDName *mdname, CDouble width, CDouble null_freq,
 						   CDouble distinct_remaining, CDouble freq_remaining,
-						   CDXLBucketArray *dxl_stats_bucket_array,
+						   CDouble distinct_by_segs, CDXLBucketArray *dxl_stats_bucket_array,
 						   BOOL is_col_stats_missing)
 	: m_mp(mp),
 	  m_mdid_col_stats(mdid_col_stats),
@@ -43,7 +43,8 @@ CDXLColStats::CDXLColStats(CMemoryPool *mp, CMDIdColStats *mdid_col_stats,
 	  m_distinct_remaining(distinct_remaining),
 	  m_freq_remaining(freq_remaining),
 	  m_dxl_stats_bucket_array(dxl_stats_bucket_array),
-	  m_is_col_stats_missing(is_col_stats_missing)
+	  m_is_col_stats_missing(is_col_stats_missing),
+	  m_distinct_by_segs(distinct_by_segs)
 {
 	GPOS_ASSERT(mdid_col_stats->IsValid());
 	GPOS_ASSERT(nullptr != dxl_stats_bucket_array);
@@ -167,6 +168,9 @@ CDXLColStats::Serialize(CXMLSerializer *xml_serializer) const
 	xml_serializer->AddAttribute(
 		CDXLTokens::GetDXLTokenStr(EdxltokenColStatsMissing),
 		m_is_col_stats_missing);
+	xml_serializer->AddAttribute(
+		CDXLTokens::GetDXLTokenStr(EdxltokenColNdvBySeg),
+		m_distinct_by_segs);
 
 	GPOS_CHECK_ABORT;
 
@@ -233,8 +237,8 @@ CDXLColStats::CreateDXLDummyColStats(CMemoryPool *mp, IMDId *mdid,
 	dxl_col_stats = GPOS_NEW(mp) CDXLColStats(
 		mp, mdid_col_stats, mdname, width, CHistogram::DefaultNullFreq,
 		CHistogram::DefaultNDVRemain, CHistogram::DefaultNDVFreqRemain,
-		dxl_bucket_array.Value(), true /* is_col_stats_missing */
-	);
+		CHistogram::DefaultNDVBySegments, dxl_bucket_array.Value(),
+		true /* is_col_stats_missing */);
 	dxl_bucket_array.Reset();
 	return dxl_col_stats.Reset();
 }
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp b/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp
index 78a45d8dc4d..b80c3ce5a16 100644
--- a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp
+++ b/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp
@@ -30,12 +30,13 @@ using namespace gpmd;
 //---------------------------------------------------------------------------
 CDXLStatsDerivedColumn::CDXLStatsDerivedColumn(
 	ULONG colid, CDouble width, CDouble null_freq, CDouble distinct_remaining,
-	CDouble freq_remaining, CDXLBucketArray *dxl_stats_bucket_array)
+	CDouble freq_remaining, CDouble distinct_by_segs, CDXLBucketArray *dxl_stats_bucket_array)
 	: m_colid(colid),
 	  m_width(width),
 	  m_null_freq(null_freq),
 	  m_distinct_remaining(distinct_remaining),
 	  m_freq_remaining(freq_remaining),
+	  m_distinct_by_segs(distinct_by_segs),
 	  m_dxl_stats_bucket_array(dxl_stats_bucket_array)
 {
 	GPOS_ASSERT(0 <= m_width);
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDName.cpp b/src/backend/gporca/libnaucrates/src/md/CMDName.cpp
index abd29531958..1e9a837c77d 100644
--- a/src/backend/gporca/libnaucrates/src/md/CMDName.cpp
+++ b/src/backend/gporca/libnaucrates/src/md/CMDName.cpp
@@ -75,7 +75,9 @@ CMDName::CMDName(const CMDName &name)
 //---------------------------------------------------------------------------
 CMDName::~CMDName()
 {
-	GPOS_ASSERT(m_name->IsValid());
+	// Some of `m_name` is reference only, there is no guarantee
+	// that the referenced object lives longer than the CMDName
+	// object when running the destructor of a process.
 
 	if (m_deep_copy)
 	{
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp b/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp
index 9b8ef4f79a6..5dac22f2ad3 100644
--- a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp
+++ b/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp
@@ -31,8 +31,8 @@ using namespace gpdxl;
 //
 //---------------------------------------------------------------------------
 CDXLLogicalCTEProducer::CDXLLogicalCTEProducer(
-	CMemoryPool *mp, ULONG id, ULongPtrArray *output_colids_array)
-	: CDXLLogical(mp), m_id(id), m_output_colids_array(output_colids_array)
+	CMemoryPool *mp, ULONG id, ULongPtrArray *output_colids_array, BOOL could_be_pruned)
+	: CDXLLogical(mp), m_id(id), m_output_colids_array(output_colids_array), m_could_be_pruned(could_be_pruned)
 {
 	GPOS_ASSERT(nullptr != output_colids_array);
 }
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp b/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp
index eb459f5c40b..8b037b833f0 100644
--- a/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp
+++ b/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp
@@ -366,7 +366,20 @@ CDXLOperatorFactory::MakeDXLAppend(CDXLMemoryManager *dxl_memory_manager,
 												   EdxltokenAppendIsZapped,
 												   EdxltokenPhysicalAppend);
 
-	return GPOS_NEW(mp) CDXLPhysicalAppend(mp, is_target, is_zapped);
+	ULONG scan_id = ExtractConvertAttrValueToUlong(dxl_memory_manager, attrs, EdxltokenPartIndexId,
+												   EdxltokenPhysicalAppend, true /* is_optional */,
+												   gpos::ulong_max /* default_value */);
+											
+	ULongPtrArray *selector_ids = nullptr;
+	if (scan_id != gpos::ulong_max)
+	{
+		selector_ids = ExtractConvertValuesToArray(dxl_memory_manager, attrs,
+												   EdxltokenSelectorIds,
+												   EdxltokenPhysicalAppend);
+	}
+											
+	return GPOS_NEW(mp) CDXLPhysicalAppend(mp, is_target, is_zapped, scan_id,
+												   nullptr, selector_ids);
 }
 
 //---------------------------------------------------------------------------
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp
index c9c3e6b4eb9..8e90a279cd8 100644
--- a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp
+++ b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp
@@ -34,6 +34,25 @@ CDXLPhysicalAppend::CDXLPhysicalAppend(CMemoryPool *mp, BOOL fIsTarget,
 {
 }
 
+CDXLPhysicalAppend::CDXLPhysicalAppend(CMemoryPool *mp, BOOL fIsTarget,
+									   BOOL fIsZapped, ULONG scan_id,
+									   CDXLTableDescr *dxl_table_desc,
+									   ULongPtrArray *selector_ids)
+	: CDXLPhysical(mp),
+	  m_used_in_upd_del(fIsTarget),
+	  m_is_zapped(fIsZapped),
+	  m_scan_id(scan_id),
+	  m_dxl_table_descr(dxl_table_desc),
+	  m_selector_ids(selector_ids)
+{
+}
+
+CDXLPhysicalAppend::~CDXLPhysicalAppend()
+{
+	CRefCount::SafeRelease(m_dxl_table_descr);
+	CRefCount::SafeRelease(m_selector_ids);
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CDXLPhysicalAppend::GetDXLOperator
@@ -113,9 +132,28 @@ CDXLPhysicalAppend::SerializeToDXL(CXMLSerializer *xml_serializer,
 	xml_serializer->AddAttribute(
 		CDXLTokens::GetDXLTokenStr(EdxltokenAppendIsZapped), m_is_zapped);
 
+	if (m_scan_id != gpos::ulong_max)
+	{
+		xml_serializer->AddAttribute(
+			CDXLTokens::GetDXLTokenStr(EdxltokenPartIndexId), m_scan_id);
+
+		CWStringDynamic *serialized_selector_ids =
+			CDXLUtils::Serialize(m_mp, m_selector_ids);
+		xml_serializer->AddAttribute(
+			CDXLTokens::GetDXLTokenStr(EdxltokenSelectorIds),
+			serialized_selector_ids);
+		GPOS_DELETE(serialized_selector_ids);
+	}
 	// serialize properties
 	dxlnode->SerializePropertiesToDXL(xml_serializer);
 
+	if (m_dxl_table_descr != nullptr)
+	{
+		GPOS_ASSERT(m_scan_id != gpos::ulong_max);
+		m_dxl_table_descr->SerializeToDXL(xml_serializer);
+	}
+
+
 	// serialize children
 	dxlnode->SerializeChildrenToDXL(xml_serializer);
 
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp
index c95935965a7..67271473087 100644
--- a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp
+++ b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp
@@ -30,8 +30,8 @@ using namespace gpdxl;
 //
 //---------------------------------------------------------------------------
 CDXLPhysicalCTEConsumer::CDXLPhysicalCTEConsumer(
-	CMemoryPool *mp, ULONG id, ULongPtrArray *output_colids_array)
-	: CDXLPhysical(mp), m_id(id), m_output_colids_array(output_colids_array)
+	CMemoryPool *mp, ULONG id, ULongPtrArray *output_colids_array, ULongPtrArray *output_colidx_map)
+	: CDXLPhysical(mp), m_id(id), m_output_colids_array(output_colids_array), m_output_colidx_map(output_colidx_map)
 {
 	GPOS_ASSERT(nullptr != output_colids_array);
 }
@@ -47,6 +47,7 @@ CDXLPhysicalCTEConsumer::CDXLPhysicalCTEConsumer(
 CDXLPhysicalCTEConsumer::~CDXLPhysicalCTEConsumer()
 {
 	m_output_colids_array->Release();
+	CRefCount::SafeRelease(m_output_colidx_map);
 }
 
 //---------------------------------------------------------------------------
@@ -102,6 +103,15 @@ CDXLPhysicalCTEConsumer::SerializeToDXL(CXMLSerializer *xml_serializer,
 								 str_colids);
 	GPOS_DELETE(str_colids);
 
+	if (m_output_colidx_map) {
+		CWStringDynamic *str_colidx_map =
+			CDXLUtils::Serialize(m_mp, m_output_colidx_map);
+
+		xml_serializer->AddAttribute(CDXLTokens::GetDXLTokenStr(EdxltokenColIdxmap),
+			str_colidx_map);
+		GPOS_DELETE(str_colidx_map);
+	}
+
 	// serialize properties
 	dxlnode->SerializePropertiesToDXL(xml_serializer);
 
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp
index 280fc28b591..84d6155afcb 100644
--- a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp
+++ b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp
@@ -30,8 +30,8 @@ using namespace gpdxl;
 //
 //---------------------------------------------------------------------------
 CDXLPhysicalCTEProducer::CDXLPhysicalCTEProducer(
-	CMemoryPool *mp, ULONG id, ULongPtrArray *output_colids_array)
-	: CDXLPhysical(mp), m_id(id), m_output_colids_array(output_colids_array)
+	CMemoryPool *mp, ULONG id, ULongPtrArray *output_colids_array, ULongPtrArray *output_colidx_map)
+	: CDXLPhysical(mp), m_id(id), m_output_colids_array(output_colids_array), m_output_colidx_map(output_colidx_map)
 {
 	GPOS_ASSERT(nullptr != output_colids_array);
 }
@@ -47,6 +47,7 @@ CDXLPhysicalCTEProducer::CDXLPhysicalCTEProducer(
 CDXLPhysicalCTEProducer::~CDXLPhysicalCTEProducer()
 {
 	m_output_colids_array->Release();
+	CRefCount::SafeRelease(m_output_colidx_map);
 }
 
 //---------------------------------------------------------------------------
@@ -102,6 +103,15 @@ CDXLPhysicalCTEProducer::SerializeToDXL(CXMLSerializer *xml_serializer,
 								 pstrColIds);
 	GPOS_DELETE(pstrColIds);
 
+	if (m_output_colidx_map) {
+		CWStringDynamic *str_colidx_map =
+			CDXLUtils::Serialize(m_mp, m_output_colidx_map);
+
+		xml_serializer->AddAttribute(CDXLTokens::GetDXLTokenStr(EdxltokenColIdxmap),
+			str_colidx_map);
+		GPOS_DELETE(str_colidx_map);
+	}
+
 	// serialize properties
 	dxlnode->SerializePropertiesToDXL(xml_serializer);
 
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp
index 9c5e7ca4e9b..19112cf23ca 100644
--- a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp
+++ b/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp
@@ -28,10 +28,12 @@ using namespace gpdxl;
 //---------------------------------------------------------------------------
 CDXLPhysicalWindow::CDXLPhysicalWindow(CMemoryPool *mp,
 									   ULongPtrArray *part_by_colid_array,
-									   CDXLWindowKeyArray *window_key_array)
+									   CDXLWindowKeyArray *window_key_array,
+									   BOOL fWindowHashAgg)
 	: CDXLPhysical(mp),
 	  m_part_by_colid_array(part_by_colid_array),
-	  m_dxl_window_key_array(window_key_array)
+	  m_dxl_window_key_array(window_key_array),
+	  m_window_hash_agg(fWindowHashAgg)
 {
 	GPOS_ASSERT(nullptr != m_part_by_colid_array);
 	GPOS_ASSERT(nullptr != m_dxl_window_key_array);
@@ -122,6 +124,18 @@ CDXLPhysicalWindow::GetDXLWindowKeyAt(ULONG position) const
 	return (*m_dxl_window_key_array)[position];
 }
 
+//---------------------------------------------------------------------------
+//	@function:
+//		CDXLPhysicalWindow::IsWindowHashAgg
+//
+//	@doc:
+//		Is windowagg implements by window hash agg
+//
+//---------------------------------------------------------------------------
+BOOL CDXLPhysicalWindow::IsWindowHashAgg() const {
+	return m_window_hash_agg;
+}
+
 //---------------------------------------------------------------------------
 //	@function:
 //		CDXLPhysicalWindow::SerializeToDXL
@@ -168,6 +182,8 @@ CDXLPhysicalWindow::SerializeToDXL(CXMLSerializer *xml_serializer,
 		CDXLTokens::GetDXLTokenStr(EdxltokenNamespacePrefix),
 		window_keys_list_str);
 
+	xml_serializer->AddAttribute(
+		CDXLTokens::GetDXLTokenStr(EdxltokenWindowHashAgg), m_window_hash_agg);
 	xml_serializer->CloseElement(
 		CDXLTokens::GetDXLTokenStr(EdxltokenNamespacePrefix), element_name);
 }
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp
index f6d21c335c2..a49169948d9 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp
@@ -68,6 +68,17 @@ CParseHandlerAppend::SetupInitialHandlers(const Attributes &attrs)
 			m_parse_handler_mgr, this);
 	m_parse_handler_mgr->ActivateParseHandler(filter_parse_handler);
 
+	// parse handler for the table desc
+	CParseHandlerBase *table_descr_parse_handler = nullptr;
+	if (m_dxl_op->GetScanId() != gpos::ulong_max)
+	{
+		// parse handler for table descriptor
+		table_descr_parse_handler = CParseHandlerFactory::GetParseHandler(
+			m_mp, CDXLTokens::XmlstrToken(EdxltokenTableDescr),
+			m_parse_handler_mgr, this);
+		m_parse_handler_mgr->ActivateParseHandler(table_descr_parse_handler);
+	}
+
 	// parse handler for the proj list
 	CParseHandlerBase *proj_list_parse_handler =
 		CParseHandlerFactory::GetParseHandler(
@@ -83,6 +94,11 @@ CParseHandlerAppend::SetupInitialHandlers(const Attributes &attrs)
 	m_parse_handler_mgr->ActivateParseHandler(prop_parse_handler);
 
 	this->Append(prop_parse_handler);
+	if (m_dxl_op->GetScanId() != gpos::ulong_max)
+	{
+		GPOS_ASSERT(nullptr != table_descr_parse_handler);
+		this->Append(table_descr_parse_handler);
+	}
 	this->Append(proj_list_parse_handler);
 	this->Append(filter_parse_handler);
 }
@@ -160,6 +176,17 @@ CParseHandlerAppend::EndElement(const XMLCh *const,	 // element_uri,
 	// construct node from the created child nodes
 	CParseHandlerProperties *prop_parse_handler =
 		dynamic_cast<CParseHandlerProperties *>((*this)[child_index++]);
+
+	if (m_dxl_op->GetScanId() != gpos::ulong_max)
+	{
+		CParseHandlerTableDescr *table_descr_parse_handler =
+			dynamic_cast<CParseHandlerTableDescr *>((*this)[child_index++]);
+		CDXLTableDescr *table_descr =
+			table_descr_parse_handler->GetDXLTableDescr();
+		table_descr->AddRef();
+		m_dxl_op->SetDXLTableDesc(table_descr);
+	}
+
 	CParseHandlerProjList *proj_list_parse_handler =
 		dynamic_cast<CParseHandlerProjList *>((*this)[child_index++]);
 	CParseHandlerFilter *filter_parse_handler =
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp
index 3c8d2d2dc66..eb1d3440882 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp
@@ -42,7 +42,8 @@ CParseHandlerColStats::CParseHandlerColStats(
 	  m_null_freq(0.0),
 	  m_distinct_remaining(0.0),
 	  m_freq_remaining(0.0),
-	  m_is_column_stats_missing(false)
+	  m_is_column_stats_missing(false),
+	  m_distinct_by_segs(0.0)
 {
 }
 
@@ -129,6 +130,17 @@ CParseHandlerColStats::StartElement(const XMLCh *const element_uri,
 					parsed_is_column_stats_missing, EdxltokenColStatsMissing,
 					EdxltokenColumnStats);
 		}
+
+		const XMLCh *parsed_distinct_by_segs =
+			attrs.getValue(CDXLTokens::XmlstrToken(EdxltokenColNdvBySeg));
+		if (nullptr != parsed_distinct_by_segs)
+		{
+			m_distinct_by_segs =
+				CDXLOperatorFactory::ConvertAttrValueToBool(
+					m_parse_handler_mgr->GetDXLMemoryManager(),
+					parsed_distinct_by_segs, EdxltokenColNdvBySeg,
+					EdxltokenColumnStats);
+		}
 	}
 	else if (0 == XMLString::compareString(
 					  CDXLTokens::XmlstrToken(EdxltokenColumnStatsBucket),
@@ -198,7 +210,7 @@ CParseHandlerColStats::EndElement(const XMLCh *const,  // element_uri,
 
 	m_imd_obj = GPOS_NEW(m_mp) CDXLColStats(
 		m_mp, m_mdid, m_md_name, m_width, m_null_freq, m_distinct_remaining,
-		m_freq_remaining, dxl_stats_bucket_array, m_is_column_stats_missing);
+		m_freq_remaining, m_distinct_by_segs, dxl_stats_bucket_array, m_is_column_stats_missing);
 
 	// deactivate handler
 	m_parse_handler_mgr->DeactivateHandler();
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp
index b6a6cd85c36..8d74ae54c78 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp
@@ -72,7 +72,7 @@ CParseHandlerLogicalCTEProducer::StartElement(
 
 	m_dxl_node = GPOS_NEW(m_mp) CDXLNode(
 		m_mp,
-		GPOS_NEW(m_mp) CDXLLogicalCTEProducer(m_mp, id, output_colids_array));
+		GPOS_NEW(m_mp) CDXLLogicalCTEProducer(m_mp, id, output_colids_array, true /*could_be_pruned*/));
 
 	// create and activate the parse handler for the child expression node
 	CParseHandlerBase *child_parse_handler =
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp
index 1ce6036cc8b..69ea4e1f220 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp
@@ -74,7 +74,7 @@ CParseHandlerPhysicalCTEConsumer::StartElement(
 
 	m_dxl_node = GPOS_NEW(m_mp) CDXLNode(
 		m_mp,
-		GPOS_NEW(m_mp) CDXLPhysicalCTEConsumer(m_mp, id, output_colids_array));
+		GPOS_NEW(m_mp) CDXLPhysicalCTEConsumer(m_mp, id, output_colids_array, nullptr));
 
 	// parse handler for the proj list
 	CParseHandlerBase *proj_list_parse_handler =
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp
index 712d7d3324f..4bb3790c08f 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp
@@ -73,9 +73,14 @@ CParseHandlerPhysicalCTEProducer::StartElement(
 			m_parse_handler_mgr->GetDXLMemoryManager(), attrs, EdxltokenColumns,
 			EdxltokenPhysicalCTEProducer);
 
+	ULongPtrArray *output_colidx_map =
+		CDXLOperatorFactory::ExtractConvertValuesToArray(
+			m_parse_handler_mgr->GetDXLMemoryManager(), attrs, EdxltokenColIdxmap,
+			EdxltokenPhysicalCTEProducer);
+
 	m_dxl_node = GPOS_NEW(m_mp) CDXLNode(
 		m_mp,
-		GPOS_NEW(m_mp) CDXLPhysicalCTEProducer(m_mp, id, output_colids_array));
+		GPOS_NEW(m_mp) CDXLPhysicalCTEProducer(m_mp, id, output_colids_array, output_colidx_map));
 
 	// create and activate the parse handler for the child expression node
 	CParseHandlerBase *child_parse_handler =
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp
index 50704f05d39..28801cbf271 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp
@@ -155,7 +155,7 @@ CParseHandlerPhysicalWindow::EndElement(const XMLCh *const,	 // element_uri,
 	CDXLWindowKeyArray *window_key_array_dxlnode =
 		window_key_list_parse_handler->GetDxlWindowKeyArray();
 	CDXLPhysicalWindow *window_op_dxlnode = GPOS_NEW(m_mp) CDXLPhysicalWindow(
-		m_mp, m_part_by_colid_array, window_key_array_dxlnode);
+		m_mp, m_part_by_colid_array, window_key_array_dxlnode, false);
 	m_dxl_node = GPOS_NEW(m_mp) CDXLNode(m_mp, window_op_dxlnode);
 
 	// set statistics and physical properties
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp
index 43fdd2d4d07..bcc1e21d259 100644
--- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp
+++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp
@@ -39,6 +39,7 @@ CParseHandlerStatsDerivedColumn::CParseHandlerStatsDerivedColumn(
 	  m_null_freq(0.0),
 	  m_distinct_remaining(0.0),
 	  m_freq_remaining(0.0),
+	  m_distinct_by_segs(0.0),
 	  m_dxl_stats_derived_col(nullptr)
 {
 }
@@ -115,6 +116,16 @@ CParseHandlerStatsDerivedColumn::StartElement(
 				parsed_freq_remaining, EdxltokenColFreqRemain,
 				EdxltokenColumnStats);
 		}
+
+		const XMLCh *parsed_distinct_by_segs =
+			attrs.getValue(CDXLTokens::XmlstrToken(EdxltokenColNdvBySeg));
+		if (nullptr != parsed_distinct_by_segs)
+		{
+			m_distinct_by_segs = CDXLOperatorFactory::ConvertAttrValueToDouble(
+				m_parse_handler_mgr->GetDXLMemoryManager(),
+				parsed_distinct_by_segs, EdxltokenColNdvBySeg,
+				EdxltokenColumnStats);
+		}
 	}
 	else if (0 == XMLString::compareString(
 					  CDXLTokens::XmlstrToken(EdxltokenColumnStatsBucket),
@@ -184,7 +195,7 @@ CParseHandlerStatsDerivedColumn::EndElement(
 
 	m_dxl_stats_derived_col = GPOS_NEW(m_mp) CDXLStatsDerivedColumn(
 		m_colid, m_width, m_null_freq, m_distinct_remaining, m_freq_remaining,
-		dxl_stats_bucket_array);
+		m_distinct_by_segs, dxl_stats_bucket_array);
 
 	// deactivate handler
 	m_parse_handler_mgr->DeactivateHandler();
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp b/src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp
index 0e4ed5697bb..a7e458ec353 100644
--- a/src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp
+++ b/src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp
@@ -904,8 +904,10 @@ CFilterStatsProcessor::MakeHistArrayCmpAnyFilter(CMemoryPool *mp,
 	}
 	CHistogram *dummy_histogram = GPOS_NEW(mp)
 		CHistogram(mp, dummy_histogram_buckets, true /* is_well_defined */,
-				   CDouble(0.0) /* null_freq */,
-				   CDouble(ndv_remain) /* distinct_remain */, freq_remain);
+				   CHistogram::DefaultNullFreq /* null_freq */,
+				   CDouble(ndv_remain) /* distinct_remain */,
+				   freq_remain,
+				   CHistogram::DefaultNDVBySegments);
 	// dummy histogram should already be normalized since each bucket's frequency
 	// is already adjusted by a scale factor of 1/dummy_rows to avoid unnecessarily
 	// deep-copying the histogram buckets
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp b/src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp
index c7cee555c58..351201160b1 100644
--- a/src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp
+++ b/src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp
@@ -23,7 +23,8 @@ CStatistics *
 CGroupByStatsProcessor::CalcGroupByStats(CMemoryPool *mp,
 										 const CStatistics *input_stats,
 										 ULongPtrArray *GCs,
-										 ULongPtrArray *aggs, CBitSet *keys)
+										 ULongPtrArray *aggs, CBitSet *keys,
+										 BOOL is_partial)
 {
 	// create hash map from colid -> histogram for resultant structure
 	UlongToHistogramMap *col_histogram_mapping =
@@ -74,7 +75,7 @@ CGroupByStatsProcessor::CalcGroupByStats(CMemoryPool *mp,
 		const CStatisticsConfig *stats_config = input_stats->GetStatsConfig();
 
 		CDoubleArray *NDVs = CStatisticsUtils::ExtractNDVForGrpCols(
-			mp, stats_config, input_stats, groupby_cols_for_stats, keys);
+			mp, stats_config, input_stats, groupby_cols_for_stats, keys, is_partial);
 		CDouble groups =
 			CStatisticsUtils::GetCumulativeNDVs(stats_config, NDVs);
 
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp b/src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp
index 26601c6e745..14c4f5cb40b 100644
--- a/src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp
+++ b/src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp
@@ -47,6 +47,9 @@ const CDouble CHistogram::DefaultNDVRemain(0.0);
 // default frequency of NDV remain
 const CDouble CHistogram::DefaultNDVFreqRemain(0.0);
 
+// default NDV by segments
+const CDouble CHistogram::DefaultNDVBySegments(0.0);
+
 // sample size used to estimate skew
 #define GPOPT_SKEW_SAMPLE_SIZE 1000
 
@@ -59,6 +62,7 @@ CHistogram::CHistogram(CMemoryPool *mp, CBucketArray *histogram_buckets,
 	  m_null_freq(CHistogram::DefaultNullFreq),
 	  m_distinct_remaining(DefaultNDVRemain),
 	  m_freq_remaining(DefaultNDVFreqRemain),
+	  m_distinct_by_segs(DefaultNDVBySegments),
 	  m_skew_was_measured(false),
 	  m_skew(1.0),
 	  m_NDVs_were_scaled(false),
@@ -75,6 +79,7 @@ CHistogram::CHistogram(CMemoryPool *mp, BOOL is_well_defined)
 	  m_null_freq(CHistogram::DefaultNullFreq),
 	  m_distinct_remaining(DefaultNDVRemain),
 	  m_freq_remaining(DefaultNDVFreqRemain),
+	  m_distinct_by_segs(DefaultNDVBySegments),
 	  m_skew_was_measured(false),
 	  m_skew(1.0),
 	  m_NDVs_were_scaled(false),
@@ -87,13 +92,14 @@ CHistogram::CHistogram(CMemoryPool *mp, BOOL is_well_defined)
 CHistogram::CHistogram(CMemoryPool *mp, CBucketArray *histogram_buckets,
 					   BOOL is_well_defined, CDouble null_freq,
 					   CDouble distinct_remaining, CDouble freq_remaining,
-					   BOOL is_col_stats_missing)
+					   CDouble distinct_by_segs, BOOL is_col_stats_missing)
 	: m_mp(mp),
 	  m_histogram_buckets(histogram_buckets),
 	  m_is_well_defined(is_well_defined),
 	  m_null_freq(null_freq),
 	  m_distinct_remaining(distinct_remaining),
 	  m_freq_remaining(freq_remaining),
+	  m_distinct_by_segs(distinct_by_segs),
 	  m_skew_was_measured(false),
 	  m_skew(1.0),
 	  m_NDVs_were_scaled(false),
@@ -144,6 +150,7 @@ CHistogram::OsPrint(IOstream &os) const
 	os << "Total NDV          : " << GetNumDistinct() << std::endl;
 	os << "Remaining frequency: " << GetFreqRemain() << std::endl;
 	os << "Total frequency    : " << GetFrequency() << std::endl;
+	os << "NDV by segs        : " << GetDistinctBySegs() << std::endl;
 
 	if (m_skew_was_measured)
 	{
@@ -207,16 +214,20 @@ CHistogram::MakeHistogramLessThanOrLessThanEqualFilter(
 
 	CDouble distinct_remaining = 0.0;
 	CDouble freq_remaining = 0.0;
+	CDouble distinct_by_segs = 0.0;
 	if (CStatistics::Epsilon < m_distinct_remaining * DefaultSelectivity)
 	{
 		distinct_remaining = m_distinct_remaining * DefaultSelectivity;
 		freq_remaining = m_freq_remaining * DefaultSelectivity;
+		distinct_by_segs = m_distinct_by_segs * DefaultSelectivity;
 	}
 
 	return GPOS_NEW(m_mp) CHistogram(m_mp, new_buckets,
 									 true,			// is_well_defined
 									 CDouble(0.0),	// fNullFreq
-									 distinct_remaining, freq_remaining);
+									 distinct_remaining,
+									 freq_remaining,
+									 distinct_by_segs);
 }
 
 // return an array buckets after applying non equality filter on the histogram buckets
@@ -267,7 +278,7 @@ CHistogram::MakeHistogramInequalityFilter(CPoint *point) const
 
 	return GPOS_NEW(m_mp)
 		CHistogram(m_mp, histogram_buckets, true /*is_well_defined*/, null_freq,
-				   m_distinct_remaining, m_freq_remaining);
+				   m_distinct_remaining, m_freq_remaining, m_distinct_by_segs);
 }
 
 // construct new histogram with IDF filter
@@ -286,7 +297,7 @@ CHistogram::MakeHistogramIDFFilter(CPoint *point) const
 
 	return GPOS_NEW(m_mp)
 		CHistogram(m_mp, histogram_buckets, true /*is_well_defined*/, null_freq,
-				   m_distinct_remaining, m_freq_remaining);
+				   m_distinct_remaining, m_freq_remaining, m_distinct_by_segs);
 }
 
 // return an array buckets after applying equality filter on the histogram buckets
@@ -339,7 +350,7 @@ CHistogram::MakeHistogramEqualFilter(CPoint *point) const
 	{
 		return GPOS_NEW(m_mp) CHistogram(
 			m_mp, GPOS_NEW(m_mp) CBucketArray(m_mp), true /* is_well_defined */,
-			m_null_freq, DefaultNDVRemain, DefaultNDVFreqRemain);
+			m_null_freq, DefaultNDVRemain, DefaultNDVFreqRemain, DefaultNDVBySegments);
 	}
 
 	CBucketArray *histogram_buckets = MakeBucketsWithEqualityFilter(point);
@@ -353,7 +364,8 @@ CHistogram::MakeHistogramEqualFilter(CPoint *point) const
 			0.0,   // null_freq
 			1.0,   // distinct_remaining
 			std::min(CDouble(1.0),
-					 m_freq_remaining / m_distinct_remaining)  // freq_remaining
+					 m_freq_remaining / m_distinct_remaining),  // freq_remaining
+			DefaultNDVBySegments // distinct by segments
 		);
 	}
 
@@ -385,13 +397,15 @@ CHistogram::MakeHistogramINDFFilter(CPoint *point) const
 			null_freq,
 			1.0,  // distinct_remaining
 			std::min(CDouble(1.0),
-					 m_freq_remaining / m_distinct_remaining)  // freq_remaining
+					 m_freq_remaining / m_distinct_remaining),  // freq_remaining
+			DefaultNDVBySegments // distinct by segments
 		);
 	}
 
 	return GPOS_NEW(m_mp) CHistogram(
 		m_mp, histogram_buckets, true /* is_well_defined */, null_freq,
-		CHistogram::DefaultNDVRemain, CHistogram::DefaultNDVFreqRemain);
+		CHistogram::DefaultNDVRemain, CHistogram::DefaultNDVFreqRemain,
+		CHistogram::DefaultNDVBySegments);
 }
 
 // construct new histogram with greater than or greater than equal filter
@@ -446,16 +460,18 @@ CHistogram::MakeHistogramGreaterThanOrGreaterThanEqualFilter(
 
 	CDouble distinct_remaining = 0.0;
 	CDouble freq_remaining = 0.0;
+	CDouble distinct_by_segs = 0.0;
 	if (CStatistics::Epsilon < m_distinct_remaining * DefaultSelectivity)
 	{
 		distinct_remaining = m_distinct_remaining * DefaultSelectivity;
 		freq_remaining = m_freq_remaining * DefaultSelectivity;
+		distinct_by_segs = m_distinct_by_segs * DefaultSelectivity;
 	}
 
 	return GPOS_NEW(m_mp) CHistogram(m_mp, new_buckets,
 									 true,			// is_well_defined
 									 CDouble(0.0),	// fNullFreq
-									 distinct_remaining, freq_remaining);
+									 distinct_remaining, freq_remaining, distinct_by_segs);
 }
 
 // sum of frequencies from buckets.
@@ -964,7 +980,7 @@ CHistogram::MakeLASJHistogram(CStatsPred::EStatsCmpType stats_cmp_type,
 
 	return GPOS_NEW(m_mp)
 		CHistogram(m_mp, new_buckets, true /*is_well_defined*/, null_freq,
-				   m_distinct_remaining, m_freq_remaining);
+				   m_distinct_remaining, m_freq_remaining, m_distinct_by_segs);
 }
 
 // scales frequencies on histogram so that they add up to 1.0.
@@ -1020,7 +1036,7 @@ CHistogram::CopyHistogram() const
 	m_histogram_buckets->AddRef();
 	CHistogram *histogram_copy = GPOS_NEW(m_mp)
 		CHistogram(m_mp, m_histogram_buckets, m_is_well_defined, m_null_freq,
-				   m_distinct_remaining, m_freq_remaining);
+				   m_distinct_remaining, m_freq_remaining, m_distinct_by_segs);
 	if (WereNDVsScaled())
 	{
 		histogram_copy->SetNDVScaled();
@@ -1163,7 +1179,9 @@ CHistogram::MakeJoinHistogramEqualityFilter(const CHistogram *histogram) const
 
 	return GPOS_NEW(m_mp)
 		CHistogram(m_mp, join_buckets, true /*is_well_defined*/,
-				   0.0 /*null_freq*/, distinct_remaining, freq_remaining);
+				   0.0 /*null_freq*/, distinct_remaining, freq_remaining,
+				   DefaultNDVRemain // ndv from segs will be distortion after join 
+				   );
 }
 
 // construct a new histogram for NDV based cardinality estimation
@@ -1214,7 +1232,9 @@ CHistogram::MakeNDVBasedJoinHistogramEqualityFilter(
 
 	return GPOS_NEW(m_mp)
 		CHistogram(m_mp, join_buckets, true /*is_well_defined*/,
-				   0.0 /*null_freq*/, distinct_remaining, freq_remaining);
+				   0.0 /*null_freq*/, distinct_remaining, freq_remaining,
+				   DefaultNDVRemain // ndv from segs will be distortion after join
+				   );
 }
 
 // construct a new histogram for an INDF join predicate
@@ -1419,7 +1439,9 @@ CHistogram::MakeGroupByHistogramNormalize(CDouble,	// rows,
 
 	CHistogram *result_histogram = GPOS_NEW(m_mp)
 		CHistogram(m_mp, new_buckets, true /*is_well_defined*/, new_null_freq,
-				   m_distinct_remaining, freq_remaining);
+				   m_distinct_remaining, freq_remaining,
+				   DefaultNDVRemain // ndv from segs will be distortion after gb
+				   );
 	*result_distinct_values = result_histogram->GetNumDistinct();
 
 	return result_histogram;
@@ -1518,6 +1540,13 @@ CHistogram::MakeUnionAllHistogramNormalize(CDouble rows,
 		(m_freq_remaining * rows + histogram->GetFreqRemain() * rows_other) /
 		rows_new;
 
+	CDouble distinct_by_seg = DefaultNDVBySegments;
+	if (m_distinct_by_segs > CStatistics::Epsilon &&
+		histogram->GetDistinctBySegs() > CStatistics::Epsilon)
+	{
+		distinct_by_seg = m_distinct_by_segs + histogram->GetDistinctBySegs();
+	}
+
 	ULONG max_num_buckets = COptCtxt::PoctxtFromTLS()
 								->GetOptimizerConfig()
 								->GetStatsConf()
@@ -1528,7 +1557,7 @@ CHistogram::MakeUnionAllHistogramNormalize(CDouble rows,
 		CombineBuckets(m_mp, new_buckets, desired_num_buckets);
 	CHistogram *result_histogram = GPOS_NEW(m_mp)
 		CHistogram(m_mp, result_buckets, true /*is_well_defined*/,
-				   new_null_freq, distinct_remaining, freq_remaining);
+				   new_null_freq, distinct_remaining, freq_remaining, distinct_by_seg);
 	(void) result_histogram->NormalizeHistogram();
 	GPOS_ASSERT(result_histogram->IsValid());
 
@@ -2051,7 +2080,7 @@ CHistogram::TranslateToDXLDerivedColumnStats(CMDAccessor *md_accessor,
 
 	return GPOS_NEW(m_mp)
 		CDXLStatsDerivedColumn(colid, width, m_null_freq, m_distinct_remaining,
-							   m_freq_remaining, dxl_stats_bucket_array);
+							   m_freq_remaining, m_distinct_by_segs, dxl_stats_bucket_array);
 }
 
 // randomly pick a bucket index based on bucket frequency values
@@ -2218,10 +2247,11 @@ CHistogram::MakeDefaultBoolHistogram(CMemoryPool *mp)
 	CDouble distinct_remaining = CDouble(3.0);
 	CDouble freq_remaining = CDouble(1.0);
 	CDouble null_freq = CDouble(0.0);
+	CDouble distinct_by_segs = CDouble(0.0);
 
 	return GPOS_NEW(mp) CHistogram(
 		mp, buckets, true /* is_well_defined */, null_freq, distinct_remaining,
-		freq_remaining, true /*is_col_stats_missing */
+		freq_remaining, distinct_by_segs, true /*is_col_stats_missing */
 	);
 }
 
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp b/src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp
index 218b9c0b6fe..a1d5d695f90 100644
--- a/src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp
+++ b/src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp
@@ -199,7 +199,8 @@ CLeftOuterJoinStatsProcessor::AddHistogramsLOJInner(
 		CHistogram *null_histogram = GPOS_NEW(mp) CHistogram(
 			mp, GPOS_NEW(mp) CBucketArray(mp), true /*is_well_defined*/,
 			1.0 /*null_freq*/, CHistogram::DefaultNDVRemain,
-			CHistogram::DefaultNDVFreqRemain);
+			CHistogram::DefaultNDVFreqRemain,
+			CHistogram::DefaultNDVBySegments);
 		CHistogram *LOJ_histogram =
 			inner_join_histogram->MakeUnionAllHistogramNormalize(
 				num_rows_inner_join, null_histogram, num_rows_LASJ);
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp b/src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp
index 8a2ddeaf943..11e48efa319 100644
--- a/src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp
+++ b/src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp
@@ -43,7 +43,8 @@ CLeftSemiJoinStatsProcessor::CalcLSJoinStatsStatic(
 	IStatistics *inner_stats = CGroupByStatsProcessor::CalcGroupByStats(
 		mp, dynamic_cast<const CStatistics *>(inner_stats_input), inner_colids,
 		aggs,
-		nullptr	 // keys: no keys, use all grouping cols
+		nullptr,	 // keys: no keys, use all grouping cols
+		false /* isPartial*/
 	);
 
 	const CStatistics *outer_stats =
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp b/src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp
index 097c14f304f..9b2ebe057ef 100644
--- a/src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp
+++ b/src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp
@@ -91,7 +91,8 @@ CProjectStatsProcessor::CalcProjStats(
 				proj_col_histogram = GPOS_NEW(mp)
 					CHistogram(mp, proj_col_bucket, is_well_defined, null_freq,
 							   CHistogram::DefaultNDVRemain,
-							   CHistogram::DefaultNDVFreqRemain);
+							   CHistogram::DefaultNDVFreqRemain,
+							   CHistogram::DefaultNDVBySegments);
 			}
 
 			histograms_new->Insert(GPOS_NEW(mp) ULONG(colid),
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp b/src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp
index 3947a23aecf..4131a2b42df 100644
--- a/src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp
+++ b/src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp
@@ -1356,7 +1356,8 @@ CStatisticsUtils::AddNdvForAllGrpCols(
 	CMemoryPool *mp, const CStatistics *input_stats,
 	const ULongPtrArray
 		*grouping_columns,	   // array of grouping column ids from a source
-	CDoubleArray *output_ndvs  // output array of ndvs
+	CDoubleArray *output_ndvs, // output array of ndvs
+	BOOL is_partial            // cal ndvs with segment generated
 )
 {
 	GPOS_ASSERT(nullptr != grouping_columns);
@@ -1374,10 +1375,14 @@ CStatisticsUtils::AddNdvForAllGrpCols(
 		const CHistogram *histogram = input_stats->GetHistogram(colid);
 		if (nullptr != histogram)
 		{
-			distinct_vals = histogram->GetNumDistinct();
-			if (histogram->IsEmpty())
-			{
-				distinct_vals = DefaultDistinctVals(input_stats->Rows());
+			if (is_partial && histogram->GetDistinctBySegs() > CStatistics::Epsilon) {
+				distinct_vals = histogram->GetDistinctBySegs();
+			} else {
+				distinct_vals = histogram->GetNumDistinct();
+				if (histogram->IsEmpty())
+				{
+					distinct_vals = DefaultDistinctVals(input_stats->Rows());
+				}
 			}
 		}
 		output_ndvs->Append(GPOS_NEW(mp) CDouble(distinct_vals));
@@ -1401,7 +1406,8 @@ CDoubleArray *
 CStatisticsUtils::ExtractNDVForGrpCols(
 	CMemoryPool *mp, const CStatisticsConfig *stats_config,
 	const IStatistics *stats, CColRefSet *grp_cols_refset,
-	CBitSet *keys  // keys derived during optimization
+	CBitSet *keys,  // keys derived during optimization
+	BOOL is_partial
 )
 {
 	GPOS_ASSERT(nullptr != stats);
@@ -1425,13 +1431,13 @@ CStatisticsUtils::ExtractNDVForGrpCols(
 		{
 			// this array of grouping columns represents computed columns.
 			// Since we currently do not cap computed columns, we add all of their NDVs as is
-			AddNdvForAllGrpCols(mp, input_stats, src_grouping_cols, ndvs);
+			AddNdvForAllGrpCols(mp, input_stats, src_grouping_cols, ndvs, is_partial);
 		}
 		else
 		{
 			// compute the maximum number of groups when aggregated on columns from the given source
 			CDouble max_grps_per_src = MaxNumGroupsForGivenSrcGprCols(
-				mp, stats_config, input_stats, src_grouping_cols);
+				mp, stats_config, input_stats, src_grouping_cols, is_partial);
 			ndvs->Append(GPOS_NEW(mp) CDouble(max_grps_per_src));
 		}
 	}
@@ -1524,7 +1530,8 @@ CStatisticsUtils::MaxNdv(const CStatistics *stats,
 CDouble
 CStatisticsUtils::MaxNumGroupsForGivenSrcGprCols(
 	CMemoryPool *mp, const CStatisticsConfig *stats_config,
-	CStatistics *input_stats, const ULongPtrArray *src_grouping_cols)
+	CStatistics *input_stats, const ULongPtrArray *src_grouping_cols,
+	BOOL is_partial)
 {
 	GPOS_ASSERT(nullptr != input_stats);
 	GPOS_ASSERT(nullptr != src_grouping_cols);
@@ -1565,7 +1572,7 @@ CStatisticsUtils::MaxNumGroupsForGivenSrcGprCols(
 
 	// add any remaining columns not covered by multivariate n-distinct
 	// correlated stats
-	AddNdvForAllGrpCols(mp, input_stats, updated_src_grouping_cols, ndvs);
+	AddNdvForAllGrpCols(mp, input_stats, updated_src_grouping_cols, ndvs, is_partial);
 	updated_src_grouping_cols->Release();
 
 	// take the minimum of (a) the estimated number of groups from the columns of this source,
@@ -1597,7 +1604,8 @@ CDouble
 CStatisticsUtils::Groups(CMemoryPool *mp, IStatistics *stats,
 						 const CStatisticsConfig *stats_config,
 						 ULongPtrArray *grouping_cols,
-						 CBitSet *keys	// keys derived during optimization
+						 CBitSet *keys,	// keys derived during optimization
+						 BOOL is_partial
 )
 {
 	GPOS_ASSERT(nullptr != stats);
@@ -1609,7 +1617,7 @@ CStatisticsUtils::Groups(CMemoryPool *mp, IStatistics *stats,
 		MakeGroupByColsForStats(mp, grouping_cols, computed_groupby_cols);
 
 	CDoubleArray *ndvs =
-		ExtractNDVForGrpCols(mp, stats_config, stats, grp_col_for_stats, keys);
+		ExtractNDVForGrpCols(mp, stats_config, stats, grp_col_for_stats, keys, is_partial);
 	CDouble groups =
 		std::min(std::max(CStatistics::MinRows.Get(),
 						  GetCumulativeNDVs(stats_config, ndvs).Get()),
diff --git a/src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp b/src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp
index 0c977f57529..0f59d689a05 100644
--- a/src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp
+++ b/src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp
@@ -172,6 +172,8 @@ CDXLTokens::Init(CMemoryPool *mp)
 
 		{EdxltokenDuplicateSensitive, GPOS_WSZ_LIT("DuplicateSensitive")},
 
+		{EdxltokenPartIndexId, GPOS_WSZ_LIT("PartIndexId")},
+		{EdxltokenPartIndexIdPrintable, GPOS_WSZ_LIT("PrintablePartIndexId")},
 		{EdxltokenSegmentIdCol, GPOS_WSZ_LIT("SegmentIdCol")},
 
 		{EdxltokenScalar, GPOS_WSZ_LIT("Scalar")},
@@ -341,6 +343,7 @@ CDXLTokens::Init(CMemoryPool *mp)
 		{EdxltokenWindowFrame, GPOS_WSZ_LIT("WindowFrame")},
 		{EdxltokenWindowKeyList, GPOS_WSZ_LIT("WindowKeyList")},
 		{EdxltokenWindowKey, GPOS_WSZ_LIT("WindowKey")},
+		{EdxltokenWindowHashAgg, GPOS_WSZ_LIT("IsWindowHashAgg")},
 
 		{EdxltokenWindowSpecList, GPOS_WSZ_LIT("WindowSpecList")},
 		{EdxltokenWindowSpec, GPOS_WSZ_LIT("WindowSpec")},
@@ -400,6 +403,7 @@ CDXLTokens::Init(CMemoryPool *mp)
 
 		{EdxltokenColDescr, GPOS_WSZ_LIT("Column")},
 		{EdxltokenColRef, GPOS_WSZ_LIT("ColRef")},
+		{EdxltokenColIdxmap, GPOS_WSZ_LIT("ColIdxMap")},
 
 		{EdxltokenColumns, GPOS_WSZ_LIT("Columns")},
 		{EdxltokenColumn, GPOS_WSZ_LIT("Column")},
@@ -413,6 +417,7 @@ CDXLTokens::Init(CMemoryPool *mp)
 		{EdxltokenColNdvRemain, GPOS_WSZ_LIT("NdvRemain")},
 		{EdxltokenColFreqRemain, GPOS_WSZ_LIT("FreqRemain")},
 		{EdxltokenColStatsMissing, GPOS_WSZ_LIT("ColStatsMissing")},
+		{EdxltokenColNdvBySeg, GPOS_WSZ_LIT("NdvBySeg")},
 
 		{EdxltokenParamId, GPOS_WSZ_LIT("ParamId")},
 
@@ -552,8 +557,7 @@ CDXLTokens::Init(CMemoryPool *mp)
 		 GPOS_WSZ_LIT("AppendOnly, Column-oriented")},
 		{EdxltokenRelStorageAppendOnlyRows,
 		 GPOS_WSZ_LIT("AppendOnly, Row-oriented")},
-		{EdxltokenRelStoragePAX,
-		 GPOS_WSZ_LIT("PAX")},
+		{EdxltokenRelStoragePAX, GPOS_WSZ_LIT("PAX")},
 		{EdxltokenRelStorageMixedPartitioned, GPOS_WSZ_LIT("MixedPartitioned")},
 		{EdxltokenRelStorageForeign, GPOS_WSZ_LIT("Foreign")},
 		{EdxltokenRelStorageCompositeType, GPOS_WSZ_LIT("Composite")},
diff --git a/src/backend/gporca/scripts/cal_bitmap_test.py b/src/backend/gporca/scripts/cal_bitmap_test.py
index c404924bcfb..3c54848cb4a 100755
--- a/src/backend/gporca/scripts/cal_bitmap_test.py
+++ b/src/backend/gporca/scripts/cal_bitmap_test.py
@@ -32,7 +32,7 @@
 try:
     from gppylib.db import dbconn
 except ImportError as e:
-    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced greenplum_path.sh.  Detail: ' + str(e))
+    sys.exit('ERROR: Cannot import modules.  Please check that you have sourced cloudberry-env.sh.  Detail: ' + str(e))
 
 # constants
 # -----------------------------------------------------------------------------
diff --git a/src/backend/gporca/scripts/get_debug_event_counters.py b/src/backend/gporca/scripts/get_debug_event_counters.py
index 41a5b0ea410..aaa22b0f4ec 100755
--- a/src/backend/gporca/scripts/get_debug_event_counters.py
+++ b/src/backend/gporca/scripts/get_debug_event_counters.py
@@ -28,7 +28,7 @@
 try:
 	from gppylib.db import dbconn
 except ImportError, e:
-	sys.exit('ERROR: Cannot import modules.  Please check that you have sourced greenplum_path.sh to set PYTHONPATH. '
+	sys.exit('ERROR: Cannot import modules.  Please check that you have sourced cloudberry-env.sh to set PYTHONPATH. '
 			 'Detail: ' + str(e))
 
 glob_use_sql = False
diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h b/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h
index c87830560dc..462a656f9bc 100644
--- a/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h
+++ b/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h
@@ -59,7 +59,7 @@ class CExpressionPreprocessorTest
 	// check if a given expression has a subquery exists node
 	static BOOL FHasSubqueryExists(CExpression *pexpr);
 
-	// check if a given expression has a subquery not exitst node
+	// check if a given expression has a subquery not exists node
 	static BOOL FHasSubqueryNotExists(CExpression *pexpr);
 
 	// check if a given expression has an ALL subquery
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp
index cb5355964ed..a6e37b2a07a 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp
@@ -99,6 +99,24 @@ CGroupTest::EresUnittest_FResetStatsOnCGroupWithDuplicateGroup()
 		return GPOS_FAILED;
 	}
 
+	CStatistics *stat =
+		GPOS_NEW(mp) CStatistics(mp, GPOS_NEW(mp) UlongToHistogramMap(mp),
+								 GPOS_NEW(mp) UlongToDoubleMap(mp), 0, false);
+
+	IStatistics *oldStats = pmemo->Pgroup(0)->Pstats();
+	pmemo->Pgroup(0)->AppendStats(mp, stat);
+
+	// By appending stats on group (0), we really are appending the stats on
+	// group (1). group (0) stats is never set in the first place.
+	if (oldStats == pmemo->Pgroup(1)->Pstats())
+	{
+		stat->Release();
+		GPOS_DELETE(pmemo);
+		pexprGet1->Release();
+		pexprGet2->Release();
+		return GPOS_FAILED;
+	}
+
 	pmemo->Pgroup(0)->FResetStats();
 
 	// After resetting stats on group (0), we should have also reset stats on
@@ -106,12 +124,14 @@ CGroupTest::EresUnittest_FResetStatsOnCGroupWithDuplicateGroup()
 	if (pmemo->Pgroup(0)->Pstats() != nullptr ||
 		pmemo->Pgroup(1)->Pstats() != nullptr)
 	{
+		stat->Release();
 		GPOS_DELETE(pmemo);
 		pexprGet1->Release();
 		pexprGet2->Release();
 		return GPOS_FAILED;
 	}
 
+	stat->Release();
 	GPOS_DELETE(pmemo);
 	pexprGet1->Release();
 	pexprGet2->Release();
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp b/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp
index 1e5f586596a..910a10ad2ab 100644
--- a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp
+++ b/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp
@@ -172,6 +172,7 @@ CXformTest::EresUnittest_ApplyXforms_CTE()
 
 	pdrgpexpr->Append(pexprConsumer);
 	COptCtxt::PoctxtFromTLS()->Pcteinfo()->IncrementConsumers(ulCTEId);
+	COptCtxt::PoctxtFromTLS()->Pcteinfo()->AddCTEConsumer(pexprNewConsumer);
 
 	pexprConsumer->AddRef();
 	CExpression *pexprSelect =
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 18ffeb3f784..3a9fd32741d 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -1262,6 +1262,7 @@ _copyShareInputScan(const ShareInputScan *from)
 	COPY_SCALAR_FIELD(this_slice_id);
 	COPY_SCALAR_FIELD(nconsumers);
 	COPY_SCALAR_FIELD(discard_output);
+	COPY_SCALAR_FIELD(ref_set);
 
 	return newnode;
 }
@@ -1473,6 +1474,43 @@ _copyWindowAgg(const WindowAgg *from)
 	return newnode;
 }
 
+/*
+ * _copyWindowHashAgg
+ */
+static WindowHashAgg *
+_copyWindowHashAgg(const WindowHashAgg *from)
+{
+	WindowHashAgg  *newnode = makeNode(WindowHashAgg);
+
+	CopyPlanFields((const Plan *) from, (Plan *) newnode);
+
+	COPY_SCALAR_FIELD(winref);
+	COPY_SCALAR_FIELD(partNumCols);
+	COPY_POINTER_FIELD(partColIdx, from->partNumCols * sizeof(AttrNumber));
+	COPY_POINTER_FIELD(partOperators, from->partNumCols * sizeof(Oid));
+	COPY_POINTER_FIELD(partCollations, from->partNumCols * sizeof(Oid));
+	COPY_SCALAR_FIELD(ordNumCols);
+
+	if (from->ordNumCols > 0)
+	{
+		COPY_POINTER_FIELD(ordColIdx, from->ordNumCols * sizeof(AttrNumber));
+		COPY_POINTER_FIELD(ordOperators, from->ordNumCols * sizeof(Oid));
+		COPY_POINTER_FIELD(ordCollations, from->ordNumCols * sizeof(Oid));
+		COPY_POINTER_FIELD(ordNullsFirst, from->ordNumCols * sizeof(bool));
+	}
+
+	COPY_SCALAR_FIELD(frameOptions);
+	COPY_NODE_FIELD(startOffset);
+	COPY_NODE_FIELD(endOffset);
+	COPY_SCALAR_FIELD(startInRangeFunc);
+	COPY_SCALAR_FIELD(endInRangeFunc);
+	COPY_SCALAR_FIELD(inRangeColl);
+	COPY_SCALAR_FIELD(inRangeAsc);
+	COPY_SCALAR_FIELD(inRangeNullsFirst);
+
+	return newnode;
+}
+
 /*
  * _copyUnique
  */
@@ -2165,8 +2203,8 @@ _copyFuncExpr(const FuncExpr *from)
 	COPY_SCALAR_FIELD(funccollid);
 	COPY_SCALAR_FIELD(inputcollid);
 	COPY_NODE_FIELD(args);
-	COPY_SCALAR_FIELD(is_tablefunc);
 	COPY_LOCATION_FIELD(location);
+	COPY_SCALAR_FIELD(is_tablefunc);
 
 	return newnode;
 }
@@ -6562,6 +6600,9 @@ copyObjectImpl(const void *from)
 		case T_WindowAgg:
 			retval = _copyWindowAgg(from);
 			break;
+		case T_WindowHashAgg:
+			retval = _copyWindowHashAgg(from);
+			break;
 		case T_TableFunctionScan:
 			retval = _copyTableFunctionScan(from);
 			break;
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 946cdfa6717..fcb37bfd8da 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -534,6 +534,7 @@ makeFuncExpr(Oid funcid, Oid rettype, List *args,
 	funcexpr->inputcollid = inputcollid;
 	funcexpr->args = args;
 	funcexpr->location = -1;
+	funcexpr->is_tablefunc = false;
 
 	return funcexpr;
 }
diff --git a/src/backend/nodes/outfast.c b/src/backend/nodes/outfast.c
index 054fc06238a..cfc6a322c0d 100644
--- a/src/backend/nodes/outfast.c
+++ b/src/backend/nodes/outfast.c
@@ -1030,6 +1030,9 @@ _outNode(StringInfo str, void *obj)
 			case T_WindowAgg:
 				_outWindowAgg(str, obj);
 				break;
+			case T_WindowHashAgg:
+				_outWindowHashAgg(str, obj);
+				break;
 			case T_Group:
 				_outGroup(str, obj);
 				break;
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 38f34f40b62..b27ca507c65 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -1013,6 +1013,33 @@ _outWindowAgg(StringInfo str, const WindowAgg *node)
 	WRITE_BOOL_FIELD(inRangeNullsFirst);
 }
 
+static void
+_outWindowHashAgg(StringInfo str, const WindowHashAgg *node)
+{
+	WRITE_NODE_TYPE("WINDOWHASHAGG");
+
+	_outPlanInfo(str, (const Plan *) node);
+
+	WRITE_UINT_FIELD(winref);
+	WRITE_INT_FIELD(partNumCols);
+	WRITE_ATTRNUMBER_ARRAY(partColIdx, node->partNumCols);
+	WRITE_OID_ARRAY(partOperators, node->partNumCols);
+	WRITE_OID_ARRAY(partCollations, node->partNumCols);
+	WRITE_INT_FIELD(ordNumCols);
+	WRITE_ATTRNUMBER_ARRAY(ordColIdx, node->ordNumCols);
+	WRITE_OID_ARRAY(ordOperators, node->ordNumCols);
+	WRITE_OID_ARRAY(ordCollations, node->ordNumCols);
+	WRITE_BOOL_ARRAY(ordNullsFirst, node->ordNumCols);
+	WRITE_INT_FIELD(frameOptions);
+	WRITE_NODE_FIELD(startOffset);
+	WRITE_NODE_FIELD(endOffset);
+	WRITE_OID_FIELD(startInRangeFunc);
+	WRITE_OID_FIELD(endInRangeFunc);
+	WRITE_OID_FIELD(inRangeColl);
+	WRITE_BOOL_FIELD(inRangeAsc);
+	WRITE_BOOL_FIELD(inRangeNullsFirst);
+}
+
 static void
 _outGroup(StringInfo str, const Group *node)
 {
@@ -1442,8 +1469,8 @@ _outFuncExpr(StringInfo str, const FuncExpr *node)
 	WRITE_OID_FIELD(funccollid);
 	WRITE_OID_FIELD(inputcollid);
 	WRITE_NODE_FIELD(args);
-	WRITE_BOOL_FIELD(is_tablefunc);  /* GPDB */
 	WRITE_LOCATION_FIELD(location);
+	WRITE_BOOL_FIELD(is_tablefunc);  /* GPDB */
 }
 
 static void
@@ -4347,6 +4374,9 @@ outNode(StringInfo str, const void *obj)
 			case T_WindowAgg:
 				_outWindowAgg(str, obj);
 				break;
+			case T_WindowHashAgg:
+				_outWindowHashAgg(str, obj);
+				break;
 			case T_Group:
 				_outGroup(str, obj);
 				break;
diff --git a/src/backend/nodes/outfuncs_common.c b/src/backend/nodes/outfuncs_common.c
index f164f5a6ca6..44a760390f2 100644
--- a/src/backend/nodes/outfuncs_common.c
+++ b/src/backend/nodes/outfuncs_common.c
@@ -398,6 +398,7 @@ _outShareInputScan(StringInfo str, const ShareInputScan *node)
 	WRITE_INT_FIELD(this_slice_id);
 	WRITE_INT_FIELD(nconsumers);
 	WRITE_BOOL_FIELD(discard_output);
+	WRITE_BOOL_FIELD(ref_set);
 
 	_outPlanInfo(str, (Plan *) node);
 }
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index c5223413071..3d0bd4b1533 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -564,6 +564,8 @@ plannode_type(Plan *p)
 			return "TupleSplit";
 		case T_WindowAgg:
 			return "WINDOWAGG";
+		case T_WindowHashAgg:
+			return "WINDOWHASHAGG";
 		case T_TableFunctionScan:
 			return "TABLEFUNCTIONSCAN";
 		case T_Unique:
diff --git a/src/backend/nodes/readfast.c b/src/backend/nodes/readfast.c
index 887f9eae433..8066d1198c1 100644
--- a/src/backend/nodes/readfast.c
+++ b/src/backend/nodes/readfast.c
@@ -1002,6 +1002,7 @@ _readShareInputScan(void)
 	READ_INT_FIELD(this_slice_id);
 	READ_INT_FIELD(nconsumers);
 	READ_BOOL_FIELD(discard_output);
+	READ_BOOL_FIELD(ref_set);
 
 	ReadCommonPlan(&local_node->scan.plan);
 
@@ -2076,6 +2077,9 @@ readNodeBinary(void)
 			case T_WindowAgg:
 				return_value = _readWindowAgg();
 				break;
+			case T_WindowHashAgg:
+				return_value = _readWindowHashAgg();
+				break;
 			case T_TableFunctionScan:
 				return_value = _readTableFunctionScan();
 				break;
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 636e79d1cf4..5f1bbacfa91 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -749,9 +749,8 @@ _readFuncExpr(void)
 	READ_OID_FIELD(funccollid);
 	READ_OID_FIELD(inputcollid);
 	READ_NODE_FIELD(args);
-	READ_BOOL_FIELD(is_tablefunc);  /* GPDB */
 	READ_LOCATION_FIELD(location);
-
+	READ_BOOL_FIELD(is_tablefunc);  /* GPDB */
 	READ_DONE();
 }
 
@@ -2534,6 +2533,35 @@ _readWindowAgg(void)
 	READ_DONE();
 }
 
+static WindowHashAgg *
+_readWindowHashAgg(void)
+{
+	READ_LOCALS(WindowHashAgg);
+
+	ReadCommonPlan(&local_node->plan);
+
+	READ_UINT_FIELD(winref);
+	READ_INT_FIELD(partNumCols);
+	READ_ATTRNUMBER_ARRAY(partColIdx, local_node->partNumCols);
+	READ_OID_ARRAY(partOperators, local_node->partNumCols);
+	READ_OID_ARRAY(partCollations, local_node->partNumCols);
+	READ_INT_FIELD(ordNumCols);
+	READ_ATTRNUMBER_ARRAY(ordColIdx, local_node->ordNumCols);
+	READ_OID_ARRAY(ordOperators, local_node->ordNumCols);
+	READ_OID_ARRAY(ordCollations, local_node->ordNumCols);
+	READ_BOOL_ARRAY(ordNullsFirst, local_node->ordNumCols);
+	READ_INT_FIELD(frameOptions);
+	READ_NODE_FIELD(startOffset);
+	READ_NODE_FIELD(endOffset);
+	READ_OID_FIELD(startInRangeFunc);
+	READ_OID_FIELD(endInRangeFunc);
+	READ_OID_FIELD(inRangeColl);
+	READ_BOOL_FIELD(inRangeAsc);
+	READ_BOOL_FIELD(inRangeNullsFirst);
+
+	READ_DONE();
+}
+
 /*
  * _readUnique
  */
@@ -3165,6 +3193,8 @@ parseNodeString(void)
 		return_value = _readDQAExpr();
 	else if (MATCH("WINDOWAGG", 9))
 		return_value = _readWindowAgg();
+	else if (MATCH("WINDOWHASHAGG", 13))
+		return_value = _readWindowHashAgg();
 	else if (MATCH("UNIQUE", 6))
 		return_value = _readUnique();
 	else if (MATCH("GATHER", 6))
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 9db0db827d5..c02fcd4ea73 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -1826,7 +1826,6 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 		Assert(parallel_workers > 0);
 #endif
 
-		/* GPDB parallel, parallel_workers <= 1 is bogus */
 		if (parallel_workers > 1)
 		{
 			/* Generate a partial append path. */
@@ -1840,8 +1839,38 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 			 * estimate.
 			 */
 			partial_rows = appendpath->path.rows;
-			/* Add the path if subpath has not Motion.*/
-			if (appendpath->path.parallel_safe && appendpath->path.motionHazard == false)
+
+			if (enable_parallel_append)
+			{
+				/* Add the path if subpath didn't encounter motion hazard.*/
+				if (appendpath->path.parallel_safe && (appendpath->path.motionHazard == false))
+					add_partial_path(rel, (Path *)appendpath);
+				else
+				{
+					/*
+					 * CBDB_PARALLEL:
+					 * When a parallel-aware Append is dropped due to motion hazard,
+					 * we attempt a second pass using parallel-oblivious Append.
+					 *
+					 * This approach is feasible in CBDB because:
+					 * 1. All Motions in a parallel plan handle tuples individually
+					 * 2. Parallel Append might miss executing slices containing Motions,
+					 *    whereas regular Append does not have this problem
+					 *
+					 * This behavior is conceptually similar to UPSTREAM's Append node
+					 * with partial paths implementation.
+					 */
+					appendpath = create_append_path(root, rel, NIL, partial_subpaths,
+													NIL, NULL, parallel_workers,
+													false /*enable_parallel_append*/,
+													-1);
+					partial_rows = appendpath->path.rows;
+
+					if (appendpath->path.parallel_safe)
+						add_partial_path(rel, (Path *)appendpath);
+				}
+			}
+			else if (appendpath->path.parallel_safe)
 				add_partial_path(rel, (Path *)appendpath);
 		}
 	}
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 04c68c5620d..4a1bbbf584b 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -1540,10 +1540,10 @@ cost_subqueryscan(SubqueryScanPath *path, PlannerInfo *root,
 	Assert(baserel->relid > 0);
 	Assert(baserel->rtekind == RTE_SUBQUERY);
 
-	/* Adjust row count if this runs in multiple segments and parallel model */
 	if (CdbPathLocus_IsPartitioned(path->path.locus))
 	{
-		numsegments = CdbPathLocus_NumSegments(path->path.locus);
+		/* Adjust row count if this runs in multiple segments and parallel model */
+		numsegments = CdbPathLocus_NumSegmentsPlusParallelWorkers(path->path.locus);
 	}
 	else
 		numsegments = 1;
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index ece5f3cde82..48a60c137d3 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -1551,23 +1551,28 @@ cdb_pull_up_eclass(PlannerInfo *root,
 				   Relids relids,
 				   List *targetlist,
 				   List *newvarlist,
-				   Index newrelid)
+				   Index newrelid,
+				   bool ignore_relabel)
 {
 	Expr	   *sub_distkeyexpr;
 	EquivalenceClass *outer_ec;
 	Expr	   *newexpr = NULL;
 	Index sortref = 0;
+	bool	relabel_stripped = false;
 
 	Assert(eclass);
 	Assert(!newvarlist ||
 		   list_length(newvarlist) == list_length(targetlist));
 
 	/* Find an expr that we can rewrite to use the projected columns. */
-	sub_distkeyexpr = cdbpullup_findEclassInTargetList(eclass, targetlist, InvalidOid);
+	sub_distkeyexpr = cdbpullup_findEclassInTargetList(eclass, targetlist, InvalidOid, &relabel_stripped);
 
 	/* Replace expr's Var nodes with new ones referencing the targetlist. */
 	if (sub_distkeyexpr)
 	{
+		if (ignore_relabel && relabel_stripped)
+			return eclass;
+
 		newexpr = cdbpullup_expr(sub_distkeyexpr,
 								 targetlist,
 								 newvarlist,
diff --git a/src/backend/optimizer/plan/aqumv.c b/src/backend/optimizer/plan/aqumv.c
index 59d133d8af4..4a576061780 100644
--- a/src/backend/optimizer/plan/aqumv.c
+++ b/src/backend/optimizer/plan/aqumv.c
@@ -74,6 +74,13 @@ static Node *aqumv_adjust_sub_matched_expr_mutator(Node *node, aqumv_equivalent_
 static bool contain_var_or_aggstar_clause_walker(Node *node, void *context);
 static bool check_partition(Query *parse, Oid origin_rel_oid);
 
+static bool
+groupby_query_rewrite(PlannerInfo *subroot,
+						Query *parse,
+						Query *viewQuery,
+						aqumv_equivalent_transformation_context *context,
+						AqumvContext aqumv_context);
+
 typedef struct
 {
 	int	complexity;
@@ -353,37 +360,28 @@ answer_query_using_materialized_views(PlannerInfo *root, AqumvContext aqumv_cont
 		subroot->tuple_fraction = root->tuple_fraction;
 		subroot->limit_tuples = root->limit_tuples;
 
-		/*
-		 * AQUMV_FIXME_MVP
-		 * Are stable functions OK?
-		 * A STABLE function cannot modify the database and is guaranteed to
-		 * return the same results given the same arguments for all rows
-		 * within a single statement.
-		 * But AQUMV rewrites the query to a new SQL actually, though the same
-		 * results is guaranteed.
-		 * Its's unclear whether STABLE is OK, let's be conservative for now.
-		 */
-		if(contain_mutable_functions((Node *)viewQuery))
-			continue;
-
 		context = aqumv_init_context(viewQuery->targetList, matviewRel->rd_att);
 
 		if (!parse->hasAggs && viewQuery->hasAggs)
 			continue;
 
-		if (parse->hasAggs && viewQuery->hasAggs)
+		if (parse->groupClause != NIL && viewQuery->groupClause != NIL)
+		{
+			if (!groupby_query_rewrite(subroot, parse, viewQuery, context, aqumv_context))
+				continue;
+		}
+		else if (parse->hasAggs && viewQuery->hasAggs)
 		{
+			/* Both don't have group by. */
+			{
 			if (parse->hasDistinctOn ||
 				parse->distinctClause != NIL ||
-				parse->groupClause != NIL || /* TODO: GROUP BY */
 				parse->groupingSets != NIL ||
 				parse->groupDistinct)
 				continue;
 
-			/* No Group by now. */
 			if (viewQuery->hasDistinctOn ||
 				viewQuery->distinctClause != NIL ||
-				viewQuery->groupClause != NIL ||
 				viewQuery->groupingSets != NIL ||
 				viewQuery->groupDistinct ||
 				viewQuery->havingQual != NULL || /* HAVING clause is not supported on IMMV yet. */
@@ -401,7 +399,7 @@ answer_query_using_materialized_views(PlannerInfo *root, AqumvContext aqumv_cont
 			 */
 			if (parse->sortClause != NIL || viewQuery->sortClause != NIL)
 			{
-				/* Earse view's sort caluse, it's ok to let alone view's target list. */
+				/* Erase view's sort caluse, it's ok to let alone view's target list. */
 				viewQuery->sortClause = NIL;
 			}
 
@@ -476,6 +474,7 @@ answer_query_using_materialized_views(PlannerInfo *root, AqumvContext aqumv_cont
 
 			/* Select from a mv never have that.*/
 			subroot->append_rel_list = NIL;
+			}
 		}
 		else
 		{
@@ -909,3 +908,91 @@ check_partition(Query *parse, Oid origin_rel_oid)
 	}
 	return true;
 }
+
+static bool
+groupby_query_rewrite(PlannerInfo *subroot,
+						Query *parse,
+						Query *viewQuery,
+						aqumv_equivalent_transformation_context *context,
+						AqumvContext aqumv_context)
+{
+	List	*post_quals = NIL;
+	List	*mv_final_tlist = NIL;
+
+	if (!parse->hasAggs || !viewQuery->hasAggs)
+		return false;
+
+	/* Both have Group by and aggregation. */
+	if (parse->groupClause == NIL || viewQuery->groupClause == NIL)
+		return false;
+
+	if (parse->hasDistinctOn ||
+		parse->distinctClause != NIL ||
+		parse->groupingSets != NIL ||
+		parse->sortClause != NIL ||
+		limit_needed(parse) ||
+		parse->havingQual != NULL ||
+		parse->groupDistinct)
+		return false;
+
+	if (viewQuery->hasDistinctOn ||
+		viewQuery->distinctClause != NIL ||
+		viewQuery->groupingSets != NIL ||
+		viewQuery->groupDistinct ||
+		viewQuery->havingQual != NULL ||
+		viewQuery->sortClause != NIL ||
+		limit_needed(viewQuery))
+		return false;
+
+	if (tlist_has_srf(parse))
+		return false;
+
+	preprocess_qual_conditions(subroot, (Node *) viewQuery->jointree);
+
+	if(!aqumv_process_from_quals(parse->jointree->quals, viewQuery->jointree->quals, &post_quals))
+		return false;
+
+	if (post_quals != NIL)
+		return false;
+
+	/*
+	 * There should be no post_quals for now, erase those from view.
+	 */
+	viewQuery->jointree->quals = NULL;
+
+	if (list_difference(parse->groupClause, viewQuery->groupClause))
+		return false;
+
+	if (list_difference(viewQuery->groupClause, parse->groupClause))
+		return false;
+
+	/*
+	 * Group By clauses are equal, erase those from view.
+	 */
+	viewQuery->groupClause = NIL;
+
+	if(!aqumv_process_targetlist(context, aqumv_context->raw_processed_tlist, &mv_final_tlist))
+		return false;
+
+	viewQuery->targetList = mv_final_tlist;
+	/* SRF is not supported now, but correct the field. */
+	viewQuery->hasTargetSRFs = parse->hasTargetSRFs;
+	viewQuery->hasAggs = false;
+	subroot->agginfos = NIL;
+	subroot->aggtransinfos = NIL;
+	subroot->hasNonPartialAggs = false;
+	subroot->hasNonSerialAggs = false;
+	subroot->numOrderedAggs = false;
+	/* CBDB specifical */
+	subroot->hasNonCombine = false;
+	subroot->numPureOrderedAggs = false;
+	/*
+	 * NB: Update processed_tlist again in case that tlist has been changed.
+	 */
+	subroot->processed_tlist = NIL;
+	preprocess_targetlist(subroot);
+
+	/* Select from a mv never have that.*/
+	subroot->append_rel_list = NIL;
+	return true;
+}
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 7ce61a9ab9e..53c1bf7d338 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -2312,12 +2312,12 @@ create_projection_plan(PlannerInfo *root, ProjectionPath *best_path, int flags)
 	 * https://github.com/greenplum-db/gpdb/issues/9874 for more
 	 * detailed info.
 	 */
-	if (root->config->gp_enable_direct_dispatch && best_path->direct_dispath_contentIds)
+	if (root->config->gp_enable_direct_dispatch && best_path->direct_dispatch_contentIds)
 	{
 		DirectDispatchInfo dispatchInfo;
 
 		dispatchInfo.isDirectDispatch = true;
-		dispatchInfo.contentIds = best_path->direct_dispath_contentIds;
+		dispatchInfo.contentIds = best_path->direct_dispatch_contentIds;
 		dispatchInfo.haveProcessedAnyCalculations = true;
 
 		MergeDirectDispatchCalculationInfo(&root->curSlice->directDispatch, &dispatchInfo);
diff --git a/src/backend/optimizer/plan/orca.c b/src/backend/optimizer/plan/orca.c
index 0d706129d58..97f63f7a334 100644
--- a/src/backend/optimizer/plan/orca.c
+++ b/src/backend/optimizer/plan/orca.c
@@ -25,6 +25,7 @@
 #include "cdb/cdbplan.h"
 #include "cdb/cdbvars.h"
 #include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/optimizer.h"
 #include "optimizer/orca.h"
@@ -37,11 +38,16 @@
 #include "parser/parsetree.h"
 #include "rewrite/rewriteManip.h"
 #include "portability/instr_time.h"
+#include "utils/elog.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
+#include "utils/syscache.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_namespace.h"
 
 /* GPORCA entry point */
-extern PlannedStmt * GPOPTOptimizedPlan(Query *parse, bool *had_unexpected_failure);
+extern PlannedStmt * GPOPTOptimizedPlan(Query *parse, bool *had_unexpected_failure, OptimizerOptions *opts);
 
 static Plan *remove_redundant_results(PlannerInfo *root, Plan *plan);
 static Node *remove_redundant_results_mutator(Node *node, void *);
@@ -81,6 +87,110 @@ log_optimizer(PlannedStmt *plan, bool fUnexpectedFailure)
 	}
 }
 
+/*
+ * support_functions_check_context
+ *		Context structure for checking support functions, similar to eval_const_expressions_context
+ */
+typedef struct
+{
+	PlannerInfo *root;
+	bool		recurse_queries;		/* recurse into query structures */
+	bool		recurse_sublink_testexpr; /* recurse into sublink test expressions */
+} support_functions_check_context;
+
+/*
+ * check_support_functions_walker
+ *		Walker function to check if a query tree contains functions with support functions
+ *		Uses the same traversal pattern as eval_const_expressions_mutator but as a walker
+ */
+static bool
+check_support_functions_walker(Node *node, support_functions_check_context *context)
+{
+	if (node == NULL)
+		return false;
+
+	if (IsA(node, Query))
+	{
+		Query *query = (Query *) node;
+
+		if (context->recurse_queries)
+		{
+			/* Recurse into Query structures like fold_constants does */
+			return query_tree_walker(query, check_support_functions_walker, context, 0);
+		}
+		return false;
+	}
+
+	/* Handle SubLink like eval_const_expressions_mutator does */
+	if (IsA(node, SubLink) && !context->recurse_sublink_testexpr)
+	{
+		SubLink *sublink = (SubLink *) node;
+
+		/*
+		 * Also invoke the walker on the sublink's Query node, so it
+		 * can recurse into the sub-query if it wants to.
+		 */
+		return query_tree_walker((Query *) sublink->subselect, check_support_functions_walker, context, 0);
+	}
+
+	/* Check both FuncExpr and OpExpr nodes for prosupport functions */
+	if (IsA(node, FuncExpr) || IsA(node, OpExpr))
+	{
+		HeapTuple	proctup;
+		Form_pg_proc procform;
+		bool		has_support = false;
+		Oid			funcid;
+		const char	*exprtype;
+
+		/* Extract function OID from either FuncExpr or OpExpr */
+		if (IsA(node, FuncExpr))
+		{
+			FuncExpr *funcexpr = (FuncExpr *) node;
+			funcid = funcexpr->funcid;
+			exprtype = "FuncExpr";
+		}
+		else /* OpExpr */
+		{
+			OpExpr *opexpr = (OpExpr *) node;
+			funcid = opexpr->opfuncid;
+			exprtype = "OpExpr";
+		}
+
+		proctup = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid));
+		if (HeapTupleIsValid(proctup))
+		{
+			procform = (Form_pg_proc) GETSTRUCT(proctup);
+			has_support = OidIsValid(procform->prosupport);
+			/* Skip pg_catalog namespace support functions - they are safe */
+			if (has_support && procform->pronamespace != PG_CATALOG_NAMESPACE)
+			{
+				elog(DEBUG1, "Found %s with non-pg_catalog prosupport function, falling back to standard planner", exprtype);
+				ReleaseSysCache(proctup);
+				return true;
+			}
+			ReleaseSysCache(proctup);
+		}
+	}
+
+	return expression_tree_walker(node, check_support_functions_walker, context);
+}
+
+/*
+ * query_contains_support_functions
+ *		Check if a query contains function calls that have support functions
+ */
+static bool
+query_contains_support_functions(Query *query)
+{
+	support_functions_check_context context;
+
+	context.root = NULL;  /* We don't need PlannerInfo for this check */
+	context.recurse_queries = true; /* recurse into query structures */
+	context.recurse_sublink_testexpr = false; /* do not recurse into sublink test expressions */
+
+	/* Use the same traversal pattern as fold_constants but with a walker */
+	return query_or_expression_tree_walker((Node *) query, check_support_functions_walker, &context, 0);
+}
 
 /*
  * optimize_query
@@ -89,7 +199,7 @@ log_optimizer(PlannedStmt *plan, bool fUnexpectedFailure)
  * This is the main entrypoint for invoking Orca.
  */
 PlannedStmt *
-optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams)
+optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams, OptimizerOptions *options)
 {
 	/* flag to check if optimizer unexpectedly failed to produce a plan */
 	bool			fUnexpectedFailure = false;
@@ -140,6 +250,23 @@ optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	/*
 	 * Pre-process the Query tree before calling optimizer.
 	 *
+	 * Check if rtable is NULL and query contains support functions.
+	 * If both conditions are true, fall back to standard planner to avoid
+	 * crashes in extension support functions that expect valid rtable.
+	 * 
+	 * Performance note: This check does not significantly impact performance
+	 * since pqueryCopy->rtable is non-NULL for most queries. The rtable is
+	 * typically only NULL when the query contains sublinks, which is uncommon.
+	 * The query_contains_support_functions() traversal only occurs in these
+	 * rare cases.
+	 */
+	if (pqueryCopy->rtable == NULL && query_contains_support_functions(pqueryCopy))
+	{
+		elog(DEBUG1, "Query rtable is NULL and contains support functions, falling back to standard planner");
+		return NULL;
+	}
+
+	/*
 	 * Constant folding will add dependencies to functions or relations in
 	 * glob->invalItems, for any functions that are inlined or eliminated
 	 * away. (We will find dependencies to other objects later, after planning).
@@ -153,7 +280,7 @@ optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	pqueryCopy = (Query *) transformGroupedWindows((Node *) pqueryCopy, NULL);
 
 	/* Ok, invoke ORCA. */
-	result = GPOPTOptimizedPlan(pqueryCopy, &fUnexpectedFailure);
+	result = GPOPTOptimizedPlan(pqueryCopy, &fUnexpectedFailure, options);
 
 	log_optimizer(result, fUnexpectedFailure);
 
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 463b24ba903..da5acb23ebf 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -300,6 +300,14 @@ static split_rollup_data *make_new_rollups_for_hash_grouping_set(PlannerInfo *ro
 																 Path *path,
 																 grouping_sets_data *gd);
 
+static void create_partial_window_path(PlannerInfo *root,
+											RelOptInfo *window_rel,
+											Path *path,
+											PathTarget *input_target,
+											PathTarget *output_target,
+											WindowFuncLists *wflists,
+											List *activeWindows);
+
 
 /*****************************************************************************
  *
@@ -320,13 +328,16 @@ planner(Query *parse, const char *query_string, int cursorOptions,
 {
 	PlannedStmt *result;
 	instr_time	starttime, endtime;
+	OptimizerOptions *optimizer_options;
 
+	optimizer_options = palloc(sizeof(OptimizerOptions));
+	optimizer_options->create_vectorization_plan = false;
 	if (planner_hook)
 	{
 		if (gp_log_optimization_time)
 			INSTR_TIME_SET_CURRENT(starttime);
 
-		result = (*planner_hook) (parse, query_string, cursorOptions, boundParams);
+		result = (*planner_hook) (parse, query_string, cursorOptions, boundParams, optimizer_options);
 
 		if (gp_log_optimization_time)
 		{
@@ -336,14 +347,14 @@ planner(Query *parse, const char *query_string, int cursorOptions,
 		}
 	}
 	else
-		result = standard_planner(parse, query_string, cursorOptions, boundParams);
-
+		result = standard_planner(parse, query_string, cursorOptions, boundParams, optimizer_options);
+	pfree(optimizer_options);
 	return result;
 }
 
 PlannedStmt *
 standard_planner(Query *parse, const char *query_string, int cursorOptions,
-				 ParamListInfo boundParams)
+				 ParamListInfo boundParams, OptimizerOptions *optimizer_options)
 {
 	PlannedStmt *result;
 	PlannerGlobal *glob;
@@ -396,7 +407,7 @@ standard_planner(Query *parse, const char *query_string, int cursorOptions,
 			INSTR_TIME_SET_CURRENT(starttime);
 
 #ifdef USE_ORCA
-		result = optimize_query(parse, cursorOptions, boundParams);
+		result = optimize_query(parse, cursorOptions, boundParams, optimizer_options);
 #else
 		/* Make sure this branch is not taken in builds using --disable-orca. */
 		Assert(false);
@@ -4252,6 +4263,8 @@ make_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel,
 	grouped_rel->useridiscurrent = input_rel->useridiscurrent;
 	grouped_rel->fdwroutine = input_rel->fdwroutine;
 	grouped_rel->exec_location = input_rel->exec_location;
+	grouped_rel->cdbpolicy = input_rel->cdbpolicy;
+	grouped_rel->relid = input_rel->relid;
 
 	return grouped_rel;
 }
@@ -4876,6 +4889,27 @@ create_window_paths(PlannerInfo *root,
 								   activeWindows);
 	}
 
+	/*
+	 * Unlike Upstream, we could make window function parallel by redistributing
+	 * the tuples according to the PARTITION BY clause which is similar to Group By.
+	 * Even there is no PARTITION BY, window function could be parallel from
+	 * sub partial paths.
+	 */
+	if (window_rel->consider_parallel &&
+		input_rel->partial_pathlist)
+	{
+		/* For partial, only the best one if enough. */
+		Path	   *path = (Path *) linitial(input_rel->partial_pathlist);
+
+		create_partial_window_path(root,
+							   window_rel,
+							   path,
+							   input_target,
+							   output_target,
+							   wflists,
+							   activeWindows);
+	}
+
 	/*
 	 * If there is an FDW that's responsible for all baserels of the query,
 	 * let it consider adding ForeignPaths.
@@ -9103,3 +9137,76 @@ make_new_rollups_for_hash_grouping_set(PlannerInfo        *root,
 
 	return srd;
 }
+
+/*
+ * Parallel processing of window functions.
+ *
+ * NB: it may produce non-deterministic results if the window function
+ * lacks ORDER BY and PARTITION BY clause.
+ * SQL:2011 has clarified this behavior.
+ */
+static void
+create_partial_window_path(PlannerInfo *root,
+					   RelOptInfo *window_rel,
+					   Path *path,
+					   PathTarget *input_target,
+					   PathTarget *output_target,
+					   WindowFuncLists *wflists,
+					   List *activeWindows)
+{
+	PathTarget *window_target;
+	ListCell   *l;
+
+	window_target = input_target;
+
+	foreach(l, activeWindows)
+	{
+		WindowClause *wc = lfirst_node(WindowClause, l);
+		List	   *window_pathkeys;
+		int			presorted_keys;
+		bool		is_sorted;
+
+		window_pathkeys = make_pathkeys_for_window(root,
+												   wc,
+												   root->processed_tlist);
+
+		is_sorted = pathkeys_count_contained_in(window_pathkeys,
+												path->pathkeys,
+												&presorted_keys);
+
+		path = cdb_prepare_path_for_sorted_agg(root,
+											   is_sorted,
+											   presorted_keys,
+											   window_rel,
+											   path,
+											   path->pathtarget,
+											   window_pathkeys,
+											   -1.0,
+											   wc->partitionClause,
+											   NIL);
+		if (lnext(activeWindows, l))
+		{
+			ListCell   *lc2;
+
+			window_target = copy_pathtarget(window_target);
+			foreach(lc2, wflists->windowFuncs[wc->winref])
+			{
+				WindowFunc *wfunc = lfirst_node(WindowFunc, lc2);
+
+				add_column_to_pathtarget(window_target, (Expr *) wfunc, 0);
+				window_target->width += get_typavgwidth(wfunc->wintype, -1);
+			}
+		}
+		else
+		{
+			window_target = output_target;
+		}
+
+		path = (Path *)
+			create_windowagg_path(root, window_rel, path, window_target,
+								  wflists->windowFuncs[wc->winref],
+								  wc);
+	}
+
+	add_partial_path(window_rel, path);
+}
diff --git a/src/backend/optimizer/plan/planshare.c b/src/backend/optimizer/plan/planshare.c
index 75983b8ffe3..f3b716364ca 100644
--- a/src/backend/optimizer/plan/planshare.c
+++ b/src/backend/optimizer/plan/planshare.c
@@ -40,6 +40,7 @@ make_shareinputscan(PlannerInfo *root, Plan *inputplan)
 	sisc->this_slice_id = -1;
 	sisc->nconsumers = 0;
 	sisc->discard_output = false;
+	sisc->ref_set = false;
 
 	sisc->scan.plan.qual = NIL;
 	sisc->scan.plan.righttree = NULL;
@@ -51,6 +52,9 @@ make_shareinputscan(PlannerInfo *root, Plan *inputplan)
 	sisc->scan.plan.plan_rows = inputplan->plan_rows;
 	sisc->scan.plan.plan_width = inputplan->plan_width;
 
+	sisc->scan.plan.locustype = inputplan->locustype;
+	sisc->scan.plan.parallel = 0; /* No parallel ShareInputScan */
+
 	return sisc;
 }
 
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 715971a7b02..5ed6f9dacab 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -387,6 +387,7 @@ set_plan_references(PlannerInfo *root, Plan *plan)
 	PlannerGlobal *glob = root->glob;
 	int			rtoffset = list_length(glob->finalrtable);
 	ListCell   *lc;
+	bool need_append_rel = true;
 
 #ifdef USE_ASSERT_CHECKING
 	/* 
@@ -422,6 +423,17 @@ set_plan_references(PlannerInfo *root, Plan *plan)
 		glob->finalrowmarks = lappend(glob->finalrowmarks, newrc);
 	}
 
+	/*
+	 * ShareInputScan nodes can be reused multiple times during execution, but this
+	 * causes a crash when explaining plans with append info in the function
+	 * deparse_context_for_plan_tree().
+	 *
+	 * To fix this, we only add appendrels for the producer ShareInputScan node of
+	 * a given share_id, rather than all nodes with the same share_id. 
+	 */
+	if (plan != NULL && IsA(plan, ShareInputScan))
+		need_append_rel = ((ShareInputScan *) plan)->ref_set;
+
 	/*
 	 * Adjust RT indexes of AppendRelInfos and add to final appendrels list.
 	 * We assume the AppendRelInfos were built during planning and don't need
@@ -431,6 +443,9 @@ set_plan_references(PlannerInfo *root, Plan *plan)
 	{
 		AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc);
 
+		if (!need_append_rel)
+			break;
+
 		/* adjust RT indexes */
 		appinfo->parent_relid += rtoffset;
 		appinfo->child_relid += rtoffset;
diff --git a/src/backend/optimizer/prep/prepagg.c b/src/backend/optimizer/prep/prepagg.c
index 5388b1c4934..b16e4adb220 100644
--- a/src/backend/optimizer/prep/prepagg.c
+++ b/src/backend/optimizer/prep/prepagg.c
@@ -53,16 +53,6 @@
 #include "utils/syscache.h"
 
 static bool preprocess_aggrefs_walker(Node *node, PlannerInfo *root);
-static int	find_compatible_agg(PlannerInfo *root, Aggref *newagg,
-								List **same_input_transnos);
-static int	find_compatible_trans(PlannerInfo *root, Aggref *newagg,
-								  bool shareable,
-								  Oid aggtransfn, Oid aggtranstype,
-								  int transtypeLen, bool transtypeByVal,
-								  Oid aggcombinefn,
-								  Oid aggserialfn, Oid aggdeserialfn,
-								  Datum initValue, bool initValueIsNull,
-								  List *transnos);
 static Datum GetAggInitVal(Datum textInitVal, Oid transtype);
 
 /* -----------------
@@ -220,7 +210,7 @@ preprocess_aggref(Aggref *aggref, PlannerInfo *root)
 	 * 1. See if this is identical to another aggregate function call that
 	 * we've seen already.
 	 */
-	aggno = find_compatible_agg(root, aggref, &same_input_transnos);
+	aggno = find_compatible_agg(root->agginfos, aggref, &same_input_transnos);
 	if (aggno != -1)
 	{
 		AggInfo    *agginfo = list_nth(root->agginfos, aggno);
@@ -266,7 +256,7 @@ preprocess_aggref(Aggref *aggref, PlannerInfo *root)
 		 * 2. See if this aggregate can share transition state with another
 		 * aggregate that we've initialized already.
 		 */
-		transno = find_compatible_trans(root, aggref, shareable,
+		transno = find_compatible_trans(root->aggtransinfos, shareable,
 										aggtransfn, aggtranstype,
 										transtypeLen, transtypeByVal,
 										aggcombinefn,
@@ -367,8 +357,8 @@ preprocess_aggrefs_walker(Node *node, PlannerInfo *root)
  * passed later to find_compatible_trans, to see if we can at least reuse
  * the state value of another aggregate.
  */
-static int
-find_compatible_agg(PlannerInfo *root, Aggref *newagg,
+int
+find_compatible_agg(List *agginfos, Aggref *newagg,
 					List **same_input_transnos)
 {
 	ListCell   *lc;
@@ -390,7 +380,7 @@ find_compatible_agg(PlannerInfo *root, Aggref *newagg,
 	 * same transition function will be checked later.)
 	 */
 	aggno = -1;
-	foreach(lc, root->agginfos)
+	foreach(lc, agginfos)
 	{
 		AggInfo    *agginfo = (AggInfo *) lfirst(lc);
 		Aggref	   *existingRef;
@@ -445,8 +435,8 @@ find_compatible_agg(PlannerInfo *root, Aggref *newagg,
  * transition function and initial condition. (The inputs have already been
  * verified to match.)
  */
-static int
-find_compatible_trans(PlannerInfo *root, Aggref *newagg, bool shareable,
+int
+find_compatible_trans(List *aggtransinfos, bool shareable,
 					  Oid aggtransfn, Oid aggtranstype,
 					  int transtypeLen, bool transtypeByVal,
 					  Oid aggcombinefn,
@@ -463,7 +453,7 @@ find_compatible_trans(PlannerInfo *root, Aggref *newagg, bool shareable,
 	foreach(lc, transnos)
 	{
 		int			transno = lfirst_int(lc);
-		AggTransInfo *pertrans = (AggTransInfo *) list_nth(root->aggtransinfos, transno);
+		AggTransInfo *pertrans = (AggTransInfo *) list_nth(aggtransinfos, transno);
 
 		/*
 		 * if the transfns or transition state types are not the same then the
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index ce315e3058e..ffaaea30b9c 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -79,7 +79,8 @@ static List *plan_union_children(PlannerInfo *root,
 								 List *refnames_tlist,
 								 List **tlist_list);
 static Path *make_union_unique(SetOperationStmt *op, Path *path, List *tlist,
-							   PlannerInfo *root);
+							   PlannerInfo *root,
+							   Relids relids);
 static void postprocess_setop_rel(PlannerInfo *root, RelOptInfo *rel);
 static bool choose_hashed_setop(PlannerInfo *root, List *groupClauses,
 								Path *input_path,
@@ -573,7 +574,7 @@ generate_recursion_path(SetOperationStmt *setOp, PlannerInfo *root,
 	if (!setOp->all && CdbPathLocus_IsPartitioned(path->locus))
 	{
 		path = make_motion_hash_all_targets(root, path, tlist);
-		path = make_union_unique(setOp, path, tlist, root);
+		path = make_union_unique(setOp, path, tlist, root, bms_union(lrel->relids, rrel->relids));
 	}
 
 	add_path(result_rel, path, root);
@@ -595,7 +596,7 @@ generate_union_paths(SetOperationStmt *op, PlannerInfo *root,
 	ListCell   *lc;
 	List	   *pathlist = NIL;
 	List	   *partial_pathlist = NIL;
-	bool		partial_paths_valid = false; /* CBDB_PARALLEL_FIXME: temproary disable partial path */
+	bool		partial_paths_valid = true;
 	bool		consider_parallel = true;
 	List	   *rellist;
 	List	   *tlist_list;
@@ -680,7 +681,7 @@ generate_union_paths(SetOperationStmt *op, PlannerInfo *root,
 			/* CDB: Hash motion to collocate non-distinct tuples. */
 			path = make_motion_hash_all_targets(root, path, tlist);
 		}
-		path = make_union_unique(op, path, tlist, root);
+		path = make_union_unique(op, path, tlist, root, relids);
 	}
 
 	add_path(result_rel, path, root);
@@ -709,7 +710,16 @@ generate_union_paths(SetOperationStmt *op, PlannerInfo *root,
 
 			parallel_workers = Max(parallel_workers, path->parallel_workers);
 		}
+#if 0
+		/*
+		 * CBDB_PARALLEL:
+		 * Unlike upstream, this scenario can occur when there are paths with
+		 * parallel_workers set to 0, but have subpaths with parallel_workers > 0.
+		 * This is a valid case that allows our Cloudberry
+		 * to maximize parallel execution where possible.
+		 */
 		Assert(parallel_workers > 0);
+#endif
 
 		/*
 		 * If the use of parallel append is permitted, always request at least
@@ -725,12 +735,17 @@ generate_union_paths(SetOperationStmt *op, PlannerInfo *root,
 			parallel_workers = Min(parallel_workers,
 								   max_parallel_workers_per_gather);
 		}
+#if 0
+		/*
+		 * See above comments.
+		 */
 		Assert(parallel_workers > 0);
+#endif
 
 		ppath = (Path *)
 			create_append_path(root, result_rel, NIL, partial_pathlist,
 							   NIL, NULL,
-							   parallel_workers, enable_parallel_append,
+							   parallel_workers, false /* enable_parallel_append */,
 							   -1);
 		/* CBDB_PARALLEL_FIXME: we disable pg styple Gather/GatherMerge node */
 #if 0
@@ -739,8 +754,15 @@ generate_union_paths(SetOperationStmt *op, PlannerInfo *root,
 							   result_rel->reltarget, NULL, NULL);
 #endif
 		if (!op->all)
-			ppath = make_union_unique(op, ppath, tlist, root);
-		add_path(result_rel, ppath, root);
+		{
+			/* CDB: Hash motion to collocate non-distinct tuples. */
+			if (CdbPathLocus_IsPartitioned(ppath->locus))
+			{
+				ppath = make_motion_hash_all_targets(root, ppath, tlist);
+			}
+			ppath = make_union_unique(op, ppath, tlist, root, relids);
+		}
+		add_partial_path(result_rel, ppath);
 	}
 
 	/* Undo effects of possibly forcing tuple_fraction to 0 */
@@ -1010,9 +1032,9 @@ plan_union_children(PlannerInfo *root,
  */
 static Path *
 make_union_unique(SetOperationStmt *op, Path *path, List *tlist,
-				  PlannerInfo *root)
+				  PlannerInfo *root, Relids relids)
 {
-	RelOptInfo *result_rel = fetch_upper_rel(root, UPPERREL_SETOP, NULL);
+	RelOptInfo *result_rel = fetch_upper_rel(root, UPPERREL_SETOP, relids);
 	List	   *groupList;
 	double		dNumGroups;
 
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index a48f2ed8433..2669f2c3017 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -807,7 +807,13 @@ max_parallel_hazard_walker(Node *node, max_parallel_hazard_context *context)
 	 */
 	else if (IsA(node, WindowFunc))
 	{
-		if (max_parallel_hazard_test(PROPARALLEL_RESTRICTED, context))
+		/*
+		 * In Cloudberry, we proess window fuctions by redistributeing the tuples
+		 * if there is Partition By clause.
+		 * Each partition is processed individually, whether in a single process
+		 * or distributed parallel workers setup.
+		 */
+		if (max_parallel_hazard_test(PROPARALLEL_SAFE, context))
 			return true;
 	}
 
@@ -4147,29 +4153,23 @@ simplify_function(Oid funcid, Oid result_type, int32 result_typmod,
 		 * function is actually being invoked.
 		 */
 		SupportRequestSimplify req;
-		FuncExpr	fexpr;
-
-		fexpr.xpr.type = T_FuncExpr;
-		fexpr.funcid = funcid;
-		fexpr.funcresulttype = result_type;
-		fexpr.funcretset = func_form->proretset;
-		fexpr.funcvariadic = funcvariadic;
-		fexpr.funcformat = COERCE_EXPLICIT_CALL;
-		fexpr.funccollid = result_collid;
-		fexpr.inputcollid = input_collid;
-		fexpr.args = args;
-		fexpr.location = -1;
+		FuncExpr *fexpr = makeFuncExpr(funcid, result_type, args,
+									   result_collid, input_collid,
+									   COERCE_EXPLICIT_CALL);
+
+		fexpr->funcvariadic = funcvariadic;
+		fexpr->funcretset = func_form->proretset;
 
 		req.type = T_SupportRequestSimplify;
 		req.root = context->root;
-		req.fcall = &fexpr;
+		req.fcall = fexpr;
 
 		newexpr = (Expr *)
 			DatumGetPointer(OidFunctionCall1(func_form->prosupport,
 											 PointerGetDatum(&req)));
 
 		/* catch a possible API misunderstanding */
-		Assert(newexpr != (Expr *) &fexpr);
+		Assert(newexpr != (Expr *) fexpr);
 	}
 
 	if (!newexpr && allow_non_const)
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index ec5287bdc32..24b795dde17 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -2092,7 +2092,7 @@ set_append_path_locus(PlannerInfo *root, Path *pathnode, RelOptInfo *rel,
 				 * gp_execution_segment() = <segid> here, so we should update
 				 * direct dispatch info when creating plan.
 				 */
-				((ProjectionPath *) subpath)->direct_dispath_contentIds = list_make1_int(gp_session_id % numsegments);
+				((ProjectionPath *) subpath)->direct_dispatch_contentIds = list_make1_int(gp_session_id % numsegments);
 
 				CdbPathLocus_MakeStrewn(&(subpath->locus),
 				                        numsegments,
@@ -2156,12 +2156,17 @@ set_append_path_locus(PlannerInfo *root, Path *pathnode, RelOptInfo *rel,
 	 * Partially fixed append issue.
 	 * But there are still several locus can't be parallel so that we can't handle it currently.
 	 */
-	AssertImply(parallel_workers > 1 &&
+	/*
+	 * After we try parallel-bolivious append, there could be possible that partial paths with
+	 * parallel_workers = 0, ex: a partial path and Motion to a path with parallel_workers = 0.
+	 */
+	pathnode->parallel_workers = targetlocus.parallel_workers;
+
+	AssertImply(pathnode->parallel_workers > 1 &&
 				!CdbPathLocus_IsEntry(targetlocus) &&
 				!CdbPathLocus_IsOuterQuery(targetlocus) &&
 				!CdbPathLocus_IsGeneral(targetlocus) &&
 				!CdbPathLocus_IsSingleQE(targetlocus), targetlocus.parallel_workers > 1);
-	pathnode->parallel_workers = targetlocus.parallel_workers;
 
 	*subpaths_out = new_subpaths;
 
@@ -3611,19 +3616,13 @@ make_cdbpathlocus_for_foreign_relations(struct PlannerInfo   *root,
                           struct RelOptInfo    *rel,
 						  ForeignPath *pathnode)
 {
-	ForeignServer *server = NULL;
-	
 	switch (rel->exec_location)
 	{
 		case FTEXECLOCATION_ANY:
 			CdbPathLocus_MakeGeneral(&(pathnode->path.locus));
 			break;
 		case FTEXECLOCATION_ALL_SEGMENTS:
-			server = GetForeignServer(rel->serverid);
-			if (server)
-				CdbPathLocus_MakeStrewn(&(pathnode->path.locus), server->num_segments, 0);
-			else
-				CdbPathLocus_MakeStrewn(&(pathnode->path.locus), getgpsegmentCount(), 0);
+			CdbPathLocus_MakeStrewn(&(pathnode->path.locus), rel->num_segments, 0);
 			break;
 		case FTEXECLOCATION_COORDINATOR:
 			CdbPathLocus_MakeEntry(&(pathnode->path.locus));
diff --git a/src/backend/optimizer/util/walkers.c b/src/backend/optimizer/util/walkers.c
index 93834cb32f7..3b3d0311d06 100644
--- a/src/backend/optimizer/util/walkers.c
+++ b/src/backend/optimizer/util/walkers.c
@@ -403,6 +403,14 @@ plan_tree_walker(Node *node,
 			if (walker(((WindowAgg *) node)->endOffset, context))
 				return true;
 			break;
+		case T_WindowHashAgg:
+			if (walk_plan_node_fields((Plan *) node, walker, context))
+				return true;
+			if (walker(((WindowHashAgg *) node)->startOffset, context))
+				return true;
+			if (walker(((WindowHashAgg *) node)->endOffset, context))
+				return true;
+			break;
 
 		case T_Unique:
 			if (walk_plan_node_fields((Plan *) node, walker, context))
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 8dd38d75e84..d8091c6c4f4 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -340,6 +340,33 @@ transformOptionalSelectInto(ParseState *pstate, Node *parseTree)
 			stmt->intoClause = NULL;
 
 			parseTree = (Node *) ctas;
+
+			if (stmt->withClause)
+			{
+				ListCell   *lc;
+				foreach(lc, stmt->withClause->ctes)
+				{
+					CommonTableExpr *cte = (CommonTableExpr *) lfirst(lc);
+					if (!IsA(cte->ctequery, SelectStmt))
+					{
+						/* must be a data-modifying statement */
+						Assert(IsA(cte->ctequery, InsertStmt) ||
+							   IsA(cte->ctequery, UpdateStmt) ||
+							   IsA(cte->ctequery, DeleteStmt));
+
+						/*
+						 * Since Cloudberry currently only support a single writer gang, only one
+						 * writable clause is permitted per CTE. Once we get flexible gangs
+						 * with more than one writer gang we can lift this restriction.
+						 */
+						ereport(ERROR,
+								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								 errmsg("writable CTE queries cannot be used with writable queries"),
+								 errdetail("Apache Cloudberry currently only support CTEs with one writable clause, called in a non-writable context."),
+								 errhint("Rewrite the query to only include one writable clause.")));
+					}
+				}
+			}
 		}
 	}
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index db7661ea206..b982ba3a29a 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -500,7 +500,7 @@ static void check_expressions_in_partition_key(PartitionSpec *spec, core_yyscan_
 
 %type <range>	OptTempTableName
 %type <into>	into_clause create_as_target create_mv_target
-%type <boolean>	incremental
+%type <boolean>	opt_incremental
 
 %type <defelt>	createfunc_opt_item common_func_opt_item dostmt_opt_item
 %type <fun_param> func_arg func_arg_with_default table_func_column aggr_arg
@@ -7216,7 +7216,7 @@ ext_opt_encoding_item:
  *****************************************************************************/
 
 CreateMatViewStmt:
-		CREATE OptNoLog incremental MATERIALIZED VIEW create_mv_target AS SelectStmt opt_with_data OptDistributedBy
+		CREATE OptNoLog opt_incremental MATERIALIZED VIEW create_mv_target AS SelectStmt opt_with_data OptDistributedBy
 				{
 					CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
 					ctas->query = $8;
@@ -7231,7 +7231,7 @@ CreateMatViewStmt:
 					ctas->into->distributedBy = $10;
 					$$ = (Node *) ctas;
 				}
-		| CREATE OptNoLog incremental MATERIALIZED VIEW IF_P NOT EXISTS create_mv_target AS SelectStmt opt_with_data OptDistributedBy
+		| CREATE OptNoLog opt_incremental MATERIALIZED VIEW IF_P NOT EXISTS create_mv_target AS SelectStmt opt_with_data OptDistributedBy
 				{
 					CreateTableAsStmt *ctas = makeNode(CreateTableAsStmt);
 					ctas->query = $11;
@@ -7336,7 +7336,7 @@ create_mv_target:
 				}
 		;
 
-incremental:	INCREMENTAL					{ $$ = true; }
+opt_incremental:	INCREMENTAL					{ $$ = true; }
 			| /*EMPTY*/						{ $$ = false; }
 		;
 
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 21709b72ba3..58a4bd68a91 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -115,18 +115,6 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 	int			save_next_resno;
 	ListCell   *lc;
 
-	/*
-	 * Before separating the args into direct and aggregated args, make a list
-	 * of their data type OIDs for use later.
-	 */
-	foreach(lc, args)
-	{
-		Expr	   *arg = (Expr *) lfirst(lc);
-
-		argtypes = lappend_oid(argtypes, exprType((Node *) arg));
-	}
-	agg->aggargtypes = argtypes;
-
 	if (AGGKIND_IS_ORDERED_SET(agg->aggkind))
 	{
 		/*
@@ -238,6 +226,29 @@ transformAggregateCall(ParseState *pstate, Aggref *agg,
 	agg->aggorder = torder;
 	agg->aggdistinct = tdistinct;
 
+	/*
+	 * Now build the aggargtypes list with the type OIDs of the direct and
+	 * aggregated args, ignoring any resjunk entries that might have been
+	 * added by ORDER BY/DISTINCT processing.  We can't do this earlier
+	 * because said processing can modify some args' data types, in particular
+	 * by resolving previously-unresolved "unknown" literals.
+	 */
+	foreach(lc, agg->aggdirectargs)
+	{
+		Expr	   *arg = (Expr *) lfirst(lc);
+
+		argtypes = lappend_oid(argtypes, exprType((Node *) arg));
+	}
+	foreach(lc, tlist)
+	{
+		TargetEntry *tle = (TargetEntry *) lfirst(lc);
+
+		if (tle->resjunk)
+			continue;			/* ignore junk */
+		argtypes = lappend_oid(argtypes, exprType((Node *) tle->expr));
+	}
+	agg->aggargtypes = argtypes;
+
 	check_agglevels_and_constraints(pstate, (Node *) agg);
 }
 
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index bbda4328d4c..44acfd9c81b 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -2260,7 +2260,7 @@ LookupFuncName(List *funcname, int nargs, const Oid *argtypes, bool missing_ok)
 Oid
 LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func, bool missing_ok)
 {
-	Oid			argoids[FUNC_MAX_ARGS];
+	Oid			argoids[FUNC_MAX_ARGS] = {InvalidOid,};
 	int			argcount;
 	int			nargs;
 	int			i;
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 49063b5f7fd..223c6fcb48b 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -3137,13 +3137,6 @@ getPolicyForDistributedBy(DistributedBy *distributedBy, TupleDesc tupdesc)
 					if (strcmp(colname, NameStr(attr->attname)) == 0)
 					{
 						Oid			opclass;
-						Oid			typid;
-
-						typid = getBaseType(attr->atttypid);
-						if (type_is_enum(typid))
-							ereport(ERROR,
-									(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-									 errmsg("cannot use ENUM column \"%s\" in DISTRIBUTED BY statement", colname)));
 
 						opclass = cdb_get_opclass_for_column_def(dkelem->opclass, attr->atttypid);
 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 5c11b8125f9..92e830164e8 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -1541,9 +1541,6 @@ PostmasterMain(int argc, char *argv[])
 	}
 #endif
 
-	InitializeKmgr();
-	InitializeBufferEncryption();
-
 	if (terminal_fd != -1)
 		close(terminal_fd);
 
@@ -3202,6 +3199,14 @@ reset_shared(void)
 	 * clean up dead IPC objects if the postmaster crashes and is restarted.
 	 */
 	CreateSharedMemoryAndSemaphores();
+
+	/*
+	 * When backend process crashes, postmaster restart database,
+	 * we need to init kmgr share memory.
+	 */
+	InitializeKmgr();
+	InitializeBufferEncryption();
+
 }
 
 
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index 1a835983222..68524222d71 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -371,6 +371,9 @@ standby_decode(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 			 * XLOG_XACT_INVALIDATIONS.  So we don't need to do anything here.
 			 */
 			break;
+		case XLOG_LATESTCOMPLETED_GXID:
+			/* FIXME: need to decode this part? */
+			break;
 		default:
 			elog(ERROR, "unexpected RM_STANDBY_ID record type: %u", info);
 	}
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 73a53822b3d..e2953686b8e 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -1712,6 +1712,7 @@ OpenTemporaryFile(bool interXact, const char *filePrefix)
 	if (!interXact)
 		RegisterTemporaryFile(file);
 
+	SIMPLE_FAULT_INJECTOR("after_open_temp_file");
 	return file;
 }
 
diff --git a/src/backend/storage/file/ufile.c b/src/backend/storage/file/ufile.c
index 0c1ba28b995..0938a1bd83c 100644
--- a/src/backend/storage/file/ufile.c
+++ b/src/backend/storage/file/ufile.c
@@ -59,7 +59,7 @@ static int localFileRead(UFile *file, char *buffer, int amount);
 static int localFileWrite(UFile *file, char *buffer, int amount);
 static off_t localFileSize(UFile *file);
 static void localFileUnlink(Oid spcId, const char *fileName);
-static char *localFormatPathName(RelFileNode *relFileNode);
+static char *localFormatPathName(Oid relid, RelFileNode *relFileNode);
 static bool localEnsurePath(Oid spcId, const char *PathName);
 static bool localFileExists(Oid spcId, const char *fileName);
 static const char *localFileName(UFile *file);
@@ -307,15 +307,15 @@ localFileUnlink(Oid spcId, const char *fileName)
 }
 
 static char *
-localFormatPathName(RelFileNode *relFileNode)
+localFormatPathName(Oid relid, RelFileNode *relFileNode)
 {
 	if (relFileNode->spcNode == DEFAULTTABLESPACE_OID)
 		return psprintf("base/%u/%u_dirtable",
-				  		relFileNode->dbNode, relFileNode->relNode);
+				  		relFileNode->dbNode, relid);
 	else
 		return psprintf("pg_tblspc/%u/%s/%u/%u_dirtable",
 						relFileNode->spcNode, GP_TABLESPACE_VERSION_DIRECTORY,
-						relFileNode->dbNode, relFileNode->relNode);
+						relFileNode->dbNode, relid);
 }
 
 bool
@@ -440,13 +440,13 @@ UFileUnlink(Oid spcId, const char *fileName)
 }
 
 char *
-UFileFormatPathName(RelFileNode *relFileNode)
+UFileFormatPathName(Oid relid, RelFileNode *relFileNode)
 {
 	FileAm *fileAm;
 
 	fileAm = GetTablespaceFileHandler(relFileNode->spcNode);
 
-	return fileAm->formatPathName(relFileNode);
+	return fileAm->formatPathName(relid, relFileNode);
 }
 
 bool
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index 3154caba1bd..57c03cce7d9 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -2530,8 +2530,10 @@ getDtxCheckPointInfo(char **result, int *result_size)
 	gxid_array = &gxact_checkpoint->committedGxidArray[0];
 
 	actual = 0;
+	LWLockAcquire(CommittedGxidArrayLock, LW_SHARED);
 	for (; actual < *shmNumCommittedGxacts; actual++)
 		gxid_array[actual] = shmCommittedGxidArray[actual];
+	LWLockRelease(CommittedGxidArrayLock);
 
 	SIMPLE_FAULT_INJECTOR("checkpoint_dtx_info");
 
@@ -2609,7 +2611,8 @@ CreateDistributedSnapshot(DistributedSnapshot *ds)
 	ProcArrayStruct *arrayP = procArray;
 
 	Assert(LWLockHeldByMe(ProcArrayLock));
-	if (*shmNumCommittedGxacts != 0)
+	/* Hot standby accepts query while constantly replaying dtx, so this ERROR doesn't apply. */
+	if (!IS_HOT_STANDBY_QD() && *shmNumCommittedGxacts != 0)
 		elog(ERROR, "Create distributed snapshot before DTM recovery finish");
 
 	xmin = xmax = ShmemVariableCache->latestCompletedGxid + 1;
@@ -2623,9 +2626,45 @@ CreateDistributedSnapshot(DistributedSnapshot *ds)
 
 	Assert(ds->inProgressXidArray != NULL);
 
+	/*
+	 * For a hot standby QD, check shmCommittedGxidArray to build the knowledge.
+	 * Need to acquire shared lock to access the committed gxid array as the
+	 * startup process might modify it.
+	 */
+	if (IS_HOT_STANDBY_QD())
+	{
+		LWLockAcquire(CommittedGxidArrayLock, LW_SHARED);
+		for (i = 0; i < *shmNumCommittedGxacts; i++)
+		{
+			DistributedTransactionId gxid;
+
+			gxid = shmCommittedGxidArray[i];
+
+			if (gxid == InvalidDistributedTransactionId || gxid >= xmax)
+				continue;
+
+			if (gxid < xmin)
+				xmin = gxid;
+
+			ds->inProgressXidArray[count++] = gxid;
+		}
+		LWLockRelease(CommittedGxidArrayLock);
+	}
+
 	/*
 	 * Gather up current in-progress global transactions for the distributed
 	 * snapshot.
+	 *
+	 * Note: The inProgressXidArray built below may contain transactions that
+	 * have been prepared on some/all segments, and for which the QD hasn't
+	 * begun the COMMIT phase (by writing a XLOG_XACT_DISTRIBUTED_COMMIT record).
+	 * The gxids of these transactions don't necessarily have to be placed into
+	 * inProgressXidArray, for correctness. This is because for visibility
+	 * checks on the QEs, a state of DISTRIBUTEDSNAPSHOT_COMMITTED_UNKNOWN will
+	 * be encountered for such txs, prompting a local check. The local check will
+	 * always find these txs in progress (due to the dummy PGXACTs being
+	 * recorded for prepared txs). So, hypothetically we could exclude these txs
+	 * here, but we don't currently track them on the QD, so we can't.
 	 */
 	for (i = 0; i < arrayP->numProcs; i++)
 	{
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 687ce03767d..13dc551ca54 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -21,6 +21,7 @@
 #include "access/xact.h"
 #include "access/xlog.h"
 #include "access/xloginsert.h"
+#include "cdb/cdbvars.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/bufmgr.h"
@@ -29,6 +30,7 @@
 #include "storage/procarray.h"
 #include "storage/sinvaladt.h"
 #include "storage/standby.h"
+#include "utils/faultinjector.h"
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
@@ -848,6 +850,8 @@ SendRecoveryConflictWithBufferPin(ProcSignalReason reason)
 	 * SIGUSR1 handling in each backend decide their own fate.
 	 */
 	CancelDBBackends(InvalidOid, reason, false);
+
+	SIMPLE_FAULT_INJECTOR("recovery_conflict_bufferpin_signal_sent");
 }
 
 /*
@@ -1148,6 +1152,23 @@ standby_redo(XLogReaderState *record)
 											 xlrec->dbId,
 											 xlrec->tsId);
 	}
+	else if (info == XLOG_LATESTCOMPLETED_GXID)
+	{
+		/*
+		 * This record is only logged by coordinator. But the segment in
+		 * some situation might see it too (e.g. gpexpand), but segment
+		 * doesn't need to update latestCompletedGxid.
+		 */
+		if (IS_QUERY_DISPATCHER())
+		{
+			DistributedTransactionId gxid;
+
+			gxid = *((DistributedTransactionId *) XLogRecGetData(record));
+			LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
+			ShmemVariableCache->latestCompletedGxid = gxid;
+			LWLockRelease(ProcArrayLock);
+		}
+	}
 	else
 		elog(PANIC, "standby_redo: unknown op code %u", info);
 }
@@ -1265,6 +1286,21 @@ LogStandbySnapshot(void)
 
 	/* GetRunningTransactionData() acquired XidGenLock, we must release it */
 	LWLockRelease(XidGenLock);
+	if (IS_QUERY_DISPATCHER())
+	{
+		/*
+		 * GPDB: write latestCompletedGxid too, because the standby needs this 
+		 * value for creating distributed snapshot. The standby cannot rely on
+		 * the nextGxid value to set latestCompletedGxid during restart (which 
+		 * the primary does) because nextGxid was bumped in the checkpoint.
+		 */
+		LWLockAcquire(ProcArrayLock, LW_SHARED);
+		DistributedTransactionId lcgxid = ShmemVariableCache->latestCompletedGxid;
+		LWLockRelease(ProcArrayLock);
+		XLogBeginInsert();
+		XLogRegisterData((char *) (&lcgxid), sizeof(lcgxid));
+		recptr = XLogInsert(RM_STANDBY_ID, XLOG_LATESTCOMPLETED_GXID);
+	}
 
 	return recptr;
 }
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 90ea0a666e0..faf69b1581f 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -330,6 +330,8 @@ static LOCALLOCK *StrongLockInProgress;
 LOCALLOCK *awaitedLock;
 ResourceOwner awaitedOwner;
 
+/* find writer proc entry retry time */
+int	find_writer_proc_retry_time = 5;
 
 #ifdef LOCK_DEBUG
 
@@ -937,11 +939,26 @@ LockAcquireExtended(const LOCKTAG *locktag,
 			{
 				/* Find the guy who should manage our locks */
 				volatile PGPROC * proc = FindProcByGpSessionId(gp_session_id);
-				int count = 0;
-				while(proc==NULL && count < 5)
+				TimestampTz current_time;
+				TimestampTz start_time;
+				long        elapsed_secs;
+				int         elapsed_usecs;
+				start_time = GetCurrentTimestamp();
+
+				while (proc == NULL)
 				{
+					/*
+					 * The creation timeout retry logic of cdbgang_createGang_async
+					 * should be synchronized with the reader to avoid slow creation
+					 * due to platform, container, network and other reasons, 
+					 * which would cause the reader to prematurely consider it an abnormal termination.
+					 */
+					current_time = GetCurrentTimestamp();
+					TimestampDifference(start_time, current_time, &elapsed_secs, &elapsed_usecs);
+					if (elapsed_secs >= gp_segment_connect_timeout / 2)
+						break;
+
 					pg_usleep( /* microseconds */ 2000);
-					count++;
 					CHECK_FOR_INTERRUPTS();
 					/*
 					 * The reason for using pg_memory_barrier() is to ensure that
@@ -952,12 +969,13 @@ LockAcquireExtended(const LOCKTAG *locktag,
 				}
 				if (proc != NULL)
 				{
-					elog(DEBUG1,"Found writer proc entry.  My Pid %d, his pid %d", MyProc-> pid, proc->pid);
+					elog(DEBUG1, "Found writer proc entry.  My Pid %d, his pid %d", MyProc-> pid, proc->pid);
 					lockHolderProcPtr = (PGPROC*) proc;
 				}
 				else
 					ereport(FATAL,
 							(errcode(ERRCODE_GP_INTERCONNECTION_ERROR),
+							 errprintstack(true),
 							 errmsg(WRITER_IS_MISSING_MSG),
 							 errdetail("lock [%u,%u] %s %d. "
 									   "Probably because writer gang is gone somehow. "
diff --git a/src/backend/storage/lmgr/lwlocknames.txt b/src/backend/storage/lmgr/lwlocknames.txt
index c8f283198ce..c3583b146d7 100644
--- a/src/backend/storage/lmgr/lwlocknames.txt
+++ b/src/backend/storage/lmgr/lwlocknames.txt
@@ -75,3 +75,4 @@ LoginFailedControlLock				65
 LoginFailedSharedMemoryLock			66
 GPIVMResLock						67
 DirectoryTableLock                  68
+CommittedGxidArrayLock				69
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index a174e981b1f..37d917a1f3e 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -354,17 +354,9 @@ InitProcess(void)
 	 * WAL sender, etc are marked as GP_ROLE_UTILITY to prevent unwanted
 	 * GP_ROLE_DISPATCH MyProc settings such as mppSessionId being valid and
 	 * mppIsWriter set to true.
-	 *
-	 * RecoveryInProgress() to see if we are in hot standby, because
-	 * HotStandbyActive() is still true after promotion.
 	 */
-	if (am_walsender || am_ftshandler || am_faulthandler ||
-		(GpIdentity.segindex == -1 && RecoveryInProgress()))
-	{
+	if (am_walsender || am_ftshandler || am_faulthandler)
 		Gp_role = GP_ROLE_UTILITY;
-		if (GpIdentity.segindex == -1 && RecoveryInProgress())
-			elog(WARNING, "Force to run in utility mode in hot standby");
-	}
 
 	/*
 	 * ProcGlobal should be set up already (if we are a backend, we inherit
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index a64c7384853..96e531e0798 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -127,6 +127,7 @@ static File	AORelOpenSegFileXlog(RelFileNode node, int32 segmentFileNum, int fil
 static const f_smgr_ao smgrswao[] = {
 	/* regular file */
 	{
+		.smgr_create_ao = mdcreate_ao,
 		.smgr_FileClose = FileClose,
 		.smgr_FileDiskSize = FileDiskSize,
 		.smgr_FileTruncate = FileTruncate,
@@ -492,9 +493,16 @@ smgrcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo)
  *		already because we are in a WAL replay sequence.
  */
 void
-smgrcreate_ao(RelFileNodeBackend rnode, int32 segmentFileNum, bool isRedo)
+smgrcreate_ao(const struct f_smgr_ao *smgr,
+				RelFileNodeBackend rnode,
+				int32 segmentFileNum, bool isRedo)
 {
-	mdcreate_ao(rnode, segmentFileNum, isRedo);
+	/* If we get there, check that provided smgr structure is sane.
+	 * First off all, outer Appendonly IO utilities should
+	 * pass valid smgr. Also, in-kernel smgr interface implementation
+	 * smgr_create_ao as mdcreate_ao, and extension should define its own. */
+	Assert(smgr != NULL && smgr->smgr_create_ao != NULL);
+	smgr->smgr_create_ao(rnode, segmentFileNum, isRedo);
 	if (file_create_hook)
 		(*file_create_hook)(rnode);
 }
diff --git a/src/backend/task/pg_cron.c b/src/backend/task/pg_cron.c
index ac5cfbe82bc..0c1fdb9156d 100644
--- a/src/backend/task/pg_cron.c
+++ b/src/backend/task/pg_cron.c
@@ -1784,7 +1784,7 @@ CronBackgroundWorker(Datum main_arg)
 												 ALLOCSET_DEFAULT_MAXSIZE);
 
 	/* Set up a dynamic shared memory segment. */
-	seg = dsm_attach(DatumGetInt32(main_arg));
+	seg = dsm_attach(DatumGetUInt32(main_arg));
 	if (seg == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index f29c9c2e606..62ded58aafb 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -1529,6 +1529,8 @@ exec_mpp_dtx_protocol_command(DtxProtocolCommand dtxProtocolCommand,
 	qc.commandTag = GetCommandTagEnum(loggingStr);
 	qc.nprocessed = 1;
 
+	SIMPLE_FAULT_INJECTOR("exec_dtx_protocol_start");
+
 	if (log_statement == LOGSTMT_ALL)
 		elog(LOG,"DTM protocol command '%s' for gid = %s", loggingStr, gid);
 
@@ -5714,6 +5716,7 @@ PostgresMain(int argc, char *argv[],
 					const char *serializedQueryDispatchDesc = NULL;
 					const char *resgroupInfoBuf = NULL;
 
+					int is_hs_dispatch;
 					int query_string_len = 0;
 					int serializedDtxContextInfolen = 0;
 					int serializedPlantreelen = 0;
@@ -5750,6 +5753,20 @@ PostgresMain(int argc, char *argv[],
 					cuid = pq_getmsgint(&input_message, 4);
 
 					statementStart = pq_getmsgint64(&input_message);
+
+					/* check if the message is from standby QD and is expected */
+					is_hs_dispatch = pq_getmsgint(&input_message, 4);
+					if (is_hs_dispatch == 0 && IS_HOT_STANDBY_QE())
+						ereport(ERROR,
+								(errcode(ERRCODE_PROTOCOL_VIOLATION),
+								 errmsg("mirror segments can only process MPP protocol messages from standby QD"),
+								 errhint("Exit the current session and re-connect.")));
+					else if (is_hs_dispatch != 0 && !IS_HOT_STANDBY_QE())
+						ereport(ERROR,
+								(errcode(ERRCODE_PROTOCOL_VIOLATION),
+								 errmsg("primary segments can only process MPP protocol messages from primary QD"),
+								 errhint("Exit the current session and re-connect.")));
+
 					query_string_len = pq_getmsgint(&input_message, 4);
 					serializedPlantreelen = pq_getmsgint(&input_message, 4);
 					serializedQueryDispatchDesclen = pq_getmsgint(&input_message, 4);
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 728d12c604a..532690f1d51 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -617,6 +617,8 @@ PortalStart(Portal portal, ParamListInfo params,
 						needDistributedSnapshot = false;
 				}
 				
+				SIMPLE_FAULT_INJECTOR("select_before_qd_create_snapshot");
+
 				/* Must set snapshot before starting executor. */
 				if (snapshot)
 					PushActiveSnapshot(snapshot);
@@ -626,6 +628,8 @@ PortalStart(Portal portal, ParamListInfo params,
 				/* reset value */
 				needDistributedSnapshot = true;
 
+				SIMPLE_FAULT_INJECTOR("select_after_qd_create_snapshot");
+
 				/*
 				 * We could remember the snapshot in portal->portalSnapshot,
 				 * but presently there seems no need to, as this code path
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
index e41dc619b89..d163a7f38ea 100644
--- a/src/backend/utils/adt/dbsize.c
+++ b/src/backend/utils/adt/dbsize.c
@@ -153,6 +153,15 @@ db_dir_size(const char *path)
 			continue;
 
 		snprintf(filename, sizeof(filename), "%s/%s", path, direntry->d_name);
+		if (direntry->d_type == DT_DIR)
+		{
+			/**
+			 * Recurse into subdirectory. PAX stores data file in a separate
+			 * directory, so we need to account for that.
+			 */
+			dirsize += db_dir_size(filename);
+			continue;
+		}
 
 		if (stat(filename, &fst) < 0)
 		{
diff --git a/src/backend/utils/adt/pg_upgrade_support.c b/src/backend/utils/adt/pg_upgrade_support.c
index 38347caa516..5d99e1346f3 100644
--- a/src/backend/utils/adt/pg_upgrade_support.c
+++ b/src/backend/utils/adt/pg_upgrade_support.c
@@ -20,6 +20,7 @@
 #include "catalog/pg_class.h"
 #include "catalog/pg_enum.h"
 #include "catalog/pg_namespace.h"
+#include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
 #include "cdb/cdbvars.h"
 #include "commands/extension.h"
@@ -38,6 +39,19 @@ do {															\
 				 errmsg("function can only be called when server is in binary upgrade mode"))); \
 } while (0)
 
+Datum
+binary_upgrade_set_next_pg_tablespace_oid(PG_FUNCTION_ARGS)
+{
+	Oid			tablespaceoid = PG_GETARG_OID(0);
+	char	   *tablespacename = GET_STR(PG_GETARG_TEXT_P(1));
+
+	CHECK_IS_BINARY_UPGRADE;
+	AddPreassignedOidFromBinaryUpgrade(tablespaceoid, TableSpaceRelationId, tablespacename,
+						InvalidOid, InvalidOid, InvalidOid);
+
+	PG_RETURN_VOID();
+}
+
 Datum
 binary_upgrade_set_next_pg_type_oid(PG_FUNCTION_ARGS)
 {
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index cbfc3d184d2..cdbd27d4d95 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -53,6 +53,7 @@
 #include "nodes/pathnodes.h"
 #include "optimizer/optimizer.h"
 #include "parser/parse_agg.h"
+#include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_node.h"
 #include "parser/parse_oper.h"
@@ -9696,6 +9697,159 @@ get_rule_expr(Node *node, deparse_context *context,
 			}
 			break;
 
+		case T_GpPartitionDefinition:
+			{
+				GpPartitionDefinition *def = (GpPartitionDefinition*)node;
+				ListCell *lc;
+				char *sep = "";
+				ParseState *pstate = make_parsestate(NULL);
+
+				if (def->isTemplate)
+					appendStringInfo(buf, "SUBPARTITION TEMPLATE(");
+
+				foreach(lc, def->partDefElems)
+				{
+					if (IsA(lfirst(lc), GpPartDefElem))
+					{
+						GpPartDefElem *elem = lfirst_node(GpPartDefElem, lc);
+
+						if (elem->colencs)
+							elog(ERROR, "Partition specific ENCODING clause not supported yet");
+
+						appendStringInfoString(buf, sep);
+						sep = ", ";
+						if (elem->partName)
+						{
+							if (elem->isDefault)
+								appendStringInfo(buf, "DEFAULT SUBPARTITION %s", elem->partName);
+							else
+								appendStringInfo(buf, "SUBPARTITION %s", elem->partName);
+						}
+
+						if (elem->boundSpec)
+						{
+							switch (nodeTag(elem->boundSpec))
+							{
+								case T_GpPartitionRangeSpec:
+								{
+									GpPartitionRangeSpec *rspec =
+															(GpPartitionRangeSpec *) elem->boundSpec;
+									if (rspec->partStart)
+									{
+										Node *val = transformExpr(pstate,
+												(Node *)linitial(rspec->partStart->val), EXPR_KIND_VALUES);
+										Assert(rspec->partStart->edge ==
+												PART_EDGE_INCLUSIVE);
+										appendStringInfo(buf, " START (");
+										get_rule_expr(val, context, true);
+										appendStringInfo(buf, ")");
+									}
+									if (rspec->partEnd)
+									{
+										Node *val = transformExpr(pstate,
+												(Node *)linitial(rspec->partEnd->val), EXPR_KIND_VALUES);
+										Assert(rspec->partEnd->edge ==
+												PART_EDGE_EXCLUSIVE);
+										appendStringInfo(buf, " END (");
+										get_rule_expr(val, context, true);
+										appendStringInfo(buf, ")");
+									}
+									if (rspec->partEvery)
+									{
+										Node *val = transformExpr(pstate,
+												(Node *)linitial(rspec->partEvery), EXPR_KIND_VALUES);
+
+										appendStringInfo(buf, " Every (");
+										get_rule_expr(val, context, true);
+										appendStringInfo(buf, ")");
+									}
+								}
+									break;
+								case T_GpPartitionListSpec:
+								{
+									GpPartitionListSpec *lspec = (GpPartitionListSpec *) elem->boundSpec;
+									ListCell *cell;
+
+									appendStringInfoString(buf, " VALUES (");
+									sep = "";
+									foreach(cell, lspec->partValues)
+									{
+										Node *val = transformExpr(pstate, (Node *)linitial(lfirst(cell)), EXPR_KIND_VALUES);
+
+										Assert(list_length(lfirst(cell)) == 1);
+										appendStringInfoString(buf, sep);
+										get_rule_expr(val, context, -1);
+										sep = ", ";
+									}
+									appendStringInfoChar(buf, ')');
+								}
+									break;
+								default:
+									elog(ERROR, "unrecognized node type: %d", (int) nodeTag(node));
+							}
+						}
+						if (elem->options)
+						{
+							ListCell *cell;
+
+							appendStringInfoString(buf, sep);
+							appendStringInfoString(buf, " WITH (");
+							if (elem->accessMethod)
+							{
+								if (pg_strcasecmp(elem->accessMethod, "ao_row") != 0)
+								{
+									appendStringInfoString(buf, "appendonly=true, orientation=row");
+									sep = ", ";
+								}
+								else if (pg_strcasecmp(elem->accessMethod, "ao_column") != 0)
+								{
+									appendStringInfoString(buf, "appendonly=true, orientation=column");
+									sep = ", ";
+								}
+							}
+							foreach (cell, elem->options)
+							{
+								DefElem *el = lfirst_node(DefElem, cell);
+								char *arg;
+
+								appendStringInfoString(buf, sep);
+								appendStringInfo(buf, "%s=", el->defname);
+								appendStringInfo(buf, "%s", arg = defGetString(el));
+								sep = ", ";
+							}
+							appendStringInfoChar(buf, ')');
+						}
+					}
+					else if (IsA(lfirst(lc), ColumnReferenceStorageDirective))
+					{
+						ListCell *cell;
+						ColumnReferenceStorageDirective *crsd = lfirst_node(ColumnReferenceStorageDirective, lc);
+
+						appendStringInfoString(buf, sep);
+						if (crsd->deflt)
+							appendStringInfo(buf, "DEFAULT COLUMN ENCODING (");
+						else
+							appendStringInfo(buf, "COLUMN %s ENCODING (", crsd->column);
+
+						sep = "";
+						foreach(cell, crsd->encoding)
+						{
+							DefElem *el = lfirst_node(DefElem, cell);
+							char *arg;
+
+							appendStringInfoString(buf, sep);
+							appendStringInfo(buf, "%s=", el->defname);
+							appendStringInfo(buf, "%s", arg = defGetString(el));
+							sep = ", ";
+						}
+						appendStringInfo(buf, ")");
+					}
+				}
+				if (def->isTemplate)
+					appendStringInfo(buf, ")");
+			}
+			break;
+
 		default:
 			elog(ERROR, "unrecognized node type: %d", (int) nodeTag(node));
 			break;
diff --git a/src/backend/utils/datumstream/datumstream.c b/src/backend/utils/datumstream/datumstream.c
index 42f374d1498..53addc99a95 100644
--- a/src/backend/utils/datumstream/datumstream.c
+++ b/src/backend/utils/datumstream/datumstream.c
@@ -876,6 +876,7 @@ datumstreamread_close_file(DatumStreamRead * ds)
 {
 	AppendOnlyStorageRead_CloseFile(&ds->ao_read);
 
+	ds->blockRowCount = 0;
 	ds->need_close_file = false;
 }
 
@@ -1129,7 +1130,7 @@ datumstreamwrite_lob(DatumStreamWrite * acc,
 	return varLen;
 }
 
-static bool
+bool
 datumstreamread_block_info(DatumStreamRead * acc)
 {
 	bool		readOK = false;
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index b187da7e849..aad67dbb2f5 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -145,7 +145,7 @@ int			max_statement_mem = 2048000;
  * do not enforce per-query memory limit
  */
 int			gp_vmem_limit_per_query = 0;
-double		hash_mem_multiplier = 1.0;
+double		hash_mem_multiplier = 1.5;
 int			maintenance_work_mem = 65536;
 int			max_parallel_maintenance_workers = 2;
 
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index e84c0efb77e..34bdf7364d4 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -1267,8 +1267,14 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
      * Primary function is to establish connections to the qExecs.
      * This is SKIPPED when the database is in bootstrap mode or 
      * Is not UnderPostmaster.
+     *
+     * Also skip for auxiliary background workers (e.g., ftsprobe, global
+     * deadlock detector, dtx recovery, sweeper, pg_cron launcher). These
+     * processes don't require interconnect for data exchange and opening
+     * unnecessary network sockets may be considered a security issue.
      */
-    if (!bootstrap && IsUnderPostmaster && !IsLoginMonitorWorkerProcess())
+    if (!bootstrap && IsUnderPostmaster && !IsLoginMonitorWorkerProcess() &&
+        !amAuxiliaryBgWorker())
     {
 		cdb_setup();
 		on_proc_exit( cdb_cleanup, 0 );
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 626eeb7aa70..154d6e39737 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -582,6 +582,7 @@ bool		Debug_print_parse = false;
 bool		Debug_print_rewritten = false;
 bool		Debug_pretty_print = true;
 bool 		Debug_print_ivm = false;
+bool 		Debug_print_aggref_in_explain = false;
 
 bool		log_parser_stats = false;
 bool		log_planner_stats = false;
@@ -1545,6 +1546,15 @@ static struct config_bool ConfigureNamesBool[] =
 		false,
 		NULL, NULL, NULL
 	},
+	{
+		{"debug_print_aggref_in_explain", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Logs the aggnos/aggtransno in explain."),
+			NULL
+		},
+		&Debug_print_aggref_in_explain,
+		false,
+		NULL, NULL, NULL
+	},
 	{
 		{"log_parser_stats", PGC_SUSET, STATS_MONITORING,
 			gettext_noop("Writes parser performance statistics to the server log."),
@@ -2280,7 +2290,7 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_EXPLAIN
 		},
 		&join_collapse_limit,
-		20, 1, INT_MAX,
+		13, 1, INT_MAX,
 		NULL, NULL, NULL
 	},
 	{
@@ -2642,6 +2652,16 @@ static struct config_int ConfigureNamesInt[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"find_writer_proc_retry_time", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Sets the retry time of find writer proc entry."),
+			NULL
+		},
+		&find_writer_proc_retry_time,
+		5, 1, 5000,
+		NULL, NULL, NULL
+	},
+
 #ifdef LOCK_DEBUG
 	{
 		{"trace_lock_oidmin", PGC_SUSET, DEVELOPER_OPTIONS,
@@ -3818,7 +3838,7 @@ static struct config_real ConfigureNamesReal[] =
 			GUC_EXPLAIN
 		},
 		&hash_mem_multiplier,
-		1.0, 1.0, 1000.0,
+		1.5, 1.0, 1000.0,
 		NULL, NULL, NULL
 	},
 
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index e342d762705..42b61dfbbbb 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -86,6 +86,7 @@ static bool check_optimizer(bool *newval, void **extra, GucSource source);
 static bool check_verify_gpfdists_cert(bool *newval, void **extra, GucSource source);
 static bool check_dispatch_log_stats(bool *newval, void **extra, GucSource source);
 static bool check_gp_workfile_compression(bool *newval, void **extra, GucSource source);
+static bool check_hot_dr(bool *newval, void **extra, GucSource source);
 
 /* Helper function for guc setter */
 bool gpvars_check_gp_resqueue_priority_default_value(char **newval,
@@ -151,6 +152,8 @@ bool		enable_parallel = false;
 bool		enable_parallel_semi_join = true;
 bool		enable_parallel_dedup_semi_join = true;
 bool		enable_parallel_dedup_semi_reverse_join = true;
+bool		parallel_query_use_streaming_hashagg = false;
+bool		gp_use_streaming_hashagg = true;
 int			gp_appendonly_insert_files = 0;
 int			gp_appendonly_insert_files_tuples_range = 0;
 int			gp_random_insert_segments = 0;
@@ -237,6 +240,7 @@ double		gp_resource_group_cpu_limit;
 bool		gp_resource_group_bypass;
 bool		gp_resource_group_bypass_catalog_query;
 bool		gp_resource_group_bypass_direct_dispatch;
+char	   *gp_resource_group_cgroup_parent;
 
 /* Metrics collector debug GUC */
 bool		vmem_process_interrupt = false;
@@ -311,6 +315,8 @@ bool		optimizer_print_group_properties;
 bool		optimizer_print_optimization_context;
 bool		optimizer_print_optimization_stats;
 bool		optimizer_print_xform_results;
+bool		optimizer_print_preprocess_result;
+bool		optimizer_debug_cte;
 
 /* array of xforms disable flags */
 bool		optimizer_xforms[OPTIMIZER_XFORMS_COUNT] = {[0 ... OPTIMIZER_XFORMS_COUNT - 1] = false};
@@ -362,6 +368,8 @@ bool		optimizer_enable_replicated_table;
 bool		optimizer_enable_foreign_table;
 bool		optimizer_enable_right_outer_join;
 bool		optimizer_enable_query_parameter;
+bool		optimizer_force_window_hash_agg;
+int			optimizer_agg_pds_strategy;
 
 /* Optimizer plan enumeration related GUCs */
 bool		optimizer_enumerate_plans;
@@ -419,6 +427,7 @@ bool		optimizer_enable_range_predicate_dpe;
 bool		optimizer_enable_use_distribution_in_dqa;
 bool		optimizer_enable_push_join_below_union_all;
 bool		optimizer_enable_orderedagg;
+bool		optimizer_disable_dynamic_table_scan;
 
 /* Analyze related GUCs for Optimizer */
 bool		optimizer_analyze_root_partition;
@@ -552,6 +561,8 @@ static const struct config_enum_entry gp_autostats_modes[] = {
 static const struct config_enum_entry gp_interconnect_fc_methods[] = {
 	{"loss", INTERCONNECT_FC_METHOD_LOSS},
 	{"capacity", INTERCONNECT_FC_METHOD_CAPACITY},
+	{"loss_advance", INTERCONNECT_FC_METHOD_LOSS_ADVANCE},
+	{"loss_timer", INTERCONNECT_FC_METHOD_LOSS_TIMER},
 	{NULL, 0}
 };
 
@@ -1786,8 +1797,7 @@ struct config_bool ConfigureNamesBool_gp[] =
 	{
 		{"gp_cte_sharing", PGC_USERSET, QUERY_TUNING_METHOD,
 			gettext_noop("This guc enables sharing of plan fragments for common table expressions."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+			NULL
 		},
 		&gp_cte_sharing,
 		false,
@@ -1889,6 +1899,16 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false, NULL, NULL
 	},
 
+	{
+		{"gp_use_streaming_hashagg", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Use streaming hash agg in the first phase for multi-phase aggregations."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&gp_use_streaming_hashagg,
+		true, NULL, NULL
+	},
+
 	{
 		{"gp_force_random_redistribution", PGC_USERSET, CUSTOM_OPTIONS,
 			gettext_noop("Force redistribution of insert for randomly-distributed."),
@@ -1968,6 +1988,17 @@ struct config_bool ConfigureNamesBool_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_print_preprocess_result", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Prints the expression tree produced by the optimizer preprocess(every steps). Only worked with debug version of CBDB."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_preprocess_result,
+		false,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"optimizer_print_xform", PGC_USERSET, LOGGING_WHAT,
 			gettext_noop("Prints optimizer transformation information."),
@@ -2011,6 +2042,17 @@ struct config_bool ConfigureNamesBool_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_debug_cte", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print the debug info of CTE in ORCA. Only worked with debug version of CBDB."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_debug_cte,
+		false,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"optimizer_print_memo_after_exploration", PGC_USERSET, LOGGING_WHAT,
 			gettext_noop("Print optimizer memo structure after the exploration phase."),
@@ -3059,15 +3101,16 @@ struct config_bool ConfigureNamesBool_gp[] =
 	},
 
 	{
-		{"gp_pause_on_restore_point_replay", PGC_SIGHUP, DEVELOPER_OPTIONS,
-		 gettext_noop("Pause recovery when a restore point is replayed."),
+		{"optimizer_disable_dynamic_table_scan", PGC_USERSET, DEVELOPER_OPTIONS,
+		 gettext_noop("Disable the dynamic seq/bitmap/index scan in partition table."),
 		 NULL,
-		 GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&gp_pause_on_restore_point_replay,
-		false,
-		NULL, NULL, NULL
+		 GUC_NOT_IN_SAMPLE
+		 },
+		 &optimizer_disable_dynamic_table_scan,
+		 false,
+		 NULL, NULL, NULL
 	},
+
 	{
 		{"gp_autostats_allow_nonowner", PGC_SUSET, DEVELOPER_OPTIONS,
 			gettext_noop("Allow automatic stats collection on tables even for users who are not the owner of the relation."),
@@ -3191,6 +3234,16 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true,
 		NULL, NULL, NULL
 	},
+	{
+		{"parallel_query_use_streaming_hashagg", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("allow to use of streaming hashagg in parallel query for DISTINCT."),
+			NULL,
+			GUC_EXPLAIN
+		},
+		&parallel_query_use_streaming_hashagg,
+		true,
+		NULL, NULL, NULL
+	},
 	{
 		{"gp_internal_is_singlenode", PGC_POSTMASTER, UNGROUPED,
 			 gettext_noop("Is in SingleNode mode (no segments). WARNING: user SHOULD NOT set this by any means."),
@@ -3251,6 +3304,17 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true,
 		NULL, NULL, NULL
 	},
+	{
+		{"optimizer_force_window_hash_agg", PGC_USERSET, DEVELOPER_OPTIONS,
+		 gettext_noop("Enable create window hash agg."),
+		 NULL,
+		 GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_force_window_hash_agg, // TODO: remove it before merge
+		false,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"aqumv_allow_foreign_table", PGC_USERSET, DEVELOPER_OPTIONS,
 			gettext_noop("allow answer query using materialized views which have foreign or external tables."),
@@ -3292,6 +3356,16 @@ struct config_bool ConfigureNamesBool_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"hot_dr", PGC_POSTMASTER, REPLICATION_STANDBY,
+			gettext_noop("DR Cluster as well as allows connteions and queries"),
+			NULL
+		},
+		&EnableHotDR,
+		false,
+		check_hot_dr, NULL, NULL
+	},
+
 	{
 		{"gp_enable_runtime_filter_pushdown", PGC_USERSET, DEVELOPER_OPTIONS,
 			gettext_noop("Try to push the hash table of hash join to the seqscan or AM as bloom filter."),
@@ -3487,7 +3561,7 @@ struct config_int ConfigureNamesInt_gp[] =
 			NULL
 		},
 		&gp_appendonly_insert_files,
-		4, 0, 127,
+		0, 0, 127,
 		NULL, NULL, NULL
 	},
 
@@ -3708,6 +3782,27 @@ struct config_int ConfigureNamesInt_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"gp_interconnect_mem_size", PGC_USERSET, GP_ARRAY_TUNING,
+			gettext_noop("Sets the maximum size(in MB) of the send/recv queue memory for all connections in the UDP interconnect"),
+			NULL
+		},
+		&Gp_interconnect_mem_size,
+		10, 1, 1024,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"gp_interconnect_cursor_ic_table_size", PGC_USERSET, GP_ARRAY_TUNING,
+			gettext_noop("Sets the size of Cursor History Table in the UDP interconnect"),
+			gettext_noop("You can try to increase it when a UDF which contains many concurrent "
+						 "cursor queries hangs. The default value is 128.")
+		},
+		&Gp_interconnect_cursor_ic_table_size,
+		128, 128, 102400,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"gp_interconnect_timer_period", PGC_USERSET, GP_ARRAY_TUNING,
 			gettext_noop("Sets the timer period (in ms) for UDP interconnect"),
@@ -4452,6 +4547,17 @@ struct config_int ConfigureNamesInt_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_agg_pds_strategy", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Set the strategy of agg required distribution."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_agg_pds_strategy,
+		OPTIMIZER_AGG_PDS_ALL_KEY, OPTIMIZER_AGG_PDS_ALL_KEY, OPTIMIZER_AGG_PDS_EXCLUDE_NON_FIXED,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"memory_profiler_dataset_size", PGC_USERSET, DEVELOPER_OPTIONS,
 			gettext_noop("Set the size in GB"),
@@ -4839,6 +4945,17 @@ struct config_string ConfigureNamesString_gp[] =
 		gpvars_show_gp_resource_manager_policy,
 	},
 
+	{
+		{"gp_resource_group_cgroup_parent", PGC_POSTMASTER, RESOURCES,
+			gettext_noop("The root of gpdb cgroup hierarchy."),
+			NULL,
+			GUC_SUPERUSER_ONLY
+		},
+		&gp_resource_group_cgroup_parent,
+		"gpdb.service",
+		gpvars_check_gp_resource_group_cgroup_parent, NULL, NULL
+	},
+
 	/* for pljava */
 	{
 		{"pljava_vmoptions", PGC_SUSET, CUSTOM_OPTIONS,
@@ -4996,6 +5113,9 @@ struct config_string ConfigureNamesString_gp[] =
 		{"gp_interconnect_type", PGC_BACKEND, GP_ARRAY_TUNING,
 			gettext_noop("Sets the protocol used for inter-node communication."),
 			gettext_noop("Valid values are \"tcp\", \"udpifc\""
+#ifdef ENABLE_IC_UDP2
+						 ", \"udp2(experimental feature)\""
+#endif /* ENABLE_IC_UDP2 */
 #ifdef ENABLE_IC_PROXY
 						 " and \"proxy\""
 #endif  /* ENABLE_IC_PROXY */
@@ -5005,6 +5125,17 @@ struct config_string ConfigureNamesString_gp[] =
 		"udpifc",
 		check_gp_interconnect_type, assign_gp_interconnect_type, show_gp_interconnect_type
 	},
+	{
+		{"gp_pause_on_restore_point_replay", PGC_SUSET, DEVELOPER_OPTIONS,
+			gettext_noop("Specifies the restore point to pause replay on."),
+			gettext_noop("Unlike recovery_target_name, this can be used to continuously set/reset "
+						"how much a standby should replay up to."),
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&gp_pause_on_restore_point_replay,
+		"",
+		NULL, NULL, NULL
+	},
 
 	/* End-of-list marker */
 	{
@@ -5394,6 +5525,22 @@ check_verify_gpfdists_cert(bool *newval, void **extra, GucSource source)
 	return true;
 }
 
+static bool
+check_hot_dr(bool *newval, void **extra, GucSource source)
+{
+	if (*newval && !EnableHotStandby)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot enable \"hot_dr\" when \"hot_standby\" is false")));
+
+	if (*newval && IS_QUERY_DISPATCHER() && !checkGpSegConfigFtsFiles())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("cannot enable \"hot_dr\" since DR cluster segment configuration file does not exist")));
+
+	return true;
+}
+
 static bool
 check_dispatch_log_stats(bool *newval, void **extra, GucSource source)
 {
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 1f504832eac..4192dfb2748 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -434,7 +434,7 @@ max_prepared_transactions = 250		# can be 0 or more
 #cursor_tuple_fraction = 0.1		# range 0.0-1.0
 
 #from_collapse_limit = 20
-#join_collapse_limit = 20		# 1 disables collapsing of explicit
+#join_collapse_limit = 13		# 1 disables collapsing of explicit
 					# JOIN clauses
 #force_parallel_mode = off
 #jit = on				# allow JIT compilation
diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c
index 40e47487c21..58361eb2bff 100644
--- a/src/backend/utils/misc/sampling.c
+++ b/src/backend/utils/misc/sampling.c
@@ -116,7 +116,11 @@ BlockSampler_Next(BlockSampler bs)
 }
 
 /*
- * This is a 64 bit version of BlockSampler.
+ * This is used for sampling AO/CO row numbers, in the flattened
+ * row number space, across all segfile tuple counts. 64 bits is
+ * used for simplicity and is sufficient to hold a maximum tuple
+ * count of (AOTupleId_MaxSegmentFileNum * MAX_AOREL_CONCURRENCY),
+ * which can be represented with 48 bits.
  *
  * The code is same as BlockSampler except replacing
  * int type of variables with int64, which is intended
@@ -127,7 +131,7 @@ BlockSampler_Next(BlockSampler bs)
  */
 void
 RowSampler_Init(RowSampler rs, int64 nobjects, int64 samplesize,
-				   long randseed)
+				long randseed)
 {
 	rs->N = nobjects;			/* measured table size */
 
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 45812a608e0..2835fbd10f1 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -224,6 +224,7 @@ CreatePortal(const char *name, bool allowDup, bool dupSilent)
 	portal->atEnd = true;		/* disallow fetches until query is set */
 	portal->visible = true;
 	portal->creation_time = GetCurrentStatementStartTimestamp();
+	portal->stop_requested_in_motion = false;
 
 	if (IsResQueueEnabled())
 	{
@@ -587,7 +588,7 @@ PortalDrop(Portal portal, bool isTopCommit)
 	if (portal->resowner &&
 		(!isTopCommit || portal->status == PORTAL_FAILED))
 	{
-		bool		isCommit = (portal->status != PORTAL_FAILED);
+		bool		isCommit = (portal->status != PORTAL_FAILED) && !portal->stop_requested_in_motion;
 
 		ResourceOwnerRelease(portal->resowner,
 							 RESOURCE_RELEASE_BEFORE_LOCKS,
diff --git a/src/backend/utils/resgroup/cgroup-ops-dummy.c b/src/backend/utils/resgroup/cgroup-ops-dummy.c
index 9c5c2850aea..91c588f5986 100644
--- a/src/backend/utils/resgroup/cgroup-ops-dummy.c
+++ b/src/backend/utils/resgroup/cgroup-ops-dummy.c
@@ -252,6 +252,12 @@ dumpio_dummy(List *limit_list)
 	return DefaultIOLimit;
 }
 
+static void
+cleario_dummy(Oid groupid)
+{
+	unsupported_system();
+}
+
 static CGroupOpsRoutine cGroupOpsRoutineDummy = {
 		.getcgroupname = getcgroupname_dummy,
 
@@ -280,7 +286,9 @@ static CGroupOpsRoutine cGroupOpsRoutineDummy = {
 		.setio = setio_dummy,
 		.freeio = freeio_dummy,
 		.getiostat = getiostat_dummy,
-		.dumpio = dumpio_dummy
+		.dumpio = dumpio_dummy,
+		.cleario = cleario_dummy
+
 };
 
 CGroupOpsRoutine *get_cgroup_routine_dummy(void)
diff --git a/src/backend/utils/resgroup/cgroup-ops-linux-v1.c b/src/backend/utils/resgroup/cgroup-ops-linux-v1.c
index 96390712be4..0ad53ee35ab 100644
--- a/src/backend/utils/resgroup/cgroup-ops-linux-v1.c
+++ b/src/backend/utils/resgroup/cgroup-ops-linux-v1.c
@@ -176,6 +176,7 @@ static void setio_v1(Oid group, List *limit_list);
 static void freeio_v1(List *limit_list);
 static List* getiostat_v1(Oid group, List *io_limit);
 static char *dumpio_v1(List *limit_list);
+static void cleario_v1(Oid groupid);
 
 /*
  * Detect gpdb cgroup component dirs.
@@ -651,11 +652,11 @@ createcgroup_v1(Oid group)
 {
 	int retry = 0;
 
-	if (!createDir(group, CGROUP_COMPONENT_CPU) ||
-		!createDir(group, CGROUP_COMPONENT_CPUACCT) ||
-		!createDir(group, CGROUP_COMPONENT_MEMORY) ||
+	if (!createDir(group, CGROUP_COMPONENT_CPU, "") ||
+		!createDir(group, CGROUP_COMPONENT_CPUACCT, "") ||
+		!createDir(group, CGROUP_COMPONENT_MEMORY, "") ||
 		(gp_resource_group_enable_cgroup_cpuset &&
-		 !createDir(group, CGROUP_COMPONENT_CPUSET)))
+		 !createDir(group, CGROUP_COMPONENT_CPUSET, "")))
 	{
 		CGROUP_ERROR("can't create cgroup for resource group '%d': %m", group);
 	}
@@ -704,7 +705,7 @@ create_default_cpuset_group_v1(void)
 	CGroupComponentType component = CGROUP_COMPONENT_CPUSET;
 	int retry = 0;
 
-	if (!createDir(DEFAULT_CPUSET_GROUP_ID, component))
+	if (!createDir(DEFAULT_CPUSET_GROUP_ID, component, ""))
 	{
 		CGROUP_ERROR("can't create cpuset cgroup for resgroup '%d': %m",
 					 DEFAULT_CPUSET_GROUP_ID);
@@ -1158,6 +1159,14 @@ dumpio_v1(List *limit_list)
 	return DefaultIOLimit;
 }
 
+static void
+cleario_v1(Oid groupid)
+{
+	ereport(WARNING,
+			(errcode(ERRCODE_SYSTEM_ERROR),
+			 errmsg("resource group io limit only can be used in cgroup v2.")));
+}
+
 static CGroupOpsRoutine cGroupOpsRoutineV1 = {
 		.getcgroupname = getcgroupname_v1,
 		.probecgroup = probecgroup_v1,
@@ -1187,7 +1196,8 @@ static CGroupOpsRoutine cGroupOpsRoutineV1 = {
 		.setio = setio_v1,
 		.freeio = freeio_v1,
 		.getiostat = getiostat_v1,
-		.dumpio = dumpio_v1
+		.dumpio = dumpio_v1,
+		.cleario = cleario_v1
 };
 
 CGroupOpsRoutine *get_group_routine_v1(void)
diff --git a/src/backend/utils/resgroup/cgroup-ops-linux-v2.c b/src/backend/utils/resgroup/cgroup-ops-linux-v2.c
index 546b2272213..6b5f667fe7f 100644
--- a/src/backend/utils/resgroup/cgroup-ops-linux-v2.c
+++ b/src/backend/utils/resgroup/cgroup-ops-linux-v2.c
@@ -166,6 +166,7 @@ static void setio_v2(Oid group, List *limit_list);
 static void freeio_v2(List *limit_list);
 static List	*getiostat_v2(Oid group, List *io_limit);
 static char *dumpio_v2(List *limit_list);
+static void cleario_v2(Oid groupid);
 
 /*
  * Dump component dir to the log.
@@ -385,7 +386,8 @@ createcgroup_v2(Oid group)
 {
 	int retry = 0;
 
-	if (!createDir(group, CGROUP_COMPONENT_PLAIN))
+	if (!createDir(group, CGROUP_COMPONENT_PLAIN, "") ||
+		!createDir(group, CGROUP_COMPONENT_PLAIN, CGROUPV2_LEAF_INDENTIFIER))
 	{
 		CGROUP_ERROR("can't create cgroup for resource group '%d': %m", group);
 	}
@@ -417,7 +419,7 @@ create_default_cpuset_group_v2(void)
 	CGroupComponentType component = CGROUP_COMPONENT_PLAIN;
 	int retry = 0;
 
-	if (!createDir(DEFAULT_CPUSET_GROUP_ID, component))
+	if (!createDir(DEFAULT_CPUSET_GROUP_ID, component, ""))
 	{
 		CGROUP_ERROR("can't create cpuset cgroup for resgroup '%d': %m",
 					 DEFAULT_CPUSET_GROUP_ID);
@@ -465,6 +467,7 @@ create_default_cpuset_group_v2(void)
 static void
 attachcgroup_v2(Oid group, int pid, bool is_cpuset_enabled)
 {
+	char path_of_leaf[MAXPATHLEN];
 	/*
 	 * needn't write to file if the pid has already been written in.
 	 * Unless it has not been written or the group has changed or
@@ -473,8 +476,9 @@ attachcgroup_v2(Oid group, int pid, bool is_cpuset_enabled)
 	if (IsUnderPostmaster && group == currentGroupIdInCGroup)
 		return;
 
+	pg_sprintf(path_of_leaf, "%s/cgroup.procs", CGROUPV2_LEAF_INDENTIFIER);
 	writeInt64(group, BASEDIR_GPDB, CGROUP_COMPONENT_PLAIN,
-			   "cgroup.procs", pid);
+			   path_of_leaf, pid);
 
 	/*
 	 * Do not assign the process to cgroup/memory for now.
@@ -498,6 +502,7 @@ detachcgroup_v2(Oid group, CGroupComponentType component, int fd_dir)
 {
 	char 	path[MAX_CGROUP_PATHLEN];
 	size_t 	path_size = sizeof(path);
+	char	path_of_leaf[MAXPATHLEN];
 
 	char 	*buf;
 	size_t 	buf_size;
@@ -532,7 +537,8 @@ detachcgroup_v2(Oid group, CGroupComponentType component, int fd_dir)
 	} \
 } while (0)
 
-	buildPath(group, BASEDIR_GPDB, component, "cgroup.procs", path, path_size);
+	pg_sprintf(path_of_leaf, "%s/cgroup.procs", CGROUPV2_LEAF_INDENTIFIER);
+	buildPath(group, BASEDIR_GPDB, component, path_of_leaf, path, path_size);
 
 	fdr = open(path, O_RDONLY);
 
@@ -560,7 +566,7 @@ detachcgroup_v2(Oid group, CGroupComponentType component, int fd_dir)
 	if (buf_len == 0)
 		return;
 
-	buildPath(DEFAULTRESGROUP_OID, BASEDIR_GPDB, component, "cgroup.procs",
+	buildPath(DEFAULTRESGROUP_OID, BASEDIR_GPDB, component, path_of_leaf,
 			  path, path_size);
 
 	fdw = open(path, O_WRONLY);
@@ -856,22 +862,22 @@ setio_v2(Oid group, List *limit_list)
 	{
 		TblSpcIOLimit *limit = (TblSpcIOLimit *)lfirst(tblspc_cell);
 
-		if (limit->ioconfig->rbps == IO_LIMIT_MAX )
+		if (limit->ioconfig->rbps == IO_LIMIT_MAX || limit->ioconfig->rbps == IO_LIMIT_EMPTY)
 			sprintf(rbps_str, "rbps=max");
 		else
 			sprintf(rbps_str, "rbps=%lu", limit->ioconfig->rbps * 1024 * 1024);
 
-		if (limit->ioconfig->wbps == IO_LIMIT_MAX)
+		if (limit->ioconfig->wbps == IO_LIMIT_MAX || limit->ioconfig->wbps == IO_LIMIT_EMPTY)
 			sprintf(wbps_str, "wbps=max");
 		else
 			sprintf(wbps_str, "wbps=%lu", limit->ioconfig->wbps * 1024 * 1024);
 
-		if (limit->ioconfig->riops == IO_LIMIT_MAX)
+		if (limit->ioconfig->riops == IO_LIMIT_MAX || limit->ioconfig->riops == IO_LIMIT_EMPTY)
 			sprintf(riops_str, "riops=max");
 		else
 			sprintf(riops_str, "riops=%u", (uint32)limit->ioconfig->riops);
 
-		if (limit->ioconfig->wiops == IO_LIMIT_MAX)
+		if (limit->ioconfig->wiops == IO_LIMIT_MAX || limit->ioconfig->wiops == IO_LIMIT_EMPTY)
 			sprintf(wiops_str, "wiops=max");
 		else
 			sprintf(wiops_str, "wiops=%u", (uint32)limit->ioconfig->wiops);
@@ -906,6 +912,12 @@ dumpio_v2(List *limit_list)
 	return io_limit_dump(limit_list);
 }
 
+static void
+cleario_v2(Oid groupid)
+{
+	clear_io_max(groupid);
+}
+
 static CGroupOpsRoutine cGroupOpsRoutineV2 = {
 		.getcgroupname = getcgroupname_v2,
 		.probecgroup = probecgroup_v2,
@@ -935,7 +947,8 @@ static CGroupOpsRoutine cGroupOpsRoutineV2 = {
 		.setio = setio_v2,
 		.freeio = freeio_v2,
 		.getiostat = getiostat_v2,
-		.dumpio = dumpio_v2
+		.dumpio = dumpio_v2,
+		.cleario = cleario_v2
 };
 
 CGroupOpsRoutine *get_group_routine_v2(void)
diff --git a/src/backend/utils/resgroup/cgroup.c b/src/backend/utils/resgroup/cgroup.c
index a996e31aa51..983d247dc96 100644
--- a/src/backend/utils/resgroup/cgroup.c
+++ b/src/backend/utils/resgroup/cgroup.c
@@ -174,7 +174,7 @@ buildPathSafe(Oid group,
 		 * for cgroup v2, we just have the top level and child level,
 		 * don't need to care about the component.
 		 */
-		base_dir = base == BASEDIR_GPDB ? "gpdb" : "";
+		base_dir = base == BASEDIR_GPDB ? gp_resource_group_cgroup_parent : "";
 		len = snprintf(path, path_size, "%s/%s%s/%s",
 					   cgroupSystemInfo->cgroup_dir, base_dir, group_dir, filename);
 	}
@@ -285,12 +285,12 @@ lockDir(const char *path, bool block)
  * Create cgroup dir
  */
 bool
-createDir(Oid group, CGroupComponentType component)
+createDir(Oid group, CGroupComponentType component, char *filename)
 {
 	char path[MAX_CGROUP_PATHLEN];
 	size_t path_size = sizeof(path);
 
-	buildPath(group, BASEDIR_GPDB, component, "", path, path_size);
+	buildPath(group, BASEDIR_GPDB, component, filename, path, path_size);
 
 	if (mkdir(path, 0755) && errno != EEXIST)
 		return false;
@@ -466,14 +466,20 @@ bool
 deleteDir(Oid group, CGroupComponentType component, const char *filename, bool unassign,
 		  void (*detachcgroup) (Oid group, CGroupComponentType component, int fd_dir))
 {
-
 	char path[MAX_CGROUP_PATHLEN];
+	char leaf_path[MAX_CGROUP_PATHLEN];
 	size_t path_size = sizeof(path);
 
+	bool is_v2 = Gp_resource_manager_policy == RESOURCE_MANAGER_POLICY_GROUP_V2;
+	int path_cnt = 2;
+	char *paths[2] = {leaf_path, path};
 	int retry = unassign ? 0 : MAX_RETRY - 1;
 	int fd_dir;
+	int i;
 
 	buildPath(group, BASEDIR_GPDB, component, "", path, path_size);
+	if (is_v2)
+		buildPath(group, BASEDIR_GPDB, component, CGROUPV2_LEAF_INDENTIFIER, leaf_path, path_size);
 
 	/*
 	 * To prevent race condition between multiple processes we require a dir
@@ -492,37 +498,47 @@ deleteDir(Oid group, CGroupComponentType component, const char *filename, bool u
 	if (filename)
 		writeInt64(group, BASEDIR_GPDB, component, filename, 0);
 
+	if (!unassign)
+		detachcgroup = NULL;
+
+	i = is_v2 ? 0 : 1;
 	while (++retry <= MAX_RETRY)
 	{
-		if (unassign)
+		if (detachcgroup)
 			detachcgroup(group, component, fd_dir);
 
-		if (rmdir(path))
+		for (; i < path_cnt; ++i)
 		{
-			int err = errno;
-
-			if (err == EBUSY && unassign && retry < MAX_RETRY)
+			if (rmdir(paths[i]))
 			{
-				elog(DEBUG1, "can't remove dir, will retry: %s: %s",
-					 path, strerror(err));
-				pg_usleep(1000);
-				continue;
+				int err = errno;
+
+				if (err == EBUSY && unassign && retry < MAX_RETRY)
+				{
+					elog(DEBUG1, "can't remove dir, will retry: %s: %s",
+						 paths[i], strerror(err));
+					pg_usleep(1000);
+					break;
+				}
+
+				if (err != ENOENT)
+				{
+					elog(DEBUG1, "can't remove dir, ignore the error: %s: %s",
+						paths[i], strerror(err));
+					goto error;
+				}
 			}
 
-			/*
-			 * we don't check for ENOENT again as we already acquired the lock
-			 * on this dir and the dir still exist at that time, so if then
-			 * it's removed by other processes then it's a bug.
-			 */
-			elog(DEBUG1, "can't remove dir, ignore the error: %s: %s",
-				 path, strerror(err));
+			detachcgroup = NULL;
+
+			elog(DEBUG1, "cgroup dir '%s' removed", paths[i]);
 		}
-		break;
-	}
 
-	if (retry <= MAX_RETRY)
-		elog(DEBUG1, "cgroup dir '%s' removed", path);
+		if (i >= path_cnt)
+			break;
+	}
 
+error:
 	/* close() also releases the lock */
 	close(fd_dir);
 
@@ -649,6 +665,12 @@ permListCheck(const PermList *permlist, Oid group, bool report)
 									prop[0] ? "file" : "directory",
 									path);
 			}
+			else
+			{
+				CGROUP_CONFIG_WARNING("invalid %s name '%s': %m",
+									  prop[0] ? "file" : "directory",
+									  path);
+			}
 			return false;
 		}
 
@@ -662,6 +684,12 @@ permListCheck(const PermList *permlist, Oid group, bool report)
 									prop[0] ? "file" : "directory",
 									path);
 			}
+			else
+			{
+				CGROUP_CONFIG_WARNING("can't access %s '%s': %m",
+									  prop[0] ? "file" : "directory",
+									  path);
+			}
 			return false;
 		}
 	}
diff --git a/src/backend/utils/resgroup/cgroup_io_limit.c b/src/backend/utils/resgroup/cgroup_io_limit.c
index f3b1a1e33b2..43e096301d2 100644
--- a/src/backend/utils/resgroup/cgroup_io_limit.c
+++ b/src/backend/utils/resgroup/cgroup_io_limit.c
@@ -1,5 +1,4 @@
 #include "postgres.h"
-#include "utils/cgroup_io_limit.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup.h"
@@ -9,6 +8,8 @@
 #include "catalog/indexing.h"
 #include "catalog/pg_resgroup_d.h"
 #include "catalog/pg_resgroupcapability_d.h"
+#include "common/string.h"
+#include "commands/tablespace.h"
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_tablespace_d.h"
 #include "commands/resgroupcmds.h"
@@ -18,11 +19,18 @@
 #include "port.h"
 #include "storage/fd.h"
 #include "utils/cgroup.h"
+#include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/hsearch.h"
 #include "utils/palloc.h"
 #include "utils/relcache.h"
 #include "utils/resgroup.h"
+#include "utils/cgroup_io_limit.h"
+#include <utils/cgroup.h>
+
+#ifndef __linux__
+#error  cgroup is only available on linux
+#endif
 
 #include <libgen.h>
 #include <limits.h>
@@ -37,7 +45,6 @@ const char *IOconfigFields[4] = {"rbps", "wbps", "riops", "wiops"};
 const char	*IOStatFields[4] = {"rbytes", "wbytes", "rios", "wios"};
 
 static int bdi_cmp(const void *a, const void *b);
-static void ioconfig_validate(IOconfig *config);
 
 typedef struct BDICmp
 {
@@ -95,8 +102,6 @@ io_limit_validate(List *limit_list)
 		TblSpcIOLimit *limit = (TblSpcIOLimit *)lfirst(limit_cell);
 		ListCell	  *bdi_cell;
 
-		ioconfig_validate(limit->ioconfig);
-
 		foreach (bdi_cell, limit->bdi_list)
 		{
 			bdi_array[i].bdi = *(bdi_t *)lfirst(bdi_cell);
@@ -251,6 +256,10 @@ get_bdi_of_path(const char *ori_path)
 				 errmsg("cannot find disk of %s, details: %m", path),
 				 errhint("mount point of %s is: %s", path, match_mnt.mnt_fsname)));
 	}
+	pfree(match_mnt.mnt_fsname);
+	pfree(match_mnt.mnt_dir);
+	pfree(match_mnt.mnt_type);
+	pfree(match_mnt.mnt_opts);
 
 	maj = major(sb.st_rdev);
 	min = minor(sb.st_rdev);
@@ -297,31 +306,27 @@ get_bdi_of_path(const char *ori_path)
 	return make_bdi(parent_maj, parent_min);
 }
 
-static void
-ioconfig_validate(IOconfig *config)
+
+bool
+io_limit_value_validate(const char *field, const uint64 value, uint64 *max)
 {
 	const uint64 ULMAX = ULLONG_MAX / 1024 / 1024;
 	const uint32 UMAX = UINT_MAX;
 
-	if (config->rbps != IO_LIMIT_MAX && (config->rbps > ULMAX || config->rbps < 2))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("io limit: rbps must in range [2, %lu] or equal 0", ULMAX)));
+	*max = 0;
 
-	if (config->wbps != IO_LIMIT_MAX && (config->wbps > ULMAX || config->wbps < 2))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("io limit: wbps must in range [2, %lu] or equal 0", ULMAX)));
-
-	if (config->wiops != IO_LIMIT_MAX && (config->wiops > UMAX || config->wiops < 2))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("io limit: wiops must in range [2, %u] or equal 0", UMAX)));
+	if (strcmp(field, "rbps") == 0 || strcmp(field, "wbps") == 0)
+	{
+		*max = ULMAX;
+		return value == IO_LIMIT_MAX || !(value > ULMAX || value < 2);
+	}
+	else if (strcmp(field, "riops") == 0 || strcmp(field, "wiops") == 0)
+	{
+		*max = (uint64) UMAX;
+		return value == IO_LIMIT_MAX || !(value > UMAX || value < 2);
+	}
 
-	if (config->riops != IO_LIMIT_MAX && (config->riops > UMAX || config->riops < 2))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("io limit: riops must in range [2, %u] or equal 0", UMAX)));
+	return false;
 }
 
 char *
@@ -536,7 +541,10 @@ io_limit_dump(List *limit_list)
 
 		for(i = 0; i < fields_length; i++)
 		{
-			appendStringInfo(result, "%s=%lu", IOconfigFields[i], *(value + i));
+			if ((*(value + i) != IO_LIMIT_MAX) && (*(value + i) != IO_LIMIT_EMPTY))
+				appendStringInfo(result, "%s=%lu", IOconfigFields[i], *(value + i));
+			else
+				appendStringInfo(result, "%s=max", IOconfigFields[i]);
 
 			if (i + 1 != fields_length)
 				appendStringInfo(result, ",");
@@ -548,3 +556,47 @@ io_limit_dump(List *limit_list)
 
 	return result->data;
 }
+
+void
+clear_io_max(Oid groupid)
+{
+	FILE *f;
+	StringInfo line			 = makeStringInfo();
+	StringInfo result		 = makeStringInfo();
+	List	   *result_lines = NIL;
+	ListCell   *cell;
+	char	   path[MAX_CGROUP_PATHLEN];
+	buildPath(groupid, BASEDIR_GPDB, CGROUP_COMPONENT_PLAIN, "io.max", path, MAX_CGROUP_PATHLEN);
+
+	f = AllocateFile(path, "r");
+	/* pg_get_line_buf will reset line each time */
+	while (pg_get_line_buf(f, line))
+	{
+		uint32 maj, min;
+		int i;
+		char *str = line->data;
+
+		sscanf(str, "%u:%u", &maj, &min);
+
+		appendStringInfo(result, "%u:%u", maj, min);
+		for (i = 0; i < lengthof(IOconfigFields); i++)
+			appendStringInfo(result, " %s=max", IOconfigFields[i]);
+
+		result_lines = lappend(result_lines, (void *) pstrdup(result->data));
+
+		resetStringInfo(result);
+	}
+	FreeFile(f);
+	pfree(line->data);
+	pfree(result->data);
+	pfree(line);
+	pfree(result);
+
+	foreach(cell, result_lines)
+	{
+		char *str = (char *)lfirst(cell);
+		writeStr(groupid, BASEDIR_GPDB, CGROUP_COMPONENT_PLAIN, "io.max", str);
+	}
+
+	list_free_deep(result_lines);
+}
diff --git a/src/backend/utils/resgroup/io_limit_gram.y b/src/backend/utils/resgroup/io_limit_gram.y
index e79b35b6f21..6663821c856 100644
--- a/src/backend/utils/resgroup/io_limit_gram.y
+++ b/src/backend/utils/resgroup/io_limit_gram.y
@@ -1,5 +1,6 @@
 %define api.pure true
 %define api.prefix {io_limit_yy}
+%error-verbose
 
 %code top {
 	#include "postgres.h"
@@ -10,6 +11,9 @@
 
 	#define YYMALLOC palloc
 	#define YYFREE	 pfree
+
+	extern int io_limit_yycolumn;
+	static char *line;
 }
 
 %code requires {
@@ -35,7 +39,7 @@
 	void io_limit_yyerror(IOLimitParserContext *parser_context, void *scanner, const char *message);
 }
 
-%token IOLIMIT_CONFIG_DELIM TABLESPACE_IO_CONFIG_START STAR IOCONFIG_DELIM VALUE_MAX
+%token STAR VALUE_MAX
 %token <str> ID IO_KEY
 %token <integer> NUMBER
 
@@ -43,7 +47,7 @@
 %type <integer> io_value
 %type <ioconfig> ioconfigs
 %type <tblspciolimit> tablespace_io_config
-%type <list> iolimit_config_string start
+%type <list> iolimit_config_string
 %type <ioconfigitem> ioconfig
 
 %destructor { pfree($$); } <str> <ioconfig> <ioconfigitem>
@@ -55,34 +59,31 @@
 
 %%
 
-start: iolimit_config_string
-	   {
-			context->result = $$ = $1;
-			return 0;
-	   }
-
 iolimit_config_string: tablespace_io_config
 					   {
 							List *l = NIL;
 
 							$$ = lappend(l, $1);
+
+							context->result = $$;
 					   }
-					 | iolimit_config_string IOLIMIT_CONFIG_DELIM tablespace_io_config
+					 | iolimit_config_string ';' tablespace_io_config
 					   {
 							$$ = lappend($1, $3);
+
+							context->result = $$;
 					   }
+;
 
-tablespace_name: ID  { $$ = $1; }
+tablespace_name: ID  { $$ = $1; } ;
 
-tablespace_io_config: tablespace_name TABLESPACE_IO_CONFIG_START ioconfigs
+tablespace_io_config: tablespace_name ':' ioconfigs
 					  {
 
 							TblSpcIOLimit *tblspciolimit = (TblSpcIOLimit *)palloc0(sizeof(TblSpcIOLimit));
 
 							if (context->star_tablespace_cnt > 0)
-								ereport(ERROR,
-										(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-										errmsg("io limit: tablespace '*' cannot be used with other tablespaces")));
+								yyerror(NULL, NULL, "tablespace '*' cannot be used with other tablespaces");
 							tblspciolimit->tablespace_oid = get_tablespace_oid($1, false);
 							context->normal_tablespce_cnt++;
 
@@ -90,14 +91,13 @@ tablespace_io_config: tablespace_name TABLESPACE_IO_CONFIG_START ioconfigs
 
 							$$ = tblspciolimit;
 					  }
-					| STAR TABLESPACE_IO_CONFIG_START ioconfigs
+					| STAR ':' ioconfigs
 					  {
 							TblSpcIOLimit *tblspciolimit = (TblSpcIOLimit *)palloc0(sizeof(TblSpcIOLimit));
 
 							if (context->normal_tablespce_cnt > 0 || context->star_tablespace_cnt > 0)
-								ereport(ERROR,
-										(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-										errmsg("io limit: tablespace '*' cannot be used with other tablespaces")));
+								yyerror(NULL, NULL, "tablespace '*' cannot be used with other tablespaces");
+
 							tblspciolimit->tablespace_oid = InvalidOid;
 							context->star_tablespace_cnt++;
 
@@ -105,18 +105,14 @@ tablespace_io_config: tablespace_name TABLESPACE_IO_CONFIG_START ioconfigs
 
 							$$ = tblspciolimit;
 					  }
-					| NUMBER TABLESPACE_IO_CONFIG_START ioconfigs
+					| NUMBER ':' ioconfigs
 					  {
 							TblSpcIOLimit *tblspciolimit = (TblSpcIOLimit *)palloc0(sizeof(TblSpcIOLimit));
 
 							if (context->star_tablespace_cnt > 0)
-								ereport(ERROR,
-										(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-										errmsg("io limit: tablespace '*' cannot be used with other tablespaces")));
-							if ($1 <= 0 || $1 > UINT_MAX)
-								ereport(ERROR,
-										(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-										errmsg("io limit: tablespace oid exceeds the limit")));
+								yyerror(NULL, NULL, "tablespace '*' cannot be used with other tablespaces");
+							if (!OidIsValid($1) || $1 > OID_MAX)
+								yyerror(NULL, NULL, "tablespace oid exceeds the limit");
 
 							tblspciolimit->tablespace_oid = $1;
 							context->normal_tablespce_cnt++;
@@ -125,49 +121,69 @@ tablespace_io_config: tablespace_name TABLESPACE_IO_CONFIG_START ioconfigs
 
 							$$ = tblspciolimit;
 					  }
+;
 
 ioconfigs: ioconfig
 		   {
 				IOconfig *config = (IOconfig *)palloc0(sizeof(IOconfig));
 				uint64 *config_var = (uint64 *)config;
 				if (config == NULL)
-					io_limit_yyerror(NULL, NULL, "io limit: cannot allocate memory");
+					yyerror(NULL, NULL, "cannot allocate memory");
 
 				*(config_var + $1->offset) = $1->value;
 				$$ = config;
 		   }
-		 | ioconfigs IOCONFIG_DELIM ioconfig
+		 | ioconfigs ',' ioconfig
 		   {
 				uint64 *config_var = (uint64 *)$1;
+
+				if (*(config_var + $3->offset) != IO_LIMIT_EMPTY)
+					yyerror(NULL, NULL, psprintf("duplicated IO_KEY: %s", IOconfigFields[$3->offset]));
+
 				*(config_var + $3->offset) = $3->value;
 				$$ = $1;
 		   }
+;
 
 ioconfig: IO_KEY '=' io_value
 		  {
-			IOconfigItem *item = (IOconfigItem *)palloc0(sizeof(IOconfigItem));
+			uint64 max;
+			IOconfigItem *item = (IOconfigItem *)palloc(sizeof(IOconfigItem));
+			item->value = IO_LIMIT_MAX;
+
 			if (item == NULL)
-				io_limit_yyerror(NULL, NULL, "io limit: cannot allocate memory");
+				yyerror(NULL, NULL, "cannot allocate memory");
 
 			item->value = $3;
-			for (int i = 0;i < lengthof(IOconfigFields); ++i)
+			for (int i = 0; i < lengthof(IOconfigFields); ++i)
 				if (strcmp($1, IOconfigFields[i]) == 0)
+				{
 					item->offset = i;
+					if (!io_limit_value_validate(IOconfigFields[i], item->value, &max))
+						yyerror(NULL, NULL,
+								psprintf("value of '%s' must in range [2, %lu] or equal 'max'", IOconfigFields[i], max));
+				}
 
 			$$ = item;
 		  }
+;
 
-io_value: NUMBER { $$ = $1; }
-		| VALUE_MAX { $$ = 0; }
+io_value: NUMBER
+		{
+			$$ = $1;
+		}
+		| VALUE_MAX { $$ = IO_LIMIT_MAX; }
+;
 
 %%
 
 void
 io_limit_yyerror(IOLimitParserContext *parser_context, void *scanner, const char *message)
 {
-	ereport(ERROR, \
-		(errcode(ERRCODE_SYNTAX_ERROR), \
-		errmsg("%s", message))); \
+	ereport(ERROR,
+		(errcode(ERRCODE_SYNTAX_ERROR),
+		errmsg("io limit: %s", message),
+		errhint(" %s\n        %*c", line, io_limit_yycolumn, '^')));
 }
 
 /*
@@ -180,12 +196,14 @@ io_limit_parse(const char *limit_str)
 	IOLimitParserContext context;
 	IOLimitScannerState state;
 
+	line = (char *) limit_str;
+
 	context.result = NIL;
 	context.normal_tablespce_cnt = 0;
 	context.star_tablespace_cnt = 0;
 	io_limit_scanner_begin(&state, limit_str);
 	if (yyparse(&context, state.scanner) != 0)
-		yyerror(&context, state.scanner, "io limit: parse error");
+		yyerror(&context, state.scanner, "parse error");
 
 	io_limit_scanner_finish(&state);
 
diff --git a/src/backend/utils/resgroup/io_limit_scanner.l b/src/backend/utils/resgroup/io_limit_scanner.l
index 429e682d4c9..92754f64e79 100644
--- a/src/backend/utils/resgroup/io_limit_scanner.l
+++ b/src/backend/utils/resgroup/io_limit_scanner.l
@@ -3,6 +3,11 @@
 #include "io_limit_gram.h"
 
 #define YYSTYPE IO_LIMIT_YYSTYPE
+
+#define SAVE_COLUMN io_limit_yycolumn = next_col; next_col += strlen(yytext)
+
+static int next_col = 1;
+int io_limit_yycolumn = 1;
 %}
 
 %option noinput nounput noyywrap
@@ -14,43 +19,56 @@
 id  [a-zA-Z_][a-zA-Z0-9_]*
 wildcard \*
 
+%s ts_param
+
 %%
-[wr](b|io)ps {
-                yylval->str = pstrdup(yytext);
-                return IO_KEY;
-             }
+:           {
+                SAVE_COLUMN;
+                BEGIN ts_param;
+                return ':';
+            }
+
+<ts_param>[wr](b|io)ps {
+                          SAVE_COLUMN;
+                          yylval->str = pstrdup(yytext);
+                          return IO_KEY;
+                       }
 
-max          {
+<ts_param>max {
+                SAVE_COLUMN;
                 yylval->str = pstrdup("max");
                 return VALUE_MAX;
+              }
+
+<ts_param>;  {
+                SAVE_COLUMN;
+                BEGIN INITIAL;
+                return ';';
              }
 
 {id}         {
+                SAVE_COLUMN;
                 yylval->str = pstrdup(yytext);
                 return ID;
              }
 
-\;           { return IOLIMIT_CONFIG_DELIM; }
-
-:            { return TABLESPACE_IO_CONFIG_START; };
-
-,            { return IOCONFIG_DELIM; }
-
 [[:digit:]]+ {
+                SAVE_COLUMN;
                 yylval->integer = strtoull(yytext, NULL, 10);
                 return NUMBER;
              }
 
 {wildcard}   {
+                SAVE_COLUMN;
                 return STAR;
              }
 
-[[:space:]]  ;
+[[:space:]]  {  SAVE_COLUMN; }
 
 .           {
+                SAVE_COLUMN;
                 return *yytext;
             }
-
 %%
 
 
@@ -91,7 +109,10 @@ io_limit_scanner_begin(IOLimitScannerState *state, const char *limit_str)
     yyscan_t scanner;
     yylex_init(&scanner);
 
-    state->state = (void *)yy_scan_string(limit_str, scanner);
+    next_col = 1;
+    io_limit_yycolumn = 1;
+
+    state->buffer = (void *)yy_scan_string(limit_str, scanner);
     state->scanner = scanner;
 }
 
@@ -99,5 +120,5 @@ io_limit_scanner_begin(IOLimitScannerState *state, const char *limit_str)
 void
 io_limit_scanner_finish(IOLimitScannerState *state)
 {
-    yy_delete_buffer((YY_BUFFER_STATE)state->state, (yyscan_t)state->scanner);
+    yy_delete_buffer(state->buffer, state->scanner);
 }
diff --git a/src/backend/utils/resgroup/resgroup.c b/src/backend/utils/resgroup/resgroup.c
index 6dc5f0c8174..72f1ac75d41 100644
--- a/src/backend/utils/resgroup/resgroup.c
+++ b/src/backend/utils/resgroup/resgroup.c
@@ -33,6 +33,7 @@
 #include "cdb/cdbdisp_query.h"
 #include "cdb/memquota.h"
 #include "commands/resgroupcmds.h"
+#include "commands/tablespace.h"
 #include "common/hashfn.h"
 #include "funcapi.h"
 #include "miscadmin.h"
@@ -59,6 +60,7 @@
 #include "utils/cgroup-ops-v1.h"
 #include "utils/cgroup-ops-dummy.h"
 #include "utils/cgroup-ops-v2.h"
+#include "utils/cgroup_io_limit.h"
 #include "access/xact.h"
 
 #define InvalidSlotId	(-1)
@@ -805,6 +807,12 @@ ResGroupAlterOnCommit(const ResourceGroupCallbackContext *callbackCtx)
 		}
 		else if (callbackCtx->limittype == RESGROUP_LIMIT_TYPE_IO_LIMIT)
 		{
+			/*
+			 * When alter io_limit to -1 , the caps.io_limit will be nil.
+			 * There are no errors in io_limit string when caps.io_limit is nil.
+			 * When alter io_limit, caps.io_limit is nil means this resource group's io_limit should be clear.
+			 */
+			cgroupOpsRoutine->cleario(callbackCtx->groupid);
 			cgroupOpsRoutine->setio(callbackCtx->groupid, callbackCtx->caps.io_limit);
 		}
 
@@ -3701,6 +3709,94 @@ check_and_unassign_from_resgroup(PlannedStmt* stmt)
 								   bypassedGroup->caps.cpuMaxPercent == CPU_MAX_PERCENT_DISABLED);
 }
 
+/*
+ * return ture if there is a resource group which io_limit contains tblspcid.
+ * if errout is true, print warning, message. */
+bool
+checkTablespaceInIOlimit(Oid tblspcid, bool errout)
+{
+	Relation rel_resgroup_caps;
+	SysScanDesc	sscan;
+	HeapTuple	tuple;
+	bool		contain = false;
+	bool		print_header = false;
+	StringInfo  log = makeStringInfo();
+
+	rel_resgroup_caps = table_open(ResGroupCapabilityRelationId, AccessShareLock);
+	/* get io limit string from catalog */
+	sscan = systable_beginscan(rel_resgroup_caps, InvalidOid, false,
+							   NULL, 0, NULL);
+	while (HeapTupleIsValid(tuple = systable_getnext(sscan)))
+	{
+		Oid id;
+		bool isNULL;
+		Datum id_datum;
+		Datum type_datum;
+		Datum value_datum;
+		ResGroupLimitType type;
+		char *io_limit_str;
+		List *limit_list;
+		ListCell *cell;
+
+		type_datum = heap_getattr(tuple, Anum_pg_resgroupcapability_reslimittype,
+								  rel_resgroup_caps->rd_att, &isNULL);
+		type = (ResGroupLimitType) DatumGetInt16(type_datum);
+		if (type != RESGROUP_LIMIT_TYPE_IO_LIMIT)
+			continue;
+
+		id_datum = heap_getattr(tuple, Anum_pg_resgroupcapability_resgroupid,
+								rel_resgroup_caps->rd_att, &isNULL);
+		id = DatumGetObjectId(id_datum);
+
+		value_datum = heap_getattr(tuple, Anum_pg_resgroupcapability_value,
+								   rel_resgroup_caps->rd_att, &isNULL);
+		io_limit_str = TextDatumGetCString(value_datum);
+
+		if (strcmp(io_limit_str, DefaultIOLimit) == 0)
+			continue;
+
+		limit_list = cgroupOpsRoutine->parseio(io_limit_str);
+		foreach(cell, limit_list)
+		{
+			TblSpcIOLimit *limit = (TblSpcIOLimit *) lfirst(cell);
+
+			if (limit->tablespace_oid == tblspcid)
+			{
+				contain = true;
+
+				if (!errout)
+					break;
+
+				if (!print_header)
+				{
+					print_header = true;
+					appendStringInfo(log, "io limit: following resource groups depend on tablespace %s:", get_tablespace_name(tblspcid));
+				}
+
+				appendStringInfo(log, " %s", GetResGroupNameForId(id));
+			}
+		}
+
+		cgroupOpsRoutine->freeio(limit_list);
+
+		if (contain && !errout)
+			break;
+	}
+	systable_endscan(sscan);
+
+	table_close(rel_resgroup_caps, AccessShareLock);
+
+	if (contain && errout)
+		ereport(ERROR, (errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
+						errmsg("%s", log->data),
+						errhint("you can remove those resource groups or remove tablespace %s from io_limit of those resource groups.", get_tablespace_name(tblspcid))));
+
+	pfree(log->data);
+	pfree(log);
+
+	return contain;
+}
+
 /*
  * Given a planned statement, check if it is pure catalog query or a very simple query.
  * Return true only when:
diff --git a/src/backend/utils/resource_manager/memquota.c b/src/backend/utils/resource_manager/memquota.c
index f1e272e9f24..1cf5f805df9 100644
--- a/src/backend/utils/resource_manager/memquota.c
+++ b/src/backend/utils/resource_manager/memquota.c
@@ -247,6 +247,7 @@ IsMemoryIntensiveOperator(Node *node, PlannedStmt *stmt)
 		case T_Hash:
 		case T_BitmapIndexScan:
 		case T_WindowAgg:
+		case T_WindowHashAgg:
 		case T_TableFunctionScan:
 		case T_FunctionScan:
 			return true;
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index d3978ca987d..5a5415d4452 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -3232,6 +3232,14 @@ dumptuples(Tuplesortstate *state, bool alltuples)
 		!alltuples)
 		return;
 
+	/*
+	 * do nothing if we are told to finish execution.
+	 */
+	if (QueryFinishPending)
+	{
+		return;
+	}
+
 	/*
 	 * Final call might require no sorting, in rare cases where we just so
 	 * happen to have previously LACKMEM()'d at the point where exactly all
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index a5e94e065c2..34f45d5b59b 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -2592,13 +2592,19 @@ RestoreSnapshot(char *start_address)
 	if (serialized_snapshot.haveDistribSnapshot &&
 		serialized_snapshot.ds_count > 0)
 	{
+		Size ds_off = sizeof(SerializedSnapshotData) +
+					serialized_snapshot.xcnt * sizeof(TransactionId) +
+					serialized_snapshot.subxcnt * sizeof(TransactionId);
+		Size ds_lmoff = ds_off +
+					serialized_snapshot.ds_count * sizeof(DistributedTransactionId);
+
 		snapshot->distribSnapshotWithLocalMapping.ds.inProgressXidArray =
 			(DistributedTransactionId*) ((char *) snapshot + dsoff);
 		snapshot->distribSnapshotWithLocalMapping.inProgressMappedLocalXids =
 			(TransactionId*) ((char *) snapshot + dslmoff);
 
 		memcpy(snapshot->distribSnapshotWithLocalMapping.ds.inProgressXidArray,
-				(DistributedTransactionId*) (start_address + dsoff),
+				(DistributedTransactionId*) (start_address + ds_off),
 				serialized_snapshot.ds_count *
 				sizeof(DistributedTransactionId));
 
@@ -2608,7 +2614,7 @@ RestoreSnapshot(char *start_address)
 					0,
 					serialized_snapshot.ds_count * sizeof(TransactionId));
 			memcpy(snapshot->distribSnapshotWithLocalMapping.inProgressMappedLocalXids,
-					(TransactionId*) (start_address + dslmoff),
+					(TransactionId*) (start_address + ds_lmoff),
 					serialized_snapshot.currentLocalXidsCount *
 					sizeof(TransactionId));
 		}
diff --git a/src/bin/gpfdist/README b/src/bin/gpfdist/README
index 1e35d24a385..21aadf349bf 100644
--- a/src/bin/gpfdist/README
+++ b/src/bin/gpfdist/README
@@ -4,7 +4,7 @@ See gpdb-doc/dita/utility_guide/admin_utilities/gpfdist.xml
 
 Compiling
 -------------
-## Do not source greenplum_path.sh (although you can find $GPHOME in there)
+## Do not source cloudberry-env.sh (although you can find $GPHOME in there)
 ./configure --enable-transformations --prefix=<Location of $GPHOME>
 make
 make install
diff --git a/src/bin/gpfdist/gpfdist.c b/src/bin/gpfdist/gpfdist.c
index 350ef563abd..ad7fb868313 100644
--- a/src/bin/gpfdist/gpfdist.c
+++ b/src/bin/gpfdist/gpfdist.c
@@ -71,7 +71,7 @@
 #include <openssl/err.h>
 #endif
 
-#define DEFAULT_COMPRESS_LEVEL 1
+#define DEFAULT_COMPRESS_LEVEL 3
 #define MAX_FRAME_SIZE 65536
 
 /*  A data block */
@@ -198,7 +198,8 @@ static struct
 	const char* ssl; /* path to certificates in case we use gpfdist with ssl */
 	int			w; /* The time used for session timeout in seconds */
 	int			compress; /* The flag to indicate whether comopression transmission is open */
-} opt = { 8080, 8080, 0, 0, 0, ".", 0, 0, -1, 5, 0, 32768, 0, 256, 0, 0, 0, 0, 0};
+	int			compress_level; /* ZSTD compression level (1-9) */
+} opt = { 8080, 8080, 0, 0, 0, ".", 0, 0, -1, 5, 0, 32768, 0, 256, 0, 0, 0, 0, 0, DEFAULT_COMPRESS_LEVEL};
 
 
 typedef union address
@@ -232,6 +233,7 @@ static struct
 	SSL_CTX 		*server_ctx;/* for SSL */
 #endif
 	int 			wdtimer; /* Kill gpfdist after k seconds of inactivity. 0 to disable. */
+	struct event_base *event_base; /* for libevent 2.0+ */
 } gcb;
 
 /*  A session */
@@ -577,9 +579,9 @@ static void usage_error(const char* msg, int print_usage)
 		}
 		else
 		{
-			fprintf(stderr,
+							fprintf(stderr,
 					"gpfdist -- file distribution web server\n\n"
-						"usage: gpfdist [--ssl <certificates_directory>] [-d <directory>] [-p <http(s)_port>] [-l <log_file>] [-t <timeout>] [-v | -V | -s] [-m <maxlen>] [-w <timeout>]"
+						"usage: gpfdist [--ssl <certificates_directory>] [-d <directory>] [-p <http(s)_port>] [-l <log_file>] [-t <timeout>] [-v | -V | -s] [-m <maxlen>] [-w <timeout>] [--compress] [--compress-level <level>]"
 #ifdef GPFXDIST
 					    "[-c file]"
 #endif
@@ -605,7 +607,12 @@ static void usage_error(const char* msg, int print_usage)
 					    "        -c file    : configuration file for transformations\n"
 #endif
 						"        --version  : print version information\n"
-						"        -w timeout : timeout in seconds before close target file\n\n");
+						"        -w timeout : timeout in seconds before close target file\n"
+#ifdef USE_ZSTD
+						"        --compress : enable ZSTD compression\n"
+						"        --compress-level : ZSTD compression level (1-9, default=1)\n"
+#endif
+						"\n");
 		}
 	}
 
@@ -669,6 +676,7 @@ static void parse_command_line(int argc, const char* const argv[],
 	{ "version", 256, 0, "print version number" },
 	{ NULL, 'w', 1, "wait for session timeout in seconds" },
 	{"compress", 258, 0, "turn on compressed transmission"},
+	{"compress-level", 259, 1, "ZSTD compression level (1-9, default=1)"},
 	{ 0 } };
 
 	status = apr_getopt_init(&os, pool, argc, argv);
@@ -757,10 +765,19 @@ static void parse_command_line(int argc, const char* const argv[],
 		case 258:
 			opt.compress = 1;
 			break;
+		case 259:
+			opt.compress_level = atoi(arg);
+			if (opt.compress_level < 1 || opt.compress_level > 9) {
+				usage_error("Error: compression level must be between 1 and 9", 0);
+			}
+			break;
 #else
 		case 258:
 			usage_error("ZSTD is not supported by this build", 0);
 			break;
+		case 259:
+			usage_error("ZSTD compression level option is not supported by this build", 0);
+			break;
 #endif
 		}
 	}
@@ -1584,7 +1601,7 @@ static void session_detach(request_t* r)
 			}
 
 			event_del(&session->ev);
-			evtimer_set(&session->ev, free_session_cb, session);
+			evtimer_assign(&session->ev, gcb.event_base, free_session_cb, session);
 			session->tm.tv_sec  = opt.w;
 			session->tm.tv_usec = 0;
 			(void)evtimer_add(&session->ev, &session->tm);
@@ -1795,7 +1812,7 @@ static int session_attach(request_t* r)
 		session->active_segids[r->segid] = 1; /* mark this segid as active */
 		session->maxsegs = r->totalsegs;
 		session->requests = apr_hash_make(pool);
-		event_set(&session->ev, 0, 0, 0, 0);
+		event_assign(&session->ev, gcb.event_base, -1, 0, NULL, NULL);
 
 		if (session->tid == 0 || session->path == 0 || session->key == 0)
 			gfatal(r, "out of memory in session_attach");
@@ -2309,6 +2326,22 @@ static void do_accept(int fd, short event, void* arg)
 		closesocket(sock);
 		goto failure;
 	}
+
+	if (opt.compress)
+	{
+		int recv_buf_size = 128 * 1024;  /* 128KB receive buffer */
+		int send_buf_size = 128 * 1024;  /* 128KB send buffer */
+
+		if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (void*)&recv_buf_size, sizeof(recv_buf_size)) == -1)
+		{
+			gwarning(NULL, "Setting SO_RCVBUF to 128KB failed, using system default");
+		}
+
+		if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (void*)&send_buf_size, sizeof(send_buf_size)) == -1)
+		{
+			gwarning(NULL, "Setting SO_SNDBUF to 128KB failed, using system default");
+		}
+	}
 	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &on, sizeof(on)) == -1)
 	{
 		gwarning(NULL, "Setting SO_REUSEADDR on socket failed");
@@ -2336,7 +2369,7 @@ static void do_accept(int fd, short event, void* arg)
 	r->pool = pool;
 	r->sock = sock;
 
-	event_set(&r->ev, 0, 0, 0, 0);
+	event_assign(&r->ev, gcb.event_base, -1, 0, NULL, NULL);
 
 	/* use the block size specified by -m option */
 	r->outblock.data = palloc_safe(r, pool, opt.m, "out of memory when allocating buffer: %d bytes", opt.m);
@@ -2389,7 +2422,7 @@ static int setup_write(request_t* r)
 	if (r->sock < 0)
 		gwarning(r, "internal error in setup_write - no socket to use");
 	event_del(&r->ev);
-	event_set(&r->ev, r->sock, EV_WRITE, do_write, r);
+	event_assign(&r->ev, gcb.event_base, r->sock, EV_WRITE, do_write, r);
 	return (event_add(&r->ev, 0));
 }
 
@@ -2413,7 +2446,7 @@ static int setup_read(request_t* r)
 		gwarning(r, "internal error in setup_read - no socket to use");
 
 	event_del(&r->ev);
-	event_set(&r->ev, r->sock, EV_READ, do_read_request, r);
+	event_assign(&r->ev, gcb.event_base, r->sock, EV_READ, do_read_request, r);
 
 	if(opt.t == 0)
 	{
@@ -2520,18 +2553,32 @@ static void
 signal_register()
 {
     /* when SIGTERM raised invoke process_term_signal */
-    signal_set(&gcb.signal_event,SIGTERM,process_term_signal,0);
+    evsignal_assign(&gcb.signal_event, gcb.event_base, SIGTERM, process_term_signal, 0);
 
     /* high priority so we accept as fast as possible */
     if(event_priority_set(&gcb.signal_event, 0))
         gwarning(NULL,"signal event priority set failed");
 
     /* start watching this event */
-	if(signal_add(&gcb.signal_event, 0))
+	if(evsignal_add(&gcb.signal_event, 0))
         gfatal(NULL,"cannot set up event on signal register");
 
 }
 
+/*
+ * gpfdist_cleanup
+ *
+ * Clean up all resources before exiting
+ */
+static void gpfdist_cleanup(void)
+{
+	/* Clean up event_base if initialized */
+	if (gcb.event_base) {
+		event_base_free(gcb.event_base);
+		gcb.event_base = NULL;
+	}
+}
+
 static void clear_listen_sock(void)
 {
 	SOCKET sock = -1;
@@ -2584,9 +2631,8 @@ http_setup(void)
 		hostaddr = opt.b;
 
 	/* setup event priority */
-	if (event_priority_init(10))
-		gwarning(NULL, "event_priority_init failed");
-
+	if (event_base_priority_init(gcb.event_base, 10))
+		gwarning(NULL, "event_base_priority_init failed");
 
 	/* Try each possible port from opt.p to opt.last_port */
 	for (;;)
@@ -2779,8 +2825,8 @@ http_setup(void)
 	for (i = 0; i < gcb.listen_sock_count; i++)
 	{
 		/* when this socket is ready, do accept */
-		event_set(&gcb.listen_events[i], gcb.listen_socks[i], EV_READ | EV_PERSIST,
-				  do_accept, 0);
+		event_assign(&gcb.listen_events[i], gcb.event_base, gcb.listen_socks[i], 
+		            EV_READ | EV_PERSIST, do_accept, 0);
 
         /* only signal process function priority higher than socket handler */
 		if (event_priority_set(&gcb.listen_events[i], 1))
@@ -2806,6 +2852,9 @@ process_term_signal(int sig,short event,void* arg)
 			{
 				closesocket(gcb.listen_socks[i]);
 			}
+		
+		/* Clean up resources before exiting */
+		gpfdist_cleanup();
 		_exit(1);
 }
 
@@ -3881,7 +3930,10 @@ int gpfdist_init(int argc, const char* const argv[])
 		putenv("EVENT_SHOW_METHOD=1");
 	putenv("EVENT_NOKQUEUE=1");
 
-	event_init();
+	/* libevent 2.0+ */
+	gcb.event_base = event_base_new();
+	if (!gcb.event_base)
+		gfatal(NULL, "event_base_new failed");
 
     signal_register();
 	http_setup();
@@ -3959,16 +4011,19 @@ int gpfdist_init(int argc, const char* const argv[])
 
 int gpfdist_run()
 {
-	return event_dispatch();
+	return event_base_dispatch(gcb.event_base);
 }
 
 #ifndef WIN32
 
 int main(int argc, const char* const argv[])
 {
+	int ret;
 	if (gpfdist_init(argc, argv) == -1)
 		gfatal(NULL, "Initialization failed");
-	return gpfdist_run();
+	ret = gpfdist_run();
+	gpfdist_cleanup();
+	return ret;
 }
 
 
@@ -4143,6 +4198,7 @@ int main(int argc, const char* const argv[])
 		if (gpfdist_init(argc, argv) == -1)
 			gfatal(NULL, "Initialization failed");
 		main_ret = gpfdist_run();
+		gpfdist_cleanup();
 	}
 
 
@@ -4232,6 +4288,7 @@ void ServiceMain(int argc, char** argv)
 	 * actual service work
 	 */
 	gpfdist_run();
+	gpfdist_cleanup();
 }
 
 void ControlHandler(DWORD request)
@@ -4534,7 +4591,7 @@ static void flush_ssl_buffer(int fd, short event, void* arg)
 static void setup_flush_ssl_buffer(request_t* r)
 {
 	event_del(&r->ev);
-	event_set(&r->ev, r->sock, EV_WRITE, flush_ssl_buffer, r);
+	event_assign(&r->ev, gcb.event_base, r->sock, EV_WRITE, flush_ssl_buffer, r);
 	r->tm.tv_sec  = 5;
 	r->tm.tv_usec = 0;
 	(void)event_add(&r->ev, &r->tm);
@@ -4646,7 +4703,7 @@ static void request_cleanup(request_t *r)
 static void setup_do_close(request_t* r)
 {
 	event_del(&r->ev);
-	event_set(&r->ev, r->sock, EV_READ, do_close, r);
+	event_assign(&r->ev, gcb.event_base, r->sock, EV_READ, do_close, r);
 
 	r->tm.tv_sec = 60;
 	r->tm.tv_usec = 0;
@@ -4867,7 +4924,8 @@ static int compress_zstd(const request_t *r, block_t *blk, int buflen)
 		return -1;
 	}
 
-	size_t init_result = ZSTD_initCStream(r->zstd_cctx, DEFAULT_COMPRESS_LEVEL);
+	/* Use configurable compression level */
+	size_t init_result = ZSTD_initCStream(r->zstd_cctx, opt.compress_level);
 	if (ZSTD_isError(init_result)) 
 	{
 		snprintf(r->zstd_error, r->zstd_err_len, "Creating compression context initialization failed, error is %s.", ZSTD_getErrorName(init_result));
@@ -4905,7 +4963,7 @@ static int compress_zstd(const request_t *r, block_t *blk, int buflen)
 	}
 	offset += output.pos;
 
-	gdebug(NULL, "compress_zstd finished, input size = %d, output size = %d.", buflen, offset);
+	gdebug(NULL, "compress_zstd finished, input size = %d, output size = %d, compression level = %d.", buflen, offset, opt.compress_level);
 
 	return offset;
 }
diff --git a/src/bin/gpfdist/regress/input/gpfdist2_compress.source b/src/bin/gpfdist/regress/input/gpfdist2_compress.source
index ba9379fc9e5..7af836dddda 100644
--- a/src/bin/gpfdist/regress/input/gpfdist2_compress.source
+++ b/src/bin/gpfdist/regress/input/gpfdist2_compress.source
@@ -12,7 +12,7 @@ CREATE TABLE REG_REGION (R_REGIONKEY INT, R_NAME CHAR(25), R_COMMENT VARCHAR(152
 DROP EXTERNAL WEB TABLE IF EXISTS gpfdist2_start;
 DROP EXTERNAL WEB TABLE IF EXISTS gpfdist2_stop;
 CREATE EXTERNAL WEB TABLE gpfdist2_start (x text)
-execute E'((@bindir@/gpfdist -p 7070 -d @abs_srcdir@/data --compress </dev/null >/dev/null 2>&1 &); for i in `seq 1 30`; do curl 127.0.0.1:7070 >/dev/null 2>&1 && break; sleep 1; done; echo "starting...") '
+execute E'((@bindir@/gpfdist -p 7070 -d @abs_srcdir@/data --compress --compress-level 3 </dev/null >/dev/null 2>&1 &); for i in `seq 1 30`; do curl 127.0.0.1:7070 >/dev/null 2>&1 && break; sleep 1; done; echo "starting...") '
 on SEGMENT 0
 FORMAT 'text' (delimiter '|');
 
diff --git a/src/bin/gpfdist/regress/output/gpfdist2_compress.source b/src/bin/gpfdist/regress/output/gpfdist2_compress.source
index a14f9c7a16d..27023a8acd2 100644
--- a/src/bin/gpfdist/regress/output/gpfdist2_compress.source
+++ b/src/bin/gpfdist/regress/output/gpfdist2_compress.source
@@ -12,7 +12,7 @@ CREATE TABLE REG_REGION (R_REGIONKEY INT, R_NAME CHAR(25), R_COMMENT VARCHAR(152
 DROP EXTERNAL WEB TABLE IF EXISTS gpfdist2_start;
 DROP EXTERNAL WEB TABLE IF EXISTS gpfdist2_stop;
 CREATE EXTERNAL WEB TABLE gpfdist2_start (x text)
-execute E'((@bindir@/gpfdist -p 7070 -d @abs_srcdir@/data --compress </dev/null >/dev/null 2>&1 &); for i in `seq 1 30`; do curl 127.0.0.1:7070 >/dev/null 2>&1 && break; sleep 1; done; echo "starting...") '
+execute E'((@bindir@/gpfdist -p 7070 -d @abs_srcdir@/data --compress --compress-level 3 </dev/null >/dev/null 2>&1 &); for i in `seq 1 30`; do curl 127.0.0.1:7070 >/dev/null 2>&1 && break; sleep 1; done; echo "starting...") '
 on SEGMENT 0
 FORMAT 'text' (delimiter '|');
 CREATE EXTERNAL WEB TABLE gpfdist2_stop (x text)
diff --git a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat
index 696791f1015..f761ce7c883 100644
--- a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat
+++ b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat
@@ -1,2 +1,2 @@
-call "C:\Program Files\Cloudberry\greenplum-clients\greenplum_clients_path.bat"
+call "C:\Program Files\Cloudberry\greenplum-clients\cloudberry_clients_path.bat"
 gpfdist -p 7070 -d .\ --ssl gpfdist_ssl\certs_not_matching
diff --git a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat
index 2c75d07330f..201e1a3dd86 100644
--- a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat
+++ b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat
@@ -1,3 +1,3 @@
-call "C:\Program Files\Cloudberry\greenplum-clients\greenplum_clients_path.bat"
+call "C:\Program Files\Cloudberry\greenplum-clients\cloudberry_clients_path.bat"
 del gpfdist_ssl\tbl2.tbl
 gpfdist -p 7070 -d .\ --ssl gpfdist_ssl\certs_matching
diff --git a/src/bin/gpfts/failover/docker_master_check_back.sh b/src/bin/gpfts/failover/docker_master_check_back.sh
index 9b1ab8806f7..0db97596ac5 100755
--- a/src/bin/gpfts/failover/docker_master_check_back.sh
+++ b/src/bin/gpfts/failover/docker_master_check_back.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 if !type gpssh >/dev/null 2>&1; then 
     echo "[FATAL]:- gpssh not exist, script Exits!"
diff --git a/src/bin/gpfts/failover/docker_segment_check_back.sh b/src/bin/gpfts/failover/docker_segment_check_back.sh
index 2776415b40e..94bb4b3c4da 100755
--- a/src/bin/gpfts/failover/docker_segment_check_back.sh
+++ b/src/bin/gpfts/failover/docker_segment_check_back.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 
 if !type gpssh >/dev/null 2>&1; then 
     echo "[FATAL]:- gpssh not exist, script Exits!"
diff --git a/src/bin/gpfts/failover/docker_standby_check_back.sh b/src/bin/gpfts/failover/docker_standby_check_back.sh
index 81abd790efb..fe2dce7bca3 100755
--- a/src/bin/gpfts/failover/docker_standby_check_back.sh
+++ b/src/bin/gpfts/failover/docker_standby_check_back.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 
 if !type gpssh >/dev/null 2>&1; then 
     echo "[FATAL]:- gpssh not exist, script Exits!"
diff --git a/src/bin/gpfts/failover/master_check_back.sh b/src/bin/gpfts/failover/master_check_back.sh
index 9b1ab8806f7..0db97596ac5 100755
--- a/src/bin/gpfts/failover/master_check_back.sh
+++ b/src/bin/gpfts/failover/master_check_back.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 if !type gpssh >/dev/null 2>&1; then 
     echo "[FATAL]:- gpssh not exist, script Exits!"
diff --git a/src/bin/gpfts/failover/segment_all_down.sh b/src/bin/gpfts/failover/segment_all_down.sh
index 954801b923b..1121f54fbbc 100755
--- a/src/bin/gpfts/failover/segment_all_down.sh
+++ b/src/bin/gpfts/failover/segment_all_down.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 if !type pg_ctl >/dev/null 2>&1; then 
     echo "[FATAL]:- pg_ctl not exist, script Exits!"
diff --git a/src/bin/gpfts/failover/segment_check_back.sh b/src/bin/gpfts/failover/segment_check_back.sh
index 91f57d69107..ec55ab64982 100755
--- a/src/bin/gpfts/failover/segment_check_back.sh
+++ b/src/bin/gpfts/failover/segment_check_back.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 if !type gprecoverseg >/dev/null 2>&1; then 
     echo "[FATAL]:- gprecoverseg not exist, script Exits!"
diff --git a/src/bin/gpfts/failover/standby_check_back.sh b/src/bin/gpfts/failover/standby_check_back.sh
index 81abd790efb..fe2dce7bca3 100755
--- a/src/bin/gpfts/failover/standby_check_back.sh
+++ b/src/bin/gpfts/failover/standby_check_back.sh
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env bash
 
 if !type gpssh >/dev/null 2>&1; then 
     echo "[FATAL]:- gpssh not exist, script Exits!"
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 42c22a0690a..53c3a82a45e 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -3391,6 +3391,11 @@ main(int argc, char *argv[])
 				pwprompt = true;
 				break;
 			case 'U':
+				if (optarg[0] == '\0')
+				{
+					pg_log_error("superuser name must not be empty.");
+					exit(1);
+				}
 				username = pg_strdup(optarg);
 				break;
 			case 'd':
diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl
index 635ff79b475..7d3ab3e38cd 100644
--- a/src/bin/initdb/t/001_initdb.pl
+++ b/src/bin/initdb/t/001_initdb.pl
@@ -11,7 +11,7 @@
 use File::stat qw{lstat};
 use PostgresNode;
 use TestLib;
-use Test::More tests => 22;
+use Test::More tests => 22 + 2;
 
 my $tempdir = TestLib::tempdir;
 my $xlogdir = "$tempdir/pgxlog";
@@ -38,6 +38,11 @@
 	[ 'initdb', '-U', 'pg_test', $datadir ],
 	'role names cannot begin with "pg_"');
 
+command_fails_like(
+	[ 'initdb', '--username' => '', $datadir ],
+	qr/superuser name must not be empty./,
+	'empty username not allowed');
+
 mkdir $datadir;
 
 # make sure we run one successful test without a TZ setting so we test
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index e47f354cfdd..661e19605f6 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -125,7 +125,6 @@ getSchemaData(Archive *fout, int *numTablesPtr)
 	int			numForeignServers;
 	int			numDefaultACLs;
 	int			numEventTriggers;
-	int  		numTypeStorageOptions;
 
 	/* GPDB specific variables */
 	int			numExtProtocols;
@@ -171,10 +170,6 @@ getSchemaData(Archive *fout, int *numTablesPtr)
 	pg_log_info("reading user-defined types");
 	(void) getTypes(fout, &numTypes);
 
-	/* this must be after getFuncs */
-	pg_log_info("reading type storage options");
-	getTypeStorageOptions(fout, &numTypeStorageOptions);
-
 	/* this must be after getFuncs, too */
 	pg_log_info("reading procedural languages");
 	getProcLangs(fout, &numProcLangs);
@@ -250,6 +245,9 @@ getSchemaData(Archive *fout, int *numTablesPtr)
 	pg_log_info("flagging inherited columns in subtables");
 	flagInhAttrs(fout->dopt, tblinfo, numTables);
 
+	pg_log_info("reading partitioning data");
+	getPartitioningInfo(fout);
+
 	pg_log_info("reading indexes");
 	getIndexes(fout, tblinfo, numTables);
 
@@ -302,7 +300,6 @@ static void
 flagInhTables(Archive *fout, TableInfo *tblinfo, int numTables,
 			  InhInfo *inhinfo, int numInherits)
 {
-	DumpOptions *dopt = fout->dopt;
 	int			i,
 				j;
 
@@ -318,26 +315,18 @@ flagInhTables(Archive *fout, TableInfo *tblinfo, int numTables,
 			continue;
 
 		/*
-		 * FIXME: In PostgreSQL, foreign tables can be inherited. But
-		 * pg_dump chokes on external tables, if an external table is
-		 * used as a partition, and a column has attislocal=false.
-		 */
-		if (tblinfo[i].relstorage == 'x' /* RELSTORAGE_EXTERNAL */)
-			continue;
-
-		/*
-		 * Normally, we don't bother computing anything for non-target tables,
-		 * but if load-via-partition-root is specified, we gather information
-		 * on every partition in the system so that getRootTableInfo can trace
-		 * from any given to leaf partition all the way up to the root.  (We
-		 * don't need to mark them as interesting for getTableAttrs, though.)
+		 * Normally, we don't bother computing anything for non-target tables.
+		 * However, we must find the parents of non-root partitioned tables in
+		 * any case, so that we can trace from leaf partitions up to the root
+		 * (in case a leaf is to be dumped but its parents are not).  We need
+		 * not mark such parents interesting for getTableAttrs, though.
 		 */
 		if (!tblinfo[i].dobj.dump)
 		{
 			mark_parents = false;
 
-			if (!dopt->load_via_partition_root ||
-				!tblinfo[i].ispartition)
+			if (!(tblinfo[i].relkind == RELKIND_PARTITIONED_TABLE &&
+				  tblinfo[i].ispartition))
 				find_parents = false;
 		}
 
diff --git a/src/bin/pg_dump/meson.build b/src/bin/pg_dump/meson.build
new file mode 100644
index 00000000000..b2fb7ac77fd
--- /dev/null
+++ b/src/bin/pg_dump/meson.build
@@ -0,0 +1,105 @@
+# Copyright (c) 2022-2023, PostgreSQL Global Development Group
+
+pg_dump_common_sources = files(
+  'compress_gzip.c',
+  'compress_io.c',
+  'compress_lz4.c',
+  'compress_none.c',
+  'dumputils.c',
+  'parallel.c',
+  'pg_backup_archiver.c',
+  'pg_backup_custom.c',
+  'pg_backup_db.c',
+  'pg_backup_directory.c',
+  'pg_backup_null.c',
+  'pg_backup_tar.c',
+  'pg_backup_utils.c',
+)
+
+pg_dump_common = static_library('libpgdump_common',
+  pg_dump_common_sources,
+  c_pch: pch_postgres_fe_h,
+  dependencies: [frontend_code, libpq, lz4, zlib],
+  kwargs: internal_lib_args,
+)
+
+
+pg_dump_sources = files(
+  'common.c',
+  'pg_dump.c',
+  'pg_dump_sort.c',
+)
+
+if host_system == 'windows'
+  pg_dump_sources += rc_bin_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'pg_dump',
+    '--FILEDESC', 'pg_dump - backup one PostgreSQL database',])
+endif
+
+pg_dump = executable('pg_dump',
+  pg_dump_sources,
+  link_with: [pg_dump_common],
+  dependencies: [frontend_code, libpq, zlib],
+  kwargs: default_bin_args,
+)
+bin_targets += pg_dump
+
+
+pg_dumpall_sources = files(
+  'pg_dumpall.c',
+)
+
+if host_system == 'windows'
+  pg_dumpall_sources += rc_bin_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'pg_dumpall',
+    '--FILEDESC', 'pg_dumpall - backup PostgreSQL databases'])
+endif
+
+pg_dumpall = executable('pg_dumpall',
+  pg_dumpall_sources,
+  link_with: [pg_dump_common],
+  dependencies: [frontend_code, libpq, zlib],
+  kwargs: default_bin_args,
+)
+bin_targets += pg_dumpall
+
+
+pg_restore_sources = files(
+  'pg_restore.c',
+)
+
+if host_system == 'windows'
+  pg_restore_sources += rc_bin_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'pg_restore',
+    '--FILEDESC', 'pg_restore - restore PostgreSQL databases'])
+endif
+
+pg_restore = executable('pg_restore',
+  pg_restore_sources,
+  link_with: [pg_dump_common],
+  dependencies: [frontend_code, libpq, zlib],
+  kwargs: default_bin_args,
+)
+bin_targets += pg_restore
+
+tests += {
+  'name': 'pg_dump',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'tap': {
+    'env': {
+      'GZIP_PROGRAM': gzip.path(),
+      'LZ4': program_lz4.found() ? program_lz4.path() : '',
+      'with_icu': icu.found() ? 'yes' : 'no',
+    },
+    'tests': [
+      't/001_basic.pl',
+      't/002_pg_dump.pl',
+      't/003_pg_dump_with_server.pl',
+      't/004_pg_dump_parallel.pl',
+      't/010_dump_connstr.pl',
+    ],
+  },
+}
+
+subdir('po', if_found: libintl)
diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index df7470feb2d..e7f8140fb24 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -184,6 +184,18 @@ typedef struct _dumpOptions
 	int			do_nothing;
 } DumpOptions;
 
+
+typedef enum
+{
+	Greenplum,
+	Cloudberry
+} DatabaseType;
+
+typedef struct
+{
+	DatabaseType type;
+	int version;
+} DatabaseVersion;
 /*
  *	We may want to have some more user-readable data, but in the mean
  *	time this gives us some abstraction and type checking.
@@ -216,6 +228,8 @@ typedef struct Archive
 	bool		exit_on_error;	/* whether to exit on SQL errors... */
 	int			n_errors;		/* number of errors (if no die) */
 
+	DatabaseVersion version;
+
 	/* The rest is private */
 } Archive;
 
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index b2ae4aaf046..70131b7af63 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -93,6 +93,7 @@ static RestorePass _tocEntryRestorePass(TocEntry *te);
 static bool _tocEntryIsACL(TocEntry *te);
 static void _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te);
 static void _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te);
+static bool is_load_via_partition_root(TocEntry *te);
 static void buildTocEntryArrays(ArchiveHandle *AH);
 static void _moveBefore(TocEntry *pos, TocEntry *te);
 static int	_discoverArchiveFormat(ArchiveHandle *AH);
@@ -892,6 +893,8 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 				}
 				else
 				{
+					bool		use_truncate;
+
 					_disableTriggersIfNecessary(AH, te);
 
 					/* Select owner and schema as necessary */
@@ -903,13 +906,24 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 
 					/*
 					 * In parallel restore, if we created the table earlier in
-					 * the run then we wrap the COPY in a transaction and
-					 * precede it with a TRUNCATE.  If archiving is not on
-					 * this prevents WAL-logging the COPY.  This obtains a
-					 * speedup similar to that from using single_txn mode in
-					 * non-parallel restores.
+					 * this run (so that we know it is empty) and we are not
+					 * restoring a load-via-partition-root data item then we
+					 * wrap the COPY in a transaction and precede it with a
+					 * TRUNCATE.  If wal_level is set to minimal this prevents
+					 * WAL-logging the COPY.  This obtains a speedup similar
+					 * to that from using single_txn mode in non-parallel
+					 * restores.
+					 *
+					 * We mustn't do this for load-via-partition-root cases
+					 * because some data might get moved across partition
+					 * boundaries, risking deadlock and/or loss of previously
+					 * loaded data.  (We assume that all partitions of a
+					 * partitioned table will be treated the same way.)
 					 */
-					if (is_parallel && te->created)
+					use_truncate = is_parallel && te->created &&
+						!is_load_via_partition_root(te);
+
+					if (use_truncate)
 					{
 						/*
 						 * Parallel restore is always talking directly to a
@@ -950,7 +964,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 					AH->outputKind = OUTPUT_SQLCMDS;
 
 					/* close out the transaction started above */
-					if (is_parallel && te->created)
+					if (use_truncate)
 						CommitTransaction(&AH->public);
 
 					_enableTriggersIfNecessary(AH, te);
@@ -1048,6 +1062,43 @@ _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te)
 			 fmtQualifiedId(te->namespace, te->tag));
 }
 
+/*
+ * Detect whether a TABLE DATA TOC item is performing "load via partition
+ * root", that is the target table is an ancestor partition rather than the
+ * table the TOC item is nominally for.
+ *
+ * In newer archive files this can be detected by checking for a special
+ * comment placed in te->defn.  In older files we have to fall back to seeing
+ * if the COPY statement targets the named table or some other one.  This
+ * will not work for data dumped as INSERT commands, so we could give a false
+ * negative in that case; fortunately, that's a rarely-used option.
+ */
+static bool
+is_load_via_partition_root(TocEntry *te)
+{
+	if (te->defn &&
+		strncmp(te->defn, "-- load via partition root ", 27) == 0)
+		return true;
+	if (te->copyStmt && *te->copyStmt)
+	{
+		PQExpBuffer copyStmt = createPQExpBuffer();
+		bool		result;
+
+		/*
+		 * Build the initial part of the COPY as it would appear if the
+		 * nominal target table is the actual target.  If we see anything
+		 * else, it must be a load-via-partition-root case.
+		 */
+		appendPQExpBuffer(copyStmt, "COPY %s ",
+						  fmtQualifiedId(te->namespace, te->tag));
+		result = strncmp(te->copyStmt, copyStmt->data, copyStmt->len) != 0;
+		destroyPQExpBuffer(copyStmt);
+		return result;
+	}
+	/* Assume it's not load-via-partition-root */
+	return false;
+}
+
 /*
  * This is a routine that is part of the dumper interface, hence the 'Archive*' parameter.
  */
@@ -3020,8 +3071,12 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
 			res = res & ~REQ_DATA;
 	}
 
-	/* If there's no definition command, there's no schema component */
-	if (!te->defn || !te->defn[0])
+	/*
+	 * If there's no definition command, there's no schema component.  Treat
+	 * "load via partition root" comments as not schema.
+	 */
+	if (!te->defn || !te->defn[0] ||
+		strncmp(te->defn, "-- load via partition root ", 27) == 0)
 		res = res & ~REQ_SCHEMA;
 
 	/*
@@ -4880,43 +4935,8 @@ CloneArchive(ArchiveHandle *AH)
 
 	/* re-establish fixed state */
 	if (AH->mode == archModeRead)
-	{
-		Assert(AH->connection == NULL);
-
-		/* this also sets clone->connection */
-		ConnectDatabase((Archive *) clone, &clone->public.ropt->cparams, true, false);
-
-		/* re-establish fixed state */
 		_doSetFixedOutputState(clone);
-	}
-	else
-	{
-		PQExpBufferData connstr;
-		char	   *pghost;
-		char	   *pgport;
-		char	   *username;
-
-		Assert(AH->connection != NULL);
-
-		/*
-		 * Even though we are technically accessing the parent's database
-		 * object here, these functions are fine to be called like that
-		 * because all just return a pointer and do not actually send/receive
-		 * any data to/from the database.
-		 */
-		initPQExpBuffer(&connstr);
-		appendPQExpBufferStr(&connstr, "dbname=");
-		appendConnStrVal(&connstr, PQdb(AH->connection));
-		pghost = PQhost(AH->connection);
-		pgport = PQport(AH->connection);
-		username = PQuser(AH->connection);
-
-		/* this also sets clone->connection */
-		ConnectDatabase((Archive *) clone, &clone->public.ropt->cparams, true, false);
-
-		termPQExpBuffer(&connstr);
-		/* setupDumpWorker will fix up connection state */
-	}
+	/* in write case, setupDumpWorker will fix up connection state */
 
 	/* Let the format-specific code have a chance too */
 	clone->ClonePtr(clone);
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index e59cf998dec..967e35ec7f2 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -35,6 +35,10 @@ _check_database_version(ArchiveHandle *AH)
 	const char *remoteversion_str;
 	int			remoteversion;
 	PGresult   *res;
+	char	   *version;
+	char		dbstring[1024];
+	char		dbstring2[1024];
+	int			v1;
 
 	remoteversion_str = PQparameterStatus(AH->connection, "server_version");
 	remoteversion = PQserverVersion(AH->connection);
@@ -68,6 +72,29 @@ _check_database_version(ArchiveHandle *AH)
 	}
 	else
 		AH->public.isStandby = false;
+
+	res = ExecuteSqlQueryForSingleRow((Archive *) AH, "SELECT version()");
+
+	version = PQgetvalue(res, 0, 0);
+
+	if(sscanf(version, "%*[^(](%s %s %d.%*d.%*d-%*[^)])", dbstring, dbstring2, &v1) != 3)
+		pg_log_error("could not get version output from select version();\n");
+
+	if (strcasecmp("Greenplum", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+	{
+		AH->public.version.type = Greenplum;
+		AH->public.version.version = v1;
+
+	} else if((strcasecmp("Cloudberry", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+				|| (strcasecmp("Apache", dbstring) == 0 && strcasecmp("Cloudberry", dbstring2) == 0))
+	{
+		AH->public.version.type = Cloudberry;
+		AH->public.version.version = v1;
+	}
+	else
+		pg_log_error("could not upgrade from non Greenplum/Cloudberry version: %s %s\n", dbstring, dbstring2);
+
+	PQclear(res);
 }
 
 /*
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index cb4b6e1db4c..7ea694ce07d 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -266,7 +266,6 @@ static void dumpForeignServer(Archive *fout, const ForeignServerInfo *srvinfo);
 
 /* GPDB follow upstream style */
 static void dumpExtProtocol(Archive *fout, const ExtProtInfo *ptcinfo);
-static void dumpTypeStorageOptions(Archive *fout, const TypeStorageOptions *tstorageoptions);
 
 static void dumpUserMappings(Archive *fout,
 							 const char *servername, const char *namespace,
@@ -364,9 +363,11 @@ static void appendReloptionsArrayAH(PQExpBuffer buffer, const char *reloptions,
 static char *get_synchronized_snapshot(Archive *fout);
 static void setupDumpWorker(Archive *AHX);
 static TableInfo *getRootTableInfo(const TableInfo *tbinfo);
+static bool forcePartitionRootLoad(const TableInfo *tbinfo);
 
 
 /* START MPP ADDITION */
+static void dumpTypeStorageOptions(Archive *fout, const TypeInfo *tyinfo);
 static void setExtPartDependency(TableInfo *tblinfo, int numTables);
 static char *format_table_function_columns(Archive *fout, const FuncInfo *finfo, int nallargs,
 							  char **allargtypes,
@@ -2537,11 +2538,13 @@ dumpTableData_insert(Archive *fout, const void *dcontext)
 			insertStmt = createPQExpBuffer();
 
 			/*
-			 * When load-via-partition-root is set, get the root table name
-			 * for the partition table, so that we can reload data through the
-			 * root table.
+			 * When load-via-partition-root is set or forced, get the root
+			 * table name for the partition table, so that we can reload data
+			 * through the root table.
 			 */
-			if (dopt->load_via_partition_root && tbinfo->ispartition)
+			if (tbinfo->ispartition &&
+				(dopt->load_via_partition_root ||
+				 forcePartitionRootLoad(tbinfo)))
 				targettab = getRootTableInfo(tbinfo);
 			else
 				targettab = tbinfo;
@@ -2739,6 +2742,35 @@ getRootTableInfo(const TableInfo *tbinfo)
 	return parentTbinfo;
 }
 
+/*
+ * forcePartitionRootLoad
+ *     Check if we must force load_via_partition_root for this partition.
+ *
+ * This is required if any level of ancestral partitioned table has an
+ * unsafe partitioning scheme.
+ */
+static bool
+forcePartitionRootLoad(const TableInfo *tbinfo)
+{
+	TableInfo  *parentTbinfo;
+
+	Assert(tbinfo->ispartition);
+	Assert(tbinfo->numParents == 1);
+
+	parentTbinfo = tbinfo->parents[0];
+	if (parentTbinfo->unsafe_partitions)
+		return true;
+	while (parentTbinfo->ispartition)
+	{
+		Assert(parentTbinfo->numParents == 1);
+		parentTbinfo = parentTbinfo->parents[0];
+		if (parentTbinfo->unsafe_partitions)
+			return true;
+	}
+
+	return false;
+}
+
 /*
  * dumpTableData -
  *	  dump the contents of a single table
@@ -2753,34 +2785,40 @@ dumpTableData(Archive *fout, const TableDataInfo *tdinfo)
 	PQExpBuffer copyBuf = createPQExpBuffer();
 	PQExpBuffer clistBuf = createPQExpBuffer();
 	DataDumperPtr dumpFn;
+	char	   *tdDefn = NULL;
 	char	   *copyStmt;
 	const char *copyFrom;
 
 	/* We had better have loaded per-column details about this table */
 	Assert(tbinfo->interesting);
 
+	/*
+	 * When load-via-partition-root is set or forced, get the root table name
+	 * for the partition table, so that we can reload data through the root
+	 * table.  Then construct a comment to be inserted into the TOC entry's
+	 * defn field, so that such cases can be identified reliably.
+	 */
+	if (tbinfo->ispartition &&
+		(dopt->load_via_partition_root ||
+		 forcePartitionRootLoad(tbinfo)))
+	{
+		TableInfo  *parentTbinfo;
+
+		parentTbinfo = getRootTableInfo(tbinfo);
+		copyFrom = fmtQualifiedDumpable(parentTbinfo);
+		printfPQExpBuffer(copyBuf, "-- load via partition root %s",
+						  copyFrom);
+		tdDefn = pg_strdup(copyBuf->data);
+	}
+	else
+		copyFrom = fmtQualifiedDumpable(tbinfo);
+
 	if (dopt->dump_inserts == 0)
 	{
 		/* Dump/restore using COPY */
 		dumpFn = dumpTableData_copy;
-
-		/*
-		 * When load-via-partition-root is set, get the root table name for
-		 * the partition table, so that we can reload data through the root
-		 * table.
-		 */
-		if (dopt->load_via_partition_root && tbinfo->ispartition)
-		{
-			TableInfo  *parentTbinfo;
-
-			parentTbinfo = getRootTableInfo(tbinfo);
-			copyFrom = fmtQualifiedDumpable(parentTbinfo);
-		}
-		else
-			copyFrom = fmtQualifiedDumpable(tbinfo);
-
 		/* must use 2 steps here 'cause fmtId is nonreentrant */
-		appendPQExpBuffer(copyBuf, "COPY %s ",
+		printfPQExpBuffer(copyBuf, "COPY %s ",
 						  copyFrom);
 		appendPQExpBuffer(copyBuf, "%s FROM stdin;\n",
 						  fmtCopyColumnList(tbinfo, clistBuf));
@@ -2808,6 +2846,7 @@ dumpTableData(Archive *fout, const TableDataInfo *tdinfo)
 									   .owner = tbinfo->rolname,
 									   .description = "TABLE DATA",
 									   .section = SECTION_DATA,
+									   .createStmt = tdDefn,
 									   .copyStmt = copyStmt,
 									   .deps = &(tbinfo->dobj.dumpId),
 									   .nDeps = 1,
@@ -5909,6 +5948,7 @@ getTypes(Archive *fout, int *numTypes)
 	int			i_typtype;
 	int			i_typisdefined;
 	int			i_isarray;
+	int			i_typstorage;
 
 	/*
 	 * we include even the built-in types because those may be used as array
@@ -5949,8 +5989,10 @@ getTypes(Archive *fout, int *numTypes)
 						  "ELSE (SELECT relkind FROM pg_class WHERE oid = t.typrelid) END AS typrelkind, "
 						  "t.typtype, t.typisdefined, "
 						  "t.typname[0] = '_' AND t.typelem != 0 AND "
-						  "(SELECT typarray FROM pg_type te WHERE oid = t.typelem) = t.oid AS isarray "
+						  "(SELECT typarray FROM pg_type te WHERE oid = t.typelem) = t.oid AS isarray, "
+							"coalesce(array_to_string(e.typoptions, ', '), '') AS typstorage "
 						  "FROM pg_type t "
+							"LEFT JOIN pg_type_encoding e ON t.oid = e.typid "
 						  "LEFT JOIN pg_init_privs pip ON "
 						  "(t.oid = pip.objoid "
 						  "AND pip.classoid = 'pg_type'::regclass "
@@ -6018,6 +6060,7 @@ getTypes(Archive *fout, int *numTypes)
 	i_typtype = PQfnumber(res, "typtype");
 	i_typisdefined = PQfnumber(res, "typisdefined");
 	i_isarray = PQfnumber(res, "isarray");
+	i_typstorage = PQfnumber(res, "typstorage");
 
 	for (i = 0; i < ntups; i++)
 	{
@@ -6050,6 +6093,8 @@ getTypes(Archive *fout, int *numTypes)
 		else
 			tyinfo[i].isArray = false;
 
+		tyinfo[i].typstorage = pg_strdup(PQgetvalue(res, i, i_typstorage));
+
 		if (tyinfo[i].typtype == 'm')
 			tyinfo[i].isMultirange = true;
 		else
@@ -6118,91 +6163,6 @@ getTypes(Archive *fout, int *numTypes)
 	return tyinfo;
 }
 
-
-
-/*
- * getTypeStorageOptions:
- *	  read all types with storage options in the system catalogs and return them in the
- * TypeStorageOptions* structure
- *
- *	numTypes is set to the number of types with storage options read in
- *
- */
-TypeStorageOptions *
-getTypeStorageOptions(Archive *fout, int *numTypes)
-{
-	PGresult   *res;
-	int			ntups;
-	int			i;
-	PQExpBuffer query = createPQExpBuffer();
-	TypeStorageOptions   *tstorageoptions;
-	int			i_tableoid;
-	int			i_oid;
-	int			i_typname;
-	int			i_typnamespace;
-	int			i_typoptions;
-	int			i_rolname;
-
-	/*
-	 * The following statement used format_type to resolve an internal name to its equivalent sql name.
-	 * The format_type seems to do two things, it translates an internal type name (e.g. bpchar) into its
-	 * sql equivalent (e.g. character), and it puts trailing "[]" on a type if it is an array.
-	 * For any user defined type (ie. oid > 10000) or any type that might be an array (ie. starts with '_'),
-	 * then we will call quote_ident. If the type is a system defined type (i.e. oid <= 10000)
-	 * and can not possibly be an array (i.e. does not start with '_'), then call format_type to get the name. The
-	 * reason we do not call format_type for arrays is that it will return a '[]' on the end, which can not be used
-	 * when dumping the type.
-	 */
-	appendPQExpBuffer(query, "SELECT "
-					  "CASE WHEN t.oid > 10000 OR substring(t.typname from 1 for 1) = '_' "
-					  "THEN quote_ident(t.typname) "
-					  "ELSE pg_catalog.format_type(t.oid, NULL) "
-					  "END  as typname, "
-					  "t.tableoid as tableoid, "
-					  "t.oid AS oid, "
-					  "t.typnamespace AS typnamespace, "
-					  "(%s typowner) as rolname, "
-					  "array_to_string(a.typoptions, ', ') AS typoptions "
-					  "FROM pg_type t "
-					  "JOIN pg_catalog.pg_type_encoding a ON a.typid = t.oid "
-					  "WHERE t.typisdefined = 't'", username_subquery);
-
-	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
-
-	ntups = PQntuples(res);
-
-	tstorageoptions = (TypeStorageOptions *) pg_malloc(ntups * sizeof(TypeStorageOptions));
-
-	i_tableoid = PQfnumber(res, "tableoid");
-	i_oid = PQfnumber(res, "oid");
-	i_typname = PQfnumber(res, "typname");
-	i_typnamespace = PQfnumber(res, "typnamespace");
-	i_typoptions = PQfnumber(res, "typoptions");
-	i_rolname = PQfnumber(res, "rolname");
-
-	for (i = 0; i < ntups; i++)
-	{
-		tstorageoptions[i].dobj.objType = DO_TYPE_STORAGE_OPTIONS;
-		tstorageoptions[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
-		tstorageoptions[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
-		AssignDumpId(&tstorageoptions[i].dobj);
-		tstorageoptions[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_typname));
-		tstorageoptions[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_typnamespace)));
-		tstorageoptions[i].typoptions = pg_strdup(PQgetvalue(res, i, i_typoptions));
-		tstorageoptions[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
-	}
-
-	*numTypes = ntups;
-
-	PQclear(res);
-
-	destroyPQExpBuffer(query);
-
-	return tstorageoptions;
-}
-
-
-
 /*
  * getOperators:
  *	  read all operators in the system catalogs and return them in the
@@ -7424,7 +7384,7 @@ getTables(Archive *fout, int *numTables)
 						  "%s AS ispartition, "
 						  "%s AS partbound, "
 						  "c.relisivm AS isivm, "
-						  "c.relisdynamic AS isdynamic "
+						  "%s"
 						  "FROM pg_class c "
 						  "LEFT JOIN pg_depend d ON "
 						  "(c.relkind = '%c' AND "
@@ -7454,6 +7414,7 @@ getTables(Archive *fout, int *numTables)
 						  partkeydef,
 						  ispartition,
 						  partbound,
+						  (fout->version.type == Cloudberry && fout->version.version >= 2) ? "c.relisdynamic AS isdynamic " : "false AS isdynamic ",
 						  RELKIND_SEQUENCE,
 						  RELKIND_PARTITIONED_TABLE,
 						  RELKIND_RELATION, RELKIND_SEQUENCE,
@@ -8260,6 +8221,76 @@ getInherits(Archive *fout, int *numInherits)
 	return inhinfo;
 }
 
+/*
+ * getPartitioningInfo
+ *	  get information about partitioning
+ *
+ * For the most part, we only collect partitioning info about tables we
+ * intend to dump.  However, this function has to consider all partitioned
+ * tables in the database, because we need to know about parents of partitions
+ * we are going to dump even if the parents themselves won't be dumped.
+ *
+ * Specifically, what we need to know is whether each partitioned table
+ * has an "unsafe" partitioning scheme that requires us to force
+ * load-via-partition-root mode for its children.  Currently the only case
+ * for which we force that is hash partitioning on enum columns, since the
+ * hash codes depend on enum value OIDs which won't be replicated across
+ * dump-and-reload.  There are other cases in which load-via-partition-root
+ * might be necessary, but we expect users to cope with them.
+ */
+void
+getPartitioningInfo(Archive *fout)
+{
+	PQExpBuffer query;
+	PGresult   *res;
+	int			ntups;
+
+	/* hash partitioning didn't exist before v11 */
+	if (fout->remoteVersion < 110000)
+		return;
+	/* needn't bother if schema-only dump */
+	if (fout->dopt->schemaOnly)
+		return;
+
+	query = createPQExpBuffer();
+
+	/*
+	 * Unsafe partitioning schemes are exactly those for which hash enum_ops
+	 * appears among the partition opclasses.  We needn't check partstrat.
+	 *
+	 * Note that this query may well retrieve info about tables we aren't
+	 * going to dump and hence have no lock on.  That's okay since we need not
+	 * invoke any unsafe server-side functions.
+	 */
+	appendPQExpBufferStr(query,
+						 "SELECT partrelid FROM pg_partitioned_table WHERE\n"
+						 "(SELECT c.oid FROM pg_opclass c JOIN pg_am a "
+						 "ON c.opcmethod = a.oid\n"
+						 "WHERE opcname = 'enum_ops' "
+						 "AND opcnamespace = 'pg_catalog'::regnamespace "
+						 "AND amname = 'hash') = ANY(partclass)");
+
+	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
+
+	ntups = PQntuples(res);
+
+	for (int i = 0; i < ntups; i++)
+	{
+		Oid			tabrelid = atooid(PQgetvalue(res, i, 0));
+		TableInfo  *tbinfo;
+
+		tbinfo = findTableByOid(tabrelid);
+		if (tbinfo == NULL)
+			fatal("failed sanity check, table OID %u appearing in pg_partitioned_table not found",
+					 tabrelid);
+		tbinfo->unsafe_partitions = true;
+	}
+
+	PQclear(res);
+
+	destroyPQExpBuffer(query);
+}
+
 /*
  * getIndexes
  *	  get information about every index on a dumpable table
@@ -11379,9 +11410,6 @@ dumpDumpableObject(Archive *fout, const DumpableObject *dobj)
 		case DO_TYPE:
 			dumpType(fout, (const TypeInfo *) dobj);
 			break;
-		case DO_TYPE_STORAGE_OPTIONS:
-			dumpTypeStorageOptions(fout, (const TypeStorageOptions *) dobj);
-			break;
 		case DO_SHELL_TYPE:
 			dumpShellType(fout, (const ShellTypeInfo *) dobj);
 			break;
@@ -11762,6 +11790,10 @@ dumpType(Archive *fout, const TypeInfo *tyinfo)
 	else
 		pg_log_warning("typtype of data type \"%s\" appears to be invalid",
 					   tyinfo->dobj.name);
+
+	if (tyinfo->typstorage && *tyinfo->typstorage != '\0')
+		dumpTypeStorageOptions(fout, tyinfo);
+
 }
 
 /*
@@ -12377,36 +12409,28 @@ dumpBaseType(Archive *fout, const TypeInfo *tyinfo)
  *     writes out to fout the ALTER TYPE queries to set default storage options for type
  */
 static void
-dumpTypeStorageOptions(Archive *fout, const TypeStorageOptions *tstorageoptions)
+dumpTypeStorageOptions(Archive *fout, const TypeInfo *tyinfo)
 {
 	PQExpBuffer q;
-	PQExpBuffer delq;
-
 	q = createPQExpBuffer();
-	delq = createPQExpBuffer();
 
-	/*
-	 * Type name is already quoted by caller using quote_ident, hence used
-	 * directly here.
-	 */
 	appendPQExpBuffer(q, "ALTER TYPE %s.",
-					  fmtId(tstorageoptions->dobj.namespace->dobj.name));
+					  fmtId(tyinfo->dobj.namespace->dobj.name));
 	appendPQExpBuffer(q, "%s SET DEFAULT ENCODING (%s);\n",
-					  tstorageoptions->dobj.name,
-					  tstorageoptions->typoptions);
+					  fmtId(tyinfo->dobj.name),
+					  tyinfo->typstorage);
 
 	ArchiveEntry(fout,
-				 tstorageoptions->dobj.catId,
-				 tstorageoptions->dobj.dumpId,
-				 ARCHIVE_OPTS(.tag = tstorageoptions->dobj.name,
-				 			  .namespace = tstorageoptions->dobj.namespace->dobj.name,
-							  .owner = tstorageoptions->rolname,
+				 tyinfo->dobj.catId,
+				 tyinfo->dobj.dumpId,
+				 ARCHIVE_OPTS(.tag = tyinfo->dobj.name,
+							  .namespace = tyinfo->dobj.namespace->dobj.name,
+							  .owner = tyinfo->rolname,
 							  .description = "TYPE STORAGE OPTIONS",
 							  .section = SECTION_PRE_DATA,
 							  .createStmt = q->data));
 
 	destroyPQExpBuffer(q);
-	destroyPQExpBuffer(delq);
 }
 
 /*
@@ -15573,18 +15597,18 @@ dumpAgg(Archive *fout, const AggInfo *agginfo)
 	if (fout->remoteVersion >= 110000)
 		appendPQExpBufferStr(query,
 							 "aggfinalmodify,\n"
-							 "aggmfinalmodify\n");
+							 "aggmfinalmodify,\n");
 	else
 		appendPQExpBufferStr(query,
 							 "'0' AS aggfinalmodify,\n"
-							 "'0' AS aggmfinalmodify\n");
+							 "'0' AS aggmfinalmodify,\n");
 
-	if (fout->remoteVersion >= 140000)
+	if (fout->remoteVersion >= 140000 && fout->version.type == Cloudberry && fout->version.version >= 2)
 		appendPQExpBufferStr(query,
-								"aggrepsafeexec,\n");
+								"aggrepsafeexec\n");
 	else
 		appendPQExpBufferStr(query,
-								 "false AS aggrepsafeexec,\n");
+								 "false AS aggrepsafeexec\n");
 
 	appendPQExpBuffer(query,
 					  "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p "
@@ -18111,13 +18135,30 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
 			actual_atts = 0;
 
 		if (nonemptyReloptions(tbinfo->reloptions) ||
-			nonemptyReloptions(tbinfo->toast_reloptions))
+			nonemptyReloptions(tbinfo->toast_reloptions) ||
+			(tbinfo->amoid &&
+			(tbinfo->amoid == AO_ROW_TABLE_AM_OID ||
+			tbinfo->amoid == AO_COLUMN_TABLE_AM_OID)))
 		{
 			bool		addcomma = false;
 
 			appendPQExpBufferStr(q, "\nWITH (");
+			if (tbinfo->amoid && tbinfo->amoid == AO_ROW_TABLE_AM_OID)
+			{
+				addcomma = true;
+				appendPQExpBufferStr(q, "appendonly = true");
+			}
+			else if (tbinfo->amoid && tbinfo->amoid == AO_COLUMN_TABLE_AM_OID)
+			{
+				addcomma = true;
+				appendPQExpBufferStr(q, "appendonly = true, orientation = column");
+			}
+
 			if (nonemptyReloptions(tbinfo->reloptions))
 			{
+				if (addcomma)
+					appendPQExpBufferStr(q, ", ");
+
 				addcomma = true;
 				appendReloptionsArrayAH(q, tbinfo->reloptions, "", fout);
 			}
@@ -20904,7 +20945,6 @@ addBoundaryDependencies(DumpableObject **dobjs, int numObjs,
 			case DO_TRANSFORM:
 			case DO_BLOB:
 			case DO_EXTPROTOCOL:
-			case DO_TYPE_STORAGE_OPTIONS:
 			case DO_BINARY_UPGRADE:
 				/* Pre-data objects: must come before the pre-data boundary */
 				addObjectDependency(preDataBound, dobj->dumpId);
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index a0bf7f4ce86..81fa36289b3 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -77,7 +77,6 @@ typedef enum
 	DO_BLOB,
 	DO_BLOB_DATA,
 	DO_EXTPROTOCOL,
-	DO_TYPE_STORAGE_OPTIONS,
 	DO_PRE_DATA_BOUNDARY,
 	DO_POST_DATA_BOUNDARY,
 	DO_EVENT_TRIGGER,
@@ -178,12 +177,12 @@ typedef struct _typeInfo
 	 * result of format_type(), which will be quoted if needed, and might be
 	 * schema-qualified too.
 	 */
-	char	   *ftypname;
-	char	   *rolname;		/* name of owner, or empty string */
-	char	   *typacl;
-	char	   *rtypacl;
-	char	   *inittypacl;
-	char	   *initrtypacl;
+	char		*ftypname;
+	char		*rolname;		/* name of owner, or empty string */
+	char		*typacl;
+	char		*rtypacl;
+	char		*inittypacl;
+	char		*initrtypacl;
 	Oid			typelem;
 	Oid			typrelid;
 	char		typrelkind;		/* 'r', 'v', 'c', etc */
@@ -196,24 +195,10 @@ typedef struct _typeInfo
 	/* If it's a domain, we store links to its constraints here: */
 	int			nDomChecks;
 	struct _constraintInfo *domChecks;
+	char		*typstorage; /* GPDB: store the type's encoding clause */
 } TypeInfo;
 
 
-typedef struct _typeStorageOptions
-{
-	DumpableObject dobj;
-
-	/*
-	 * Note: dobj.name is the pg_type.typname entry.  format_type() might
-	 * produce something different than typname
-	 */
-	char     *typnamespace;
-	char     *typoptions; /* storage options */
-	char     *rolname;		/* name of owner, or empty string */
-} TypeStorageOptions;
-
-
-
 typedef struct _shellTypeInfo
 {
 	DumpableObject dobj;
@@ -341,6 +326,7 @@ typedef struct _tableInfo
 	bool		dummy_view;		/* view's real definition must be postponed */
 	bool		postponed_def;	/* matview must be postponed into post-data */
 	bool		ispartition;	/* is table a partition? */
+	bool		unsafe_partitions;	/* is it an unsafe partitioned table? */
 
 	/*
 	 * These fields are computed only if we decide the table is interesting
@@ -745,6 +731,7 @@ extern ConvInfo *getConversions(Archive *fout, int *numConversions);
 extern TableInfo *getTables(Archive *fout, int *numTables);
 extern void getOwnedSeqs(Archive *fout, TableInfo tblinfo[], int numTables);
 extern InhInfo *getInherits(Archive *fout, int *numInherits);
+extern void getPartitioningInfo(Archive *fout);
 extern void getIndexes(Archive *fout, TableInfo tblinfo[], int numTables);
 extern void getExtendedStatistics(Archive *fout);
 extern void getConstraints(Archive *fout, TableInfo tblinfo[], int numTables);
@@ -777,7 +764,6 @@ extern void getPublicationTables(Archive *fout, TableInfo tblinfo[],
 extern void getSubscriptions(Archive *fout);
 
 /* START MPP ADDITION */
-extern TypeStorageOptions *getTypeStorageOptions(Archive *fout, int *numTypes);
 extern ExtProtInfo *getExtProtocols(Archive *fout, int *numExtProtocols);
 extern BinaryUpgradeInfo *getBinaryUpgradeObjects(void);
 
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 4e3244ed1f7..c35a6da1f23 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -138,7 +138,6 @@ static const int dbObjectTypePriority[] =
 	21,							/* DO_BLOB */
 	25,							/* DO_BLOB_DATA */
 	8,							/* DO_EXTPROTOCOL */
-	21,							/* DO_TYPE_STORAGE_OPTIONS */
 	1,							/* DO_BINARY_UPGRADE */
 	22,							/* DO_PRE_DATA_BOUNDARY */
 	26,							/* DO_POST_DATA_BOUNDARY */
@@ -1287,11 +1286,6 @@ describeDumpableObject(DumpableObject *obj, char *buf, int bufsize)
 					 "TYPE %s  (ID %d OID %u)",
 					 obj->name, obj->dumpId, obj->catId.oid);
 			return;
-		case DO_TYPE_STORAGE_OPTIONS:
-			snprintf(buf, bufsize,
-					 "TYPE STORAGE OPTIONS FOR TYPE %s.%s  (ID %d OID %u) OPTIONS %s",
-					 ((TypeStorageOptions *)obj)->typnamespace, obj->name, obj->dumpId, obj->catId.oid, ((TypeStorageOptions *)obj)->typoptions);
-			return;
 		case DO_SHELL_TYPE:
 			snprintf(buf, bufsize,
 					 "SHELL TYPE %s  (ID %d OID %u)",
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 73310951b54..b193448d2a4 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1759,6 +1759,12 @@ dumpTablespaces(PGconn *conn)
 		/* needed for buildACLCommands() */
 		fspcname = pg_strdup(fmtId(spcname));
 
+		if (binary_upgrade)
+		{
+			appendPQExpBufferStr(buf, "\n-- For binary upgrade, must preserve pg_tablespace oid\n");
+			appendPQExpBuffer(buf, "SELECT pg_catalog.binary_upgrade_set_next_pg_tablespace_oid('%u'::pg_catalog.oid, '%s'::text);\n", spcoid, spcname);
+		}
+
 		appendPQExpBuffer(buf, "CREATE TABLESPACE %s", spcname);
 		appendPQExpBuffer(buf, " OWNER %s", fmtId(spcowner));
 
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index 32845170092..5b85ffa49fc 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -2022,6 +2022,16 @@
 		unlike => { exclude_dump_test_schema => 1, },
 	},
 
+	'ALTER TYPE dump_test.int42 SET DEFAULT ENCODING' => {
+		create_order => 43,
+		create_sql => 'ALTER TYPE dump_test.int42 SET DEFAULT ENCODING
+		(compresstype=rle_type, blocksize=8192, compresslevel=4);',
+		regexp => qr/^\QALTER TYPE dump_test.int42 SET DEFAULT ENCODING (compresstype=rle_type, blocksize=8192, compresslevel=4);\E/m,
+		like =>
+			{ %full_runs, %dump_test_schema_runs, section_pre_data => 1, },
+		unlike => { exclude_dump_test_schema => 1, },
+	},
+
 	'CREATE FOREIGN DATA WRAPPER dummy' => {
 		create_order => 35,
 		create_sql   => 'CREATE FOREIGN DATA WRAPPER dummy;',
@@ -2200,6 +2210,29 @@
 		unlike => { exclude_dump_test_schema => 1, },
 	},
 
+	'CREATE APPEND OPTIMIZED ao_table' => {
+		create_order => 19,
+		create_sql	=> 'CREATE TABLE dump_test.test_table_ao(a integer, b text)
+						WITH (appendonly = true, compresstype = zlib, compresslevel = 1);',
+		regexp => qr{^
+			\QCREATE TABLE dump_test.test_table_ao (\E
+			\n\s+\Qa integer,\E
+			\n\s+\Qb text\E
+			\n\Q)\E
+			\n\QWITH (appendonly = true, compresstype=zlib, compresslevel='1');\E
+			}xm,
+		like => {
+			%full_runs,
+			%dump_test_schema_runs,
+			section_pre_data     => 1,
+			exclude_test_table       => 1,
+		},
+		unlike => {
+			only_dump_test_table => 1,
+			exclude_dump_test_schema => 1,
+		},
+	},
+
 	'CREATE POLICY p1 ON test_table' => {
 		create_order => 22,
 		create_sql   => 'CREATE POLICY p1 ON dump_test.test_table
diff --git a/src/bin/pg_dump/t/004_pg_dump_parallel.pl b/src/bin/pg_dump/t/004_pg_dump_parallel.pl
new file mode 100644
index 00000000000..f41c2fa2233
--- /dev/null
+++ b/src/bin/pg_dump/t/004_pg_dump_parallel.pl
@@ -0,0 +1,81 @@
+
+# Copyright (c) 2021-2023, PostgreSQL Global Development Group
+
+use strict;
+use warnings;
+
+use PostgreSQL::Test::Cluster;
+use PostgreSQL::Test::Utils;
+use Test::More;
+
+my $dbname1 = 'regression_src';
+my $dbname2 = 'regression_dest1';
+my $dbname3 = 'regression_dest2';
+
+my $node = PostgreSQL::Test::Cluster->new('main');
+$node->init;
+$node->start;
+
+my $backupdir = $node->backup_dir;
+
+$node->run_log([ 'createdb', $dbname1 ]);
+$node->run_log([ 'createdb', $dbname2 ]);
+$node->run_log([ 'createdb', $dbname3 ]);
+
+$node->safe_psql(
+	$dbname1,
+	qq{
+create type digit as enum ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9');
+
+-- plain table with index
+create table tplain (en digit, data int unique);
+insert into tplain select (x%10)::text::digit, x from generate_series(1,1000) x;
+
+-- non-troublesome hashed partitioning
+create table ths (mod int, data int, unique(mod, data)) partition by hash(mod);
+create table ths_p1 partition of ths for values with (modulus 3, remainder 0);
+create table ths_p2 partition of ths for values with (modulus 3, remainder 1);
+create table ths_p3 partition of ths for values with (modulus 3, remainder 2);
+insert into ths select (x%10), x from generate_series(1,1000) x;
+
+-- dangerous hashed partitioning
+create table tht (en digit, data int, unique(en, data)) partition by hash(en);
+create table tht_p1 partition of tht for values with (modulus 3, remainder 0);
+create table tht_p2 partition of tht for values with (modulus 3, remainder 1);
+create table tht_p3 partition of tht for values with (modulus 3, remainder 2);
+insert into tht select (x%10)::text::digit, x from generate_series(1,1000) x;
+	});
+
+$node->command_ok(
+	[
+		'pg_dump', '-Fd', '--no-sync', '-j2', '-f', "$backupdir/dump1",
+		$node->connstr($dbname1)
+	],
+	'parallel dump');
+
+$node->command_ok(
+	[
+		'pg_restore', '-v',
+		'-d',         $node->connstr($dbname2),
+		'-j3',        "$backupdir/dump1"
+	],
+	'parallel restore');
+
+$node->command_ok(
+	[
+		'pg_dump',   '-Fd',
+		'--no-sync', '-j2',
+		'-f',        "$backupdir/dump2",
+		'--inserts', $node->connstr($dbname1)
+	],
+	'parallel dump as inserts');
+
+$node->command_ok(
+	[
+		'pg_restore', '-v',
+		'-d',         $node->connstr($dbname3),
+		'-j3',        "$backupdir/dump2"
+	],
+	'parallel restore as inserts');
+
+done_testing();
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb91d269e4b..7b660a75e49 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -564,6 +564,9 @@ main(int argc, char *argv[])
 			FullTransactionIdFromEpochAndXid(EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid),
 											 set_xid);
 
+	if (set_gxid != 0)
+		ControlFile.checkPointCopy.nextGxid = set_gxid;
+
 	if (set_oldest_commit_ts_xid != 0)
 		ControlFile.checkPointCopy.oldestCommitTsXid = set_oldest_commit_ts_xid;
 	if (set_newest_commit_ts_xid != 0)
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 71624cea745..2fae1ffc1b0 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -1083,11 +1083,11 @@ get_target_dbid(const char *argv0)
 		if (ret == -1)
 			pg_fatal("The program \"postgres\" is needed by %s but was \n"
 					 "not found in the same directory as \"%s\".\n"
-					 "Check your installation.\n", progname, full_path);
+					 "Check your installation.", progname, full_path);
 		else
 			pg_fatal("The program \"postgres\" was found by \"%s\"\n"
 					 "but was not the same version as %s.\n"
-					 "Check your installation.\n", full_path, progname);
+					 "Check your installation.`", full_path, progname);
 	}
 
 	snprintf(cmd, MAXCMDLEN, "\"%s\" -D \"%s\" -C gp_dbid",
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 1cf10dace16..d0905f3d588 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -576,7 +576,7 @@ check_for_new_tablespace_dir(ClusterInfo *new_cluster)
 				 os_info.old_tablespaces[tblnum],
 				 new_cluster->tablespace_suffix);
 
-		if (stat(new_tablespace_dir, &statbuf) == 0 || errno != ENOENT)
+		if (is_greenplum_dispatcher_mode() && (stat(new_tablespace_dir, &statbuf) == 0 || errno != ENOENT))
 			gp_fatal_log("new cluster tablespace directory already exists: \"%s\"\n",
 					 new_tablespace_dir);
 	}
@@ -1598,6 +1598,8 @@ check_for_cluster_key_failure(ClusterInfo *cluster)
 {
 	struct stat buffer;
 
+	prep_status("Checking for presence of pg_cryptokeys");
+
 	if (stat (KMGR_DIR_PID, &buffer) == 0)
 	{
 		if (cluster == &old_cluster)
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 78749e9d310..2b300819678 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -555,7 +555,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 			cluster->controldata.data_checksum_version = str2uint(p);
 			got_data_checksum_version = true;
 		}
-		else if ((p = strstr(bufin, "Cluster file encryption method:")) != NULL)
+		else if ((p = strstr(bufin, "File encryption method:")) != NULL)
 		{
 			p = strchr(p, ':');
 
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
index f8c064786e7..81b1aef91c4 100644
--- a/src/bin/pg_upgrade/exec.c
+++ b/src/bin/pg_upgrade/exec.c
@@ -36,7 +36,8 @@ get_bin_version(ClusterInfo *cluster)
 {
 	char		cmd[MAXPGPATH],
 				cmd_output[MAX_STRING],
-				dbstring[MAX_STRING];
+				dbstring[MAX_STRING],
+				dbstring2[MAX_STRING];
 
 	FILE	   *output;
 	int			v1 = 0,
@@ -51,11 +52,13 @@ get_bin_version(ClusterInfo *cluster)
 
 	pclose(output);
 
-	if (sscanf(cmd_output, "%*s (%s Database) %d.%d", dbstring, &v1, &v2) < 1)
+	if (sscanf(cmd_output, "%*s (%s %[^)]) %d.%d", dbstring, dbstring2, &v1, &v2) != 4)
 		pg_fatal("could not get pg_ctl version output from %s\n", cmd);
 
-	if (strcmp("Greenplum", dbstring) && strcmp("Cloudberry", dbstring))
-		pg_fatal("could not upgrade from non Greenplum/Cloudberry version: %s\n", dbstring);
+	if (!((strcmp("Greenplum", dbstring) == 0 && strcmp("Database", dbstring2) == 0) \
+				|| (strcmp("Cloudberry", dbstring) == 0 && strcmp("Database", dbstring2) == 0)
+				|| (strcmp("Apache", dbstring) == 0 && strcmp("Cloudberry", dbstring2) == 0)))
+		pg_fatal("could not upgrade from non Greenplum/Cloudberry version: %s %s\n", dbstring, dbstring2);
 
 	if (v1 < 10)
 	{
diff --git a/src/bin/pg_upgrade/greenplum/check_gp.c b/src/bin/pg_upgrade/greenplum/check_gp.c
index 7b95841c097..d9893fab887 100644
--- a/src/bin/pg_upgrade/greenplum/check_gp.c
+++ b/src/bin/pg_upgrade/greenplum/check_gp.c
@@ -665,6 +665,14 @@ check_for_plpython2_dependent_functions(ClusterInfo *cluster)
 	char		output_path[MAXPGPATH];
 	bool		found = false;
 
+
+	if (cluster->version.type == Cloudberry)
+	{
+		prep_status("Skip checking for plpython2 functions, CBDB use plpython3");
+		check_ok();
+		return ;
+	}
+
 	prep_status("Checking for functions dependent on plpython2");
 
 	snprintf(output_path, sizeof(output_path), "%s/%s",
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 15372af5991..da2f3cb9e38 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -119,9 +119,15 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
 		 * Verify that rels of same OID have same name.  The namespace name
 		 * should always match, but the relname might not match for TOAST
 		 * tables (and, therefore, their indexes).
+		 * 
+		 * XXX GPDB: for TOAST tables, don't insist on a match at all
+		 * yet; there are other ways for us to get mismatched names. Ideally
+		 * this will go away eventually.
 		 */
 		if (strcmp(old_rel->nspname, new_rel->nspname) != 0 ||
-			strcmp(old_rel->relname, new_rel->relname) != 0)
+			(strcmp(old_rel->relname, new_rel->relname) != 0 &&
+			 (/* GET_MAJOR_VERSION(old_cluster.major_version) >= 900 || */
+			  strcmp(old_rel->nspname, "pg_toast") != 0)))
 		{
 			pg_log(PG_WARNING, "Relation names for OID %u in database \"%s\" do not match: "
 				   "old name \"%s.%s\", new name \"%s.%s\"\n",
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index eee38da194f..506666acdf1 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -59,6 +59,7 @@ static void copy_xact_xlog_xid(void);
 static void set_frozenxids(bool minmxid_only);
 static void make_outputdirs(char *pgdata);
 static void setup(char *argv0, bool *live_check);
+static void get_cluster_version(ClusterInfo *cluster);
 
 static void copy_subdir_files(const char *old_subdir, const char *new_subdir);
 
@@ -170,6 +171,9 @@ main(int argc, char **argv)
 		umask(pg_mode_mask);
 	}
 
+	get_cluster_version(&old_cluster);
+	get_cluster_version(&new_cluster);
+
 
 	check_and_dump_old_cluster(live_check, &sequence_script_file_name);
 
@@ -304,6 +308,72 @@ main(int argc, char **argv)
 	return 0;
 }
 
+
+void
+get_cluster_version(ClusterInfo *cluster)
+{
+	PGconn	   *conn;
+	PGresult   *res;
+	char		query[QUERY_ALLOC];
+	char	   *version;
+	int			i_version;
+	int			ntups;
+	int			dbid;
+	int			i_dbid;
+	char		dbstring[MAX_STRING];
+	char		dbstring2[MAX_STRING];
+	int			v1;
+
+	start_postmaster(cluster, false);
+
+	conn = connectToServer(cluster, "template1");
+
+	snprintf(query, sizeof(query), "SELECT version()");
+
+	res = executeQueryOrDie(conn, "%s", query);
+
+	i_version = PQfnumber(res, "version");
+
+	ntups = PQntuples(res);
+	Assert(ntups == 1);
+
+	version = PQgetvalue(res, 0, i_version);
+
+	if(sscanf(version, "%*[^(](%s %s %d.%*d.%*d-%*[^)])", dbstring, dbstring2, &v1) != 3)
+		pg_fatal("could not get version output from select version();\n");
+
+	if (strcasecmp("Greenplum", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+	{
+		cluster->version.type = Greenplum;
+		cluster->version.version = v1;
+
+	} else if((strcasecmp("Cloudberry", dbstring) == 0 && strcasecmp("Database", dbstring2) == 0)
+				|| (strcasecmp("Apache", dbstring) == 0 && strcasecmp("Cloudberry", dbstring2) == 0))
+	{
+		cluster->version.type = Cloudberry;
+		cluster->version.version = v1;
+	}
+	else
+		pg_fatal("could not upgrade from non Greenplum/Cloudberry version: %s %s\n", dbstring, dbstring2);
+
+	res = executeQueryOrDie(conn, "%s", "show gp_dbid;");
+
+	i_dbid = PQfnumber(res, "gp_dbid");
+
+	ntups = PQntuples(res);
+	Assert(ntups == 1);
+
+	dbid = atoi(PQgetvalue(res, 0, i_dbid));
+
+	cluster->dbid = dbid;
+
+	PQclear(res);
+
+	PQfinish(conn);
+
+	stop_postmaster(false);
+}
+
 #ifdef WIN32
 typedef BOOL(WINAPI * __CreateRestrictedToken) (HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE);
 
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index 1ab50c4f830..9b1775e5435 100644
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -351,6 +351,18 @@ typedef enum
 
 typedef long pgpid_t;
 
+typedef enum
+{
+	Greenplum,
+	Cloudberry
+} DatabaseType;
+
+typedef struct
+{
+	DatabaseType type;
+	int version;
+} DatabaseVersion;
+
 
 /*
  * cluster
@@ -373,6 +385,8 @@ typedef struct
 	char		major_version_str[64];	/* string PG_VERSION of cluster */
 	uint32		bin_version;	/* version returned from pg_ctl */
 	const char *tablespace_suffix;	/* directory specification */
+	DatabaseVersion version;
+	int32		dbid;
 } ClusterInfo;
 
 
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index c2ab2872630..20e12bc455f 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -260,7 +260,7 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error)
 	}
 
 	snprintf(cmd, sizeof(cmd),
-			 "\"%s/pg_ctl\" -w -l \"%s/%s\" -D \"%s\" -o \"-p %d -c %s -b%s %s %s%s\" start",
+			 "unset LD_LIBRARY_PATH;\"%s/pg_ctl\" -w -l \"%s/%s\" -D \"%s\" -o \"-p %d -c %s -b%s %s %s%s\" start",
 			 cluster->bindir,
 			 log_opts.logdir,
 			 SERVER_LOG_FILE,
diff --git a/src/bin/pg_upgrade/tablespace.c b/src/bin/pg_upgrade/tablespace.c
index 741a856b6c7..98f4041ecbf 100644
--- a/src/bin/pg_upgrade/tablespace.c
+++ b/src/bin/pg_upgrade/tablespace.c
@@ -110,7 +110,8 @@ set_tablespace_directory_suffix(ClusterInfo *cluster)
 	/* This cluster has a version-specific subdirectory */
 
 	/* The leading slash is needed to start a new directory. */
-	cluster->tablespace_suffix = psprintf("/PG_%s_%d",
-										  cluster->major_version_str,
+	cluster->tablespace_suffix = psprintf("/%d/GPDB_%d_%d",
+										  cluster->dbid,
+										  cluster->version.version,
 										  cluster->controldata.cat_ver);
 }
diff --git a/src/bin/pg_upgrade/test_gpdb.sh b/src/bin/pg_upgrade/test_gpdb.sh
index 5c770240aa7..d5cecff8108 100755
--- a/src/bin/pg_upgrade/test_gpdb.sh
+++ b/src/bin/pg_upgrade/test_gpdb.sh
@@ -368,7 +368,7 @@ main() {
 	
 	########################## START: OLD cluster checks
 	
-	. ${OLD_BINDIR}/../greenplum_path.sh
+	. ${OLD_BINDIR}/../cloudberry-env.sh
 
 	# The cluster should be running by now, but in case it isn't, issue a restart.
 	# Since we expect the testcluster to be a stock standard gpdemo, we test for
@@ -419,7 +419,7 @@ main() {
 	########################## START: NEW cluster creation
 	
 	echo "Switching to gpdb-6 env..."
-	. ${NEW_BINDIR}/../greenplum_path.sh
+	. ${NEW_BINDIR}/../cloudberry-env.sh
 	
 	# Create a new gpdemo cluster in the NEW_DATADIR. Using the new datadir for the
 	# path to demo_cluster.sh is a bit of a hack, but since this test relies on
@@ -492,7 +492,7 @@ main() {
 	
 	print_delta_seconds $epoch_for_perf_start 'number_of_seconds_for_upgrade'
 	
-	. ${NEW_BINDIR}/../greenplum_path.sh
+	. ${NEW_BINDIR}/../cloudberry-env.sh
 	
 	if (( !$perf_test )) ; then
 		diff_and_exit
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index 7acee2b563e..02947234ca0 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -112,6 +112,12 @@ check_for_data_types_usage(ClusterInfo *cluster,
 	FILE	   *script = NULL;
 	int			dbnum;
 
+	if (cluster->version.type == Cloudberry && cluster->version.version <= 2)
+	{
+		pg_log(PG_REPORT, "Skip checking for data type, current version CBDB do not support recursive query");
+		return false;
+	}
+
 	for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
 	{
 		PQExpBuffer cte_oids;
@@ -547,7 +553,7 @@ report_extension_updates(ClusterInfo *cluster)
 	if (found)
 	{
 		report_status(PG_REPORT, "notice");
-		gp_fatal_log(
+		pg_log(PG_REPORT,
 				"| Your installation contains extensions that should be updated\n"
 				"| with the ALTER EXTENSION command.  The file\n"
 				"|     %s\n"
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index cf8dec81eec..e0dfadcf414 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -716,7 +716,7 @@ usage(void)
 		   "  -q, --quiet              quiet logging (one message each 5 seconds)\n"
 		   "  -s, --scale=NUM          scaling factor\n"
 		   "  --foreign-keys           create foreign key constraints between tables\n"
-		   "  --use-unique-keys        make the indexes that are created non-unique indexes\n"
+		   "  --use-non-unique-keys        make the indexes that are created non-unique indexes\n"
 		   "                           (default: unique)\n"
 		   "  --index-tablespace=TABLESPACE\n"
 		   "                           create indexes in the specified tablespace\n"
@@ -4382,7 +4382,11 @@ initCreatePKeys(PGconn *con)
 	int			i;
 	PQExpBufferData query;
 
-	fprintf(stderr, "creating primary keys...\n");
+	if (use_unique_key)
+		fprintf(stderr, "creating primary keys...\n");
+	else
+		fprintf(stderr, "creating non-unique keys...\n");
+
 	initPQExpBuffer(&query);
 
 	for (i = 0; i < lengthof(DDLINDEXes); i++)
@@ -5837,7 +5841,8 @@ main(int argc, char **argv)
 		{"show-script", required_argument, NULL, 10},
 		{"partitions", required_argument, NULL, 11},
 		{"partition-method", required_argument, NULL, 12},
-		{"use-unique-keys", no_argument, &use_unique_key, 1},
+		/* Cloudberry-specific */
+		{"use-non-unique-keys", no_argument, NULL, 13},
 		{NULL, 0, NULL, 0}
 	};
 
@@ -6217,6 +6222,9 @@ main(int argc, char **argv)
 					exit(1);
 				}
 				break;
+			case 13:
+				use_unique_key = 0;
+				break;
 			default:
 				fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
 				exit(1);
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 796eb57208d..282ccc24aeb 100644
--- a/src/bin/pgbench/t/001_pgbench_with_server.pl
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -100,6 +100,19 @@
 	],
 	'pgbench --init-steps');
 
+
+# Test interaction of --init-steps with legacy step-selection options
+$node->pgbench(
+	'--initialize --use-non-unique-keys',
+	0,
+	[qr{^$}],
+	[
+		qr{creating tables},
+		qr{creating non-unique keys},
+		qr{done in \d+\.\d\d s }
+	],
+	'pgbench --use-non-unique-keys');
+
 # Run all builtin scripts, for a few transactions each
 $node->pgbench(
 	'--transactions=5 -Dfoo=bla --client=2 --protocol=simple --builtin=t'
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 9b65b884950..90c8bb777fa 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -5091,7 +5091,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 	PGresult   *res;
 	printQueryOpt myopt = pset.popt;
 	int			cols_so_far;
-	bool		translate_columns[] = {false, false, true, false, false, false, false, false, false};
+	bool		translate_columns[] = {false, false, true, false, false, false, false, false, false, false};
 
 	/* If tabtypes is empty, we default to \dtvmsE (but see also command.c) */
 	if (!(showTables || showIndexes || showViews || showMatViews || showSeq || showForeign || showDirectory))
@@ -5164,6 +5164,8 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 			appendPQExpBuffer(&buf, " WHEN 'f' THEN '%s'", gettext_noop("foreign"));
 			appendPQExpBuffer(&buf, " END as \"%s\"\n", gettext_noop("Storage"));
 		}
+		translate_columns[cols_so_far] = true;
+		cols_so_far++;
 	}
 
 	if (showIndexes)
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 385d507ea24..5ebb566c3b9 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -693,7 +693,7 @@ print_copyright(void)
 {
 	puts(
 		 "Apache Cloudberry (Incubating)\n"
-		 "Copyright 2024-2025 The Apache Software Foundation\n\n"
+		 "Copyright 2024-2026 The Apache Software Foundation\n\n"
 		 "Greenplum Database version of PostgreSQL Database Management System\n"
 		 "Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group\n\n"
 		 "Portions Copyright (c) 2014-Present VMware, Inc. or its affiliates.\n\n"
diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h
index 61948090e22..2253e400efb 100644
--- a/src/include/access/tableam.h
+++ b/src/include/access/tableam.h
@@ -39,6 +39,7 @@ struct SampleScanState;
 struct TBMIterateResult;
 struct VacuumParams;
 struct ValidateIndexState;
+enum CmdType;
 
 /**
  * Flags represented the supported features of scan.
@@ -751,6 +752,13 @@ typedef struct TableAmRoutine
 											double *liverows,
 											double *deadrows,
 											TupleTableSlot *slot);
+	
+	int			(*relation_acquire_sample_rows) (Relation onerel,
+												 int elevel,
+												 HeapTuple *rows,
+												 int targrows,
+												 double *totalrows,
+												 double *totaldeadrows);
 
 	/* see table_index_build_range_scan for reference about parameters */
 	double		(*index_build_range_scan) (Relation table_rel,
@@ -948,15 +956,14 @@ typedef struct TableAmRoutine
 										   struct SampleScanState *scanstate,
 										   TupleTableSlot *slot);
 
-	/*
-	 * Like scan_sample_next_block and scan_sample_next_tuple, this callback
-	 * is also used to sample tuple rows. As different storage maybe need to
-	 * use different acquire sample rows process, we extend an interface to
-	 * achieve this requirement. 
+	/**
+	 * The pair of callbacks are invoked to perform any initialization and
+	 * cleanup required for DML operations (INSERT, UPDATE, DELETE) on a
+	 * relation of this table AM.
 	 */
-	int			(*acquire_sample_rows) (Relation onerel, int elevel,
-										HeapTuple *rows, int targrows,
-										double *totalrows, double *totaldeadrows);
+	void (*dml_init) (Relation relation, enum CmdType operation);
+	void (*dml_fini) (Relation relation, enum CmdType operation);
+
 	/*
 	 * This callback is used to parse reloptions for relation/matview/toast.
 	 */
@@ -1793,6 +1800,19 @@ table_finish_bulk_insert(Relation rel, int options)
 		rel->rd_tableam->finish_bulk_insert(rel, options);
 }
 
+static inline void
+table_dml_init(Relation rel, enum CmdType operation)
+{
+	if (rel->rd_tableam && rel->rd_tableam->dml_init)
+		rel->rd_tableam->dml_init(rel, operation);
+}
+
+static inline void
+table_dml_fini(Relation rel, enum CmdType operation)
+{
+	if (rel->rd_tableam && rel->rd_tableam->dml_fini)
+		rel->rd_tableam->dml_fini(rel, operation);
+}
 
 /* ------------------------------------------------------------------------
  * DDL related functionality.
@@ -1903,6 +1923,38 @@ table_relation_vacuum(Relation rel, struct VacuumParams *params,
 	rel->rd_tableam->relation_vacuum(rel, params, bstrategy);
 }
 
+/*
+ * GPDB: Interface to acquire sample rows from a given relation (currently
+ * AO/CO).
+ *
+ * Selected rows are returned in the caller-allocated array rows[], which
+ * must have space to hold at least targrows entries.
+ *
+ * The actual number of rows selected is returned as the function result.
+ * We also estimate the total numbers of live and dead rows in the table,
+ * and return them into *totalrows and *totaldeadrows, respectively.
+ *
+ * The returned list of tuples is in order by physical position in the table.
+ * (We will rely on this later to derive correlation estimates.)
+ *
+ * Note: this interface is not used by upstream code.
+ * The upstream interface (implemented by heap) uses a 2-stage sampling method
+ * using table_scan_analyze_next_block() and table_scan_analyze_next_tuple().
+ * See acquire_sample_rows(). Since this upstream method does not suit AO/CO
+ * tables we have created the relation_acquire_sample_rows() interface.
+ *
+ * Note for future merges:
+ * We have to keep this interface consistent with acquire_sample_rows().
+ */
+static inline int
+table_relation_acquire_sample_rows(Relation rel, int elevel, HeapTuple *rows,
+								   int targrows, double *totalrows, double *totaldeadrows)
+{
+	return rel->rd_tableam->relation_acquire_sample_rows(rel, elevel, rows,
+														 targrows, totalrows,
+														 totaldeadrows);
+}
+
 /*
  * Prepare to analyze block `blockno` of `scan`. The scan needs to have been
  * started with table_beginscan_analyze().  Note that this routine might
@@ -2327,13 +2379,5 @@ extern const TableAmRoutine *GetHeapamTableAmRoutine(void);
 extern bool check_default_table_access_method(char **newval, void **extra,
 											  GucSource source);
 
-/* ----------------------------------------------------------------------------
- * Hook function to run init/fini for storage extensions
- * ----------------------------------------------------------------------------
- */
-enum CmdType;
-typedef void (*ext_dml_func_hook_type) (Relation relation, enum CmdType operation);
-extern PGDLLIMPORT ext_dml_func_hook_type ext_dml_init_hook;
-extern PGDLLIMPORT ext_dml_func_hook_type ext_dml_finish_hook;
 
 #endif							/* TABLEAM_H */
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index cec3e5f4cb7..687799bec9f 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -301,7 +301,7 @@ extern int xid_stop_limit;
 extern int xid_warn_limit;
 
 /* GPDB-specific */
-extern bool gp_pause_on_restore_point_replay;
+extern char *gp_pause_on_restore_point_replay;
 
 /* hook for plugins to assign new relfilenode */
 typedef Oid (*NewSegRelfilenode_assign_hook_type)(void);
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 2dfad411b7a..6d1cc151ed2 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -11,6 +11,8 @@
 #ifndef XLOG_H
 #define XLOG_H
 
+#include "postgres.h" /* for Datum */
+
 #include "access/rmgr.h"
 #include "access/xlogdefs.h"
 #include "access/xloginsert.h"
@@ -121,6 +123,7 @@ extern int	XLogArchiveTimeout;
 extern int	wal_retrieve_retry_interval;
 extern char *XLogArchiveCommand;
 extern bool EnableHotStandby;
+extern bool EnableHotDR;
 
 extern bool fullPageWrites;
 extern bool wal_log_hints;
diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 2a0d5adef40..a47b1ef1615 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -11055,6 +11055,10 @@
   proname => 'binary_upgrade_set_next_array_pg_type_oid', provolatile => 'v',
   proparallel => 'r', prorettype => 'void', proargtypes => 'oid oid text',
   prosrc => 'binary_upgrade_set_next_array_pg_type_oid' },
+{ oid => '4545', descr => 'for use by pg_upgrade',
+  proname => 'binary_upgrade_set_next_pg_tablespace_oid', provolatile => 'v',
+  proparallel => 'r', prorettype => 'void', proargtypes => 'oid text',
+  prosrc => 'binary_upgrade_set_next_pg_tablespace_oid' },
 { oid => '4390', descr => 'for use by pg_upgrade',
   proname => 'binary_upgrade_set_next_multirange_pg_type_oid',
   provolatile => 'v', proparallel => 'r', prorettype => 'void',
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index 0c81a479a86..2643925d0f3 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -287,6 +287,18 @@ DECLARE_FOREIGN_KEY((starelid, staattnum), pg_attribute, (attrelid, attnum));
  */
 #define STATISTIC_KIND_BOUNDS_HISTOGRAM  7
 
+/*
+ * Used to calculate the summary of ndv on the segment.
+ * It will be used to count the number of rows produced
+ * when optimizer generating the partial agg node, and 
+ * thus calculate the cost value of the operator.
+ * 
+ * In the past, partial agg used histogram (on master) 
+ * data to calculate NDV, which may be quite different
+ * from the NDV on the segment.
+ */
+#define STATISTIC_KIND_NDV_BY_SEGMENTS  8
+
 /*
  * A "hyperloglog" slot stores the hyperloglog_counter created for sampled data.
  * This hyperloglog_counter data structure is converted into a bytea and stored
diff --git a/src/include/cdb/cdbaocsam.h b/src/include/cdb/cdbaocsam.h
index b4a4653bfd0..c18f86db1fd 100644
--- a/src/include/cdb/cdbaocsam.h
+++ b/src/include/cdb/cdbaocsam.h
@@ -105,6 +105,57 @@ enum AOCSScanDescIdentifier
 	AOCSBITMAPSCANDATA		/* am private */
 };
 
+/*
+ * Used for fetch individual tuples from specified by TID of append only relations
+ * using the AO Block Directory.
+ */
+typedef struct AOCSFetchDescData
+{
+	Relation		relation;
+	Snapshot		appendOnlyMetaDataSnapshot;
+
+	/*
+	 * Snapshot to use for non-metadata operations.
+	 * Usually snapshot = appendOnlyMetaDataSnapshot, but they
+	 * differ e.g. if gp_select_invisible is set.
+	 */ 
+	Snapshot    snapshot;
+
+	MemoryContext	initContext;
+
+	int				totalSegfiles;
+	struct AOCSFileSegInfo **segmentFileInfo;
+
+	/*
+	 * Array containing the maximum row number in each aoseg (to be consulted
+	 * during fetch). This is a sparse array as not all segments are involved
+	 * in a scan. Sparse entries are marked with InvalidAORowNum.
+	 *
+	 * Note:
+	 * If we have no updates and deletes, the total_tupcount is equal to the
+	 * maximum row number. But after some updates and deletes, the maximum row
+	 * number is always much bigger than total_tupcount, so this carries the
+	 * last sequence from gp_fastsequence.
+	 */
+	int64			lastSequence[AOTupleId_MultiplierSegmentFileNum];
+
+	char			*segmentFileName;
+	int				segmentFileNameMaxLen;
+	char            *basepath;
+
+	AppendOnlyBlockDirectory	blockDirectory;
+
+	DatumStreamFetchDesc *datumStreamFetchDesc;
+
+	int64	skipBlockCount;
+
+	AppendOnlyVisimap visibilityMap;
+
+	Oid segrelid;
+} AOCSFetchDescData;
+
+typedef AOCSFetchDescData *AOCSFetchDesc;
+
 /*
  * Used for scan of appendoptimized column oriented relations, should be used in
  * the tableam api related code and under it.
@@ -118,19 +169,41 @@ typedef struct AOCSScanDescData
 
 	/* synthetic system attributes */
 	ItemPointerData cdb_fake_ctid;
-	int64 total_row;
-	int64 segrowsprocessed;
 
 	/*
-	 * Only used by `analyze`
+	 * used by `analyze`
 	 */
-	int64		nextTupleId;
-	int64		targetTupleId;
 
 	/*
- 	 * Only used by `sample scan`
- 	 */	 	
+	 * targrow: the output of the Row-based sampler (Alogrithm S), denotes a
+	 * rownumber in the flattened row number space that is the target of a sample,
+	 * which starts from 0.
+	 * In other words, if we have seg0 rownums: [1, 100], seg1 rownums: [1, 200]
+	 * If targrow = 150, then we are referring to seg1's rownum=51.
+	 */
+	int64			targrow;
+
+	/*
+	 * segfirstrow: pointing to the next starting row which is used to check
+	 * the distance to `targrow`
+	 */
+	int64			segfirstrow;
+
+	/*
+	 * segrowsprocessed: track the rows processed under the current segfile.
+	 * Don't miss updating it accordingly when "segfirstrow" is updated.
+	 */
+	int64			segrowsprocessed;
+
+	AOBlkDirScan	blkdirscan;
+	AOCSFetchDesc	aocsfetch;
+	bool 			*proj;
+
+	/*
+	 * Only used by `sample scan`
+	 */
 	int64		fetchTupleId;
+	int64		nextTupleId;
 	int64		totalTuples;
 	/*
 	 * Part of the struct to be used only inside aocsam.c
@@ -212,57 +285,6 @@ typedef struct AOCSScanDescData
 
 typedef AOCSScanDescData *AOCSScanDesc;
 
-/*
- * Used for fetch individual tuples from specified by TID of append only relations
- * using the AO Block Directory.
- */
-typedef struct AOCSFetchDescData
-{
-	Relation		relation;
-	Snapshot		appendOnlyMetaDataSnapshot;
-
-	/*
-	 * Snapshot to use for non-metadata operations.
-	 * Usually snapshot = appendOnlyMetaDataSnapshot, but they
-	 * differ e.g. if gp_select_invisible is set.
-	 */ 
-	Snapshot    snapshot;
-
-	MemoryContext	initContext;
-
-	int				totalSegfiles;
-	struct AOCSFileSegInfo **segmentFileInfo;
-
-	/*
-	 * Array containing the maximum row number in each aoseg (to be consulted
-	 * during fetch). This is a sparse array as not all segments are involved
-	 * in a scan. Sparse entries are marked with InvalidAORowNum.
-	 *
-	 * Note:
-	 * If we have no updates and deletes, the total_tupcount is equal to the
-	 * maximum row number. But after some updates and deletes, the maximum row
-	 * number is always much bigger than total_tupcount, so this carries the
-	 * last sequence from gp_fastsequence.
-	 */
-	int64			lastSequence[AOTupleId_MultiplierSegmentFileNum];
-
-	char			*segmentFileName;
-	int				segmentFileNameMaxLen;
-	char            *basepath;
-
-	AppendOnlyBlockDirectory	blockDirectory;
-
-	DatumStreamFetchDesc *datumStreamFetchDesc;
-
-	int64	skipBlockCount;
-
-	AppendOnlyVisimap visibilityMap;
-
-	Oid segrelid;
-} AOCSFetchDescData;
-
-typedef AOCSFetchDescData *AOCSFetchDesc;
-
 /*
  * AOCSDeleteDescData is used for delete data from AOCS relations.
  * It serves an equivalent purpose as AppendOnlyScanDescData
@@ -397,8 +419,7 @@ extern void aocs_addcol_emptyvpe(
 extern void aocs_addcol_setfirstrownum(AOCSAddColumnDesc desc,
 		int64 firstRowNum);
 
-extern void aoco_dml_init(Relation relation, CmdType operation);
-extern void aoco_dml_finish(Relation relation, CmdType operation);
+extern bool aocs_get_target_tuple(AOCSScanDesc aoscan, int64 targrow, TupleTableSlot *slot);
 
 extern bool extractcolumns_from_node(Node *expr, bool *cols, AttrNumber natts);
 extern ExprState * aocs_predicate_pushdown_prepare(AOCSScanDesc scan,
@@ -423,5 +444,21 @@ AOCSScanDesc_UpdateTotalBytesRead(AOCSScanDesc scan, AttrNumber attno)
 		scan->totalBytesRead += scan->columnScanInfo.ds[attno]->ao_read.current.uncompressedLen;
 }
 
+static inline int64
+AOCSScanDesc_TotalTupCount(AOCSScanDesc scan)
+{
+	Assert(scan != NULL);
+
+	int64 totalrows = 0;
+	AOCSFileSegInfo **seginfo = scan->seginfo;
+
+	for (int i = 0; i < scan->total_seg; i++)
+	{
+		if (seginfo[i]->state != AOSEG_STATE_AWAITING_DROP)
+			totalrows += seginfo[i]->total_tupcount;
+	}
+
+	return totalrows;
+}
 
 #endif   /* AOCSAM_H */
diff --git a/src/include/cdb/cdbappendonlyam.h b/src/include/cdb/cdbappendonlyam.h
index 125c1de4d23..1d2622a8ff2 100644
--- a/src/include/cdb/cdbappendonlyam.h
+++ b/src/include/cdb/cdbappendonlyam.h
@@ -141,6 +141,7 @@ typedef struct AppendOnlyExecutorReadBlock
 	int				segmentFileNum;
 
 	int64			totalRowsScanned;
+	int64			blockRowsProcessed;
 
 	int64			blockFirstRowNum;
 	int64			headerOffsetInFile;
@@ -236,10 +237,31 @@ typedef struct AppendOnlyScanDescData
 	AppendOnlyVisimap visibilityMap;
 
 	/*
-	 * Only used by `analyze`
+	 * used by `analyze`
 	 */
-	int64		nextTupleId;
-	int64		targetTupleId;
+
+	/*
+	 * targrow: the output of the Row-based sampler (Alogrithm S), denotes a
+	 * rownumber in the flattened row number space that is the target of a sample,
+	 * which starts from 0.
+	 * In other words, if we have seg0 rownums: [1, 100], seg1 rownums: [1, 200]
+	 * If targrow = 150, then we are referring to seg1's rownum=51.
+	 */
+	int64				targrow;
+
+	/*
+	 * segfirstrow: pointing to the next starting row which is used to check
+	 * the distance to `targrow`
+	 */
+	int64				segfirstrow;
+
+	/*
+	 * segrowsprocessed: track the rows processed under the current segfile.
+	 * Don't miss updating it accordingly when "segfirstrow" is updated.
+	 */
+	int64				segrowsprocessed;
+
+	AOBlkDirScan		blkdirscan;
 
 	/* scan current state */
 	BlockNumber rs_nblocks;		/* current block */
@@ -454,6 +476,9 @@ extern bool appendonly_getnextslot(TableScanDesc scan,
 								   ScanDirection direction,
 								   TupleTableSlot *slot);
 extern uint32 appendonly_scan_flags(Relation relation);
+extern bool appendonly_get_target_tuple(AppendOnlyScanDesc aoscan,
+										int64 targrow,
+										TupleTableSlot *slot);
 extern AppendOnlyFetchDesc appendonly_fetch_init(
 	Relation 	relation,
 	Snapshot    snapshot,
@@ -463,14 +488,12 @@ extern bool appendonly_fetch(
 	AOTupleId *aoTid,
 	TupleTableSlot *slot);
 extern void appendonly_fetch_finish(AppendOnlyFetchDesc aoFetchDesc);
-extern void appendonly_dml_init(Relation relation, CmdType operation);
 extern AppendOnlyInsertDesc appendonly_insert_init(Relation rel, int segno);
 extern void appendonly_insert(
 		AppendOnlyInsertDesc aoInsertDesc, 
 		MemTuple instup, 
 		AOTupleId *aoTupleId);
 extern void appendonly_insert_finish(AppendOnlyInsertDesc aoInsertDesc, dlist_head *head);
-extern void appendonly_dml_finish(Relation relation, CmdType operation);
 
 extern AppendOnlyDeleteDesc appendonly_delete_init(Relation rel);
 extern TM_Result appendonly_delete(
@@ -514,4 +537,21 @@ AppendOnlyScanDesc_UpdateTotalBytesRead(AppendOnlyScanDesc scan)
 		scan->totalBytesRead += scan->storageRead.current.uncompressedLen;
 }
 
+static inline int64
+AppendOnlyScanDesc_TotalTupCount(AppendOnlyScanDesc scan)
+{
+	Assert(scan != NULL);
+
+	int64 totalrows = 0;
+	FileSegInfo **seginfo = scan->aos_segfile_arr;
+
+	for (int i = 0; i < scan->aos_total_segfiles; i++)
+	{
+		if (seginfo[i]->state != AOSEG_STATE_AWAITING_DROP)
+			totalrows += seginfo[i]->total_tupcount;
+	}
+
+	return totalrows;
+}
+
 #endif   /* CDBAPPENDONLYAM_H */
diff --git a/src/include/cdb/cdbappendonlyblockdirectory.h b/src/include/cdb/cdbappendonlyblockdirectory.h
index 425cb9f7312..f90f7849fe0 100644
--- a/src/include/cdb/cdbappendonlyblockdirectory.h
+++ b/src/include/cdb/cdbappendonlyblockdirectory.h
@@ -95,6 +95,8 @@ typedef struct MinipagePerColumnGroup
 #define IsMinipageFull(minipagePerColumnGroup) \
 	((minipagePerColumnGroup)->numMinipageEntries == (uint32) gp_blockdirectory_minipage_size)
 
+#define InvalidEntryNum (-1)
+
 /*
  * Define a structure for the append-only relation block directory.
  */
@@ -135,6 +137,14 @@ typedef struct AppendOnlyBlockDirectory
 	ScanKey scanKeys;
 	StrategyNumber *strategyNumbers;
 
+	/*
+	 * Minipage entry number, for caching purpose.
+	 *
+	 * XXX: scenarios which call AppendOnlyBlockDirectory_GetEntry()
+	 * may need to consider using this cache.
+	 */
+	int cached_mpentry_num;
+
 }	AppendOnlyBlockDirectory;
 
 
@@ -169,10 +179,16 @@ typedef struct AOFetchSegmentFile
 	int64 logicalEof;
 } AOFetchSegmentFile;
 
-typedef struct AppendOnlyBlockDirectorySeqScan {
-	AppendOnlyBlockDirectory blkdir;
-	SysScanDesc sysScan;
-} AppendOnlyBlockDirectorySeqScan;
+/*
+ * Tracks block directory scan state for block-directory based ANALYZE.
+ */
+typedef struct AOBlkDirScanData
+{
+	AppendOnlyBlockDirectory	*blkdir;
+	SysScanDesc					sysscan;
+	int							segno;
+	int							colgroupno;
+} AOBlkDirScanData, *AOBlkDirScan;
 
 extern void AppendOnlyBlockDirectoryEntry_GetBeginRange(
 	AppendOnlyBlockDirectoryEntry	*directoryEntry,
@@ -190,6 +206,12 @@ extern bool AppendOnlyBlockDirectory_GetEntry(
 	AOTupleId 						*aoTupleId,
 	int                             columnGroupNo,
 	AppendOnlyBlockDirectoryEntry	*directoryEntry);
+extern int64 AOBlkDirScan_GetRowNum(
+	AOBlkDirScan					blkdirscan,
+	int								targsegno,
+	int								colgroupno,
+	int64							targrow,
+	int64							*startrow);
 extern bool AppendOnlyBlockDirectory_CoversTuple(
 	AppendOnlyBlockDirectory		*blockDirectory,
 	AOTupleId 						*aoTupleId);
@@ -243,6 +265,8 @@ extern void AppendOnlyBlockDirectory_DeleteSegmentFile(
 		int columnGroupNo);
 extern void AppendOnlyBlockDirectory_End_forUniqueChecks(
 	AppendOnlyBlockDirectory *blockDirectory);
+extern void AppendOnlyBlockDirectory_End_forSearch_InSequence(
+	AOBlkDirScan seqscan);
 
 extern void AppendOnlyBlockDirectory_InsertPlaceholder(AppendOnlyBlockDirectory *blockDirectory,
 												  int64 firstRowNum,
@@ -322,4 +346,35 @@ copy_out_minipage(MinipagePerColumnGroup *minipageInfo,
 	minipageInfo->numMinipageEntries = minipageInfo->minipage->nEntry;
 }
 
+static inline void
+AOBlkDirScan_Init(AOBlkDirScan blkdirscan,
+				  AppendOnlyBlockDirectory *blkdir)
+{
+	blkdirscan->blkdir = blkdir;
+	blkdirscan->sysscan = NULL;
+	blkdirscan->segno = -1;
+	blkdirscan->colgroupno = 0;
+}
+
+/* should be called before fetch_finish() */
+static inline void
+AOBlkDirScan_Finish(AOBlkDirScan blkdirscan)
+{
+	/*
+	 * Make sure blkdir hasn't been destroyed by fetch_finish(),
+	 * or systable_endscan_ordered() will be crashed for sysscan
+	 * is holding blkdir relation which is freed.
+	 */
+	Assert(blkdirscan->blkdir != NULL);
+
+	if (blkdirscan->sysscan != NULL)
+	{
+		systable_endscan_ordered(blkdirscan->sysscan);
+		blkdirscan->sysscan = NULL;
+	}
+	blkdirscan->segno = -1;
+	blkdirscan->colgroupno = 0;
+	blkdirscan->blkdir = NULL;
+}
+
 #endif
diff --git a/src/include/cdb/cdbappendonlystoragelayer.h b/src/include/cdb/cdbappendonlystoragelayer.h
index 05358dc564d..6ec495aecb5 100755
--- a/src/include/cdb/cdbappendonlystoragelayer.h
+++ b/src/include/cdb/cdbappendonlystoragelayer.h
@@ -99,7 +99,7 @@ typedef struct AppendOnlyStorageAttributes
 			 * The level can be equally important on
 			 * decompression since it may specify which
 			 * sub-library to use for decompress
-			 * (e.g. QuickLZ).
+			 * (e.g. Zlib).
 			 */
 	int					overflowSize;
 			/*
diff --git a/src/include/cdb/cdbdisp_query.h b/src/include/cdb/cdbdisp_query.h
index b62368dfdff..f8f8ed7b0e6 100644
--- a/src/include/cdb/cdbdisp_query.h
+++ b/src/include/cdb/cdbdisp_query.h
@@ -140,9 +140,9 @@ extern ExtendProtocolData epd;
 extern List* ConsumeExtendProtocolData(ExtendProtocolSubTag subtag);
 
 extern void
-ConsumeAndProcessExtendProtocolData_IUD(Bitmapset **inserted,
-										Bitmapset **updated,
-										Bitmapset **deleted);
+ConsumeAndProcessExtendProtocolData_IUD(List **inserted,
+										List **updated,
+										List **deleted);
 
 extern void
 AtEOXact_ExtendProtocolData(void);
diff --git a/src/include/cdb/cdbinterconnect.h b/src/include/cdb/cdbinterconnect.h
index 9f5ce7753d8..5204d4c1b94 100644
--- a/src/include/cdb/cdbinterconnect.h
+++ b/src/include/cdb/cdbinterconnect.h
@@ -213,6 +213,10 @@ typedef struct ChunkTransportState
 
 	/* ic_proxy backend context */
 	struct ICProxyBackendContext *proxyContext;
+
+	/* used by IPC layer implement */
+	void *implement_state;
+
 } ChunkTransportState;
 
 #endif   /* CDBINTERCONNECT_H */
diff --git a/src/include/cdb/cdbpullup.h b/src/include/cdb/cdbpullup.h
index 535b2987ce1..8c23a4a64f2 100644
--- a/src/include/cdb/cdbpullup.h
+++ b/src/include/cdb/cdbpullup.h
@@ -55,7 +55,7 @@
 Expr *
 cdbpullup_expr(Expr *expr, List *targetlist, List *newvarlist, Index newvarno);
 
-extern Expr *cdbpullup_findEclassInTargetList(EquivalenceClass *eclass, List *targetlist, Oid hashOpFamily);
+extern Expr *cdbpullup_findEclassInTargetList(EquivalenceClass *eclass, List *targetlist, Oid hashOpFamily, bool *relabel_stripped);
 
 extern List *cdbpullup_truncatePathKeysForTargetList(List *pathkeys, List *targetlist);
 
diff --git a/src/include/cdb/cdbtm.h b/src/include/cdb/cdbtm.h
index 951b9013c00..dc05e1a79dd 100644
--- a/src/include/cdb/cdbtm.h
+++ b/src/include/cdb/cdbtm.h
@@ -35,8 +35,12 @@ typedef enum
 	DTX_STATE_NONE = 0,
 
 	/**
-	 * The distributed transaction is active and requires distributed coordination
-	 *   (because it is explicit or an implicit writer transaction)
+	 * The distributed transaction is active.
+	 * For a primary, this state means the transaction requires distributed
+	 * coordination (because it is explicit or an implicit writer transaction),
+	 * and it will switch to other dtx states in different phases.
+	 * For a hot standby, there is no coordination necessary so transaction 
+	 * will stay in this state until the end of the commit.
 	 */
 	DTX_STATE_ACTIVE_DISTRIBUTED,
 
@@ -213,7 +217,7 @@ typedef struct TMGXACT
 	* When first assigning and fetching gxid, using this to keep
 	* atomic and then assign/fetch gxid with its value.
 	* Only use this on QD when necessary as QE's gxid and
-	* DistributedSnapshot is dispathed from QD.
+	* DistributedSnapshot is dispatched from QD.
 	*/
 	pg_atomic_uint64 			atomic_gxid;
 #endif
@@ -232,6 +236,7 @@ typedef struct TMGXACTLOCAL
 {
 	/*
 	 * Memory only fields.
+	 * If we are in hot standby, only 'state' is relevant.
 	 */
  	DtxState				state;
 	
diff --git a/src/include/cdb/cdbutil.h b/src/include/cdb/cdbutil.h
index 22c3cc782d8..0f638bbd521 100644
--- a/src/include/cdb/cdbutil.h
+++ b/src/include/cdb/cdbutil.h
@@ -132,6 +132,7 @@ extern char *getDnsAddress(char *name, int port, int elevel);
 
 #ifdef USE_INTERNAL_FTS
 extern void writeGpSegConfigToFTSFiles(void);
+extern bool checkGpSegConfigFtsFiles(void);
 #else
 
 GpSegConfigEntry * readGpSegConfig(char * buff, int *total_dbs);
diff --git a/src/include/cdb/cdbvars.h b/src/include/cdb/cdbvars.h
index 90af5177ce0..abbddb3cd8b 100644
--- a/src/include/cdb/cdbvars.h
+++ b/src/include/cdb/cdbvars.h
@@ -19,6 +19,7 @@
 #ifndef CDBVARS_H
 #define CDBVARS_H
 
+#include "access/xlog.h"  /*RecoveryInProgress*/
 #include "access/xlogdefs.h"  /*XLogRecPtr*/
 #include "cdb/cdbutil.h" /* MASTER_CONTENT_ID */
 #ifdef USE_INTERNAL_FTS
@@ -334,6 +335,8 @@ typedef enum GpVars_Interconnect_Method
 {
 	INTERCONNECT_FC_METHOD_CAPACITY = 0,
 	INTERCONNECT_FC_METHOD_LOSS = 2,
+	INTERCONNECT_FC_METHOD_LOSS_ADVANCE = 3,
+	INTERCONNECT_FC_METHOD_LOSS_TIMER = 4,
 } GpVars_Interconnect_Method;
 
 extern int Gp_interconnect_fc_method;
@@ -360,6 +363,16 @@ extern int	Gp_interconnect_queue_depth;
  *
  */
 extern int	Gp_interconnect_snd_queue_depth;
+
+/*
+ * Cursor IC table size.
+ *
+ * For cursor case, there may be several concurrent interconnect
+ * instances on QD. The table is used to track the status of the
+ * instances, which is quite useful for "ACK the past and NAK the future" paradigm.
+ *
+ */
+extern int  Gp_interconnect_cursor_ic_table_size;
 extern int	Gp_interconnect_timer_period;
 extern int	Gp_interconnect_timer_checking_period;
 extern int	Gp_interconnect_default_rtt;
@@ -367,6 +380,7 @@ extern int	Gp_interconnect_min_rto;
 extern int  Gp_interconnect_transmit_timeout;
 extern int	Gp_interconnect_min_retries_before_timeout;
 extern int	Gp_interconnect_debug_retry_interval;
+extern int	Gp_interconnect_mem_size;
 
 /* UDP recv buf size in KB.  For testing */
 extern int 	Gp_udp_bufsize_k;
@@ -756,9 +770,12 @@ extern GpId GpIdentity;
 #define MAX_DBID_STRING_LENGTH  11
 
 #define UNINITIALIZED_GP_IDENTITY_VALUE (-10000)
+#define IS_HOT_DR_CLUSTER() (EnableHotDR)
 #define IS_QUERY_DISPATCHER() (GpIdentity.segindex == MASTER_CONTENT_ID)
+#define IS_HOT_STANDBY_QD() (EnableHotStandby && IS_QUERY_DISPATCHER() && RecoveryInProgress())
 
 #define IS_QUERY_EXECUTOR_BACKEND() (Gp_role == GP_ROLE_EXECUTE && gp_session_id > 0)
+#define IS_HOT_STANDBY_QE() (EnableHotStandby && IS_QUERY_EXECUTOR_BACKEND() && RecoveryInProgress())
 
 /* Stores the listener port that this process uses to listen for incoming
  * Interconnect connections from other Motion nodes.
diff --git a/src/include/commands/analyzeutils.h b/src/include/commands/analyzeutils.h
index f07339a598d..33ca85d458a 100644
--- a/src/include/commands/analyzeutils.h
+++ b/src/include/commands/analyzeutils.h
@@ -61,4 +61,8 @@ extern AttrNumber fetch_leaf_attnum(Oid leafRelid, const char* attname);
 extern HeapTuple fetch_leaf_att_stats(Oid leafRelid, AttrNumber leafAttNum);
 extern bool leaf_parts_analyzed(Oid attrelid, Oid relid_exclude, List *va_cols, int elevel);
 
+extern bool aggregate_leaf_partition_ndvbs(int nParts,
+								HeapTuple *heaptupleStats,
+								float4 *relTuples,
+								float8 *result);
 #endif  /* ANALYZEUTILS_H */
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index 87f19d4e087..e33d39973c0 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -150,6 +150,7 @@ typedef struct VacAttrStats
 	float4		stanullfrac;	/* fraction of entries that are NULL */
 	int32		stawidth;		/* average width of column values */
 	float4		stadistinct;	/* # distinct values */
+	double		stadistinctbyseg;	/* # distinct values by segments*/
 	int16		stakind[STATISTIC_NUM_SLOTS];
 	Oid			staop[STATISTIC_NUM_SLOTS];
 	Oid			stacoll[STATISTIC_NUM_SLOTS];
@@ -323,13 +324,16 @@ typedef struct
 	double		totalrows;
 	double		totaldeadrows;
 
+	/* Only used if current role is excutor */
+	Datum*		stadistincts;
+
 	/*
 	 * Result tuple descriptor. Each returned row consists of three "fixed"
 	 * columns, plus all the columns of the sampled table (excluding dropped
 	 * columns).
 	 */
 	TupleDesc	outDesc;
-#define NUM_SAMPLE_FIXED_COLS 3
+#define NUM_SAMPLE_FIXED_COLS 4
 
 	/* SRF state, to track which rows have already been returned. */
 	int			index;
@@ -434,13 +438,6 @@ extern double anl_random_fract(void);
 extern double anl_init_selection_state(int n);
 extern double anl_get_next_S(double t, int n, double *stateptr);
 
-extern int acquire_sample_rows(Relation onerel, int elevel,
-							   HeapTuple *rows, int targrows,
-							   double *totalrows, double *totaldeadrows);
-extern int acquire_inherited_sample_rows(Relation onerel, int elevel,
-							  HeapTuple *rows, int targrows,
-							  double *totalrows, double *totaldeadrows);
-
 /* in commands/analyzefuncs.c */
 extern Datum gp_acquire_sample_rows(PG_FUNCTION_ARGS);
 extern Datum gp_acquire_correlations(PG_FUNCTION_ARGS);
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 60fd9f960f8..5e4e21f250a 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -311,6 +311,29 @@ typedef struct AggStatePerHashData
 	AttrNumber *hashGrpColIdxInput; /* hash col indices in input slot */
 	AttrNumber *hashGrpColIdxHash;	/* indices in hash table tuples */
 	Agg		   *aggnode;		/* original Agg node, for numGroups etc. */
+
+	/*
+	 * Some statistic info of hash table, used for EXPLAIN ANALYZE.
+	 * Note that they are accumulated info and will not be reset even
+	 * after the hash table is reset.
+	 */
+
+	/* number of groups/entries output by the iterator */
+	uint64		num_output_groups;
+	/* number of spilled partitions */
+	uint64		num_spill_parts;
+	/* number of hash table expansions */
+	uint32		num_expansions;
+	/* total number of buckets */
+	uint64      bucket_total;
+	/* number of used buckets */
+	uint64      bucket_used;
+	/* number of all chains */
+	uint64      chain_count;
+	/* total length of all chains */
+	uint64      chain_length_total;
+	/* max chain length */
+	uint32      chain_length_max;
 }			AggStatePerHashData;
 
 
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 170286a8d5e..efc712dc4b7 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -30,4 +30,6 @@ extern void ExecSeqScanReInitializeDSM(SeqScanState *node, ParallelContext *pcxt
 extern void ExecSeqScanInitializeWorker(SeqScanState *node,
 										ParallelWorkerContext *pwcxt);
 
+extern bool PassByBloomFilter(PlanState *ps, List *filters, TupleTableSlot *slot);
+
 #endif							/* NODESEQSCAN_H */
diff --git a/src/include/gpopt/CGPOptimizer.h b/src/include/gpopt/CGPOptimizer.h
index 243e42c6da1..4a191a8009a 100644
--- a/src/include/gpopt/CGPOptimizer.h
+++ b/src/include/gpopt/CGPOptimizer.h
@@ -18,6 +18,7 @@
 extern "C" {
 #include "postgres.h"
 
+#include "optimizer/orcaopt.h"
 #include "nodes/params.h"
 #include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
@@ -30,7 +31,8 @@ class CGPOptimizer
 	static PlannedStmt *GPOPTOptimizedPlan(
 		Query *query,
 		bool *
-			had_unexpected_failure	// output : set to true if optimizer unexpectedly failed to produce plan
+			had_unexpected_failure,	// output : set to true if optimizer unexpectedly failed to produce plan
+		OptimizerOptions *opts
 	);
 
 	// serialize planned statement into DXL
@@ -45,7 +47,8 @@ class CGPOptimizer
 extern "C" {
 
 extern PlannedStmt *GPOPTOptimizedPlan(Query *query,
-									   bool *had_unexpected_failure);
+									   bool *had_unexpected_failure,
+									   OptimizerOptions *opts);
 extern char *SerializeDXLPlan(Query *query);
 extern void InitGPOPT();
 extern void TerminateGPOPT();
diff --git a/src/include/gpopt/config/CConfigParamMapping.h b/src/include/gpopt/config/CConfigParamMapping.h
index ec314640b9d..32d81825384 100644
--- a/src/include/gpopt/config/CConfigParamMapping.h
+++ b/src/include/gpopt/config/CConfigParamMapping.h
@@ -68,7 +68,7 @@ class CConfigParamMapping
 	CConfigParamMapping(const CConfigParamMapping &) = delete;
 
 	// pack enabled optimizer config params in a traceflag bitset
-	static CBitSet *PackConfigParamInBitset(CMemoryPool *mp, ULONG xform_id);
+	static CBitSet *PackConfigParamInBitset(CMemoryPool *mp, ULONG xform_id, BOOL create_vec_plan);
 };
 }  // namespace gpdxl
 
diff --git a/src/include/gpopt/gpdbwrappers.h b/src/include/gpopt/gpdbwrappers.h
index cb75b2d493c..261cd28b5f0 100644
--- a/src/include/gpopt/gpdbwrappers.h
+++ b/src/include/gpopt/gpdbwrappers.h
@@ -63,82 +63,163 @@ struct ArrayExpr;
 
 #include "gpopt/utils/RelationWrapper.h"
 
+// without GP_WRAP try...catch functions
 namespace gpdb
 {
 // convert datum to bool
-bool BoolFromDatum(Datum d);
+static inline bool BoolFromDatum(Datum d) 
+{
+	return DatumGetBool(d);
+}
 
 // convert bool to datum
-Datum DatumFromBool(bool b);
+static inline Datum DatumFromBool(bool b)
+{
+	return BoolGetDatum(b);
+}
 
 // convert datum to char
-char CharFromDatum(Datum d);
+static inline char CharFromDatum(Datum d)
+{
+	return DatumGetChar(d);
+}
 
 // convert char to datum
-Datum DatumFromChar(char c);
+static inline Datum DatumFromChar(char c)
+{
+	return CharGetDatum(c);
+}
 
 // convert datum to int8
-int8 Int8FromDatum(Datum d);
+static inline int8 Int8FromDatum(Datum d)
+{
+	return DatumGetInt8(d);
+}
 
 // convert int8 to datum
-Datum DatumFromInt8(int8 i8);
+static inline Datum DatumFromInt8(int8 i8)
+{
+	return Int8GetDatum(i8);
+}
 
 // convert datum to uint8
-uint8 Uint8FromDatum(Datum d);
+static inline uint8 Uint8FromDatum(Datum d)
+{
+	return DatumGetUInt8(d);
+}
 
 // convert uint8 to datum
-Datum DatumFromUint8(uint8 ui8);
+static inline Datum DatumFromUint8(uint8 ui8)
+{
+	return UInt8GetDatum(ui8);
+}
 
 // convert datum to int16
-int16 Int16FromDatum(Datum d);
+static inline int16 Int16FromDatum(Datum d)
+{
+	return DatumGetInt16(d);
+}
 
 // convert int16 to datum
-Datum DatumFromInt16(int16 i16);
+static inline Datum DatumFromInt16(int16 i16)
+{
+	return Int16GetDatum(i16);
+}
 
 // convert datum to uint16
-uint16 Uint16FromDatum(Datum d);
+static inline uint16 Uint16FromDatum(Datum d)
+{
+	return DatumGetUInt16(d);
+}
 
 // convert uint16 to datum
-Datum DatumFromUint16(uint16 ui16);
+static inline Datum DatumFromUint16(uint16 ui16)
+{
+	return UInt16GetDatum(ui16);
+}
 
 // convert datum to int32
-int32 Int32FromDatum(Datum d);
+static inline int32 Int32FromDatum(Datum d)
+{
+	return DatumGetInt32(d);
+}
 
 // convert int32 to datum
-Datum DatumFromInt32(int32 i32);
+static inline Datum DatumFromInt32(int32 i32)
+{
+	return Int32GetDatum(i32);
+}
 
 // convert datum to uint32
-uint32 lUint32FromDatum(Datum d);
+static inline uint32 Uint32FromDatum(Datum d)
+{
+	return DatumGetUInt32(d);
+}
 
 // convert uint32 to datum
-Datum DatumFromUint32(uint32 ui32);
+static inline Datum DatumFromUint32(uint32 ui32)
+{
+	return UInt32GetDatum(ui32);
+}
 
 // convert datum to int64
-int64 Int64FromDatum(Datum d);
+static inline int64 Int64FromDatum(Datum d)
+{
+	return DatumGetInt64(d);
+}
 
 // convert int64 to datum
-Datum DatumFromInt64(int64 i64);
+static inline Datum DatumFromInt64(int64 i64)
+{
+	return Int64GetDatum(i64);
+}
 
 // convert datum to uint64
-uint64 Uint64FromDatum(Datum d);
+static inline uint64 Uint64FromDatum(Datum d)
+{
+	return DatumGetUInt64(d);
+}
 
 // convert uint64 to datum
-Datum DatumFromUint64(uint64 ui64);
+static inline Datum DatumFromUint64(uint64 ui64)
+{
+	return UInt64GetDatum(ui64);
+}
 
 // convert datum to oid
-Oid OidFromDatum(Datum d);
+static inline Oid OidFromDatum(Datum d)
+{
+	return DatumGetObjectId(d);
+}
 
 // convert datum to generic object with pointer handle
-void *PointerFromDatum(Datum d);
+static inline void *PointerFromDatum(Datum d)
+{
+	return DatumGetPointer(d);
+}
+
+// convert pointer to datum
+static inline Datum DatumFromPointer(const void *p)
+{
+	return PointerGetDatum(p);
+}
 
 // convert datum to float4
-float4 Float4FromDatum(Datum d);
+static inline float4 Float4FromDatum(Datum d)
+{
+	return DatumGetFloat4(d);
+}
 
 // convert datum to float8
-float8 Float8FromDatum(Datum d);
+static inline float8 Float8FromDatum(Datum d)
+{
+	return DatumGetFloat8(d);
+}
 
-// convert pointer to datum
-Datum DatumFromPointer(const void *p);
+}
+
+namespace gpdb
+{
 
 // does an aggregate exist with the given oid
 bool AggregateExists(Oid oid);
@@ -146,6 +227,9 @@ bool AggregateExists(Oid oid);
 // add member to Bitmapset
 Bitmapset *BmsAddMember(Bitmapset *a, int x);
 
+// next member of Bitmapset
+int BmsNextMember(const Bitmapset *a, int prevbit);
+
 // create a copy of an object
 void *CopyObject(void *from);
 
@@ -166,6 +250,9 @@ Oid ExprCollation(Node *expr);
 // expression collation - GPDB_91_MERGE_FIXME
 Oid TypeCollation(Oid type);
 
+// Byval type get len
+void TypLenByVal(Oid typid, int16 *typlen, bool *typbyval);
+
 // extract nodes with specific tag from a plan tree
 List *ExtractNodesPlan(Plan *pl, int node_tag, bool descend_into_subqueries);
 
@@ -183,6 +270,26 @@ int GetAggregateArgTypes(Aggref *aggref, Oid *inputTypes);
 Oid ResolveAggregateTransType(Oid aggfnoid, Oid aggtranstype, Oid *inputTypes,
 							  int numArguments);
 
+// intermediate result of given aggregate
+void GetAggregateInfo(Aggref *aggref, Oid *aggtransfn,
+					  Oid *aggfinalfn, Oid *aggcombinefn, 
+					  Oid *aggserialfn, Oid *aggdeserialfn,
+					  Oid *aggtranstype, int *aggtransspace,
+					  Datum *initValue, bool *initValueIsNull,
+					  bool *shareable);
+
+int
+FindCompatibleAgg(List *agginfos, Aggref *newagg,
+				  List **same_input_transnos);
+int
+FindCompatibleTrans(List *aggtransinfos, bool shareable,
+					Oid aggtransfn, Oid aggtranstype,
+					int transtypeLen, bool transtypeByVal,
+					Oid aggcombinefn, Oid aggserialfn,
+					Oid aggdeserialfn, Datum initValue, 
+					bool initValueIsNull, List *transnos);
+
+
 // replace Vars that reference JOIN outputs with references to the original
 // relation variables instead
 Query *FlattenJoinAliasVar(Query *query, gpos::ULONG query_level);
@@ -231,6 +338,12 @@ bool IsFuncNDVPreserving(Oid funcid);
 // stability property of given function
 char FuncStability(Oid funcid);
 
+// support function of given function
+RegProcedure FuncSupport(Oid funcid);
+
+// namespace of given function
+Oid FuncNamespace(Oid funcid);
+
 // exec location property of given function
 char FuncExecLocation(Oid funcid);
 
diff --git a/src/include/gpopt/translate/CContextDXLToPlStmt.h b/src/include/gpopt/translate/CContextDXLToPlStmt.h
index f10d45456f4..2630ad1a62d 100644
--- a/src/include/gpopt/translate/CContextDXLToPlStmt.h
+++ b/src/include/gpopt/translate/CContextDXLToPlStmt.h
@@ -56,36 +56,31 @@ using HMUlDxltrctx =
 class CContextDXLToPlStmt
 {
 private:
-	// cte consumer information
-	struct SCTEConsumerInfo
+	// cte producer information
+	struct SCTEEntryInfo
 	{
-		// list of ShareInputScan represent cte consumers
-		List *m_cte_consumer_list;
+		// producer idx mapping
+		ULongPtrArray *m_pidxmap;
 
-		// ctor
-		SCTEConsumerInfo(List *plan_cte) : m_cte_consumer_list(plan_cte)
-		{
-		}
+		// producer plan
+		ShareInputScan *m_cte_producer_plan;
 
-		void
-		AddCTEPlan(ShareInputScan *share_input_scan)
-		{
-			GPOS_ASSERT(nullptr != share_input_scan);
-			m_cte_consumer_list =
-				gpdb::LAppend(m_cte_consumer_list, share_input_scan);
-		}
 
-		~SCTEConsumerInfo()
+		// ctor
+		SCTEEntryInfo(ULongPtrArray *idxmap, ShareInputScan *plan_cte) : 
+		m_pidxmap(idxmap), m_cte_producer_plan(plan_cte)
 		{
-			gpdb::ListFree(m_cte_consumer_list);
+			GPOS_ASSERT(plan_cte);
 		}
+
+		~SCTEEntryInfo() = default;
 	};
 
-	// hash maps mapping ULONG -> SCTEConsumerInfo
-	using HMUlCTEConsumerInfo =
-		CHashMap<ULONG, SCTEConsumerInfo, gpos::HashValue<ULONG>,
+	// hash maps mapping ULONG -> SCTEEntryInfo
+	using HMUlCTEProducerInfo =
+		CHashMap<ULONG, SCTEEntryInfo, gpos::HashValue<ULONG>,
 				 gpos::Equals<ULONG>, CleanupDelete<ULONG>,
-				 CleanupDelete<SCTEConsumerInfo>>;
+				 CleanupDelete<SCTEEntryInfo>>;
 
 	using HMUlIndex =
 		CHashMap<ULONG, Index, gpos::HashValue<ULONG>, gpos::Equals<ULONG>,
@@ -122,7 +117,7 @@ class CContextDXLToPlStmt
 	ULONG m_result_relation_index;
 
 	// hash map of the cte identifiers and the cte consumers with the same cte identifier
-	HMUlCTEConsumerInfo *m_cte_consumer_info;
+	HMUlCTEProducerInfo *m_cte_producer_info;
 
 	// CTAS distribution policy
 	GpPolicy *m_distribution_policy;
@@ -132,6 +127,9 @@ class CContextDXLToPlStmt
 	// hash map of the queryid (of DML query) and the target relation index
 	HMUlIndex *m_used_rte_indexes;
 
+	// the aggno and aggtransno in agg 
+	List	   *m_agg_infos;		/* AggInfo structs */
+	List	   *m_agg_trans_infos;	/* AggTransInfo structs */
 public:
 	// ctor/dtor
 	CContextDXLToPlStmt(CMemoryPool *mp, CIdGenerator *plan_id_counter,
@@ -157,11 +155,11 @@ class CContextDXLToPlStmt
 	// retrieve the next parameter id
 	ULONG GetNextParamId(OID typeoid);
 
-	// add a newly found CTE consumer
-	void AddCTEConsumerInfo(ULONG cte_id, ShareInputScan *share_input_scan);
+	// register a newly CTE producer
+	void RegisterCTEProducerInfo(ULONG cte_id, ULongPtrArray *producer_output_colidx_map, ShareInputScan *siscan);
 
-	// return the list of shared input scan plans representing the CTE consumers
-	List *GetCTEConsumerList(ULONG cte_id) const;
+	// return the Share Input Scan plans representing the CTE producer
+	std::pair<ULongPtrArray *, ShareInputScan *> GetCTEProducerInfo(ULONG cte_id) const;
 
 	// return list of range table entries
 	List *
@@ -238,6 +236,20 @@ class CContextDXLToPlStmt
 
 	Index GetRTEIndexByAssignedQueryId(ULONG assigned_query_id_for_target_rel,
 									   BOOL *is_rte_exists);
+	// List of AggInfo and AggTransInfo
+	inline List *GetAggInfos() const 
+	{
+		return m_agg_infos;
+	}
+
+	inline List *GetAggTransInfos() const 
+	{
+		return m_agg_trans_infos;
+	}
+
+	void AppendAggInfos(AggInfo *agginfo);
+	void AppendAggTransInfos(AggTransInfo *transinfo);
+	void ResetAggInfosAndTransInfos();
 };
 
 }  // namespace gpdxl
diff --git a/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h b/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h
index 0507dc05105..625ed5cd0a3 100644
--- a/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h
+++ b/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h
@@ -291,12 +291,19 @@ class CTranslatorDXLToPlStmt
 	);
 
 	// translate DXL window node into GPDB window node
-	Plan *TranslateDXLWindow(
+	Plan *TranslateDXLWindowAgg(
 		const CDXLNode *motion_dxlnode, CDXLTranslateContext *output_context,
 		CDXLTranslationContextArray *
 			ctxt_translation_prev_siblings	// translation contexts of previous siblings
 	);
 
+	// translate DXL window node into window hash agg node
+	Plan *TranslateDXLWindowHashAgg(
+		const CDXLNode *window_dxlnode, CDXLTranslateContext *output_context,
+		CDXLTranslationContextArray 
+			*ctxt_translation_prev_siblings	// translation contexts of previous siblings
+	);
+
 	// translate DXL sort node into GPDB Sort plan node
 	Plan *TranslateDXLSort(
 		const CDXLNode *sort_dxlnode, CDXLTranslateContext *output_context,
@@ -647,6 +654,9 @@ class CTranslatorDXLToPlStmt
 		CDXLTranslationContextArray *ctxt_translation_prev_siblings,
 		CDXLTranslateContext *output_context,
 		CDXLNode *index_cond_list_dxlnode);
+
+	// fill the aggno and transno for the aggnode
+	static void TranslateAggFillInfo(CContextDXLToPlStmt *context, Aggref *aggref);
 };
 }  // namespace gpdxl
 
diff --git a/src/include/gpopt/utils/COptTasks.h b/src/include/gpopt/utils/COptTasks.h
index 2de78c7667a..bed8f36d51a 100644
--- a/src/include/gpopt/utils/COptTasks.h
+++ b/src/include/gpopt/utils/COptTasks.h
@@ -15,6 +15,10 @@
 #ifndef COptTasks_H
 #define COptTasks_H
 
+extern "C" {
+#include "optimizer/orcaopt.h"
+}
+
 #include "gpos/error/CException.h"
 
 #include "gpopt/base/CColRef.h"
@@ -103,11 +107,14 @@ struct SOptContext
 	void Free(EPin input, EPin epinOutput) const;
 
 	// Clone the error message in given context.
-	CHAR *CloneErrorMsg(struct MemoryContextData *context) const;
+	CHAR *CloneErrorMsg(struct MemoryContextData *context, BOOL *clone_failed) const;
 
 	// casting function
 	static SOptContext *Cast(void *ptr);
 
+	// other options pass by OptimizerOptions
+	BOOL m_create_vec_plan;
+
 };	// struct SOptContext
 
 class COptTasks
@@ -160,7 +167,8 @@ class COptTasks
 
 	// optimize Query->DXL->LExpr->Optimize->PExpr->DXL->PlannedStmt
 	static PlannedStmt *GPOPTOptimizedPlan(Query *query,
-										   SOptContext *gpopt_context);
+										   SOptContext *gpopt_context,
+										   OptimizerOptions *opts);
 
 	// enable/disable a given xforms
 	static bool SetXform(char *xform_str, bool should_disable);
diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
index a4a25c57f21..8b4af795544 100644
--- a/src/include/lib/simplehash.h
+++ b/src/include/lib/simplehash.h
@@ -126,6 +126,7 @@
 #define SH_ALLOCATE SH_MAKE_NAME(allocate)
 #define SH_FREE SH_MAKE_NAME(free)
 #define SH_STAT SH_MAKE_NAME(stat)
+#define SH_COLL_STAT SH_MAKE_NAME(coll_stat)
 
 /* internal helper functions (no externally visible prototypes) */
 #define SH_COMPUTE_PARAMETERS SH_MAKE_NAME(compute_parameters)
@@ -169,6 +170,14 @@ typedef struct SH_TYPE
 
 	/* user defined data, useful for callbacks */
 	void	   *private_data;
+
+	/*
+	 * number of times hash table is expanded
+	 *
+	 * Since the max size of hash table is UINT32_MAX, uint32 is good
+	 * enough for the number of expanded times.
+	 */
+	uint32 num_expansions;
 }			SH_TYPE;
 
 typedef enum SH_STATUS
@@ -244,6 +253,12 @@ SH_SCOPE	SH_ELEMENT_TYPE *SH_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter);
 /* void <prefix>_stat(<prefix>_hash *tb */
 SH_SCOPE void SH_STAT(SH_TYPE * tb);
 
+SH_SCOPE void
+SH_COLL_STAT(SH_TYPE * tb,
+			 uint32 * max_chain_length,
+			 uint32 * total_chain_length,
+			 uint32 * chain_count);
+
 #endif							/* SH_DECLARE */
 
 
@@ -450,6 +465,7 @@ SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data)
 	SH_COMPUTE_PARAMETERS(tb, size);
 
 	tb->data = SH_ALLOCATE(tb, sizeof(SH_ELEMENT_TYPE) * tb->size);
+	tb->num_expansions = 0;
 
 	return tb;
 }
@@ -468,6 +484,7 @@ SH_RESET(SH_TYPE * tb)
 {
 	memset(tb->data, 0, sizeof(SH_ELEMENT_TYPE) * tb->size);
 	tb->members = 0;
+	tb->num_expansions = 0;
 }
 
 /*
@@ -580,6 +597,7 @@ SH_GROW(SH_TYPE * tb, uint64 newsize)
 		}
 	}
 
+	(tb->num_expansions)++;
 	SH_FREE(tb, olddata);
 }
 
@@ -1120,6 +1138,69 @@ SH_STAT(SH_TYPE * tb)
 		   total_collisions, max_collisions, avg_collisions);
 }
 
+/*
+ * Greenplum specific
+ *
+ * Collect some statistics about the state of the hashtable. Major code was
+ * copied from SH_STAT() with some modifications to keep consistent with GPDB6.
+ */
+SH_SCOPE void
+SH_COLL_STAT(SH_TYPE * tb,
+			 uint32 * max_chain_length,
+			 uint32 * total_chain_length,
+			 uint32 * chain_count)
+{
+	*total_chain_length = 0;
+	*chain_count = 0;
+	uint32 last_dist = 0;
+
+	for (int i = 0; i < tb->size; i++)
+	{
+		uint32		hash;
+		uint32		optimal;
+		uint32		dist;
+		SH_ELEMENT_TYPE *elem;
+
+		elem = &tb->data[i];
+
+		if (elem->status != SH_STATUS_IN_USE)
+			continue;
+
+		hash = SH_ENTRY_HASH(tb, elem);
+		optimal = SH_INITIAL_BUCKET(tb, hash);
+		dist = SH_DISTANCE_FROM_OPTIMAL(tb, optimal, i);
+
+		/*
+		 * Different from SH_STAT(), always calculate chain length from 1 but
+		 * not 0, e.g. when there is only one element in bucket, the length
+		 * is 1.
+		 */
+		dist++;
+
+		/*
+		 * In same chain, dist must be always increasing. If dist < last_dist,
+		 * we must hit a new chain; take the length of old chain into account.
+		 */
+		if (dist < last_dist)
+		{
+			if (last_dist > *max_chain_length)
+				*max_chain_length = last_dist;
+			*total_chain_length += last_dist;
+			(*chain_count)++;
+		}
+		last_dist = dist;
+	}
+
+	/* Count the last chain. */
+	if (last_dist != 0)
+	{
+		if (last_dist > *max_chain_length)
+			*max_chain_length = last_dist;
+		*total_chain_length += last_dist;
+		(*chain_count)++;
+	}
+}
+
 #endif							/* SH_DEFINE */
 
 
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index e673dd47736..63a4b212bfe 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -1357,10 +1357,8 @@ typedef struct ModifyTableState
 	struct TransitionCaptureState *mt_oc_transition_capture;
 
 	/* Record modified leaf relation(s) */
-	bool		has_leaf_changed;
-	Bitmapset	*mt_leaf_relids_inserted;
-	Bitmapset	*mt_leaf_relids_updated;
-	Bitmapset	*mt_leaf_relids_deleted;
+	HTAB	*modified_leaf_relids;
+
 } ModifyTableState;
 
 /* ----------------
@@ -2231,6 +2229,9 @@ typedef struct DynamicSeqScanState
 	struct PartitionPruneState *as_prune_state; /* partition dynamic pruning state */
 	Bitmapset  *as_valid_subplans; /* used to determine partitions during dynamic pruning*/
 	bool 		did_pruning; /* flag that is set once dynamic pruning is performed */
+
+	/* runtime filter support */
+	List		*filters;			/* the list of struct ScanKeyData for runtime filters */
 } DynamicSeqScanState;
 
 /*
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 2ec47618998..30c0c09c6e4 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -103,6 +103,7 @@ typedef enum NodeTag
 	T_Agg,
 	T_TupleSplit,
 	T_WindowAgg,
+	T_WindowHashAgg,
 	T_Unique,
 	T_Gather,
 	T_GatherMerge,
diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index b81b5020089..b02a2ccf0c1 100644
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -2133,7 +2133,7 @@ typedef struct ProjectionPath
 	 * CDB: projection with qual gp_execution_segment() = <segid>,
 	 * for such case we should consider update directdispatch info.
 	 */
-	List	   *direct_dispath_contentIds;
+	List	   *direct_dispatch_contentIds;
 } ProjectionPath;
 
 typedef struct RuntimeFilterPath
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index d2b2d921fba..dd214cb9996 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -1245,6 +1245,9 @@ typedef struct ShareInputScan
 
 	/* Discard the scan output? True for ORCA CTE producer, false otherwise. */
 	bool        discard_output;
+
+	/* Could be set reference? */
+	bool		ref_set;
 } ShareInputScan;
 
 /* ----------------
@@ -1442,6 +1445,47 @@ typedef struct WindowAgg
 	bool		inRangeNullsFirst;	/* nulls sort first for in_range tests? */
 } WindowAgg;
 
+
+/* ----------------
+ *		window hash aggregate node
+ *
+ * A WindowHashAgg node implements window functions over zero or more
+ * ordering/framing specifications within a partition specification on
+ * appropriately UNORDERED input.
+ * 
+ * CBDB does not create plans with `WindowHashAgg` for the row executor,
+ * but does for the vectorization executor.
+ * ----------------
+ */
+typedef struct WindowHashAgg
+{
+	Plan		plan;
+	Index		winref;			/* ID referenced by window functions */
+	int			partNumCols;	/* number of columns in partition clause */
+	AttrNumber *partColIdx;		/* their indexes in the target list */
+	Oid		   *partOperators;	/* equality operators for partition columns */
+	Oid		   *partCollations; /* collations for partition columns */
+	/*
+	 * Different with `WindowAgg`, WindowHashAgg may use the 
+	 * `order by` information.
+	 */
+	int			ordNumCols;		/* number of sort-key columns */
+	AttrNumber *ordColIdx;		/* their indexes in the target list */
+	Oid		   *ordOperators;	/* OIDs of operators to sort them by */
+	Oid		   *ordCollations;	/* OIDs of collations */
+	bool	   *ordNullsFirst;	/* NULLS FIRST/LAST directions */
+
+	int			frameOptions;	/* frame_clause options, see WindowDef */
+	Node	   *startOffset;	/* expression for starting bound, if any */
+	Node	   *endOffset;		/* expression for ending bound, if any */
+	/* these fields are used with RANGE offset PRECEDING/FOLLOWING: */
+	Oid			startInRangeFunc;	/* in_range function for startOffset */
+	Oid			endInRangeFunc; /* in_range function for endOffset */
+	Oid			inRangeColl;	/* collation for in_range tests */
+	bool		inRangeAsc;		/* use ASC sort order for in_range tests? */
+	bool		inRangeNullsFirst;	/* nulls sort first for in_range tests? */
+} WindowHashAgg;
+
 /* ----------------
  *		unique node
  * ----------------
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index c49cba565f8..ff8b9c591f0 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -166,7 +166,7 @@ extern void cost_group(Path *path, PlannerInfo *root,
 					   List *quals,
 					   Cost input_startup_cost, Cost input_total_cost,
 					   double input_tuples);
-/* GPDB_92_MERGE_FIXME: parameterized path for shared input scan? */
+/* GPDB_92_MERGE_FIXME: parameterized path for Share Input Scan? */
 extern void cost_shareinputscan(Path *path, PlannerInfo *root, Cost sharecost, double ntuples, int width);
 extern void initial_cost_nestloop(PlannerInfo *root,
 								  JoinCostWorkspace *workspace,
diff --git a/src/include/optimizer/orca.h b/src/include/optimizer/orca.h
index d26903fc085..a32af3f56fd 100644
--- a/src/include/optimizer/orca.h
+++ b/src/include/optimizer/orca.h
@@ -18,10 +18,11 @@
 #define ORCA_H
 
 #include "pg_config.h"
+#include "optimizer/orcaopt.h"
 
 #ifdef USE_ORCA
 
-extern PlannedStmt * optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams);
+extern PlannedStmt * optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams, OptimizerOptions *options);
 extern Node *transformGroupedWindows(Node *node, void *context);
 
 // plan_hint_hook generates HintState by parsing a Query.
diff --git a/src/include/optimizer/orcaopt.h b/src/include/optimizer/orcaopt.h
new file mode 100644
index 00000000000..4a045b632c0
--- /dev/null
+++ b/src/include/optimizer/orcaopt.h
@@ -0,0 +1,39 @@
+/*-------------------------------------------------------------------------
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * orcaopt.h
+ *
+ * IDENTIFICATION
+ *	  src/include/optimizer/orcaopt.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef ORCA_OPT_H
+#define ORCA_OPT_H
+
+#include "pg_config.h"
+
+
+typedef struct OptimizerOptions 
+{
+    bool create_vectorization_plan;
+} OptimizerOptions;
+
+
+#endif /* ORCA_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 9b890e95566..a90c654cea6 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -283,7 +283,8 @@ cdb_pull_up_eclass(PlannerInfo    *root,
                     Relids          relids,
                     List           *targetlist,
                     List           *newvarlist,
-                    Index           newrelid);
+                    Index           newrelid,
+					bool			ignore_relabel);
 
 extern List *make_pathkeys_for_sortclauses(PlannerInfo *root,
 										   List *sortclauses,
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 29aac021f38..610034b2c62 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -21,13 +21,14 @@
 #include "nodes/pathnodes.h"
 #include "nodes/plannerconfig.h"
 #include "nodes/plannodes.h"
-
+#include "optimizer/orcaopt.h"
 
 /* Hook for plugins to get control in planner() */
 typedef PlannedStmt *(*planner_hook_type) (Query *parse,
 										   const char *query_string,
 										   int cursorOptions,
-										   ParamListInfo boundParams);
+										   ParamListInfo boundParams,
+										   OptimizerOptions *optimizer_options);
 extern PGDLLIMPORT planner_hook_type planner_hook;
 
 /* Hook for plugins to get control when grouping_planner() plans upper rels */
@@ -41,7 +42,8 @@ extern PGDLLIMPORT create_upper_paths_hook_type create_upper_paths_hook;
 
 extern PlannedStmt *standard_planner(Query *parse, const char *query_string,
 									 int cursorOptions,
-									 ParamListInfo boundParams);
+									 ParamListInfo boundParams,
+									 OptimizerOptions *optimizer_options);
 
 extern PlannerInfo *subquery_planner(PlannerGlobal *glob, Query *parse,
 									 PlannerInfo *parent_root,
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index ca57e87b367..6dcf03f9234 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -54,6 +54,14 @@ extern void compute_agg_clause_costs(PlannerInfo *root, AggSplit aggsplit,
 								 AggClauseCosts *agg_costs);
 extern void preprocess_aggrefs(PlannerInfo *root, Node *clause);
 
+extern int find_compatible_agg(List *agginfos, Aggref *newagg, List **same_input_transnos);
+extern int find_compatible_trans(List *aggtransinfos, bool shareable,
+								  Oid aggtransfn, Oid aggtranstype,
+								  int transtypeLen, bool transtypeByVal,
+								  Oid aggcombinefn,
+								  Oid aggserialfn, Oid aggdeserialfn,
+								  Datum initValue, bool initValueIsNull,
+								  List *transnos);
 /*
  * prototypes for prepunion.c
  */
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 379a94ae56a..aaa3ea32e8a 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -60,25 +60,19 @@
 /* Define to 1 to build with ic-proxy support (--enable-ic-proxy) */
 #undef ENABLE_IC_PROXY
 
-/* Define to 1 to disable preload interconnect module */
+/* Define to 1 to build with interconnect udp2 support (--enable-ic-udp2) */
+#undef ENABLE_IC_UDP2
+
+/* Define to 1 to preload with ic module */
 #undef ENABLE_PRELOAD_IC_MODULE
 
 /* Define to 1 to build client libraries as thread-safe code.
    (--enable-thread-safety) */
 #undef ENABLE_THREAD_SAFETY
 
-/* Define to 1 to build with fault injector. (--enable-faultinjector) */
+/* Define to 1 to build with fault injector. */
 #undef FAULT_INJECTOR
 
-/* Define to nothing if C supports flexible array members, and to 1 if it does
-   not. That way, with a declaration like `struct s { int n; double
-   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
-   compilers. When computing the size of such an object, don't use 'sizeof
-   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
-   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
-   MSVC and with C++ compilers. */
-#undef FLEXIBLE_ARRAY_MEMBER
-
 /* float4 values are passed by value if 'true', by reference if 'false'
    (always true in GPDB) */
 #undef FLOAT4PASSBYVAL
@@ -130,6 +124,9 @@
 /* Define to 1 if you have the `BIO_meth_new' function. */
 #undef HAVE_BIO_METH_NEW
 
+/* Define to 1 if you have the `cbrt' function. */
+#undef HAVE_CBRT
+
 /* Define to 1 if you have the `clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME
 
@@ -148,9 +145,6 @@
 /* Define to 1 if you have the `CRYPTO_lock' function. */
 #undef HAVE_CRYPTO_LOCK
 
-/* Define to 1 if you have the <crypt.h> header file. */
-#undef HAVE_CRYPT_H
-
 /* define if the compiler supports basic C++14 syntax */
 #undef HAVE_CXX14
 
@@ -386,6 +380,9 @@
 /* Define to 1 if you have the `execinfo' library (-lexecinfo). */
 #undef HAVE_LIBEXECINFO
 
+/* Define to 1 if you have the `jansson' library (-ljansson). */
+#undef HAVE_LIBJANSSON
+
 /* Define to 1 if you have the `ldap' library (-lldap). */
 #undef HAVE_LIBLDAP
 
@@ -401,15 +398,15 @@
 /* Define to 1 if you have the `pam' library (-lpam). */
 #undef HAVE_LIBPAM
 
-/* Define to 1 if you have the `quicklz' library (-lquicklz). */
-#undef HAVE_LIBQUICKLZ
-
 /* Define if you have a function readline library */
 #undef HAVE_LIBREADLINE
 
 /* Define to 1 if you have the `rt' library (-lrt). */
 #undef HAVE_LIBRT
 
+/* Define to 1 if you have the `seccomp' library (-lseccomp). */
+#undef HAVE_LIBSECCOMP
+
 /* Define to 1 if you have the `selinux' library (-lselinux). */
 #undef HAVE_LIBSELINUX
 
@@ -506,6 +503,9 @@
 /* Define to 1 if you have the `pread' function. */
 #undef HAVE_PREAD
 
+/* Define if protobuf is available */
+#undef HAVE_PROTOBUF
+
 /* Define to 1 if you have the `pstat' function. */
 #undef HAVE_PSTAT
 
@@ -747,10 +747,6 @@
 /* Define to 1 if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#undef HAVE_TM_ZONE
-
 /* Define to 1 if your compiler understands `typeof' or something similar. */
 #undef HAVE_TYPEOF
 
@@ -799,14 +795,12 @@
 /* Define to 1 if you have the <winldap.h> header file. */
 #undef HAVE_WINLDAP_H
 
-
 /* Define to 1 if you have the <winsock2.h> header file. */
 #undef HAVE_WINSOCK2_H
 
 /* Define to 1 if you have the `writev' function. */
 #undef HAVE_WRITEV
 
-
 /* Define to 1 if you have the `X509_get_signature_nid' function. */
 #undef HAVE_X509_GET_SIGNATURE_NID
 
@@ -816,6 +810,9 @@
 /* Define to 1 if you have the <yaml.h> header file. */
 #undef HAVE_YAML_H
 
+/* Define if zstd is available */
+#undef HAVE_ZSTD
+
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
@@ -870,9 +867,6 @@
 /* Define to 1 if you have the `__strtoull' function. */
 #undef HAVE___STRTOULL
 
-/* Define to 1 if you have the `etcdlib' library (-letcdlib). */
-#undef HAVE_LIBETCDLIB
-
 /* Define to the appropriate printf length modifier for 64-bit ints. */
 #undef INT64_MODIFIER
 
@@ -885,6 +879,9 @@
 /* Define bytes to use libc memset(). */
 #undef MEMSET_LOOP_LIMIT
 
+/* Define to 1 if you want to allow OpenSSL redirects. */
+#undef OPENSSL_ALLOW_REDIRECT
+
 /* Define to the OpenSSL API version in use. This avoids deprecation warnings
    from newer OpenSSL versions. */
 #undef OPENSSL_API_COMPAT
@@ -933,7 +930,6 @@
 #undef PG_USE_STDBOOL
 
 /* Postgres version Apache Cloudberry is based on */
-/* PostgreSQL version as a string */
 #undef PG_VERSION
 
 /* PostgreSQL version as a number */
@@ -963,7 +959,7 @@
    RELSEG_SIZE requires an initdb. */
 #undef RELSEG_SIZE
 
-/*  Define to 1 to use serverless mode of Cloudberry. (--enable-serverless) */
+/* Define to 1 to use serverless mode of Cloudberry. (--enable-serverless) */
 #undef SERVERLESS
 
 /* The size of `bool', as computed by sizeof. */
@@ -1008,9 +1004,6 @@
 /* Define to 1 to build with libcurl support. (--with-libcurl) */
 #undef USE_CURL
 
-/* Define to use /dev/urandom for random number generation */
-#undef USE_DEV_URANDOM
-
 /* Define to 1 if you want float4 values to be passed by value. (Always
    defined in GPDB) */
 #undef USE_FLOAT4_BYVAL
@@ -1022,10 +1015,12 @@
 /* Define to 1 to build with gpcloud (--enable-gpcloud) */
 #undef USE_GPCLOUD
 
-
 /* Define to build with ICU support. (--with-icu) */
 #undef USE_ICU
 
+/* Define to 1 to use the internal FTS implementation. */
+#undef USE_INTERNAL_FTS
+
 /* Define to 1 to build with LDAP support. (--with-ldap) */
 #undef USE_LDAP
 
@@ -1036,18 +1031,18 @@
    (--with-libxslt) */
 #undef USE_LIBXSLT
 
+/* Define to 1 to build Cloudberry using the shared library libpostgres.so
+   (--enable-link-postgres-with-shared) */
+#undef USE_LINK_POSTGRES_WITH_SHARED
+
 /* Define to 1 to build with LLVM based JIT support. (--with-llvm) */
 #undef USE_LLVM
 
-/* Define to 1 to build with Mapreduce capabilities (--enable-mapreduce) */
-#undef USE_MAPREDUCE
-
-/* Define to 1 to build with shared postgres backend capabilities (--enable-shared-postgres-backend) */
-#undef USE_SHARED_POSTGRES_BACKEND
-
 /* Define to 1 to build with LZ4 support. (--with-lz4) */
 #undef USE_LZ4
 
+/* Define to 1 to build with Mapreduce capabilities (--enable-mapreduce) */
+#undef USE_MAPREDUCE
 
 /* Define to select named POSIX semaphores. */
 #undef USE_NAMED_POSIX_SEMAPHORES
@@ -1055,21 +1050,19 @@
 /* Define to 1 to build with OpenSSL support. (--with-ssl=openssl) */
 #undef USE_OPENSSL
 
-/* Define to use OpenSSL for random number generation */
-#undef USE_OPENSSL_RANDOM
-
-/* Define to use OpenSSL redirect access internal implements if not implements */
-#undef OPENSSL_ALLOW_REDIRECT
-
 /* Define to 1 to build with Cloudberry ORCA optimizer. (--enable-orca) */
 #undef USE_ORCA
 
-/* Define to 1 to build with pax support. (--enable-pax) */
-#undef USE_PAX_STORAGE
-
 /* Define to 1 to build with PAM support. (--with-pam) */
 #undef USE_PAM
 
+/* Define to 1 to support PAX */
+#undef USE_PAX_STORAGE
+
+/* Define to 1 to build with shared Cloudberry backend capabilities
+   (--enable-shared-postgres-backend) */
+#undef USE_SHARED_POSTGRES_BACKEND
+
 /* Define to 1 to use software CRC-32C implementation (slicing-by-8). */
 #undef USE_SLICING_BY_8_CRC32C
 
@@ -1103,9 +1096,6 @@
 /* Define to 1 if `wcstombs_l' requires <xlocale.h>. */
 #undef WCSTOMBS_L_IN_XLOCALE
 
-/* Define to build with external FTS support. (--enable-external-fts) */
-#undef USE_INTERNAL_FTS
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
@@ -1125,10 +1115,7 @@
    */
 #undef XLOG_BLCKSZ
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
+
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 215be9f731f..dc80f4ba040 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -294,9 +294,6 @@
 /* Define to 1 if you have the `pam' library (-lpam). */
 /* #undef HAVE_LIBPAM */
 
-/* Define to 1 if you have the `quicklz' library (-lquicklz). */
-/* #undef HAVE_LIBQUICKLZ */
-
 /* Define if you have a function readline library */
 /* #undef HAVE_LIBREADLINE */
 
diff --git a/src/include/postgres.h b/src/include/postgres.h
index bde5a8b01b1..90fd1f29d39 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -186,30 +186,38 @@ typedef struct
 } varattrib_1b_e;
 
 /*
- * Bit layouts for varlena headers: (GPDB always stores this big-endian format)
+ * Bit layouts for varlena headers on big-endian machines:
  *
  * 00xxxxxx 4-byte length word, aligned, uncompressed data (up to 1G)
  * 01xxxxxx 4-byte length word, aligned, *compressed* data (up to 1G)
  * 10000000 1-byte length word, unaligned, TOAST pointer
  * 1xxxxxxx 1-byte length word, unaligned, uncompressed data (up to 126b)
  *
- * Cloudberry differs from PostgreSQL here... In Postgres, they use different
- * macros for big-endian and little-endian machines, so the length is contiguous,
- * while the 4 byte lengths are stored in native endian format.
+ * Bit layouts for varlena headers on little-endian machines:
  *
- * Cloudberry stored the 4 byte varlena header in network byte order, so it always
- * look big-endian in the tuple.   This is a bit ugly, but changing it would require
- * all our customers to initdb.
+ * xxxxxx00 4-byte length word, aligned, uncompressed data (up to 1G)
+ * xxxxxx10 4-byte length word, aligned, *compressed* data (up to 1G)
+ * 00000001 1-byte length word, unaligned, TOAST pointer
+ * xxxxxxx1 1-byte length word, unaligned, uncompressed data (up to 126b)
  *
  * The "xxx" bits are the length field (which includes itself in all cases).
- * In the big-endian case we mask to extract the length.
- * Note that in both cases the flag bits are in the physically
+ * In the big-endian case we mask to extract the length, in the little-endian
+ * case we shift.  Note that in both cases the flag bits are in the physically
  * first byte.  Also, it is not possible for a 1-byte length word to be zero;
  * this lets us disambiguate alignment padding bytes from the start of an
  * unaligned datum.  (We now *require* pad bytes to be filled with zero!)
  *
  * In TOAST pointers the va_tag field (see varattrib_1b_e) is used to discern
  * the specific type and length of the pointer datum.
+ *
+ * NOTE:
+ * Greenplum differs from PostgreSQL here... In Postgres, it use different
+ * macros for big-endian and little-endian machines, so the length is contiguous,
+ * while the 4 byte lengths are stored in native endian format.
+ *
+ * Greenplum stored the 4 byte varlena header in network byte order, so it always
+ * look big-endian in the tuple.
+ *
  */
 
 /*
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 0c0284c9ed3..2c594cd68d8 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -35,6 +35,7 @@ typedef struct PROC_QUEUE
 
 /* GUC variables */
 extern int	max_locks_per_xact;
+extern int	find_writer_proc_retry_time;
 
 #ifdef LOCK_DEBUG
 extern int	Trace_lock_oidmin;
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index e7db1a43d49..4e3685dc55d 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -155,6 +155,7 @@ typedef struct f_smgr
 } f_smgr;
 
 typedef struct f_smgr_ao {
+	void			(*smgr_create_ao) (RelFileNodeBackend rnode, int32 segmentFileNum, bool isRedo);
 	off_t			(*smgr_FileDiskSize) (File file);
 	void			(*smgr_FileClose) (File file);
 	int				(*smgr_FileTruncate) (File file, int64 offset, uint32 wait_event_info);
@@ -193,7 +194,9 @@ extern void smgrclose(SMgrRelation reln);
 extern void smgrcloseall(void);
 extern void smgrclosenode(RelFileNodeBackend rnode);
 extern void smgrcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo);
-extern void smgrcreate_ao(RelFileNodeBackend rnode, int32 segmentFileNum, bool isRedo);
+extern void smgrcreate_ao(const struct f_smgr_ao *smgr,
+				RelFileNodeBackend rnode,
+				int32 segmentFileNum, bool isRedo);
 extern void smgrdosyncall(SMgrRelation *rels, int nrels);
 extern void smgrdounlinkall(SMgrRelation *rels, int nrels, bool isRedo);
 extern void smgrextend(SMgrRelation reln, ForkNumber forknum,
diff --git a/src/include/storage/standbydefs.h b/src/include/storage/standbydefs.h
index d99e6f40c6d..f007fe25245 100644
--- a/src/include/storage/standbydefs.h
+++ b/src/include/storage/standbydefs.h
@@ -34,6 +34,7 @@ extern void standby_desc_invalidations(StringInfo buf,
 #define XLOG_STANDBY_LOCK			0x00
 #define XLOG_RUNNING_XACTS			0x10
 #define XLOG_INVALIDATIONS			0x20
+#define XLOG_LATESTCOMPLETED_GXID   0xF0
 
 typedef struct xl_standby_locks
 {
diff --git a/src/include/storage/ufile.h b/src/include/storage/ufile.h
index e34d66350ca..7e66196c040 100644
--- a/src/include/storage/ufile.h
+++ b/src/include/storage/ufile.h
@@ -44,7 +44,7 @@ typedef struct FileAm
 	int (*write) (struct UFile *file, char *buffer, int amount);
 	int64_t (*size) (struct UFile *file);
 	void (*unlink) (Oid spcId, const char *fileName);
-	char* (*formatPathName) (RelFileNode *relFileNode);
+	char* (*formatPathName) (Oid relid, RelFileNode *relFileNode);
 	bool (*ensurePath) (Oid spcId, const char *pathName);
 	bool (*exists) (Oid spcId, const char *fileName);
 	const char *(*name) (struct UFile *file);
@@ -72,7 +72,7 @@ extern off_t UFileSize(UFile *file);
 extern const char *UFileName(UFile *file);
 
 extern void UFileUnlink(Oid spcId, const char *fileName);
-extern char* UFileFormatPathName(RelFileNode *relFileNode);
+extern char* UFileFormatPathName(Oid relid, RelFileNode *relFileNode);
 extern bool UFileEnsurePath(Oid spcId, const char *pathName);
 extern bool UFileExists(Oid spcId, const char *fileName);
 
diff --git a/src/include/utils/cgroup.h b/src/include/utils/cgroup.h
index 42e6468be40..e43e1a88412 100644
--- a/src/include/utils/cgroup.h
+++ b/src/include/utils/cgroup.h
@@ -18,9 +18,18 @@
 #include "postgres.h"
 #include "nodes/pg_list.h"
 
+extern char *gp_resource_group_cgroup_parent;
+
 #define MAX_CGROUP_PATHLEN 256
 #define MAX_CGROUP_CONTENTLEN 1024  
 
+#define CGROUP_CONFIG_WARNING(msg, ...) \
+	ereport(WARNING, \
+			(errmsg("cgroup is not properly configured: " msg, ##__VA_ARGS__), \
+			 errhint("Please check whether the directory '/sys/fs/cgroup/%s' exists when gp_resource_manager = 'group-v2' and gp_resource_group_cgroup_parent = '%s'.", \
+			 gp_resource_group_cgroup_parent ? gp_resource_group_cgroup_parent : "", \
+			 gp_resource_group_cgroup_parent ? gp_resource_group_cgroup_parent : "")))
+
 #define CGROUP_ERROR(...) elog(ERROR, __VA_ARGS__)
 #define CGROUP_CONFIG_ERROR(...) \
 	CGROUP_ERROR("cgroup is not properly configured: " __VA_ARGS__)
@@ -47,6 +56,8 @@
 /* This is the default value about Linux Control Group */
 #define DEFAULT_CPU_PERIOD_US 100000LL
 
+/* The name of leaf cgroup when use cgroup v2 */
+#define CGROUPV2_LEAF_INDENTIFIER "queries"
 
 /*
  * Resource Group underlying component types.
@@ -168,7 +179,7 @@ extern void setComponentDir(CGroupComponentType component, const char *dir);
 extern int lockDir(const char *path, bool block);
 
 /* Create cgroup dir. */
-extern bool createDir(Oid group, CGroupComponentType comp);
+extern bool createDir(Oid group, CGroupComponentType comp, char *filename);
 /* Delete cgroup dir. */
 extern bool deleteDir(Oid group, CGroupComponentType component, const char *filename, bool unassign,
 					  void (*detachcgroup) (Oid group, CGroupComponentType component, int fd_dir));
@@ -233,6 +244,7 @@ typedef void (*setio_function) (Oid group, List *limit_list);
 typedef void (*freeio_function) (List *limit_list);
 typedef List* (*getiostat_function) (Oid groupid, List *io_limit);
 typedef char* (*dumpio_function) (List *limit_list);
+typedef void  (*cleario_function) (Oid groupid);
 
 
 typedef struct CGroupOpsRoutine
@@ -272,6 +284,7 @@ typedef struct CGroupOpsRoutine
 	freeio_function			freeio;
 	getiostat_function		getiostat;
 	dumpio_function			dumpio;
+	cleario_function		cleario;
 } CGroupOpsRoutine;
 
 /* The global function handler. */
diff --git a/src/include/utils/cgroup_io_limit.h b/src/include/utils/cgroup_io_limit.h
index e7ea1528899..5f774822435 100644
--- a/src/include/utils/cgroup_io_limit.h
+++ b/src/include/utils/cgroup_io_limit.h
@@ -7,14 +7,18 @@
 /* type for linux device id, use libc dev_t now.
  * bdi means backing device info.
  */
+#ifdef __linux__
 typedef dev_t bdi_t;
-
 #define make_bdi(major, minor) makedev(major, minor)
 #define bdi_major(bdi) major(bdi)
 #define bdi_minor(bdi) minor(bdi)
+#else
+typedef uint64 bdi_t;
+#endif
 
 
-#define IO_LIMIT_MAX  (0)
+#define IO_LIMIT_MAX  (PG_UINT64_MAX)
+#define IO_LIMIT_EMPTY (0)
 
 /*
  * IOconfig represents the io.max of cgroup v2 io controller.
@@ -69,7 +73,7 @@ typedef struct IOLimitParserContext
 
 typedef struct IOLimitScannerState
 {
-	void *state;
+	void *buffer;
 	void *scanner;
 } IOLimitScannerState;
 
@@ -104,9 +108,11 @@ extern int fill_bdi_list(TblSpcIOLimit *io_limit);
 extern List *io_limit_parse(const char *limit_str);
 extern void io_limit_free(List *limit_list);
 extern void io_limit_validate(List *limit_list);
+bool io_limit_value_validate(const char *field, const uint64 value, uint64 *max);
 
 extern List  *get_iostat(Oid groupid, List *io_limit);
 extern int  compare_iostat(const ListCell *ca, const ListCell *cb);
 extern char *io_limit_dump(List *limit_list);
+extern void clear_io_max(Oid groupid);
 
 #endif
diff --git a/src/include/utils/datumstream.h b/src/include/utils/datumstream.h
index 5210159d8b6..278579fb60b 100644
--- a/src/include/utils/datumstream.h
+++ b/src/include/utils/datumstream.h
@@ -93,6 +93,7 @@ typedef struct DatumStreamRead
 	int64		blockFirstRowNum;
 	int64		blockFileOffset;
 	int			blockRowCount;
+	int			blockRowsProcessed;
 
 	AppendOnlyStorageRead ao_read;
 
@@ -322,8 +323,9 @@ extern bool datumstreamread_find_block(DatumStreamRead * datumStream,
 extern void *datumstreamread_get_upgrade_space(DatumStreamRead *datumStream,
 											   size_t len);
 
+extern bool datumstreamread_block_info(DatumStreamRead * acc);
 /*
- * MPP-17061: make sure datumstream_read_block_info was called first for the CO block
+ * MPP-17061: make sure datumstreamread_block_info was called first for the CO block
  * before calling datumstreamread_block_content.
  */
 extern void datumstreamread_block_content(DatumStreamRead * acc);
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 63a69864d9c..aa34138a4b5 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -261,6 +261,7 @@ extern bool Debug_print_parse;
 extern bool Debug_print_rewritten;
 extern bool Debug_pretty_print;
 extern bool Debug_print_ivm;
+extern bool Debug_print_aggref_in_explain;
 
 extern bool	Debug_print_full_dtm;
 extern bool	Debug_print_snapshot_dtm;
@@ -292,6 +293,8 @@ extern bool enable_parallel;
 extern bool enable_parallel_semi_join;
 extern bool enable_parallel_dedup_semi_join;
 extern bool enable_parallel_dedup_semi_reverse_join;
+extern bool	parallel_query_use_streaming_hashagg;
+extern bool gp_use_streaming_hashagg;
 extern int  gp_appendonly_insert_files;
 extern int  gp_appendonly_insert_files_tuples_range;
 extern int  gp_random_insert_segments;
@@ -464,6 +467,12 @@ extern bool create_restartpoint_on_ckpt_record_replay;
 #define OPTIMIZER_GPDB_CALIBRATED       1       /* GPDB's calibrated cost model */
 #define OPTIMIZER_GPDB_EXPERIMENTAL     2       /* GPDB's experimental cost model */
 
+/* optimizer cost model */
+#define OPTIMIZER_AGG_PDS_ALL_KEY             0
+#define OPTIMIZER_AGG_PDS_FIRST_KEY           1
+#define OPTIMIZER_AGG_PDS_MINIMAL_LEN_KEY     2
+#define OPTIMIZER_AGG_PDS_EXCLUDE_NON_FIXED   3
+
 
 /* Optimizer related gucs */
 extern bool	optimizer;
@@ -489,6 +498,8 @@ extern bool	optimizer_print_group_properties;
 extern bool	optimizer_print_optimization_context;
 extern bool optimizer_print_optimization_stats;
 extern bool optimizer_print_xform_results;
+extern bool optimizer_print_preprocess_result;
+extern bool optimizer_debug_cte;
 
 /* array of xforms disable flags */
 extern bool optimizer_xforms[OPTIMIZER_XFORMS_COUNT];
@@ -542,6 +553,8 @@ extern bool optimizer_enable_replicated_table;
 extern bool optimizer_enable_foreign_table;
 extern bool optimizer_enable_right_outer_join;
 extern bool optimizer_enable_query_parameter;
+extern bool optimizer_force_window_hash_agg;
+extern int optimizer_agg_pds_strategy;
 
 /* Optimizer plan enumeration related GUCs */
 extern bool optimizer_enumerate_plans;
@@ -597,6 +610,7 @@ extern bool optimizer_enable_associativity;
 extern bool optimizer_enable_range_predicate_dpe;
 extern bool optimizer_enable_use_distribution_in_dqa;
 extern bool optimizer_enable_push_join_below_union_all;
+extern bool optimizer_disable_dynamic_table_scan;
 
 /* Analyze related GUCs for Optimizer */
 extern bool optimizer_analyze_root_partition;
@@ -848,6 +862,7 @@ extern void gpvars_assign_gp_resource_manager_policy(const char *newval, void *e
 extern const char *gpvars_show_gp_resource_manager_policy(void);
 extern const char *gpvars_assign_gp_resqueue_memory_policy(const char *newval, bool doit, GucSource source);
 extern const char *gpvars_show_gp_resqueue_memory_policy(void);
+extern bool gpvars_check_gp_resource_group_cgroup_parent(char **newval, void **extra, GucSource source);
 extern bool gpvars_check_statement_mem(int *newval, void **extra, GucSource source);
 extern bool gpvars_check_rg_query_fixed_mem(int *newval, void **extra, GucSource source);
 extern int guc_name_compare(const char *namea, const char *nameb);
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index fb940fa1ecf..e592d1e8863 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -225,6 +225,9 @@ typedef struct PortalData
 
 	/* MPP: is this portal a CURSOR, or protocol level portal? */
 	bool		is_extended_query; /* simple or extended query protocol? */
+
+	/* current motion stop requested? */
+	bool		stop_requested_in_motion;
 }			PortalData;
 
 /*
diff --git a/src/include/utils/process_shared_preload_libraries.h b/src/include/utils/process_shared_preload_libraries.h
index fe098ccf401..87e4dc40a6d 100644
--- a/src/include/utils/process_shared_preload_libraries.h
+++ b/src/include/utils/process_shared_preload_libraries.h
@@ -1,6 +1,9 @@
 #ifdef ENABLE_PRELOAD_IC_MODULE
   "interconnect",
 #endif
+#ifdef ENABLE_IC_UDP2
+  		"udp2",
+#endif
 #ifdef USE_PAX_STORAGE
 		"pax",
 #endif
diff --git a/src/include/utils/resgroup.h b/src/include/utils/resgroup.h
index 6db5a10a0e8..dd03b842fd2 100644
--- a/src/include/utils/resgroup.h
+++ b/src/include/utils/resgroup.h
@@ -109,6 +109,7 @@ extern int gp_resource_group_queuing_timeout;
 extern bool gp_resource_group_bypass_catalog_query;
 extern int gp_resource_group_move_timeout;
 extern bool gp_resource_group_bypass_direct_dispatch;
+extern char *gp_resource_group_cgroup_parent;
 
 /*
  * Non-GUC global variables.
@@ -216,6 +217,7 @@ extern void ResGroupMoveQuery(int sessionId, Oid groupId, const char *groupName)
 extern Oid ResGroupGetGroupIdBySessionId(int sessionId);
 extern char *getCpuSetByRole(const char *cpuset);
 extern void checkCpuSetByRole(const char *cpuset);
+extern bool checkTablespaceInIOlimit(Oid tblspcid, bool errout);
 
 #define LOG_RESGROUP_DEBUG(...) \
 	do {if (Debug_resource_group) elog(__VA_ARGS__); } while(false);
diff --git a/src/include/utils/sampling.h b/src/include/utils/sampling.h
index 9536b07432c..fa3c9aa2ff8 100644
--- a/src/include/utils/sampling.h
+++ b/src/include/utils/sampling.h
@@ -42,7 +42,7 @@ extern BlockNumber BlockSampler_Init(BlockSampler bs, BlockNumber nblocks,
 extern bool BlockSampler_HasMore(BlockSampler bs);
 extern BlockNumber BlockSampler_Next(BlockSampler bs);
 
-/* 64 bit version of BlockSampler */
+/* 64 bit version of BlockSampler (used for sampling AO/CO table rows) */
 typedef struct
 {
 	int64           N;				/* number of objects, known in advance */
diff --git a/src/include/utils/sync_guc_name.h b/src/include/utils/sync_guc_name.h
index 286762e6d6f..6d09f49155f 100644
--- a/src/include/utils/sync_guc_name.h
+++ b/src/include/utils/sync_guc_name.h
@@ -53,6 +53,8 @@
 		"gp_appendonly_compaction",
 		"gp_appendonly_compaction_segfile_limit",
 		"gp_appendonly_compaction_threshold",
+		"gp_appendonly_insert_files",
+		"gp_appendonly_insert_files_tuples_range",
 		"gp_appendonly_verify_block_checksums",
 		"gp_appendonly_verify_write_block",
 		"gp_blockdirectory_entry_min_range",
@@ -63,6 +65,7 @@
 		"gp_disable_tuple_hints",
 		"gp_enable_interconnect_aggressive_retry",
 		"gp_enable_runtime_filter",
+		"gp_enable_runtime_filter_pushdown",
 		"gp_enable_segment_copy_checking",
 		"gp_external_enable_filter_pushdown",
 		"gp_hashjoin_tuples_per_bucket",
@@ -71,6 +74,7 @@
 		"gp_initial_bad_row_limit",
 		"gp_interconnect_address_type",
 		"gp_interconnect_cache_future_packets",
+		"gp_interconnect_cursor_ic_table_size",
 		"gp_interconnect_debug_retry_interval",
 		"gp_interconnect_default_rtt",
 		"gp_interconnect_fc_method",
@@ -82,6 +86,7 @@
 		"gp_interconnect_queue_depth",
 		"gp_interconnect_setup_timeout",
 		"gp_interconnect_snd_queue_depth",
+		"gp_interconnect_mem_size",
 		"gp_interconnect_tcp_listener_backlog",
 		"gp_interconnect_timer_checking_period",
 		"gp_interconnect_timer_period",
@@ -95,6 +100,7 @@
 		"gp_log_suboverflow_statement",
 		"gp_max_packet_size",
 		"gp_motion_slice_noop",
+		"gp_random_insert_segments",
 		"gp_resgroup_debug_wait_queue",
 		"gp_resgroup_memory_policy_auto_fixed_mem",
 		"gp_resqueue_memory_policy_auto_fixed_mem",
@@ -193,8 +199,5 @@
 		"wal_debug",
 		"wal_sender_timeout",
 		"work_mem",
-		"gp_appendonly_insert_files",
-		"gp_appendonly_insert_files_tuples_range",
-		"gp_enable_runtime_filter_pushdown",
-		"gp_random_insert_segments",
 		"zero_damaged_pages",
+		"find_writer_proc_retry_time",
diff --git a/src/include/utils/unsync_guc_name.h b/src/include/utils/unsync_guc_name.h
index 6cbf4b3179b..cba11770a81 100644
--- a/src/include/utils/unsync_guc_name.h
+++ b/src/include/utils/unsync_guc_name.h
@@ -7,7 +7,6 @@
 *--------------------------------------------------------------------------
 */
 /* items in this file should be ordered */
-		"enable_answer_query_using_materialized_views",
 		"application_name",
 		"aqumv_allow_foreign_table",
 		"archive_cleanup_command",
@@ -44,6 +43,7 @@
 		"checkpoint_warning",
 		"client_connection_check_interval",
 		"client_encoding",
+		"cluster_key_command",
 		"cluster_name",
 		"compute_query_id",
 		"config_file",
@@ -89,6 +89,7 @@
 		"debug_print_slice_table",
 		"debug_print_snapshot_dtm",
 		"debug_print_ivm",
+		"debug_print_aggref_in_explain",
 		"debug_resource_group",
 		"debug_walrepl_rcv",
 		"debug_walrepl_snd",
@@ -106,6 +107,7 @@
 		"dynamic_shared_memory_type",
 		"effective_cache_size",
 		"effective_io_concurrency",
+		"enable_answer_query_using_materialized_views",
 		"enable_async_append",
 		"enable_bitmapscan",
 		"enable_gathermerge",
@@ -140,6 +142,7 @@
 		"exit_on_error",
 		"external_pid_file",
 		"extra_float_digits",
+		"file_encryption_method",
 		"from_collapse_limit",
 		"fsync",
 		"full_page_writes",
@@ -257,6 +260,7 @@
 		"gp_resource_group_bypass_direct_dispatch",
 		"gp_resource_group_queuing_timeout",
 		"gp_resource_group_move_timeout",
+		"gp_resource_group_cgroup_parent",
 		"gp_resource_manager",
 		"gp_resqueue_memory_policy",
 		"gp_resqueue_priority",
@@ -285,12 +289,14 @@
 		"gp_subtrans_warn_limit",
 		"gp_vmem_idle_resource_timeout",
 		"gp_use_legacy_hashops",
+		"gp_use_streaming_hashagg",
 		"gp_vmem_limit_per_query",
 		"gp_vmem_protect_limit",
 		"gp_vmem_protect_segworker_cache_limit",
 		"gp_workfile_limit_per_segment",
 		"gp_workfile_max_entries",
 		"hba_file",
+		"hot_dr",
 		"hot_standby",
 		"hot_standby_feedback",
 		"huge_pages",
@@ -425,6 +431,7 @@
 		"optimizer_enable_partition_propagation",
 		"optimizer_enable_partition_selection",
 		"optimizer_enable_push_join_below_union_all",
+		"optimizer_disable_dynamic_table_scan",
 		"optimizer_enable_range_predicate_dpe",
 		"optimizer_enable_use_distribution_in_dqa",
 		"optimizer_enable_redistribute_nestloop_loj_inner_child",
@@ -436,6 +443,8 @@
 		"optimizer_enable_foreign_table",
 		"optimizer_enable_right_outer_join",
 		"optimizer_enable_query_parameter",
+		"optimizer_force_window_hash_agg",
+		"optimizer_agg_pds_strategy",
 		"optimizer_enforce_subplans",
 		"optimizer_enumerate_plans",
 		"optimizer_expand_fulljoin",
@@ -475,6 +484,8 @@
 		"optimizer_print_query",
 		"optimizer_print_xform",
 		"optimizer_print_xform_results",
+		"optimizer_print_preprocess_result",
+		"optimizer_debug_cte",
 		"optimizer_prune_computed_columns",
 		"optimizer_push_group_by_below_setop_threshold",
 		"optimizer_push_requirements_from_consumer_to_producer",
@@ -492,6 +503,7 @@
 		"optimizer_use_gpdb_allocators",
 		"optimizer_xform_bind_threshold",
 		"parallel_leader_participation",
+		"parallel_query_use_streaming_hashagg",
 		"parallel_setup_cost",
 		"parallel_tuple_cost",
 		"password_encryption",
@@ -570,6 +582,7 @@
 		"task_log_statement",
 		"task_use_background_worker",
 		"task_timezone",
+		"tde_force_switch",
 		"temp_file_limit",
 		"test_AppendOnlyHash_eviction_vs_just_marking_not_inuse",
 		"test_print_direct_dispatch_info",
@@ -621,6 +634,3 @@
 		"xid_warn_limit",
 		"xmlbinary",
 		"xmloption",
-		"cluster_key_command",
-		"file_encryption_method",
-		"tde_force_switch",
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c
index 7006ed58a12..aeb6e35dbdd 100644
--- a/src/interfaces/libpq/fe-secure-gssapi.c
+++ b/src/interfaces/libpq/fe-secure-gssapi.c
@@ -585,6 +585,8 @@ pqsecure_open_gss(PGconn *conn)
 
 			PqGSSRecvLength += ret;
 
+			Assert(PqGSSRecvLength < PQ_GSS_RECV_BUFFER_SIZE);
+			PqGSSRecvBuffer[PqGSSRecvLength] = '\0';
 			appendPQExpBuffer(&conn->errorMessage, "%s\n", PqGSSRecvBuffer + 1);
 
 			return PGRES_POLLING_FAILED;
diff --git a/src/test/binary_swap/test_binary_swap.sh b/src/test/binary_swap/test_binary_swap.sh
index 2c0fb2ed0cd..09033d49a75 100755
--- a/src/test/binary_swap/test_binary_swap.sh
+++ b/src/test/binary_swap/test_binary_swap.sh
@@ -144,7 +144,7 @@ run_tests schedule1${VARIANT}
 
 ## Change the binary, dump, and then compare the two dumps generated
 ## by both binaries. Then we do some inserts and dump again. We source
-## $GPHOME_CURRENT/greenplum_path.sh here after starting Cloudberry
+## $GPHOME_CURRENT/cloudberry-env.sh here after starting Cloudberry
 ## with $GPHOME_OTHER to use latest pg_dumpall to prevent catching
 ## diffs due to changes made to pg_dump. The running binaries are
 ## still from $GPHOME_OTHER. Only pg_regress, pg_dumpall, psql, and
diff --git a/src/test/isolation2/Makefile b/src/test/isolation2/Makefile
index 759b2855513..bc1e0f66be0 100644
--- a/src/test/isolation2/Makefile
+++ b/src/test/isolation2/Makefile
@@ -90,3 +90,6 @@ installcheck-cbdb-parallel: install
 	export PGOPTIONS='-c optimizer=off -c enable_parallel=true'; \
 	$(pg_isolation2_regress_installcheck) --init-file=$(top_builddir)/src/test/regress/init_file --init-file=./init_file_isolation2 --schedule=$(srcdir)/isolation2_schedule \
 	)
+
+installcheck-hot-standby: install
+	$(pg_isolation2_regress_installcheck) $(EXTRA_REGRESS_OPTS) --init-file=$(top_builddir)/src/test/regress/init_file --init-file=./init_file_isolation2 --schedule=$(srcdir)/hot_standby_schedule --dbname=isolation2-hot-standby
diff --git a/src/test/isolation2/expected/ao_blkdir.out b/src/test/isolation2/expected/ao_blkdir.out
index f202d8ec4da..0a1eb468592 100644
--- a/src/test/isolation2/expected/ao_blkdir.out
+++ b/src/test/isolation2/expected/ao_blkdir.out
@@ -319,6 +319,155 @@ COMMIT
 DROP TABLE ao_blkdir_test;
 DROP
 
+-- Test `tupcount` in pg_aoseg == sum of number of `row_count` across all
+-- aoblkdir entries for each segno. Test with commits, aborts and deletes.
+
+-- Case1: without VACUUM ANALYZE
+CREATE TABLE ao_blkdir_test_rowcount(i int, j int) USING ao_row DISTRIBUTED BY (j);
+CREATE
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+4: BEGIN;
+BEGIN
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+INSERT 10
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+INSERT 20
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+INSERT 30
+3: ABORT;
+ABORT
+3: BEGIN;
+BEGIN
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 40) i;
+INSERT 40
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+INSERT 50
+1: COMMIT;
+COMMIT
+2: COMMIT;
+COMMIT
+3: COMMIT;
+COMMIT
+4: COMMIT;
+COMMIT
+DELETE FROM ao_blkdir_test_rowcount WHERE j = 7;
+DELETE 50
+
+CREATE INDEX ao_blkdir_test_rowcount_idx ON ao_blkdir_test_rowcount(i);
+CREATE
+
+SELECT segno, sum(row_count) AS totalrows FROM (SELECT (gp_toolkit.__gp_aoblkdir('ao_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id') WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno;
+ segno | totalrows 
+-------+-----------
+ 1     | 10        
+ 2     | 20        
+ 3     | 40        
+ 4     | 50        
+(4 rows)
+SELECT segno, sum(tupcount) AS totalrows FROM gp_toolkit.__gp_aoseg('ao_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno;
+ segno | totalrows 
+-------+-----------
+ 1     | 10        
+ 2     | 20        
+ 3     | 40        
+ 4     | 50        
+(4 rows)
+
+-- Case2: with VACUUM ANALYZE
+DROP TABLE ao_blkdir_test_rowcount;
+DROP
+CREATE TABLE ao_blkdir_test_rowcount(i int, j int) USING ao_row DISTRIBUTED BY (j);
+CREATE
+CREATE INDEX ao_blkdir_test_rowcount_idx ON ao_blkdir_test_rowcount(i);
+CREATE
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+4: BEGIN;
+BEGIN
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+INSERT 10
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM ao_blkdir_test_rowcount;
+INSERT 10
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM ao_blkdir_test_rowcount;
+INSERT 20
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+INSERT 20
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM ao_blkdir_test_rowcount;
+INSERT 20
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM ao_blkdir_test_rowcount;
+INSERT 40
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+INSERT 30
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM ao_blkdir_test_rowcount;
+INSERT 30
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM ao_blkdir_test_rowcount;
+INSERT 60
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+INSERT 50
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM ao_blkdir_test_rowcount;
+INSERT 50
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM ao_blkdir_test_rowcount;
+INSERT 100
+1: COMMIT;
+COMMIT
+2: COMMIT;
+COMMIT
+3: ABORT;
+ABORT
+4: COMMIT;
+COMMIT
+
+DELETE FROM ao_blkdir_test_rowcount WHERE j = 7;
+DELETE 200
+VACUUM ANALYZE ao_blkdir_test_rowcount;
+VACUUM
+
+SELECT segno, sum(row_count) AS totalrows FROM (SELECT (gp_toolkit.__gp_aoblkdir('ao_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id') WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno;
+ segno | totalrows 
+-------+-----------
+ 1     | 40        
+ 2     | 80        
+(2 rows)
+SELECT segno, sum(tupcount) AS totalrows FROM gp_toolkit.__gp_aoseg('ao_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno;
+ segno | totalrows 
+-------+-----------
+ 1     | 40        
+ 2     | 80        
+ 3     | 0         
+ 4     | 0         
+(4 rows)
+
+UPDATE ao_blkdir_test_rowcount SET i = i + 1;
+UPDATE 120
+VACUUM ANALYZE ao_blkdir_test_rowcount;
+VACUUM
+
+SELECT segno, sum(row_count) AS totalrows FROM (SELECT (gp_toolkit.__gp_aoblkdir('ao_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id') WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno;
+ segno | totalrows 
+-------+-----------
+ 3     | 120       
+(1 row)
+SELECT segno, sum(tupcount) AS totalrows FROM gp_toolkit.__gp_aoseg('ao_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno;
+ segno | totalrows 
+-------+-----------
+ 1     | 0         
+ 2     | 0         
+ 3     | 120       
+ 4     | 0         
+(4 rows)
+
+DROP TABLE ao_blkdir_test_rowcount;
+DROP
+
 --------------------------------------------------------------------------------
 -- AOCO tables
 --------------------------------------------------------------------------------
@@ -825,3 +974,172 @@ DETAIL:  Key (i)=(2) already exists.
 
 DROP TABLE aoco_blkdir_test;
 DROP
+
+-- Test `tupcount` in pg_ao(cs)seg == sum of number of `row_count` across all
+-- aoblkdir entries for each <segno, columngroup_no>. Test with commits, aborts
+-- and deletes.
+
+-- Case1: without VACUUM ANALYZE
+CREATE TABLE aoco_blkdir_test_rowcount(i int, j int) USING ao_column DISTRIBUTED BY (j);
+CREATE
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+4: BEGIN;
+BEGIN
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+INSERT 10
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+INSERT 20
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+INSERT 30
+3: ABORT;
+ABORT
+3: BEGIN;
+BEGIN
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 40) i;
+INSERT 40
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+INSERT 50
+1: COMMIT;
+COMMIT
+2: COMMIT;
+COMMIT
+3: COMMIT;
+COMMIT
+4: COMMIT;
+COMMIT
+DELETE FROM aoco_blkdir_test_rowcount WHERE j = 7;
+DELETE 50
+
+CREATE INDEX aoco_blkdir_test_rowcount_idx ON aoco_blkdir_test_rowcount(i);
+CREATE
+
+SELECT segno, columngroup_no, sum(row_count) AS totalrows FROM (SELECT (gp_toolkit.__gp_aoblkdir('aoco_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id') WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno, columngroup_no;
+ segno | columngroup_no | totalrows 
+-------+----------------+-----------
+ 1     | 0              | 10        
+ 1     | 1              | 10        
+ 2     | 0              | 20        
+ 2     | 1              | 20        
+ 3     | 0              | 40        
+ 3     | 1              | 40        
+ 4     | 0              | 50        
+ 4     | 1              | 50        
+(8 rows)
+SELECT segno, column_num, sum(tupcount) AS totalrows FROM gp_toolkit.__gp_aocsseg('aoco_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno, column_num;
+ segno | column_num | totalrows 
+-------+------------+-----------
+ 1     | 0          | 10        
+ 1     | 1          | 10        
+ 2     | 0          | 20        
+ 2     | 1          | 20        
+ 3     | 0          | 40        
+ 3     | 1          | 40        
+ 4     | 0          | 50        
+ 4     | 1          | 50        
+(8 rows)
+
+-- Case2: with VACUUM ANALYZE
+DROP TABLE aoco_blkdir_test_rowcount;
+DROP
+CREATE TABLE aoco_blkdir_test_rowcount(i int, j int) USING ao_column DISTRIBUTED BY (j);
+CREATE
+CREATE INDEX aoco_blkdir_test_rowcount_idx ON aoco_blkdir_test_rowcount(i);
+CREATE
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+4: BEGIN;
+BEGIN
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+INSERT 10
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM aoco_blkdir_test_rowcount;
+INSERT 10
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM aoco_blkdir_test_rowcount;
+INSERT 20
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+INSERT 20
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM aoco_blkdir_test_rowcount;
+INSERT 20
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM aoco_blkdir_test_rowcount;
+INSERT 40
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+INSERT 30
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM aoco_blkdir_test_rowcount;
+INSERT 30
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM aoco_blkdir_test_rowcount;
+INSERT 60
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+INSERT 50
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM aoco_blkdir_test_rowcount;
+INSERT 50
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM aoco_blkdir_test_rowcount;
+INSERT 100
+1: COMMIT;
+COMMIT
+2: COMMIT;
+COMMIT
+3: ABORT;
+ABORT
+4: COMMIT;
+COMMIT
+
+DELETE FROM aoco_blkdir_test_rowcount WHERE j = 7;
+DELETE 200
+VACUUM ANALYZE aoco_blkdir_test_rowcount;
+VACUUM
+
+SELECT segno, columngroup_no, sum(row_count) AS totalrows FROM (SELECT (gp_toolkit.__gp_aoblkdir('aoco_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id') WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno, columngroup_no;
+ segno | columngroup_no | totalrows 
+-------+----------------+-----------
+ 1     | 0              | 40        
+ 1     | 1              | 40        
+ 2     | 0              | 80        
+ 2     | 1              | 80        
+(4 rows)
+SELECT segno, column_num, sum(tupcount) AS totalrows FROM gp_toolkit.__gp_aocsseg('aoco_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno, column_num;
+ segno | column_num | totalrows 
+-------+------------+-----------
+ 1     | 0          | 40        
+ 1     | 1          | 40        
+ 2     | 0          | 80        
+ 2     | 1          | 80        
+ 3     | 0          | 0         
+ 3     | 1          | 0         
+ 4     | 0          | 0         
+ 4     | 1          | 0         
+(8 rows)
+
+UPDATE aoco_blkdir_test_rowcount SET i = i + 1;
+UPDATE 120
+VACUUM ANALYZE aoco_blkdir_test_rowcount;
+VACUUM
+
+SELECT segno, columngroup_no, sum(row_count) AS totalrows FROM (SELECT (gp_toolkit.__gp_aoblkdir('aoco_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id') WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno, columngroup_no;
+ segno | columngroup_no | totalrows 
+-------+----------------+-----------
+ 3     | 0              | 120       
+ 3     | 1              | 120       
+(2 rows)
+SELECT segno, column_num, sum(tupcount) AS totalrows FROM gp_toolkit.__gp_aocsseg('aoco_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno, column_num;
+ segno | column_num | totalrows 
+-------+------------+-----------
+ 1     | 0          | 0         
+ 1     | 1          | 0         
+ 2     | 0          | 0         
+ 2     | 1          | 0         
+ 3     | 0          | 120       
+ 3     | 1          | 120       
+ 4     | 0          | 0         
+ 4     | 1          | 0         
+(8 rows)
+
+DROP TABLE aoco_blkdir_test_rowcount;
+DROP
diff --git a/src/test/isolation2/expected/hot_standby/basic.out b/src/test/isolation2/expected/hot_standby/basic.out
new file mode 100644
index 00000000000..5318a35d7d7
--- /dev/null
+++ b/src/test/isolation2/expected/hot_standby/basic.out
@@ -0,0 +1,242 @@
+-- Tests for basic query dispatch on a hot standy.
+
+-- hot standby must show on and the sync mode is remote_apply for the tests to make sense
+-1S: show hot_standby;
+ hot_standby 
+-------------
+ on          
+(1 row)
+-1S: show synchronous_commit;
+ synchronous_commit 
+--------------------
+ remote_apply       
+(1 row)
+
+-- will be checking if QD/QE info looks good
+-1S: select id, type, content, port from gp_backend_info();
+ id | type | content | port 
+----+------+---------+------
+ -1 | Q    | -1      | 7001 
+(1 row)
+
+----------------------------------------------------------------
+-- Test: basic query dispatch
+----------------------------------------------------------------
+create table hs_t1(a int);
+CREATE
+create table hs_t2(a int);
+CREATE
+
+-- standby should see the results for 2pc immediately.
+insert into hs_t1 select * from generate_series(1,10);
+INSERT 10
+-1S: select * from hs_t1;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 5  
+ 6  
+ 9  
+ 10 
+ 1  
+(10 rows)
+-- standby won't see results for the last 1pc immediately because the standby QD
+-- isn't aware of of it so its distributed snapshot doesn't include the 1pc, but
+-- as long as another 2pc comes it will be able to see the previous 1pc. Wee
+-- tolerate this case in the mirrored cluster setup.
+insert into hs_t2 values(1);
+INSERT 1
+-1S: select * from hs_t2;
+ a 
+---
+(0 rows)
+-- any following 2pc will make the 1pc visible
+create temp table tt(a int);
+CREATE
+-1S: select * from hs_t2;
+ a 
+---
+ 1 
+(1 row)
+
+-- we have three QEs launched on the mirror segments.
+-- note that the first QE on a segment is still a "writer" because we
+-- need it to manage locks, same as read-only queries on a primary QD.
+-1S: select id, type, content, port from gp_backend_info();
+ id | type | content | port 
+----+------+---------+------
+ -1 | Q    | -1      | 7001 
+ 0  | w    | 0       | 7005 
+ 1  | w    | 1       | 7006 
+ 2  | w    | 2       | 7007 
+(4 rows)
+
+-- should have parallel readers launched
+-1S: select * from hs_t1 join (select * from hs_t2) hs_t2 on (hs_t1 = hs_t2);
+ a | a 
+---+---
+ 1 | 1 
+(1 row)
+-1S: select id, type, content, port from gp_backend_info();
+ id | type | content | port 
+----+------+---------+------
+ -1 | Q    | -1      | 7001 
+ 0  | w    | 0       | 7005 
+ 1  | w    | 1       | 7006 
+ 2  | w    | 2       | 7007 
+ 3  | r    | 0       | 7005 
+ 4  | r    | 1       | 7006 
+ 5  | r    | 2       | 7007 
+(7 rows)
+
+-- now a singleton reader added too
+-1S: select * from hs_t1 join (select oid::int from pg_class) hs_t2 on (hs_t1 = hs_t2);
+ a | oid 
+---+-----
+(0 rows)
+-1S: select id, type, content, port from gp_backend_info();
+ id | type | content | port 
+----+------+---------+------
+ -1 | Q    | -1      | 7001 
+ 0  | w    | 0       | 7005 
+ 1  | w    | 1       | 7006 
+ 2  | w    | 2       | 7007 
+ 3  | r    | 0       | 7005 
+ 4  | r    | 1       | 7006 
+ 5  | r    | 2       | 7007 
+ 6  | R    | -1      | 7001 
+(8 rows)
+
+-- un-committed result should not be seen by the standby
+begin;
+BEGIN
+insert into hs_t1 select * from generate_series(11,20);
+INSERT 10
+
+-- standby should only see 1...10
+-1S: select * from hs_t1;
+ a  
+----
+ 5  
+ 6  
+ 9  
+ 10 
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+(10 rows)
+
+end;
+END
+
+-- standby should see 1...20 now
+-1S: select * from hs_t1;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 16 
+ 18 
+ 19 
+ 1  
+ 12 
+ 15 
+ 20 
+ 5  
+ 6  
+ 9  
+ 10 
+ 11 
+ 13 
+ 14 
+ 17 
+(20 rows)
+
+----------------------------------------------------------------
+-- Test: other things that a hot standby can do.
+--
+-- More refer to regress test 'hs_standby_allowed'.
+----------------------------------------------------------------
+-- set/reset and show GUC
+-1S: set optimizer = on;
+SET
+-1S: show optimizer;
+ optimizer 
+-----------
+ on        
+(1 row)
+-1S: reset optimizer;
+RESET
+-- copy command
+-1S: copy hs_t1 to '/tmp/hs_copyto.csv' csv null '';
+COPY 20
+-- query catalogs
+-1S: select count(*) from pg_class where relname = 'hs_t1';
+ count 
+-------
+ 1     
+(1 row)
+-1S: select dbid,content,role,preferred_role,mode,status from gp_segment_configuration where dbid = current_setting('gp_dbid')::integer;
+ dbid | content | role | preferred_role | mode | status 
+------+---------+------+----------------+------+--------
+ 8    | -1      | m    | m              | s    | u      
+(1 row)
+-- checkpoint is allowed on standby but a restart point is created instead
+-1S: checkpoint;
+CHECKPOINT
+
+----------------------------------------------------------------
+-- Test: things that can't be done on a hot standby:
+-- no DML, DDL or anything that generates WAL.
+--
+-- More refer to regress test 'hs_standby_disallowed'.
+----------------------------------------------------------------
+-1S: insert into hs_t1 values(1);
+ERROR:  cannot execute INSERT in a read-only transaction
+-1S: delete from hs_t1;
+ERROR:  cannot acquire lock mode ExclusiveLock on database objects while recovery is in progress
+LINE 1: delete from hs_t1;
+                    ^
+HINT:  Only RowExclusiveLock or less can be acquired on database objects during recovery.
+-1S: update hs_t1 set a = 0;
+ERROR:  cannot acquire lock mode ExclusiveLock on database objects while recovery is in progress
+LINE 1: update hs_t1 set a = 0;
+               ^
+HINT:  Only RowExclusiveLock or less can be acquired on database objects during recovery.
+-1S: create table hs_t2(a int);
+ERROR:  cannot execute CREATE TABLE in a read-only transaction
+-1S: create database hs_db;
+ERROR:  cannot execute CREATE DATABASE in a read-only transaction
+-1S: vacuum hs_t1;
+ERROR:  cannot execute VACUUM during recovery
+
+--
+-- No hintbit WAL generation in SELECT.
+--
+create table hs_nohintbit(a int) distributed by (a);
+CREATE
+insert into hs_nohintbit select generate_series (1, 10);
+INSERT 10
+-- flush the data to disk
+checkpoint;
+CHECKPOINT
+
+-1S: set gp_disable_tuple_hints=off;
+SET
+-- no WAL is being generated (otherwise an error would occur "cannot make new WAL entries during recovery")
+-1S: SELECT count(*) FROM hs_nohintbit;
+ count 
+-------
+ 10    
+(1 row)
+
diff --git a/src/test/isolation2/expected/hot_standby/faults.out b/src/test/isolation2/expected/hot_standby/faults.out
new file mode 100644
index 00000000000..2eb16b37229
--- /dev/null
+++ b/src/test/isolation2/expected/hot_standby/faults.out
@@ -0,0 +1,327 @@
+-- Test system faults scenarios
+
+-- start_matchsubs
+--
+-- m/Is the server running on host.*/
+-- s/Is the server running on host "\d+.\d+.\d+.\d+" and accepting/Is the server running on host <IP> and accepting/
+-- m/(seg\d+ \d+.\d+.\d+.\d+:\d+)/
+-- s/(.*)/(seg<ID> IP:PORT)/
+-- m/ERROR:  connection to dbid 1 .*:7000 failed .*/
+-- s/ERROR:  connection to dbid 1 .*:7000 failed .*/ERROR:  connection to dbid 1 <host>:7000 failed/
+--
+-- end_matchsubs
+
+-- Let FTS detect/declare failure sooner
+!\retcode gpconfig -c gp_fts_probe_interval -v 10 --coordinatoronly;
+(exited with code 0)
+!\retcode gpstop -u;
+(exited with code 0)
+
+create table hs_failover(a int);
+CREATE
+insert into hs_failover select * from generate_series(1,10);
+INSERT 10
+-1S: select * from hs_failover;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+
+----------------------------------------------------------------
+-- Mirror segment fails
+----------------------------------------------------------------
+select pg_ctl(datadir, 'stop', 'immediate') from gp_segment_configuration where content=1 and role = 'm';
+ pg_ctl 
+--------
+ OK     
+(1 row)
+
+-- make sure mirror is detected down
+create temp table hs_tt(a int);
+CREATE
+select gp_request_fts_probe_scan();
+ gp_request_fts_probe_scan 
+---------------------------
+ t                         
+(1 row)
+
+-- will not succeed
+-1S: select * from hs_failover;
+ERROR:  Error on receive from seg1 slice1 127.0.1.1:7006 pid=26942: server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+-1Sq: ... <quitting>
+
+-- recovery
+!\retcode gprecoverseg -aF;
+(exited with code 0)
+
+-- sync-up
+select wait_until_all_segments_synchronized();
+ wait_until_all_segments_synchronized 
+--------------------------------------
+ OK                                   
+(1 row)
+
+-- works now
+-1S: select * from hs_failover;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 5  
+ 6  
+ 9  
+ 10 
+ 1  
+(10 rows)
+
+----------------------------------------------------------------
+-- Primary segment fails
+----------------------------------------------------------------
+-- inject a fault where the mirror gets out of recovery
+select gp_inject_fault('out_of_recovery_in_startupxlog', 'skip', dbid) from gp_segment_configuration where content = 1 and role = 'm';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+select pg_ctl(datadir, 'stop', 'immediate') from gp_segment_configuration where content=1 and role = 'p';
+ pg_ctl 
+--------
+ OK     
+(1 row)
+select gp_request_fts_probe_scan();
+ gp_request_fts_probe_scan 
+---------------------------
+ t                         
+(1 row)
+
+-- make sure failover happens
+select dbid, content, role, preferred_role, mode, status from gp_segment_configuration where content = 1;
+ dbid | content | role | preferred_role | mode | status 
+------+---------+------+----------------+------+--------
+ 3    | 1       | m    | p              | n    | d      
+ 6    | 1       | p    | m              | n    | u      
+(2 rows)
+select gp_wait_until_triggered_fault('out_of_recovery_in_startupxlog', 1, dbid) from gp_segment_configuration where content = 1 and role = 'p';
+ gp_wait_until_triggered_fault 
+-------------------------------
+ Success:                      
+(1 row)
+select gp_inject_fault('out_of_recovery_in_startupxlog', 'reset', dbid) from gp_segment_configuration where content = 1 and role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+-- On an existing standby connection, query will run but it is dispatched to the previous mirror
+-- in an existing gang. That mirror is now a primary, so it will complain and the query fails.
+-1S: select * from hs_failover;
+ERROR:  primary segments can only process MPP protocol messages from primary QD  (seg1 slice1 127.0.1.1:7006 pid=14671)
+HINT:  Exit the current session and re-connect.
+-1Sq: ... <quitting>
+-- start_ignore
+-- will fail due to downed mirror (previous primary)
+-1S: select * from hs_failover;
+ERROR:  failed to acquire resources on one or more segments
+DETAIL:  connection to server at "10.13.9.74", port 7003 failed: Connection refused
+	Is the server running on that host and accepting TCP/IP connections?
+ (seg1 10.13.9.74:7003)
+-1Sq: ... <quitting>
+-- end_ignore
+
+-- bring the downed mirror up
+!\retcode gprecoverseg -aF;
+(exited with code 0)
+select wait_until_all_segments_synchronized();
+ wait_until_all_segments_synchronized 
+--------------------------------------
+ OK                                   
+(1 row)
+
+-- mirror is up
+-1S: select dbid, content, role, preferred_role, mode, status from gp_segment_configuration where content = 1;
+ dbid | content | role | preferred_role | mode | status 
+------+---------+------+----------------+------+--------
+ 6    | 1       | p    | m              | s    | u      
+ 3    | 1       | m    | p              | s    | u      
+(2 rows)
+
+-- now the query will succeed
+-1S: select * from hs_failover;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 5  
+ 6  
+ 9  
+ 10 
+ 1  
+(10 rows)
+-1Sq: ... <quitting>
+
+-- re-balance, bring the segments to their preferred roles
+!\retcode gprecoverseg -ar;
+(exited with code 0)
+select wait_until_all_segments_synchronized();
+ wait_until_all_segments_synchronized 
+--------------------------------------
+ OK                                   
+(1 row)
+-1S: select dbid, content, role, preferred_role, mode, status from gp_segment_configuration where content = 1;
+ dbid | content | role | preferred_role | mode | status 
+------+---------+------+----------------+------+--------
+ 3    | 1       | p    | p              | s    | u      
+ 6    | 1       | m    | m              | s    | u      
+(2 rows)
+
+-- query runs fine still
+-1S: select * from hs_failover;
+ a  
+----
+ 5  
+ 6  
+ 9  
+ 10 
+ 1  
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+(10 rows)
+
+----------------------------------------------------------------
+-- DTX recovery
+----------------------------------------------------------------
+-- skip FTS probe to prevent unexpected mirror promotion
+1: select gp_inject_fault_infinite('fts_probe', 'skip', dbid) from gp_segment_configuration where role='p' and content=-1;
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+(1 row)
+
+1: create table tt_hs_dtx(a int);
+CREATE
+
+-- inject fault to repeatedly fail the COMMIT PREPARE phase of 2PC, which ensures that the dtx cannot finish even by the dtx recovery process.
+select gp_inject_fault_infinite('finish_commit_prepared', 'error', dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+(1 row)
+
+-- session 1 on primary QD tries to commit a DTX, but cannot finish due to the fault on a QE
+1&: insert into tt_hs_dtx select * from generate_series(1,10);  <waiting ...>
+
+-- inject a panic on primary QD, essentially restarts the primary QD
+2: select gp_inject_fault('before_read_command', 'panic', dbid) from gp_segment_configuration where content=-1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+2: select 1;
+PANIC:  fault triggered, fault name:'before_read_command' fault type:'panic'
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+
+1<:  <... completed>
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+1q: ... <quitting>
+2q: ... <quitting>
+
+-- standby QD can still run query
+-1S: select * from hs_failover;
+ a  
+----
+ 1  
+ 10 
+ 2  
+ 3  
+ 4  
+ 5  
+ 6  
+ 7  
+ 8  
+ 9  
+(10 rows)
+-- it cannot see rows from the in-doubt DTX
+-1S: select * from tt_hs_dtx;
+ a 
+---
+(0 rows)
+
+-- let the failed dtx be recovered, also make sure the standby replays the forget record which signals the completion of the dtx
+-1S: select gp_inject_fault('redoDistributedForgetCommitRecord', 'skip', dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-1S: select gp_inject_fault_infinite('finish_commit_prepared', 'reset', dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+(1 row)
+-1S: select gp_wait_until_triggered_fault('redoDistributedForgetCommitRecord', 1, dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_wait_until_triggered_fault 
+-------------------------------
+ Success:                      
+(1 row)
+-1S: select gp_inject_fault('redoDistributedForgetCommitRecord', 'reset', dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+-- standby should see the rows from the in-doubt DTX now
+-1S: select * from tt_hs_dtx;
+ a  
+----
+ 1  
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+
+-1S: select wait_until_all_segments_synchronized();
+ wait_until_all_segments_synchronized 
+--------------------------------------
+ OK                                   
+(1 row)
+1: select gp_inject_fault('before_read_command', 'reset', dbid) from gp_segment_configuration where content=-1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1: select gp_inject_fault('fts_probe', 'reset', dbid) from gp_segment_configuration where role='p' and content=-1;
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
diff --git a/src/test/isolation2/expected/hot_standby/setup.out b/src/test/isolation2/expected/hot_standby/setup.out
new file mode 100644
index 00000000000..f8f1e02fe40
--- /dev/null
+++ b/src/test/isolation2/expected/hot_standby/setup.out
@@ -0,0 +1,14 @@
+-- setup for hot standby tests
+!\retcode gpconfig -c hot_standby -v on;
+(exited with code 0)
+-- let primary wait for standby to apply changes, make test less flaky
+!\retcode gpconfig -c synchronous_commit -v remote_apply;
+(exited with code 0)
+-- make it faster to handle query conflict
+!\retcode gpconfig -c max_standby_streaming_delay -v 1000;
+(exited with code 0)
+-- disable autovacuum, to not affect the manual VACUUM in the tests
+!\retcode gpconfig -c autovacuum -v off;
+(exited with code 0)
+!\retcode gpstop -ar;
+(exited with code 0)
diff --git a/src/test/isolation2/expected/hot_standby/teardown.out b/src/test/isolation2/expected/hot_standby/teardown.out
new file mode 100644
index 00000000000..8b4e1271610
--- /dev/null
+++ b/src/test/isolation2/expected/hot_standby/teardown.out
@@ -0,0 +1,9 @@
+-- reset the setup for hot standby tests
+!\retcode gpconfig -r hot_standby;
+(exited with code 0)
+!\retcode gpconfig -r synchronous_commit;
+(exited with code 0)
+!\retcode gpconfig -r max_standby_streaming_delay;
+(exited with code 0)
+!\retcode gpstop -ar;
+(exited with code 0)
diff --git a/src/test/isolation2/expected/hot_standby/transaction_isolation.out b/src/test/isolation2/expected/hot_standby/transaction_isolation.out
new file mode 100644
index 00000000000..3990bd7cd56
--- /dev/null
+++ b/src/test/isolation2/expected/hot_standby/transaction_isolation.out
@@ -0,0 +1,984 @@
+----------------------------------------------------------------
+-- Test transaction isolation in general, not specific to dtx
+----------------------------------------------------------------
+1: create table hs_tx(a int);
+CREATE
+1: insert into hs_tx select * from generate_series(1,10);
+INSERT 10
+
+1: begin;
+BEGIN
+1: insert into hs_tx select * from generate_series(11,20);
+INSERT 10
+2: begin;
+BEGIN
+2: insert into hs_tx select * from generate_series(21,30);
+INSERT 10
+2: abort;
+ABORT
+
+-- standby should only see completed transactions, not in-progress transactions, nor aborted transactions
+-1S: select * from hs_tx;
+ a  
+----
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+(10 rows)
+
+1: end;
+END
+-1S: select * from hs_tx;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 16 
+ 18 
+ 19 
+ 1  
+ 12 
+ 15 
+ 20 
+ 5  
+ 6  
+ 9  
+ 10 
+ 11 
+ 13 
+ 14 
+ 17 
+(20 rows)
+
+----------------------------------------------------------------
+-- Test isolation between hot standby query and in-progress dtx
+----------------------------------------------------------------
+
+1: create table hs_dtx1(a int);
+CREATE
+1: create table hs_dtx2(a int);
+CREATE
+
+-- inject two suspend faults:
+-- 1. on seg0, suspend before PREPARE phase of 2PC
+1: select gp_inject_fault('qe_start_prepared', 'suspend',dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1&: insert into hs_dtx1 select * from  generate_series(1,10);  <waiting ...>
+-- 2. on seg1, suspend before COMMIT phase of 2PC
+2: select gp_inject_fault('qe_start_commit_prepared', 'suspend',dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+2&: insert into hs_dtx2 select * from  generate_series(1,10);  <waiting ...>
+
+-- standby should not see any rows from either dtx
+-1S: select * from hs_dtx1;
+ a 
+---
+(0 rows)
+-1S: select * from hs_dtx2;
+ a 
+---
+(0 rows)
+
+-- reset
+3: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+3: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1<:  <... completed>
+INSERT 10
+2<:  <... completed>
+INSERT 10
+
+-- standby should see the results from the dtx now
+-1S: select * from hs_dtx1;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+-1S: select * from hs_dtx2;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 5  
+ 6  
+ 9  
+ 10 
+ 1  
+(10 rows)
+
+----------------------------------------------------------------
+-- Test DTX abort that happens in different phases
+----------------------------------------------------------------
+
+1: create table hs_abort_dtx1(a int);
+CREATE
+1: create table hs_abort_dtx2(a int);
+CREATE
+
+-- inject two errors:
+-- 1. on seg0, error out before PREPARE phase of 2PC
+1: select gp_inject_fault('qe_start_prepared', 'error', dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1: insert into hs_abort_dtx1 select * from  generate_series(1,10);
+ERROR:  fault triggered, fault name:'qe_start_prepared' fault type:'error'  (seg0 127.0.1.1:7002 pid=343)
+1: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-- 2. on seg1, error out before COMMIT phase of 2PC
+1: select gp_inject_fault('qe_start_commit_prepared', 'error', dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1: insert into hs_abort_dtx2 select * from  generate_series(1,10);
+INSERT 10
+1: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+-- standby should not see dtx1 which is aborted but should see dtx2 which is recovered
+-1S: select * from hs_abort_dtx1;
+ a 
+---
+(0 rows)
+-1S: select * from hs_abort_dtx2;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+
+----------------------------------------------------------------
+-- Test isolation between hot standby query and in-progress dtx,
+-- but also run more queries in between
+----------------------------------------------------------------
+1: create table hs_dtx3(a int);
+CREATE
+
+-- inject faults to suspend segments in 2PC
+1: select gp_inject_fault('qe_start_prepared', 'suspend', dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1&: insert into hs_dtx3 select * from  generate_series(1,10);  <waiting ...>
+2: select gp_inject_fault('qe_start_commit_prepared', 'suspend', dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+2&: insert into hs_dtx3 select * from  generate_series(11,20);  <waiting ...>
+
+-- standby should not see rows in the in-progress dtx
+-1S: select * from hs_dtx3;
+ a 
+---
+(0 rows)
+
+-- now run some dtx and completed
+3: insert into hs_dtx3 values(99);
+INSERT 1
+3: create table hs_dtx4(a int);
+CREATE
+3: insert into hs_dtx4 select * from  generate_series(1,10);
+INSERT 10
+
+-- standby should still not see rows in the in-progress DTX, but should see the completed ones
+-1S: select * from hs_dtx3;
+ a  
+----
+ 99 
+(1 row)
+-1S: select * from hs_dtx4;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 5  
+ 6  
+ 9  
+ 10 
+ 1  
+(10 rows)
+
+3: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+3: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1<:  <... completed>
+INSERT 10
+2<:  <... completed>
+INSERT 10
+
+-- standby should see all rows now
+-1S: select * from hs_dtx3;
+ a  
+----
+ 1  
+ 12 
+ 15 
+ 20 
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 16 
+ 18 
+ 19 
+ 99 
+ 5  
+ 6  
+ 9  
+ 10 
+ 11 
+ 13 
+ 14 
+ 17 
+(21 rows)
+
+----------------------------------------------------------------
+-- Test isolation between standby QD and in-progress dtx,
+-- but after standby QD resets and gets running DTX from checkpoint.
+----------------------------------------------------------------
+1: create table hs_t5(a int, b text);
+CREATE
+1: create table hs_t6(a int, b text);
+CREATE
+
+-- inject fault to suspend a primary right before it conducts the commit phase of 2PC,
+-- so in the subsequent INSERT, all local transactions will be committed but the dtx is not.
+1: select gp_inject_fault('qe_start_commit_prepared', 'suspend', dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1&: insert into hs_t5 select i, 'in-progress' from generate_series(1,10) i;  <waiting ...>
+
+-- now run some dtx and completed, and primary conducts a checkpoint
+2: insert into hs_t5 values(1, 'commited');
+INSERT 1
+2: insert into hs_t6 select i, 'committed' from generate_series(1,10) i;
+INSERT 10
+2: begin;
+BEGIN
+2: insert into hs_t5 values(99, 'aborted');
+INSERT 1
+2: abort;
+ABORT
+2: checkpoint;
+CHECKPOINT
+
+-- now make the standby QD resets itself
+-1S: select gp_inject_fault('exec_simple_query_start', 'panic', dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-1S: select 1;
+PANIC:  fault triggered, fault name:'exec_simple_query_start' fault type:'panic'
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+-1Sq: ... <quitting>
+
+-- standby should still not see rows in the in-progress DTX, but should see the completed ones
+-1S: select * from hs_t5;
+ a | b        
+---+----------
+ 1 | commited 
+(1 row)
+-1S: select * from hs_t6;
+ a  | b         
+----+-----------
+ 1  | committed 
+ 2  | committed 
+ 3  | committed 
+ 4  | committed 
+ 7  | committed 
+ 8  | committed 
+ 5  | committed 
+ 6  | committed 
+ 9  | committed 
+ 10 | committed 
+(10 rows)
+
+2: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1<:  <... completed>
+INSERT 10
+
+-- standby should see all rows now
+-1S: select * from hs_t5;
+ a  | b           
+----+-------------
+ 1  | in-progress 
+ 1  | commited    
+ 5  | in-progress 
+ 6  | in-progress 
+ 9  | in-progress 
+ 10 | in-progress 
+ 2  | in-progress 
+ 3  | in-progress 
+ 4  | in-progress 
+ 7  | in-progress 
+ 8  | in-progress 
+(11 rows)
+-1S: select * from hs_t6;
+ a  | b         
+----+-----------
+ 5  | committed 
+ 6  | committed 
+ 9  | committed 
+ 10 | committed 
+ 1  | committed 
+ 2  | committed 
+ 3  | committed 
+ 4  | committed 
+ 7  | committed 
+ 8  | committed 
+(10 rows)
+
+-- standby should correctly see more in-progress dtx on the primary.
+-- context: previously this would be fail because the standby updates latestCompletedGxid to the
+-- bumped nextGxid from checkpoint, which is too far (so that it thinks the new dtx already completed).
+1: select gp_inject_fault('qe_start_prepared', 'suspend', dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1&: delete from hs_t5;  <waiting ...>
+2: select gp_inject_fault('qe_start_commit_prepared', 'suspend', dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+2&: delete from hs_t6;  <waiting ...>
+
+-- standby should not see the effect of the deletes
+-1S: select * from hs_t5;
+ a  | b           
+----+-------------
+ 2  | in-progress 
+ 3  | in-progress 
+ 4  | in-progress 
+ 7  | in-progress 
+ 8  | in-progress 
+ 1  | in-progress 
+ 1  | commited    
+ 5  | in-progress 
+ 6  | in-progress 
+ 9  | in-progress 
+ 10 | in-progress 
+(11 rows)
+-1S: select * from hs_t6;
+ a  | b         
+----+-----------
+ 1  | committed 
+ 2  | committed 
+ 3  | committed 
+ 4  | committed 
+ 7  | committed 
+ 8  | committed 
+ 5  | committed 
+ 6  | committed 
+ 9  | committed 
+ 10 | committed 
+(10 rows)
+
+3: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+3: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+1<:  <... completed>
+DELETE 11
+2<:  <... completed>
+DELETE 10
+
+-- standby now see those deletes
+-1S: select * from hs_t5;
+ a | b 
+---+---
+(0 rows)
+-1S: select * from hs_t6;
+ a | b 
+---+---
+(0 rows)
+
+----------------------------------------------------------------
+-- Read-committed isolation: query on hot standby should not see dtx that completed after it
+-- created distributed snapshot, but should see dtx that completed before that.
+----------------------------------------------------------------
+
+1: create table hs_rc(a int);
+CREATE
+1: insert into hs_rc select * from generate_series(1,10);
+INSERT 10
+
+-- case 1: suspend SELECT on the standby QD right after it created snapshot
+-1S: select gp_inject_fault('select_after_qd_create_snapshot', 'suspend', dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-1S&: select * from hs_rc;  <waiting ...>
+
+-- new INSERT or DELETE won't be observed by the standby
+1: insert into hs_rc select * from generate_series(11,20);
+INSERT 10
+1: delete from hs_rc where a < 5;
+DELETE 4
+1: select gp_inject_fault('select_after_qd_create_snapshot', 'reset', dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+-- should only see the rows at the time when SELECT started (1...10).
+-1S<:  <... completed>
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+
+-- SELECT again, should see the effect from the INSERT and DELETE now
+-1S: select * from hs_rc;
+ a  
+----
+ 12 
+ 15 
+ 20 
+ 7  
+ 8  
+ 16 
+ 18 
+ 19 
+ 5  
+ 6  
+ 9  
+ 10 
+ 11 
+ 13 
+ 14 
+ 17 
+(16 rows)
+
+-- case 2: suspend SELECT on the standby QD before creating snapshot
+-1S: select gp_inject_fault('select_before_qd_create_snapshot', 'suspend', dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-1S&: select * from hs_rc;  <waiting ...>
+
+1: insert into hs_rc select * from generate_series(21,30);
+INSERT 10
+1: delete from hs_rc where a < 21;
+DELETE 16
+1: select gp_inject_fault('select_before_qd_create_snapshot', 'reset', dbid) from gp_segment_configuration where content=-1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+-- standby should see the effect of the INSERT and DELETE
+-1S<:  <... completed>
+ a  
+----
+ 23 
+ 26 
+ 30 
+ 22 
+ 24 
+ 27 
+ 29 
+ 21 
+ 25 
+ 28 
+(10 rows)
+
+----------------------------------------------------------------
+-- Read-committed isolation in the BEGIN...END block
+----------------------------------------------------------------
+
+1: truncate hs_rc;
+TRUNCATE
+1: insert into hs_rc select * from generate_series(1,30);
+INSERT 30
+
+-1S: begin;
+BEGIN
+-1S: select count(*) from hs_rc;
+ count 
+-------
+ 30    
+(1 row)
+
+-- have some concurrent sessions on primary QD:
+-- 1. a completed transaction
+1: delete from hs_rc where a <= 10;
+DELETE 10
+-- 3. an aborted transaction
+2: begin;
+BEGIN
+2: delete from hs_rc where a > 10 and a <= 20;
+DELETE 10
+2: abort;
+ABORT
+-- 3. an ongoing transaction
+3: begin;
+BEGIN
+3: delete from hs_rc where a > 20 and a <= 30;
+DELETE 10
+
+-- the standby should see results accordingly
+-1S: select * from hs_rc;
+ a  
+----
+ 12 
+ 15 
+ 20 
+ 23 
+ 26 
+ 30 
+ 11 
+ 13 
+ 14 
+ 17 
+ 21 
+ 25 
+ 28 
+ 16 
+ 18 
+ 19 
+ 22 
+ 24 
+ 27 
+ 29 
+(20 rows)
+-1S: end;
+END
+
+3: end;
+END
+-1S: select * from hs_rc;
+ a  
+----
+ 12 
+ 15 
+ 20 
+ 11 
+ 13 
+ 14 
+ 17 
+ 16 
+ 18 
+ 19 
+(10 rows)
+
+----------------------------------------------------------------
+-- Repeatable-read isolation: distributed snapshot is created at time of the
+-- first query in transaction block. All queries in the transaction block
+-- should only see results committed before the distributed snapshot creation.
+----------------------------------------------------------------
+
+1: create table hs_rr(a int);
+CREATE
+1: insert into hs_rr select * from generate_series(1,10);
+INSERT 10
+
+-1S: begin isolation level repeatable read;
+BEGIN
+-- should see 10
+-1S: select count(*) from hs_rr;
+ count 
+-------
+ 10    
+(1 row)
+
+-- do some more INSERT, DELETE and UPDATE
+1: insert into hs_rr select * from generate_series(11,20);
+INSERT 10
+1: delete from hs_rr where a <= 10;
+DELETE 10
+1: update hs_rr set a = a + 100;
+UPDATE 10
+
+-- should still the initial rows {1...10}
+-1S: select * from hs_rr;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+-1S: end;
+END
+
+-- should see the results from the INSERT, DELETE and UPDATE
+-1S: begin isolation level repeatable read;
+BEGIN
+-1S: select * from hs_rr;
+ a   
+-----
+ 115 
+ 120 
+ 118 
+ 113 
+ 114 
+ 112 
+ 116 
+ 119 
+ 111 
+ 117 
+(10 rows)
+
+-- standby won't see ongoing or aborted transactions either
+1: begin;
+BEGIN
+1: insert into hs_rr select * from generate_series(1,10);
+INSERT 10
+2: begin;
+BEGIN
+2: insert into hs_rr select * from generate_series(1,10);
+INSERT 10
+2: abort;
+ABORT
+
+-1S: select * from hs_rr;
+ a   
+-----
+ 114 
+ 115 
+ 120 
+ 118 
+ 113 
+ 112 
+ 116 
+ 119 
+ 111 
+ 117 
+(10 rows)
+
+1: end;
+END
+-1S: end;
+END
+
+----------------------------------------------------------------
+-- Transaction isolation is respected in subtransactions too
+----------------------------------------------------------------
+
+1: create table hs_subtrx(a int);
+CREATE
+
+-- (1) read-committed
+-1S: begin;
+BEGIN
+-1S: select count(*) from hs_subtrx;
+ count 
+-------
+ 0     
+(1 row)
+-1S: savepoint s1;
+SAVEPOINT
+
+1: insert into hs_subtrx select * from generate_series(1,10);
+INSERT 10
+
+-1S: select count(*) from hs_subtrx;
+ count 
+-------
+ 10    
+(1 row)
+-1S: savepoint s2;
+SAVEPOINT
+-1S: select count(*) from hs_subtrx;
+ count 
+-------
+ 10    
+(1 row)
+-1S: rollback to savepoint s1;
+ROLLBACK
+-1S: select count(*) from hs_subtrx;
+ count 
+-------
+ 10    
+(1 row)
+-1S: end;
+END
+
+-- (2) repeatable-read
+-1S: begin isolation level repeatable read;
+BEGIN
+-1S: select * from hs_subtrx;
+ a  
+----
+ 1  
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+-1S: savepoint s1;
+SAVEPOINT
+
+1: insert into hs_subtrx select * from generate_series(11,20);
+INSERT 10
+1: delete from hs_subtrx where a <= 10;
+DELETE 10
+1: update hs_subtrx set a = a + 100;
+UPDATE 10
+
+-1S: select * from hs_subtrx;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+-1S: savepoint s2;
+SAVEPOINT
+-1S: select * from hs_subtrx;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+-1S: rollback to savepoint s1;
+ROLLBACK
+-1S: select * from hs_subtrx;
+ a  
+----
+ 2  
+ 3  
+ 4  
+ 7  
+ 8  
+ 1  
+ 5  
+ 6  
+ 9  
+ 10 
+(10 rows)
+-1S: end;
+END
+-1S: select * from hs_subtrx;
+ a   
+-----
+ 114 
+ 115 
+ 120 
+ 118 
+ 113 
+ 112 
+ 116 
+ 119 
+ 111 
+ 117 
+(10 rows)
+
+----------------------------------------------------------------
+-- Various isolation tests that involve AO/CO table.
+----------------------------------------------------------------
+1: create table hs_ao(a int, id int unique) using ao_row;
+CREATE
+1: insert into hs_ao select 1,i from generate_series(1,10) i;
+INSERT 10
+1: begin;
+BEGIN
+1: insert into hs_ao select 2,i from generate_series(11,20) i;
+INSERT 10
+
+-- standby sees the same AO metadata as primary
+2: select * from gp_toolkit.__gp_aoseg('hs_ao');
+ segment_id | segno | eof | tupcount | varblockcount | eof_uncompressed | modcount | formatversion | state 
+------------+-------+-----+----------+---------------+------------------+----------+---------------+-------
+ 0          | 1     | 128 | 5        | 1             | 128              | 1        | 3             | 1     
+ 1          | 1     | 40  | 1        | 1             | 40               | 1        | 3             | 1     
+ 2          | 1     | 104 | 4        | 1             | 104              | 1        | 3             | 1     
+(3 rows)
+-1S: select * from gp_toolkit.__gp_aoseg('hs_ao');
+ segment_id | segno | eof | tupcount | varblockcount | eof_uncompressed | modcount | formatversion | state 
+------------+-------+-----+----------+---------------+------------------+----------+---------------+-------
+ 0          | 1     | 128 | 5        | 1             | 128              | 1        | 3             | 1     
+ 1          | 1     | 40  | 1        | 1             | 40               | 1        | 3             | 1     
+ 2          | 1     | 104 | 4        | 1             | 104              | 1        | 3             | 1     
+(3 rows)
+2: select (gp_toolkit.__gp_aoblkdir('hs_ao')).* from gp_dist_random('gp_id');
+ tupleid | segno | columngroup_no | entry_no | first_row_no | file_offset | row_count 
+---------+-------+----------------+----------+--------------+-------------+-----------
+ (0,2)   | 1     | 0              | 0        | 1            | 0           | 4         
+ (0,2)   | 1     | 0              | 0        | 1            | 0           | 1         
+ (0,2)   | 1     | 0              | 0        | 1            | 0           | 5         
+(3 rows)
+-1S: select (gp_toolkit.__gp_aoblkdir('hs_ao')).* from gp_dist_random('gp_id');
+ tupleid | segno | columngroup_no | entry_no | first_row_no | file_offset | row_count 
+---------+-------+----------------+----------+--------------+-------------+-----------
+ (0,2)   | 1     | 0              | 0        | 1            | 0           | 5         
+ (0,2)   | 1     | 0              | 0        | 1            | 0           | 1         
+ (0,2)   | 1     | 0              | 0        | 1            | 0           | 4         
+(3 rows)
+
+-- standby sees correct table data
+-1S: select * from hs_ao;
+ a | id 
+---+----
+ 1 | 2  
+ 1 | 3  
+ 1 | 4  
+ 1 | 7  
+ 1 | 8  
+ 1 | 1  
+ 1 | 5  
+ 1 | 6  
+ 1 | 9  
+ 1 | 10 
+(10 rows)
+
+-- standby sees the effect of vacuum
+1: end;
+END
+1: delete from hs_ao where a = 1;
+DELETE 10
+1: vacuum hs_ao;
+VACUUM
+1: select * from gp_toolkit.__gp_aoseg('hs_ao');
+ segment_id | segno | eof | tupcount | varblockcount | eof_uncompressed | modcount | formatversion | state 
+------------+-------+-----+----------+---------------+------------------+----------+---------------+-------
+ 2          | 1     | 0   | 0        | 0             | 0                | 3        | 3             | 1     
+ 2          | 2     | 104 | 4        | 1             | 104              | 0        | 3             | 1     
+ 0          | 1     | 0   | 0        | 0             | 0                | 3        | 3             | 1     
+ 0          | 2     | 88  | 3        | 1             | 88               | 0        | 3             | 1     
+ 1          | 1     | 0   | 0        | 0             | 0                | 3        | 3             | 1     
+ 1          | 2     | 88  | 3        | 1             | 88               | 0        | 3             | 1     
+(6 rows)
+-1S: select * from gp_toolkit.__gp_aoseg('hs_ao');
+ segment_id | segno | eof | tupcount | varblockcount | eof_uncompressed | modcount | formatversion | state 
+------------+-------+-----+----------+---------------+------------------+----------+---------------+-------
+ 2          | 1     | 0   | 0        | 0             | 0                | 3        | 3             | 1     
+ 2          | 2     | 104 | 4        | 1             | 104              | 0        | 3             | 1     
+ 0          | 1     | 0   | 0        | 0             | 0                | 3        | 3             | 1     
+ 0          | 2     | 88  | 3        | 1             | 88               | 0        | 3             | 1     
+ 1          | 1     | 0   | 0        | 0             | 0                | 3        | 3             | 1     
+ 1          | 2     | 88  | 3        | 1             | 88               | 0        | 3             | 1     
+(6 rows)
+-1S: select * from hs_ao;
+ a | id 
+---+----
+ 2 | 11 
+ 2 | 13 
+ 2 | 14 
+ 2 | 17 
+ 2 | 12 
+ 2 | 15 
+ 2 | 20 
+ 2 | 16 
+ 2 | 18 
+ 2 | 19 
+(10 rows)
diff --git a/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out b/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out
index 779e4dd1bcf..473c2fff185 100644
--- a/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out
+++ b/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out
@@ -20,7 +20,19 @@ ERROR:  language "plpython3u" already exists
 -- end_ignore
 
 -- enable resource group and restart cluster.
+-- prerequisites:
+--     1. '/sys/fs/cgroup/gpdb' must exist,
+--        otherwise create it before run installcheck-resgroup-v2;
+--     2. 'gpconfig -c gp_resource_group_cgroup_parent -v "gpdb" && gpstop -rai'
+--        must run before 'gpconfig -c gp_resource_manager -v group-v2', because
+--        during the process of setting gp_resource_manager to group-v2, the
+--        system will check whether the directory
+--        '/sys/fs/cgroup/$gp_resource_group_cgroup_parent' exists.
 -- start_ignore
+! gpconfig -c gp_resource_group_cgroup_parent -v "gpdb";
+
+! gpstop -rai;
+
 ! gpconfig -c gp_resource_manager -v group-v2;
 
 ! gpconfig -c max_connections -v 250 -m 25;
@@ -37,6 +49,11 @@ ERROR:  language "plpython3u" already exists
 ---------------------
  group-v2            
 (1 row)
+0: SHOW gp_resource_group_cgroup_parent;
+ gp_resource_group_cgroup_parent 
+---------------------------------
+ gpdb                            
+(1 row)
 
 -- resource queue statistics should not crash
 0: SELECT * FROM pg_resqueue_status;
@@ -118,7 +135,7 @@ sql = "select sess_id from pg_stat_activity where pid = '%d'" % pid result = plp
 sql = "select groupid from gp_toolkit.gp_resgroup_config where groupname='%s'" % groupname result = plpy.execute(sql) groupid = result[0]['groupid'] 
 sql = "select hostname from gp_segment_configuration group by hostname" result = plpy.execute(sql) hosts = [_['hostname'] for _ in result] 
 def get_result(host): stdout = subprocess.run(["ssh", "{}".format(host), "ps -ef | grep postgres | grep con{} | grep -v grep | awk '{{print $2}}'".format(session_id)], stdout=subprocess.PIPE, check=True).stdout session_pids = stdout.splitlines() 
-path = "/sys/fs/cgroup/gpdb/{}/cgroup.procs".format(groupid) stdout = subprocess.run(["ssh", "{}".format(host), "cat {}".format(path)], stdout=subprocess.PIPE, check=True).stdout cgroups_pids = stdout.splitlines() 
+path = "/sys/fs/cgroup/gpdb/{}/queries/cgroup.procs".format(groupid) stdout = subprocess.run(["ssh", "{}".format(host), "cat {}".format(path)], stdout=subprocess.PIPE, check=True).stdout cgroups_pids = stdout.splitlines() 
 return set(session_pids).issubset(set(cgroups_pids)) 
 for host in hosts: if not get_result(host): return False return True 
 $$ LANGUAGE plpython3u;
@@ -138,10 +155,26 @@ CREATE
 
 0: CREATE OR REPLACE FUNCTION mkdir(dirname text) RETURNS BOOL AS $$ import os 
 if os.path.exists(dirname): return True 
-try: os.makedirs(dirname) except Exception as e: plpy.error("cannot create dir {}".format(e)) else: return True $$ LANGUAGE plpython3u;
+try: os.makedirs(dirname) except FileExistsError: return True except Exception as e: plpy.error("cannot create dir {}".format(e)) else: return True $$ LANGUAGE plpython3u;
+CREATE
+
+0: CREATE OR REPLACE FUNCTION rmdir(dirname text) RETURNS BOOL AS $$ import shutil import fcntl import os 
+try: f = os.open(dirname, os.O_RDONLY) except FileNotFoundError: return True 
+fcntl.flock(f, fcntl.LOCK_EX) 
+if not os.path.exists(dirname): os.close(f) return True 
+try: shutil.rmtree(dirname) except Exception as e: plpy.error("cannot remove dir {}".format(e)) else: return True finally: os.close(f) $$ LANGUAGE plpython3u;
 CREATE
 
-0: CREATE OR REPLACE FUNCTION rmdir(dirname text) RETURNS BOOL AS $$ import shutil import os 
-if not os.path.exists(dirname): return True 
-try: shutil.rmtree(dirname) except Exception as e: plpy.error("cannot remove dir {}".format(e)) else: return True $$ LANGUAGE plpython3u;
+0: CREATE OR REPLACE FUNCTION check_clear_io_max(groupname text) RETURNS BOOL AS $$ import ctypes import os 
+postgres = ctypes.CDLL(None) clear_io_max = postgres['clear_io_max'] 
+# get group oid sql = "select groupid from gp_toolkit.gp_resgroup_config where groupname = '%s'" % groupname result = plpy.execute(sql) groupid = result[0]['groupid'] 
+clear_io_max(groupid) 
+cgroup_path = "/sys/fs/cgroup/gpdb/%d/io.max" % groupid 
+return os.stat(cgroup_path).st_size == 0 $$ LANGUAGE plpython3u;
+CREATE
+
+0: CREATE OR REPLACE FUNCTION check_io_max_empty(groupname text) RETURNS BOOL AS $$ import os 
+# get group oid sql = "select groupid from gp_toolkit.gp_resgroup_config where groupname = '%s'" % groupname result = plpy.execute(sql) groupid = result[0]['groupid'] 
+cgroup_path = "/sys/fs/cgroup/gpdb/%d/io.max" % groupid 
+return os.stat(cgroup_path).st_size == 0 $$ LANGUAGE plpython3u;
 CREATE
diff --git a/src/test/isolation2/expected/segwalrep/select_throttle.out b/src/test/isolation2/expected/segwalrep/select_throttle.out
index 1d722085938..5a072cf5674 100644
--- a/src/test/isolation2/expected/segwalrep/select_throttle.out
+++ b/src/test/isolation2/expected/segwalrep/select_throttle.out
@@ -275,7 +275,7 @@ SELECT pg_reload_conf();
 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1
 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] got cmd: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1
 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1
-20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1"'  had result: cmd had rc=0 completed=True halted=False
+20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1"'  had result: cmd had rc=0 completed=True halted=False
   stdout='pg_control version number:            12010700
 Catalog version number:               302304041
 Database system identifier:           7227176750494621446
@@ -333,7 +333,7 @@ Mock authentication nonce:            e3a5af22bfbe2ac44c969f4724f7c7a50599226317
   stderr=''
 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] got cmd: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1
 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1
-20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1"'  had result: cmd had rc=0 completed=True halted=False
+20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1"'  had result: cmd had rc=0 completed=True halted=False
   stdout='pg_control version number:            12010700
 Catalog version number:               302304041
 Database system identifier:           7227176750494621446
@@ -603,7 +603,7 @@ host replication pivotal 2601:647:4800:c740:3259:5e67:ae0d:643f/128 trust
 host replication pivotal 2601:647:4800:c740:7cd8:f44e:3889:509e/128 trust
 host replication pivotal 2601:647:4800:c740:40d4:7879:8a:dc04/128 trust
 host replication pivotal 2601:647:4800:c740:c21a:83b2:8a4a:33bd/128 trust'
-20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Update pg_hba.conf cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/sbin/seg_update_pg_hba.py --data-dir /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 --entries '
+20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Update pg_hba.conf cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/sbin/seg_update_pg_hba.py --data-dir /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 --entries '
 host replication pivotal samehost trust
 host all pivotal 10.0.0.234/32 trust
 host all pivotal 172.17.0.1/32 trust
@@ -644,7 +644,7 @@ host replication pivotal 2601:647:4800:c740:c21a:83b2:8a4a:33bd/128 trust'"'  ha
 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: $GPHOME/sbin/gpsegsetuprecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite
 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] got cmd: $GPHOME/sbin/gpsegsetuprecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite
 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/sbin/gpsegsetuprecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite
-20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Run validation checks and setup data directories for recovery cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/sbin/gpsegsetuprecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite"'  had result: cmd had rc=0 completed=True halted=False
+20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Run validation checks and setup data directories for recovery cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/sbin/gpsegsetuprecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite"'  had result: cmd had rc=0 completed=True halted=False
   stdout='20230428:13:32:55:1968258 gpsegsetuprecovery.py:station6:pivotal-[INFO]:-Starting recovery with args: -c [{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}] -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite
 20230428:13:32:55:1968258 gpsegsetuprecovery.py:station6:pivotal-[DEBUG]:-WorkerPool() initialized with 1 workers
 20230428:13:32:55:1968258 gpsegsetuprecovery.py:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: 
@@ -691,7 +691,7 @@ host replication pivotal 2601:647:4800:c740:c21a:83b2:8a4a:33bd/128 trust'"'  ha
 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: $GPHOME/sbin/gpsegrecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001
 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker1] got cmd: $GPHOME/sbin/gpsegrecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001
 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/sbin/gpsegrecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001
-20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker1] finished cmd: Recover segments cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/sbin/gpsegrecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001"'  had result: cmd had rc=0 completed=True halted=False
+20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker1] finished cmd: Recover segments cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/sbin/gpsegrecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001"'  had result: cmd had rc=0 completed=True halted=False
   stdout='20230428:13:32:56:1968306 gpsegrecovery.py:station6:pivotal-[INFO]:-Starting recovery with args: -c [{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}] -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001
 20230428:13:32:56:1968306 gpsegrecovery.py:station6:pivotal-[DEBUG]:-WorkerPool() initialized with 1 workers
 20230428:13:32:56:1968306 gpsegrecovery.py:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: 
@@ -717,7 +717,7 @@ station6 (dbid 6): skipping pg_rewind on mirror as standby.signal is present
 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out
 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker2] got cmd: rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out
 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out
-20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker2] finished cmd: remove file cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"'  had result: cmd had rc=0 completed=True halted=False
+20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker2] finished cmd: remove file cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"'  had result: cmd had rc=0 completed=True halted=False
   stdout=''
   stderr=''
 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[INFO]:-Triggering FTS probe
diff --git a/src/test/isolation2/expected/segwalrep/startup_rename_prepared_xlog.out b/src/test/isolation2/expected/segwalrep/startup_rename_prepared_xlog.out
new file mode 100644
index 00000000000..d51241e6aa0
--- /dev/null
+++ b/src/test/isolation2/expected/segwalrep/startup_rename_prepared_xlog.out
@@ -0,0 +1,173 @@
+-- Test a bug where the last XLOG segment is renamed to .partial before prepared
+-- transactions contained in it are recovered. This would result in segfault at
+-- RecoverPreparedTransactions. The failure is well described in PG hackers:
+-- https://www.postgresql.org/message-id/743b9b45a2d4013bd90b6a5cba8d6faeb717ee34.camel%40cybertec.at
+-- However, in GP due to an older version of PG this error is masked by always caching
+-- the last opened xlog segment in XLogRead(). To actually trigger the failure we need to
+-- create unfinished prepared transactions in TWO different xlog segments.
+
+-- Allow extra time for mirror promotion to complete recovery to avoid
+-- gprecoverseg BEGIN failures due to gang creation failure as some primaries
+-- are not up. Setting these increase the number of retries in gang creation in
+-- case segment is in recovery. Approximately we want to wait 30 seconds.
+!\retcode gpconfig -c gp_gang_creation_retry_count -v 120 --skipvalidation --masteronly;
+(exited with code 0)
+!\retcode gpconfig -c gp_gang_creation_retry_timer -v 1000 --skipvalidation --masteronly;
+(exited with code 0)
+
+-- The last xlog segment is renamed to .partial only when archive mode is on
+!\retcode gpconfig -c archive_mode -v on;
+(exited with code 0)
+!\retcode gpconfig -c archive_command -v '/bin/true';
+(exited with code 0)
+!\retcode gpstop -rai;
+(exited with code 0)
+
+1: create extension if not exists gp_inject_fault;
+CREATE
+1: create table t_rename1 (a int);
+CREATE
+1: create table t_rename2 (a int);
+CREATE
+
+-- generate an orphaned prepare transaction in first segment
+1: select gp_inject_fault('dtm_broadcast_prepare', 'suspend', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-- assume (2), (1) are on different segments and one tuple is on the first segment.
+-- the test finally double-check that.
+2&: insert into t_rename1 values(2),(1);  <waiting ...>
+1: select gp_wait_until_triggered_fault('dtm_broadcast_prepare', 1, dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_wait_until_triggered_fault 
+-------------------------------
+ Success:                      
+(1 row)
+
+-- start another xlog segment (will be renamed to .partial on failover)
+GP_IGNORE:-- start_ignore
+GP_IGNORE:0U: select pg_switch_xlog();
+GP_IGNORE: pg_switch_xlog 
+GP_IGNORE:----------------
+GP_IGNORE: 0/C0B05E0      
+GP_IGNORE:(1 row)
+GP_IGNORE:-- end_ignore
+
+-- inject another fault and prepare transaction in the new xlog segment
+1: select gp_inject_fault('dtm_broadcast_prepare', 'reset', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1: select gp_inject_fault('dtm_broadcast_prepare', 'suspend', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-- assume (4), (3) are on different segments and one tuple is on the first segment.
+-- the test finally double-check that.
+3&: insert into t_rename2 values(2),(1);  <waiting ...>
+1: select gp_wait_until_triggered_fault('dtm_broadcast_prepare', 1, dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_wait_until_triggered_fault 
+-------------------------------
+ Success:                      
+(1 row)
+
+-- shutdown primary and make sure the segment is down
+-1U: select pg_ctl((SELECT datadir from gp_segment_configuration c where c.role='p' and c.content=0), 'stop', 'immediate');
+ pg_ctl 
+--------
+ OK     
+(1 row)
+1: select gp_request_fts_probe_scan();
+ gp_request_fts_probe_scan 
+---------------------------
+ t                         
+(1 row)
+1: select role, preferred_role from gp_segment_configuration where content = 0 order by role;
+ role | preferred_role 
+------+----------------
+ m    | p              
+ p    | m              
+(2 rows)
+
+-- double confirm that promote succeeds.
+-- also double confirm that
+--  1. tuples (2) and (1) are located on two segments (thus we are testing 2pc with prepared transaction).
+--  2. there are tuples on the first segment (we have been testing on the first segment).
+1: insert into t_rename1 values(2),(1);
+INSERT 2
+1: select gp_segment_id, * from t_rename1 order by a;
+ gp_segment_id | a 
+---------------+---
+ 1             | 1 
+ 0             | 2 
+(2 rows)
+
+1: select gp_inject_fault('dtm_broadcast_prepare', 'reset', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+2<:  <... completed>
+INSERT 2
+3<:  <... completed>
+INSERT 2
+
+-- confirm the "orphaned" prepared trnasaction commits finally.
+1: select * from t_rename1 order by a;
+ a 
+---
+ 1 
+ 1 
+ 2 
+ 2 
+(4 rows)
+1: select * from t_rename2 order by a;
+ a 
+---
+ 1 
+ 2 
+(2 rows)
+
+-- recovery the nodes
+!\retcode gprecoverseg -a;
+(exited with code 0)
+1: select wait_until_segment_synchronized(0);
+ wait_until_segment_synchronized 
+---------------------------------
+ OK                              
+(1 row)
+
+!\retcode gprecoverseg -ar;
+(exited with code 0)
+1: select wait_until_segment_synchronized(0);
+ wait_until_segment_synchronized 
+---------------------------------
+ OK                              
+(1 row)
+
+-- verify the first segment is recovered to the original state.
+1: select role, preferred_role from gp_segment_configuration where content = 0 order by role;
+ role | preferred_role 
+------+----------------
+ m    | m              
+ p    | p              
+(2 rows)
+
+-- cleanup
+1: drop table t_rename1;
+DROP
+1: drop table t_rename2;
+DROP
+!\retcode gpconfig -r gp_gang_creation_retry_count --skipvalidation;
+(exited with code 0)
+!\retcode gpconfig -r gp_gang_creation_retry_timer --skipvalidation;
+(exited with code 0)
+!\retcode gpconfig -r archive_mode --skipvalidation;
+(exited with code 0)
+!\retcode gpconfig -r archive_command --skipvalidation;
+(exited with code 0)
+!\retcode gpstop -rai;
+(exited with code 0)
diff --git a/src/test/isolation2/hot_standby_schedule b/src/test/isolation2/hot_standby_schedule
new file mode 100644
index 00000000000..da27cb327e9
--- /dev/null
+++ b/src/test/isolation2/hot_standby_schedule
@@ -0,0 +1,6 @@
+test: hot_standby/setup
+test: hot_standby/basic
+test: hot_standby/transaction_isolation
+# test: hot_standby/query_conflict
+test: hot_standby/faults
+test: hot_standby/teardown
diff --git a/src/test/isolation2/input/hot_standby/query_conflict.source b/src/test/isolation2/input/hot_standby/query_conflict.source
new file mode 100644
index 00000000000..0e2706bfa5a
--- /dev/null
+++ b/src/test/isolation2/input/hot_standby/query_conflict.source
@@ -0,0 +1,225 @@
+-- Tests for query conflict detection and cancellation on the hot standby.
+
+----------------------------------------------------------------
+-- Various query conflcit cases for hot standy.
+--
+-- All cases are written in this pattern:
+-- 1. Start a standby transaction that will be conflicted and cancelled;
+-- 2. Start a primary transaction that will conflict it;
+-- 3. Commit the primary transaction. Since we are using remote_apply, it will 
+--     wait until the WAL is applied on the standby, which would happen only
+--     after the standby query is cancelled;
+-- 4. Run something on the standby transaction and see the conflict error, which
+--     in some cases it's ERROR, in others it's FATAL. 
+-- 5. Quit, establish a new connection, and re-run
+-- 6. Check the system view gp_stat_database_conflicts to see that the conflict
+--     has been recorded. Note that we print the max count among all segments
+--     to avoid flakiness.
+-- See https://www.postgresql.org/docs/12/hot-standby.html#HOT-STANDBY-CONFLICT for more details.
+----------------------------------------------------------------
+
+-- We assume we start the test with clean records
+-1S: select max(confl_tablespace), max(confl_lock), max(confl_snapshot), max(confl_bufferpin), max(confl_deadlock) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+
+---------------------------------------------------------------------
+-- Conflict with explicit lock
+---------------------------------------------------------------------
+create table hs_qc_lock(a int);
+insert into hs_qc_lock select * from generate_series(1,5);
+-1S: begin;
+-1S: select * from hs_qc_lock;
+1: begin;
+1: lock table hs_qc_lock in access exclusive mode;
+1: end;
+-1S: select * from hs_qc_lock;
+-1Sq:
+-1S: select * from hs_qc_lock;
+-1S: select max(confl_lock) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+
+---------------------------------------------------------------------
+-- Conflict with implicit lock
+---------------------------------------------------------------------
+-1S: begin;
+-1S: select * from hs_qc_lock;
+1: alter table hs_qc_lock set access method ao_row;
+-1S: select * from hs_qc_lock;
+-1Sq:
+-1S: select * from hs_qc_lock;
+-1S: select max(confl_lock) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+
+---------------------------------------------------------------------
+-- Conflict with drop database
+---------------------------------------------------------------------
+1: create database hs_qc_dropdb;
+-1Sq:
+-1S:@db_name hs_qc_dropdb: select 1;
+1: drop database hs_qc_dropdb;
+-1S: select 1;
+-1Sq:
+-- Stats aren't counted for database conflicts. See: pgstat_recv_recoveryconflict
+
+---------------------------------------------------------------------
+-- Conflict with VACUUM (snapshot)
+---------------------------------------------------------------------
+1: create table hs_qc_vac1(a int);
+1: insert into hs_qc_vac1 select * from generate_series(1,10);
+-1S: begin transaction isolation level repeatable read;
+-1S: select count(*) from hs_qc_vac1;
+1: delete from hs_qc_vac1;
+1: vacuum hs_qc_vac1;
+-1S: select count(*) from hs_qc_vac1;
+-1Sq:
+-1S: select max(confl_snapshot) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+
+---------------------------------------------------------------------
+-- Conflict with VACUUM (buffer pin)
+-- VACUUM of page that the standby is still holding buffer pin on, the difference with
+-- the previous case is that here the deleted row is already invisible to the standby.
+---------------------------------------------------------------------
+1: create table hs_qc_vac2(a int);
+1: insert into hs_qc_vac2 values(2);
+1: delete from hs_qc_vac2;
+-- run select once on the standby, so the next select will fetch data from buffer
+-1S: select * from hs_qc_vac2;
+-- suspend the standby at where it just unlocks the buffer but still holds the pin
+1: select gp_inject_fault('heapgetpage_after_unlock_buffer', 'suspend','','','hs_qc_vac2',1,1,0,dbid) from gp_segment_configuration where content=0 and role='m';
+-- we'll also make sure the startup process has sent out the signal before we let the standby backend release the pin
+1: select gp_inject_fault('recovery_conflict_bufferpin_signal_sent', 'skip',dbid) from gp_segment_configuration where content=0 and role='m';
+-1S&: select * from hs_qc_vac2;
+1: vacuum hs_qc_vac2;
+-- as mentioned before, make sure startup process has sent the signal, and then let the standby proceed
+1: select gp_wait_until_triggered_fault('recovery_conflict_bufferpin_signal_sent', 1,dbid) from gp_segment_configuration where content=0 and role='m';
+1: select gp_inject_fault('recovery_conflict_bufferpin_signal_sent', 'reset',dbid) from gp_segment_configuration where content=0 and role='m';
+1: select gp_inject_fault('heapgetpage_after_unlock_buffer', 'reset',dbid) from gp_segment_configuration where content=0 and role='m';
+-- should see the conflict
+-1S<:
+-1Sq:
+-- XXX: sometimes it shows the number is 2 instead of 1. It still validates the test but it would be nice to know why.
+-1S: select max(confl_bufferpin) > 0 from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+
+---------------------------------------------------------------------
+-- Conflict with drop (temp) tablespace
+-- Note: regular user tablespaces won't cause conflict on the standby since the standby cannot create any objects under them.
+---------------------------------------------------------------------
+-- create tablespace
+!\retcode mkdir -p @testtablespace@/hs_tablespace_directory;
+create tablespace hs_ts location '@testtablespace@/hs_tablespace_directory';
+
+-- some prepartion on the primary
+create table hs_ts_foo (i int, j int) distributed by(i);
+insert into hs_ts_foo select i, i from generate_series(1,800000)i;
+analyze hs_ts_foo;
+
+-- make sure the standby won't run too fast and delete the temp files
+select gp_inject_fault('after_open_temp_file', 'suspend',dbid) from gp_segment_configuration where content=1 and role='m';
+
+-- on the standby, run some query that requires workfile, this example is taken
+-- from regress/temp_tablespaces test
+-1S: set temp_tablespaces = hs_ts;
+-1S: set default_tablespace = hs_ts;
+-1S: set statement_mem='2MB';
+-1S&: with a1 as (select * from hs_ts_foo), a2 as (select * from hs_ts_foo) select a1.i xx from a1 inner join a2 on a2.i = a1.i union all select count(a1.i) from a1 inner join a2 on a2.i = a1.i order by xx limit 5;
+
+-- drop tablespace, should see conflict on the hot standby
+drop tablespace hs_ts;
+select gp_inject_fault('after_open_temp_file', 'reset',dbid) from gp_segment_configuration where content=1 and role='m';
+-1S<:
+-1Sq:
+
+-- conflict has been recorded
+-1S: select max(confl_tablespace) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+
+-- cleanup
+!\retcode rm -rf @testtablespace@/hs_tablespace_directory;
+-- Do one checkpoint. Otherwise if server restarts w/o doing checkpoint (some subsequent
+-- tests might do that), the server would complain it cannot find the directory for hs_ts.
+checkpoint;
+
+----------------------------------------------------------------
+-- Additional case to show that distributed transaction is not taken into 
+-- account w/o the help of restore-point-based distributed snapshot creation.
+----------------------------------------------------------------
+
+1: create table hs_qc_ds1(a int);
+1: insert into hs_qc_ds1 select * from generate_series(1,10);
+-- standby starts a repeatable read transaction, runs a local query that
+-- creates a distributed snapshot w/o creating QE.
+-1S: select count(*) from hs_qc_ds1;
+-1S: begin transaction isolation level repeatable read;
+-1S: select relname from pg_class where relname = 'hs_qc_ds1';
+-- primary runs VACUUM
+1: delete from hs_qc_ds1;
+1: vacuum hs_qc_ds1;
+-- The standby query in theory should be cancelled, because it started before
+-- the VACUUM. But in reality, it doesn't, and sees 0 rows, because the QE for the 
+-- SELECT below will create more recent local snapshot that does not conflict with
+-- the VACUUM, and sees the result of DELETE+VACUUM.
+-- Note: with the help of restore point, we would be able to create local snapshot 
+-- precisely corresponding to each distributed snapshot, and do conflict detection accordingly.
+-1S: select count(*) from hs_qc_ds1;
+-1S: end;
+
+----------------------------------------------------------------
+-- Test GUC hot_standby_feedback
+----------------------------------------------------------------
+!\retcode gpconfig -c hot_standby_feedback -v on;
+!\retcode gpstop -u;
+
+1: create table hs_qc_guc1(a int);
+1: insert into hs_qc_guc1 select * from generate_series(1,10);
+
+-1S: begin transaction isolation level repeatable read;
+-1S: select * from hs_qc_guc1;
+
+-- VACUUM won't cleanup this table since the standby still sees it
+1: delete from hs_qc_guc1;
+1: vacuum hs_qc_guc1;
+
+-- hot standby can still see those rows
+-1S: select * from hs_qc_guc1;
+
+-- after the conflicting read transaction ends, the next VACUUM will successfully vacuum the table
+-1S: end;
+1: vacuum hs_qc_guc1;
+-1S: select * from hs_qc_guc1;
+-1Sq:
+
+!\retcode gpconfig -r hot_standby_feedback;
+!\retcode gpstop -u;
+
+----------------------------------------------------------------
+-- Test GUC vacuum_defer_cleanup_age
+----------------------------------------------------------------
+-- Use a GUC value that's not 0, so VACUUM does not clean up
+-- recent dead rows that the hot standby might be still seeing.
+!\retcode gpconfig -c vacuum_defer_cleanup_age -v 1;
+!\retcode gpstop -u;
+
+1: create table hs_qc_guc2(a int);
+1: insert into hs_qc_guc2 select * from generate_series(1,10);
+
+-1S: begin transaction isolation level repeatable read;
+-1S: select count(*) from hs_qc_guc2;
+
+-- VACUUM won't cleanup this table since the DELETE is still within vacuum_defer_cleanup_age
+1: delete from hs_qc_guc2;
+1: vacuum hs_qc_guc2;
+
+-- showing all rows are deleted but not vacuumed
+1: select count(*) from hs_qc_guc2;
+1: set gp_select_invisible to on;
+1: select count(*) from hs_qc_guc2;
+
+-- hot standby can still query the table
+-1S: select count(*) from hs_qc_guc2;
+
+-- only if the age is reached, hot standby will see the same conflict as before
+1: create temp table tt1(a int);
+1: vacuum hs_qc_guc2;
+-1S: select count(*) from hs_qc_guc2;
+-1Sq:
+-1S: select max(confl_snapshot) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+
+!\retcode gpconfig -r vacuum_defer_cleanup_age;
+!\retcode gpstop -u;
+
diff --git a/src/test/isolation2/input/resgroup/resgroup_io_limit.source b/src/test/isolation2/input/resgroup/resgroup_io_limit.source
index 935964c5163..9a5fe2dc2f7 100644
--- a/src/test/isolation2/input/resgroup/resgroup_io_limit.source
+++ b/src/test/isolation2/input/resgroup/resgroup_io_limit.source
@@ -1,3 +1,8 @@
+-- different bison version may have different log format
+-- start_matchignore
+-- m/^ERROR:  io limit: syntax error.*\n/
+-- end_matchignore
+
 -- positive: io limit with correct syntax
 CREATE RESOURCE GROUP rg_test_group1 WITH (concurrency=10, cpu_max_percent=10, io_limit='pg_default:rbps=1000,wbps=1000,riops=1000,wiops=1000');
 SELECT io_limit FROM gp_toolkit.gp_resgroup_config WHERE groupname='rg_test_group1';
@@ -44,10 +49,17 @@ CREATE RESOURCE GROUP rg_test_group5 WITH (concurrency=10, cpu_max_percent=10, i
 
 SELECT check_cgroup_io_max('rg_test_group5', 'rg_io_limit_ts_1', 'rbps=1048576000 wbps=1048576000 riops=1000 wiops=1000');
 
+-- try to drop test tablespace
+DROP TABLESPACE rg_io_limit_ts_1;
+
 ALTER RESOURCE GROUP rg_test_group5 SET io_limit 'rg_io_limit_ts_1:rbps=1000,wbps=1000';
 
 SELECT check_cgroup_io_max('rg_test_group5', 'rg_io_limit_ts_1', 'rbps=1048576000 wbps=1048576000 riops=max wiops=max');
 
+ALTER RESOURCE GROUP rg_test_group5 SET concurrency 1;
+
+SELECT check_clear_io_max('rg_test_group5');
+
 -- fault injector
 SELECT gp_inject_fault('create_resource_group_fail', 'error', 1);
 
@@ -57,14 +69,30 @@ SELECT groupid, groupname, cpuset FROM gp_toolkit.gp_resgroup_config WHERE group
 
 SELECT gp_inject_fault('create_resource_group_fail', 'reset', 1);
 
--- start_ignore
+-- clear limitations
+CREATE RESOURCE GROUP rg_test_group7 WITH (concurrency=10, cpu_max_percent=10, io_limit='rg_io_limit_ts_1:rbps=1000,wbps=1000');
+
+SELECT check_cgroup_io_max('rg_test_group7', 'rg_io_limit_ts_1', 'rbps=1048576000 wbps=1048576000 riops=max wiops=max');
+
+ALTER RESOURCE GROUP rg_test_group7 SET IO_LIMIT '-1';
+
+SELECT check_io_max_empty('rg_test_group7');
+
 -- view
+-- start_ignore
 SELECT * from gp_toolkit.gp_resgroup_iostats_per_host;
 -- end_ignore
 
+SELECT count(*) > 0 as r from gp_toolkit.gp_resgroup_iostats_per_host;
+
 -- clean
 DROP RESOURCE GROUP rg_test_group1;
 DROP RESOURCE GROUP rg_test_group2;
 DROP RESOURCE GROUP rg_test_group3;
 DROP RESOURCE GROUP rg_test_group4;
 DROP RESOURCE GROUP rg_test_group5;
+DROP RESOURCE GROUP rg_test_group7;
+
+DROP TABLESPACE rg_io_limit_ts_1;
+
+select rmdir('@testtablespace@/rg_io_limit_ts_1') from gp_dist_random('gp_id') intersect select rmdir('@testtablespace@/rg_io_limit_ts_1') from gp_id;
diff --git a/src/test/isolation2/input/uao/fast_analyze.source b/src/test/isolation2/input/uao/fast_analyze.source
new file mode 100644
index 00000000000..962ba600f75
--- /dev/null
+++ b/src/test/isolation2/input/uao/fast_analyze.source
@@ -0,0 +1,349 @@
+--
+-- Test AO/CO sampling method.
+--
+-- These tests ensure that we achieve our ANALYZE targets for AO/CO tables.
+--
+CREATE TABLE fast_analyze_@amname@_1(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+
+-- Stats target info shows that we will sample 300 * (100) rows.
+SHOW default_statistics_target;
+SELECT attstattarget FROM pg_attribute
+  WHERE attrelid = 'fast_analyze_@amname@_1'::regclass AND attname IN ('i', 'j');
+
+--------------------------------------------------------------------------------
+-- Scenario 1:
+-- We have MORE than 300 * default_statistics_target = 30k rows for a 2 int table,
+-- spread across 3 segments, with no aborted rows [2 subcases -> blkdir and
+-- non-blkdir].
+-- Expectation: We have collected 30k live rows.
+--------------------------------------------------------------------------------
+
+-- (a) Without blkdir subcase
+
+-- Insert 10.5k rows in each QE.
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+1: INSERT INTO fast_analyze_@amname@_1 SELECT i, 2 FROM generate_series(1, 10500) i;
+2: INSERT INTO fast_analyze_@amname@_1 SELECT i, 1 FROM generate_series(1, 10500) i;
+3: INSERT INTO fast_analyze_@amname@_1 SELECT i, 5 FROM generate_series(1, 10500) i;
+1: COMMIT;
+2: COMMIT;
+3: COMMIT;
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_1;
+
+-- We have sampled 10k live rows.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_1(i);
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_1;
+
+-- We have sampled 10k live rows from each QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+--------------------------------------------------------------------------------
+-- Scenario 2:
+-- We have LESS than 300 * default_statistics_target = 30k rows for a 2 int table,
+-- spread across 3 segments, with no aborted rows [2 subcases -> blkdir and
+-- non-blkdir].
+-- Expectation: We have collected number of live rows = total tupcount of table.
+--------------------------------------------------------------------------------
+
+CREATE TABLE fast_analyze_@amname@_2(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+
+-- (a) Without blkdir subcase
+
+-- Insert 10 rows in each QE.
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+1: INSERT INTO fast_analyze_@amname@_2 SELECT i, 2 FROM generate_series(1, 10) i;
+2: INSERT INTO fast_analyze_@amname@_2 SELECT i, 1 FROM generate_series(1, 10) i;
+3: INSERT INTO fast_analyze_@amname@_2 SELECT i, 5 FROM generate_series(1, 10) i;
+1: COMMIT;
+2: COMMIT;
+3: COMMIT;
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_2;
+
+-- We have sampled 10 live rows from each QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_2(i);
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_2;
+
+-- We have sampled 10 live rows from each QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+--------------------------------------------------------------------------------
+-- Scenario 3:
+-- We have ALL aborted rows [2 subcases -> blkdir and non-blkdir].
+-- Expectation: We have not sampled any live rows.
+--------------------------------------------------------------------------------
+
+CREATE TABLE fast_analyze_@amname@_3(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+
+-- (a) Without blkdir subcase
+
+-- Insert 10 rows in each QE.
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+1: INSERT INTO fast_analyze_@amname@_3 SELECT i, 2 FROM generate_series(1, 10) i;
+2: INSERT INTO fast_analyze_@amname@_3 SELECT i, 1 FROM generate_series(1, 10) i;
+3: INSERT INTO fast_analyze_@amname@_3 SELECT i, 5 FROM generate_series(1, 10) i;
+1: ABORT;
+2: ABORT;
+3: ABORT;
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_3;
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_3(i);
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_3;
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+--------------------------------------------------------------------------------
+-- Scenario 4:
+-- We have ALL deleted rows [2 subcases -> blkdir and non-blkdir].
+-- Expectation: We have not collected any live rows.
+--------------------------------------------------------------------------------
+
+CREATE TABLE fast_analyze_@amname@_4(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+
+-- (a) Without blkdir subcase
+
+-- Insert 10 rows in each QE.
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+1: INSERT INTO fast_analyze_@amname@_4 SELECT i, 2 FROM generate_series(1, 10) i;
+2: INSERT INTO fast_analyze_@amname@_4 SELECT i, 1 FROM generate_series(1, 10) i;
+3: INSERT INTO fast_analyze_@amname@_4 SELECT i, 5 FROM generate_series(1, 10) i;
+1: COMMIT;
+2: COMMIT;
+3: COMMIT;
+-- Delete all rows.
+DELETE FROM fast_analyze_@amname@_4;
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_4;
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_4(i);
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+ANALYZE fast_analyze_@amname@_4;
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+
+DROP TABLE fast_analyze_@amname@_1;
+DROP TABLE fast_analyze_@amname@_2;
+DROP TABLE fast_analyze_@amname@_3;
+DROP TABLE fast_analyze_@amname@_4;
+
+--
+-- The following tests ensure fast analyze function to work
+-- with multi-segfiles tables under concurrent inserts.
+--
+
+create table analyze_@amname@ (id int, a int, b inet, c inet) using @amname@ with (compresstype=zlib, compresslevel=3);
+
+insert into analyze_@amname@ select 2, i, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' ||
+  (i%255)::text))::inet, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' ||
+  (i%255)::text))::inet from generate_series(1,30000)i;
+
+insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+-- test ANALYZE after concurrent inserts commit
+
+1: begin;
+1: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+2: begin;
+2: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+3: begin;
+3: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+4: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+5: analyze analyze_@amname@;
+
+1: commit;
+2: commit;
+3: abort;
+
+1: analyze analyze_@amname@;
+
+-- test aoblkdir based ANALYZE
+
+create index on analyze_@amname@(id);
+
+1: begin;
+1: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+2: begin;
+2: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+3: begin;
+3: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+4: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+
+5: analyze analyze_@amname@;
+
+1: commit;
+2: commit;
+3: abort;
+
+1: analyze analyze_@amname@;
+
+drop table analyze_@amname@;
+
+-- test more data and stability, note, it could take a little long time
+
+create table analyze_@amname@_2 (id int, a int, b inet, c inet) using @amname@ with (compresstype=zlib, compresslevel=3);
+insert into analyze_@amname@_2 select 2, i, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' ||
+  (i%255)::text))::inet, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' ||
+  (i%255)::text))::inet from generate_series(1,1000)i;
+
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+1: begin;
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+1: commit;
+
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+
+1: begin;
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+1: abort;
+
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+
+-- test with aoblkdir
+
+create index on analyze_@amname@_2(a);
+
+1: begin;
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+1: commit;
+
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+
+1: begin;
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+
+1: abort;
+
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+1: analyze analyze_@amname@_2;
+
+drop table analyze_@amname@_2;
diff --git a/src/test/isolation2/isolation2_schedule b/src/test/isolation2/isolation2_schedule
index 18fd4a2c0c4..aec0005e8d8 100644
--- a/src/test/isolation2/isolation2_schedule
+++ b/src/test/isolation2/isolation2_schedule
@@ -148,6 +148,7 @@ test: uao/limit_indexscan_inits_row
 test: uao/test_pg_appendonly_version_row
 # Refer to the case comment for why it is commented out.
 # test: uao/bad_buffer_on_temp_ao_row
+test: uao/fast_analyze_row
 
 test: uao/create_index_allows_readonly_row
 test: reorganize_after_ao_vacuum_skip_drop truncate_after_ao_vacuum_skip_drop mark_all_aoseg_await_drop
@@ -209,6 +210,7 @@ test: uao/test_pg_appendonly_version_column
 # Refer to the case comment for why it is commented out.
 # test: uao/bad_buffer_on_temp_ao_column
 test: uao/create_index_allows_readonly_column
+test: uao/fast_analyze_column
 
 # this case contains fault injection, must be put in a separate test group
 test: terminate_in_gang_creation
@@ -250,6 +252,7 @@ test: segwalrep/dtm_recovery_on_standby
 test: segwalrep/commit_blocking_on_standby
 test: segwalrep/dtx_recovery_wait_lsn
 test: segwalrep/select_throttle
+test: segwalrep/startup_rename_prepared_xlog
 test: fts_manual_probe
 test: fts_session_reset
 # unstable FTS test in different arch
@@ -266,8 +269,10 @@ test: reindex/reindextable_while_altertable_ao_part_btree reindex/reindextable_w
 # upstream also has this issue, so disable them for now
 # test: reindex/reindextable_while_dropindex_ao_part_btree reindex/reindextable_while_dropindex_heap_part_btree reindex/reindextable_while_dropindex_aoco_part_btree
 
-test: reindex/reindextable_while_reindex_idx_ao_part_btree reindex/reindextable_while_reindex_idx_heap_part_btree reindex/reindextable_while_reindex_idx_aoco_part_btree
-test: reindex/reindextable_while_reindex_idx_ao_bitmap reindex/reindextable_while_reindex_idx_heap_bitmap reindex/reindextable_while_reindex_idx_aoco_bitmap
+# flaky tests: the tests prefixed with "reindextable_while_reindex_idx" may failed, and the reason of failed is not related to MVCC.
+ignore: reindex/reindextable_while_reindex_idx_ao_part_btree reindex/reindextable_while_reindex_idx_heap_part_btree reindex/reindextable_while_reindex_idx_aoco_part_btree
+ignore: reindex/reindextable_while_reindex_idx_ao_bitmap reindex/reindextable_while_reindex_idx_heap_bitmap reindex/reindextable_while_reindex_idx_aoco_bitmap
+
 test: reindex/serializable_reindex_with_drop_column_heap
 test: reindex/serializable_reindex_with_drop_index_ao reindex/serializable_reindex_with_drop_index_heap
 test: reindex/repeatable_read_reindex_with_insert_heap
diff --git a/src/test/isolation2/output/hot_standby/query_conflict.source b/src/test/isolation2/output/hot_standby/query_conflict.source
new file mode 100644
index 00000000000..397e3977d12
--- /dev/null
+++ b/src/test/isolation2/output/hot_standby/query_conflict.source
@@ -0,0 +1,470 @@
+-- Tests for query conflict detection and cancellation on the hot standby.
+
+----------------------------------------------------------------
+-- Various query conflcit cases for hot standy.
+--
+-- All cases are written in this pattern:
+-- 1. Start a standby transaction that will be conflicted and cancelled;
+-- 2. Start a primary transaction that will conflict it;
+-- 3. Commit the primary transaction. Since we are using remote_apply, it will
+--     wait until the WAL is applied on the standby, which would happen only
+--     after the standby query is cancelled;
+-- 4. Run something on the standby transaction and see the conflict error, which
+--     in some cases it's ERROR, in others it's FATAL.
+-- 5. Quit, establish a new connection, and re-run
+-- 6. Check the system view gp_stat_database_conflicts to see that the conflict
+--     has been recorded. Note that we print the max count among all segments
+--     to avoid flakiness.
+-- See https://www.postgresql.org/docs/12/hot-standby.html#HOT-STANDBY-CONFLICT for more details.
+----------------------------------------------------------------
+
+-- We assume we start the test with clean records
+-1S: select max(confl_tablespace), max(confl_lock), max(confl_snapshot), max(confl_bufferpin), max(confl_deadlock) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ max | max | max | max | max 
+-----+-----+-----+-----+-----
+ 0   | 0   | 0   | 0   | 0   
+(1 row)
+
+---------------------------------------------------------------------
+-- Conflict with explicit lock
+---------------------------------------------------------------------
+create table hs_qc_lock(a int);
+CREATE
+insert into hs_qc_lock select * from generate_series(1,5);
+INSERT 5
+-1S: begin;
+BEGIN
+-1S: select * from hs_qc_lock;
+ a 
+---
+ 2 
+ 3 
+ 4 
+ 1 
+ 5 
+(5 rows)
+1: begin;
+BEGIN
+1: lock table hs_qc_lock in access exclusive mode;
+LOCK
+1: end;
+END
+-1S: select * from hs_qc_lock;
+FATAL:  terminating connection due to conflict with recovery
+DETAIL:  User was holding a relation lock for too long.
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+-1Sq: ... <quitting>
+-1S: select * from hs_qc_lock;
+ a 
+---
+ 1 
+ 5 
+ 2 
+ 3 
+ 4 
+(5 rows)
+-1S: select max(confl_lock) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ max 
+-----
+ 1   
+(1 row)
+
+---------------------------------------------------------------------
+-- Conflict with implicit lock
+---------------------------------------------------------------------
+-1S: begin;
+BEGIN
+-1S: select * from hs_qc_lock;
+ a 
+---
+ 1 
+ 5 
+ 2 
+ 3 
+ 4 
+(5 rows)
+1: alter table hs_qc_lock set access method ao_row;
+ALTER
+-1S: select * from hs_qc_lock;
+FATAL:  terminating connection due to conflict with recovery
+DETAIL:  User was holding a relation lock for too long.
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+-1Sq: ... <quitting>
+-1S: select * from hs_qc_lock;
+ a 
+---
+ 1 
+ 5 
+ 2 
+ 3 
+ 4 
+(5 rows)
+-1S: select max(confl_lock) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ max 
+-----
+ 2   
+(1 row)
+
+---------------------------------------------------------------------
+-- Conflict with drop database
+---------------------------------------------------------------------
+1: create database hs_qc_dropdb;
+CREATE
+-1Sq: ... <quitting>
+-1S:@db_name hs_qc_dropdb: select 1;
+ ?column? 
+----------
+ 1        
+(1 row)
+1: drop database hs_qc_dropdb;
+DROP
+-1S: select 1;
+FATAL:  terminating connection due to conflict with recovery
+DETAIL:  User was connected to a database that must be dropped.
+server closed the connection unexpectedly
+	This probably means the server terminated abnormally
+	before or while processing the request.
+-1Sq: ... <quitting>
+-- Stats aren't counted for database conflicts. See: pgstat_recv_recoveryconflict
+
+---------------------------------------------------------------------
+-- Conflict with VACUUM (snapshot)
+---------------------------------------------------------------------
+1: create table hs_qc_vac1(a int);
+CREATE
+1: insert into hs_qc_vac1 select * from generate_series(1,10);
+INSERT 10
+-1S: begin transaction isolation level repeatable read;
+BEGIN
+-1S: select count(*) from hs_qc_vac1;
+ count 
+-------
+ 10    
+(1 row)
+1: delete from hs_qc_vac1;
+DELETE 10
+1: vacuum hs_qc_vac1;
+VACUUM
+-1S: select count(*) from hs_qc_vac1;
+DETAIL:  User query might have needed to see row versions that must be removed.
+ERROR:  terminating connection due to conflict with recovery
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
+-1Sq: ... <quitting>
+-1S: select max(confl_snapshot) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ max 
+-----
+ 1   
+(1 row)
+
+---------------------------------------------------------------------
+-- Conflict with VACUUM (buffer pin)
+-- VACUUM of page that the standby is still holding buffer pin on, the difference with
+-- the previous case is that here the deleted row is already invisible to the standby.
+---------------------------------------------------------------------
+1: create table hs_qc_vac2(a int);
+CREATE
+1: insert into hs_qc_vac2 values(2);
+INSERT 1
+1: delete from hs_qc_vac2;
+DELETE 1
+-- run select once on the standby, so the next select will fetch data from buffer
+-1S: select * from hs_qc_vac2;
+ a 
+---
+(0 rows)
+-- suspend the standby at where it just unlocks the buffer but still holds the pin
+1: select gp_inject_fault('heapgetpage_after_unlock_buffer', 'suspend','','','hs_qc_vac2',1,1,0,dbid) from gp_segment_configuration where content=0 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-- we'll also make sure the startup process has sent out the signal before we let the standby backend release the pin
+1: select gp_inject_fault('recovery_conflict_bufferpin_signal_sent', 'skip',dbid) from gp_segment_configuration where content=0 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-1S&: select * from hs_qc_vac2;  <waiting ...>
+1: vacuum hs_qc_vac2;
+VACUUM
+-- as mentioned before, make sure startup process has sent the signal, and then let the standby proceed
+1: select gp_wait_until_triggered_fault('recovery_conflict_bufferpin_signal_sent', 1,dbid) from gp_segment_configuration where content=0 and role='m';
+ gp_wait_until_triggered_fault 
+-------------------------------
+ Success:                      
+(1 row)
+1: select gp_inject_fault('recovery_conflict_bufferpin_signal_sent', 'reset',dbid) from gp_segment_configuration where content=0 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+1: select gp_inject_fault('heapgetpage_after_unlock_buffer', 'reset',dbid) from gp_segment_configuration where content=0 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-- should see the conflict
+-1S<:  <... completed>
+ERROR:  canceling statement due to conflict with recovery  (seg0 slice1 127.0.1.1:7005 pid=17044)
+DETAIL:  User was holding shared buffer pin for too long.
+-1Sq: ... <quitting>
+-- XXX: sometimes it shows the number is 2 instead of 1. It still validates the test but it would be nice to know why.
+-1S: select max(confl_bufferpin) > 0 from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ ?column? 
+----------
+ t        
+(1 row)
+
+---------------------------------------------------------------------
+-- Conflict with drop (temp) tablespace
+-- Note: regular user tablespaces won't cause conflict on the standby since the standby cannot create any objects under them.
+---------------------------------------------------------------------
+-- create tablespace
+!\retcode mkdir -p @testtablespace@/hs_tablespace_directory;
+(exited with code 0)
+create tablespace hs_ts location '@testtablespace@/hs_tablespace_directory';
+CREATE
+
+-- some prepartion on the primary
+create table hs_ts_foo (i int, j int) distributed by(i);
+CREATE
+insert into hs_ts_foo select i, i from generate_series(1,800000)i;
+INSERT 800000
+analyze hs_ts_foo;
+ANALYZE
+
+-- make sure the standby won't run too fast and delete the temp files
+select gp_inject_fault('after_open_temp_file', 'suspend',dbid) from gp_segment_configuration where content=1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+
+-- on the standby, run some query that requires workfile, this example is taken
+-- from regress/temp_tablespaces test
+-1S: set temp_tablespaces = hs_ts;
+SET
+-1S: set default_tablespace = hs_ts;
+SET
+-1S: set statement_mem='2MB';
+SET
+-1S&: with a1 as (select * from hs_ts_foo), a2 as (select * from hs_ts_foo) select a1.i xx from a1 inner join a2 on a2.i = a1.i union all select count(a1.i) from a1 inner join a2 on a2.i = a1.i order by xx limit 5;  <waiting ...>
+
+-- drop tablespace, should see conflict on the hot standby
+drop tablespace hs_ts;
+DROP
+select gp_inject_fault('after_open_temp_file', 'reset',dbid) from gp_segment_configuration where content=1 and role='m';
+ gp_inject_fault 
+-----------------
+ Success:        
+(1 row)
+-1S<:  <... completed>
+ERROR:  canceling statement due to conflict with recovery  (seg1 slice3 127.0.1.1:7006 pid=990)
+DETAIL:  User was or might have been using tablespace that must be dropped.
+-1Sq: ... <quitting>
+
+-- conflict has been recorded
+-1S: select max(confl_tablespace) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ max 
+-----
+ 1   
+(1 row)
+
+-- cleanup
+!\retcode rm -rf @testtablespace@/hs_tablespace_directory;
+GP_IGNORE:-- start_ignore
+GP_IGNORE:
+GP_IGNORE:-- end_ignore
+(exited with code 0)
+-- Do one checkpoint. Otherwise if server restarts w/o doing checkpoint (some subsequent
+-- tests might do that), the server would complain it cannot find the directory for hs_ts.
+checkpoint;
+CHECKPOINT
+
+----------------------------------------------------------------
+-- Additional case to show that distributed transaction is not taken into
+-- account w/o the help of restore-point-based distributed snapshot creation.
+----------------------------------------------------------------
+
+1: create table hs_qc_ds1(a int);
+CREATE
+1: insert into hs_qc_ds1 select * from generate_series(1,10);
+INSERT 10
+-- standby starts a repeatable read transaction, runs a local query that
+-- creates a distributed snapshot w/o creating QE.
+-1S: select count(*) from hs_qc_ds1;
+ count 
+-------
+ 10    
+(1 row)
+-1S: begin transaction isolation level repeatable read;
+BEGIN
+-1S: select relname from pg_class where relname = 'hs_qc_ds1';
+ relname   
+-----------
+ hs_qc_ds1 
+(1 row)
+-- primary runs VACUUM
+1: delete from hs_qc_ds1;
+DELETE 10
+1: vacuum hs_qc_ds1;
+VACUUM
+-- The standby query in theory should be cancelled, because it started before
+-- the VACUUM. But in reality, it doesn't, and sees 0 rows, because the QE for the
+-- SELECT below will create more recent local snapshot that does not conflict with
+-- the VACUUM, and sees the result of DELETE+VACUUM.
+-- Note: with the help of restore point, we would be able to create local snapshot
+-- precisely corresponding to each distributed snapshot, and do conflict detection accordingly.
+-1S: select count(*) from hs_qc_ds1;
+ count 
+-------
+ 0     
+(1 row)
+-1S: end;
+END
+
+----------------------------------------------------------------
+-- Test GUC hot_standby_feedback
+----------------------------------------------------------------
+!\retcode gpconfig -c hot_standby_feedback -v on;
+(exited with code 0)
+!\retcode gpstop -u;
+(exited with code 0)
+
+1: create table hs_qc_guc1(a int);
+CREATE
+1: insert into hs_qc_guc1 select * from generate_series(1,10);
+INSERT 10
+
+-1S: begin transaction isolation level repeatable read;
+BEGIN
+-1S: select * from hs_qc_guc1;
+ a  
+----
+ 1  
+ 10 
+ 2  
+ 3  
+ 4  
+ 5  
+ 6  
+ 7  
+ 8  
+ 9  
+(10 rows)
+
+-- VACUUM won't cleanup this table since the standby still sees it
+1: delete from hs_qc_guc1;
+DELETE 10
+1: vacuum hs_qc_guc1;
+VACUUM
+
+-- hot standby can still see those rows
+-1S: select * from hs_qc_guc1;
+ a  
+----
+ 1  
+ 10 
+ 2  
+ 3  
+ 4  
+ 5  
+ 6  
+ 7  
+ 8  
+ 9  
+(10 rows)
+
+-- after the conflicting read transaction ends, the next VACUUM will successfully vacuum the table
+-1S: end;
+END
+1: vacuum hs_qc_guc1;
+VACUUM
+-1S: select * from hs_qc_guc1;
+ a 
+---
+(0 rows)
+-1Sq: ... <quitting>
+
+!\retcode gpconfig -r hot_standby_feedback;
+(exited with code 0)
+!\retcode gpstop -u;
+(exited with code 0)
+
+----------------------------------------------------------------
+-- Test GUC vacuum_defer_cleanup_age
+----------------------------------------------------------------
+-- Use a GUC value that's not 0, so VACUUM does not clean up
+-- recent dead rows that the hot standby might be still seeing.
+!\retcode gpconfig -c vacuum_defer_cleanup_age -v 1;
+(exited with code 0)
+!\retcode gpstop -u;
+(exited with code 0)
+
+1: create table hs_qc_guc2(a int);
+CREATE
+1: insert into hs_qc_guc2 select * from generate_series(1,10);
+INSERT 10
+
+-1S: begin transaction isolation level repeatable read;
+BEGIN
+-1S: select count(*) from hs_qc_guc2;
+ count 
+-------
+ 10    
+(1 row)
+
+-- VACUUM won't cleanup this table since the DELETE is still within vacuum_defer_cleanup_age
+1: delete from hs_qc_guc2;
+DELETE 10
+1: vacuum hs_qc_guc2;
+VACUUM
+
+-- showing all rows are deleted but not vacuumed
+1: select count(*) from hs_qc_guc2;
+ count 
+-------
+ 0     
+(1 row)
+1: set gp_select_invisible to on;
+SET
+1: select count(*) from hs_qc_guc2;
+ count 
+-------
+ 10    
+(1 row)
+
+-- hot standby can still query the table
+-1S: select count(*) from hs_qc_guc2;
+ count 
+-------
+ 10    
+(1 row)
+
+-- only if the age is reached, hot standby will see the same conflict as before
+1: create temp table tt1(a int);
+CREATE
+1: vacuum hs_qc_guc2;
+VACUUM
+-1S: select count(*) from hs_qc_guc2;
+ERROR:  terminating connection due to conflict with recovery  (seg0 slice1 127.0.1.1:7005 pid=18713)
+DETAIL:  User query might have needed to see row versions that must be removed.
+HINT:  In a moment you should be able to reconnect to the database and repeat your command.
+-1Sq: ... <quitting>
+-1S: select max(confl_snapshot) from gp_stat_database_conflicts where datname = 'isolation2-hot-standby';
+ max 
+-----
+ 2   
+(1 row)
+
+!\retcode gpconfig -r vacuum_defer_cleanup_age;
+(exited with code 0)
+!\retcode gpstop -u;
+(exited with code 0)
+
diff --git a/src/test/isolation2/output/resgroup/resgroup_io_limit.source b/src/test/isolation2/output/resgroup/resgroup_io_limit.source
index 610c5b29b13..ea7957bc1cf 100644
--- a/src/test/isolation2/output/resgroup/resgroup_io_limit.source
+++ b/src/test/isolation2/output/resgroup/resgroup_io_limit.source
@@ -1,3 +1,8 @@
+-- different bison version may have different log format
+-- start_matchignore
+-- m/^ERROR:  io limit: syntax error.*\n/
+-- end_matchignore
+
 -- positive: io limit with correct syntax
 CREATE RESOURCE GROUP rg_test_group1 WITH (concurrency=10, cpu_max_percent=10, io_limit='pg_default:rbps=1000,wbps=1000,riops=1000,wiops=1000');
 CREATE
@@ -43,23 +48,31 @@ SELECT check_cgroup_io_max('rg_test_group4', 'pg_default', 'rbps=1048576000 wbps
 -- negative: io limit with incorrect syntax
 -- * must be unique tablespace
 CREATE RESOURCE GROUP rg_test_group WITH (concurrency=10, cpu_max_percent=10, io_limit='pg_default:rbps=1000,wbps=1000,riops=1000,wiops=1000;*:wbps=1000');
-ERROR:  io limit: tablespace '*' cannot be used with other tablespaces  (seg0 127.0.0.2:6000 pid=62791)
+ERROR:  io limit: tablespace '*' cannot be used with other tablespaces
+HINT:   pg_default:rbps=1000,wbps=1000,riops=1000,wiops=1000;*:wbps=1000
+                                                                    ^
 
 -- tail ;
 CREATE RESOURCE GROUP rg_test_group WITH (concurrency=10, cpu_max_percent=10, io_limit='pg_default:rbps=1000,wbps=1000,riops=1000,wiops=1000;');
-ERROR:  syntax error  (seg0 127.0.0.2:6000 pid=62791)
+ERROR:  io limit: syntax error, unexpected end of file, expecting STAR or ID or NUMBER
+HINT:   pg_default:rbps=1000,wbps=1000,riops=1000,wiops=1000;
+                                                            ^
 
 -- tail ,
 CREATE RESOURCE GROUP rg_test_group WITH (concurrency=10, cpu_max_percent=10, io_limit='pg_default:rbps=1000,wbps=1000,riops=1000,');
-ERROR:  syntax error  (seg1 127.0.0.2:6001 pid=62792)
+ERROR:  io limit: syntax error, unexpected end of file, expecting IO_KEY
+HINT:   pg_default:rbps=1000,wbps=1000,riops=1000,
+                                                 ^
 
 -- wrong key
 CREATE RESOURCE GROUP rg_test_group WITH (concurrency=10, cpu_max_percent=10, io_limit='pg_default:rrbps=1000');
-ERROR:  syntax error  (seg0 127.0.0.2:6000 pid=62791)
+ERROR:  io limit: syntax error, unexpected ID, expecting IO_KEY
+HINT:   pg_default:rrbps=1000
+                   ^
 
 -- wrong tablespace name
 CREATE RESOURCE GROUP rg_test_group WITH (concurrency=10, cpu_max_percent=10, io_limit='pgdefault:rbps=1000,wbps=1000,riops=1000');
-ERROR:  tablespace "pgdefault" does not exist  (seg0 127.0.0.2:6000 pid=62791)
+ERROR:  tablespace "pgdefault" does not exist
 
 -- use another tablespace
 select mkdir('@testtablespace@/rg_io_limit_ts_1') from gp_dist_random('gp_id') intersect select mkdir('@testtablespace@/rg_io_limit_ts_1') from gp_id;
@@ -80,6 +93,11 @@ SELECT check_cgroup_io_max('rg_test_group5', 'rg_io_limit_ts_1', 'rbps=104857600
  t                   
 (1 row)
 
+-- try to drop test tablespace
+DROP TABLESPACE rg_io_limit_ts_1;
+ERROR:  io limit: following resource groups depend on tablespace rg_io_limit_ts_1: rg_test_group5
+HINT:  you can remove those resource groups or remove tablespace rg_io_limit_ts_1 from io_limit of those resource groups.
+
 ALTER RESOURCE GROUP rg_test_group5 SET io_limit 'rg_io_limit_ts_1:rbps=1000,wbps=1000';
 ALTER
 
@@ -89,6 +107,15 @@ SELECT check_cgroup_io_max('rg_test_group5', 'rg_io_limit_ts_1', 'rbps=104857600
  t                   
 (1 row)
 
+ALTER RESOURCE GROUP rg_test_group5 SET concurrency 1;
+ALTER
+
+SELECT check_clear_io_max('rg_test_group5');
+ check_clear_io_max 
+--------------------
+ t                  
+(1 row)
+
 -- fault injector
 SELECT gp_inject_fault('create_resource_group_fail', 'error', 1);
  gp_inject_fault 
@@ -110,8 +137,27 @@ SELECT gp_inject_fault('create_resource_group_fail', 'reset', 1);
  Success:        
 (1 row)
 
--- start_ignore
+-- clear limitations
+CREATE RESOURCE GROUP rg_test_group7 WITH (concurrency=10, cpu_max_percent=10, io_limit='rg_io_limit_ts_1:rbps=1000,wbps=1000');
+CREATE
+
+SELECT check_cgroup_io_max('rg_test_group7', 'rg_io_limit_ts_1', 'rbps=1048576000 wbps=1048576000 riops=max wiops=max');
+ check_cgroup_io_max 
+---------------------
+ t                   
+(1 row)
+
+ALTER RESOURCE GROUP rg_test_group7 SET IO_LIMIT '-1';
+ALTER
+
+SELECT check_io_max_empty('rg_test_group7');
+ check_io_max_empty 
+--------------------
+ t                  
+(1 row)
+
 -- view
+-- start_ignore
 SELECT * from gp_toolkit.gp_resgroup_iostats_per_host;
  rsgname        | hostname | tablespace       | rbps | wbps | riops | wiops 
 ----------------+----------+------------------+------+------+-------+-------
@@ -123,6 +169,12 @@ SELECT * from gp_toolkit.gp_resgroup_iostats_per_host;
 (5 rows)
 -- end_ignore
 
+SELECT count(*) > 0 as r from gp_toolkit.gp_resgroup_iostats_per_host;
+ r    
+------
+ t    
+(1 row)
+
 -- clean
 DROP RESOURCE GROUP rg_test_group1;
 DROP
@@ -134,3 +186,14 @@ DROP RESOURCE GROUP rg_test_group4;
 DROP
 DROP RESOURCE GROUP rg_test_group5;
 DROP
+DROP RESOURCE GROUP rg_test_group7;
+DROP
+
+DROP TABLESPACE rg_io_limit_ts_1;
+DROP
+
+select rmdir('@testtablespace@/rg_io_limit_ts_1') from gp_dist_random('gp_id') intersect select rmdir('@testtablespace@/rg_io_limit_ts_1') from gp_id;
+ rmdir 
+-------
+ t     
+(1 row)
diff --git a/src/test/isolation2/output/uao/fast_analyze.source b/src/test/isolation2/output/uao/fast_analyze.source
new file mode 100644
index 00000000000..7f6a133e18b
--- /dev/null
+++ b/src/test/isolation2/output/uao/fast_analyze.source
@@ -0,0 +1,632 @@
+--
+-- Test AO/CO sampling method.
+--
+-- These tests ensure that we achieve our ANALYZE targets for AO/CO tables.
+--
+CREATE TABLE fast_analyze_@amname@_1(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+CREATE
+
+-- Stats target info shows that we will sample 300 * (100) rows.
+SHOW default_statistics_target;
+ default_statistics_target 
+---------------------------
+ 100                       
+(1 row)
+SELECT attstattarget FROM pg_attribute WHERE attrelid = 'fast_analyze_@amname@_1'::regclass AND attname IN ('i', 'j');
+ attstattarget 
+---------------
+ -1            
+ -1            
+(2 rows)
+
+--------------------------------------------------------------------------------
+-- Scenario 1:
+-- We have MORE than 300 * default_statistics_target = 30k rows for a 2 int table,
+-- spread across 3 segments, with no aborted rows [2 subcases -> blkdir and
+-- non-blkdir].
+-- Expectation: We have collected 30k live rows.
+--------------------------------------------------------------------------------
+
+-- (a) Without blkdir subcase
+
+-- Insert 10.5k rows in each QE.
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+1: INSERT INTO fast_analyze_@amname@_1 SELECT i, 2 FROM generate_series(1, 10500) i;
+INSERT 10500
+2: INSERT INTO fast_analyze_@amname@_1 SELECT i, 1 FROM generate_series(1, 10500) i;
+INSERT 10500
+3: INSERT INTO fast_analyze_@amname@_1 SELECT i, 5 FROM generate_series(1, 10500) i;
+INSERT 10500
+1: COMMIT;
+COMMIT
+2: COMMIT;
+COMMIT
+3: COMMIT;
+COMMIT
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_1;
+ANALYZE
+
+-- We have sampled 10k live rows.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                               
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10000' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10000' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10000' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_1(i);
+CREATE
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_1;
+ANALYZE
+
+-- We have sampled 10k live rows from each QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                               
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10000' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10000' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10000' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+--------------------------------------------------------------------------------
+-- Scenario 2:
+-- We have LESS than 300 * default_statistics_target = 30k rows for a 2 int table,
+-- spread across 3 segments, with no aborted rows [2 subcases -> blkdir and
+-- non-blkdir].
+-- Expectation: We have collected number of live rows = total tupcount of table.
+--------------------------------------------------------------------------------
+
+CREATE TABLE fast_analyze_@amname@_2(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+CREATE
+
+-- (a) Without blkdir subcase
+
+-- Insert 10 rows in each QE.
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+1: INSERT INTO fast_analyze_@amname@_2 SELECT i, 2 FROM generate_series(1, 10) i;
+INSERT 10
+2: INSERT INTO fast_analyze_@amname@_2 SELECT i, 1 FROM generate_series(1, 10) i;
+INSERT 10
+3: INSERT INTO fast_analyze_@amname@_2 SELECT i, 5 FROM generate_series(1, 10) i;
+INSERT 10
+1: COMMIT;
+COMMIT
+2: COMMIT;
+COMMIT
+3: COMMIT;
+COMMIT
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_2;
+ANALYZE
+
+-- We have sampled 10 live rows from each QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                            
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_2(i);
+CREATE
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_2;
+ANALYZE
+
+-- We have sampled 10 live rows from each QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                            
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'triggered'  num times hit:'10' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+--------------------------------------------------------------------------------
+-- Scenario 3:
+-- We have ALL aborted rows [2 subcases -> blkdir and non-blkdir].
+-- Expectation: We have not sampled any live rows.
+--------------------------------------------------------------------------------
+
+CREATE TABLE fast_analyze_@amname@_3(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+CREATE
+
+-- (a) Without blkdir subcase
+
+-- Insert 10 rows in each QE.
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+1: INSERT INTO fast_analyze_@amname@_3 SELECT i, 2 FROM generate_series(1, 10) i;
+INSERT 10
+2: INSERT INTO fast_analyze_@amname@_3 SELECT i, 1 FROM generate_series(1, 10) i;
+INSERT 10
+3: INSERT INTO fast_analyze_@amname@_3 SELECT i, 5 FROM generate_series(1, 10) i;
+INSERT 10
+1: ABORT;
+ABORT
+2: ABORT;
+ABORT
+3: ABORT;
+ABORT
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_3;
+ANALYZE
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_3(i);
+CREATE
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_3;
+ANALYZE
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+--------------------------------------------------------------------------------
+-- Scenario 4:
+-- We have ALL deleted rows [2 subcases -> blkdir and non-blkdir].
+-- Expectation: We have not collected any live rows.
+--------------------------------------------------------------------------------
+
+CREATE TABLE fast_analyze_@amname@_4(i int, j int) USING @amname@ DISTRIBUTED BY (j);
+CREATE
+
+-- (a) Without blkdir subcase
+
+-- Insert 10 rows in each QE.
+1: BEGIN;
+BEGIN
+2: BEGIN;
+BEGIN
+3: BEGIN;
+BEGIN
+1: INSERT INTO fast_analyze_@amname@_4 SELECT i, 2 FROM generate_series(1, 10) i;
+INSERT 10
+2: INSERT INTO fast_analyze_@amname@_4 SELECT i, 1 FROM generate_series(1, 10) i;
+INSERT 10
+3: INSERT INTO fast_analyze_@amname@_4 SELECT i, 5 FROM generate_series(1, 10) i;
+INSERT 10
+1: COMMIT;
+COMMIT
+2: COMMIT;
+COMMIT
+3: COMMIT;
+COMMIT
+-- Delete all rows.
+DELETE FROM fast_analyze_@amname@_4;
+DELETE 30
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_4;
+ANALYZE
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+-- (b) With blkdir subcase
+
+CREATE INDEX ON fast_analyze_@amname@_4(i);
+CREATE
+
+SELECT gp_inject_fault_infinite('returned_sample_row', 'skip', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault_infinite 
+--------------------------
+ Success:                 
+ Success:                 
+ Success:                 
+(3 rows)
+
+ANALYZE fast_analyze_@amname@_4;
+ANALYZE
+
+-- We have not sampled any live rows on any QE.
+SELECT gp_inject_fault('returned_sample_row', 'status', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault                                                                                                                                                                                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+ Success: fault name:'returned_sample_row' fault type:'skip' ddl statement:'' database name:'' table name:'' start occurrence:'1' end occurrence:'-1' extra arg:'0' fault injection state:'set'  num times hit:'0' 
+ 
+(3 rows)
+
+SELECT gp_inject_fault('returned_sample_row', 'reset', dbid) FROM gp_segment_configuration WHERE content != -1 AND role = 'p';
+ gp_inject_fault 
+-----------------
+ Success:        
+ Success:        
+ Success:        
+(3 rows)
+
+DROP TABLE fast_analyze_@amname@_1;
+DROP
+DROP TABLE fast_analyze_@amname@_2;
+DROP
+DROP TABLE fast_analyze_@amname@_3;
+DROP
+DROP TABLE fast_analyze_@amname@_4;
+DROP
+
+--
+-- The following tests ensure fast analyze function to work
+-- with multi-segfiles tables under concurrent inserts.
+--
+
+create table analyze_@amname@ (id int, a int, b inet, c inet) using @amname@ with (compresstype=zlib, compresslevel=3);
+CREATE
+
+insert into analyze_@amname@ select 2, i, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text))::inet, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text))::inet from generate_series(1,30000)i;
+INSERT 30000
+
+insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+-- test ANALYZE after concurrent inserts commit
+
+1: begin;
+BEGIN
+1: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+2: begin;
+BEGIN
+2: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+3: begin;
+BEGIN
+3: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+4: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+5: analyze analyze_@amname@;
+ANALYZE
+
+1: commit;
+COMMIT
+2: commit;
+COMMIT
+3: abort;
+ABORT
+
+1: analyze analyze_@amname@;
+ANALYZE
+
+-- test aoblkdir based ANALYZE
+
+create index on analyze_@amname@(id);
+CREATE
+
+1: begin;
+BEGIN
+1: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+2: begin;
+BEGIN
+2: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+3: begin;
+BEGIN
+3: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+4: insert into analyze_@amname@ select * from analyze_@amname@ limit 1000;
+INSERT 1000
+
+5: analyze analyze_@amname@;
+ANALYZE
+
+1: commit;
+COMMIT
+2: commit;
+COMMIT
+3: abort;
+ABORT
+
+1: analyze analyze_@amname@;
+ANALYZE
+
+drop table analyze_@amname@;
+DROP
+
+-- test more data and stability, note, it could take a little long time
+
+create table analyze_@amname@_2 (id int, a int, b inet, c inet) using @amname@ with (compresstype=zlib, compresslevel=3);
+CREATE
+insert into analyze_@amname@_2 select 2, i, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text))::inet, (select ((i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text || '.' || (i%255)::text))::inet from generate_series(1,1000)i;
+INSERT 1000
+
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 1000
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 2000
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 4000
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 8000
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 16000
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 32000
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 64000
+insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 128000
+
+1: begin;
+BEGIN
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 256000
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 256000
+
+1: commit;
+COMMIT
+
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+
+1: begin;
+BEGIN
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 768000
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 768000
+
+1: abort;
+ABORT
+
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+
+-- test with aoblkdir
+
+create index on analyze_@amname@_2(a);
+CREATE
+
+1: begin;
+BEGIN
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 1536000
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 1536000
+
+1: commit;
+COMMIT
+
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+
+1: begin;
+BEGIN
+1: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 4608000
+
+2: insert into analyze_@amname@_2 select * from analyze_@amname@_2;
+INSERT 4608000
+
+1: abort;
+ABORT
+
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+1: analyze analyze_@amname@_2;
+ANALYZE
+
+drop table analyze_@amname@_2;
+DROP
diff --git a/src/test/isolation2/sql/.gitignore b/src/test/isolation2/sql/.gitignore
index 361b986e18d..bfc3709082c 100644
--- a/src/test/isolation2/sql/.gitignore
+++ b/src/test/isolation2/sql/.gitignore
@@ -7,6 +7,7 @@
 /pt_io_in_progress_deadlock.sql
 /distributed_snapshot.sql
 /local_directory_table_mixed.sql
+/hot_standby/query_conflict.sql
 
 # ignores including sub-directories
 autovacuum-analyze.sql
diff --git a/src/test/isolation2/sql/ao_blkdir.sql b/src/test/isolation2/sql/ao_blkdir.sql
index cd8f1b662d0..cff529876c1 100644
--- a/src/test/isolation2/sql/ao_blkdir.sql
+++ b/src/test/isolation2/sql/ao_blkdir.sql
@@ -96,6 +96,81 @@ WHERE gp_segment_id = 0 ORDER BY 1,2,3,4,5;
 
 DROP TABLE ao_blkdir_test;
 
+-- Test `tupcount` in pg_aoseg == sum of number of `row_count` across all
+-- aoblkdir entries for each segno. Test with commits, aborts and deletes.
+
+-- Case1: without VACUUM ANALYZE
+CREATE TABLE ao_blkdir_test_rowcount(i int, j int) USING ao_row DISTRIBUTED BY (j);
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+4: BEGIN;
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+3: ABORT;
+3: BEGIN;
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 40) i;
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+1: COMMIT;
+2: COMMIT;
+3: COMMIT;
+4: COMMIT;
+DELETE FROM ao_blkdir_test_rowcount WHERE j = 7;
+
+CREATE INDEX ao_blkdir_test_rowcount_idx ON ao_blkdir_test_rowcount(i);
+
+SELECT segno, sum(row_count) AS totalrows FROM
+  (SELECT (gp_toolkit.__gp_aoblkdir('ao_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id')
+      WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno;
+SELECT segno, sum(tupcount) AS totalrows FROM
+  gp_toolkit.__gp_aoseg('ao_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno;
+
+-- Case2: with VACUUM ANALYZE
+DROP TABLE ao_blkdir_test_rowcount;
+CREATE TABLE ao_blkdir_test_rowcount(i int, j int) USING ao_row DISTRIBUTED BY (j);
+CREATE INDEX ao_blkdir_test_rowcount_idx ON ao_blkdir_test_rowcount(i);
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+4: BEGIN;
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM ao_blkdir_test_rowcount;
+1: INSERT INTO ao_blkdir_test_rowcount SELECT i, 2 FROM ao_blkdir_test_rowcount;
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM ao_blkdir_test_rowcount;
+2: INSERT INTO ao_blkdir_test_rowcount SELECT i, 3 FROM ao_blkdir_test_rowcount;
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM ao_blkdir_test_rowcount;
+3: INSERT INTO ao_blkdir_test_rowcount SELECT i, 4 FROM ao_blkdir_test_rowcount;
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM ao_blkdir_test_rowcount;
+4: INSERT INTO ao_blkdir_test_rowcount SELECT i, 7 FROM ao_blkdir_test_rowcount;
+1: COMMIT;
+2: COMMIT;
+3: ABORT;
+4: COMMIT;
+
+DELETE FROM ao_blkdir_test_rowcount WHERE j = 7;
+VACUUM ANALYZE ao_blkdir_test_rowcount;
+
+SELECT segno, sum(row_count) AS totalrows FROM
+  (SELECT (gp_toolkit.__gp_aoblkdir('ao_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id')
+      WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno;
+SELECT segno, sum(tupcount) AS totalrows FROM
+  gp_toolkit.__gp_aoseg('ao_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno;
+
+UPDATE ao_blkdir_test_rowcount SET i = i + 1;
+VACUUM ANALYZE ao_blkdir_test_rowcount;
+
+SELECT segno, sum(row_count) AS totalrows FROM
+  (SELECT (gp_toolkit.__gp_aoblkdir('ao_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id')
+      WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno;
+SELECT segno, sum(tupcount) AS totalrows FROM
+  gp_toolkit.__gp_aoseg('ao_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno;
+
+DROP TABLE ao_blkdir_test_rowcount;
+
 --------------------------------------------------------------------------------
 -- AOCO tables
 --------------------------------------------------------------------------------
@@ -203,3 +278,79 @@ FROM gp_segment_configuration WHERE role = 'p' AND content = 0;
 4: INSERT INTO aoco_blkdir_test VALUES (2, 2);
 
 DROP TABLE aoco_blkdir_test;
+
+-- Test `tupcount` in pg_ao(cs)seg == sum of number of `row_count` across all
+-- aoblkdir entries for each <segno, columngroup_no>. Test with commits, aborts
+-- and deletes.
+
+-- Case1: without VACUUM ANALYZE
+CREATE TABLE aoco_blkdir_test_rowcount(i int, j int) USING ao_column DISTRIBUTED BY (j);
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+4: BEGIN;
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+3: ABORT;
+3: BEGIN;
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 40) i;
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+1: COMMIT;
+2: COMMIT;
+3: COMMIT;
+4: COMMIT;
+DELETE FROM aoco_blkdir_test_rowcount WHERE j = 7;
+
+CREATE INDEX aoco_blkdir_test_rowcount_idx ON aoco_blkdir_test_rowcount(i);
+
+SELECT segno, columngroup_no, sum(row_count) AS totalrows FROM
+    (SELECT (gp_toolkit.__gp_aoblkdir('aoco_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id')
+     WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno, columngroup_no;
+SELECT segno, column_num, sum(tupcount) AS totalrows FROM
+    gp_toolkit.__gp_aocsseg('aoco_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno, column_num;
+
+-- Case2: with VACUUM ANALYZE
+DROP TABLE aoco_blkdir_test_rowcount;
+CREATE TABLE aoco_blkdir_test_rowcount(i int, j int) USING ao_column DISTRIBUTED BY (j);
+CREATE INDEX aoco_blkdir_test_rowcount_idx ON aoco_blkdir_test_rowcount(i);
+1: BEGIN;
+2: BEGIN;
+3: BEGIN;
+4: BEGIN;
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM generate_series(1, 10) i;
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM aoco_blkdir_test_rowcount;
+1: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 2 FROM aoco_blkdir_test_rowcount;
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM generate_series(1, 20) i;
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM aoco_blkdir_test_rowcount;
+2: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 3 FROM aoco_blkdir_test_rowcount;
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM generate_series(1, 30) i;
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM aoco_blkdir_test_rowcount;
+3: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 4 FROM aoco_blkdir_test_rowcount;
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM generate_series(1, 50) i;
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM aoco_blkdir_test_rowcount;
+4: INSERT INTO aoco_blkdir_test_rowcount SELECT i, 7 FROM aoco_blkdir_test_rowcount;
+1: COMMIT;
+2: COMMIT;
+3: ABORT;
+4: COMMIT;
+
+DELETE FROM aoco_blkdir_test_rowcount WHERE j = 7;
+VACUUM ANALYZE aoco_blkdir_test_rowcount;
+
+SELECT segno, columngroup_no, sum(row_count) AS totalrows FROM
+    (SELECT (gp_toolkit.__gp_aoblkdir('aoco_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id')
+     WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno, columngroup_no;
+SELECT segno, column_num, sum(tupcount) AS totalrows FROM
+    gp_toolkit.__gp_aocsseg('aoco_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno, column_num;
+
+UPDATE aoco_blkdir_test_rowcount SET i = i + 1;
+VACUUM ANALYZE aoco_blkdir_test_rowcount;
+
+SELECT segno, columngroup_no, sum(row_count) AS totalrows FROM
+    (SELECT (gp_toolkit.__gp_aoblkdir('aoco_blkdir_test_rowcount')).* FROM gp_dist_random('gp_id')
+     WHERE gp_segment_id = 0)s GROUP BY segno, columngroup_no ORDER BY segno, columngroup_no;
+SELECT segno, column_num, sum(tupcount) AS totalrows FROM
+    gp_toolkit.__gp_aocsseg('aoco_blkdir_test_rowcount') WHERE segment_id = 0 GROUP BY segno, column_num;
+
+DROP TABLE aoco_blkdir_test_rowcount;
diff --git a/src/test/isolation2/sql/hot_standby/basic.sql b/src/test/isolation2/sql/hot_standby/basic.sql
new file mode 100644
index 00000000000..a900b38a29c
--- /dev/null
+++ b/src/test/isolation2/sql/hot_standby/basic.sql
@@ -0,0 +1,95 @@
+-- Tests for basic query dispatch on a hot standy.
+
+-- hot standby must show on and the sync mode is remote_apply for the tests to make sense
+-1S: show hot_standby;
+-1S: show synchronous_commit;
+
+-- will be checking if QD/QE info looks good
+-1S: select id, type, content, port from gp_backend_info();
+
+----------------------------------------------------------------
+-- Test: basic query dispatch
+----------------------------------------------------------------
+create table hs_t1(a int);
+create table hs_t2(a int);
+
+-- standby should see the results for 2pc immediately.
+insert into hs_t1 select * from generate_series(1,10);
+-1S: select * from hs_t1;
+-- standby won't see results for the last 1pc immediately because the standby QD
+-- isn't aware of of it so its distributed snapshot doesn't include the 1pc, but
+-- as long as another 2pc comes it will be able to see the previous 1pc. Wee 
+-- tolerate this case in the mirrored cluster setup.
+insert into hs_t2 values(1);
+-1S: select * from hs_t2;
+-- any following 2pc will make the 1pc visible
+create temp table tt(a int);
+-1S: select * from hs_t2;
+
+-- we have three QEs launched on the mirror segments.
+-- note that the first QE on a segment is still a "writer" because we
+-- need it to manage locks, same as read-only queries on a primary QD.
+-1S: select id, type, content, port from gp_backend_info();
+
+-- should have parallel readers launched
+-1S: select * from hs_t1 join (select * from hs_t2) hs_t2 on (hs_t1 = hs_t2);
+-1S: select id, type, content, port from gp_backend_info();
+
+-- now a singleton reader added too
+-1S: select * from hs_t1 join (select oid::int from pg_class) hs_t2 on (hs_t1 = hs_t2);
+-1S: select id, type, content, port from gp_backend_info();
+
+-- un-committed result should not be seen by the standby
+begin;
+insert into hs_t1 select * from generate_series(11,20);
+
+-- standby should only see 1...10
+-1S: select * from hs_t1;
+
+end;
+
+-- standby should see 1...20 now
+-1S: select * from hs_t1;
+
+----------------------------------------------------------------
+-- Test: other things that a hot standby can do.
+--
+-- More refer to regress test 'hs_standby_allowed'.
+----------------------------------------------------------------
+-- set/reset and show GUC
+-1S: set optimizer = on;
+-1S: show optimizer;
+-1S: reset optimizer;
+-- copy command
+-1S: copy hs_t1 to '/tmp/hs_copyto.csv' csv null '';
+-- query catalogs
+-1S: select count(*) from pg_class where relname = 'hs_t1';
+-1S: select dbid,content,role,preferred_role,mode,status from gp_segment_configuration where dbid = current_setting('gp_dbid')::integer;
+-- checkpoint is allowed on standby but a restart point is created instead
+-1S: checkpoint;
+
+----------------------------------------------------------------
+-- Test: things that can't be done on a hot standby:
+-- no DML, DDL or anything that generates WAL.
+--
+-- More refer to regress test 'hs_standby_disallowed'.
+----------------------------------------------------------------
+-1S: insert into hs_t1 values(1);
+-1S: delete from hs_t1;
+-1S: update hs_t1 set a = 0;
+-1S: create table hs_t2(a int);
+-1S: create database hs_db;
+-1S: vacuum hs_t1;
+
+--
+-- No hintbit WAL generation in SELECT.
+--
+create table hs_nohintbit(a int) distributed by (a);
+insert into hs_nohintbit select generate_series (1, 10);
+-- flush the data to disk
+checkpoint;
+
+-1S: set gp_disable_tuple_hints=off;
+-- no WAL is being generated (otherwise an error would occur "cannot make new WAL entries during recovery")
+-1S: SELECT count(*) FROM hs_nohintbit;
+
diff --git a/src/test/isolation2/sql/hot_standby/faults.sql b/src/test/isolation2/sql/hot_standby/faults.sql
new file mode 100644
index 00000000000..b1be240916a
--- /dev/null
+++ b/src/test/isolation2/sql/hot_standby/faults.sql
@@ -0,0 +1,126 @@
+-- Test system faults scenarios
+
+-- start_matchsubs
+--
+-- m/Is the server running on host.*/
+-- s/Is the server running on host "\d+.\d+.\d+.\d+" and accepting/Is the server running on host <IP> and accepting/
+-- m/(seg\d+ \d+.\d+.\d+.\d+:\d+)/
+-- s/(.*)/(seg<ID> IP:PORT)/
+-- m/ERROR:  connection to dbid 1 .*:7000 failed .*/
+-- s/ERROR:  connection to dbid 1 .*:7000 failed .*/ERROR:  connection to dbid 1 <host>:7000 failed/
+--
+-- end_matchsubs
+
+-- Let FTS detect/declare failure sooner
+!\retcode gpconfig -c gp_fts_probe_interval -v 10 --coordinatoronly;
+!\retcode gpstop -u;
+
+create table hs_failover(a int);
+insert into hs_failover select * from generate_series(1,10);
+-1S: select * from hs_failover;
+
+----------------------------------------------------------------
+-- Mirror segment fails
+----------------------------------------------------------------
+select pg_ctl(datadir, 'stop', 'immediate') from gp_segment_configuration where content=1 and role = 'm';
+
+-- make sure mirror is detected down
+create temp table hs_tt(a int);
+select gp_request_fts_probe_scan();
+
+-- will not succeed
+-1S: select * from hs_failover;
+-1Sq:
+
+-- recovery
+!\retcode gprecoverseg -aF;
+
+-- sync-up
+select wait_until_all_segments_synchronized();
+
+-- works now
+-1S: select * from hs_failover;
+
+----------------------------------------------------------------
+-- Primary segment fails
+----------------------------------------------------------------
+-- inject a fault where the mirror gets out of recovery
+select gp_inject_fault('out_of_recovery_in_startupxlog', 'skip', dbid) from gp_segment_configuration where content = 1 and role = 'm';
+
+select pg_ctl(datadir, 'stop', 'immediate') from gp_segment_configuration where content=1 and role = 'p';
+select gp_request_fts_probe_scan();
+
+-- make sure failover happens
+select dbid, content, role, preferred_role, mode, status from gp_segment_configuration where content = 1;
+select gp_wait_until_triggered_fault('out_of_recovery_in_startupxlog', 1, dbid) from gp_segment_configuration where content = 1 and role = 'p';
+select gp_inject_fault('out_of_recovery_in_startupxlog', 'reset', dbid) from gp_segment_configuration where content = 1 and role = 'p';
+
+-- On an existing standby connection, query will run but it is dispatched to the previous mirror
+-- in an existing gang. That mirror is now a primary, so it will complain and the query fails.
+-1S: select * from hs_failover;
+-1Sq:
+-- start_ignore
+-- will fail due to downed mirror (previous primary)
+-1S: select * from hs_failover;
+-1Sq:
+-- end_ignore
+
+-- bring the downed mirror up
+!\retcode gprecoverseg -aF;
+select wait_until_all_segments_synchronized();
+
+-- mirror is up
+-1S: select dbid, content, role, preferred_role, mode, status from gp_segment_configuration where content = 1;
+
+-- now the query will succeed
+-1S: select * from hs_failover;
+-1Sq:
+
+-- re-balance, bring the segments to their preferred roles
+!\retcode gprecoverseg -ar;
+select wait_until_all_segments_synchronized();
+-1S: select dbid, content, role, preferred_role, mode, status from gp_segment_configuration where content = 1;
+
+-- query runs fine still
+-1S: select * from hs_failover;
+
+----------------------------------------------------------------
+-- DTX recovery
+----------------------------------------------------------------
+-- skip FTS probe to prevent unexpected mirror promotion
+1: select gp_inject_fault_infinite('fts_probe', 'skip', dbid) from gp_segment_configuration where role='p' and content=-1;
+
+1: create table tt_hs_dtx(a int);
+
+-- inject fault to repeatedly fail the COMMIT PREPARE phase of 2PC, which ensures that the dtx cannot finish even by the dtx recovery process. 
+select gp_inject_fault_infinite('finish_commit_prepared', 'error', dbid) from gp_segment_configuration where content=1 and role='p';
+
+-- session 1 on primary QD tries to commit a DTX, but cannot finish due to the fault on a QE
+1&: insert into tt_hs_dtx select * from generate_series(1,10);
+
+-- inject a panic on primary QD, essentially restarts the primary QD
+2: select gp_inject_fault('before_read_command', 'panic', dbid) from gp_segment_configuration where content=-1 and role='p';
+2: select 1;
+
+1<:
+1q:
+2q:
+
+-- standby QD can still run query
+-1S: select * from hs_failover;
+-- it cannot see rows from the in-doubt DTX
+-1S: select * from tt_hs_dtx;
+
+-- let the failed dtx be recovered, also make sure the standby replays the forget record which signals the completion of the dtx
+-1S: select gp_inject_fault('redoDistributedForgetCommitRecord', 'skip', dbid) from gp_segment_configuration where content=-1 and role='m';
+-1S: select gp_inject_fault_infinite('finish_commit_prepared', 'reset', dbid) from gp_segment_configuration where content=1 and role='p';
+-1S: select gp_wait_until_triggered_fault('redoDistributedForgetCommitRecord', 1, dbid) from gp_segment_configuration where content=-1 and role='m';
+-1S: select gp_inject_fault('redoDistributedForgetCommitRecord', 'reset', dbid) from gp_segment_configuration where content=-1 and role='m';
+
+-- standby should see the rows from the in-doubt DTX now
+-1S: select * from tt_hs_dtx;
+
+-1S: select wait_until_all_segments_synchronized();
+1: select gp_inject_fault('before_read_command', 'reset', dbid) from gp_segment_configuration where content=-1 and role='p';
+1: select gp_inject_fault('fts_probe', 'reset', dbid) from gp_segment_configuration where role='p' and content=-1;
+
diff --git a/src/test/isolation2/sql/hot_standby/setup.sql b/src/test/isolation2/sql/hot_standby/setup.sql
new file mode 100644
index 00000000000..aa15f468b7d
--- /dev/null
+++ b/src/test/isolation2/sql/hot_standby/setup.sql
@@ -0,0 +1,9 @@
+-- setup for hot standby tests
+!\retcode gpconfig -c hot_standby -v on;
+-- let primary wait for standby to apply changes, make test less flaky
+!\retcode gpconfig -c synchronous_commit -v remote_apply;
+-- make it faster to handle query conflict
+!\retcode gpconfig -c max_standby_streaming_delay -v 1000;
+-- disable autovacuum, to not affect the manual VACUUM in the tests
+!\retcode gpconfig -c autovacuum -v off;
+!\retcode gpstop -ar;
diff --git a/src/test/isolation2/sql/hot_standby/teardown.sql b/src/test/isolation2/sql/hot_standby/teardown.sql
new file mode 100644
index 00000000000..af6fba50aed
--- /dev/null
+++ b/src/test/isolation2/sql/hot_standby/teardown.sql
@@ -0,0 +1,5 @@
+-- reset the setup for hot standby tests
+!\retcode gpconfig -r hot_standby;
+!\retcode gpconfig -r synchronous_commit;
+!\retcode gpconfig -r max_standby_streaming_delay;
+!\retcode gpstop -ar;
diff --git a/src/test/isolation2/sql/hot_standby/transaction_isolation.sql b/src/test/isolation2/sql/hot_standby/transaction_isolation.sql
new file mode 100644
index 00000000000..68945228313
--- /dev/null
+++ b/src/test/isolation2/sql/hot_standby/transaction_isolation.sql
@@ -0,0 +1,319 @@
+----------------------------------------------------------------
+-- Test transaction isolation in general, not specific to dtx
+----------------------------------------------------------------
+1: create table hs_tx(a int);
+1: insert into hs_tx select * from generate_series(1,10);
+
+1: begin;
+1: insert into hs_tx select * from generate_series(11,20);
+2: begin;
+2: insert into hs_tx select * from generate_series(21,30);
+2: abort;
+
+-- standby should only see completed transactions, not in-progress transactions, nor aborted transactions
+-1S: select * from hs_tx;
+
+1: end;
+-1S: select * from hs_tx;
+
+----------------------------------------------------------------
+-- Test isolation between hot standby query and in-progress dtx
+----------------------------------------------------------------
+
+1: create table hs_dtx1(a int);
+1: create table hs_dtx2(a int);
+
+-- inject two suspend faults:
+-- 1. on seg0, suspend before PREPARE phase of 2PC
+1: select gp_inject_fault('qe_start_prepared', 'suspend',dbid) from gp_segment_configuration where content=0 and role='p';
+1&: insert into hs_dtx1 select * from  generate_series(1,10);
+-- 2. on seg1, suspend before COMMIT phase of 2PC
+2: select gp_inject_fault('qe_start_commit_prepared', 'suspend',dbid) from gp_segment_configuration where content=1 and role='p';
+2&: insert into hs_dtx2 select * from  generate_series(1,10);
+
+-- standby should not see any rows from either dtx
+-1S: select * from hs_dtx1;
+-1S: select * from hs_dtx2;
+
+-- reset
+3: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+3: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+1<:
+2<:
+
+-- standby should see the results from the dtx now
+-1S: select * from hs_dtx1;
+-1S: select * from hs_dtx2;
+
+----------------------------------------------------------------
+-- Test DTX abort that happens in different phases
+----------------------------------------------------------------
+
+1: create table hs_abort_dtx1(a int);
+1: create table hs_abort_dtx2(a int);
+
+-- inject two errors:
+-- 1. on seg0, error out before PREPARE phase of 2PC
+1: select gp_inject_fault('qe_start_prepared', 'error', dbid) from gp_segment_configuration where content=0 and role='p';
+1: insert into hs_abort_dtx1 select * from  generate_series(1,10);
+1: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+-- 2. on seg1, error out before COMMIT phase of 2PC
+1: select gp_inject_fault('qe_start_commit_prepared', 'error', dbid) from gp_segment_configuration where content=1 and role='p';
+1: insert into hs_abort_dtx2 select * from  generate_series(1,10);
+1: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+
+-- standby should not see dtx1 which is aborted but should see dtx2 which is recovered
+-1S: select * from hs_abort_dtx1;
+-1S: select * from hs_abort_dtx2;
+
+----------------------------------------------------------------
+-- Test isolation between hot standby query and in-progress dtx,
+-- but also run more queries in between
+----------------------------------------------------------------
+1: create table hs_dtx3(a int);
+
+-- inject faults to suspend segments in 2PC
+1: select gp_inject_fault('qe_start_prepared', 'suspend', dbid) from gp_segment_configuration where content=0 and role='p';
+1&: insert into hs_dtx3 select * from  generate_series(1,10);
+2: select gp_inject_fault('qe_start_commit_prepared', 'suspend', dbid) from gp_segment_configuration where content=1 and role='p';
+2&: insert into hs_dtx3 select * from  generate_series(11,20);
+
+-- standby should not see rows in the in-progress dtx
+-1S: select * from hs_dtx3;
+
+-- now run some dtx and completed
+3: insert into hs_dtx3 values(99);
+3: create table hs_dtx4(a int);
+3: insert into hs_dtx4 select * from  generate_series(1,10);
+
+-- standby should still not see rows in the in-progress DTX, but should see the completed ones
+-1S: select * from hs_dtx3;
+-1S: select * from hs_dtx4;
+
+3: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+3: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+1<:
+2<:
+
+-- standby should see all rows now
+-1S: select * from hs_dtx3;
+
+----------------------------------------------------------------
+-- Test isolation between standby QD and in-progress dtx,
+-- but after standby QD resets and gets running DTX from checkpoint.
+----------------------------------------------------------------
+1: create table hs_t5(a int, b text);
+1: create table hs_t6(a int, b text);
+
+-- inject fault to suspend a primary right before it conducts the commit phase of 2PC,
+-- so in the subsequent INSERT, all local transactions will be committed but the dtx is not.
+1: select gp_inject_fault('qe_start_commit_prepared', 'suspend', dbid) from gp_segment_configuration where content=0 and role='p';
+1&: insert into hs_t5 select i, 'in-progress' from generate_series(1,10) i;
+
+-- now run some dtx and completed, and primary conducts a checkpoint
+2: insert into hs_t5 values(1, 'commited');
+2: insert into hs_t6 select i, 'committed' from generate_series(1,10) i;
+2: begin;
+2: insert into hs_t5 values(99, 'aborted');
+2: abort;
+2: checkpoint;
+
+-- now make the standby QD resets itself
+-1S: select gp_inject_fault('exec_simple_query_start', 'panic', dbid) from gp_segment_configuration where content=-1 and role='m';
+-1S: select 1;
+-1Sq:
+
+-- standby should still not see rows in the in-progress DTX, but should see the completed ones
+-1S: select * from hs_t5;
+-1S: select * from hs_t6;
+
+2: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+1<:
+
+-- standby should see all rows now
+-1S: select * from hs_t5;
+-1S: select * from hs_t6;
+
+-- standby should correctly see more in-progress dtx on the primary.
+-- context: previously this would be fail because the standby updates latestCompletedGxid to the
+-- bumped nextGxid from checkpoint, which is too far (so that it thinks the new dtx already completed).
+1: select gp_inject_fault('qe_start_prepared', 'suspend', dbid) from gp_segment_configuration where content=0 and role='p';
+1&: delete from hs_t5;
+2: select gp_inject_fault('qe_start_commit_prepared', 'suspend', dbid) from gp_segment_configuration where content=1 and role='p';
+2&: delete from hs_t6;
+
+-- standby should not see the effect of the deletes
+-1S: select * from hs_t5;
+-1S: select * from hs_t6;
+
+3: select gp_inject_fault('qe_start_prepared', 'reset',dbid) from gp_segment_configuration where content=0 and role='p';
+3: select gp_inject_fault('qe_start_commit_prepared', 'reset',dbid) from gp_segment_configuration where content=1 and role='p';
+
+1<:
+2<:
+
+-- standby now see those deletes
+-1S: select * from hs_t5;
+-1S: select * from hs_t6;
+
+----------------------------------------------------------------
+-- Read-committed isolation: query on hot standby should not see dtx that completed after it
+-- created distributed snapshot, but should see dtx that completed before that.
+----------------------------------------------------------------
+
+1: create table hs_rc(a int);
+1: insert into hs_rc select * from generate_series(1,10);
+
+-- case 1: suspend SELECT on the standby QD right after it created snapshot
+-1S: select gp_inject_fault('select_after_qd_create_snapshot', 'suspend', dbid) from gp_segment_configuration where content=-1 and role='m';
+-1S&: select * from hs_rc;
+
+-- new INSERT or DELETE won't be observed by the standby
+1: insert into hs_rc select * from generate_series(11,20);
+1: delete from hs_rc where a < 5;
+1: select gp_inject_fault('select_after_qd_create_snapshot', 'reset', dbid) from gp_segment_configuration where content=-1 and role='m';
+
+-- should only see the rows at the time when SELECT started (1...10).
+-1S<:
+
+-- SELECT again, should see the effect from the INSERT and DELETE now
+-1S: select * from hs_rc;
+
+-- case 2: suspend SELECT on the standby QD before creating snapshot
+-1S: select gp_inject_fault('select_before_qd_create_snapshot', 'suspend', dbid) from gp_segment_configuration where content=-1 and role='m';
+-1S&: select * from hs_rc;
+
+1: insert into hs_rc select * from generate_series(21,30);
+1: delete from hs_rc where a < 21;
+1: select gp_inject_fault('select_before_qd_create_snapshot', 'reset', dbid) from gp_segment_configuration where content=-1 and role='m';
+
+-- standby should see the effect of the INSERT and DELETE
+-1S<:
+
+----------------------------------------------------------------
+-- Read-committed isolation in the BEGIN...END block
+----------------------------------------------------------------
+
+1: truncate hs_rc;
+1: insert into hs_rc select * from generate_series(1,30);
+
+-1S: begin;
+-1S: select count(*) from hs_rc;
+
+-- have some concurrent sessions on primary QD:
+-- 1. a completed transaction
+1: delete from hs_rc where a <= 10;
+-- 3. an aborted transaction
+2: begin;
+2: delete from hs_rc where a > 10 and a <= 20;
+2: abort;
+-- 3. an ongoing transaction
+3: begin;
+3: delete from hs_rc where a > 20 and a <= 30;
+
+-- the standby should see results accordingly
+-1S: select * from hs_rc;
+-1S: end;
+
+3: end;
+-1S: select * from hs_rc;
+
+----------------------------------------------------------------
+-- Repeatable-read isolation: distributed snapshot is created at time of the 
+-- first query in transaction block. All queries in the transaction block 
+-- should only see results committed before the distributed snapshot creation.
+----------------------------------------------------------------
+
+1: create table hs_rr(a int);
+1: insert into hs_rr select * from generate_series(1,10);
+
+-1S: begin isolation level repeatable read;
+-- should see 10
+-1S: select count(*) from hs_rr;
+
+-- do some more INSERT, DELETE and UPDATE
+1: insert into hs_rr select * from generate_series(11,20);
+1: delete from hs_rr where a <= 10;
+1: update hs_rr set a = a + 100;
+
+-- should still the initial rows {1...10}
+-1S: select * from hs_rr;
+-1S: end;
+
+-- should see the results from the INSERT, DELETE and UPDATE
+-1S: begin isolation level repeatable read;
+-1S: select * from hs_rr;
+
+-- standby won't see ongoing or aborted transactions either
+1: begin;
+1: insert into hs_rr select * from generate_series(1,10);
+2: begin;
+2: insert into hs_rr select * from generate_series(1,10);
+2: abort;
+
+-1S: select * from hs_rr;
+
+1: end;
+-1S: end;
+
+----------------------------------------------------------------
+-- Transaction isolation is respected in subtransactions too
+----------------------------------------------------------------
+
+1: create table hs_subtrx(a int);
+
+-- (1) read-committed
+-1S: begin;
+-1S: select count(*) from hs_subtrx;
+-1S: savepoint s1;
+
+1: insert into hs_subtrx select * from generate_series(1,10);
+
+-1S: select count(*) from hs_subtrx;
+-1S: savepoint s2;
+-1S: select count(*) from hs_subtrx;
+-1S: rollback to savepoint s1;
+-1S: select count(*) from hs_subtrx;
+-1S: end;
+
+-- (2) repeatable-read
+-1S: begin isolation level repeatable read;
+-1S: select * from hs_subtrx;
+-1S: savepoint s1;
+
+1: insert into hs_subtrx select * from generate_series(11,20);
+1: delete from hs_subtrx where a <= 10;
+1: update hs_subtrx set a = a + 100;
+
+-1S: select * from hs_subtrx;
+-1S: savepoint s2;
+-1S: select * from hs_subtrx;
+-1S: rollback to savepoint s1;
+-1S: select * from hs_subtrx;
+-1S: end;
+-1S: select * from hs_subtrx;
+
+----------------------------------------------------------------
+-- Various isolation tests that involve AO/CO table.
+----------------------------------------------------------------
+1: create table hs_ao(a int, id int unique) using ao_row;
+1: insert into hs_ao select 1,i from generate_series(1,10) i;
+1: begin;
+1: insert into hs_ao select 2,i from generate_series(11,20) i;
+
+-- standby sees the same AO metadata as primary
+2: select * from gp_toolkit.__gp_aoseg('hs_ao');
+-1S: select * from gp_toolkit.__gp_aoseg('hs_ao');
+2: select (gp_toolkit.__gp_aoblkdir('hs_ao')).* from gp_dist_random('gp_id');
+-1S: select (gp_toolkit.__gp_aoblkdir('hs_ao')).* from gp_dist_random('gp_id');
+
+-- standby sees correct table data
+-1S: select * from hs_ao; 
+
+-- standby sees the effect of vacuum
+1: end;
+1: delete from hs_ao where a = 1;
+1: vacuum hs_ao;
+1: select * from gp_toolkit.__gp_aoseg('hs_ao');
+-1S: select * from gp_toolkit.__gp_aoseg('hs_ao');
+-1S: select * from hs_ao; 
diff --git a/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql b/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql
index b791c1c31af..cf708526ad3 100644
--- a/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql
+++ b/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql
@@ -19,7 +19,17 @@ CREATE LANGUAGE plpython3u;
 -- end_ignore
 
 -- enable resource group and restart cluster.
+-- prerequisites:
+--     1. '/sys/fs/cgroup/gpdb' must exist,
+--        otherwise create it before run installcheck-resgroup-v2;
+--     2. 'gpconfig -c gp_resource_group_cgroup_parent -v "gpdb" && gpstop -rai'
+--        must run before 'gpconfig -c gp_resource_manager -v group-v2', because
+--        during the process of setting gp_resource_manager to group-v2, the
+--        system will check whether the directory
+--        '/sys/fs/cgroup/$gp_resource_group_cgroup_parent' exists.
 -- start_ignore
+! gpconfig -c gp_resource_group_cgroup_parent -v "gpdb";
+! gpstop -rai;
 ! gpconfig -c gp_resource_manager -v group-v2;
 ! gpconfig -c max_connections -v 250 -m 25;
 ! gpconfig -c runaway_detector_activation_percent -v 100;
@@ -29,6 +39,7 @@ CREATE LANGUAGE plpython3u;
 -- after the restart we need a new connection to run the queries
 
 0: SHOW gp_resource_manager;
+0: SHOW gp_resource_group_cgroup_parent;
 
 -- resource queue statistics should not crash
 0: SELECT * FROM pg_resqueue_status;
@@ -259,7 +270,7 @@ $$ LANGUAGE plpython3u;
                                 stdout=subprocess.PIPE, check=True).stdout
         session_pids = stdout.splitlines()
 
-        path = "/sys/fs/cgroup/gpdb/{}/cgroup.procs".format(groupid)
+        path = "/sys/fs/cgroup/gpdb/{}/queries/cgroup.procs".format(groupid)
         stdout = subprocess.run(["ssh", "{}".format(host), "cat {}".format(path)], stdout=subprocess.PIPE, check=True).stdout
         cgroups_pids = stdout.splitlines()
 
@@ -320,6 +331,8 @@ $$ LANGUAGE plpython3u;
 
     try:
         os.makedirs(dirname)
+    except FileExistsError:
+        return True
     except Exception as e:
         plpy.error("cannot create dir {}".format(e))
     else:
@@ -328,9 +341,18 @@ $$ LANGUAGE plpython3u;
 
 0: CREATE OR REPLACE FUNCTION rmdir(dirname text) RETURNS BOOL AS $$
     import shutil
+    import fcntl
     import os
 
+    try:
+        f = os.open(dirname, os.O_RDONLY)
+    except FileNotFoundError:
+        return True
+
+    fcntl.flock(f, fcntl.LOCK_EX)
+
     if not os.path.exists(dirname):
+        os.close(f)
         return True
 
     try:
@@ -339,4 +361,38 @@ $$ LANGUAGE plpython3u;
         plpy.error("cannot remove dir {}".format(e))
     else:
         return True
+    finally:
+        os.close(f)
+$$ LANGUAGE plpython3u;
+
+0: CREATE OR REPLACE FUNCTION check_clear_io_max(groupname text) RETURNS BOOL AS $$
+    import ctypes
+    import os
+
+    postgres = ctypes.CDLL(None)
+    clear_io_max = postgres['clear_io_max']
+
+    # get group oid
+    sql = "select groupid from gp_toolkit.gp_resgroup_config where groupname = '%s'" % groupname
+    result = plpy.execute(sql)
+    groupid = result[0]['groupid']
+
+    clear_io_max(groupid)
+
+    cgroup_path = "/sys/fs/cgroup/gpdb/%d/io.max" % groupid
+
+    return os.stat(cgroup_path).st_size == 0
+$$ LANGUAGE plpython3u;
+
+0: CREATE OR REPLACE FUNCTION check_io_max_empty(groupname text) RETURNS BOOL AS $$
+    import os
+
+    # get group oid
+    sql = "select groupid from gp_toolkit.gp_resgroup_config where groupname = '%s'" % groupname
+    result = plpy.execute(sql)
+    groupid = result[0]['groupid']
+
+    cgroup_path = "/sys/fs/cgroup/gpdb/%d/io.max" % groupid
+
+    return os.stat(cgroup_path).st_size == 0
 $$ LANGUAGE plpython3u;
diff --git a/src/test/isolation2/sql/segwalrep/startup_rename_prepared_xlog.sql b/src/test/isolation2/sql/segwalrep/startup_rename_prepared_xlog.sql
new file mode 100644
index 00000000000..f612647f8ea
--- /dev/null
+++ b/src/test/isolation2/sql/segwalrep/startup_rename_prepared_xlog.sql
@@ -0,0 +1,89 @@
+-- Test a bug where the last XLOG segment is renamed to .partial before prepared
+-- transactions contained in it are recovered. This would result in segfault at
+-- RecoverPreparedTransactions. The failure is well described in PG hackers:
+-- https://www.postgresql.org/message-id/743b9b45a2d4013bd90b6a5cba8d6faeb717ee34.camel%40cybertec.at
+-- However, in GP due to an older version of PG this error is masked by always caching 
+-- the last opened xlog segment in XLogRead(). To actually trigger the failure we need to
+-- create unfinished prepared transactions in TWO different xlog segments.
+
+-- Allow extra time for mirror promotion to complete recovery to avoid
+-- gprecoverseg BEGIN failures due to gang creation failure as some primaries
+-- are not up. Setting these increase the number of retries in gang creation in
+-- case segment is in recovery. Approximately we want to wait 30 seconds.
+!\retcode gpconfig -c gp_gang_creation_retry_count -v 120 --skipvalidation --masteronly;
+!\retcode gpconfig -c gp_gang_creation_retry_timer -v 1000 --skipvalidation --masteronly;
+
+-- The last xlog segment is renamed to .partial only when archive mode is on
+!\retcode gpconfig -c archive_mode -v on;
+!\retcode gpconfig -c archive_command -v '/bin/true';
+!\retcode gpstop -rai;
+
+1: create extension if not exists gp_inject_fault;
+1: create table t_rename1 (a int);
+1: create table t_rename2 (a int);
+
+-- generate an orphaned prepare transaction in first segment
+1: select gp_inject_fault('dtm_broadcast_prepare', 'suspend', dbid)
+  from gp_segment_configuration where role = 'p' and content = -1;
+-- assume (2), (1) are on different segments and one tuple is on the first segment.
+-- the test finally double-check that.
+2&: insert into t_rename1 values(2),(1);
+1: select gp_wait_until_triggered_fault('dtm_broadcast_prepare', 1, dbid)
+  from gp_segment_configuration where role = 'p' and content = -1;
+
+-- start another xlog segment (will be renamed to .partial on failover)
+-- start_ignore
+0U: select pg_switch_xlog();
+-- end_ignore
+
+-- inject another fault and prepare transaction in the new xlog segment
+1: select gp_inject_fault('dtm_broadcast_prepare', 'reset', dbid)
+  from gp_segment_configuration where role = 'p' and content = -1;
+1: select gp_inject_fault('dtm_broadcast_prepare', 'suspend', dbid)
+  from gp_segment_configuration where role = 'p' and content = -1;
+-- assume (4), (3) are on different segments and one tuple is on the first segment.
+-- the test finally double-check that.
+3&: insert into t_rename2 values(2),(1);
+1: select gp_wait_until_triggered_fault('dtm_broadcast_prepare', 1, dbid)
+  from gp_segment_configuration where role = 'p' and content = -1;
+
+-- shutdown primary and make sure the segment is down
+-1U: select pg_ctl((SELECT datadir from gp_segment_configuration c
+  where c.role='p' and c.content=0), 'stop', 'immediate');
+1: select gp_request_fts_probe_scan();
+1: select role, preferred_role from gp_segment_configuration where content = 0 order by role;
+
+-- double confirm that promote succeeds.
+-- also double confirm that
+--  1. tuples (2) and (1) are located on two segments (thus we are testing 2pc with prepared transaction).
+--  2. there are tuples on the first segment (we have been testing on the first segment).
+1: insert into t_rename1 values(2),(1);
+1: select gp_segment_id, * from t_rename1 order by a;
+
+1: select gp_inject_fault('dtm_broadcast_prepare', 'reset', dbid)
+  from gp_segment_configuration where role = 'p' and content = -1;
+2<:
+3<:
+
+-- confirm the "orphaned" prepared trnasaction commits finally.
+1: select * from t_rename1 order by a;
+1: select * from t_rename2 order by a;
+
+-- recovery the nodes
+!\retcode gprecoverseg -a;
+1: select wait_until_segment_synchronized(0);
+
+!\retcode gprecoverseg -ar;
+1: select wait_until_segment_synchronized(0);
+
+-- verify the first segment is recovered to the original state.
+1: select role, preferred_role from gp_segment_configuration where content = 0 order by role;
+
+-- cleanup
+1: drop table t_rename1;
+1: drop table t_rename2;
+!\retcode gpconfig -r gp_gang_creation_retry_count --skipvalidation;
+!\retcode gpconfig -r gp_gang_creation_retry_timer --skipvalidation;
+!\retcode gpconfig -r archive_mode --skipvalidation;
+!\retcode gpconfig -r archive_command --skipvalidation;
+!\retcode gpstop -rai;
diff --git a/src/test/modules/delay_execution/delay_execution.c b/src/test/modules/delay_execution/delay_execution.c
index b3d0841ba80..03925c74880 100644
--- a/src/test/modules/delay_execution/delay_execution.c
+++ b/src/test/modules/delay_execution/delay_execution.c
@@ -44,17 +44,17 @@ void		_PG_fini(void);
 /* planner_hook function to provide the desired delay */
 static PlannedStmt *
 delay_execution_planner(Query *parse, const char *query_string,
-						int cursorOptions, ParamListInfo boundParams)
+						int cursorOptions, ParamListInfo boundParams, OptimizerOptions *optimizer_options)
 {
 	PlannedStmt *result;
 
 	/* Invoke the planner, possibly via a previous hook user */
 	if (prev_planner_hook)
 		result = prev_planner_hook(parse, query_string, cursorOptions,
-								   boundParams);
+								   boundParams, optimizer_options);
 	else
 		result = standard_planner(parse, query_string, cursorOptions,
-								  boundParams);
+								  boundParams, optimizer_options);
 
 	/* If enabled, delay by taking and releasing the specified lock */
 	if (post_planning_lock_id != 0)
diff --git a/src/test/modules/test_shm_mq/worker.c b/src/test/modules/test_shm_mq/worker.c
index 2180776a669..5b30454dd22 100644
--- a/src/test/modules/test_shm_mq/worker.c
+++ b/src/test/modules/test_shm_mq/worker.c
@@ -77,7 +77,7 @@ test_shm_mq_main(Datum main_arg)
 	 * exit, which is fine.  If there were a ResourceOwner, it would acquire
 	 * ownership of the mapping, but we have no need for that.
 	 */
-	seg = dsm_attach(DatumGetInt32(main_arg));
+	seg = dsm_attach(DatumGetUInt32(main_arg));
 	if (seg == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index 262e4e74fbe..9e6d4c653b9 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -603,6 +603,50 @@ sub append_conf
 
 =pod
 
+=item $node->adjust_conf(filename, setting, value, skip_equals)
+
+Modify the named config file setting with the value. If the value is undefined,
+instead delete the setting. If the setting is not present no action is taken.
+
+This will write "$setting = $value\n" in place of the existing line,
+unless skip_equals is true, in which case it will write
+"$setting $value\n". If the value needs to be quoted it is the caller's
+responsibility to do that.
+
+=cut
+
+sub adjust_conf
+{
+    my ($self, $filename, $setting, $value, $skip_equals) = @_;
+
+    my $conffile = $self->data_dir . '/' . $filename;
+
+    my $contents = PostgreSQL::Test::Utils::slurp_file($conffile);
+    my @lines    = split(/\n/, $contents);
+    my @result;
+    my $eq = $skip_equals ? '' : '= ';
+    foreach my $line (@lines)
+    {
+        if ($line !~ /^$setting\W/)
+        {
+            push(@result, "$line\n");
+        }
+        elsif (defined $value)
+        {
+            push(@result, "$setting $eq$value\n");
+        }
+    }
+    open my $fh, ">", $conffile
+        or croak "could not write \"$conffile\": $!";
+    print $fh @result;
+    close $fh;
+
+    chmod($self->group_access() ? 0640 : 0600, $conffile)
+        or die("unable to set permissions for $conffile");
+}
+
+=pod
+
 =item $node->backup(backup_name)
 
 Create a hot backup with B<pg_basebackup> in subdirectory B<backup_name> of
diff --git a/src/test/recovery/t/101_restore_point_and_startup_pause.pl b/src/test/recovery/t/101_restore_point_and_startup_pause.pl
index cda572524c1..f59acffb7ad 100644
--- a/src/test/recovery/t/101_restore_point_and_startup_pause.pl
+++ b/src/test/recovery/t/101_restore_point_and_startup_pause.pl
@@ -1,48 +1,122 @@
-# test for pausing on startup and on a specified restore point
+# Test for pausing and resuming recovery at specific restore points,
+# both at initial startup and in a continuous fashion by advancing
+# gp_pause_on_restore_point_replay.
+
 use strict;
 use warnings;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 1;
+use Test::More tests => 12;
 use File::Copy;
 
-# Initialize primary node with WAL archiving setup
+# Initialize and start primary node
 my $node_primary = get_new_node('primary');
-$node_primary->init(
-    has_archiving    => 1,
-    allows_streaming => 1);
-$node_primary->append_conf('postgresql.conf', "wal_level = 'replica'");
-$node_primary->append_conf('postgresql.conf', "max_wal_senders = 10");
-my $backup_name = 'my_backup';
-
-# Start primary
+$node_primary->init(has_archiving => 1, allows_streaming => 1);
 $node_primary->start;
 
-# Initialize standby node from backup, fetching WAL from archives
-$node_primary->backup($backup_name);
-my $node_standby = get_new_node('standby');
-$node_standby->init_from_backup($node_primary, $backup_name,
-    has_restoring => 1);
-$node_standby->append_conf('postgresql.conf', "gp_pause_on_restore_point_replay = on");
+my $node_standby = get_new_node("standby");
+
+sub test_pause_in_recovery
+{
+	my ($restore_point, $test_lsn, $num_rows) = @_;
+
+	# Wait until standby has replayed enough data
+	my $caughtup_query = "SELECT pg_last_wal_replay_lsn() = '$test_lsn'::pg_lsn";
+	$node_standby->poll_query_until('postgres', $caughtup_query)
+		or die "Timed out while waiting for standby to catch up";
+
+	# Check data has been replayed
+	my $result = $node_standby->safe_psql('postgres', "SELECT count(*) FROM table_foo;");
+	is($result, $num_rows, "check standby content for $restore_point");
+	ok($node_standby->safe_psql('postgres', 'SELECT pg_is_wal_replay_paused();') eq 't',
+		"standby is paused in recovery on $restore_point");
+}
+
+# Create data before taking the backup
+$node_primary->safe_psql('postgres', "CREATE TABLE table_foo AS SELECT generate_series(1,1000);");
+# Take backup from which all operations will be run
+$node_primary->backup('my_backup');
+my $lsn0 = $node_primary->safe_psql('postgres', "SELECT pg_create_restore_point('rp0');");
+# Switching WAL guarantees that the restore point is available to the standby
+$node_primary->safe_psql('postgres', "SELECT pg_switch_wal();");
+
+# Add more data, create restore points and switch wal to guarantee
+# that the restore point is available to the standby
+
+# rp1
+$node_primary->safe_psql('postgres', "INSERT INTO table_foo VALUES (generate_series(1001,2000))");
+my $lsn1 = $node_primary->safe_psql('postgres', "SELECT pg_create_restore_point('rp1');");
+$node_primary->safe_psql('postgres', "SELECT pg_switch_wal();");
+
+# rp2
+$node_primary->safe_psql('postgres', "INSERT INTO table_foo VALUES (generate_series(2001, 3000))");
+my $lsn2 = $node_primary->safe_psql('postgres', "SELECT pg_create_restore_point('rp2');");
+$node_primary->safe_psql('postgres', "SELECT pg_switch_wal();");
+
+# rp3
+$node_primary->safe_psql('postgres', "INSERT INTO table_foo VALUES (generate_series(3001, 4000))");
+$node_primary->safe_psql('postgres', "SELECT pg_create_restore_point('rp3');");
+$node_primary->safe_psql('postgres', "SELECT pg_switch_wal();");
 
-# Start standby
+# rp4
+$node_primary->safe_psql('postgres', "INSERT INTO table_foo VALUES (generate_series(4001, 5000))");
+my $lsn4 = $node_primary->safe_psql('postgres', "SELECT pg_create_restore_point('rp4');");
+$node_primary->safe_psql('postgres', "SELECT pg_switch_wal();");
+
+# rp5
+$node_primary->safe_psql('postgres', "INSERT INTO table_foo VALUES (generate_series(5001, 6000))");
+$node_primary->safe_psql('postgres', "SELECT pg_create_restore_point('rp5');");
+$node_primary->safe_psql('postgres', "SELECT pg_switch_wal();");
+
+# Restore the backup
+$node_standby->init_from_backup($node_primary, 'my_backup', has_restoring => 1);
+# Enable `hot_standby`
+$node_standby->append_conf('postgresql.conf', qq(hot_standby = 'on'));
+
+# Set rp0 as a restore point to pause on start up
+$node_standby->append_conf('postgresql.conf', qq(gp_pause_on_restore_point_replay = 'rp0'));
+# Start the standby
 $node_standby->start;
+test_pause_in_recovery('rp0', $lsn0, 1000);
+
+# Advance to rp1
+$node_standby->adjust_conf('postgresql.conf', 'gp_pause_on_restore_point_replay', "rp1");
+$node_standby->reload;
+$node_standby->safe_psql('postgres', "SELECT pg_wal_replay_resume();");
+test_pause_in_recovery('rp1', $lsn1, 2000);
+
+# Advance to rp2
+$node_standby->adjust_conf('postgresql.conf', 'gp_pause_on_restore_point_replay', "rp2");
+$node_standby->reload;
+$node_standby->safe_psql('postgres', "SELECT pg_wal_replay_resume();");
+test_pause_in_recovery('rp2', $lsn2, 3000);
+
+# Verify that a restart will bring us back to rp2
+$node_standby->restart;
+test_pause_in_recovery('rp2', $lsn2, 3000);
+
+# Skip rp3 and advance to rp4
+$node_standby->adjust_conf('postgresql.conf', 'gp_pause_on_restore_point_replay', "rp4");
+$node_standby->reload;
+$node_standby->safe_psql('postgres', "SELECT pg_wal_replay_resume();");
+test_pause_in_recovery('rp4', $lsn4, 5000);
+
+# Do not advance to rp5; signal promote and then resume recovery
+$node_standby->safe_psql('postgres', "SELECT pg_promote(false);");
+$node_standby->safe_psql('postgres', "SELECT pg_wal_replay_resume();");
 
-# Create a restore point on the primary
-my $restore_point_lsn =
-    $node_primary->safe_psql('postgres', "SELECT pg_create_restore_point('rp')");
+# Wait for standby to promote
+$node_standby->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery();")
+	or die "Timed out while waiting for standby to exit recovery";
 
-# Force archival of WAL file to make it present on standby
-$node_primary->safe_psql('postgres', "SELECT pg_switch_wal()");
+# Check that we promoted with rp4's table count and not rp5's
+my $result = $node_standby->safe_psql('postgres', "SELECT count(*) FROM table_foo;");
+is($result, 5000, "check standby content after promotion");
 
-# Wait until enough replay has been done on the standby before checking if replay
-# is paused at the restore point
-my $caughtup_query =
-    "SELECT '$restore_point_lsn'::pg_lsn <= pg_last_wal_replay_lsn()";
-$node_standby->poll_query_until('postgres', $caughtup_query)
-    or die "Timed out while waiting for standby to catch up";
+# Make sure the former standby is now writable
+$node_standby->safe_psql('postgres', "INSERT INTO table_foo VALUES (generate_series(6001, 7000));");
+$result = $node_standby->safe_psql('postgres', "SELECT count(*) FROM table_foo;");
+is($result, 6000, "check standby is writable after promotion");
 
-my $paused_at_restore_point_query =
-    "SELECT pg_is_wal_replay_paused() and pg_last_wal_replay_lsn() = '$restore_point_lsn'::pg_lsn";
-my $result2 = $node_standby->safe_psql('postgres', $paused_at_restore_point_query);
-is($result2, qq(t), 'check if WAL replay is paused at restore point');
+$node_primary->teardown_node;
+$node_standby->teardown_node;
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index dffdba2572a..9bc8b67591e 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -99,6 +99,8 @@ OBJS = $(WIN32RES) regress.o
 
 OBJS += regress_gp.o
 
+SHLIB_LINK_INTERNAL = $(libpq)
+
 include $(top_srcdir)/src/Makefile.shlib
 
 all: all-lib
@@ -239,6 +241,16 @@ endif
 standbycheck: all
 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule  $(EXTRA_TESTS)
 
+# GPDB: installcheck for hot standby. This is essentially same as the upstream 'standbycheck'
+# above but we just make sure that we do the primary preparation and use the desired standby port.
+# If no standby port is given, just use the demo cluster's standby port 7001. 
+ifeq ($(STANDBY_PGPORT),)
+  STANDBY_PGPORT = 7001
+endif
+installcheck-hot-standby: all
+	$(pg_regress_installcheck) $(REGRESS_OPTS) hs_primary_setup
+	$(pg_regress_installcheck) $(REGRESS_OPTS) --port=$(STANDBY_PGPORT) --use-existing --schedule=$(srcdir)/standby_schedule  $(EXTRA_TESTS)
+
 # old interfaces follow...
 
 runcheck: check
diff --git a/src/test/regress/expected/AOCO_Compression.out b/src/test/regress/expected/AOCO_Compression.out
index f8e1c6164a9..adfcafab56f 100644
--- a/src/test/regress/expected/AOCO_Compression.out
+++ b/src/test/regress/expected/AOCO_Compression.out
@@ -459,6 +459,12 @@ CREATE TABLE co_cr_sub_partzlib8192_1
  COLUMN a1 encoding (compresstype = zlib),
  COLUMN a5 ENCODING (compresstype=zlib,compresslevel=1, blocksize=8192),
  DEFAULT COLUMN ENCODING (compresstype=zlib,compresslevel=1,blocksize=8192)) (start(1) end(5000) every(1000));
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_cr_sub_partzlib8192_1'::regclass;
+ level |                                                                                                                                                                                       pg_get_expr                                                                                                                                                                                       
+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION df_sp, SUBPARTITION sp1 VALUES ('M'), SUBPARTITION sp2 VALUES ('F'), COLUMN a2 ENCODING (compresstype=zlib, compresslevel=1, blocksize=8192), COLUMN a1 ENCODING (compresstype=zlib), COLUMN a5 ENCODING (compresstype=zlib, compresslevel=1, blocksize=8192), DEFAULT COLUMN ENCODING (compresstype=zlib, compresslevel=1, blocksize=8192))
+(1 row)
+
 -- 
 -- Create Indexes
 --
@@ -472,6 +478,12 @@ INSERT INTO co_cr_sub_partzlib8192_1(a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,
 ANALYZE co_cr_sub_partzlib8192_1;
 --Create Uncompressed table of same schema definition
 CREATE TABLE co_cr_sub_partzlib8192_1_uncompr(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int) WITH (appendonly=true, orientation=column) distributed randomly Partition by range(a1) Subpartition by list(a2) subpartition template ( subpartition sp1 values('M') , subpartition sp2 values('F') ) (start(1)  end(5000) every(1000)) ;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_cr_sub_partzlib8192_1_uncompr'::regclass;
+ level |                                     pg_get_expr                                     
+-------+-------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(SUBPARTITION sp1 VALUES ('M'), SUBPARTITION sp2 VALUES ('F'))
+(1 row)
+
 --
 -- Insert to uncompressed table
 --
@@ -844,6 +856,12 @@ CREATE TABLE co_cr_sub_partzlib8192_1_2
  COLUMN a1 encoding (compresstype = zlib),
  COLUMN a5 ENCODING (compresstype=zlib,compresslevel=1, blocksize=8192),
  DEFAULT COLUMN ENCODING (compresstype=zlib,compresslevel=1,blocksize=8192)) (partition p1 values('F'), partition p2 values ('M'));
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_cr_sub_partzlib8192_1_2'::regclass;
+ level |                                                                                                                                                                          pg_get_expr                                                                                                                                                                          
+-------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION df_sp,  START (1) END (5000) Every (1000), COLUMN a2 ENCODING (compresstype=zlib, compresslevel=1, blocksize=8192), COLUMN a1 ENCODING (compresstype=zlib), COLUMN a5 ENCODING (compresstype=zlib, compresslevel=1, blocksize=8192), DEFAULT COLUMN ENCODING (compresstype=zlib, compresslevel=1, blocksize=8192))
+(1 row)
+
 -- 
 -- Create Indexes
 --
@@ -1283,6 +1301,12 @@ CREATE TABLE co_wt_sub_partrle_type8192_1
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=column) distributed randomly  Partition by range(a1) Subpartition by list(a2) subpartition template ( default subpartition df_sp, subpartition sp1 values('M') , subpartition sp2 values('F')  
  WITH (appendonly=true, orientation=column,compresstype=rle_type,compresslevel=1,blocksize=8192)) (start(1)  end(5000) every(1000) );
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_wt_sub_partrle_type8192_1'::regclass;
+ level |                                                                                                    pg_get_expr                                                                                                    
+-------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION df_sp, SUBPARTITION sp1 VALUES ('M'), SUBPARTITION sp2 VALUES ('F'),  WITH (appendonly=true, orientation=row, compresstype=rle_type, compresslevel=1, blocksize=8192))
+(1 row)
+
 -- 
 -- Create Indexes
 --
@@ -1296,6 +1320,12 @@ INSERT INTO co_wt_sub_partrle_type8192_1(a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,
 ANALYZE co_wt_sub_partrle_type8192_1;
 --Create Uncompressed table of same schema definition
 CREATE TABLE co_wt_sub_partrle_type8192_1_uncompr(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int) WITH (appendonly=true, orientation=column) distributed randomly Partition by range(a1) Subpartition by list(a2) subpartition template ( subpartition sp1 values('M') , subpartition sp2 values('F') ) (start(1)  end(5000) every(1000)) ;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_wt_sub_partrle_type8192_1_uncompr'::regclass;
+ level |                                     pg_get_expr                                     
+-------+-------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(SUBPARTITION sp1 VALUES ('M'), SUBPARTITION sp2 VALUES ('F'))
+(1 row)
+
 --
 -- Insert to uncompressed table
 --
@@ -1668,6 +1698,12 @@ CREATE TABLE co_wt_sub_partrle_type8192_1_2
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=column) distributed randomly  Partition by list(a2) Subpartition by range(a1) subpartition template (default subpartition df_sp, start(1)  end(5000) every(1000) 
  WITH (appendonly=true, orientation=column,compresstype=rle_type,compresslevel=1,blocksize=8192)) (partition p1 values ('M'), partition p2 values ('F'));
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_wt_sub_partrle_type8192_1_2'::regclass;
+ level |                                                                                       pg_get_expr                                                                                       
+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION df_sp,  START (1) END (5000) Every (1000),  WITH (appendonly=true, orientation=row, compresstype=rle_type, compresslevel=1, blocksize=8192))
+(1 row)
+
 -- 
 -- Create Indexes
 --
@@ -2111,6 +2147,12 @@ CREATE TABLE ao_wt_sub_partzlib8192_5
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=row) distributed randomly  Partition by range(a1) Subpartition by list(a2) subpartition template ( default subpartition df_sp, subpartition sp1 values('M') , subpartition sp2 values('F')  
  WITH (appendonly=true, orientation=row,compresstype=zlib,compresslevel=5,blocksize=8192)) (start(1)  end(5000) every(1000) );
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ao_wt_sub_partzlib8192_5'::regclass;
+ level |                                                                                                   pg_get_expr                                                                                                    
+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION df_sp, SUBPARTITION sp1 VALUES ('M'), SUBPARTITION sp2 VALUES ('F'),  WITH (appendonly=true, orientation=column, compresstype=zlib, compresslevel=5, blocksize=8192))
+(1 row)
+
 -- 
 -- Create Indexes
 --
@@ -2505,6 +2547,12 @@ CREATE TABLE ao_wt_sub_partzlib8192_5_2
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=row) distributed randomly  Partition by list(a2) Subpartition by range(a1) subpartition template (default subpartition df_sp, start(1)  end(5000) every(1000) 
  WITH (appendonly=true, orientation=row,compresstype=zlib,compresslevel=5,blocksize=8192)) (partition p1 values ('M'), partition p2 values ('F'));
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ao_wt_sub_partzlib8192_5_2'::regclass;
+ level |                                                                                      pg_get_expr                                                                                       
+-------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION df_sp,  START (1) END (5000) Every (1000),  WITH (appendonly=true, orientation=column, compresstype=zlib, compresslevel=5, blocksize=8192))
+(1 row)
+
 -- 
 -- Create Indexes
 --
diff --git a/src/test/regress/expected/DML_over_joins_optimizer.out b/src/test/regress/expected/DML_over_joins_optimizer.out
index c0d7286affd..77a90f888c2 100644
--- a/src/test/regress/expected/DML_over_joins_optimizer.out
+++ b/src/test/regress/expected/DML_over_joins_optimizer.out
@@ -1774,22 +1774,21 @@ HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For
                                   QUERY PLAN                                  
 ------------------------------------------------------------------------------
  Delete on tab1
-   ->  Result
-         ->  Redistribute Motion 3:3  (slice1; segments: 3)
-               Hash Key: tab1.b
-               ->  Hash Join
-                     Hash Cond: (tab2.a = tab1.a)
-                     ->  Seq Scan on tab2
-                     ->  Hash
-                           ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                                 Hash Key: tab1.a
-                                 ->  Hash Join
-                                       Hash Cond: (tab3.b = tab1.b)
-                                       ->  Seq Scan on tab3
-                                       ->  Hash
-                                             ->  Seq Scan on tab1
+   ->  Hash Join
+         Hash Cond: (tab3.b = tab1.b)
+         ->  Seq Scan on tab3
+         ->  Hash
+               ->  Redistribute Motion 3:3  (slice1; segments: 3)
+                     Hash Key: tab1.b
+                     ->  Hash Join
+                           Hash Cond: (tab2.a = tab1.a)
+                           ->  Seq Scan on tab2
+                           ->  Hash
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                       Hash Key: tab1.a
+                                       ->  Seq Scan on tab1
  Optimizer: GPORCA
-(16 rows)
+(15 rows)
 
 -- ----------------------------------------------------------------------
 -- Test delete on partition table from join on another partition table
diff --git a/src/test/regress/expected/agg_pushdown.out b/src/test/regress/expected/agg_pushdown.out
index 8e6b8e478ba..9ed0c09f782 100644
--- a/src/test/regress/expected/agg_pushdown.out
+++ b/src/test/regress/expected/agg_pushdown.out
@@ -1,23 +1,23 @@
--- disable ORCA
-SET optimizer TO off;
 -- Test case group 1: basic functions
 CREATE TABLE agg_pushdown_parent (
-	i int primary key,
-	x int);
+    i int,
+    x int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 CREATE TABLE agg_pushdown_child1 (
-	j int,
-	parent int,
-	v double precision,
-	PRIMARY KEY (j, parent));
-CREATE INDEX ON agg_pushdown_child1(parent);
+    j int,
+    parent int,
+    v double precision
+    )
+    DISTRIBUTED BY (j, parent);
 CREATE TABLE agg_pushdown_child2 (
-	k int,
-	parent int,
-	v double precision,
-	PRIMARY KEY (k, parent));;
+    k int,
+    parent int,
+    v double precision)
+    DISTRIBUTED BY (k, parent);
 INSERT INTO agg_pushdown_parent(i, x)
 SELECT n, n
-FROM generate_series(0, 7) AS s(n);
+FROM generate_series(0, 10) AS s(n);
 INSERT INTO agg_pushdown_child1(j, parent, v)
 SELECT 128 * i + n, i, random()
 FROM generate_series(0, 127) AS s(n), agg_pushdown_parent;
@@ -27,79 +27,12 @@ FROM generate_series(0, 127) AS s(n), agg_pushdown_parent;
 ANALYZE agg_pushdown_parent;
 ANALYZE agg_pushdown_child1;
 ANALYZE agg_pushdown_child2;
-SET enable_nestloop TO on;
-SET enable_hashjoin TO off;
-SET enable_mergejoin TO off;
 -- Perform scan of a table, aggregate the result, join it to the other table
 -- and finalize the aggregation.
---
--- In addition, check that functionally dependent column "p.x" can be
--- referenced by SELECT although GROUP BY references "p.i".
-SET gp_enable_agg_pushdown TO off;
-EXPLAIN (VERBOSE on, COSTS off)
-SELECT p.x, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
-AS c1 ON c1.parent = p.i GROUP BY p.i;
-                                                               QUERY PLAN                                                               
-----------------------------------------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)
-   Output: p.x, (avg(c1.v)), p.i
-   ->  HashAggregate
-         Output: p.x, avg(c1.v), p.i
-         Group Key: p.i
-         ->  Nested Loop
-               Output: p.i, p.x, c1.v
-               Inner Unique: true
-               ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                     Output: c1.v, c1.parent
-                     Hash Key: c1.parent
-                     ->  Seq Scan on public.agg_pushdown_child1 c1
-                           Output: c1.v, c1.parent
-               ->  Memoize
-                     Output: p.x, p.i
-                     Cache Key: c1.parent
-                     Cache Mode: logical
-                     ->  Index Scan using agg_pushdown_parent_pkey on public.agg_pushdown_parent p
-                           Output: p.x, p.i
-                           Index Cond: (p.i = c1.parent)
- Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', gp_enable_agg_pushdown = 'off', optimizer = 'off'
- Optimizer: Postgres query optimizer
-(22 rows)
-
-SET gp_enable_agg_pushdown TO on;
-EXPLAIN (VERBOSE on, COSTS off)
-SELECT p.x, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
-AS c1 ON c1.parent = p.i GROUP BY p.i;
-                                                              QUERY PLAN                                                               
----------------------------------------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)
-   Output: p.x, (avg(c1.v)), p.i
-   ->  Finalize GroupAggregate
-         Output: p.x, avg(c1.v), p.i
-         Group Key: p.i
-         ->  Sort
-               Output: p.i, p.x, (PARTIAL avg(c1.v))
-               Sort Key: p.i
-               ->  Nested Loop
-                     Output: p.i, p.x, (PARTIAL avg(c1.v))
-                     Inner Unique: true
-                     ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                           Output: c1.parent, (PARTIAL avg(c1.v))
-                           Hash Key: c1.parent
-                           ->  Partial HashAggregate
-                                 Output: c1.parent, PARTIAL avg(c1.v)
-                                 Group Key: c1.parent
-                                 ->  Seq Scan on public.agg_pushdown_child1 c1
-                                       Output: c1.j, c1.parent, c1.v
-                     ->  Index Scan using agg_pushdown_parent_pkey on public.agg_pushdown_parent p
-                           Output: p.i, p.x
-                           Index Cond: (p.i = c1.parent)
- Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'off'
- Optimizer: Postgres query optimizer
-(24 rows)
-
--- The same for hash join.
+SET enable_mergejoin TO off;
 SET enable_nestloop TO off;
 SET enable_hashjoin TO on;
+SET gp_enable_agg_pushdown TO on;
 EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
 AS c1 ON c1.parent = p.i GROUP BY p.i;
@@ -182,63 +115,73 @@ SET enable_seqscan TO off;
 EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
 AS c1 ON c1.parent = p.i GROUP BY p.i;
-                                                                          QUERY PLAN                                                                          
---------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                      QUERY PLAN                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: p.i, (avg(c1.v))
-   ->  HashAggregate
+   ->  Finalize HashAggregate
          Output: p.i, avg(c1.v)
          Group Key: p.i
-         ->  Nested Loop
-               Output: p.i, c1.v
-               Inner Unique: true
-               ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                     Output: c1.v, c1.parent
-                     Hash Key: c1.parent
-                     ->  Index Scan using agg_pushdown_child1_parent_idx on public.agg_pushdown_child1 c1
-                           Output: c1.v, c1.parent
-               ->  Memoize
-                     Output: p.i
-                     Cache Key: c1.parent
-                     Cache Mode: logical
-                     ->  Index Only Scan using agg_pushdown_parent_pkey on public.agg_pushdown_parent p
-                           Output: p.i
-                           Index Cond: (p.i = c1.parent)
- Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_seqscan = 'off', gp_enable_agg_pushdown = 'off', optimizer = 'off'
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: p.i, (PARTIAL avg(c1.v))
+               Hash Key: p.i
+               ->  Partial GroupAggregate
+                     Output: p.i, PARTIAL avg(c1.v)
+                     Group Key: p.i
+                     ->  Merge Join
+                           Output: p.i, c1.v
+                           Merge Cond: (p.i = c1.parent)
+                           ->  Sort
+                                 Output: p.i
+                                 Sort Key: p.i
+                                 ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                       Output: p.i
+                                       ->  Seq Scan on public.agg_pushdown_parent p
+                                             Output: p.i
+                           ->  Sort
+                                 Output: c1.v, c1.parent
+                                 Sort Key: c1.parent
+                                 ->  Seq Scan on public.agg_pushdown_child1 c1
+                                       Output: c1.v, c1.parent
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'off', gp_enable_agg_pushdown = 'off', optimizer = 'off'
  Optimizer: Postgres query optimizer
-(22 rows)
+(28 rows)
 
 SET gp_enable_agg_pushdown TO on;
 EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
 AS c1 ON c1.parent = p.i GROUP BY p.i;
-                                                                         QUERY PLAN                                                                          
--------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: p.i, (avg(c1.v))
-   ->  Finalize GroupAggregate
+   ->  Finalize HashAggregate
          Output: p.i, avg(c1.v)
          Group Key: p.i
-         ->  Sort
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: p.i, (PARTIAL avg(c1.v))
-               Sort Key: p.i
-               ->  Nested Loop
+               Hash Key: p.i
+               ->  Merge Join
                      Output: p.i, (PARTIAL avg(c1.v))
-                     Inner Unique: true
-                     ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Merge Cond: (p.i = c1.parent)
+                     ->  Sort
+                           Output: p.i
+                           Sort Key: p.i
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                 Output: p.i
+                                 ->  Seq Scan on public.agg_pushdown_parent p
+                                       Output: p.i
+                     ->  Sort
                            Output: c1.parent, (PARTIAL avg(c1.v))
-                           Hash Key: c1.parent
-                           ->  Partial GroupAggregate
+                           Sort Key: c1.parent
+                           ->  Partial HashAggregate
                                  Output: c1.parent, PARTIAL avg(c1.v)
                                  Group Key: c1.parent
-                                 ->  Index Scan using agg_pushdown_child1_parent_idx on public.agg_pushdown_child1 c1
+                                 ->  Seq Scan on public.agg_pushdown_child1 c1
                                        Output: c1.j, c1.parent, c1.v
-                     ->  Index Only Scan using agg_pushdown_parent_pkey on public.agg_pushdown_parent p
-                           Output: p.i
-                           Index Cond: (p.i = c1.parent)
- Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_seqscan = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'off'
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'off'
  Optimizer: Postgres query optimizer
-(24 rows)
+(28 rows)
 
 SET enable_seqscan TO on;
 -- Join "c1" to "p.x" column, i.e. one that is not in the GROUP BY clause. The
@@ -261,7 +204,7 @@ AS c1 ON c1.parent = p.x GROUP BY p.i;
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: p.i, (PARTIAL avg(c1.v))
                Hash Key: p.i
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Output: p.i, PARTIAL avg(c1.v)
                      Group Key: p.i
                      ->  Hash Join
@@ -324,45 +267,49 @@ EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
 agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
 c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
-                                                                          QUERY PLAN                                                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)
-   Output: p.i, (avg((c1.v + c2.v)))
-   ->  HashAggregate
-         Output: p.i, avg((c1.v + c2.v))
-         Group Key: p.i
-         ->  Nested Loop
-               Output: p.i, c1.v, c2.v
-               Inner Unique: true
-               ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                     Output: c1.v, c1.parent, c2.v, c2.parent
-                     Hash Key: c1.parent
+                                                                                       QUERY PLAN                                                                                       
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Finalize GroupAggregate
+   Output: p.i, avg((c1.v + c2.v))
+   Group Key: p.i
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Output: p.i, (PARTIAL avg((c1.v + c2.v)))
+         Merge Key: p.i
+         ->  Partial GroupAggregate
+               Output: p.i, PARTIAL avg((c1.v + c2.v))
+               Group Key: p.i
+               ->  Sort
+                     Output: p.i, c1.v, c2.v
+                     Sort Key: p.i
                      ->  Nested Loop
-                           Output: c1.v, c1.parent, c2.v, c2.parent
-                           Inner Unique: true
-                           ->  Seq Scan on public.agg_pushdown_child1 c1
-                                 Output: c1.j, c1.parent, c1.v
-                           ->  Index Scan using agg_pushdown_child2_pkey on public.agg_pushdown_child2 c2
-                                 Output: c2.k, c2.parent, c2.v
-                                 Index Cond: ((c2.k = c1.j) AND (c2.parent = c1.parent))
-               ->  Memoize
-                     Output: p.i
-                     Cache Key: c1.parent
-                     Cache Mode: logical
-                     ->  Index Only Scan using agg_pushdown_parent_pkey on public.agg_pushdown_parent p
-                           Output: p.i
-                           Index Cond: (p.i = c1.parent)
- Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', enable_seqscan = 'on', gp_enable_agg_pushdown = 'off', optimizer = 'off'
+                           Output: p.i, c1.v, c2.v
+                           Join Filter: (c1.parent = p.i)
+                           ->  Broadcast Motion 3:3  (slice2; segments: 3)
+                                 Output: p.i
+                                 ->  Seq Scan on public.agg_pushdown_parent p
+                                       Output: p.i
+                           ->  Materialize
+                                 Output: c1.v, c1.parent, c2.v, c2.parent
+                                 ->  Nested Loop
+                                       Output: c1.v, c1.parent, c2.v, c2.parent
+                                       Join Filter: ((c1.parent = c2.parent) AND (c1.j = c2.k))
+                                       ->  Seq Scan on public.agg_pushdown_child1 c1
+                                             Output: c1.j, c1.parent, c1.v
+                                       ->  Materialize
+                                             Output: c2.v, c2.parent, c2.k
+                                             ->  Seq Scan on public.agg_pushdown_child2 c2
+                                                   Output: c2.v, c2.parent, c2.k
+ Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'off', optimizer = 'off'
  Optimizer: Postgres query optimizer
-(28 rows)
+(32 rows)
 
 SET gp_enable_agg_pushdown TO on;
 EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
 agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
 c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
-                                                                          QUERY PLAN                                                                          
---------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                      QUERY PLAN                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: p.i, (avg((c1.v + c2.v)))
    ->  Finalize GroupAggregate
@@ -371,29 +318,33 @@ c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
          ->  Sort
                Output: p.i, (PARTIAL avg((c1.v + c2.v)))
                Sort Key: p.i
-               ->  Nested Loop
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
                      Output: p.i, (PARTIAL avg((c1.v + c2.v)))
-                     Inner Unique: true
-                     ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                           Output: c1.parent, c2.parent, (PARTIAL avg((c1.v + c2.v)))
-                           Hash Key: c1.parent
-                           ->  Partial HashAggregate
-                                 Output: c1.parent, c2.parent, PARTIAL avg((c1.v + c2.v))
-                                 Group Key: c1.parent
-                                 ->  Nested Loop
-                                       Output: c1.v, c1.parent, c2.v, c2.parent
-                                       Inner Unique: true
-                                       ->  Seq Scan on public.agg_pushdown_child1 c1
-                                             Output: c1.j, c1.parent, c1.v
-                                       ->  Index Scan using agg_pushdown_child2_pkey on public.agg_pushdown_child2 c2
-                                             Output: c2.k, c2.parent, c2.v
-                                             Index Cond: ((c2.k = c1.j) AND (c2.parent = c1.parent))
-                     ->  Index Only Scan using agg_pushdown_parent_pkey on public.agg_pushdown_parent p
-                           Output: p.i
-                           Index Cond: (p.i = c1.parent)
- Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'off'
+                     Hash Key: p.i
+                     ->  Nested Loop
+                           Output: p.i, (PARTIAL avg((c1.v + c2.v)))
+                           Join Filter: (c1.parent = p.i)
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                 Output: p.i
+                                 ->  Seq Scan on public.agg_pushdown_parent p
+                                       Output: p.i
+                           ->  Materialize
+                                 Output: c1.parent, c2.parent, (PARTIAL avg((c1.v + c2.v)))
+                                 ->  Partial HashAggregate
+                                       Output: c1.parent, c2.parent, PARTIAL avg((c1.v + c2.v))
+                                       Group Key: c1.parent
+                                       ->  Nested Loop
+                                             Output: c1.v, c1.parent, c2.v, c2.parent
+                                             Join Filter: ((c1.parent = c2.parent) AND (c1.j = c2.k))
+                                             ->  Seq Scan on public.agg_pushdown_child1 c1
+                                                   Output: c1.j, c1.parent, c1.v
+                                             ->  Materialize
+                                                   Output: c2.v, c2.parent, c2.k
+                                                   ->  Seq Scan on public.agg_pushdown_child2 c2
+                                                         Output: c2.v, c2.parent, c2.k
+ Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'off'
  Optimizer: Postgres query optimizer
-(30 rows)
+(34 rows)
 
 -- The same for hash join.
 SET enable_nestloop TO off;
@@ -402,8 +353,8 @@ EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
 agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
 c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
-                                                                          QUERY PLAN                                                                          
---------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                      QUERY PLAN                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: p.i, (avg((c1.v + c2.v)))
    ->  Finalize GroupAggregate
@@ -429,7 +380,6 @@ c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
                                        Group Key: c1.parent
                                        ->  Hash Join
                                              Output: c1.v, c1.parent, c2.v, c2.parent
-                                             Inner Unique: true
                                              Hash Cond: ((c1.parent = c2.parent) AND (c1.j = c2.k))
                                              ->  Seq Scan on public.agg_pushdown_child1 c1
                                                    Output: c1.j, c1.parent, c1.v
@@ -437,9 +387,9 @@ c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
                                                    Output: c2.v, c2.parent, c2.k
                                                    ->  Seq Scan on public.agg_pushdown_child2 c2
                                                          Output: c2.v, c2.parent, c2.k
- Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'off'
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'off'
  Optimizer: Postgres query optimizer
-(35 rows)
+(34 rows)
 
 -- The same for merge join.
 SET enable_hashjoin TO off;
@@ -449,39 +399,42 @@ EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
 agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
 c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
-                                                                          QUERY PLAN                                                                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                       QUERY PLAN                                                                                       
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: p.i, (avg((c1.v + c2.v)))
-   ->  Finalize GroupAggregate
+   ->  HashAggregate
          Output: p.i, avg((c1.v + c2.v))
          Group Key: p.i
-         ->  Merge Join
-               Output: p.i, (PARTIAL avg((c1.v + c2.v)))
-               Inner Unique: true
-               Merge Cond: (c1.parent = p.i)
-               ->  Sort
-                     Output: c1.parent, c2.parent, (PARTIAL avg((c1.v + c2.v)))
-                     Sort Key: c1.parent
-                     ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                           Output: c1.parent, c2.parent, (PARTIAL avg((c1.v + c2.v)))
-                           Hash Key: c1.parent
-                           ->  Partial HashAggregate
-                                 Output: c1.parent, c2.parent, PARTIAL avg((c1.v + c2.v))
-                                 Group Key: c1.parent
-                                 ->  Merge Join
-                                       Output: c1.v, c1.parent, c2.v, c2.parent
-                                       Inner Unique: true
-                                       Merge Cond: ((c1.j = c2.k) AND (c1.parent = c2.parent))
-                                       ->  Index Scan using agg_pushdown_child1_pkey on public.agg_pushdown_child1 c1
-                                             Output: c1.j, c1.parent, c1.v
-                                       ->  Index Scan using agg_pushdown_child2_pkey on public.agg_pushdown_child2 c2
-                                             Output: c2.k, c2.parent, c2.v
-               ->  Index Only Scan using agg_pushdown_parent_pkey on public.agg_pushdown_parent p
-                     Output: p.i
- Settings: enable_hashjoin = 'off', enable_mergejoin = 'on', enable_nestloop = 'off', enable_seqscan = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'off'
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: p.i, c1.v, c2.v
+               Hash Key: p.i
+               ->  Merge Join
+                     Output: p.i, c1.v, c2.v
+                     Merge Cond: (c1.parent = p.i)
+                     ->  Merge Join
+                           Output: c1.v, c1.parent, c2.v, c2.parent
+                           Merge Cond: ((c1.parent = c2.parent) AND (c1.j = c2.k))
+                           ->  Sort
+                                 Output: c1.v, c1.parent, c1.j
+                                 Sort Key: c1.parent, c1.j
+                                 ->  Seq Scan on public.agg_pushdown_child1 c1
+                                       Output: c1.v, c1.parent, c1.j
+                           ->  Sort
+                                 Output: c2.v, c2.parent, c2.k
+                                 Sort Key: c2.parent, c2.k
+                                 ->  Seq Scan on public.agg_pushdown_child2 c2
+                                       Output: c2.v, c2.parent, c2.k
+                     ->  Sort
+                           Output: p.i
+                           Sort Key: p.i
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                 Output: p.i
+                                 ->  Seq Scan on public.agg_pushdown_parent p
+                                       Output: p.i
+ Settings: enable_hashjoin = 'off', enable_mergejoin = 'on', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'off'
  Optimizer: Postgres query optimizer
-(30 rows)
+(33 rows)
 
 SET enable_seqscan TO on;
 -- Clear tables
@@ -502,6 +455,7 @@ SET enable_nestloop TO off;
 SET enable_hashjoin TO on;
 SET enable_mergejoin TO off;
 SET gp_enable_agg_pushdown TO ON;
+SET optimizer_force_multistage_agg to ON;
 -- Join key and group key are the same.
 EXPLAIN (VERBOSE on, COSTS off)
 SELECT t1.id, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id GROUP BY t1.id;
@@ -846,7 +800,7 @@ NOTICE:  table "nation_pd" does not exist, skipping
 CREATE TABLE vendor_pd (v_id int, v_name VARCHAR(20)) WITH (APPENDONLY=true, ORIENTATION=column);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v_id' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-CREATE TABLE customer_pd (c_id int primary key, c_v_id int, c_n_id int, c_type int, c_consumption int);
+CREATE TABLE customer_pd (c_id int, c_v_id int, c_n_id int, c_type int, c_consumption int);
 CREATE TABLE nation_pd (n_id int, n_name VARCHAR(20), n_type int, n_population int) WITH (APPENDONLY=true, ORIENTATION=column);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'n_id' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
@@ -1153,16 +1107,11 @@ DROP TABLE pagg_pd;
 CREATE TABLE pagg_pd_p (a int, b int);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-CREATE TABLE pagg_pd (c text, d int) inherits (pagg_pd_p) PARTITION BY LIST(c);
-ERROR:  cannot create partitioned table as inheritance child
 DROP TABLE IF EXISTS pagg_pd, pagg_pd_p;
 NOTICE:  table "pagg_pd" does not exist, skipping
 CREATE TABLE pagg_pd_p (a int, b int, c text) PARTITION BY LIST(c);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-CREATE TABLE pagg_pd (d int) inherits (pagg_pd_p);
-NOTICE:  table has parent, setting distribution columns to match parent table
-ERROR:  cannot inherit from partitioned table "pagg_pd_p"
 DROP TABLE IF EXISTS pagg_pd, pagg_pd_p;
 NOTICE:  table "pagg_pd" does not exist, skipping
 CREATE TABLE pagg_pd_p (a int, b int);
@@ -1234,7 +1183,7 @@ SELECT t1.c, sum(t1.a)
 DROP TABLE pagg_pd, pagg_pd_p;
 RESET enable_incremental_sort;
 -- Clear settings
-SET optimizer TO default;
+RESET optimizer_force_multistage_agg;
 SET gp_enable_agg_pushdown TO off;
 SET enable_seqscan TO on;
 SET enable_nestloop TO on;
diff --git a/src/test/regress/expected/agg_pushdown_optimizer.out b/src/test/regress/expected/agg_pushdown_optimizer.out
new file mode 100644
index 00000000000..494abb1c68c
--- /dev/null
+++ b/src/test/regress/expected/agg_pushdown_optimizer.out
@@ -0,0 +1,1116 @@
+-- Test case group 1: basic functions
+CREATE TABLE agg_pushdown_parent (
+    i int,
+    x int);
+CREATE TABLE agg_pushdown_child1 (
+    j int,
+    parent int,
+    v double precision
+    )
+    DISTRIBUTED BY (j, parent);
+CREATE TABLE agg_pushdown_child2 (
+    k int,
+    parent int,
+    v double precision)
+    DISTRIBUTED BY (k, parent);
+INSERT INTO agg_pushdown_parent(i, x)
+SELECT n, n
+FROM generate_series(0, 10) AS s(n);
+INSERT INTO agg_pushdown_child1(j, parent, v)
+SELECT 128 * i + n, i, random()
+FROM generate_series(0, 127) AS s(n), agg_pushdown_parent;
+INSERT INTO agg_pushdown_child2(k, parent, v)
+SELECT 128 * i + n, i, random()
+FROM generate_series(0, 127) AS s(n), agg_pushdown_parent;
+ANALYZE agg_pushdown_parent;
+ANALYZE agg_pushdown_child1;
+ANALYZE agg_pushdown_child2;
+-- Perform scan of a table, aggregate the result, join it to the other table
+-- and finalize the aggregation.
+SET enable_mergejoin TO off;
+SET enable_nestloop TO off;
+SET enable_hashjoin TO on;
+SET gp_enable_agg_pushdown TO on;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
+AS c1 ON c1.parent = p.i GROUP BY p.i;
+                                                                          QUERY PLAN                                                                           
+---------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg(c1.v))
+   ->  Finalize HashAggregate
+         Output: p.i, avg(c1.v)
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg(c1.v))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg(c1.v))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg(c1.v)
+                           Group Key: c1.parent
+                           ->  Seq Scan on public.agg_pushdown_child1 c1
+                                 Output: c1.parent, c1.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+-- The same for merge join.
+SET enable_hashjoin TO off;
+SET enable_mergejoin TO on;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
+AS c1 ON c1.parent = p.i GROUP BY p.i;
+                                                                          QUERY PLAN                                                                           
+---------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg(c1.v))
+   ->  Finalize HashAggregate
+         Output: p.i, avg(c1.v)
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg(c1.v))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg(c1.v))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg(c1.v)
+                           Group Key: c1.parent
+                           ->  Seq Scan on public.agg_pushdown_child1 c1
+                                 Output: c1.parent, c1.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'off', enable_mergejoin = 'on', enable_nestloop = 'off', enable_parallel = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+-- Restore the default values.
+SET enable_nestloop TO on;
+SET enable_hashjoin TO on;
+-- Scan index on agg_pushdown_child1(parent) column and aggregate the result
+-- using AGG_SORTED strategy.
+SET gp_enable_agg_pushdown TO off;
+SET enable_seqscan TO off;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
+AS c1 ON c1.parent = p.i GROUP BY p.i;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg(c1.v))
+   ->  Finalize HashAggregate
+         Output: p.i, avg(c1.v)
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg(c1.v))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg(c1.v))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg(c1.v)
+                           Group Key: c1.parent
+                           ->  Seq Scan on public.agg_pushdown_child1 c1
+                                 Output: c1.parent, c1.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'off', gp_enable_agg_pushdown = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+SET gp_enable_agg_pushdown TO on;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
+AS c1 ON c1.parent = p.i GROUP BY p.i;
+                                                                                     QUERY PLAN                                                                                      
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg(c1.v))
+   ->  Finalize HashAggregate
+         Output: p.i, avg(c1.v)
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg(c1.v))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg(c1.v))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg(c1.v)
+                           Group Key: c1.parent
+                           ->  Seq Scan on public.agg_pushdown_child1 c1
+                                 Output: c1.parent, c1.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+SET enable_seqscan TO on;
+-- Join "c1" to "p.x" column, i.e. one that is not in the GROUP BY clause. The
+-- planner should still use "c1.parent" as grouping expression for partial
+-- aggregation, although it's not in the same equivalence class as the GROUP
+-- BY expression ("p.i"). The reason to use "c1.parent" for partial
+-- aggregation is that this is the only way for "c1" to provide the join
+-- expression with input data.
+SET gp_enable_agg_pushdown TO off;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
+AS c1 ON c1.parent = p.x GROUP BY p.i;
+                                                                                     QUERY PLAN                                                                                      
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg(c1.v))
+   ->  Finalize HashAggregate
+         Output: p.i, avg(c1.v)
+         Group Key: p.i
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: p.i, (PARTIAL avg(c1.v))
+               Hash Key: p.i
+               ->  Streaming Partial HashAggregate
+                     Output: p.i, PARTIAL avg(c1.v)
+                     Group Key: p.i
+                     ->  Hash Join
+                           Output: p.i, c1.v
+                           Hash Cond: (c1.parent = p.x)
+                           ->  Seq Scan on public.agg_pushdown_child1 c1
+                                 Output: c1.parent, c1.v
+                           ->  Hash
+                                 Output: p.i, p.x
+                                 ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                       Output: p.i, p.x
+                                       ->  Seq Scan on public.agg_pushdown_parent p
+                                             Output: p.i, p.x
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+SET gp_enable_agg_pushdown TO on;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
+AS c1 ON c1.parent = p.x GROUP BY p.i;
+                                                                                     QUERY PLAN                                                                                     
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg(c1.v))
+   ->  Finalize HashAggregate
+         Output: p.i, avg(c1.v)
+         Group Key: p.i
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: p.i, (PARTIAL avg(c1.v))
+               Hash Key: p.i
+               ->  Streaming Partial HashAggregate
+                     Output: p.i, PARTIAL avg(c1.v)
+                     Group Key: p.i
+                     ->  Hash Join
+                           Output: p.i, c1.v
+                           Hash Cond: (c1.parent = p.x)
+                           ->  Seq Scan on public.agg_pushdown_child1 c1
+                                 Output: c1.parent, c1.v
+                           ->  Hash
+                                 Output: p.i, p.x
+                                 ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                       Output: p.i, p.x
+                                       ->  Seq Scan on public.agg_pushdown_parent p
+                                             Output: p.i, p.x
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'on', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+-- Perform nestloop join between agg_pushdown_child1 and agg_pushdown_child2
+-- and aggregate the result.
+SET enable_nestloop TO on;
+SET enable_hashjoin TO off;
+SET enable_mergejoin TO off;
+SET gp_enable_agg_pushdown TO off;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
+agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
+c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
+                                                                                      QUERY PLAN                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg((c1.v + c2.v)))
+   ->  Finalize HashAggregate
+         Output: p.i, avg((c1.v + c2.v))
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg((c1.v + c2.v)))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg((c1.v + c2.v)))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg((c1.v + c2.v))
+                           Group Key: c1.parent
+                           ->  Hash Join
+                                 Output: c1.parent, c1.v, c2.v
+                                 Hash Cond: ((c1.j = c2.k) AND (c1.parent = c2.parent))
+                                 ->  Seq Scan on public.agg_pushdown_child1 c1
+                                       Output: c1.j, c1.parent, c1.v
+                                 ->  Hash
+                                       Output: c2.k, c2.parent, c2.v
+                                       ->  Seq Scan on public.agg_pushdown_child2 c2
+                                             Output: c2.k, c2.parent, c2.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+SET gp_enable_agg_pushdown TO on;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
+agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
+c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg((c1.v + c2.v)))
+   ->  Finalize HashAggregate
+         Output: p.i, avg((c1.v + c2.v))
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg((c1.v + c2.v)))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg((c1.v + c2.v)))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg((c1.v + c2.v))
+                           Group Key: c1.parent
+                           ->  Hash Join
+                                 Output: c1.parent, c1.v, c2.v
+                                 Hash Cond: ((c1.j = c2.k) AND (c1.parent = c2.parent))
+                                 ->  Seq Scan on public.agg_pushdown_child1 c1
+                                       Output: c1.j, c1.parent, c1.v
+                                 ->  Hash
+                                       Output: c2.k, c2.parent, c2.v
+                                       ->  Seq Scan on public.agg_pushdown_child2 c2
+                                             Output: c2.k, c2.parent, c2.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'off', enable_mergejoin = 'off', enable_nestloop = 'on', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+-- The same for hash join.
+SET enable_nestloop TO off;
+SET enable_hashjoin TO on;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
+agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
+c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg((c1.v + c2.v)))
+   ->  Finalize HashAggregate
+         Output: p.i, avg((c1.v + c2.v))
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg((c1.v + c2.v)))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg((c1.v + c2.v)))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg((c1.v + c2.v))
+                           Group Key: c1.parent
+                           ->  Hash Join
+                                 Output: c1.parent, c1.v, c2.v
+                                 Hash Cond: ((c1.j = c2.k) AND (c1.parent = c2.parent))
+                                 ->  Seq Scan on public.agg_pushdown_child1 c1
+                                       Output: c1.j, c1.parent, c1.v
+                                 ->  Hash
+                                       Output: c2.k, c2.parent, c2.v
+                                       ->  Seq Scan on public.agg_pushdown_child2 c2
+                                             Output: c2.k, c2.parent, c2.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+-- The same for merge join.
+SET enable_hashjoin TO off;
+SET enable_mergejoin TO on;
+SET enable_seqscan TO off;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p.i, avg(c1.v + c2.v) FROM agg_pushdown_parent AS p JOIN
+agg_pushdown_child1 AS c1 ON c1.parent = p.i JOIN agg_pushdown_child2 AS c2 ON
+c2.parent = p.i WHERE c1.j = c2.k GROUP BY p.i;
+                                                                                      QUERY PLAN                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.i, (avg((c1.v + c2.v)))
+   ->  Finalize HashAggregate
+         Output: p.i, avg((c1.v + c2.v))
+         Group Key: p.i
+         ->  Hash Join
+               Output: p.i, (PARTIAL avg((c1.v + c2.v)))
+               Hash Cond: (c1.parent = p.i)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: c1.parent, (PARTIAL avg((c1.v + c2.v)))
+                     Hash Key: c1.parent
+                     ->  Streaming Partial HashAggregate
+                           Output: c1.parent, PARTIAL avg((c1.v + c2.v))
+                           Group Key: c1.parent
+                           ->  Hash Join
+                                 Output: c1.parent, c1.v, c2.v
+                                 Hash Cond: ((c1.j = c2.k) AND (c1.parent = c2.parent))
+                                 ->  Seq Scan on public.agg_pushdown_child1 c1
+                                       Output: c1.j, c1.parent, c1.v
+                                 ->  Hash
+                                       Output: c2.k, c2.parent, c2.v
+                                       ->  Seq Scan on public.agg_pushdown_child2 c2
+                                             Output: c2.k, c2.parent, c2.v
+               ->  Hash
+                     Output: p.i
+                     ->  Seq Scan on public.agg_pushdown_parent p
+                           Output: p.i
+ Settings: enable_hashjoin = 'off', enable_mergejoin = 'on', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'off', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+SET enable_seqscan TO on;
+-- Clear tables
+DROP TABLE agg_pushdown_child1;
+DROP TABLE agg_pushdown_child2;
+DROP TABLE agg_pushdown_parent;
+-- Test case group 2: Pushdown with different join keys and group keys.
+DROP TABLE IF EXISTS t1, t2;
+NOTICE:  table "t1" does not exist, skipping
+NOTICE:  table "t2" does not exist, skipping
+CREATE TABLE t1 (id int, val int, comment VARCHAR(20));
+CREATE TABLE t2 (id int, val int);
+SET enable_nestloop TO off;
+SET enable_hashjoin TO on;
+SET enable_mergejoin TO off;
+SET gp_enable_agg_pushdown TO ON;
+SET optimizer_force_multistage_agg to ON;
+-- Join key and group key are the same.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.id, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id GROUP BY t1.id;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.id, (sum(t1.val))
+   ->  Finalize HashAggregate
+         Output: t1.id, sum(t1.val)
+         Group Key: t1.id
+         ->  Hash Join
+               Output: t1.id, (PARTIAL sum(t1.val))
+               Hash Cond: (t1.id = t2.id)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: t1.id, (PARTIAL sum(t1.val))
+                     Hash Key: t1.id
+                     ->  Streaming Partial HashAggregate
+                           Output: t1.id, PARTIAL sum(t1.val)
+                           Group Key: t1.id
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                                 Output: t1.id, t1.val
+                                 ->  Seq Scan on public.t1
+                                       Output: t1.id, t1.val
+               ->  Hash
+                     Output: t2.id
+                     ->  Seq Scan on public.t2
+                           Output: t2.id
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+-- Join key and group key are different.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.val, SUM(t1.id) FROM t1, t2 WHERE t1.id = t2.id GROUP BY t1.val;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.val, (sum(t1.id))
+   ->  Finalize HashAggregate
+         Output: t1.val, sum(t1.id)
+         Group Key: t1.val
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: t1.val, (PARTIAL sum(t1.id))
+               Hash Key: t1.val
+               ->  Streaming Partial HashAggregate
+                     Output: t1.val, PARTIAL sum(t1.id)
+                     Group Key: t1.val
+                     ->  Hash Join
+                           Output: t1.id, t1.val
+                           Hash Cond: (t1.id = t2.id)
+                           ->  Seq Scan on public.t1
+                                 Output: t1.id, t1.val
+                           ->  Hash
+                                 Output: t2.id
+                                 ->  Seq Scan on public.t2
+                                       Output: t2.id
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+-- Pushdown with equivclass.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t2.id, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id GROUP BY t2.id;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t2.id, (sum(t1.val))
+   ->  Finalize HashAggregate
+         Output: t2.id, sum(t1.val)
+         Group Key: t2.id
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: t2.id, (PARTIAL sum(t1.val))
+               Hash Key: t2.id
+               ->  Streaming Partial HashAggregate
+                     Output: t2.id, PARTIAL sum(t1.val)
+                     Group Key: t2.id
+                     ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                           Output: t1.val, t2.id
+                           ->  Hash Join
+                                 Output: t1.val, t2.id
+                                 Hash Cond: (t1.id = t2.id)
+                                 ->  Seq Scan on public.t1
+                                       Output: t1.id, t1.val
+                                 ->  Hash
+                                       Output: t2.id
+                                       ->  Seq Scan on public.t2
+                                             Output: t2.id
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+-- Group by column from t2 and aggregate column from t1. 
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t2.val, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id GROUP BY t2.val;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t2.val, (sum(t1.val))
+   ->  Finalize HashAggregate
+         Output: t2.val, sum(t1.val)
+         Group Key: t2.val
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: t2.val, (PARTIAL sum(t1.val))
+               Hash Key: t2.val
+               ->  Streaming Partial HashAggregate
+                     Output: t2.val, PARTIAL sum(t1.val)
+                     Group Key: t2.val
+                     ->  Hash Join
+                           Output: t1.val, t2.val
+                           Hash Cond: (t1.id = t2.id)
+                           ->  Seq Scan on public.t1
+                                 Output: t1.id, t1.val
+                           ->  Hash
+                                 Output: t2.id, t2.val
+                                 ->  Seq Scan on public.t2
+                                       Output: t2.id, t2.val
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+-- Pushdown with multiply group keys.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.id, t1.comment, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id GROUP BY t1.id, t1.comment;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.id, t1.comment, (sum(t1.val))
+   ->  Finalize HashAggregate
+         Output: t1.id, t1.comment, sum(t1.val)
+         Group Key: t1.id, t1.comment
+         ->  Hash Join
+               Output: t1.id, t1.comment, (PARTIAL sum(t1.val))
+               Hash Cond: (t1.id = t2.id)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: t1.id, t1.comment, (PARTIAL sum(t1.val))
+                     Hash Key: t1.id
+                     ->  Streaming Partial HashAggregate
+                           Output: t1.id, t1.comment, PARTIAL sum(t1.val)
+                           Group Key: t1.id, t1.comment
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                                 Output: t1.id, t1.val, t1.comment
+                                 ->  Seq Scan on public.t1
+                                       Output: t1.id, t1.val, t1.comment
+               ->  Hash
+                     Output: t2.id
+                     ->  Seq Scan on public.t2
+                           Output: t2.id
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+-- Pushdown with multiply join keys.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.id, t1.comment, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id and t1.val = t2.val GROUP BY t1.id, t1.comment;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.id, t1.comment, (sum(t1.val))
+   ->  HashAggregate
+         Output: t1.id, t1.comment, sum(t1.val)
+         Group Key: t1.id, t1.comment
+         ->  Hash Join
+               Output: t1.id, t1.val, t1.comment
+               Hash Cond: ((t1.id = t2.id) AND (t1.val = t2.val))
+               ->  Seq Scan on public.t1
+                     Output: t1.id, t1.val, t1.comment
+               ->  Hash
+                     Output: t2.id, t2.val
+                     ->  Seq Scan on public.t2
+                           Output: t2.id, t2.val
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(16 rows)
+
+-- Test above case with different data distributions
+INSERT INTO t1 SELECT i, i, 'asd' FROM generate_series(1, 10000) s(i);
+ANALYZE t1;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.id, t1.comment, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id and t1.val = t2.val GROUP BY t1.id, t1.comment;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.id, t1.comment, (sum(t1.val))
+   ->  HashAggregate
+         Output: t1.id, t1.comment, sum(t1.val)
+         Group Key: t1.id, t1.comment
+         ->  Hash Join
+               Output: t1.id, t1.val, t1.comment
+               Hash Cond: ((t1.id = t2.id) AND (t1.val = t2.val))
+               ->  Seq Scan on public.t1
+                     Output: t1.id, t1.val, t1.comment
+               ->  Hash
+                     Output: t2.id, t2.val
+                     ->  Seq Scan on public.t2
+                           Output: t2.id, t2.val
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(16 rows)
+
+DELETE FROM t1;
+INSERT INTO t1 SELECT i % 10, 1, 'asd' FROM generate_series(1, 10000) s(i);
+ANALYZE t1;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.id, t1.comment, SUM(t1.val) FROM t1, t2 WHERE t1.id = t2.id and t1.val = t2.val GROUP BY t1.id, t1.comment;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.id, t1.comment, (sum(t1.val))
+   ->  HashAggregate
+         Output: t1.id, t1.comment, sum(t1.val)
+         Group Key: t1.id, t1.comment
+         ->  Hash Join
+               Output: t1.id, t1.val, t1.comment
+               Hash Cond: ((t1.id = t2.id) AND (t1.val = t2.val))
+               ->  Seq Scan on public.t1
+                     Output: t1.id, t1.val, t1.comment
+               ->  Hash
+                     Output: t2.id, t2.val
+                     ->  Seq Scan on public.t2
+                           Output: t2.id, t2.val
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(16 rows)
+
+-- Clear tables
+DROP TABLE t1, t2;
+-- Test case group 3: Pushdown in subquery and group from subquery.
+DROP TABLE IF EXISTS part, lineitem;
+NOTICE:  table "part" does not exist, skipping
+NOTICE:  table "lineitem" does not exist, skipping
+CREATE TABLE part (p_partkey int, p_size int, p_price int);
+CREATE TABLE lineitem (l_orderkey int, l_partkey int, l_amount int);
+SET enable_nestloop TO off;
+SET enable_hashjoin TO on;
+SET enable_mergejoin TO off;
+SET gp_enable_agg_pushdown TO ON;
+-- Pushdown within subquery.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT SUM(slp) FROM
+	(SELECT l_partkey, SUM(p_price) from lineitem, part
+		WHERE l_partkey = p_partkey AND p_size < 40
+		GROUP BY l_partkey
+		ORDER BY l_partkey
+		LIMIT 100) temp(lp, slp)
+	WHERE slp > 10;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Aggregate
+   Output: sum((sum(part.p_price)))
+   ->  Result
+         Output: (sum(part.p_price))
+         Filter: ((sum(part.p_price)) > 10)
+         ->  Limit
+               Output: lineitem.l_partkey, (sum(part.p_price))
+               ->  Gather Motion 3:1  (slice1; segments: 3)
+                     Output: lineitem.l_partkey, (sum(part.p_price))
+                     Merge Key: lineitem.l_partkey
+                     ->  Finalize GroupAggregate
+                           Output: lineitem.l_partkey, sum(part.p_price)
+                           Group Key: lineitem.l_partkey
+                           ->  Sort
+                                 Output: lineitem.l_partkey, (PARTIAL sum(part.p_price))
+                                 Sort Key: lineitem.l_partkey
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                       Output: lineitem.l_partkey, (PARTIAL sum(part.p_price))
+                                       Hash Key: lineitem.l_partkey
+                                       ->  Streaming Partial HashAggregate
+                                             Output: lineitem.l_partkey, PARTIAL sum(part.p_price)
+                                             Group Key: lineitem.l_partkey
+                                             ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                                                   Output: lineitem.l_partkey, part.p_price
+                                                   ->  Hash Join
+                                                         Output: lineitem.l_partkey, part.p_price
+                                                         Hash Cond: (part.p_partkey = lineitem.l_partkey)
+                                                         ->  Seq Scan on public.part
+                                                               Output: part.p_partkey, part.p_price
+                                                               Filter: (part.p_size < 40)
+                                                         ->  Hash
+                                                               Output: lineitem.l_partkey
+                                                               ->  Redistribute Motion 3:3  (slice4; segments: 3)
+                                                                     Output: lineitem.l_partkey
+                                                                     Hash Key: lineitem.l_partkey
+                                                                     ->  Seq Scan on public.lineitem
+                                                                           Output: lineitem.l_partkey
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(39 rows)
+
+-- Group base on subquery.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT p_partkey, SUM(l_amount) FROM
+	part, (SELECT l_partkey, l_amount + 10 
+			FROM lineitem ORDER BY l_partkey LIMIT 10000) li(l_partkey, l_amount)
+	WHERE l_partkey = p_partkey
+	GROUP BY p_partkey;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: part.p_partkey, (sum(((lineitem.l_amount + 10))))
+   ->  Finalize HashAggregate
+         Output: part.p_partkey, sum(((lineitem.l_amount + 10)))
+         Group Key: part.p_partkey
+         ->  Hash Join
+               Output: part.p_partkey, (PARTIAL sum(((lineitem.l_amount + 10))))
+               Hash Cond: (lineitem.l_partkey = part.p_partkey)
+               ->  Redistribute Motion 1:3  (slice2)
+                     Output: lineitem.l_partkey, (PARTIAL sum(((lineitem.l_amount + 10))))
+                     Hash Key: lineitem.l_partkey
+                     ->  Partial GroupAggregate
+                           Output: lineitem.l_partkey, PARTIAL sum(((lineitem.l_amount + 10)))
+                           Group Key: lineitem.l_partkey
+                           ->  Limit
+                                 Output: lineitem.l_partkey, ((lineitem.l_amount + 10))
+                                 ->  Gather Motion 3:1  (slice3; segments: 3)
+                                       Output: lineitem.l_partkey, ((lineitem.l_amount + 10))
+                                       Merge Key: lineitem.l_partkey
+                                       ->  Result
+                                             Output: lineitem.l_partkey, (lineitem.l_amount + 10)
+                                             ->  Sort
+                                                   Output: lineitem.l_partkey, lineitem.l_amount
+                                                   Sort Key: lineitem.l_partkey
+                                                   ->  Seq Scan on public.lineitem
+                                                         Output: lineitem.l_partkey, lineitem.l_amount
+               ->  Hash
+                     Output: part.p_partkey
+                     ->  Seq Scan on public.part
+                           Output: part.p_partkey
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(32 rows)
+
+-- Clear tables
+DROP TABLE part, lineitem;
+-- Test case group 4: construct grouped join rel from 2 plain rels
+DROP TABLE IF EXISTS vendor_pd, customer_pd, nation_pd;
+NOTICE:  table "vendor_pd" does not exist, skipping
+NOTICE:  table "customer_pd" does not exist, skipping
+NOTICE:  table "nation_pd" does not exist, skipping
+CREATE TABLE vendor_pd (v_id int, v_name VARCHAR(20)) WITH (APPENDONLY=true, ORIENTATION=column);
+CREATE TABLE customer_pd (c_id int, c_v_id int, c_n_id int, c_type int, c_consumption int);
+CREATE TABLE nation_pd (n_id int, n_name VARCHAR(20), n_type int, n_population int) WITH (APPENDONLY=true, ORIENTATION=column);
+INSERT INTO nation_pd SELECT i, 'abc', 1, 1 from generate_series(1, 100) s(i);
+INSERT INTO customer_pd SELECT i, i % 100, i % 100, 1, 100 from generate_series(1, 10000) s(i);
+ANALYZE nation_pd, customer_pd;
+-- For each vendor, calculate the total consumption of qualified customers
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT v_id, v_name, SUM(c_consumption)
+	FROM vendor_pd, customer_pd, nation_pd
+	WHERE v_id = c_v_id AND c_n_id = n_id AND c_id > n_population
+	GROUP BY v_id, v_name;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: vendor_pd.v_id, vendor_pd.v_name, (sum(customer_pd.c_consumption))
+   ->  Finalize HashAggregate
+         Output: vendor_pd.v_id, vendor_pd.v_name, sum(customer_pd.c_consumption)
+         Group Key: vendor_pd.v_id, vendor_pd.v_name
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: vendor_pd.v_id, vendor_pd.v_name, (PARTIAL sum(customer_pd.c_consumption))
+               Hash Key: vendor_pd.v_id, vendor_pd.v_name
+               ->  Streaming Partial HashAggregate
+                     Output: vendor_pd.v_id, vendor_pd.v_name, PARTIAL sum(customer_pd.c_consumption)
+                     Group Key: vendor_pd.v_id, vendor_pd.v_name
+                     ->  Hash Join
+                           Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_consumption
+                           Hash Cond: (nation_pd.n_id = customer_pd.c_n_id)
+                           Join Filter: (customer_pd.c_id > nation_pd.n_population)
+                           ->  Seq Scan on public.nation_pd
+                                 Output: nation_pd.n_id, nation_pd.n_population
+                           ->  Hash
+                                 Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_id, customer_pd.c_n_id, customer_pd.c_consumption
+                                 ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                       Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_id, customer_pd.c_n_id, customer_pd.c_consumption
+                                       ->  Hash Join
+                                             Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_id, customer_pd.c_n_id, customer_pd.c_consumption
+                                             Hash Cond: (customer_pd.c_v_id = vendor_pd.v_id)
+                                             ->  Seq Scan on public.customer_pd
+                                                   Output: customer_pd.c_id, customer_pd.c_v_id, customer_pd.c_n_id, customer_pd.c_consumption
+                                             ->  Hash
+                                                   Output: vendor_pd.v_id, vendor_pd.v_name
+                                                   ->  Broadcast Motion 3:3  (slice4; segments: 3)
+                                                         Output: vendor_pd.v_id, vendor_pd.v_name
+                                                         ->  Seq Scan on public.vendor_pd
+                                                               Output: vendor_pd.v_id, vendor_pd.v_name
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(34 rows)
+
+-- For each vendor/c_type/n_type, calculate the total consumption of qualified customers
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT v_id, c_type, n_type, SUM(c_consumption)
+	FROM vendor_pd, customer_pd, nation_pd
+	WHERE v_id = c_v_id AND c_n_id = n_id AND c_id > n_population
+	GROUP BY v_id, c_type, n_type;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type, (sum(customer_pd.c_consumption))
+   ->  Finalize GroupAggregate
+         Output: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type, sum(customer_pd.c_consumption)
+         Group Key: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type
+         ->  Sort
+               Output: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type, (PARTIAL sum(customer_pd.c_consumption))
+               Sort Key: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type, (PARTIAL sum(customer_pd.c_consumption))
+                     Hash Key: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type
+                     ->  Streaming Partial HashAggregate
+                           Output: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type, PARTIAL sum(customer_pd.c_consumption)
+                           Group Key: vendor_pd.v_id, customer_pd.c_type, nation_pd.n_type
+                           ->  Hash Join
+                                 Output: vendor_pd.v_id, customer_pd.c_type, customer_pd.c_consumption, nation_pd.n_type
+                                 Hash Cond: (nation_pd.n_id = customer_pd.c_n_id)
+                                 Join Filter: (customer_pd.c_id > nation_pd.n_population)
+                                 ->  Seq Scan on public.nation_pd
+                                       Output: nation_pd.n_id, nation_pd.n_type, nation_pd.n_population
+                                 ->  Hash
+                                       Output: vendor_pd.v_id, customer_pd.c_id, customer_pd.c_n_id, customer_pd.c_type, customer_pd.c_consumption
+                                       ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                             Output: vendor_pd.v_id, customer_pd.c_id, customer_pd.c_n_id, customer_pd.c_type, customer_pd.c_consumption
+                                             ->  Hash Join
+                                                   Output: vendor_pd.v_id, customer_pd.c_id, customer_pd.c_n_id, customer_pd.c_type, customer_pd.c_consumption
+                                                   Hash Cond: (customer_pd.c_v_id = vendor_pd.v_id)
+                                                   ->  Seq Scan on public.customer_pd
+                                                         Output: customer_pd.c_id, customer_pd.c_v_id, customer_pd.c_n_id, customer_pd.c_type, customer_pd.c_consumption
+                                                   ->  Hash
+                                                         Output: vendor_pd.v_id
+                                                         ->  Broadcast Motion 3:3  (slice4; segments: 3)
+                                                               Output: vendor_pd.v_id
+                                                               ->  Seq Scan on public.vendor_pd
+                                                                     Output: vendor_pd.v_id
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(37 rows)
+
+-- For each vendor/n_type, calculate the total consumption of customers from nation with condition.
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT v_id, v_name, n_type, SUM(c_consumption)
+	FROM vendor_pd, customer_pd, nation_pd
+	WHERE v_id = c_v_id AND c_n_id = n_id AND n_population > 100
+	GROUP BY v_id, v_name, n_type;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ GroupAggregate
+   Output: vendor_pd.v_id, vendor_pd.v_name, nation_pd.n_type, sum(customer_pd.c_consumption)
+   Group Key: vendor_pd.v_id, vendor_pd.v_name, nation_pd.n_type
+   ->  Sort
+         Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_consumption, nation_pd.n_type
+         Sort Key: vendor_pd.v_id, vendor_pd.v_name, nation_pd.n_type
+         ->  Hash Join
+               Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_consumption, nation_pd.n_type
+               Hash Cond: (customer_pd.c_n_id = nation_pd.n_id)
+               ->  Gather Motion 3:1  (slice1; segments: 3)
+                     Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_n_id, customer_pd.c_consumption
+                     ->  Hash Join
+                           Output: vendor_pd.v_id, vendor_pd.v_name, customer_pd.c_n_id, customer_pd.c_consumption
+                           Hash Cond: (customer_pd.c_v_id = vendor_pd.v_id)
+                           ->  Seq Scan on public.customer_pd
+                                 Output: customer_pd.c_v_id, customer_pd.c_n_id, customer_pd.c_consumption
+                           ->  Hash
+                                 Output: vendor_pd.v_id, vendor_pd.v_name
+                                 ->  Broadcast Motion 3:3  (slice2; segments: 3)
+                                       Output: vendor_pd.v_id, vendor_pd.v_name
+                                       ->  Seq Scan on public.vendor_pd
+                                             Output: vendor_pd.v_id, vendor_pd.v_name
+               ->  Hash
+                     Output: nation_pd.n_id, nation_pd.n_type
+                     ->  Gather Motion 3:1  (slice3; segments: 3)
+                           Output: nation_pd.n_id, nation_pd.n_type
+                           ->  Seq Scan on public.nation_pd
+                                 Output: nation_pd.n_id, nation_pd.n_type
+                                 Filter: (nation_pd.n_population > 100)
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(31 rows)
+
+-- Clear tables
+DROP TABLE vendor_pd, customer_pd, nation_pd;
+-- Test case group 4: OLAP-like cases
+DROP TABLE IF EXISTS fact, dim;
+NOTICE:  table "fact" does not exist, skipping
+NOTICE:  table "dim" does not exist, skipping
+CREATE TABLE fact (id int, did int, fact_time int, val int) WITH (APPENDONLY=true, ORIENTATION=column);
+CREATE TABLE dim (did int, proj_name varchar(20), brand int, model int);
+INSERT INTO dim SELECT i % 100, 1, 1 FROM generate_series(1, 100) s(i);
+INSERT INTO fact SELECT i % 10, i % 100, 30, 1 FROM generate_series(1, 10000) s(i);
+ANALYZE dim, fact;
+-- Test sum fact vals group by dim column
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT dim.did, sum(val)
+	FROM fact JOIN dim ON fact.did = dim.did
+	WHERE fact_time > 10 AND fact_time < 2000
+	GROUP BY dim.did;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: dim.did, (sum(fact.val))
+   ->  Finalize HashAggregate
+         Output: dim.did, sum(fact.val)
+         Group Key: dim.did
+         ->  Hash Join
+               Output: dim.did, (PARTIAL sum(fact.val))
+               Hash Cond: (fact.did = dim.did)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: fact.did, (PARTIAL sum(fact.val))
+                     Hash Key: fact.did
+                     ->  Streaming Partial HashAggregate
+                           Output: fact.did, PARTIAL sum(fact.val)
+                           Group Key: fact.did
+                           ->  Seq Scan on public.fact
+                                 Output: fact.did, fact.val
+                                 Filter: ((fact.fact_time > 10) AND (fact.fact_time < 2000))
+               ->  Hash
+                     Output: dim.did
+                     ->  Seq Scan on public.dim
+                           Output: dim.did
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(23 rows)
+
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT dim.proj_name, sum(val)
+	FROM fact JOIN dim ON fact.did = dim.did
+	WHERE fact_time > 10 AND fact_time < 2000
+	GROUP BY dim.proj_name;
+                                                                                      QUERY PLAN                                                                                      
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: dim.proj_name, (sum(fact.val))
+   ->  Finalize GroupAggregate
+         Output: dim.proj_name, sum(fact.val)
+         Group Key: dim.proj_name
+         ->  Sort
+               Output: dim.proj_name, (PARTIAL sum(fact.val))
+               Sort Key: dim.proj_name
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: dim.proj_name, (PARTIAL sum(fact.val))
+                     Hash Key: dim.proj_name
+                     ->  Streaming Partial HashAggregate
+                           Output: dim.proj_name, PARTIAL sum(fact.val)
+                           Group Key: dim.proj_name
+                           ->  Hash Join
+                                 Output: fact.val, dim.proj_name
+                                 Hash Cond: (fact.did = dim.did)
+                                 ->  Seq Scan on public.fact
+                                       Output: fact.did, fact.val
+                                       Filter: ((fact.fact_time > 10) AND (fact.fact_time < 2000))
+                                 ->  Hash
+                                       Output: dim.did, dim.proj_name
+                                       ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                             Output: dim.did, dim.proj_name
+                                             ->  Seq Scan on public.dim
+                                                   Output: dim.did, dim.proj_name
+ Settings: enable_hashjoin = 'on', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(28 rows)
+
+-- Clear tables
+DROP TABLE dim, fact;
+-- Test case group 5: partition table and inherit table
+SET enable_incremental_sort TO off;
+DROP TABLE IF EXISTS pagg_pd;
+NOTICE:  table "pagg_pd" does not exist, skipping
+CREATE TABLE pagg_pd (a int, b int, c text, d int) PARTITION BY LIST(c);
+CREATE TABLE pagg_pd_p1 PARTITION OF pagg_pd FOR VALUES IN ('0000', '0001', '0002', '0003', '0004');
+NOTICE:  table has parent, setting distribution columns to match parent table
+CREATE TABLE pagg_pd_p2 PARTITION OF pagg_pd FOR VALUES IN ('0005', '0006', '0007', '0008');
+NOTICE:  table has parent, setting distribution columns to match parent table
+CREATE TABLE pagg_pd_p3 PARTITION OF pagg_pd FOR VALUES IN ('0009', '0010', '0011');
+NOTICE:  table has parent, setting distribution columns to match parent table
+INSERT INTO pagg_pd SELECT i % 20, i % 30, to_char(i % 12, 'FM0000'), i % 30 FROM generate_series(0, 2999) i;
+ANALYZE pagg_pd;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.c, sum(t1.a)
+	FROM pagg_pd t1 JOIN pagg_pd t2 ON t1.c < t2.c
+	GROUP BY t1.c
+	ORDER BY 1, 2;
+                                                                                                      QUERY PLAN                                                                                                       
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.c, (sum(t1.a))
+   Merge Key: t1.c, (sum(t1.a))
+   ->  Sort
+         Output: t1.c, (sum(t1.a))
+         Sort Key: t1.c, (sum(t1.a))
+         ->  Finalize HashAggregate
+               Output: t1.c, sum(t1.a)
+               Group Key: t1.c
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: t1.c, (PARTIAL sum(t1.a))
+                     Hash Key: t1.c
+                     ->  Streaming Partial HashAggregate
+                           Output: t1.c, PARTIAL sum(t1.a)
+                           Group Key: t1.c
+                           ->  Nested Loop
+                                 Output: t1.a, t1.c
+                                 Join Filter: (t1.c < t2.c)
+                                 ->  Dynamic Seq Scan on public.pagg_pd t1
+                                       Output: t1.a, t1.c
+                                       Number of partitions to scan: 3 (out of 3)
+                                 ->  Materialize
+                                       Output: t2.c
+                                       ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                             Output: t2.c
+                                             ->  Dynamic Seq Scan on public.pagg_pd t2
+                                                   Output: t2.c
+                                                   Number of partitions to scan: 3 (out of 3)
+ Settings: enable_hashjoin = 'on', enable_incremental_sort = 'off', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(30 rows)
+
+SELECT t1.c, sum(t1.a)
+	FROM pagg_pd t1 JOIN pagg_pd t2 ON t1.c < t2.c
+	GROUP BY t1.c
+	ORDER BY 1, 2;
+  c   |   sum   
+------+---------
+ 0000 | 5500000
+ 0001 | 5625000
+ 0002 | 5625000
+ 0003 | 5500000
+ 0004 | 3500000
+ 0005 | 3375000
+ 0006 | 3125000
+ 0007 | 2750000
+ 0008 | 1500000
+ 0009 | 1125000
+ 0010 |  625000
+(11 rows)
+
+DROP TABLE pagg_pd;
+CREATE TABLE pagg_pd_p (a int, b int);
+DROP TABLE IF EXISTS pagg_pd, pagg_pd_p;
+NOTICE:  table "pagg_pd" does not exist, skipping
+CREATE TABLE pagg_pd_p (a int, b int, c text) PARTITION BY LIST(c);
+DROP TABLE IF EXISTS pagg_pd, pagg_pd_p;
+NOTICE:  table "pagg_pd" does not exist, skipping
+CREATE TABLE pagg_pd_p (a int, b int);
+CREATE TABLE pagg_pd (c text, d int) inherits (pagg_pd_p);
+NOTICE:  table has parent, setting distribution columns to match parent table
+INSERT INTO pagg_pd SELECT i % 20, i % 30, to_char(i % 12, 'FM0000'), i % 30 FROM generate_series(0, 2999) i;
+ANALYZE pagg_pd;
+EXPLAIN (VERBOSE on, COSTS off)
+SELECT t1.c, sum(t1.a)
+	FROM pagg_pd t1 JOIN pagg_pd t2 ON t1.c < t2.c
+	GROUP BY t1.c
+	ORDER BY 1, 2;
+                                                                                                      QUERY PLAN                                                                                                       
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.c, (sum(t1.a))
+   Merge Key: t1.c, (sum(t1.a))
+   ->  Sort
+         Output: t1.c, (sum(t1.a))
+         Sort Key: t1.c, (sum(t1.a))
+         ->  Finalize HashAggregate
+               Output: t1.c, sum(t1.a)
+               Group Key: t1.c
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: t1.c, (PARTIAL sum(t1.a))
+                     Hash Key: t1.c
+                     ->  Streaming Partial HashAggregate
+                           Output: t1.c, PARTIAL sum(t1.a)
+                           Group Key: t1.c
+                           ->  Nested Loop
+                                 Output: t1.a, t1.c
+                                 Join Filter: (t1.c < t2.c)
+                                 ->  Seq Scan on public.pagg_pd t1
+                                       Output: t1.a, t1.c
+                                 ->  Materialize
+                                       Output: t2.c
+                                       ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                             Output: t2.c
+                                             ->  Seq Scan on public.pagg_pd t2
+                                                   Output: t2.c
+ Settings: enable_hashjoin = 'on', enable_incremental_sort = 'off', enable_mergejoin = 'off', enable_nestloop = 'off', enable_parallel = 'off', enable_seqscan = 'on', gp_enable_agg_pushdown = 'on', optimizer = 'on'
+ Optimizer: GPORCA
+(28 rows)
+
+SELECT t1.c, sum(t1.a)
+	FROM pagg_pd t1 JOIN pagg_pd t2 ON t1.c < t2.c
+	GROUP BY t1.c
+	ORDER BY 1, 2;
+  c   |   sum   
+------+---------
+ 0000 | 5500000
+ 0001 | 5625000
+ 0002 | 5625000
+ 0003 | 5500000
+ 0004 | 3500000
+ 0005 | 3375000
+ 0006 | 3125000
+ 0007 | 2750000
+ 0008 | 1500000
+ 0009 | 1125000
+ 0010 |  625000
+(11 rows)
+
+DROP TABLE pagg_pd, pagg_pd_p;
+RESET enable_incremental_sort;
+-- Clear settings
+RESET optimizer_force_multistage_agg;
+SET gp_enable_agg_pushdown TO off;
+SET enable_seqscan TO on;
+SET enable_nestloop TO on;
+SET enable_hashjoin TO on;
+SET enable_mergejoin TO on;
diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index fadb82728f1..51e113ef8b6 100644
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -1315,7 +1315,7 @@ explain (costs off) select a,c from t1 group by a,c,d;
          Group Key: a, c, d
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Hash Key: a, c, d
-               ->  HashAggregate
+               ->  Streaming HashAggregate
                      Group Key: a, c, d
                      ->  Seq Scan on t1
  Optimizer: Postgres query optimizer
@@ -3264,6 +3264,8 @@ drop table agg_hash_3;
 drop table agg_hash_4;
 -- GitHub issue https://github.com/greenplum-db/gpdb/issues/12061
 -- numsegments of the general locus should be -1 on create_minmaxagg_path
+set enable_indexscan = off;
+set enable_indexonlyscan = off;
 explain analyze select count(*) from pg_class, (select count(*) > 0 from (select count(*) from pg_class where relnatts > 8) x) y;
                                                       QUERY PLAN                                                       
 -----------------------------------------------------------------------------------------------------------------------
@@ -3279,3 +3281,216 @@ explain analyze select count(*) from pg_class, (select count(*) > 0 from (select
  Execution Time: 0.302 ms
 (10 rows)
 
+reset enable_indexscan;
+reset enable_indexonlyscan;
+-- test aggno
+create table tgb1(v1 int, v2 int, v3 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table tgb2(v1 int, v2 int, v3 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into tgb1 values(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3);
+insert into tgb2 values(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3);
+set debug_print_aggref_in_explain to on;
+explain select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+                                                                                                                                                                                     QUERY PLAN                                                                                                                                                                                     
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=145986.91..145999.46 rows=4 width=12)
+   ->  Finalize HashAggregate  (cost=145986.91..145999.41 rows=1 width=12)
+         Group Key: tgb2.v2
+         Filter: ((sum((tgb1.v3 * tgb2.v3)) > 100) AND (sum((tgb1.v3 * tgb2.v3)) > 101) AND (sum((tgb1.v3 * tgb2.v3)) < 1020) AND (sum((tgb1.v3 * tgb2.v3)) <> 103) AND (sum((tgb1.v3 * tgb2.v3)) >= 104) AND (avg((tgb1.v3 * tgb2.v3)) <> '11'::numeric) AND (avg((tgb1.v3 * tgb2.v3)) <> '12'::numeric) AND (avg((tgb2.v1 * tgb1.v1)) <> '13'::numeric) AND (sum(tgb1.v3) > 200))
+         AggRefs(TargetList): [(0, 0)]
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=145944.41..145974.41 rows=1000 width=84)
+               Hash Key: tgb2.v2
+               ->  Streaming Partial HashAggregate  (cost=145944.41..145954.41 rows=1000 width=84)
+                     Group Key: tgb2.v2
+                     AggRefs(TargetList): [(0, 0), (1, 1), (2, 2), (3, 3)]
+                     ->  Hash Join  (cost=618.25..105488.34 rows=2022803 width=20)
+                           Hash Cond: (tgb1.v1 = tgb2.v1)
+                           ->  Seq Scan on tgb1  (cost=0.00..293.67 rows=25967 width=8)
+                           ->  Hash  (cost=293.67..293.67 rows=25967 width=12)
+                                 ->  Seq Scan on tgb2  (cost=0.00..293.67 rows=25967 width=12)
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+ sum 
+-----
+(0 rows)
+
+set optimizer_force_multistage_agg to on;
+explain select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+                                                                                                                                                                                     QUERY PLAN                                                                                                                                                                                     
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=145986.91..145999.46 rows=4 width=12)
+   ->  Finalize HashAggregate  (cost=145986.91..145999.41 rows=1 width=12)
+         Group Key: tgb2.v2
+         Filter: ((sum((tgb1.v3 * tgb2.v3)) > 100) AND (sum((tgb1.v3 * tgb2.v3)) > 101) AND (sum((tgb1.v3 * tgb2.v3)) < 1020) AND (sum((tgb1.v3 * tgb2.v3)) <> 103) AND (sum((tgb1.v3 * tgb2.v3)) >= 104) AND (avg((tgb1.v3 * tgb2.v3)) <> '11'::numeric) AND (avg((tgb1.v3 * tgb2.v3)) <> '12'::numeric) AND (avg((tgb2.v1 * tgb1.v1)) <> '13'::numeric) AND (sum(tgb1.v3) > 200))
+         AggRefs(TargetList): [(0, 0)]
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=145944.41..145974.41 rows=1000 width=84)
+               Hash Key: tgb2.v2
+               ->  Streaming Partial HashAggregate  (cost=145944.41..145954.41 rows=1000 width=84)
+                     Group Key: tgb2.v2
+                     AggRefs(TargetList): [(0, 0), (1, 1), (2, 2), (3, 3)]
+                     ->  Hash Join  (cost=618.25..105488.34 rows=2022803 width=20)
+                           Hash Cond: (tgb1.v1 = tgb2.v1)
+                           ->  Seq Scan on tgb1  (cost=0.00..293.67 rows=25967 width=8)
+                           ->  Hash  (cost=293.67..293.67 rows=25967 width=12)
+                                 ->  Seq Scan on tgb2  (cost=0.00..293.67 rows=25967 width=12)
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+ sum 
+-----
+(0 rows)
+
+reset debug_print_aggref_in_explain;
+reset optimizer_force_multistage_agg;
+-- test the optimizer_agg_pds_strategy
+DROP TABLE IF EXISTS pds_t1;
+NOTICE:  table "pds_t1" does not exist, skipping
+create table pds_t1(v1 int, v2 text, v3 int, v4 text, v5 int, v6 text) DISTRIBUTED BY (v1);
+set optimizer_agg_pds_strategy to 0;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: v2, v3
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: v2, v3
+               ->  Streaming HashAggregate
+                     Group Key: v2, v3
+                     ->  Seq Scan on pds_t1
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+set optimizer_agg_pds_strategy to 1;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: v2, v3
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: v2, v3
+               ->  Streaming HashAggregate
+                     Group Key: v2, v3
+                     ->  Seq Scan on pds_t1
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+set optimizer_agg_pds_strategy to 2;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: v2, v3
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: v2, v3
+               ->  Streaming HashAggregate
+                     Group Key: v2, v3
+                     ->  Seq Scan on pds_t1
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+set optimizer_agg_pds_strategy to 3;
+explain (costs off) select v2,v3,v4,v5,v6 from pds_t1 group by v2,v3,v4,v5,v6;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: v2, v3, v4, v5, v6
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: v2, v3, v4, v5, v6
+               ->  Streaming HashAggregate
+                     Group Key: v2, v3, v4, v5, v6
+                     ->  Seq Scan on pds_t1
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+-- We can't dedup the "Redistribute Motion", cause in this step we can't know the 
+-- distribution of output column which from the underlying operators.
+-- So you need to be cautious when opening this guc.
+set optimizer_agg_pds_strategy to 1;
+explain (costs off) select v1,v2,v3 from pds_t1 group by v3,v2,v1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: v3, v2, v1
+         ->  Seq Scan on pds_t1
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+set optimizer_agg_pds_strategy to 0;
+explain (costs off) select v1,v2,v3 from pds_t1 group by v3,v2,v1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: v3, v2, v1
+         ->  Seq Scan on pds_t1
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+reset optimizer_agg_pds_strategy;
diff --git a/src/test/regress/expected/aggregates_optimizer.out b/src/test/regress/expected/aggregates_optimizer.out
index 86dd330de84..73fcea90841 100644
--- a/src/test/regress/expected/aggregates_optimizer.out
+++ b/src/test/regress/expected/aggregates_optimizer.out
@@ -3430,6 +3430,8 @@ drop table agg_hash_3;
 drop table agg_hash_4;
 -- GitHub issue https://github.com/greenplum-db/gpdb/issues/12061
 -- numsegments of the general locus should be -1 on create_minmaxagg_path
+set enable_indexscan = off;
+set enable_indexonlyscan = off;
 explain analyze select count(*) from pg_class, (select count(*) > 0 from (select count(*) from pg_class where relnatts > 8) x) y;
 INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner
 DETAIL:  Falling back to Postgres-based planner because GPORCA does not support the following feature: Queries on master-only tables
@@ -3448,3 +3450,222 @@ DETAIL:  Falling back to Postgres-based planner because GPORCA does not support
  Execution Time: 0.198 ms
 (11 rows)
 
+reset enable_indexscan;
+reset enable_indexonlyscan;
+-- test aggno
+create table tgb1(v1 int, v2 int, v3 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table tgb2(v1 int, v2 int, v3 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into tgb1 values(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3);
+insert into tgb2 values(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3);
+set debug_print_aggref_in_explain to on;
+explain select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+                                                                                                                                                                                              QUERY PLAN                                                                                                                                                                                              
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=1 width=8)
+   ->  Result  (cost=0.00..862.00 rows=1 width=8)
+         Filter: (((sum((tgb1.v3 * tgb2.v3))) > 100) AND ((sum((tgb1.v3 * tgb2.v3))) > 101) AND ((sum((tgb1.v3 * tgb2.v3))) < 1020) AND ((sum((tgb1.v3 * tgb2.v3))) <> 103) AND ((sum((tgb1.v3 * tgb2.v3))) >= 104) AND ((avg((tgb1.v3 * tgb2.v3))) <> '11'::numeric) AND ((avg((tgb1.v3 * tgb2.v3))) <> '12'::numeric) AND ((avg((tgb2.v1 * tgb1.v1))) <> '13'::numeric) AND ((sum(tgb1.v3)) > 200))
+         ->  HashAggregate  (cost=0.00..862.00 rows=1 width=80)
+               Group Key: tgb2.v2
+               AggRefs(TargetList): [(0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (1, 1), (1, 1), (2, 2), (3, 3)]
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.00 rows=1 width=20)
+                     Hash Key: tgb2.v2
+                     ->  Hash Join  (cost=0.00..862.00 rows=1 width=20)
+                           Hash Cond: (tgb2.v1 = tgb1.v1)
+                           ->  Seq Scan on tgb2  (cost=0.00..431.00 rows=1 width=12)
+                           ->  Hash  (cost=431.00..431.00 rows=1 width=8)
+                                 ->  Seq Scan on tgb1  (cost=0.00..431.00 rows=1 width=8)
+ Optimizer: GPORCA
+(14 rows)
+
+select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+ sum 
+-----
+(0 rows)
+
+set optimizer_force_multistage_agg to on;
+explain select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+                                                                                                                                                                                              QUERY PLAN                                                                                                                                                                                              
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=1 width=8)
+   ->  Result  (cost=0.00..862.00 rows=1 width=8)
+         Filter: (((sum((tgb1.v3 * tgb2.v3))) > 100) AND ((sum((tgb1.v3 * tgb2.v3))) > 101) AND ((sum((tgb1.v3 * tgb2.v3))) < 1020) AND ((sum((tgb1.v3 * tgb2.v3))) <> 103) AND ((sum((tgb1.v3 * tgb2.v3))) >= 104) AND ((avg((tgb1.v3 * tgb2.v3))) <> '11'::numeric) AND ((avg((tgb1.v3 * tgb2.v3))) <> '12'::numeric) AND ((avg((tgb2.v1 * tgb1.v1))) <> '13'::numeric) AND ((sum(tgb1.v3)) > 200))
+         ->  Finalize HashAggregate  (cost=0.00..862.00 rows=1 width=80)
+               Group Key: tgb2.v2
+               AggRefs(TargetList): [(0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9)]
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.00 rows=1 width=84)
+                     Hash Key: tgb2.v2
+                     ->  Streaming Partial HashAggregate  (cost=0.00..862.00 rows=1 width=84)
+                           Group Key: tgb2.v2
+                           AggRefs(TargetList): [(0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (1, 1), (1, 1), (2, 2), (3, 3)]
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..862.00 rows=1 width=20)
+                                 ->  Hash Join  (cost=0.00..862.00 rows=1 width=20)
+                                       Hash Cond: (tgb2.v1 = tgb1.v1)
+                                       ->  Seq Scan on tgb2  (cost=0.00..431.00 rows=1 width=12)
+                                       ->  Hash  (cost=431.00..431.00 rows=1 width=8)
+                                             ->  Seq Scan on tgb1  (cost=0.00..431.00 rows=1 width=8)
+ Optimizer: GPORCA
+(18 rows)
+
+select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+ sum 
+-----
+(0 rows)
+
+reset debug_print_aggref_in_explain;
+reset optimizer_force_multistage_agg;
+-- test the optimizer_agg_pds_strategy
+DROP TABLE IF EXISTS pds_t1;
+NOTICE:  table "pds_t1" does not exist, skipping
+create table pds_t1(v1 int, v2 text, v3 int, v4 text, v5 int, v6 text) DISTRIBUTED BY (v1);
+set optimizer_agg_pds_strategy to 0;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  GroupAggregate
+         Group Key: v2, v3
+         ->  Sort
+               Sort Key: v2, v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: v2, v3
+                     ->  Seq Scan on pds_t1
+ Optimizer: GPORCA
+(9 rows)
+
+set optimizer_agg_pds_strategy to 1;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  GroupAggregate
+         Group Key: v2, v3
+         ->  Sort
+               Sort Key: v2, v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: v2
+                     ->  Seq Scan on pds_t1
+ Optimizer: GPORCA
+(9 rows)
+
+set optimizer_agg_pds_strategy to 2;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  GroupAggregate
+         Group Key: v2, v3
+         ->  Sort
+               Sort Key: v2, v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: v3
+                     ->  Seq Scan on pds_t1
+ Optimizer: GPORCA
+(9 rows)
+
+set optimizer_agg_pds_strategy to 3;
+explain (costs off) select v2,v3,v4,v5,v6 from pds_t1 group by v2,v3,v4,v5,v6;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  GroupAggregate
+         Group Key: v2, v3, v4, v5, v6
+         ->  Sort
+               Sort Key: v2, v3, v4, v5, v6
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: v3, v5
+                     ->  Seq Scan on pds_t1
+ Optimizer: GPORCA
+(9 rows)
+
+-- We can't dedup the "Redistribute Motion", cause in this step we can't know the 
+-- distribution of output column which from the underlying operators.
+-- So you need to be cautious when opening this guc.
+set optimizer_agg_pds_strategy to 1;
+explain (costs off) select v1,v2,v3 from pds_t1 group by v3,v2,v1;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  GroupAggregate
+         Group Key: v3, v2, v1
+         ->  Sort
+               Sort Key: v3, v2, v1
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: v3
+                     ->  Seq Scan on pds_t1
+ Optimizer: GPORCA
+(9 rows)
+
+set optimizer_agg_pds_strategy to 0;
+explain (costs off) select v1,v2,v3 from pds_t1 group by v3,v2,v1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  GroupAggregate
+         Group Key: v3, v2, v1
+         ->  Sort
+               Sort Key: v3, v2, v1
+               ->  Seq Scan on pds_t1
+ Optimizer: GPORCA
+(7 rows)
+
+reset optimizer_agg_pds_strategy;
diff --git a/src/test/regress/expected/aqumv.out b/src/test/regress/expected/aqumv.out
index 463b0b37032..608b4db85a4 100644
--- a/src/test/regress/expected/aqumv.out
+++ b/src/test/regress/expected/aqumv.out
@@ -3374,6 +3374,477 @@ select * from t_insert;
  1000
 (1 row)
 
+abort;
+-- Test view has Group By
+begin;
+create table t0 as select i as a, i+1 as b , i+2 as c, i+3 as d from generate_series(1, 5) i;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+analyze t0;
+create materialized view mv_group_0 as select c, b, sum(a), count(b) from t0 group by b, c;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'b, c' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create materialized view mv_group_1 as select c, b, count(b) from t0 where a > 3 group by c, b;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'c, b' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+analyze mv_group_0;
+analyze mv_group_1;
+-- no qual, exactly match
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select c, b, sum(a), count(b) from t0 group by b, c;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: c, b, (sum(a)), (count(b))
+   ->  Finalize HashAggregate
+         Output: c, b, sum(a), count(b)
+         Group Key: t0.b, t0.c
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: c, b, (PARTIAL sum(a)), (PARTIAL count(b))
+               Hash Key: b, c
+               ->  Streaming Partial HashAggregate
+                     Output: c, b, PARTIAL sum(a), PARTIAL count(b)
+                     Group Key: t0.b, t0.c
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+select c, b, sum(a), count(b) from t0 group by b, c;
+ c | b | sum  | count 
+---+---+------+-------
+ 6 | 5 | 2048 |   512
+ 3 | 2 |  512 |   512
+ 5 | 4 | 1536 |   512
+ 4 | 3 | 1024 |   512
+ 7 | 6 | 2560 |   512
+(5 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select c, b, sum(a), count(b) from t0 group by b, c;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: c, b, sum, count
+   ->  Seq Scan on aqumv.mv_group_0
+         Output: c, b, sum, count
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+select c, b, sum(a), count(b) from t0 group by b, c;
+ c | b | sum  | count 
+---+---+------+-------
+ 6 | 5 | 2048 |   512
+ 3 | 2 |  512 |   512
+ 5 | 4 | 1536 |   512
+ 4 | 3 | 1024 |   512
+ 7 | 6 | 2560 |   512
+(5 rows)
+
+-- no qual, different order
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select b, sum(a), c, count(b) from t0 group by c, b;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: b, (sum(a)), c, (count(b))
+   ->  Finalize HashAggregate
+         Output: b, sum(a), c, count(b)
+         Group Key: t0.c, t0.b
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: b, c, (PARTIAL sum(a)), (PARTIAL count(b))
+               Hash Key: c, b
+               ->  Streaming Partial HashAggregate
+                     Output: b, c, PARTIAL sum(a), PARTIAL count(b)
+                     Group Key: t0.c, t0.b
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+select b, sum(a), c, count(b) from t0 group by c, b;
+ b | sum  | c | count 
+---+------+---+-------
+ 6 | 2560 | 7 |   512
+ 4 | 1536 | 5 |   512
+ 5 | 2048 | 6 |   512
+ 3 | 1024 | 4 |   512
+ 2 |  512 | 3 |   512
+(5 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select b, sum(a), c, count(b) from t0 group by c, b;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: b, sum, c, count
+   ->  Seq Scan on aqumv.mv_group_0
+         Output: b, sum, c, count
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+select b, sum(a), c, count(b) from t0 group by c, b;
+ b | sum  | c | count 
+---+------+---+-------
+ 5 | 2048 | 6 |   512
+ 2 |  512 | 3 |   512
+ 4 | 1536 | 5 |   512
+ 3 | 1024 | 4 |   512
+ 6 | 2560 | 7 |   512
+(5 rows)
+
+-- no qual, different expr
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: (((b + c) + 1)), ((sum(a) + count(b))), c, b
+   ->  Finalize HashAggregate
+         Output: ((b + c) + 1), (sum(a) + count(b)), c, b
+         Group Key: t0.c, t0.b
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: c, b, (PARTIAL sum(a)), (PARTIAL count(b))
+               Hash Key: c, b
+               ->  Streaming Partial HashAggregate
+                     Output: c, b, PARTIAL sum(a), PARTIAL count(b)
+                     Group Key: t0.c, t0.b
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+ ?column? | ?column? 
+----------+----------
+        8 |     1536
+       14 |     3072
+       10 |     2048
+       12 |     2560
+        6 |     1024
+(5 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: (((b + c) + 1)), ((sum + count)), c, b
+   ->  Seq Scan on aqumv.mv_group_0
+         Output: ((b + c) + 1), (sum + count), c, b
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+ ?column? | ?column? 
+----------+----------
+        8 |     1536
+       14 |     3072
+       12 |     2560
+        6 |     1024
+       10 |     2048
+(5 rows)
+
+-- no qual, should not match 
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select c, count(b) from t0 group by c ;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: c, (count(b))
+   ->  Finalize HashAggregate
+         Output: c, count(b)
+         Group Key: t0.c
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: c, (PARTIAL count(b))
+               Hash Key: c
+               ->  Streaming Partial HashAggregate
+                     Output: c, PARTIAL count(b)
+                     Group Key: t0.c
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+select c, count(b) from t0 group by c ;
+ c | count 
+---+-------
+ 4 |   512
+ 3 |   512
+ 7 |   512
+ 5 |   512
+ 6 |   512
+(5 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select c, count(b) from t0 group by c ;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: c, (count(b))
+   ->  Finalize HashAggregate
+         Output: c, count(b)
+         Group Key: t0.c
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: c, (PARTIAL count(b))
+               Hash Key: c
+               ->  Streaming Partial HashAggregate
+                     Output: c, PARTIAL count(b)
+                     Group Key: t0.c
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+select c, count(b) from t0 group by c ;
+ c | count 
+---+-------
+ 4 |   512
+ 3 |   512
+ 7 |   512
+ 5 |   512
+ 6 |   512
+(5 rows)
+
+-- with qual, exactly match
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select c, b, count(b) from t0 where a > 3 group by c, b;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: c, b, (count(b))
+   ->  Finalize HashAggregate
+         Output: c, b, count(b)
+         Group Key: t0.c, t0.b
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: c, b, (PARTIAL count(b))
+               Hash Key: c, b
+               ->  Streaming Partial HashAggregate
+                     Output: c, b, PARTIAL count(b)
+                     Group Key: t0.c, t0.b
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+                           Filter: (t0.a > 3)
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+select c, b, count(b) from t0 where a > 3 group by c, b;
+ c | b | count 
+---+---+-------
+ 7 | 6 |   512
+ 6 | 5 |   512
+(2 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select c, b, count(b) from t0 where a > 3 group by c, b;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: c, b, count
+   ->  Seq Scan on aqumv.mv_group_1
+         Output: c, b, count
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+select c, b, count(b) from t0 where a > 3 group by c, b;
+ c | b | count 
+---+---+-------
+ 7 | 6 |   512
+ 6 | 5 |   512
+(2 rows)
+
+-- with qual, different order
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select count(b), b, c from t0 where a > 3 group by b, c;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: (count(b)), b, c
+   ->  Finalize HashAggregate
+         Output: count(b), b, c
+         Group Key: t0.b, t0.c
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: b, c, (PARTIAL count(b))
+               Hash Key: b, c
+               ->  Streaming Partial HashAggregate
+                     Output: b, c, PARTIAL count(b)
+                     Group Key: t0.b, t0.c
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+                           Filter: (t0.a > 3)
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+select count(b), b, c from t0 where a > 3 group by b, c;
+ count | b | c 
+-------+---+---
+   512 | 5 | 6
+   512 | 6 | 7
+(2 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select count(b), b, c from t0 where a > 3 group by b, c;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: count, b, c
+   ->  Seq Scan on aqumv.mv_group_1
+         Output: count, b, c
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+select count(b), b, c from t0 where a > 3 group by b, c;
+ count | b | c 
+-------+---+---
+   512 | 6 | 7
+   512 | 5 | 6
+(2 rows)
+
+-- with qual, different expr
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: ((count(b) + 1)), ((b + 1)), c, b
+   ->  Finalize HashAggregate
+         Output: (count(b) + 1), (b + 1), c, b
+         Group Key: t0.b, t0.c
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: c, b, (PARTIAL count(b))
+               Hash Key: b, c
+               ->  Streaming Partial HashAggregate
+                     Output: c, b, PARTIAL count(b)
+                     Group Key: t0.b, t0.c
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+                           Filter: (t0.a > 3)
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+ ?column? | ?column? | c 
+----------+----------+---
+      513 |        6 | 6
+      513 |        7 | 7
+(2 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: ((count + 1)), ((b + 1)), c, b
+   ->  Seq Scan on aqumv.mv_group_1
+         Output: (count + 1), (b + 1), c, b
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+ ?column? | ?column? | c 
+----------+----------+---
+      513 |        7 | 7
+      513 |        6 | 6
+(2 rows)
+
+-- with qual, should not match
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: b, c, (count(b))
+   ->  Finalize HashAggregate
+         Output: b, c, count(b)
+         Group Key: t0.b, t0.c
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: b, c, (PARTIAL count(b))
+               Hash Key: b, c
+               ->  Streaming Partial HashAggregate
+                     Output: b, c, PARTIAL count(b)
+                     Group Key: t0.b, t0.c
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+                           Filter: ((t0.a > 3) AND (t0.b > 1))
+ Settings: enable_answer_query_using_materialized_views = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+ b | c | count 
+---+---+-------
+ 5 | 6 |   512
+ 6 | 7 |   512
+(2 rows)
+
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: b, c, (count(b))
+   ->  Finalize HashAggregate
+         Output: b, c, count(b)
+         Group Key: t0.b, t0.c
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Output: b, c, (PARTIAL count(b))
+               Hash Key: b, c
+               ->  Streaming Partial HashAggregate
+                     Output: b, c, PARTIAL count(b)
+                     Group Key: t0.b, t0.c
+                     ->  Seq Scan on aqumv.t0
+                           Output: a, b, c, d
+                           Filter: ((t0.a > 3) AND (t0.b > 1))
+ Settings: enable_answer_query_using_materialized_views = 'on', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+ b | c | count 
+---+---+-------
+ 5 | 6 |   512
+ 6 | 7 |   512
+(2 rows)
+
 abort;
 reset optimizer;
 reset enable_answer_query_using_materialized_views;
diff --git a/src/test/regress/expected/bfv_aggregate.out b/src/test/regress/expected/bfv_aggregate.out
index e80bd8e5405..472e2ca98b3 100644
--- a/src/test/regress/expected/bfv_aggregate.out
+++ b/src/test/regress/expected/bfv_aggregate.out
@@ -1686,7 +1686,7 @@ SELECT a.x, sum(b.x) FROM pagg_tab1 a FULL OUTER JOIN pagg_tab2 b ON a.x = b.y G
                Group Key: a.x
                ->  Redistribute Motion 3:3  (slice2; segments: 3)
                      Hash Key: a.x
-                     ->  Partial HashAggregate
+                     ->  Streaming Partial HashAggregate
                            Group Key: a.x
                            ->  Hash Full Join
                                  Hash Cond: (a.x = b.y)
@@ -1961,7 +1961,7 @@ explain (verbose on, costs off) select ex2.b/2, sum(ex1.a) from ex1, (select a,
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: ((COALESCE(ex2.b, 1) / 2)), (PARTIAL sum(ex1.a))
                Hash Key: ((COALESCE(ex2.b, 1) / 2))
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Output: ((COALESCE(ex2.b, 1) / 2)), PARTIAL sum(ex1.a)
                      Group Key: (COALESCE(ex2.b, 1) / 2)
                      ->  Hash Join
@@ -1999,7 +1999,7 @@ explain (verbose on, costs off) SELECT b/2, sum(b) * (b/2) FROM ex1  GROUP BY b/
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: ((b / 2)), (PARTIAL sum(b))
                Hash Key: ((b / 2))
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Output: ((b / 2)), PARTIAL sum(b)
                      Group Key: (ex1.b / 2)
                      ->  Seq Scan on bfv_aggregate.ex1
diff --git a/src/test/regress/expected/bfv_joins.out b/src/test/regress/expected/bfv_joins.out
index 3eab4b55fc1..593c0797b96 100644
--- a/src/test/regress/expected/bfv_joins.out
+++ b/src/test/regress/expected/bfv_joins.out
@@ -4189,6 +4189,48 @@ INSERT INTO ext_stats_tbl VALUES('tC', true);
 ANALYZE ext_stats_tbl;
 explain SELECT 1 FROM ext_stats_tbl t11 FULL JOIN ext_stats_tbl t12 ON t12.c2;
 ERROR:  FULL JOIN is only supported with merge-joinable or hash-joinable join conditions
+-- Check that Postgres Planner can build a plan with 20 joins in reasonable time
+do $$
+begin 
+  for i in 1..20 loop
+    execute 'create table tj' ||  i ||  '(id int)';
+  end loop; 
+end
+$$;
+set optimizer to off;
+select trunc(extract(epoch from now())) unix_time1 \gset
+select *
+from tj1 
+  join tj2 on tj1.id = tj2.id
+  join tj3 on tj2.id = tj3.id
+  join tj4 on tj3.id = tj4.id
+  join tj5 on tj4.id = tj5.id
+  join tj6 on tj5.id = tj6.id
+  join tj7 on tj6.id = tj7.id
+  join tj8 on tj7.id = tj8.id
+  join tj9 on tj8.id = tj9.id
+  join tj10 on tj9.id = tj10.id
+  join tj11 on tj10.id = tj11.id
+  join tj12 on tj11.id = tj12.id
+  join tj13 on tj12.id = tj13.id
+  join tj14 on tj13.id = tj14.id
+  join tj15 on tj14.id = tj15.id
+  join tj16 on tj15.id = tj16.id
+  join tj17 on tj16.id = tj17.id
+  join tj18 on tj17.id = tj18.id
+  join tj19 on tj18.id = tj19.id
+  join tj20 on tj19.id = tj20.id;
+ id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id 
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----
+(0 rows)
+
+select (trunc(extract(epoch from now())) - :unix_time1) < 100 is_ok;
+ is_ok 
+-------
+ t
+(1 row)
+
+reset optimizer;
 -- Clean up. None of the objects we create are very interesting to keep around.
 reset search_path;
 set client_min_messages='warning';
diff --git a/src/test/regress/expected/bfv_joins_optimizer.out b/src/test/regress/expected/bfv_joins_optimizer.out
index cccfe3db059..c5585098961 100644
--- a/src/test/regress/expected/bfv_joins_optimizer.out
+++ b/src/test/regress/expected/bfv_joins_optimizer.out
@@ -3294,27 +3294,27 @@ ON (member_group.group_id IN (12,13,14,15) AND member_subgroup.subgroup_name = r
                                          QUERY PLAN                                          
 ---------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Hash Join
-         Hash Cond: (member."group_id" = member_group."group_id")
-         ->  Seq Scan on member
-         ->  Hash
-               ->  Broadcast Motion 3:3  (slice2; segments: 3)
-                     ->  Hash Left Join
-                           Hash Cond: (member_subgroup.subgroup_name = (region.county_name)::text)
-                           Join Filter: (member_group."group_id" = ANY ('{12,13,14,15}'::integer[]))
-                           ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                                 Hash Key: member_subgroup.subgroup_name
-                                 ->  Hash Join
-                                       Hash Cond: (member_subgroup."group_id" = member_group."group_id")
-                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)
-                                             Hash Key: member_subgroup."group_id"
+   ->  Hash Left Join
+         Hash Cond: (member_subgroup.subgroup_name = (region.county_name)::text)
+         Join Filter: (member_group."group_id" = ANY ('{12,13,14,15}'::integer[]))
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: member_subgroup.subgroup_name
+               ->  Hash Join
+                     Hash Cond: (member."group_id" = member_group."group_id")
+                     ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                           Hash Key: member."group_id"
+                           ->  Hash Join
+                                 Hash Cond: (member."group_id" = member_subgroup."group_id")
+                                 ->  Seq Scan on member
+                                 ->  Hash
+                                       ->  Broadcast Motion 3:3  (slice4; segments: 3)
                                              ->  Seq Scan on member_subgroup
-                                       ->  Hash
-                                             ->  Seq Scan on member_group
-                           ->  Hash
-                                 ->  Redistribute Motion 3:3  (slice5; segments: 3)
-                                       Hash Key: region.county_name
-                                       ->  Seq Scan on region
+                     ->  Hash
+                           ->  Seq Scan on member_group
+         ->  Hash
+               ->  Redistribute Motion 3:3  (slice5; segments: 3)
+                     Hash Key: region.county_name
+                     ->  Seq Scan on region
  Optimizer: Pivotal Optimizer (GPORCA)
 (23 rows)
 
@@ -4206,6 +4206,48 @@ INSERT INTO ext_stats_tbl VALUES('tC', true);
 ANALYZE ext_stats_tbl;
 explain SELECT 1 FROM ext_stats_tbl t11 FULL JOIN ext_stats_tbl t12 ON t12.c2;
 ERROR:  FULL JOIN is only supported with merge-joinable or hash-joinable join conditions
+-- Check that Postgres Planner can build a plan with 20 joins in reasonable time
+do $$
+begin 
+  for i in 1..20 loop
+    execute 'create table tj' ||  i ||  '(id int)';
+  end loop; 
+end
+$$;
+set optimizer to off;
+select trunc(extract(epoch from now())) unix_time1 \gset
+select *
+from tj1 
+  join tj2 on tj1.id = tj2.id
+  join tj3 on tj2.id = tj3.id
+  join tj4 on tj3.id = tj4.id
+  join tj5 on tj4.id = tj5.id
+  join tj6 on tj5.id = tj6.id
+  join tj7 on tj6.id = tj7.id
+  join tj8 on tj7.id = tj8.id
+  join tj9 on tj8.id = tj9.id
+  join tj10 on tj9.id = tj10.id
+  join tj11 on tj10.id = tj11.id
+  join tj12 on tj11.id = tj12.id
+  join tj13 on tj12.id = tj13.id
+  join tj14 on tj13.id = tj14.id
+  join tj15 on tj14.id = tj15.id
+  join tj16 on tj15.id = tj16.id
+  join tj17 on tj16.id = tj17.id
+  join tj18 on tj17.id = tj18.id
+  join tj19 on tj18.id = tj19.id
+  join tj20 on tj19.id = tj20.id;
+ id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id | id 
+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----
+(0 rows)
+
+select (trunc(extract(epoch from now())) - :unix_time1) < 100 is_ok;
+ is_ok 
+-------
+ t
+(1 row)
+
+reset optimizer;
 -- Clean up. None of the objects we create are very interesting to keep around.
 reset search_path;
 set client_min_messages='warning';
diff --git a/src/test/regress/expected/bfv_partition.out b/src/test/regress/expected/bfv_partition.out
index ec180b9855f..c159a5c28df 100644
--- a/src/test/regress/expected/bfv_partition.out
+++ b/src/test/regress/expected/bfv_partition.out
@@ -2239,18 +2239,18 @@ ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE (`);
 ERROR:  syntax error at or near "`"
 LINE 1: ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE (`);
                                                            ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                                                                                                                                     template                                                                                                                                                                                                                                                                                                                                                     
--------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 216}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 252}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName europe :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "europe" :location 291}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                                           pg_get_expr                                                            
+-------------+-------+----------------------------------------------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'), SUBPARTITION europe VALUES ('europe'))
 (1 row)
 
 set client_min_messages='warning';
 drop schema qa147 cascade;
 reset client_min_messages;
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
- relid | level | template 
--------+-------+----------
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- Mix-Match for Alter subpartition template
@@ -2268,18 +2268,18 @@ SUBPARTITION TEMPLATE
    EVERY (INTERVAL '1 month') ); 
 -- Clear TEMPLATE
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
- relid | level | template 
--------+-------+----------
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
-------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 110}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                        pg_get_expr                                        
+------------+-------+-------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 -- Invalid subpartition
@@ -2293,10 +2293,10 @@ ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ERROR:  invalid boundary specification for LIST partition
 LINE 2: ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END...
           ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
-------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 110}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                        pg_get_expr                                        
+------------+-------+-------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2307,10 +2307,10 @@ SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01')
 ERROR:  invalid boundary specification for LIST partition
 LINE 4: SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END...
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
-------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 110}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                        pg_get_expr                                        
+------------+-------+-------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2321,10 +2321,10 @@ SUBPARTITION usa1 VALUES('usa'));
 ERROR:  invalid boundary specification for LIST partition
 LINE 3: SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END...
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
-------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 110}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                        pg_get_expr                                        
+------------+-------+-------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 drop table qa147sales;
@@ -2343,26 +2343,26 @@ SUBPARTITION TEMPLATE
   PARTITION europe VALUES ('europe') );
 -- Clear TEMPLATE
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
- relid | level | template 
--------+-------+----------
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2008-02-01') EXCLUSIVE );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                                                                                                                                                               template                                                                                                                                                                                                                                                                                                                                                                               
-------------+-------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 82} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 77} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-02-01" :location 116} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 111} :location -1}) :edge 2} :partEvery <>} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                          pg_get_expr                                          
+------------+-------+-----------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('02-01-2008'::date))
 (1 row)
 
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2009-01-01') EXCLUSIVE EVERY (INTERVAL '1 month') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 82} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 77} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 116} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 111} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 156} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 147} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                                        pg_get_expr                                                        
+------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 -- Invalid subpartition template
@@ -2371,10 +2371,10 @@ ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ERROR:  invalid boundary specification for RANGE partition
 LINE 2: ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ...
           ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 82} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 77} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 116} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 111} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 156} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 147} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                                        pg_get_expr                                                        
+------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2385,10 +2385,10 @@ SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01')
 ERROR:  invalid boundary specification for RANGE partition
 LINE 3: SUBPARTITION usa1 VALUES('usa'),
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 82} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 77} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 116} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 111} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 156} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 147} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                                        pg_get_expr                                                        
+------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2399,16 +2399,16 @@ SUBPARTITION usa1 VALUES('usa'));
 ERROR:  invalid boundary specification for RANGE partition
 LINE 4: SUBPARTITION usa1 VALUES('usa'));
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
-   relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 82} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 77} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 116} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 111} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 156} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 147} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
+   relid    | level |                                                        pg_get_expr                                                        
+------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 drop table qa147sales;
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
- relid | level | template 
--------+-------+----------
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- Now with Schema
@@ -2428,18 +2428,18 @@ SUBPARTITION TEMPLATE
    EVERY (INTERVAL '1 month') );
 -- Clear TEMPLATE
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
- relid | level | template 
--------+-------+----------
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
--------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 77}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 111}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                        pg_get_expr                                        
+-------------+-------+-------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 -- Invalid subpartition
@@ -2453,10 +2453,10 @@ ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ERROR:  invalid boundary specification for LIST partition
 LINE 2: ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END...
           ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
--------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 77}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 111}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                        pg_get_expr                                        
+-------------+-------+-------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2467,10 +2467,10 @@ SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01')
 ERROR:  invalid boundary specification for LIST partition
 LINE 4: SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END...
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
--------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 77}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 111}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                        pg_get_expr                                        
+-------------+-------+-------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2481,17 +2481,17 @@ SUBPARTITION usa1 VALUES('usa'));
 ERROR:  invalid boundary specification for LIST partition
 LINE 3: SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END...
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                            
--------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usa :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "usa" :location 77}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName asia :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "asia" :location 111}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                        pg_get_expr                                        
+-------------+-------+-------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia'))
 (1 row)
 
 DROP SCHEMA qa147 cascade;
 NOTICE:  drop cascades to table qa147.sales
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
- relid | level | template 
--------+-------+----------
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 CREATE SCHEMA qa147;
@@ -2510,26 +2510,26 @@ SUBPARTITION TEMPLATE
   PARTITION europe VALUES ('europe') );
 -- Clear TEMPLATE
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
- relid | level | template 
--------+-------+----------
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2008-02-01') EXCLUSIVE );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                                                                                                                                                               template                                                                                                                                                                                                                                                                                                                                                                               
--------------+-------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 83} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 78} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-02-01" :location 117} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 112} :location -1}) :edge 2} :partEvery <>} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                          pg_get_expr                                          
+-------------+-------+-----------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('02-01-2008'::date))
 (1 row)
 
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2009-01-01') EXCLUSIVE EVERY (INTERVAL '1 month') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
--------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 83} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 78} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 117} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 112} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 157} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 148} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                                        pg_get_expr                                                        
+-------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 -- Invalid subpartition template
@@ -2538,10 +2538,10 @@ ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ERROR:  invalid boundary specification for RANGE partition
 LINE 2: ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ...
           ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
--------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 83} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 78} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 117} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 112} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 157} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 148} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                                        pg_get_expr                                                        
+-------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2552,10 +2552,10 @@ SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01')
 ERROR:  invalid boundary specification for RANGE partition
 LINE 3: SUBPARTITION usa1 VALUES('usa'),
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
--------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 83} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 78} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 117} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 112} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 157} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 148} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                                        pg_get_expr                                                        
+-------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 -- Mix and Match RANGE/LIST . Expect to Error
@@ -2566,17 +2566,17 @@ SUBPARTITION usa1 VALUES('usa'));
 ERROR:  invalid boundary specification for RANGE partition
 LINE 4: SUBPARTITION usa1 VALUES('usa'));
         ^
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
-    relid    | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           template                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
--------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- qa147.sales |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName usam1 :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2008-01-01" :location 83} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 78} :location -1}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2009-01-01" :location 117} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 112} :location -1}) :edge 2} :partEvery ({TYPECAST :arg {A_CONST :val "\1\ month" :location 157} :typeName {TYPENAME :names ("pg_catalog" "interval") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 148} :location -1})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
+    relid    | level |                                                        pg_get_expr                                                        
+-------------+-------+---------------------------------------------------------------------------------------------------------------------------
+ qa147.sales |     1 | SUBPARTITION TEMPLATE(SUBPARTITION usam1 START ('01-01-2008'::date) END ('01-01-2009'::date) Every ('@ 1 mon'::interval))
 (1 row)
 
 drop schema qa147 cascade;
 NOTICE:  drop cascades to table qa147.sales
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
- relid | level | template 
--------+-------+----------
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 set gp_autostats_mode=on_change;
@@ -2701,10 +2701,10 @@ alter table partsupp_def set subpartition template( subpartition aaa start(400)
 -- If we want to use the new subpartition template, we have to drop the default partition first, and then readd the default partition
 -- Note 2: We do not support this function yet, but if we are able to split default partition with default subpartition, would we
 -- be using the subpartition template to definte the "new" partition or the existing one.
-select relid::regclass, level, template from gp_partition_template where relid = 'partsupp_def'::regclass;
-    relid     | level |                                                                                                                                                                                                                   template                                                                                                                                                                                                                    
---------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- partsupp_def |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName aaa :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({A_CONST :val 400 :location 75}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({A_CONST :val 600 :location 85}) :edge 2} :partEvery ({A_CONST :val 100 :location 96})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'partsupp_def'::regclass;
+    relid     | level |                                pg_get_expr                                
+--------------+-------+---------------------------------------------------------------------------
+ partsupp_def |     1 | SUBPARTITION TEMPLATE(SUBPARTITION aaa START (400) END (600) Every (100))
 (1 row)
 
 alter table partsup_def add partition f1 start(0) end (300) every(100);
@@ -2727,10 +2727,10 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_pa
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 alter table partsupp_def2 set subpartition template();
 alter table partsupp_def2 set subpartition template( subpartition aaa start(400) end (600) every(100) );
-select relid::regclass, level, template from gp_partition_template where relid = 'partsupp_def2'::regclass;
-     relid     | level |                                                                                                                                                                                                                   template                                                                                                                                                                                                                    
----------------+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- partsupp_def2 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName aaa :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({A_CONST :val 400 :location 76}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({A_CONST :val 600 :location 86}) :edge 2} :partEvery ({A_CONST :val 100 :location 97})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'partsupp_def2'::regclass;
+     relid     | level |                                pg_get_expr                                
+---------------+-------+---------------------------------------------------------------------------
+ partsupp_def2 |     1 | SUBPARTITION TEMPLATE(SUBPARTITION aaa START (400) END (600) Every (100))
 (1 row)
 
 drop table partsupp_def;
@@ -3011,9 +3011,9 @@ drop table partition_cleanup1;
 drop schema partition_999 cascade;
 NOTICE:  drop cascades to table partition_cleanup2
 -- These should be empty
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
- relid | level | template 
--------+-------+----------
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 --
diff --git a/src/test/regress/expected/bfv_planner.out b/src/test/regress/expected/bfv_planner.out
index 139b470152a..eafe2e8bc15 100644
--- a/src/test/regress/expected/bfv_planner.out
+++ b/src/test/regress/expected/bfv_planner.out
@@ -663,6 +663,8 @@ select count(distinct nextval) from gp_dist_random('t_rep4');
 (1 row)
 
 drop table rep_tbl, t_rep4;
+create table t_issue_1218_random(id int) distributed randomly;
+create table t_issue_1218_replicated as select random() from t_issue_1218_random distributed replicated;
 --
 -- Test append different numsegments tables work well
 -- See Github issue: https://github.com/greenplum-db/gpdb/issues/12146
diff --git a/src/test/regress/expected/bfv_planner_optimizer.out b/src/test/regress/expected/bfv_planner_optimizer.out
index e1ca30b7544..56ab8968024 100644
--- a/src/test/regress/expected/bfv_planner_optimizer.out
+++ b/src/test/regress/expected/bfv_planner_optimizer.out
@@ -681,6 +681,8 @@ select count(distinct nextval) from gp_dist_random('t_rep4');
 (1 row)
 
 drop table rep_tbl, t_rep4;
+create table t_issue_1218_random(id int) distributed randomly;
+create table t_issue_1218_replicated as select random() from t_issue_1218_random distributed replicated;
 --
 -- Test append different numsegments tables work well
 -- See Github issue: https://github.com/greenplum-db/gpdb/issues/12146
diff --git a/src/test/regress/expected/cbdb_parallel.out b/src/test/regress/expected/cbdb_parallel.out
index b8639f9fb9c..35e90eebfa1 100644
--- a/src/test/regress/expected/cbdb_parallel.out
+++ b/src/test/regress/expected/cbdb_parallel.out
@@ -2006,28 +2006,32 @@ explain (locus, costs off) select * from rt1 union all select * from t2;
  Optimizer: Postgres query optimizer
 (15 rows)
 
--- SingleQE as subquery seems cannot produce partial_pathlist and don't have chance to parallel append.
+-- partial subpath under UNION ALL
 explain (locus, costs off) select a from rt1 union all select count(*) as a from sq1;
                       QUERY PLAN                      
 ------------------------------------------------------
  Append
    Locus: Entry
-   ->  Gather Motion 1:1  (slice1; segments: 1)
+   ->  Gather Motion 3:1  (slice1; segments: 3)
          Locus: Entry
          ->  Subquery Scan on "*SELECT* 1"
-               Locus: SegmentGeneral
-               ->  Seq Scan on rt1
-                     Locus: SegmentGeneral
+               Locus: SegmentGeneralWorkers
+               Parallel Workers: 3
+               ->  Parallel Seq Scan on rt1
+                     Locus: SegmentGeneralWorkers
+                     Parallel Workers: 3
    ->  Finalize Aggregate
          Locus: Entry
-         ->  Gather Motion 3:1  (slice2; segments: 3)
+         ->  Gather Motion 6:1  (slice2; segments: 6)
                Locus: Entry
                ->  Partial Aggregate
-                     Locus: Hashed
-                     ->  Seq Scan on sq1
-                           Locus: Hashed
+                     Locus: HashedWorkers
+                     Parallel Workers: 2
+                     ->  Parallel Seq Scan on sq1
+                           Locus: HashedWorkers
+                           Parallel Workers: 2
  Optimizer: Postgres query optimizer
-(17 rows)
+(21 rows)
 
 -- SegmentGeneralWorkers + General = SegmentGeneralWorkers
 explain (locus, costs off) select a from rt1 union all select a from generate_series(1, 1000) a;
@@ -3069,6 +3073,504 @@ select t1_anti.a, t1_anti.b from t1_anti left join t2_anti on t1_anti.a = t2_ant
 (4 rows)
 
 abort;
+--
+-- Test Parallel DISTINCT
+--
+drop table if exists t_distinct_0;
+NOTICE:  table "t_distinct_0" does not exist, skipping
+create table t_distinct_0(a int, b int) using ao_column distributed randomly;
+insert into t_distinct_0 select i, i+1 from generate_series(1, 1000) i;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+analyze t_distinct_0;
+explain(costs off)
+select distinct a from t_distinct_0;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: a
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: a
+               ->  Streaming HashAggregate
+                     Group Key: a
+                     ->  Seq Scan on t_distinct_0
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+set enable_parallel = on;
+-- first stage HashAgg, second stage GroupAgg
+explain(costs off)
+select distinct a from t_distinct_0;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   Merge Key: a
+   ->  GroupAggregate
+         Group Key: a
+         ->  Sort
+               Sort Key: a
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Hash Key: a
+                     Hash Module: 3
+                     ->  Streaming HashAggregate
+                           Group Key: a
+                           ->  Parallel Seq Scan on t_distinct_0
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+set parallel_query_use_streaming_hashagg = off;
+explain(costs off)
+select distinct a from t_distinct_0;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   Merge Key: a
+   ->  GroupAggregate
+         Group Key: a
+         ->  Sort
+               Sort Key: a
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Hash Key: a
+                     Hash Module: 3
+                     ->  HashAggregate
+                           Group Key: a
+                           ->  Parallel Seq Scan on t_distinct_0
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+-- GroupAgg
+set enable_hashagg = off;
+explain(costs off)
+select distinct a from t_distinct_0;
+                              QUERY PLAN                               
+-----------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   Merge Key: a
+   ->  GroupAggregate
+         Group Key: a
+         ->  Sort
+               Sort Key: a
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Hash Key: a
+                     Hash Module: 3
+                     ->  GroupAggregate
+                           Group Key: a
+                           ->  Sort
+                                 Sort Key: a
+                                 ->  Parallel Seq Scan on t_distinct_0
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+-- HashAgg
+set enable_hashagg = on;
+set enable_groupagg = off;
+explain(costs off)
+select distinct a from t_distinct_0;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  HashAggregate
+         Group Key: a
+         ->  Redistribute Motion 6:6  (slice2; segments: 6)
+               Hash Key: a
+               Hash Module: 3
+               ->  HashAggregate
+                     Group Key: a
+                     ->  Parallel Seq Scan on t_distinct_0
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+set parallel_query_use_streaming_hashagg = on;
+explain(costs off)
+select distinct a from t_distinct_0;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  HashAggregate
+         Group Key: a
+         ->  Redistribute Motion 6:6  (slice2; segments: 6)
+               Hash Key: a
+               Hash Module: 3
+               ->  Streaming HashAggregate
+                     Group Key: a
+                     ->  Parallel Seq Scan on t_distinct_0
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+-- multi DISTINCT tlist
+explain(costs off)
+select distinct a, b from t_distinct_0;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  HashAggregate
+         Group Key: a, b
+         ->  Redistribute Motion 6:6  (slice2; segments: 6)
+               Hash Key: a, b
+               Hash Module: 3
+               ->  Streaming HashAggregate
+                     Group Key: a, b
+                     ->  Parallel Seq Scan on t_distinct_0
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+-- DISTINCT on distribution key 
+drop table if exists t_distinct_1;
+NOTICE:  table "t_distinct_1" does not exist, skipping
+create table t_distinct_1(a int, b int) using ao_column;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into t_distinct_1 select * from t_distinct_0;
+analyze t_distinct_1;
+set enable_parallel = off;
+explain(costs off)
+select distinct a from t_distinct_1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: a
+         ->  Seq Scan on t_distinct_1
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+set enable_parallel = on;
+explain(costs off)
+select distinct a from t_distinct_1;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  HashAggregate
+         Group Key: a
+         ->  Redistribute Motion 6:6  (slice2; segments: 6)
+               Hash Key: a
+               Hash Module: 3
+               ->  Streaming HashAggregate
+                     Group Key: a
+                     ->  Parallel Seq Scan on t_distinct_1
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+--
+-- End of test Parallel DISTINCT
+--
+--
+-- Test Parallel UNION
+--
+set enable_parallel = off;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  HashAggregate
+         Group Key: t_distinct_0.a
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: t_distinct_0.a
+               ->  Append
+                     ->  HashAggregate
+                           Group Key: t_distinct_0.a
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                                 Hash Key: t_distinct_0.a
+                                 ->  Streaming HashAggregate
+                                       Group Key: t_distinct_0.a
+                                       ->  Seq Scan on t_distinct_0
+                     ->  HashAggregate
+                           Group Key: t_distinct_0_1.b
+                           ->  Redistribute Motion 3:3  (slice4; segments: 3)
+                                 Hash Key: t_distinct_0_1.b
+                                 ->  Streaming HashAggregate
+                                       Group Key: t_distinct_0_1.b
+                                       ->  Seq Scan on t_distinct_0 t_distinct_0_1
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+set enable_parallel = on;
+set enable_groupagg = off;
+set enable_hashagg = on;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  HashAggregate
+         Group Key: t_distinct_0.a
+         ->  Redistribute Motion 6:6  (slice2; segments: 6)
+               Hash Key: t_distinct_0.a
+               Hash Module: 3
+               ->  Append
+                     ->  HashAggregate
+                           Group Key: t_distinct_0.a
+                           ->  Redistribute Motion 6:6  (slice3; segments: 6)
+                                 Hash Key: t_distinct_0.a
+                                 Hash Module: 3
+                                 ->  Streaming HashAggregate
+                                       Group Key: t_distinct_0.a
+                                       ->  Parallel Seq Scan on t_distinct_0
+                     ->  HashAggregate
+                           Group Key: t_distinct_0_1.b
+                           ->  Redistribute Motion 6:6  (slice4; segments: 6)
+                                 Hash Key: t_distinct_0_1.b
+                                 Hash Module: 3
+                                 ->  Streaming HashAggregate
+                                       Group Key: t_distinct_0_1.b
+                                       ->  Parallel Seq Scan on t_distinct_0 t_distinct_0_1
+ Optimizer: Postgres query optimizer
+(24 rows)
+
+reset enable_groupagg;
+set enable_hashagg = off;
+set enable_groupagg = on;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+                                                  QUERY PLAN                                                  
+--------------------------------------------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  Unique
+         Group Key: t_distinct_0.a
+         ->  Sort
+               Sort Key: t_distinct_0.a
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Hash Key: t_distinct_0.a
+                     Hash Module: 3
+                     ->  Append
+                           ->  GroupAggregate
+                                 Group Key: t_distinct_0.a
+                                 ->  Sort
+                                       Sort Key: t_distinct_0.a
+                                       ->  Redistribute Motion 6:6  (slice3; segments: 6)
+                                             Hash Key: t_distinct_0.a
+                                             Hash Module: 3
+                                             ->  GroupAggregate
+                                                   Group Key: t_distinct_0.a
+                                                   ->  Sort
+                                                         Sort Key: t_distinct_0.a
+                                                         ->  Parallel Seq Scan on t_distinct_0
+                           ->  GroupAggregate
+                                 Group Key: t_distinct_0_1.b
+                                 ->  Sort
+                                       Sort Key: t_distinct_0_1.b
+                                       ->  Redistribute Motion 6:6  (slice4; segments: 6)
+                                             Hash Key: t_distinct_0_1.b
+                                             Hash Module: 3
+                                             ->  GroupAggregate
+                                                   Group Key: t_distinct_0_1.b
+                                                   ->  Sort
+                                                         Sort Key: t_distinct_0_1.b
+                                                         ->  Parallel Seq Scan on t_distinct_0 t_distinct_0_1
+ Optimizer: Postgres query optimizer
+(34 rows)
+
+reset enable_groupagg;
+reset enable_hashagg;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+                                            QUERY PLAN                                            
+--------------------------------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  HashAggregate
+         Group Key: t_distinct_0.a
+         ->  Redistribute Motion 6:6  (slice2; segments: 6)
+               Hash Key: t_distinct_0.a
+               Hash Module: 3
+               ->  Append
+                     ->  GroupAggregate
+                           Group Key: t_distinct_0.a
+                           ->  Sort
+                                 Sort Key: t_distinct_0.a
+                                 ->  Redistribute Motion 6:6  (slice3; segments: 6)
+                                       Hash Key: t_distinct_0.a
+                                       Hash Module: 3
+                                       ->  Streaming HashAggregate
+                                             Group Key: t_distinct_0.a
+                                             ->  Parallel Seq Scan on t_distinct_0
+                     ->  GroupAggregate
+                           Group Key: t_distinct_0_1.b
+                           ->  Sort
+                                 Sort Key: t_distinct_0_1.b
+                                 ->  Redistribute Motion 6:6  (slice4; segments: 6)
+                                       Hash Key: t_distinct_0_1.b
+                                       Hash Module: 3
+                                       ->  Streaming HashAggregate
+                                             Group Key: t_distinct_0_1.b
+                                             ->  Parallel Seq Scan on t_distinct_0 t_distinct_0_1
+ Optimizer: Postgres query optimizer
+(28 rows)
+
+reset enable_parallel;
+--
+-- End of test Parallel UNION
+--
+--
+-- Test Parallel Subquery.
+--
+CREATE TABLE departments (
+    department_id INT PRIMARY KEY,
+    department_name VARCHAR(100)
+);
+CREATE TABLE employees (
+    employee_id INT PRIMARY KEY,
+    name VARCHAR(100),
+    salary NUMERIC,
+    department_id INT
+);
+INSERT INTO departments VALUES 
+(1, 'Sales'),
+(2, 'IT'),
+(3, 'HR');
+INSERT INTO employees VALUES
+(1, 'Alice', 5000, 1),
+(2, 'Bob', 6000, 1),
+(3, 'Charlie', 7000, 2),
+(4, 'David', 8000, 2),
+(5, 'Eve', 9000, 3);
+set enable_parallel = off;
+explain SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+                                                         QUERY PLAN                                                         
+----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=163.42..307.76 rows=3767 width=218)
+   ->  Hash Join  (cost=163.42..257.54 rows=1256 width=218)
+         Hash Cond: (e.department_id = "Expr_SUBQUERY".csq_c0)
+         Join Filter: (e.salary > "Expr_SUBQUERY".csq_c1)
+         ->  Seq Scan on employees e  (cost=0.00..71.67 rows=3767 width=254)
+         ->  Hash  (cost=150.92..150.92 rows=1000 width=36)
+               ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=130.09..150.92 rows=1000 width=36)
+                     ->  Subquery Scan on "Expr_SUBQUERY"  (cost=130.09..137.59 rows=333 width=36)
+                           ->  Finalize HashAggregate  (cost=130.09..134.26 rows=333 width=36)
+                                 Group Key: employees.department_id
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=90.50..122.67 rows=990 width=36)
+                                       Hash Key: employees.department_id
+                                       ->  Streaming Partial HashAggregate  (cost=90.50..102.87 rows=990 width=36)
+                                             Group Key: employees.department_id
+                                             ->  Seq Scan on employees  (cost=0.00..71.67 rows=3767 width=36)
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+ name  
+-------
+ Bob
+ David
+(2 rows)
+
+set enable_parallel = on;
+set min_parallel_table_scan_size = 0;
+explain SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+                                                        QUERY PLAN                                                         
+---------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)  (cost=116.58..230.86 rows=3767 width=218)
+   ->  Parallel Hash Join  (cost=116.58..186.92 rows=628 width=218)
+         Hash Cond: (e.department_id = "Expr_SUBQUERY".csq_c0)
+         Join Filter: (e.salary > "Expr_SUBQUERY".csq_c1)
+         ->  Parallel Seq Scan on employees e  (cost=0.00..52.83 rows=1883 width=254)
+         ->  Parallel Hash  (cost=110.33..110.33 rows=500 width=36)
+               ->  Broadcast Workers Motion 6:6  (slice2; segments: 6)  (cost=99.92..110.33 rows=500 width=36)
+                     ->  Subquery Scan on "Expr_SUBQUERY"  (cost=99.92..103.67 rows=167 width=36)
+                           ->  HashAggregate  (cost=99.92..102.00 rows=167 width=36)
+                                 Group Key: employees.department_id
+                                 ->  Redistribute Motion 6:6  (slice3; segments: 6)  (cost=0.00..90.50 rows=1883 width=36)
+                                       Hash Key: employees.department_id
+                                       Hash Module: 3
+                                       ->  Parallel Seq Scan on employees  (cost=0.00..52.83 rows=1883 width=36)
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+ name  
+-------
+ Bob
+ David
+(2 rows)
+
+--
+-- Test https://github.com/apache/cloudberry/issues/1376
+--
+create table t1(a int, b int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table t2 (like t1);
+NOTICE:  table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table
+set gp_cte_sharing = on;
+explain(locus, costs off) with x as
+  (select a, count(*) as b from t1 group by a union all
+    select a, count(*) as b from t2 group by a)
+  select count(*) from x a join x b on a.a = b.b;
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Finalize Aggregate
+   Locus: Entry
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Locus: Entry
+         ->  Partial Aggregate
+               Locus: Hashed
+               ->  Hash Join
+                     Locus: Hashed
+                     Hash Cond: (b.b = a.a)
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                           Locus: Hashed
+                           Hash Key: b.b
+                           ->  Subquery Scan on b
+                                 Locus: Strewn
+                                 ->  Shared Scan (share slice:id 2:0)
+                                       Locus: Hashed
+                     ->  Hash
+                           Locus: Hashed
+                           ->  Subquery Scan on a
+                                 Locus: Hashed
+                                 ->  Shared Scan (share slice:id 1:0)
+                                       Locus: Hashed
+                                       ->  Append
+                                             Locus: Hashed
+                                             ->  HashAggregate
+                                                   Locus: Hashed
+                                                   Group Key: t1.a
+                                                   ->  Seq Scan on t1
+                                                         Locus: Hashed
+                                             ->  HashAggregate
+                                                   Locus: Hashed
+                                                   Group Key: t2.a
+                                                   ->  Seq Scan on t2
+                                                         Locus: Hashed
+ Optimizer: Postgres query optimizer
+(35 rows)
+
+reset gp_cte_sharing;
+reset enable_parallel;
+reset min_parallel_table_scan_size;
 -- start_ignore
 drop schema test_parallel cascade;
 -- end_ignore
diff --git a/src/test/regress/expected/cluster.out b/src/test/regress/expected/cluster.out
index f62380f80f4..f68bb39a620 100644
--- a/src/test/regress/expected/cluster.out
+++ b/src/test/regress/expected/cluster.out
@@ -467,9 +467,9 @@ set enable_indexscan = off;
 set maintenance_work_mem = '1MB';
 cluster clstr_4 using cluster_sort;
 select * from
-(select hundred, lag(hundred) over () as lhundred,
-        thousand, lag(thousand) over () as lthousand,
-        tenthous, lag(tenthous) over () as ltenthous from clstr_4) ss
+(select hundred, lag(hundred) over (order by hundred) as lhundred,
+        thousand, lag(thousand) over (order by hundred) as lthousand,
+        tenthous, lag(tenthous) over (order by hundred) as ltenthous from clstr_4) ss
 where row(hundred, thousand, tenthous) <= row(lhundred, lthousand, ltenthous);
  hundred | lhundred | thousand | lthousand | tenthous | ltenthous 
 ---------+----------+----------+-----------+----------+-----------
diff --git a/src/test/regress/expected/column_compression.out b/src/test/regress/expected/column_compression.out
index 148f73ddb91..b2edc54ddc3 100644
--- a/src/test/regress/expected/column_compression.out
+++ b/src/test/regress/expected/column_compression.out
@@ -765,6 +765,12 @@ execute ccddlcheck;
  ccddl_1_prt_p2_2_prt_sp1 | l       |       4 | {compresstype=zlib,compresslevel=1,blocksize=32768}
 (20 rows)
 
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
+ level |                                                                                                          pg_get_expr                                                                                                           
+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(SUBPARTITION sp1 VALUES (1, 2, 3, 4, 5), COLUMN i ENCODING (compresstype=zlib), COLUMN j ENCODING (compresstype=rle_type), COLUMN k ENCODING (compresstype=zlib), COLUMN l ENCODING (compresstype=zlib))
+(1 row)
+
 insert into ccddl select 1, (i % 19) + 1, ((i+3) % 5) + 1, i+3 from generate_series(1, 100) i;
 select * from ccddl;
  i | j  | k |  l  
@@ -1227,6 +1233,12 @@ execute ccddlcheck;
  ccddl_1_prt_p1_2_prt_sp1 | j       |       2 | {compresstype=rle_type,compresslevel=1,blocksize=32768}
 (6 rows)
 
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
+ level |                                                                 pg_get_expr                                                                  
+-------+----------------------------------------------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(SUBPARTITION sp1 START (1) END (20), COLUMN i ENCODING (compresstype=zlib), COLUMN j ENCODING (compresstype=rle_type))
+(1 row)
+
 alter table ccddl alter partition p1 split partition sp1 at (10) into (partition sp2, partition sp3);
 execute ccddlcheck;
          relname          | attname | filenum |                       attoptions                        
@@ -1304,6 +1316,13 @@ execute ccddlcheck;
  ccddl_1_prt_1_2_prt_1_3_prt_usa | region  |       5 | {compresstype=rle_type,compresslevel=1,blocksize=32768}
 (20 rows)
 
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
+ level |                                              pg_get_expr                                               
+-------+--------------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE( START (1) END (13), COLUMN month ENCODING (compresstype=rle_type))
+     2 | SUBPARTITION TEMPLATE(SUBPARTITION usa VALUES ('usa'), COLUMN region ENCODING (compresstype=rle_type))
+(2 rows)
+
 -- Ensure we can read and write
 insert into ccddl select 1, 2008, 1, 2, 'usa' from generate_series(1, 100);
 select * from ccddl;
@@ -1624,6 +1643,12 @@ execute ccddlcheck;
  ccddl_1_prt_newp_2_prt_sp1 | j       |       3 | {compresstype=zlib,compresslevel=1,blocksize=32768}
 (33 rows)
 
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
+ level |                                           pg_get_expr                                           
+-------+-------------------------------------------------------------------------------------------------
+     1 | SUBPARTITION TEMPLATE(SUBPARTITION sp1 VALUES (1), DEFAULT COLUMN ENCODING (compresstype=zlib))
+(1 row)
+
 drop table ccddl;
 -----------------------------------------------------------------------
 -- Partitioning support
@@ -1641,8 +1666,9 @@ encoding(compresstype=sdf2sdf));
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 ERROR:  unknown compresstype "sdf2sdf"
--- We don't support partition element specific encoding clauses in subpartition
--- templates as we have no place to store them.
+-- Historically we don't support partition element specific encoding clauses in
+-- subpartition templates as we didn't have place to store them. We now have
+-- place to store them if we want to, but for now we keep this door closed
 create table a (i int, j int) with (appendonly=true, orientation=column)
       partition by range(i) subpartition by range(j)
       subpartition template(start(1) end(10) default column encoding (compresstype=zlib),
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index f795078e761..0bc2aaa9f6e 100644
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -2683,7 +2683,6 @@ COMMIT;
 -- we keep the `CONCURRENTLY` to make the following commands fail,
 -- so these commands will not cause deadlock with test create_view,
 -- like `drop schema xxx cascade;`.
--- See more details at https://code.hashdata.xyz/cloudberry/cbdb/-/issues/54
 REINDEX TABLE CONCURRENTLY pg_class; -- no catalog relation
 ERROR:  cannot reindex system catalogs concurrently
 REINDEX INDEX CONCURRENTLY pg_class_oid_index; -- no catalog index
diff --git a/src/test/regress/expected/create_index_optimizer.out b/src/test/regress/expected/create_index_optimizer.out
index f661e53f487..65f5f92b8bd 100644
--- a/src/test/regress/expected/create_index_optimizer.out
+++ b/src/test/regress/expected/create_index_optimizer.out
@@ -2723,7 +2723,6 @@ COMMIT;
 -- we keep the `CONCURRENTLY` to make the following commands fail,
 -- so these commands will not cause deadlock with test create_view,
 -- like `drop schema xxx cascade;`.
--- See more details at https://code.hashdata.xyz/cloudberry/cbdb/-/issues/54
 REINDEX TABLE CONCURRENTLY pg_class; -- no catalog relation
 ERROR:  cannot reindex system catalogs concurrently
 REINDEX INDEX CONCURRENTLY pg_class_oid_index; -- no catalog index
diff --git a/src/test/regress/expected/create_table_distpol.out b/src/test/regress/expected/create_table_distpol.out
index 545d14625f4..46479ca2126 100644
--- a/src/test/regress/expected/create_table_distpol.out
+++ b/src/test/regress/expected/create_table_distpol.out
@@ -128,9 +128,7 @@ select distkey from gp_distribution_policy where localoid = 'distpol_person_copy
 RESET gp_create_table_random_default_distribution;
 -- Test duplicate distribute keys
 CREATE TABLE ctas_dup_dk as SELECT distinct age as c1, age as c2 from distpol_person; 
-ERROR:  duplicate DISTRIBUTED BY column 'c1'
 SELECT distinct age c1, age c2 into ctas_dup_dk_1 from distpol_person;
-ERROR:  duplicate DISTRIBUTED BY column 'c1'
 --
 -- Test deriving distribution key from the query's distribution in
 -- CREATE TABLE AS
diff --git a/src/test/regress/expected/cte_prune.out b/src/test/regress/expected/cte_prune.out
new file mode 100644
index 00000000000..84f6f0b7d10
--- /dev/null
+++ b/src/test/regress/expected/cte_prune.out
@@ -0,0 +1,1775 @@
+-- start_ignore
+create schema cte_prune;
+set search_path = cte_prune;
+SET optimizer_trace_fallback = on;
+-- end_ignore
+create table t1(v1 int, v2 int, v3 int);
+insert into t1 values(generate_series(1, 10), generate_series(11, 20), generate_series(21, 30));
+analyze t1;
+create table t2(v1 int, v2 int, v3 int);
+insert into t2 values(generate_series(0, 100), generate_series(100, 200), generate_series(200, 300));
+analyze t2;
+-- should pruned both seq scan and shared scan
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.06..2.16 rows=3 width=4)
+   Output: c11.v1
+   ->  Hash Right Join  (cost=1.06..2.11 rows=1 width=4)
+         Output: c11.v1
+         Hash Cond: (t1.v1 = c11.v1)
+         ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+               Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.04..1.04 rows=1 width=4)
+               Output: c11.v1
+               ->  Subquery Scan on c11  (cost=0.00..1.04 rows=1 width=4)
+                     Output: c11.v1
+                     ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.04 rows=1 width=12)
+                           Output: t1_1.v1, t1_1.v2, t1_1.v3
+                           Filter: (t1_1.v1 < 5)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v1 
+----
+  1
+  2
+  3
+  4
+(4 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.06..2.16 rows=3 width=4)
+   Output: c11.v2
+   ->  Hash Right Join  (cost=1.06..2.11 rows=1 width=4)
+         Output: c11.v2
+         Hash Cond: (t1.v1 = c11.v1)
+         ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+               Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.04..1.04 rows=1 width=8)
+               Output: c11.v2, c11.v1
+               ->  Subquery Scan on c11  (cost=0.00..1.04 rows=1 width=8)
+                     Output: c11.v2, c11.v1
+                     ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.04 rows=1 width=12)
+                           Output: t1_1.v1, t1_1.v2, t1_1.v3
+                           Filter: (t1_1.v1 < 5)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v2 
+----
+ 12
+ 13
+ 14
+ 11
+(4 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.06..2.16 rows=3 width=4)
+   Output: c11.v3
+   ->  Hash Right Join  (cost=1.06..2.11 rows=1 width=4)
+         Output: c11.v3
+         Hash Cond: (t1.v1 = c11.v1)
+         ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+               Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.04..1.04 rows=1 width=8)
+               Output: c11.v3, c11.v1
+               ->  Subquery Scan on c11  (cost=0.00..1.04 rows=1 width=8)
+                     Output: c11.v3, c11.v1
+                     ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.04 rows=1 width=12)
+                           Output: t1_1.v1, t1_1.v2, t1_1.v3
+                           Filter: (t1_1.v1 < 5)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v3 
+----
+ 22
+ 23
+ 24
+ 21
+(4 rows)
+
+-- * also should be pruned
+explain verbose with c1 as (select * from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.06..2.16 rows=3 width=4)
+   Output: c11.v1
+   ->  Hash Right Join  (cost=1.06..2.11 rows=1 width=4)
+         Output: c11.v1
+         Hash Cond: (t1.v1 = c11.v1)
+         ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+               Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.04..1.04 rows=1 width=4)
+               Output: c11.v1
+               ->  Subquery Scan on c11  (cost=0.00..1.04 rows=1 width=4)
+                     Output: c11.v1
+                     ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.04 rows=1 width=12)
+                           Output: t1_1.v1, t1_1.v2, t1_1.v3
+                           Filter: (t1_1.v1 < 5)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+with c1 as (select * from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v1 
+----
+  1
+  2
+  3
+  4
+(4 rows)
+
+-- no push filter
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+                                          QUERY PLAN                                          
+----------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.08..2.35 rows=10 width=4)
+   Output: c11.v3
+   ->  Hash Right Join  (cost=1.08..2.22 rows=3 width=4)
+         Output: c11.v3
+         Hash Cond: (c22.v2 = c11.v1)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+               Output: c22.v2
+               Hash Key: c22.v2
+               ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                     Output: c22.v2
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.03..1.03 rows=3 width=8)
+               Output: c11.v3, c11.v1
+               ->  Subquery Scan on c11  (cost=0.00..1.03 rows=3 width=8)
+                     Output: c11.v3, c11.v1
+                     ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(20 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+ v3 
+----
+ 26
+ 25
+ 30
+ 29
+ 21
+ 27
+ 23
+ 28
+ 24
+ 22
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+                                          QUERY PLAN                                          
+----------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.08..2.35 rows=10 width=4)
+   Output: c11.v2
+   ->  Hash Right Join  (cost=1.08..2.22 rows=3 width=4)
+         Output: c11.v2
+         Hash Cond: (c22.v2 = c11.v1)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+               Output: c22.v2
+               Hash Key: c22.v2
+               ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                     Output: c22.v2
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.03..1.03 rows=3 width=8)
+               Output: c11.v2, c11.v1
+               ->  Subquery Scan on c11  (cost=0.00..1.03 rows=3 width=8)
+                     Output: c11.v2, c11.v1
+                     ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(20 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+ v2 
+----
+ 17
+ 13
+ 18
+ 14
+ 12
+ 16
+ 15
+ 20
+ 19
+ 11
+(10 rows)
+
+-- distribution col can be pruned which is better than do redistribute in CTE consumer
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v2=c22.v2;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.14..2.42 rows=10 width=4)
+   Output: c11.v2
+   ->  Hash Left Join  (cost=1.14..2.29 rows=3 width=4)
+         Output: c11.v2
+         Hash Cond: (c11.v2 = c22.v2)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+               Output: c11.v2
+               Hash Key: c11.v2
+               ->  Subquery Scan on c11  (cost=0.00..1.03 rows=3 width=4)
+                     Output: c11.v2
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.10..1.10 rows=3 width=4)
+               Output: c22.v2
+               ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+                     Output: c22.v2
+                     Hash Key: c22.v2
+                     ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                           Output: c22.v2
+                           ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                 Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v2=c22.v2;
+ v2 
+----
+ 18
+ 16
+ 19
+ 13
+ 14
+ 17
+ 11
+ 12
+ 15
+ 20
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v3=c22.v3;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.14..2.42 rows=10 width=4)
+   Output: c11.v3
+   ->  Hash Left Join  (cost=1.14..2.29 rows=3 width=4)
+         Output: c11.v3
+         Hash Cond: (c11.v3 = c22.v3)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+               Output: c11.v3
+               Hash Key: c11.v3
+               ->  Subquery Scan on c11  (cost=0.00..1.03 rows=3 width=4)
+                     Output: c11.v3
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+         ->  Hash  (cost=1.10..1.10 rows=3 width=4)
+               Output: c22.v3
+               ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+                     Output: c22.v3
+                     Hash Key: c22.v3
+                     ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                           Output: c22.v3
+                           ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                 Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v3=c22.v3;
+ v3 
+----
+ 22
+ 24
+ 27
+ 29
+ 28
+ 21
+ 25
+ 23
+ 26
+ 30
+(10 rows)
+
+-- groupby/order by/window function/grouping set should be contains in CTE output
+-- group by 
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v1;
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.17..2.34 rows=10 width=12)
+   Output: (sum(t1.v1)), t1.v1
+   ->  HashAggregate  (cost=2.17..2.20 rows=3 width=12)
+         Output: sum(t1.v1), t1.v1
+         Group Key: t1.v1
+         ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=4)
+               Output: t1.v1
+               Hash Cond: (t1.v1 = c22.v1)
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+               ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                     Output: c22.v1
+                     ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                 Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(18 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v1;
+ sum 
+-----
+   4
+   2
+   8
+   7
+   3
+  10
+   9
+   6
+   5
+   1
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.24..2.40 rows=10 width=12)
+   Output: (sum(t1.v1)), t1.v2
+   ->  HashAggregate  (cost=2.24..2.27 rows=3 width=12)
+         Output: sum(t1.v1), t1.v2
+         Group Key: t1.v2
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.08..2.22 rows=3 width=8)
+               Output: t1.v2, t1.v1
+               Hash Key: t1.v2
+               ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+                     Output: t1.v2, t1.v1
+                     Hash Cond: (t1.v1 = c22.v1)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                                 Output: c22.v1
+                                 ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                       Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+ sum 
+-----
+   6
+   9
+   8
+  10
+   2
+   5
+   1
+   3
+   4
+   7
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.24..2.40 rows=10 width=12)
+   Output: (sum(t1.v3)), t1.v2
+   ->  HashAggregate  (cost=2.24..2.27 rows=3 width=12)
+         Output: sum(t1.v3), t1.v2
+         Group Key: t1.v2
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.08..2.22 rows=3 width=8)
+               Output: t1.v2, t1.v3
+               Hash Key: t1.v2
+               ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+                     Output: t1.v2, t1.v3
+                     Hash Cond: (t1.v1 = c22.v1)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                                 Output: c22.v1
+                                 ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                       Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+ sum 
+-----
+  26
+  29
+  28
+  30
+  22
+  25
+  21
+  23
+  24
+  27
+(10 rows)
+
+-- order by 
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v1;
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.18..2.32 rows=10 width=8)
+   Output: t1.v1, c22.v1
+   Merge Key: c22.v1
+   ->  Sort  (cost=2.18..2.19 rows=3 width=8)
+         Output: t1.v1, c22.v1
+         Sort Key: c22.v1
+         ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+               Output: t1.v1, c22.v1
+               Hash Cond: (t1.v1 = c22.v1)
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+               ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                     Output: c22.v1
+                     ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                 Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(19 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v1;
+ v1 
+----
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+ 10
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v3;
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.18..2.32 rows=10 width=8)
+   Output: t1.v1, c22.v3
+   Merge Key: c22.v3
+   ->  Sort  (cost=2.18..2.19 rows=3 width=8)
+         Output: t1.v1, c22.v3
+         Sort Key: c22.v3
+         ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+               Output: t1.v1, c22.v3
+               Hash Cond: (t1.v1 = c22.v1)
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+               ->  Hash  (cost=1.03..1.03 rows=3 width=8)
+                     Output: c22.v3, c22.v1
+                     ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=8)
+                           Output: c22.v3, c22.v1
+                           ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                 Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(19 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v3;
+ v1 
+----
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+ 10
+(10 rows)
+
+-- window function
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) OVER (ORDER BY c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ WindowAgg  (cost=2.18..2.47 rows=10 width=12)
+   Output: sum(t1.v1) OVER (?), t1.v2
+   Order By: t1.v2
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=2.18..2.32 rows=10 width=8)
+         Output: t1.v2, t1.v1
+         Merge Key: t1.v2
+         ->  Sort  (cost=2.18..2.19 rows=3 width=8)
+               Output: t1.v2, t1.v1
+               Sort Key: t1.v2
+               ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+                     Output: t1.v2, t1.v1
+                     Hash Cond: (t1.v1 = c22.v1)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                                 Output: c22.v1
+                                 ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                       Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(22 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) OVER (ORDER BY c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ sum 
+-----
+   1
+   3
+   6
+  10
+  15
+  21
+  28
+  36
+  45
+  55
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ WindowAgg  (cost=2.18..2.47 rows=10 width=12)
+   Output: sum(t1.v2) OVER (?), t1.v3
+   Order By: t1.v3
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=2.18..2.32 rows=10 width=8)
+         Output: t1.v3, t1.v2
+         Merge Key: t1.v3
+         ->  Sort  (cost=2.18..2.19 rows=3 width=8)
+               Output: t1.v3, t1.v2
+               Sort Key: t1.v3
+               ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+                     Output: t1.v3, t1.v2
+                     Hash Cond: (t1.v1 = c22.v1)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                                 Output: c22.v1
+                                 ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                       Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(22 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ sum 
+-----
+  11
+  23
+  36
+  50
+  65
+  81
+  98
+ 116
+ 135
+ 155
+(10 rows)
+
+-- grouping set 
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v1,c11.v2);
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ GroupAggregate  (cost=2.18..2.61 rows=21 width=16)
+   Output: sum(t1.v2), t1.v1, t1.v2
+   Group Key: t1.v1, t1.v2
+   Group Key: t1.v1
+   Group Key: ()
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=2.18..2.32 rows=10 width=8)
+         Output: t1.v1, t1.v2
+         Merge Key: t1.v1, t1.v2
+         ->  Sort  (cost=2.18..2.19 rows=3 width=8)
+               Output: t1.v1, t1.v2
+               Sort Key: t1.v1, t1.v2
+               ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Cond: (t1.v1 = c22.v1)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                                 Output: c22.v1
+                                 ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                       Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(24 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v1,c11.v2);
+ sum 
+-----
+  11
+  11
+  12
+  12
+  13
+  13
+  14
+  14
+  15
+  15
+  16
+  16
+  17
+  17
+  18
+  18
+  19
+  19
+  20
+  20
+ 155
+(21 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v2,c11.v3);
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ GroupAggregate  (cost=2.18..2.61 rows=21 width=16)
+   Output: sum(t1.v2), t1.v2, t1.v3
+   Group Key: t1.v2, t1.v3
+   Group Key: t1.v2
+   Group Key: ()
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=2.18..2.32 rows=10 width=8)
+         Output: t1.v2, t1.v3
+         Merge Key: t1.v2, t1.v3
+         ->  Sort  (cost=2.18..2.19 rows=3 width=8)
+               Output: t1.v2, t1.v3
+               Sort Key: t1.v2, t1.v3
+               ->  Hash Left Join  (cost=1.08..2.15 rows=3 width=8)
+                     Output: t1.v2, t1.v3
+                     Hash Cond: (t1.v1 = c22.v1)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                           Output: c22.v1
+                           ->  Subquery Scan on c22  (cost=0.00..1.03 rows=3 width=4)
+                                 Output: c22.v1
+                                 ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                       Output: t1_1.v1, t1_1.v2, t1_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(24 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ sum 
+-----
+  11
+  23
+  36
+  50
+  65
+  81
+  98
+ 116
+ 135
+ 155
+(10 rows)
+
+-- CTE producer should have right output
+explain verbose with c1 as (select t1.v1 as v1, t2.v1 as t21, t2.v2 as t22, t2.v3 as t23 from t1 join t2 on t1.v1 = t2.v1) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=366.90..742.37 rows=779 width=4)
+   Output: t1.v1
+   ->  Hash Left Join  (cost=366.90..731.98 rows=260 width=4)
+         Output: t1.v1
+         Hash Cond: (t1.v1 = c22.v1)
+         ->  Hash Join  (cost=1.08..362.58 rows=260 width=16)
+               Output: t1.v1, t2.v1, t2.v2, t2.v3
+               Hash Cond: (t2.v1 = t1.v1)
+               ->  Seq Scan on cte_prune.t2  (cost=0.00..293.67 rows=25967 width=12)
+                     Output: t2.v1, t2.v2, t2.v3
+               ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                     Output: t1.v1
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=4)
+                           Output: t1.v1
+         ->  Hash  (cost=362.58..362.58 rows=260 width=4)
+               Output: c22.v1
+               ->  Subquery Scan on c22  (cost=1.08..362.58 rows=260 width=4)
+                     Output: c22.v1
+                     ->  Hash Join  (cost=1.08..362.58 rows=260 width=16)
+                           Output: t1_1.v1, t2_1.v1, t2_1.v2, t2_1.v3
+                           Hash Cond: (t2_1.v1 = t1_1.v1)
+                           ->  Seq Scan on cte_prune.t2 t2_1  (cost=0.00..293.67 rows=25967 width=12)
+                                 Output: t2_1.v1, t2_1.v2, t2_1.v3
+                           ->  Hash  (cost=1.03..1.03 rows=3 width=4)
+                                 Output: t1_1.v1
+                                 ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=4)
+                                       Output: t1_1.v1
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(29 rows)
+
+with c1 as (select t1.v1 as v1, t2.v1 as t21, t2.v2 as t22, t2.v3 as t23 from t1 join t2 on t1.v1 = t2.v1) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ v1 
+----
+  5
+  6
+  9
+ 10
+  2
+  3
+  4
+  7
+  8
+  1
+(10 rows)
+
+explain verbose with c1 as (select sum(v1) as v1, sum(v2) as v2, v3 from t1 group by v3) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.39..2.67 rows=10 width=8)
+   Output: c11.v1
+   ->  Hash Left Join  (cost=2.39..2.54 rows=3 width=8)
+         Output: c11.v1
+         Hash Cond: (c11.v1 = c22.v1)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.12..1.23 rows=3 width=8)
+               Output: c11.v1
+               Hash Key: c11.v1
+               ->  Subquery Scan on c11  (cost=1.12..1.16 rows=3 width=8)
+                     Output: c11.v1
+                     ->  HashAggregate  (cost=1.12..1.16 rows=3 width=20)
+                           Output: sum(t1.v1), sum(t1.v2), t1.v3
+                           Group Key: t1.v3
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..1.10 rows=3 width=12)
+                                 Output: t1.v3, t1.v1, t1.v2
+                                 Hash Key: t1.v3
+                                 ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                                       Output: t1.v3, t1.v1, t1.v2
+         ->  Hash  (cost=1.23..1.23 rows=3 width=8)
+               Output: c22.v1
+               ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=1.12..1.23 rows=3 width=8)
+                     Output: c22.v1
+                     Hash Key: c22.v1
+                     ->  Subquery Scan on c22  (cost=1.12..1.16 rows=3 width=8)
+                           Output: c22.v1
+                           ->  HashAggregate  (cost=1.12..1.16 rows=3 width=20)
+                                 Output: sum(t1_1.v1), sum(t1_1.v2), t1_1.v3
+                                 Group Key: t1_1.v3
+                                 ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=0.00..1.10 rows=3 width=12)
+                                       Output: t1_1.v3, t1_1.v1, t1_1.v2
+                                       Hash Key: t1_1.v3
+                                       ->  Seq Scan on cte_prune.t1 t1_1  (cost=0.00..1.03 rows=3 width=12)
+                                             Output: t1_1.v3, t1_1.v1, t1_1.v2
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(35 rows)
+
+with c1 as (select lt1.v3 as v3, lt1.v1 as lo1, rt1.v1 as ro1 from t1 lt1, t1 rt1 where lt1.v2 = rt1.v2 and lt1.v1 = rt1.v1)  
+select * from t1 where  t1.v1 in (select v3 from c1) and t1.v1 in (select v3 from c1 where v3 > 0);
+ v1 | v2 | v3 
+----+----+----
+(0 rows)
+
+-- TPCDS case
+create table tpcds_store_sales
+(
+    ss_sold_date_sk           integer                       ,
+    ss_sold_time_sk           integer                       ,
+    ss_item_sk                integer               not null,
+    ss_customer_sk            integer                       ,
+    ss_cdemo_sk               integer                       ,
+    ss_hdemo_sk               integer                       ,
+    ss_addr_sk                integer                       ,
+    ss_store_sk               integer                       ,
+    ss_promo_sk               integer                       ,
+    ss_ticket_number          integer               not null,
+    ss_quantity               integer                       ,
+    ss_wholesale_cost         decimal(7,2)                  ,
+    ss_list_price             decimal(7,2)                  ,
+    ss_sales_price            decimal(7,2)                  ,
+    ss_ext_discount_amt       decimal(7,2)                  ,
+    ss_ext_sales_price        decimal(7,2)                  ,
+    ss_ext_wholesale_cost     decimal(7,2)                  ,
+    ss_ext_list_price         decimal(7,2)                  ,
+    ss_ext_tax                decimal(7,2)                  ,
+    ss_coupon_amt             decimal(7,2)                  ,
+    ss_net_paid               decimal(7,2)                  ,
+    ss_net_paid_inc_tax       decimal(7,2)                  ,
+    ss_net_profit             decimal(7,2)                  ,
+    primary key (ss_item_sk, ss_ticket_number)
+);
+create table tpcds_date_dim
+(
+    d_date_sk                 integer               not null,
+    d_date_id                 char(16)              not null,
+    d_date                    date                          ,
+    d_month_seq               integer                       ,
+    d_week_seq                integer                       ,
+    d_quarter_seq             integer                       ,
+    d_year                    integer                       ,
+    d_dow                     integer                       ,
+    d_moy                     integer                       ,
+    d_dom                     integer                       ,
+    d_qoy                     integer                       ,
+    d_fy_year                 integer                       ,
+    d_fy_quarter_seq          integer                       ,
+    d_fy_week_seq             integer                       ,
+    d_day_name                char(9)                       ,
+    d_quarter_name            char(6)                       ,
+    d_holiday                 char(1)                       ,
+    d_weekend                 char(1)                       ,
+    d_following_holiday       char(1)                       ,
+    d_first_dom               integer                       ,
+    d_last_dom                integer                       ,
+    d_same_day_ly             integer                       ,
+    d_same_day_lq             integer                       ,
+    d_current_day             char(1)                       ,
+    d_current_week            char(1)                       ,
+    d_current_month           char(1)                       ,
+    d_current_quarter         char(1)                       ,
+    d_current_year            char(1)                       ,
+    primary key (d_date_sk)
+);
+create table tpcds_item
+(
+    i_item_sk                 integer               not null,
+    i_item_id                 char(16)              not null,
+    i_rec_start_date          date                          ,
+    i_rec_end_date            date                          ,
+    i_item_desc               varchar(200)                  ,
+    i_current_price           decimal(7,2)                  ,
+    i_wholesale_cost          decimal(7,2)                  ,
+    i_brand_id                integer                       ,
+    i_brand                   char(50)                      ,
+    i_class_id                integer                       ,
+    i_class                   char(50)                      ,
+    i_category_id             integer                       ,
+    i_category                char(50)                      ,
+    i_manufact_id             integer                       ,
+    i_manufact                char(50)                      ,
+    i_size                    char(20)                      ,
+    i_formulation             char(20)                      ,
+    i_color                   char(20)                      ,
+    i_units                   char(10)                      ,
+    i_container               char(10)                      ,
+    i_manager_id              integer                       ,
+    i_product_name            char(50)                      ,
+    primary key (i_item_sk)
+);
+create table tpcds_web_sales
+(
+    ws_sold_date_sk           integer                       ,
+    ws_sold_time_sk           integer                       ,
+    ws_ship_date_sk           integer                       ,
+    ws_item_sk                integer               not null,
+    ws_bill_customer_sk       integer                       ,
+    ws_bill_cdemo_sk          integer                       ,
+    ws_bill_hdemo_sk          integer                       ,
+    ws_bill_addr_sk           integer                       ,
+    ws_ship_customer_sk       integer                       ,
+    ws_ship_cdemo_sk          integer                       ,
+    ws_ship_hdemo_sk          integer                       ,
+    ws_ship_addr_sk           integer                       ,
+    ws_web_page_sk            integer                       ,
+    ws_web_site_sk            integer                       ,
+    ws_ship_mode_sk           integer                       ,
+    ws_warehouse_sk           integer                       ,
+    ws_promo_sk               integer                       ,
+    ws_order_number           integer               not null,
+    ws_quantity               integer                       ,
+    ws_wholesale_cost         decimal(7,2)                  ,
+    ws_list_price             decimal(7,2)                  ,
+    ws_sales_price            decimal(7,2)                  ,
+    ws_ext_discount_amt       decimal(7,2)                  ,
+    ws_ext_sales_price        decimal(7,2)                  ,
+    ws_ext_wholesale_cost     decimal(7,2)                  ,
+    ws_ext_list_price         decimal(7,2)                  ,
+    ws_ext_tax                decimal(7,2)                  ,
+    ws_coupon_amt             decimal(7,2)                  ,
+    ws_ext_ship_cost          decimal(7,2)                  ,
+    ws_net_paid               decimal(7,2)                  ,
+    ws_net_paid_inc_tax       decimal(7,2)                  ,
+    ws_net_paid_inc_ship      decimal(7,2)                  ,
+    ws_net_paid_inc_ship_tax  decimal(7,2)                  ,
+    ws_net_profit             decimal(7,2)                  ,
+primary key (ws_item_sk, ws_order_number)
+);
+-- sql 23
+explain verbose with frequent_ss_items as 
+ (select substr(i_item_desc,1,30) itemdesc,i_item_sk item_sk,d_date solddate,count(*) cnt
+  from tpcds_store_sales
+      ,tpcds_date_dim 
+      ,tpcds_item
+  where ss_sold_date_sk = d_date_sk
+    and ss_item_sk = i_item_sk 
+    and d_year in (1999,1999+1,1999+2,1999+3)
+  group by substr(i_item_desc,1,30),i_item_sk,d_date
+  having count(*) >4)
+select t1.v1 from t1 where t1.v1 in (select item_sk from frequent_ss_items where true)
+    and t1.v1 in (select item_sk from frequent_ss_items where item_sk > 0);
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                    QUERY PLAN                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=452.38..452.44 rows=3 width=4)
+   Output: t1.v1
+   ->  HashAggregate  (cost=452.38..452.39 rows=1 width=4)
+         Output: t1.v1
+         Group Key: (RowIdExpr)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=451.80..452.38 rows=1 width=4)
+               Output: t1.v1, (RowIdExpr)
+               Hash Key: (RowIdExpr)
+               ->  Hash Join  (cost=451.80..452.36 rows=1 width=4)
+                     Output: t1.v1, (RowIdExpr)
+                     Hash Cond: (frequent_ss_items.item_sk = t1.v1)
+                     ->  Subquery Scan on frequent_ss_items  (cost=223.67..224.14 rows=6 width=4)
+                           Output: frequent_ss_items.item_sk
+                           ->  GroupAggregate  (cost=223.67..224.14 rows=6 width=48)
+                                 Output: (substr((tpcds_item.i_item_desc)::text, 1, 30)), tpcds_item.i_item_sk, tpcds_date_dim.d_date, count(*)
+                                 Group Key: (substr((tpcds_item.i_item_desc)::text, 1, 30)), tpcds_item.i_item_sk, tpcds_date_dim.d_date
+                                 Filter: (count(*) > 4)
+                                 ->  Sort  (cost=223.67..223.72 rows=18 width=40)
+                                       Output: (substr((tpcds_item.i_item_desc)::text, 1, 30)), tpcds_item.i_item_sk, tpcds_date_dim.d_date
+                                       Sort Key: (substr((tpcds_item.i_item_desc)::text, 1, 30)), tpcds_item.i_item_sk, tpcds_date_dim.d_date
+                                       ->  Hash Join  (cost=181.20..223.30 rows=18 width=40)
+                                             Output: substr((tpcds_item.i_item_desc)::text, 1, 30), tpcds_item.i_item_sk, tpcds_date_dim.d_date
+                                             Hash Cond: (tpcds_item.i_item_sk = tpcds_store_sales.ss_item_sk)
+                                             ->  Seq Scan on cte_prune.tpcds_item  (cost=0.00..39.33 rows=533 width=422)
+                                                   Output: tpcds_item.i_item_sk, tpcds_item.i_item_id, tpcds_item.i_rec_start_date, tpcds_item.i_rec_end_date, tpcds_item.i_item_desc, tpcds_item.i_current_price, tpcds_item.i_wholesale_cost, tpcds_item.i_brand_id, tpcds_item.i_brand, tpcds_item.i_class_id, tpcds_item.i_class, tpcds_item.i_category_id, tpcds_item.i_category, tpcds_item.i_manufact_id, tpcds_item.i_manufact, tpcds_item.i_size, tpcds_item.i_formulation, tpcds_item.i_color, tpcds_item.i_units, tpcds_item.i_container, tpcds_item.i_manager_id, tpcds_item.i_product_name
+                                             ->  Hash  (cost=180.98..180.98 rows=18 width=8)
+                                                   Output: tpcds_store_sales.ss_item_sk, tpcds_date_dim.d_date
+                                                   ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=89.63..180.98 rows=18 width=8)
+                                                         Output: tpcds_store_sales.ss_item_sk, tpcds_date_dim.d_date
+                                                         Hash Key: tpcds_store_sales.ss_item_sk
+                                                         ->  Hash Join  (cost=89.63..180.62 rows=18 width=8)
+                                                               Output: tpcds_store_sales.ss_item_sk, tpcds_date_dim.d_date
+                                                               Inner Unique: true
+                                                               Hash Cond: (tpcds_store_sales.ss_sold_date_sk = tpcds_date_dim.d_date_sk)
+                                                               ->  Seq Scan on cte_prune.tpcds_store_sales  (cost=0.00..79.00 rows=4500 width=8)
+                                                                     Output: tpcds_store_sales.ss_sold_date_sk, tpcds_store_sales.ss_sold_time_sk, tpcds_store_sales.ss_item_sk, tpcds_store_sales.ss_customer_sk, tpcds_store_sales.ss_cdemo_sk, tpcds_store_sales.ss_hdemo_sk, tpcds_store_sales.ss_addr_sk, tpcds_store_sales.ss_store_sk, tpcds_store_sales.ss_promo_sk, tpcds_store_sales.ss_ticket_number, tpcds_store_sales.ss_quantity, tpcds_store_sales.ss_wholesale_cost, tpcds_store_sales.ss_list_price, tpcds_store_sales.ss_sales_price, tpcds_store_sales.ss_ext_discount_amt, tpcds_store_sales.ss_ext_sales_price, tpcds_store_sales.ss_ext_wholesale_cost, tpcds_store_sales.ss_ext_list_price, tpcds_store_sales.ss_ext_tax, tpcds_store_sales.ss_coupon_amt, tpcds_store_sales.ss_net_paid, tpcds_store_sales.ss_net_paid_inc_tax, tpcds_store_sales.ss_net_profit
+                                                               ->  Hash  (cost=89.08..89.08 rows=44 width=8)
+                                                                     Output: tpcds_date_dim.d_date, tpcds_date_dim.d_date_sk
+                                                                     ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..89.08 rows=44 width=8)
+                                                                           Output: tpcds_date_dim.d_date, tpcds_date_dim.d_date_sk
+                                                                           ->  Seq Scan on cte_prune.tpcds_date_dim  (cost=0.00..88.50 rows=15 width=8)
+                                                                                 Output: tpcds_date_dim.d_date, tpcds_date_dim.d_date_sk
+                                                                                 Filter: (tpcds_date_dim.d_year = ANY ('{1999,2000,2001,2002}'::integer[]))
+                     ->  Hash  (cost=228.11..228.11 rows=1 width=8)
+                           Output: t1.v1, frequent_ss_items_1.item_sk, (RowIdExpr)
+                           ->  Hash Semi Join  (cost=227.06..228.11 rows=1 width=8)
+                                 Output: t1.v1, frequent_ss_items_1.item_sk, RowIdExpr
+                                 Hash Cond: (t1.v1 = frequent_ss_items_1.item_sk)
+                                 ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=4)
+                                       Output: t1.v1, t1.v2, t1.v3
+                                 ->  Hash  (cost=227.05..227.05 rows=1 width=4)
+                                       Output: frequent_ss_items_1.item_sk
+                                       ->  Subquery Scan on frequent_ss_items_1  (cost=226.96..227.04 rows=1 width=4)
+                                             Output: frequent_ss_items_1.item_sk
+                                             ->  GroupAggregate  (cost=226.96..227.04 rows=1 width=48)
+                                                   Output: (substr((tpcds_item_1.i_item_desc)::text, 1, 30)), tpcds_item_1.i_item_sk, tpcds_date_dim_1.d_date, count(*)
+                                                   Group Key: (substr((tpcds_item_1.i_item_desc)::text, 1, 30)), tpcds_item_1.i_item_sk, tpcds_date_dim_1.d_date
+                                                   Filter: (count(*) > 4)
+                                                   ->  Sort  (cost=226.96..226.97 rows=3 width=40)
+                                                         Output: (substr((tpcds_item_1.i_item_desc)::text, 1, 30)), tpcds_item_1.i_item_sk, tpcds_date_dim_1.d_date
+                                                         Sort Key: (substr((tpcds_item_1.i_item_desc)::text, 1, 30)), tpcds_item_1.i_item_sk, tpcds_date_dim_1.d_date
+                                                         ->  Hash Join  (cost=132.52..226.94 rows=3 width=40)
+                                                               Output: substr((tpcds_item_1.i_item_desc)::text, 1, 30), tpcds_item_1.i_item_sk, tpcds_date_dim_1.d_date
+                                                               Inner Unique: true
+                                                               Hash Cond: (tpcds_store_sales_1.ss_item_sk = tpcds_item_1.i_item_sk)
+                                                               ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=89.63..183.99 rows=6 width=8)
+                                                                     Output: tpcds_store_sales_1.ss_item_sk, tpcds_date_dim_1.d_date
+                                                                     Hash Key: tpcds_store_sales_1.ss_item_sk
+                                                                     ->  Hash Join  (cost=89.63..183.87 rows=6 width=8)
+                                                                           Output: tpcds_store_sales_1.ss_item_sk, tpcds_date_dim_1.d_date
+                                                                           Inner Unique: true
+                                                                           Hash Cond: (tpcds_store_sales_1.ss_sold_date_sk = tpcds_date_dim_1.d_date_sk)
+                                                                           ->  Seq Scan on cte_prune.tpcds_store_sales tpcds_store_sales_1  (cost=0.00..90.25 rows=1500 width=8)
+                                                                                 Output: tpcds_store_sales_1.ss_sold_date_sk, tpcds_store_sales_1.ss_sold_time_sk, tpcds_store_sales_1.ss_item_sk, tpcds_store_sales_1.ss_customer_sk, tpcds_store_sales_1.ss_cdemo_sk, tpcds_store_sales_1.ss_hdemo_sk, tpcds_store_sales_1.ss_addr_sk, tpcds_store_sales_1.ss_store_sk, tpcds_store_sales_1.ss_promo_sk, tpcds_store_sales_1.ss_ticket_number, tpcds_store_sales_1.ss_quantity, tpcds_store_sales_1.ss_wholesale_cost, tpcds_store_sales_1.ss_list_price, tpcds_store_sales_1.ss_sales_price, tpcds_store_sales_1.ss_ext_discount_amt, tpcds_store_sales_1.ss_ext_sales_price, tpcds_store_sales_1.ss_ext_wholesale_cost, tpcds_store_sales_1.ss_ext_list_price, tpcds_store_sales_1.ss_ext_tax, tpcds_store_sales_1.ss_coupon_amt, tpcds_store_sales_1.ss_net_paid, tpcds_store_sales_1.ss_net_paid_inc_tax, tpcds_store_sales_1.ss_net_profit
+                                                                                 Filter: (tpcds_store_sales_1.ss_item_sk > 0)
+                                                                           ->  Hash  (cost=89.08..89.08 rows=44 width=8)
+                                                                                 Output: tpcds_date_dim_1.d_date, tpcds_date_dim_1.d_date_sk
+                                                                                 ->  Broadcast Motion 3:3  (slice6; segments: 3)  (cost=0.00..89.08 rows=44 width=8)
+                                                                                       Output: tpcds_date_dim_1.d_date, tpcds_date_dim_1.d_date_sk
+                                                                                       ->  Seq Scan on cte_prune.tpcds_date_dim tpcds_date_dim_1  (cost=0.00..88.50 rows=15 width=8)
+                                                                                             Output: tpcds_date_dim_1.d_date, tpcds_date_dim_1.d_date_sk
+                                                                                             Filter: (tpcds_date_dim_1.d_year = ANY ('{1999,2000,2001,2002}'::integer[]))
+                                                               ->  Hash  (cost=40.67..40.67 rows=178 width=422)
+                                                                     Output: tpcds_item_1.i_item_desc, tpcds_item_1.i_item_sk
+                                                                     ->  Seq Scan on cte_prune.tpcds_item tpcds_item_1  (cost=0.00..40.67 rows=178 width=422)
+                                                                           Output: tpcds_item_1.i_item_desc, tpcds_item_1.i_item_sk
+                                                                           Filter: (tpcds_item_1.i_item_sk > 0)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(89 rows)
+
+-- sql 95
+explain verbose with ws_wh as
+(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
+ from tpcds_web_sales ws1,tpcds_web_sales ws2
+ where ws1.ws_order_number = ws2.ws_order_number
+   and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+select * from t1 where t1.v1 in (select ws_order_number from ws_wh where true) and t1.v1 in (select ws_order_number from ws_wh where ws_order_number > 0);
+                                                                              QUERY PLAN                                                                               
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2952.11..2952.33 rows=14 width=12)
+   Output: t1.v1, t1.v2, t1.v3
+   ->  HashAggregate  (cost=2952.11..2952.15 rows=5 width=12)
+         Output: t1.v1, t1.v2, t1.v3
+         Group Key: (RowIdExpr)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=508.11..2952.10 rows=5 width=12)
+               Output: t1.v1, t1.v2, t1.v3, (RowIdExpr)
+               Hash Key: (RowIdExpr)
+               ->  Hash Join  (cost=508.11..2952.01 rows=5 width=12)
+                     Output: t1.v1, t1.v2, t1.v3, (RowIdExpr)
+                     Hash Cond: (ws_wh.ws_order_number = t1.v1)
+                     ->  Subquery Scan on ws_wh  (cost=179.92..2181.72 rows=35328 width=4)
+                           Output: ws_wh.ws_order_number
+                           ->  Hash Join  (cost=179.92..2181.72 rows=35328 width=12)
+                                 Output: ws1.ws_order_number, ws1.ws_warehouse_sk, ws2.ws_warehouse_sk
+                                 Hash Cond: (ws1.ws_order_number = ws2.ws_order_number)
+                                 Join Filter: (ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..137.00 rows=3433 width=8)
+                                       Output: ws1.ws_order_number, ws1.ws_warehouse_sk
+                                       Hash Key: ws1.ws_order_number
+                                       ->  Seq Scan on cte_prune.tpcds_web_sales ws1  (cost=0.00..68.33 rows=3433 width=8)
+                                             Output: ws1.ws_order_number, ws1.ws_warehouse_sk
+                                 ->  Hash  (cost=137.00..137.00 rows=3433 width=8)
+                                       Output: ws2.ws_warehouse_sk, ws2.ws_order_number
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..137.00 rows=3433 width=8)
+                                             Output: ws2.ws_warehouse_sk, ws2.ws_order_number
+                                             Hash Key: ws2.ws_order_number
+                                             ->  Seq Scan on cte_prune.tpcds_web_sales ws2  (cost=0.00..68.33 rows=3433 width=8)
+                                                   Output: ws2.ws_warehouse_sk, ws2.ws_order_number
+                     ->  Hash  (cost=328.14..328.14 rows=5 width=16)
+                           Output: t1.v1, t1.v2, t1.v3, ws_wh_1.ws_order_number, (RowIdExpr)
+                           ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=327.96..328.14 rows=5 width=16)
+                                 Output: t1.v1, t1.v2, t1.v3, ws_wh_1.ws_order_number, (RowIdExpr)
+                                 Hash Key: t1.v1
+                                 ->  Result  (cost=327.96..328.05 rows=5 width=16)
+                                       Output: t1.v1, t1.v2, t1.v3, ws_wh_1.ws_order_number, RowIdExpr
+                                       ->  HashAggregate  (cost=327.96..328.00 rows=5 width=16)
+                                             Output: t1.v1, t1.v2, t1.v3, ws_wh_1.ws_order_number
+                                             Group Key: (RowIdExpr)
+                                             ->  Redistribute Motion 3:3  (slice6; segments: 3)  (cost=115.19..327.95 rows=5 width=16)
+                                                   Output: t1.v1, t1.v2, t1.v3, ws_wh_1.ws_order_number, (RowIdExpr)
+                                                   Hash Key: (RowIdExpr)
+                                                   ->  Hash Join  (cost=115.19..327.86 rows=5 width=16)
+                                                         Output: t1.v1, t1.v2, t1.v3, ws_wh_1.ws_order_number, (RowIdExpr)
+                                                         Hash Cond: (ws_wh_1.ws_order_number = t1.v1)
+                                                         ->  Subquery Scan on ws_wh_1  (cost=114.11..277.62 rows=3925 width=4)
+                                                               Output: ws_wh_1.ws_order_number
+                                                               ->  Hash Join  (cost=114.11..277.62 rows=3925 width=12)
+                                                                     Output: ws1_1.ws_order_number, ws1_1.ws_warehouse_sk, ws2_1.ws_warehouse_sk
+                                                                     Hash Cond: (ws1_1.ws_order_number = ws2_1.ws_order_number)
+                                                                     Join Filter: (ws1_1.ws_warehouse_sk <> ws2_1.ws_warehouse_sk)
+                                                                     ->  Redistribute Motion 3:3  (slice7; segments: 3)  (cost=0.00..99.81 rows=1144 width=8)
+                                                                           Output: ws1_1.ws_order_number, ws1_1.ws_warehouse_sk
+                                                                           Hash Key: ws1_1.ws_order_number
+                                                                           ->  Seq Scan on cte_prune.tpcds_web_sales ws1_1  (cost=0.00..76.92 rows=1144 width=8)
+                                                                                 Output: ws1_1.ws_order_number, ws1_1.ws_warehouse_sk
+                                                                                 Filter: (ws1_1.ws_order_number > 0)
+                                                                     ->  Hash  (cost=99.81..99.81 rows=1144 width=8)
+                                                                           Output: ws2_1.ws_warehouse_sk, ws2_1.ws_order_number
+                                                                           ->  Redistribute Motion 3:3  (slice8; segments: 3)  (cost=0.00..99.81 rows=1144 width=8)
+                                                                                 Output: ws2_1.ws_warehouse_sk, ws2_1.ws_order_number
+                                                                                 Hash Key: ws2_1.ws_order_number
+                                                                                 ->  Seq Scan on cte_prune.tpcds_web_sales ws2_1  (cost=0.00..76.92 rows=1144 width=8)
+                                                                                       Output: ws2_1.ws_warehouse_sk, ws2_1.ws_order_number
+                                                                                       Filter: (ws2_1.ws_order_number > 0)
+                                                         ->  Hash  (cost=1.03..1.03 rows=3 width=12)
+                                                               Output: t1.v1, t1.v2, t1.v3, (RowIdExpr)
+                                                               ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                                                                     Output: t1.v1, t1.v2, t1.v3, RowIdExpr
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(71 rows)
+
+explain verbose with ws_wh as
+(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
+ from tpcds_web_sales ws1,tpcds_web_sales ws2
+ where ws1.ws_order_number = ws2.ws_order_number
+   and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+select * from t1 where t1.v1 in (select wh1 from ws_wh where true) and t1.v1 in (select wh1 from ws_wh where ws_order_number > 0);
+                                                                              QUERY PLAN                                                                               
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2952.68..2952.91 rows=14 width=12)
+   Output: t1.v1, t1.v2, t1.v3
+   ->  HashAggregate  (cost=2952.68..2952.73 rows=5 width=12)
+         Output: t1.v1, t1.v2, t1.v3
+         Group Key: (RowIdExpr)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=508.53..2952.67 rows=5 width=12)
+               Output: t1.v1, t1.v2, t1.v3, (RowIdExpr)
+               Hash Key: (RowIdExpr)
+               ->  Hash Join  (cost=508.53..2952.58 rows=5 width=12)
+                     Output: t1.v1, t1.v2, t1.v3, (RowIdExpr)
+                     Hash Cond: (ws_wh.wh1 = t1.v1)
+                     ->  Subquery Scan on ws_wh  (cost=179.92..2181.72 rows=35328 width=4)
+                           Output: ws_wh.wh1
+                           ->  Hash Join  (cost=179.92..2181.72 rows=35328 width=12)
+                                 Output: ws1.ws_order_number, ws1.ws_warehouse_sk, ws2.ws_warehouse_sk
+                                 Hash Cond: (ws1.ws_order_number = ws2.ws_order_number)
+                                 Join Filter: (ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..137.00 rows=3433 width=8)
+                                       Output: ws1.ws_order_number, ws1.ws_warehouse_sk
+                                       Hash Key: ws1.ws_order_number
+                                       ->  Seq Scan on cte_prune.tpcds_web_sales ws1  (cost=0.00..68.33 rows=3433 width=8)
+                                             Output: ws1.ws_order_number, ws1.ws_warehouse_sk
+                                 ->  Hash  (cost=137.00..137.00 rows=3433 width=8)
+                                       Output: ws2.ws_warehouse_sk, ws2.ws_order_number
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..137.00 rows=3433 width=8)
+                                             Output: ws2.ws_warehouse_sk, ws2.ws_order_number
+                                             Hash Key: ws2.ws_order_number
+                                             ->  Seq Scan on cte_prune.tpcds_web_sales ws2  (cost=0.00..68.33 rows=3433 width=8)
+                                                   Output: ws2.ws_warehouse_sk, ws2.ws_order_number
+                     ->  Hash  (cost=328.44..328.44 rows=14 width=16)
+                           Output: t1.v1, t1.v2, t1.v3, ws_wh_1.wh1, (RowIdExpr)
+                           ->  Broadcast Motion 3:3  (slice5; segments: 3)  (cost=328.17..328.44 rows=14 width=16)
+                                 Output: t1.v1, t1.v2, t1.v3, ws_wh_1.wh1, (RowIdExpr)
+                                 ->  Result  (cost=328.17..328.26 rows=5 width=16)
+                                       Output: t1.v1, t1.v2, t1.v3, ws_wh_1.wh1, RowIdExpr
+                                       ->  HashAggregate  (cost=328.17..328.22 rows=5 width=16)
+                                             Output: t1.v1, t1.v2, t1.v3, ws_wh_1.wh1
+                                             Group Key: (RowIdExpr)
+                                             ->  Redistribute Motion 3:3  (slice6; segments: 3)  (cost=115.40..328.16 rows=5 width=16)
+                                                   Output: t1.v1, t1.v2, t1.v3, ws_wh_1.wh1, (RowIdExpr)
+                                                   Hash Key: (RowIdExpr)
+                                                   ->  Hash Join  (cost=115.40..328.07 rows=5 width=16)
+                                                         Output: t1.v1, t1.v2, t1.v3, ws_wh_1.wh1, (RowIdExpr)
+                                                         Hash Cond: (ws_wh_1.wh1 = t1.v1)
+                                                         ->  Subquery Scan on ws_wh_1  (cost=114.11..277.62 rows=3925 width=4)
+                                                               Output: ws_wh_1.wh1
+                                                               ->  Hash Join  (cost=114.11..277.62 rows=3925 width=12)
+                                                                     Output: ws1_1.ws_order_number, ws1_1.ws_warehouse_sk, ws2_1.ws_warehouse_sk
+                                                                     Hash Cond: (ws1_1.ws_order_number = ws2_1.ws_order_number)
+                                                                     Join Filter: (ws1_1.ws_warehouse_sk <> ws2_1.ws_warehouse_sk)
+                                                                     ->  Redistribute Motion 3:3  (slice7; segments: 3)  (cost=0.00..99.81 rows=1144 width=8)
+                                                                           Output: ws1_1.ws_order_number, ws1_1.ws_warehouse_sk
+                                                                           Hash Key: ws1_1.ws_order_number
+                                                                           ->  Seq Scan on cte_prune.tpcds_web_sales ws1_1  (cost=0.00..76.92 rows=1144 width=8)
+                                                                                 Output: ws1_1.ws_order_number, ws1_1.ws_warehouse_sk
+                                                                                 Filter: (ws1_1.ws_order_number > 0)
+                                                                     ->  Hash  (cost=99.81..99.81 rows=1144 width=8)
+                                                                           Output: ws2_1.ws_warehouse_sk, ws2_1.ws_order_number
+                                                                           ->  Redistribute Motion 3:3  (slice8; segments: 3)  (cost=0.00..99.81 rows=1144 width=8)
+                                                                                 Output: ws2_1.ws_warehouse_sk, ws2_1.ws_order_number
+                                                                                 Hash Key: ws2_1.ws_order_number
+                                                                                 ->  Seq Scan on cte_prune.tpcds_web_sales ws2_1  (cost=0.00..76.92 rows=1144 width=8)
+                                                                                       Output: ws2_1.ws_warehouse_sk, ws2_1.ws_order_number
+                                                                                       Filter: (ws2_1.ws_order_number > 0)
+                                                         ->  Hash  (cost=1.17..1.17 rows=10 width=12)
+                                                               Output: t1.v1, t1.v2, t1.v3, (RowIdExpr)
+                                                               ->  Broadcast Motion 3:3  (slice9; segments: 3)  (cost=0.00..1.17 rows=10 width=12)
+                                                                     Output: t1.v1, t1.v2, t1.v3, (RowIdExpr)
+                                                                     ->  Seq Scan on cte_prune.t1  (cost=0.00..1.03 rows=3 width=12)
+                                                                           Output: t1.v1, t1.v2, t1.v3, RowIdExpr
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(72 rows)
+
+-- start_ignore
+drop table tpcds_store_sales;
+drop table tpcds_date_dim;
+drop table tpcds_item;
+drop table tpcds_web_sales;
+drop table t1;
+drop table t2;
+-- end_ignore
+-- comm cases
+CREATE TABLE t3 AS SELECT i as a, i+1 as b from generate_series(1,10)i;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE t4 AS SELECT i as c, i+1 as d from generate_series(1,10)i;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'c' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+analyze t3;
+analyze t4;
+-- Additional filtering conditions are added to the consumer.
+-- This is caused by `PexprInferPredicates` in the ORCA preprocessor.
+explain verbose WITH t(a,b,d) AS
+(
+  SELECT t3.a,t3.b,t4.d FROM t3,t4 WHERE t3.a = t4.d
+)
+SELECT cup.*, SUM(t.d) OVER(PARTITION BY t.b) FROM
+  (
+    SELECT t4.*, AVG(t.b) OVER(PARTITION BY t.a ORDER BY t.b desc) AS e FROM t,t4
+  ) AS cup,
+t WHERE cup.e < 10
+GROUP BY cup.c,cup.d, cup.e ,t.d, t.b
+ORDER BY 1,2,3,4
+LIMIT 10;
+                                                                                       QUERY PLAN                                                                                       
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=20000000031.26..20000000031.40 rows=10 width=56)
+   Output: cup.c, cup.d, cup.e, (sum(t.d) OVER (?)), t.d, t.b
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=20000000031.26..20000000031.68 rows=30 width=56)
+         Output: cup.c, cup.d, cup.e, (sum(t.d) OVER (?)), t.d, t.b
+         Merge Key: cup.c, cup.d, cup.e, (sum(t.d) OVER (?))
+         ->  Limit  (cost=20000000031.26..20000000031.28 rows=10 width=56)
+               Output: cup.c, cup.d, cup.e, (sum(t.d) OVER (?)), t.d, t.b
+               ->  Sort  (cost=20000000031.26..20000000031.54 rows=111 width=56)
+                     Output: cup.c, cup.d, cup.e, (sum(t.d) OVER (?)), t.d, t.b
+                     Sort Key: cup.c, cup.d, cup.e, (sum(t.d) OVER (?))
+                     ->  WindowAgg  (cost=20000000026.91..20000000028.86 rows=111 width=56)
+                           Output: cup.c, cup.d, cup.e, sum(t.d) OVER (?), t.d, t.b
+                           Partition By: t.b
+                           ->  Sort  (cost=20000000026.91..20000000027.19 rows=111 width=48)
+                                 Output: cup.c, cup.d, cup.e, t.d, t.b
+                                 Sort Key: t.b
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=20000000018.14..20000000023.14 rows=111 width=48)
+                                       Output: cup.c, cup.d, cup.e, t.d, t.b
+                                       Hash Key: t.b
+                                       ->  GroupAggregate  (cost=20000000018.14..20000000020.92 rows=111 width=48)
+                                             Output: cup.c, cup.d, cup.e, t.d, t.b
+                                             Group Key: cup.c, cup.d, cup.e, t.d, t.b
+                                             ->  Sort  (cost=20000000018.14..20000000018.42 rows=111 width=48)
+                                                   Output: cup.c, cup.d, cup.e, t.d, t.b
+                                                   Sort Key: cup.c, cup.d, cup.e, t.d, t.b
+                                                   ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=20000000008.36..20000000014.36 rows=111 width=48)
+                                                         Output: cup.c, cup.d, cup.e, t.d, t.b
+                                                         Hash Key: cup.c, cup.d, cup.e, t.d, t.b
+                                                         ->  Nested Loop  (cost=20000000008.36..20000000012.14 rows=111 width=48)
+                                                               Output: cup.c, cup.d, cup.e, t.d, t.b
+                                                               ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=1.08..2.35 rows=10 width=8)
+                                                                     Output: t.d, t.b
+                                                                     ->  Subquery Scan on t  (cost=1.08..2.22 rows=3 width=8)
+                                                                           Output: t.d, t.b
+                                                                           ->  Hash Join  (cost=1.08..2.22 rows=3 width=12)
+                                                                                 Output: t3.a, t3.b, t4.d
+                                                                                 Hash Cond: (t4.d = t3.a)
+                                                                                 ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+                                                                                       Output: t4.d
+                                                                                       Hash Key: t4.d
+                                                                                       ->  Seq Scan on cte_prune.t4  (cost=0.00..1.03 rows=3 width=4)
+                                                                                             Output: t4.d
+                                                                                 ->  Hash  (cost=1.03..1.03 rows=3 width=8)
+                                                                                       Output: t3.a, t3.b
+                                                                                       ->  Seq Scan on cte_prune.t3  (cost=0.00..1.03 rows=3 width=8)
+                                                                                             Output: t3.a, t3.b
+                                                               ->  Materialize  (cost=10000000007.29..10000000008.43 rows=11 width=40)
+                                                                     Output: cup.c, cup.d, cup.e
+                                                                     ->  Subquery Scan on cup  (cost=10000000007.29..10000000008.37 rows=11 width=40)
+                                                                           Output: cup.c, cup.d, cup.e
+                                                                           Filter: (cup.e < '10'::numeric)
+                                                                           ->  WindowAgg  (cost=10000000007.29..10000000007.95 rows=33 width=48)
+                                                                                 Output: t4_1.c, t4_1.d, avg(t3_1.b) OVER (?), t3_1.b, t3_1.a
+                                                                                 Partition By: t3_1.a
+                                                                                 Order By: t3_1.b
+                                                                                 ->  Sort  (cost=10000000007.29..10000000007.37 rows=33 width=16)
+                                                                                       Output: t3_1.b, t3_1.a, t4_1.c, t4_1.d
+                                                                                       Sort Key: t3_1.a, t3_1.b DESC
+                                                                                       ->  Nested Loop  (cost=10000000001.08..10000000006.44 rows=33 width=16)
+                                                                                             Output: t3_1.b, t3_1.a, t4_1.c, t4_1.d
+                                                                                             ->  Hash Join  (cost=1.08..2.22 rows=3 width=12)
+                                                                                                   Output: t3_1.a, t3_1.b, t4_2.d
+                                                                                                   Hash Cond: (t4_2.d = t3_1.a)
+                                                                                                   ->  Redistribute Motion 3:3  (slice6; segments: 3)  (cost=0.00..1.10 rows=3 width=4)
+                                                                                                         Output: t4_2.d
+                                                                                                         Hash Key: t4_2.d
+                                                                                                         ->  Seq Scan on cte_prune.t4 t4_2  (cost=0.00..1.03 rows=3 width=4)
+                                                                                                               Output: t4_2.d
+                                                                                                   ->  Hash  (cost=1.03..1.03 rows=3 width=8)
+                                                                                                         Output: t3_1.a, t3_1.b
+                                                                                                         ->  Seq Scan on cte_prune.t3 t3_1  (cost=0.00..1.03 rows=3 width=8)
+                                                                                                               Output: t3_1.a, t3_1.b
+                                                                                             ->  Materialize  (cost=0.00..1.22 rows=10 width=8)
+                                                                                                   Output: t4_1.c, t4_1.d
+                                                                                                   ->  Broadcast Motion 3:3  (slice7; segments: 3)  (cost=0.00..1.17 rows=10 width=8)
+                                                                                                         Output: t4_1.c, t4_1.d
+                                                                                                         ->  Seq Scan on cte_prune.t4 t4_1  (cost=0.00..1.03 rows=3 width=8)
+                                                                                                               Output: t4_1.c, t4_1.d
+ Optimizer: Postgres query optimizer
+(80 rows)
+
+WITH t(a,b,d) AS
+(
+  SELECT t3.a,t3.b,t4.d FROM t3,t4 WHERE t3.a = t4.d
+)
+SELECT cup.*, SUM(t.d) OVER(PARTITION BY t.b) FROM
+  (
+    SELECT t4.*, AVG(t.b) OVER(PARTITION BY t.a ORDER BY t.b desc) AS e FROM t,t4
+  ) AS cup,
+t WHERE cup.e < 10
+GROUP BY cup.c,cup.d, cup.e ,t.d, t.b
+ORDER BY 1,2,3,4
+LIMIT 10;
+ c | d |         e          | sum 
+---+---+--------------------+-----
+ 1 | 2 | 3.0000000000000000 | 140
+ 1 | 2 | 3.0000000000000000 | 210
+ 1 | 2 | 3.0000000000000000 | 280
+ 1 | 2 | 3.0000000000000000 | 350
+ 1 | 2 | 3.0000000000000000 | 420
+ 1 | 2 | 3.0000000000000000 | 490
+ 1 | 2 | 3.0000000000000000 | 560
+ 1 | 2 | 3.0000000000000000 | 630
+ 1 | 2 | 3.0000000000000000 | 700
+ 1 | 2 | 4.0000000000000000 | 140
+(10 rows)
+
+-- grouping set will generate the internal CTE.
+CREATE TABLE cte_prune_tenk1 (unique1 int4, unique2 int4, two int4, four int4, ten int4, twenty int4, hundred int4, thousand int4, twothousand int4, fivethous int4, tenthous int4, odd int4, even int4, stringu1 name, stringu2 name, string4 name);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'unique1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO cte_prune_tenk1
+SELECT
+  i AS unique1,
+  (i + 10000) AS unique2,
+  i % 2 AS two,
+  i % 4 AS four,
+  i % 10 AS ten,
+  i % 20 AS twenty,
+  i % 100 AS hundred,
+  i % 1000 AS thousand,
+  i % 2000 AS twothousand,
+  i % 5000 AS fivethous,
+  i % 10000 AS tenthous,
+  (2 * i + 1) AS odd,
+  (2 * i) AS even,
+  ('A' || lpad(i::text, 4, '0'))::name AS stringu1,
+  ('B' || lpad(i::text, 4, '0'))::name AS stringu2,
+  (CASE (i % 4)
+    WHEN 0 THEN 'AAAA'::name
+    WHEN 1 THEN 'BBBB'::name
+    WHEN 2 THEN 'CCCC'::name
+    ELSE 'DDDD'::name
+  END) AS string4
+FROM generate_series(0, 99) AS i;
+explain verbose select four, x
+  from (select four, ten, 'foo'::text as x from cte_prune_tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=130.74..134.95 rows=3 width=36)
+   Output: cte_prune_tenk1.four, ('foo'::text)
+   ->  HashAggregate  (cost=130.74..134.91 rows=1 width=36)
+         Output: cte_prune_tenk1.four, ('foo'::text)
+         Group Key: cte_prune_tenk1.four, ('foo'::text), (GROUPINGSET_ID())
+         Filter: (('foo'::text) = 'foo'::text)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=83.58..123.29 rows=993 width=36)
+               Output: cte_prune_tenk1.four, ('foo'::text), (GROUPINGSET_ID())
+               Hash Key: cte_prune_tenk1.four, ('foo'::text), (GROUPINGSET_ID())
+               ->  Partial HashAggregate  (cost=83.58..103.43 rows=993 width=36)
+                     Output: cte_prune_tenk1.four, ('foo'::text), GROUPINGSET_ID()
+                     Hash Key: cte_prune_tenk1.four
+                     Hash Key: 'foo'::text
+                     ->  Seq Scan on cte_prune.cte_prune_tenk1  (cost=0.00..73.67 rows=3967 width=36)
+                           Output: cte_prune_tenk1.four, 'foo'::text
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(17 rows)
+
+select four, x
+  from (select four, ten, 'foo'::text as x from cte_prune_tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+ four |  x  
+------+-----
+      | foo
+(1 row)
+
+-- nest CTE cases
+-- start_ignore
+drop table city;
+ERROR:  table "city" does not exist
+drop table country;
+ERROR:  table "country" does not exist
+drop table countrylanguage;
+ERROR:  table "countrylanguage" does not exist
+-- end_ignore
+CREATE TABLE city (
+    id integer NOT NULL,
+    name text NOT NULL,
+    countrycode character(3) NOT NULL,
+    district text NOT NULL,
+    population integer NOT NULL
+) distributed by(id);
+CREATE TABLE country (
+    code character(3) NOT NULL,
+    name text NOT NULL,
+    continent text NOT NULL,
+    region text NOT NULL,
+    surfacearea numeric(10,2) NOT NULL,
+    indepyear smallint,
+    population integer NOT NULL,
+    lifeexpectancy real,
+    gnp numeric(10,2),
+    gnpold numeric(10,2),
+    localname text NOT NULL,
+    governmentform text NOT NULL,
+    headofstate text,
+    capital integer,
+    code2 character(2) NOT NULL
+) distributed by (code);
+CREATE TABLE countrylanguage (
+    countrycode character(3) NOT NULL,
+    "language" text NOT NULL,
+    isofficial boolean NOT NULL,
+    percentage real NOT NULL
+)distributed by (countrycode,language);
+ALTER TABLE ONLY city
+    ADD CONSTRAINT city_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY country
+    ADD CONSTRAINT country_pkey PRIMARY KEY (code);
+ALTER TABLE ONLY countrylanguage
+    ADD CONSTRAINT countrylanguage_pkey PRIMARY KEY (countrycode, "language");
+-- CTE1(inlined) in CTE2(no-inlined) case
+explain verbose with country as
+(select country.code,country.name COUNTRY, city.name CAPITAL, language, isofficial, percentage
+ FROM country,city,countrylanguage
+ WHERE country.code = countrylanguage.countrycode
+ and country.capital = city.id
+ and country.continent = 'Europe'),
+countrylanguage as
+(select country.code,country.COUNTRY,country.language,country.isofficial,country.percentage
+ FROM country,countrylanguage
+ WHERE country.code = countrylanguage.countrycode
+)
+select * from
+(select * from country where isofficial='True') country,
+(select * from countrylanguage where percentage > 50) countrylanguage
+where country.percentage = countrylanguage.percentage order by countrylanguage.COUNTRY,country.language LIMIT 40;
+                                                                                                                           QUERY PLAN                                                                                                                           
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=1051.23..1051.62 rows=28 width=202)
+   Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage, country.code, country.country, country.language, country.isofficial, country.percentage
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=1051.23..1051.62 rows=28 width=202)
+         Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage, country.code, country.country, country.language, country.isofficial, country.percentage
+         Merge Key: country.country, countrylanguage_2.language
+         ->  Limit  (cost=1051.23..1051.25 rows=9 width=202)
+               Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage, country.code, country.country, country.language, country.isofficial, country.percentage
+               ->  Sort  (cost=1051.23..1051.25 rows=9 width=202)
+                     Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage, country.code, country.country, country.language, country.isofficial, country.percentage
+                     Sort Key: country.country, countrylanguage_2.language
+                     ->  Hash Join  (cost=846.99..1051.08 rows=9 width=202)
+                           Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage, country.code, country.country, country.language, country.isofficial, country.percentage
+                           Hash Cond: (country.percentage = countrylanguage_2.percentage)
+                           ->  Hash Join  (cost=436.98..637.90 rows=245 width=85)
+                                 Output: country.code, country.country, country.language, country.isofficial, country.percentage
+                                 Hash Cond: (countrylanguage.countrycode = country.code)
+                                 ->  Seq Scan on cte_prune.countrylanguage  (cost=0.00..165.33 rows=13133 width=16)
+                                       Output: countrylanguage.countrycode, countrylanguage.language, countrylanguage.isofficial, countrylanguage.percentage
+                                 ->  Hash  (cost=436.74..436.74 rows=19 width=85)
+                                       Output: country.code, country.country, country.language, country.isofficial, country.percentage
+                                       ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=227.29..436.74 rows=19 width=85)
+                                             Output: country.code, country.country, country.language, country.isofficial, country.percentage
+                                             ->  Subquery Scan on country  (cost=227.29..436.49 rows=6 width=85)
+                                                   Output: country.code, country.country, country.language, country.isofficial, country.percentage
+                                                   ->  Hash Join  (cost=227.29..436.49 rows=6 width=117)
+                                                         Output: country_1.code, country_1.name, city.name, countrylanguage_1.language, countrylanguage_1.isofficial, countrylanguage_1.percentage
+                                                         Hash Cond: (countrylanguage_1.countrycode = country_1.code)
+                                                         ->  Seq Scan on cte_prune.countrylanguage countrylanguage_1  (cost=0.00..198.17 rows=4378 width=53)
+                                                               Output: countrylanguage_1.countrycode, countrylanguage_1.language, countrylanguage_1.isofficial, countrylanguage_1.percentage
+                                                               Filter: (countrylanguage_1.percentage > '50'::double precision)
+                                                         ->  Hash  (cost=227.11..227.11 rows=15 width=80)
+                                                               Output: country_1.code, country_1.name, city.name
+                                                               ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=77.45..227.11 rows=15 width=80)
+                                                                     Output: country_1.code, country_1.name, city.name
+                                                                     ->  Hash Join  (cost=77.45..226.91 rows=5 width=80)
+                                                                           Output: country_1.code, country_1.name, city.name
+                                                                           Hash Cond: (city.id = country_1.capital)
+                                                                           ->  Seq Scan on cte_prune.city  (cost=0.00..126.33 rows=9233 width=36)
+                                                                                 Output: city.id, city.name, city.countrycode, city.district, city.population
+                                                                           ->  Hash  (cost=77.40..77.40 rows=3 width=52)
+                                                                                 Output: country_1.code, country_1.name, country_1.capital
+                                                                                 ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..77.40 rows=3 width=52)
+                                                                                       Output: country_1.code, country_1.name, country_1.capital
+                                                                                       Hash Key: country_1.capital
+                                                                                       ->  Seq Scan on cte_prune.country country_1  (cost=0.00..77.33 rows=3 width=52)
+                                                                                             Output: country_1.code, country_1.name, country_1.capital
+                                                                                             Filter: (country_1.continent = 'Europe'::text)
+                           ->  Hash  (cost=409.66..409.66 rows=28 width=117)
+                                 Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage
+                                 ->  Broadcast Motion 3:3  (slice5; segments: 3)  (cost=227.29..409.66 rows=28 width=117)
+                                       Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage
+                                       ->  Hash Join  (cost=227.29..409.20 rows=9 width=117)
+                                             Output: country_2.code, country_2.name, city_1.name, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage
+                                             Hash Cond: (countrylanguage_2.countrycode = country_2.code)
+                                             ->  Seq Scan on cte_prune.countrylanguage countrylanguage_2  (cost=0.00..165.33 rows=6567 width=53)
+                                                   Output: countrylanguage_2.countrycode, countrylanguage_2.language, countrylanguage_2.isofficial, countrylanguage_2.percentage
+                                                   Filter: countrylanguage_2.isofficial
+                                             ->  Hash  (cost=227.11..227.11 rows=15 width=80)
+                                                   Output: country_2.code, country_2.name, city_1.name
+                                                   ->  Broadcast Motion 3:3  (slice6; segments: 3)  (cost=77.45..227.11 rows=15 width=80)
+                                                         Output: country_2.code, country_2.name, city_1.name
+                                                         ->  Hash Join  (cost=77.45..226.91 rows=5 width=80)
+                                                               Output: country_2.code, country_2.name, city_1.name
+                                                               Hash Cond: (city_1.id = country_2.capital)
+                                                               ->  Seq Scan on cte_prune.city city_1  (cost=0.00..126.33 rows=9233 width=36)
+                                                                     Output: city_1.id, city_1.name, city_1.countrycode, city_1.district, city_1.population
+                                                               ->  Hash  (cost=77.40..77.40 rows=3 width=52)
+                                                                     Output: country_2.code, country_2.name, country_2.capital
+                                                                     ->  Redistribute Motion 3:3  (slice7; segments: 3)  (cost=0.00..77.40 rows=3 width=52)
+                                                                           Output: country_2.code, country_2.name, country_2.capital
+                                                                           Hash Key: country_2.capital
+                                                                           ->  Seq Scan on cte_prune.country country_2  (cost=0.00..77.33 rows=3 width=52)
+                                                                                 Output: country_2.code, country_2.name, country_2.capital
+                                                                                 Filter: (country_2.continent = 'Europe'::text)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(76 rows)
+
+-- CTE in the main query and subqueries within the main query
+explain verbose with bad_headofstates as 
+(
+ select country.code,country.name,country.headofstate,countrylanguage.language
+ from
+ country,countrylanguage
+ where country.code = countrylanguage.countrycode and countrylanguage.isofficial=true
+ and (country.gnp < country.gnpold or country.gnp < 3000)
+)
+select OUTERMOST_FOO.*,bad_headofstates.headofstate from (
+select avg(population),region from
+(
+select FOO.*,bad_headofstates.headofstate,city.name
+from
+(select bad_headofstates.code,country.capital,country.region,country.population from
+bad_headofstates,country where bad_headofstates.code = country.code) FOO, bad_headofstates,city
+where FOO.code = bad_headofstates.code and FOO.capital = city.id) OUTER_FOO
+group by region ) OUTERMOST_FOO,bad_headofstates,country 
+where country.code = bad_headofstates.code and country.region = OUTERMOST_FOO.region
+order by OUTERMOST_FOO.region,bad_headofstates.headofstate LIMIT 40;
+                                                                                           QUERY PLAN                                                                                            
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=3473.37..3473.94 rows=40 width=96)
+   Output: (avg(country_2.population)), country_2.region, country_1.headofstate
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=3473.37..3475.07 rows=120 width=96)
+         Output: (avg(country_2.population)), country_2.region, country_1.headofstate
+         Merge Key: country_2.region, country_1.headofstate
+         ->  Limit  (cost=3473.37..3473.47 rows=40 width=96)
+               Output: (avg(country_2.population)), country_2.region, country_1.headofstate
+               ->  Sort  (cost=3473.37..3482.49 rows=3648 width=96)
+                     Output: (avg(country_2.population)), country_2.region, country_1.headofstate
+                     Sort Key: country_2.region, country_1.headofstate
+                     ->  Hash Join  (cost=2915.55..3358.06 rows=3648 width=96)
+                           Output: (avg(country_2.population)), country_2.region, country_1.headofstate
+                           Inner Unique: true
+                           Hash Cond: (country.region = country_2.region)
+                           ->  Hash Join  (cost=222.07..618.52 rows=3648 width=64)
+                                 Output: country_1.headofstate, country.region
+                                 Inner Unique: true
+                                 Hash Cond: (country_1.code = country.code)
+                                 ->  Hash Join  (cost=110.07..460.46 rows=3648 width=112)
+                                       Output: country_1.code, country_1.name, country_1.headofstate, countrylanguage.language
+                                       Inner Unique: true
+                                       Hash Cond: (countrylanguage.countrycode = country_1.code)
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..296.67 rows=6567 width=48)
+                                             Output: countrylanguage.language, countrylanguage.countrycode
+                                             Hash Key: countrylanguage.countrycode
+                                             ->  Seq Scan on cte_prune.countrylanguage  (cost=0.00..165.33 rows=6567 width=48)
+                                                   Output: countrylanguage.language, countrylanguage.countrycode
+                                                   Filter: countrylanguage.isofficial
+                                       ->  Hash  (cost=86.00..86.00 rows=1926 width=80)
+                                             Output: country_1.code, country_1.name, country_1.headofstate
+                                             ->  Seq Scan on cte_prune.country country_1  (cost=0.00..86.00 rows=1926 width=80)
+                                                   Output: country_1.code, country_1.name, country_1.headofstate
+                                                   Filter: ((country_1.gnp < country_1.gnpold) OR (country_1.gnp < '3000'::numeric))
+                                 ->  Hash  (cost=68.67..68.67 rows=3467 width=48)
+                                       Output: country.code, country.region
+                                       ->  Seq Scan on cte_prune.country  (cost=0.00..68.67 rows=3467 width=48)
+                                             Output: country.code, country.region
+                           ->  Hash  (cost=2680.97..2680.97 rows=1000 width=64)
+                                 Output: (avg(country_2.population)), country_2.region
+                                 ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=2660.14..2680.97 rows=1000 width=64)
+                                       Output: (avg(country_2.population)), country_2.region
+                                       ->  Finalize HashAggregate  (cost=2660.14..2664.31 rows=333 width=64)
+                                             Output: avg(country_2.population), country_2.region
+                                             Group Key: country_2.region
+                                             ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=2625.14..2655.14 rows=1000 width=64)
+                                                   Output: country_2.region, (PARTIAL avg(country_2.population))
+                                                   Hash Key: country_2.region
+                                                   ->  Streaming Partial HashAggregate  (cost=2625.14..2635.14 rows=1000 width=64)
+                                                         Output: country_2.region, PARTIAL avg(country_2.population)
+                                                         Group Key: country_2.region
+                                                         ->  Hash Join  (cost=1662.17..2425.51 rows=39927 width=36)
+                                                               Output: country_2.region, country_2.population
+                                                               Hash Cond: (country_3.code = country_2.code)
+                                                               ->  Hash Join  (cost=110.07..460.46 rows=3648 width=112)
+                                                                     Output: country_3.code, country_3.name, country_3.headofstate, countrylanguage_1.language
+                                                                     Inner Unique: true
+                                                                     Hash Cond: (countrylanguage_1.countrycode = country_3.code)
+                                                                     ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=0.00..296.67 rows=6567 width=48)
+                                                                           Output: countrylanguage_1.language, countrylanguage_1.countrycode
+                                                                           Hash Key: countrylanguage_1.countrycode
+                                                                           ->  Seq Scan on cte_prune.countrylanguage countrylanguage_1  (cost=0.00..165.33 rows=6567 width=48)
+                                                                                 Output: countrylanguage_1.language, countrylanguage_1.countrycode
+                                                                                 Filter: countrylanguage_1.isofficial
+                                                                     ->  Hash  (cost=86.00..86.00 rows=1926 width=80)
+                                                                           Output: country_3.code, country_3.name, country_3.headofstate
+                                                                           ->  Seq Scan on cte_prune.country country_3  (cost=0.00..86.00 rows=1926 width=80)
+                                                                                 Output: country_3.code, country_3.name, country_3.headofstate
+                                                                                 Filter: ((country_3.gnp < country_3.gnpold) OR (country_3.gnp < '3000'::numeric))
+                                                               ->  Hash  (cost=1506.49..1506.49 rows=3648 width=68)
+                                                                     Output: country_2.population, country_2.region, country_2.code, country_4.code
+                                                                     ->  Hash Join  (cost=1063.99..1506.49 rows=3648 width=68)
+                                                                           Output: country_2.population, country_2.region, country_2.code, country_4.code
+                                                                           Inner Unique: true
+                                                                           Hash Cond: (country_2.capital = city.id)
+                                                                           ->  Hash Join  (cost=222.07..618.52 rows=3648 width=72)
+                                                                                 Output: country_2.population, country_2.region, country_2.code, country_2.capital, country_4.code
+                                                                                 Inner Unique: true
+                                                                                 Hash Cond: (country_4.code = country_2.code)
+                                                                                 ->  Hash Join  (cost=110.07..460.46 rows=3648 width=112)
+                                                                                       Output: country_4.code, country_4.name, country_4.headofstate, countrylanguage_2.language
+                                                                                       Inner Unique: true
+                                                                                       Hash Cond: (countrylanguage_2.countrycode = country_4.code)
+                                                                                       ->  Redistribute Motion 3:3  (slice6; segments: 3)  (cost=0.00..296.67 rows=6567 width=48)
+                                                                                             Output: countrylanguage_2.language, countrylanguage_2.countrycode
+                                                                                             Hash Key: countrylanguage_2.countrycode
+                                                                                             ->  Seq Scan on cte_prune.countrylanguage countrylanguage_2  (cost=0.00..165.33 rows=6567 width=48)
+                                                                                                   Output: countrylanguage_2.language, countrylanguage_2.countrycode
+                                                                                                   Filter: countrylanguage_2.isofficial
+                                                                                       ->  Hash  (cost=86.00..86.00 rows=1926 width=80)
+                                                                                             Output: country_4.code, country_4.name, country_4.headofstate
+                                                                                             ->  Seq Scan on cte_prune.country country_4  (cost=0.00..86.00 rows=1926 width=80)
+                                                                                                   Output: country_4.code, country_4.name, country_4.headofstate
+                                                                                                   Filter: ((country_4.gnp < country_4.gnpold) OR (country_4.gnp < '3000'::numeric))
+                                                                                 ->  Hash  (cost=68.67..68.67 rows=3467 width=56)
+                                                                                       Output: country_2.population, country_2.region, country_2.code, country_2.capital
+                                                                                       ->  Seq Scan on cte_prune.country country_2  (cost=0.00..68.67 rows=3467 width=56)
+                                                                                             Output: country_2.population, country_2.region, country_2.code, country_2.capital
+                                                                           ->  Hash  (cost=495.67..495.67 rows=27700 width=4)
+                                                                                 Output: city.id
+                                                                                 ->  Broadcast Motion 3:3  (slice7; segments: 3)  (cost=0.00..495.67 rows=27700 width=4)
+                                                                                       Output: city.id
+                                                                                       ->  Seq Scan on cte_prune.city  (cost=0.00..126.33 rows=9233 width=4)
+                                                                                             Output: city.id
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(105 rows)
+
+-- start_ignore
+drop table city;
+drop table country;
+drop table countrylanguage;
+-- end_ignore
+-- inlined CTEs
+CREATE TABLE t5 AS SELECT i as c, i+1 as d from generate_series(1,10)i;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'c' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE t6 AS SELECT i as a, i+1 as b from generate_series(1,10)i;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- inlined CTEs should have not unused columns(ex. t5.*, t6.* in output)
+explain verbose WITH w AS (SELECT a, b from t6 where b < 5)
+SELECT *
+FROM t6,
+     (WITH v AS (SELECT c, d FROM t5, w WHERE c = w.a AND c < 2)
+      SELECT v1.c, v1.d FROM v v1, v v2 WHERE v1.c = v2.c AND v1.d > 1
+     ) x
+WHERE t6.a = x.c ORDER BY 1;
+                                                      QUERY PLAN                                                      
+----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=824331921.87..983595523.10 rows=11242136557 width=16)
+   Output: t6.a, t6.b, t5_1.c, t5_1.d
+   Merge Key: t6.a
+   ->  Sort  (cost=824331921.87..833700369.00 rows=3747378852 width=16)
+         Output: t6.a, t6.b, t5_1.c, t5_1.d
+         Sort Key: t6.a
+         ->  Hash Join  (cost=5001.56..196417010.27 rows=3747378852 width=16)
+               Output: t6.a, t6.b, t5_1.c, t5_1.d
+               Hash Cond: (t5_1.c = t6.a)
+               ->  Hash Join  (cost=4321.81..2257711.94 rows=43523564 width=8)
+                     Output: t5_1.c, t5_1.d
+                     Hash Cond: (t5.c = t5_1.c)
+                     ->  Hash Join  (cost=512.33..4788.69 rows=158519 width=8)
+                           Output: t5.c, t5.d
+                           Hash Cond: (t6_1.a = t5.c)
+                           ->  Seq Scan on cte_prune.t6 t6_1  (cost=0.00..464.50 rows=5523 width=8)
+                                 Output: t6_1.a, t6_1.b
+                                 Filter: ((t6_1.b < 5) AND (t6_1.a < 2))
+                           ->  Hash  (cost=392.75..392.75 rows=9567 width=8)
+                                 Output: t5.c, t5.d
+                                 ->  Seq Scan on cte_prune.t5  (cost=0.00..392.75 rows=9567 width=8)
+                                       Output: t5.c, t5.d
+                                       Filter: (t5.c < 2)
+                     ->  Hash  (cost=2665.47..2665.47 rows=91521 width=8)
+                           Output: t5_1.c, t5_1.d
+                           ->  Hash Join  (cost=533.54..2665.47 rows=91521 width=8)
+                                 Output: t5_1.c, t5_1.d
+                                 Hash Cond: (t5_1.c = w.a)
+                                 ->  Seq Scan on cte_prune.t5 t5_1  (cost=0.00..464.50 rows=5523 width=8)
+                                       Output: t5_1.c, t5_1.d
+                                       Filter: ((t5_1.c < 2) AND (t5_1.d > 1))
+                                 ->  Hash  (cost=464.50..464.50 rows=5523 width=4)
+                                       Output: w.a
+                                       ->  Subquery Scan on w  (cost=0.00..464.50 rows=5523 width=4)
+                                             Output: w.a
+                                             ->  Seq Scan on cte_prune.t6 t6_2  (cost=0.00..464.50 rows=5523 width=8)
+                                                   Output: t6_2.a, t6_2.b
+                                                   Filter: ((t6_2.b < 5) AND (t6_2.a < 2))
+               ->  Hash  (cost=321.00..321.00 rows=28700 width=8)
+                     Output: t6.a, t6.b
+                     ->  Seq Scan on cte_prune.t6  (cost=0.00..321.00 rows=28700 width=8)
+                           Output: t6.a, t6.b
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(44 rows)
+
+WITH w AS (SELECT a, b from t6 where b < 5)
+SELECT *
+FROM t6,
+     (WITH v AS (SELECT c, d FROM t5, w WHERE c = w.a AND c < 2)
+      SELECT v1.c, v1.d FROM v v1, v v2 WHERE v1.c = v2.c AND v1.d > 1
+     ) x
+WHERE t6.a = x.c ORDER BY 1;
+ a | b | c | d 
+---+---+---+---
+ 1 | 2 | 1 | 2
+(1 row)
+
+CREATE TABLE t7 (f1 integer, f2 integer, f3 float);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO t7 VALUES (1, 2, 3);
+INSERT INTO t7 VALUES (2, 3, 4);
+INSERT INTO t7 VALUES (3, 4, 5);
+INSERT INTO t7 VALUES (1, 1, 1);
+INSERT INTO t7 VALUES (2, 2, 2);
+INSERT INTO t7 VALUES (3, 3, 3);
+INSERT INTO t7 VALUES (6, 7, 8);
+INSERT INTO t7 VALUES (8, 9, NULL);
+-- inlined CTEs should used the origin cexpression with recreated
+explain (verbose, costs off)
+with x as (select * from (select f1 from t7) ss)
+select * from x where f1 = 1;
+                      QUERY PLAN                      
+------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   Output: t7.f1
+   ->  Seq Scan on cte_prune.t7
+         Output: t7.f1
+         Filter: (t7.f1 = 1)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+with x as (select * from (select f1 from t7) ss)
+select * from x where f1 = 1;
+ f1 
+----
+  1
+  1
+(2 rows)
+
+-- start_ignore
+drop table t5;
+drop table t6;
+drop table t7;
+drop schema cte_prune cascade;
+NOTICE:  drop cascades to 2 other objects
+DETAIL:  drop cascades to table t3
+drop cascades to table t4
+-- end_ignore
diff --git a/src/test/regress/expected/cte_prune_optimizer.out b/src/test/regress/expected/cte_prune_optimizer.out
new file mode 100644
index 00000000000..e7f2339a0eb
--- /dev/null
+++ b/src/test/regress/expected/cte_prune_optimizer.out
@@ -0,0 +1,1854 @@
+-- start_ignore
+drop table if exists t1;
+drop table if exists t2;
+SET optimizer_trace_fallback = on;
+-- end_ignore
+create table t1(v1 int, v2 int, v3 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into t1 values(generate_series(1, 10), generate_series(11, 20), generate_series(21, 30));
+analyze t1;
+create table t2(v1 int, v2 int, v3 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into t2 values(generate_series(0, 100), generate_series(100, 200), generate_series(200, 300));
+analyze t2;
+-- should pruned both seq scan and shared scan
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=5 width=4)
+   Output: share0_ref3.v1
+   ->  Sequence  (cost=0.00..1293.00 rows=2 width=4)
+         Output: share0_ref3.v1
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=1)
+               Output: share0_ref1.v1
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=2 width=4)
+                     Output: t1.v1
+                     Filter: (t1.v1 < 5)
+         ->  Hash Left Join  (cost=0.00..862.00 rows=2 width=4)
+               Output: share0_ref3.v1
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+               ->  Result  (cost=0.00..431.00 rows=2 width=4)
+                     Output: share0_ref3.v1
+                     Filter: (share0_ref3.v1 < 5)
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=4)
+                           Output: share0_ref3.v1
+               ->  Hash  (cost=431.00..431.00 rows=2 width=4)
+                     Output: share0_ref2.v1
+                     ->  Result  (cost=0.00..431.00 rows=2 width=4)
+                           Output: share0_ref2.v1
+                           Filter: (share0_ref2.v1 < 5)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=4)
+                                 Output: share0_ref2.v1
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(26 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v1 
+----
+  1
+  2
+  3
+  4
+(4 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=5 width=4)
+   Output: share0_ref3.v2
+   ->  Sequence  (cost=0.00..1293.00 rows=2 width=4)
+         Output: share0_ref3.v2
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=1)
+               Output: share0_ref1.v1, share0_ref1.v2
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=2 width=8)
+                     Output: t1.v1, t1.v2
+                     Filter: (t1.v1 < 5)
+         ->  Hash Left Join  (cost=0.00..862.00 rows=2 width=4)
+               Output: share0_ref3.v2
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+               ->  Result  (cost=0.00..431.00 rows=2 width=8)
+                     Output: share0_ref3.v1, share0_ref3.v2
+                     Filter: (share0_ref3.v1 < 5)
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=8)
+                           Output: share0_ref3.v1, share0_ref3.v2
+               ->  Hash  (cost=431.00..431.00 rows=2 width=4)
+                     Output: share0_ref2.v1
+                     ->  Result  (cost=0.00..431.00 rows=2 width=4)
+                           Output: share0_ref2.v1
+                           Filter: (share0_ref2.v1 < 5)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=4)
+                                 Output: share0_ref2.v1, share0_ref2.v2
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(26 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v2 
+----
+ 12
+ 13
+ 14
+ 11
+(4 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=5 width=4)
+   Output: share0_ref3.v3
+   ->  Sequence  (cost=0.00..1293.00 rows=2 width=4)
+         Output: share0_ref3.v3
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=1)
+               Output: share0_ref1.v1, share0_ref1.v3
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=2 width=8)
+                     Output: t1.v1, t1.v3
+                     Filter: (t1.v1 < 5)
+         ->  Hash Left Join  (cost=0.00..862.00 rows=2 width=4)
+               Output: share0_ref3.v3
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+               ->  Result  (cost=0.00..431.00 rows=2 width=8)
+                     Output: share0_ref3.v1, share0_ref3.v3
+                     Filter: (share0_ref3.v1 < 5)
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=8)
+                           Output: share0_ref3.v1, share0_ref3.v3
+               ->  Hash  (cost=431.00..431.00 rows=2 width=4)
+                     Output: share0_ref2.v1
+                     ->  Result  (cost=0.00..431.00 rows=2 width=4)
+                           Output: share0_ref2.v1
+                           Filter: (share0_ref2.v1 < 5)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=4)
+                                 Output: share0_ref2.v1, share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(26 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v3 
+----
+ 22
+ 23
+ 24
+ 21
+(4 rows)
+
+-- * also should be pruned
+explain verbose with c1 as (select * from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=5 width=4)
+   Output: share0_ref3.v1
+   ->  Sequence  (cost=0.00..1293.00 rows=2 width=4)
+         Output: share0_ref3.v1
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=1)
+               Output: share0_ref1.v1
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=2 width=4)
+                     Output: t1.v1
+                     Filter: (t1.v1 < 5)
+         ->  Hash Left Join  (cost=0.00..862.00 rows=2 width=4)
+               Output: share0_ref3.v1
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+               ->  Result  (cost=0.00..431.00 rows=2 width=4)
+                     Output: share0_ref3.v1
+                     Filter: (share0_ref3.v1 < 5)
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=4)
+                           Output: share0_ref3.v1
+               ->  Hash  (cost=431.00..431.00 rows=2 width=4)
+                     Output: share0_ref2.v1
+                     ->  Result  (cost=0.00..431.00 rows=2 width=4)
+                           Output: share0_ref2.v1
+                           Filter: (share0_ref2.v1 < 5)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=2 width=4)
+                                 Output: share0_ref2.v1
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(26 rows)
+
+with c1 as (select * from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+ v1 
+----
+  1
+  2
+  3
+  4
+(4 rows)
+
+-- no push filter
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+                                                 QUERY PLAN                                                 
+------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=11 width=4)
+   Output: share0_ref3.v3
+   ->  Sequence  (cost=0.00..1293.00 rows=4 width=4)
+         Output: share0_ref3.v3
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v1, share0_ref1.v2, share0_ref1.v3
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+         ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=4)
+               Output: share0_ref3.v3
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v2)
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=8)
+                     Output: share0_ref3.v1, share0_ref3.v2, share0_ref3.v3
+               ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                     Output: share0_ref2.v2
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                           Output: share0_ref2.v2
+                           Hash Key: share0_ref2.v2
+                           ->  Result  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: share0_ref2.v2
+                                 ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: share0_ref2.v1, share0_ref2.v2, share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+ v3 
+----
+ 26
+ 25
+ 30
+ 29
+ 21
+ 27
+ 23
+ 28
+ 24
+ 22
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+                                                 QUERY PLAN                                                 
+------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=11 width=4)
+   Output: share0_ref3.v2
+   ->  Sequence  (cost=0.00..1293.00 rows=4 width=4)
+         Output: share0_ref3.v2
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v1, share0_ref1.v2
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=8)
+                     Output: t1.v1, t1.v2
+         ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=4)
+               Output: share0_ref3.v2
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v2)
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=8)
+                     Output: share0_ref3.v1, share0_ref3.v2
+               ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                     Output: share0_ref2.v2
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                           Output: share0_ref2.v2
+                           Hash Key: share0_ref2.v2
+                           ->  Result  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: share0_ref2.v2
+                                 ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: share0_ref2.v1, share0_ref2.v2
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+ v2 
+----
+ 17
+ 13
+ 18
+ 14
+ 12
+ 16
+ 15
+ 20
+ 19
+ 11
+(10 rows)
+
+-- distribution col can be pruned which is better than do redistribute in CTE consumer
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v2=c22.v2;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=4)
+   Output: share0_ref3.v2
+   ->  Sequence  (cost=0.00..1293.00 rows=4 width=4)
+         Output: share0_ref3.v2
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v2
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                     Output: t1.v2
+                     Hash Key: t1.v2
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t1.v2
+         ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=4)
+               Output: share0_ref3.v2
+               Hash Cond: (share0_ref3.v2 = share0_ref2.v2)
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                     Output: share0_ref3.v2
+               ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                     Output: share0_ref2.v2
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                           Output: share0_ref2.v2
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v2=c22.v2;
+ v2 
+----
+ 18
+ 16
+ 19
+ 13
+ 14
+ 17
+ 11
+ 12
+ 15
+ 20
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v3=c22.v3;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=4)
+   Output: share0_ref3.v3
+   ->  Sequence  (cost=0.00..1293.00 rows=4 width=4)
+         Output: share0_ref3.v3
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                     Output: t1.v3
+                     Hash Key: t1.v3
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t1.v3
+         ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=4)
+               Output: share0_ref3.v3
+               Hash Cond: (share0_ref3.v3 = share0_ref2.v3)
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                     Output: share0_ref3.v3
+               ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                     Output: share0_ref2.v3
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                           Output: share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v3=c22.v3;
+ v3 
+----
+ 22
+ 24
+ 27
+ 29
+ 28
+ 21
+ 25
+ 23
+ 26
+ 30
+(10 rows)
+
+-- groupby/order by/window function/grouping set should be contains in CTE output
+-- group by 
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v1;
+                                                   QUERY PLAN                                                   
+----------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=8)
+   Output: (sum(share0_ref3.v1))
+   ->  Result  (cost=0.00..1293.00 rows=4 width=8)
+         Output: (sum(share0_ref3.v1))
+         ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+               Output: (sum(share0_ref3.v1)), share0_ref3.v1
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+                     Output: share0_ref1.v1
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t1.v1
+               ->  GroupAggregate  (cost=0.00..862.00 rows=4 width=8)
+                     Output: sum(share0_ref3.v1), share0_ref3.v1
+                     Group Key: share0_ref3.v1
+                     ->  Sort  (cost=0.00..862.00 rows=4 width=4)
+                           Output: share0_ref3.v1
+                           Sort Key: share0_ref3.v1
+                           ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=4)
+                                 Output: share0_ref3.v1
+                                 Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                                 ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: share0_ref3.v1
+                                 ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                       Output: share0_ref2.v1
+                                       ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                                             Output: share0_ref2.v1
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(27 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v1;
+ sum 
+-----
+   4
+   2
+   8
+   7
+   3
+  10
+   9
+   6
+   5
+   1
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+                                                      QUERY PLAN                                                      
+----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=8)
+   Output: (sum(share0_ref3.v1))
+   ->  Result  (cost=0.00..1293.00 rows=4 width=8)
+         Output: (sum(share0_ref3.v1))
+         ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+               Output: (sum(share0_ref3.v1)), share0_ref3.v2
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+                     Output: share0_ref1.v1, share0_ref1.v2
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=8)
+                           Output: t1.v1, t1.v2
+               ->  GroupAggregate  (cost=0.00..862.00 rows=4 width=8)
+                     Output: sum(share0_ref3.v1), share0_ref3.v2
+                     Group Key: share0_ref3.v2
+                     ->  Sort  (cost=0.00..862.00 rows=4 width=8)
+                           Output: share0_ref3.v1, share0_ref3.v2
+                           Sort Key: share0_ref3.v2
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.00 rows=4 width=8)
+                                 Output: share0_ref3.v1, share0_ref3.v2
+                                 Hash Key: share0_ref3.v2
+                                 ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                                       Output: share0_ref3.v1, share0_ref3.v2
+                                       Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                                       ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.00 rows=4 width=8)
+                                             Output: share0_ref3.v1, share0_ref3.v2
+                                       ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                             Output: share0_ref2.v1, share0_ref2.v2
+                                             ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.00 rows=4 width=4)
+                                                   Output: share0_ref2.v1, share0_ref2.v2
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(30 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+ sum 
+-----
+   6
+   9
+   8
+  10
+   2
+   5
+   1
+   3
+   4
+   7
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+                                                      QUERY PLAN                                                      
+----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=8)
+   Output: (sum(share0_ref3.v3))
+   ->  Result  (cost=0.00..1293.00 rows=4 width=8)
+         Output: (sum(share0_ref3.v3))
+         ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+               Output: (sum(share0_ref3.v3)), share0_ref3.v2
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+                     Output: share0_ref1.v1, share0_ref1.v2, share0_ref1.v3
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+               ->  GroupAggregate  (cost=0.00..862.00 rows=4 width=8)
+                     Output: sum(share0_ref3.v3), share0_ref3.v2
+                     Group Key: share0_ref3.v2
+                     ->  Sort  (cost=0.00..862.00 rows=4 width=8)
+                           Output: share0_ref3.v2, share0_ref3.v3
+                           Sort Key: share0_ref3.v2
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.00 rows=4 width=8)
+                                 Output: share0_ref3.v2, share0_ref3.v3
+                                 Hash Key: share0_ref3.v2
+                                 ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                                       Output: share0_ref3.v2, share0_ref3.v3
+                                       Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                                       ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.00 rows=4 width=12)
+                                             Output: share0_ref3.v1, share0_ref3.v2, share0_ref3.v3
+                                       ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                             Output: share0_ref2.v1, share0_ref2.v2, share0_ref2.v3
+                                             ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.00 rows=4 width=4)
+                                                   Output: share0_ref2.v1, share0_ref2.v2, share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(30 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+ sum 
+-----
+  26
+  29
+  28
+  30
+  22
+  25
+  21
+  23
+  24
+  27
+(10 rows)
+
+-- order by 
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v1;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Result  (cost=0.00..1293.00 rows=10 width=4)
+   Output: share0_ref3.v1
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=4)
+         Output: share0_ref3.v1, share0_ref2.v1
+         Merge Key: share0_ref2.v1
+         ->  Sort  (cost=0.00..1293.00 rows=4 width=8)
+               Output: share0_ref3.v1, share0_ref2.v1
+               Sort Key: share0_ref2.v1
+               ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+                     Output: share0_ref3.v1, share0_ref2.v1
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+                           Output: share0_ref1.v1
+                           ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t1.v1
+                     ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                           Output: share0_ref3.v1, share0_ref2.v1
+                           Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: share0_ref3.v1
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                 Output: share0_ref2.v1
+                                 ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: share0_ref2.v1
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(25 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v1;
+ v1 
+----
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+ 10
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v3;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Result  (cost=0.00..1293.00 rows=10 width=4)
+   Output: share0_ref3.v1
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=4)
+         Output: share0_ref3.v1, share0_ref2.v3
+         Merge Key: share0_ref2.v3
+         ->  Sort  (cost=0.00..1293.00 rows=4 width=8)
+               Output: share0_ref3.v1, share0_ref2.v3
+               Sort Key: share0_ref2.v3
+               ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+                     Output: share0_ref3.v1, share0_ref2.v3
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+                           Output: share0_ref1.v1, share0_ref1.v3
+                           ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=8)
+                                 Output: t1.v1, t1.v3
+                     ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                           Output: share0_ref3.v1, share0_ref2.v3
+                           Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: share0_ref3.v1, share0_ref3.v3
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=8)
+                                 Output: share0_ref2.v1, share0_ref2.v3
+                                 ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=8)
+                                       Output: share0_ref2.v1, share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(25 rows)
+
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v3;
+ v1 
+----
+  1
+  2
+  3
+  4
+  5
+  6
+  7
+  8
+  9
+ 10
+(10 rows)
+
+-- window function
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) OVER (ORDER BY c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                                      QUERY PLAN                                                      
+----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=8)
+   Output: (sum(share0_ref3.v1) OVER (?))
+   ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+         Output: (sum(share0_ref3.v1) OVER (?))
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v1, share0_ref1.v2
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=8)
+                     Output: t1.v1, t1.v2
+         ->  Redistribute Motion 1:3  (slice2)  (cost=0.00..862.00 rows=4 width=8)
+               Output: (sum(share0_ref3.v1) OVER (?))
+               ->  WindowAgg  (cost=0.00..862.00 rows=10 width=8)
+                     Output: sum(share0_ref3.v1) OVER (?)
+                     Order By: share0_ref3.v2
+                     ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..862.00 rows=10 width=8)
+                           Output: share0_ref3.v1, share0_ref3.v2
+                           Merge Key: share0_ref3.v2
+                           ->  Sort  (cost=0.00..862.00 rows=4 width=8)
+                                 Output: share0_ref3.v1, share0_ref3.v2
+                                 Sort Key: share0_ref3.v2
+                                 ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                                       Output: share0_ref3.v1, share0_ref3.v2
+                                       Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=4 width=8)
+                                             Output: share0_ref3.v1, share0_ref3.v2
+                                       ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                             Output: share0_ref2.v1, share0_ref2.v2
+                                             ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=4 width=4)
+                                                   Output: share0_ref2.v1, share0_ref2.v2
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(30 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) OVER (ORDER BY c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ sum 
+-----
+   1
+   3
+   6
+  10
+  15
+  21
+  28
+  36
+  45
+  55
+(10 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                                      QUERY PLAN                                                      
+----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=10 width=8)
+   Output: (sum(share0_ref3.v2) OVER (?))
+   ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+         Output: (sum(share0_ref3.v2) OVER (?))
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v1, share0_ref1.v2, share0_ref1.v3
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+         ->  Redistribute Motion 1:3  (slice2)  (cost=0.00..862.00 rows=4 width=8)
+               Output: (sum(share0_ref3.v2) OVER (?))
+               ->  WindowAgg  (cost=0.00..862.00 rows=10 width=8)
+                     Output: sum(share0_ref3.v2) OVER (?)
+                     Order By: share0_ref3.v3
+                     ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..862.00 rows=10 width=8)
+                           Output: share0_ref3.v2, share0_ref3.v3
+                           Merge Key: share0_ref3.v3
+                           ->  Sort  (cost=0.00..862.00 rows=4 width=8)
+                                 Output: share0_ref3.v2, share0_ref3.v3
+                                 Sort Key: share0_ref3.v3
+                                 ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                                       Output: share0_ref3.v2, share0_ref3.v3
+                                       Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=4 width=12)
+                                             Output: share0_ref3.v1, share0_ref3.v2, share0_ref3.v3
+                                       ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                             Output: share0_ref2.v1, share0_ref2.v2, share0_ref2.v3
+                                             ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=4 width=4)
+                                                   Output: share0_ref2.v1, share0_ref2.v2, share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(30 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ sum 
+-----
+  11
+  23
+  36
+  50
+  65
+  81
+  98
+ 116
+ 135
+ 155
+(10 rows)
+
+-- grouping set 
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v1,c11.v2);
+                                                         QUERY PLAN                                                         
+----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2586.00 rows=21 width=8)
+   Output: (sum(share1_ref2.v2))
+   ->  Sequence  (cost=0.00..2586.00 rows=7 width=8)
+         Output: (sum(share1_ref2.v2))
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v1, share0_ref1.v2
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=8)
+                     Output: t1.v1, t1.v2
+         ->  Sequence  (cost=0.00..2155.00 rows=7 width=8)
+               Output: (sum(share1_ref2.v2))
+               ->  Shared Scan (share slice:id 1:1)  (cost=0.00..862.00 rows=4 width=1)
+                     Output: share1_ref1.v1, share1_ref1.v2
+                     ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                           Output: share0_ref3.v1, share0_ref3.v2
+                           Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=8)
+                                 Output: share0_ref3.v1, share0_ref3.v2
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                 Output: share0_ref2.v1, share0_ref2.v2
+                                 ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: share0_ref2.v1, share0_ref2.v2
+               ->  Append  (cost=0.00..1293.00 rows=7 width=8)
+                     ->  GroupAggregate  (cost=0.00..431.00 rows=4 width=8)
+                           Output: sum(share1_ref2.v2)
+                           Group Key: share1_ref2.v1, share1_ref2.v2
+                           ->  Sort  (cost=0.00..431.00 rows=4 width=8)
+                                 Output: share1_ref2.v1, share1_ref2.v2
+                                 Sort Key: share1_ref2.v1, share1_ref2.v2
+                                 ->  Shared Scan (share slice:id 1:1)  (cost=0.00..431.00 rows=4 width=8)
+                                       Output: share1_ref2.v1, share1_ref2.v2
+                     ->  GroupAggregate  (cost=0.00..431.00 rows=4 width=8)
+                           Output: sum(share1_ref3.v2)
+                           Group Key: share1_ref3.v1
+                           ->  Sort  (cost=0.00..431.00 rows=4 width=8)
+                                 Output: share1_ref3.v1, share1_ref3.v2
+                                 Sort Key: share1_ref3.v1
+                                 ->  Shared Scan (share slice:id 1:1)  (cost=0.00..431.00 rows=4 width=8)
+                                       Output: share1_ref3.v1, share1_ref3.v2
+                     ->  Result  (cost=0.00..431.00 rows=1 width=8)
+                           Output: (sum(share1_ref4.v2))
+                           ->  Redistribute Motion 1:3  (slice2)  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: (sum(share1_ref4.v2))
+                                 ->  Finalize Aggregate  (cost=0.00..431.00 rows=1 width=8)
+                                       Output: sum(share1_ref4.v2)
+                                       ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                                             Output: (PARTIAL sum(share1_ref4.v2))
+                                             ->  Partial Aggregate  (cost=0.00..431.00 rows=1 width=8)
+                                                   Output: PARTIAL sum(share1_ref4.v2)
+                                                   ->  Shared Scan (share slice:id 3:1)  (cost=0.00..431.00 rows=4 width=4)
+                                                         Output: share1_ref4.v1, share1_ref4.v2
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(52 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v1,c11.v2);
+ sum 
+-----
+  11
+  11
+  12
+  12
+  13
+  13
+  14
+  14
+  15
+  15
+  16
+  16
+  17
+  17
+  18
+  18
+  19
+  19
+  20
+  20
+ 155
+(21 rows)
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v2,c11.v3);
+                                                         QUERY PLAN                                                         
+----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2586.00 rows=21 width=8)
+   Output: (sum(share1_ref2.v2))
+   ->  Sequence  (cost=0.00..2586.00 rows=7 width=8)
+         Output: (sum(share1_ref2.v2))
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v1, share0_ref1.v2, share0_ref1.v3
+               ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+         ->  Sequence  (cost=0.00..2155.00 rows=7 width=8)
+               Output: (sum(share1_ref2.v2))
+               ->  Shared Scan (share slice:id 1:1)  (cost=0.00..862.00 rows=4 width=1)
+                     Output: share1_ref1.v2, share1_ref1.v3
+                     ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+                           Output: share0_ref3.v2, share0_ref3.v3
+                           Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=12)
+                                 Output: share0_ref3.v1, share0_ref3.v2, share0_ref3.v3
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                 Output: share0_ref2.v1, share0_ref2.v2, share0_ref2.v3
+                                 ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: share0_ref2.v1, share0_ref2.v2, share0_ref2.v3
+               ->  Append  (cost=0.00..1293.00 rows=7 width=8)
+                     ->  GroupAggregate  (cost=0.00..431.00 rows=4 width=8)
+                           Output: sum(share1_ref2.v2)
+                           Group Key: share1_ref2.v2, share1_ref2.v3
+                           ->  Sort  (cost=0.00..431.00 rows=4 width=8)
+                                 Output: share1_ref2.v2, share1_ref2.v3
+                                 Sort Key: share1_ref2.v2, share1_ref2.v3
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=8)
+                                       Output: share1_ref2.v2, share1_ref2.v3
+                                       Hash Key: share1_ref2.v2, share1_ref2.v3
+                                       ->  Shared Scan (share slice:id 2:1)  (cost=0.00..431.00 rows=4 width=8)
+                                             Output: share1_ref2.v2, share1_ref2.v3
+                     ->  GroupAggregate  (cost=0.00..431.00 rows=4 width=8)
+                           Output: sum(share1_ref3.v2)
+                           Group Key: share1_ref3.v2
+                           ->  Sort  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: share1_ref3.v2
+                                 Sort Key: share1_ref3.v2
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: share1_ref3.v2
+                                       Hash Key: share1_ref3.v2
+                                       ->  Result  (cost=0.00..431.00 rows=4 width=4)
+                                             Output: share1_ref3.v2
+                                             ->  Shared Scan (share slice:id 3:1)  (cost=0.00..431.00 rows=4 width=4)
+                                                   Output: share1_ref3.v2, share1_ref3.v3
+                     ->  Result  (cost=0.00..431.00 rows=1 width=8)
+                           Output: (sum(share1_ref4.v2))
+                           ->  Redistribute Motion 1:3  (slice4)  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: (sum(share1_ref4.v2))
+                                 ->  Finalize Aggregate  (cost=0.00..431.00 rows=1 width=8)
+                                       Output: sum(share1_ref4.v2)
+                                       ->  Gather Motion 3:1  (slice5; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                                             Output: (PARTIAL sum(share1_ref4.v2))
+                                             ->  Partial Aggregate  (cost=0.00..431.00 rows=1 width=8)
+                                                   Output: PARTIAL sum(share1_ref4.v2)
+                                                   ->  Shared Scan (share slice:id 5:1)  (cost=0.00..431.00 rows=4 width=4)
+                                                         Output: share1_ref4.v2, share1_ref4.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(60 rows)
+
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ sum 
+-----
+  11
+  23
+  36
+  50
+  65
+  81
+  98
+ 116
+ 135
+ 155
+(10 rows)
+
+-- CTE producer should have right output
+explain verbose with c1 as (select t1.v1 as v1, t2.v1 as t21, t2.v2 as t22, t2.v3 as t23 from t1 join t2 on t1.v1 = t2.v1) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                          QUERY PLAN                                          
+----------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1724.00 rows=2 width=4)
+   Output: share0_ref3.v1
+   ->  Sequence  (cost=0.00..1724.00 rows=1 width=4)
+         Output: share0_ref3.v1
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..862.00 rows=1 width=1)
+               Output: share0_ref1.v1
+               ->  Hash Join  (cost=0.00..862.00 rows=1 width=4)
+                     Output: t1.v1
+                     Hash Cond: (t1.v1 = t2.v1)
+                     ->  Seq Scan on cte_prune.t2  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t2.v1
+                     ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                           Output: t1.v1
+                           ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=1 width=4)
+                                 Output: t1.v1
+         ->  Hash Left Join  (cost=0.00..862.00 rows=1 width=4)
+               Output: share0_ref3.v1
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=1 width=4)
+                     Output: share0_ref3.v1
+               ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                     Output: share0_ref2.v1
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=1 width=4)
+                           Output: share0_ref2.v1
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(26 rows)
+
+with c1 as (select t1.v1 as v1, t2.v1 as t21, t2.v2 as t22, t2.v3 as t23 from t1 join t2 on t1.v1 = t2.v1) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+ v1 
+----
+  5
+  6
+  9
+ 10
+  2
+  3
+  4
+  7
+  8
+  1
+(10 rows)
+
+explain verbose with c1 as (select sum(v1) as v1, sum(v2) as v2, v3 from t1 group by v3) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.00 rows=11 width=8)
+   Output: share0_ref3.v1
+   ->  Sequence  (cost=0.00..1293.00 rows=4 width=8)
+         Output: share0_ref3.v1
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=1)
+               Output: share0_ref1.v1
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=8)
+                     Output: (sum(t1.v1))
+                     Hash Key: (sum(t1.v1))
+                     ->  HashAggregate  (cost=0.00..431.00 rows=4 width=8)
+                           Output: sum(t1.v1)
+                           Group Key: t1.v3
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=4 width=12)
+                                 Output: t1.v1, t1.v2, t1.v3
+                                 Hash Key: t1.v3
+                                 ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=12)
+                                       Output: t1.v1, t1.v2, t1.v3
+         ->  Hash Left Join  (cost=0.00..862.00 rows=4 width=8)
+               Output: share0_ref3.v1
+               Hash Cond: (share0_ref3.v1 = share0_ref2.v1)
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=8)
+                     Output: share0_ref3.v1
+               ->  Hash  (cost=431.00..431.00 rows=4 width=8)
+                     Output: share0_ref2.v1
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=4 width=8)
+                           Output: share0_ref2.v1
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(28 rows)
+
+with c1 as (select lt1.v3 as v3, lt1.v1 as lo1, rt1.v1 as ro1 from t1 lt1, t1 rt1 where lt1.v2 = rt1.v2 and lt1.v1 = rt1.v1)  
+select * from t1 where  t1.v1 in (select v3 from c1) and t1.v1 in (select v3 from c1 where v3 > 0);
+ v1 | v2 | v3 
+----+----+----
+(0 rows)
+
+-- TPCDS case
+create table tpcds_store_sales
+(
+    ss_sold_date_sk           integer                       ,
+    ss_sold_time_sk           integer                       ,
+    ss_item_sk                integer               not null,
+    ss_customer_sk            integer                       ,
+    ss_cdemo_sk               integer                       ,
+    ss_hdemo_sk               integer                       ,
+    ss_addr_sk                integer                       ,
+    ss_store_sk               integer                       ,
+    ss_promo_sk               integer                       ,
+    ss_ticket_number          integer               not null,
+    ss_quantity               integer                       ,
+    ss_wholesale_cost         decimal(7,2)                  ,
+    ss_list_price             decimal(7,2)                  ,
+    ss_sales_price            decimal(7,2)                  ,
+    ss_ext_discount_amt       decimal(7,2)                  ,
+    ss_ext_sales_price        decimal(7,2)                  ,
+    ss_ext_wholesale_cost     decimal(7,2)                  ,
+    ss_ext_list_price         decimal(7,2)                  ,
+    ss_ext_tax                decimal(7,2)                  ,
+    ss_coupon_amt             decimal(7,2)                  ,
+    ss_net_paid               decimal(7,2)                  ,
+    ss_net_paid_inc_tax       decimal(7,2)                  ,
+    ss_net_profit             decimal(7,2)                  ,
+    primary key (ss_item_sk, ss_ticket_number)
+);
+create table tpcds_date_dim
+(
+    d_date_sk                 integer               not null,
+    d_date_id                 char(16)              not null,
+    d_date                    date                          ,
+    d_month_seq               integer                       ,
+    d_week_seq                integer                       ,
+    d_quarter_seq             integer                       ,
+    d_year                    integer                       ,
+    d_dow                     integer                       ,
+    d_moy                     integer                       ,
+    d_dom                     integer                       ,
+    d_qoy                     integer                       ,
+    d_fy_year                 integer                       ,
+    d_fy_quarter_seq          integer                       ,
+    d_fy_week_seq             integer                       ,
+    d_day_name                char(9)                       ,
+    d_quarter_name            char(6)                       ,
+    d_holiday                 char(1)                       ,
+    d_weekend                 char(1)                       ,
+    d_following_holiday       char(1)                       ,
+    d_first_dom               integer                       ,
+    d_last_dom                integer                       ,
+    d_same_day_ly             integer                       ,
+    d_same_day_lq             integer                       ,
+    d_current_day             char(1)                       ,
+    d_current_week            char(1)                       ,
+    d_current_month           char(1)                       ,
+    d_current_quarter         char(1)                       ,
+    d_current_year            char(1)                       ,
+    primary key (d_date_sk)
+);
+create table tpcds_item
+(
+    i_item_sk                 integer               not null,
+    i_item_id                 char(16)              not null,
+    i_rec_start_date          date                          ,
+    i_rec_end_date            date                          ,
+    i_item_desc               varchar(200)                  ,
+    i_current_price           decimal(7,2)                  ,
+    i_wholesale_cost          decimal(7,2)                  ,
+    i_brand_id                integer                       ,
+    i_brand                   char(50)                      ,
+    i_class_id                integer                       ,
+    i_class                   char(50)                      ,
+    i_category_id             integer                       ,
+    i_category                char(50)                      ,
+    i_manufact_id             integer                       ,
+    i_manufact                char(50)                      ,
+    i_size                    char(20)                      ,
+    i_formulation             char(20)                      ,
+    i_color                   char(20)                      ,
+    i_units                   char(10)                      ,
+    i_container               char(10)                      ,
+    i_manager_id              integer                       ,
+    i_product_name            char(50)                      ,
+    primary key (i_item_sk)
+);
+create table tpcds_web_sales
+(
+    ws_sold_date_sk           integer                       ,
+    ws_sold_time_sk           integer                       ,
+    ws_ship_date_sk           integer                       ,
+    ws_item_sk                integer               not null,
+    ws_bill_customer_sk       integer                       ,
+    ws_bill_cdemo_sk          integer                       ,
+    ws_bill_hdemo_sk          integer                       ,
+    ws_bill_addr_sk           integer                       ,
+    ws_ship_customer_sk       integer                       ,
+    ws_ship_cdemo_sk          integer                       ,
+    ws_ship_hdemo_sk          integer                       ,
+    ws_ship_addr_sk           integer                       ,
+    ws_web_page_sk            integer                       ,
+    ws_web_site_sk            integer                       ,
+    ws_ship_mode_sk           integer                       ,
+    ws_warehouse_sk           integer                       ,
+    ws_promo_sk               integer                       ,
+    ws_order_number           integer               not null,
+    ws_quantity               integer                       ,
+    ws_wholesale_cost         decimal(7,2)                  ,
+    ws_list_price             decimal(7,2)                  ,
+    ws_sales_price            decimal(7,2)                  ,
+    ws_ext_discount_amt       decimal(7,2)                  ,
+    ws_ext_sales_price        decimal(7,2)                  ,
+    ws_ext_wholesale_cost     decimal(7,2)                  ,
+    ws_ext_list_price         decimal(7,2)                  ,
+    ws_ext_tax                decimal(7,2)                  ,
+    ws_coupon_amt             decimal(7,2)                  ,
+    ws_ext_ship_cost          decimal(7,2)                  ,
+    ws_net_paid               decimal(7,2)                  ,
+    ws_net_paid_inc_tax       decimal(7,2)                  ,
+    ws_net_paid_inc_ship      decimal(7,2)                  ,
+    ws_net_paid_inc_ship_tax  decimal(7,2)                  ,
+    ws_net_profit             decimal(7,2)                  ,
+primary key (ws_item_sk, ws_order_number)
+);
+-- sql 23
+explain verbose with frequent_ss_items as 
+ (select substr(i_item_desc,1,30) itemdesc,i_item_sk item_sk,d_date solddate,count(*) cnt
+  from tpcds_store_sales
+      ,tpcds_date_dim 
+      ,tpcds_item
+  where ss_sold_date_sk = d_date_sk
+    and ss_item_sk = i_item_sk 
+    and d_year in (1999,1999+1,1999+2,1999+3)
+  group by substr(i_item_desc,1,30),i_item_sk,d_date
+  having count(*) >4)
+select t1.v1 from t1 where t1.v1 in (select item_sk from frequent_ss_items where true)
+    and t1.v1 in (select item_sk from frequent_ss_items where item_sk > 0);
+                                                                        QUERY PLAN                                                                        
+----------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2161.00 rows=1 width=4)
+   Output: t1.v1
+   ->  Sequence  (cost=0.00..2161.00 rows=1 width=4)
+         Output: t1.v1
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..868.00 rows=1 width=1)
+               Output: share0_ref1.i_item_sk
+               ->  Result  (cost=0.00..868.00 rows=1 width=4)
+                     Output: tpcds_item.i_item_sk
+                     Filter: ((count(*)) > 4)
+                     ->  HashAggregate  (cost=0.00..868.00 rows=1 width=12)
+                           Output: count(*), count(*), tpcds_item.i_item_sk, (substr((tpcds_item.i_item_desc)::text, 1, 30)), tpcds_date_dim.d_date
+                           Group Key: substr((tpcds_item.i_item_desc)::text, 1, 30), tpcds_item.i_item_sk, tpcds_date_dim.d_date
+                           ->  Hash Join  (cost=0.00..868.00 rows=1 width=16)
+                                 Output: substr((tpcds_item.i_item_desc)::text, 1, 30), tpcds_date_dim.d_date, tpcds_item.i_item_sk
+                                 Hash Cond: (tpcds_item.i_item_sk = tpcds_store_sales.ss_item_sk)
+                                 ->  Seq Scan on cte_prune.tpcds_item  (cost=0.00..431.00 rows=1 width=12)
+                                       Output: tpcds_item.i_item_sk, tpcds_item.i_item_desc
+                                 ->  Hash  (cost=437.00..437.00 rows=1 width=8)
+                                       Output: tpcds_store_sales.ss_item_sk, tpcds_date_dim.d_date
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..437.00 rows=1 width=8)
+                                             Output: tpcds_store_sales.ss_item_sk, tpcds_date_dim.d_date
+                                             Hash Key: tpcds_store_sales.ss_item_sk
+                                             ->  Nested Loop  (cost=0.00..437.00 rows=1 width=8)
+                                                   Output: tpcds_store_sales.ss_item_sk, tpcds_date_dim.d_date
+                                                   Join Filter: true
+                                                   ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                                                         Output: tpcds_store_sales.ss_sold_date_sk, tpcds_store_sales.ss_item_sk
+                                                         Hash Key: tpcds_store_sales.ss_sold_date_sk
+                                                         ->  Seq Scan on cte_prune.tpcds_store_sales  (cost=0.00..431.00 rows=1 width=8)
+                                                               Output: tpcds_store_sales.ss_sold_date_sk, tpcds_store_sales.ss_item_sk
+                                                   ->  Index Scan using tpcds_date_dim_pkey on cte_prune.tpcds_date_dim  (cost=0.00..6.00 rows=1 width=4)
+                                                         Output: tpcds_date_dim.d_date, tpcds_date_dim.d_year
+                                                         Index Cond: (tpcds_date_dim.d_date_sk = tpcds_store_sales.ss_sold_date_sk)
+                                                         Filter: (tpcds_date_dim.d_year = ANY ('{1999,2000,2001,2002}'::integer[]))
+         ->  Hash Semi Join  (cost=0.00..1293.00 rows=1 width=4)
+               Output: t1.v1
+               Hash Cond: (t1.v1 = share0_ref2.i_item_sk)
+               ->  Hash Semi Join  (cost=0.00..862.00 rows=1 width=4)
+                     Output: t1.v1
+                     Hash Cond: (t1.v1 = share0_ref3.i_item_sk)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t1.v1
+                     ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                           Output: share0_ref3.i_item_sk
+                           ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                                 Output: share0_ref3.i_item_sk
+                                 Filter: (share0_ref3.i_item_sk > 0)
+                                 ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=1 width=4)
+                                       Output: share0_ref3.i_item_sk
+               ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                     Output: share0_ref2.i_item_sk
+                     ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=1 width=4)
+                           Output: share0_ref2.i_item_sk
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(55 rows)
+
+-- sql 95
+explain verbose with ws_wh as
+(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
+ from tpcds_web_sales ws1,tpcds_web_sales ws2
+ where ws1.ws_order_number = ws2.ws_order_number
+   and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+select * from t1 where t1.v1 in (select ws_order_number from ws_wh where true) and t1.v1 in (select ws_order_number from ws_wh where ws_order_number > 0);
+                                                            QUERY PLAN                                                            
+----------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1730.00 rows=1 width=12)
+   Output: t1.v1, t1.v2, t1.v3
+   ->  Sequence  (cost=0.00..1730.00 rows=1 width=12)
+         Output: t1.v1, t1.v2, t1.v3
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..437.00 rows=1 width=1)
+               Output: share0_ref1.ws_order_number
+               ->  Nested Loop  (cost=0.00..437.00 rows=1 width=4)
+                     Output: ws1.ws_order_number
+                     Join Filter: true
+                     ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                           Output: ws1.ws_warehouse_sk, ws1.ws_order_number
+                           ->  Seq Scan on cte_prune.tpcds_web_sales ws1  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: ws1.ws_warehouse_sk, ws1.ws_order_number
+                     ->  Index Scan using tpcds_web_sales_pkey on cte_prune.tpcds_web_sales ws2  (cost=0.00..6.00 rows=1 width=1)
+                           Output: ws2.ws_warehouse_sk
+                           Index Cond: (ws2.ws_order_number = ws1.ws_order_number)
+                           Filter: (ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+         ->  Hash Semi Join  (cost=0.00..1293.00 rows=1 width=12)
+               Output: t1.v1, t1.v2, t1.v3
+               Hash Cond: (t1.v1 = share0_ref2.ws_order_number)
+               ->  Hash Semi Join  (cost=0.00..862.00 rows=1 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+                     Hash Cond: (t1.v1 = share0_ref3.ws_order_number)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                           Output: share0_ref3.ws_order_number
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                                 Output: share0_ref3.ws_order_number
+                                 Hash Key: share0_ref3.ws_order_number
+                                 ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                                       Output: share0_ref3.ws_order_number
+                                       Filter: (share0_ref3.ws_order_number > 0)
+                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=1 width=4)
+                                             Output: share0_ref3.ws_order_number
+               ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                     Output: share0_ref2.ws_order_number
+                     ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                           Output: share0_ref2.ws_order_number
+                           Hash Key: share0_ref2.ws_order_number
+                           ->  Shared Scan (share slice:id 4:0)  (cost=0.00..431.00 rows=1 width=4)
+                                 Output: share0_ref2.ws_order_number
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(44 rows)
+
+explain verbose with ws_wh as
+(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
+ from tpcds_web_sales ws1,tpcds_web_sales ws2
+ where ws1.ws_order_number = ws2.ws_order_number
+   and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+select * from t1 where t1.v1 in (select wh1 from ws_wh where true) and t1.v1 in (select wh1 from ws_wh where ws_order_number > 0);
+                                                            QUERY PLAN                                                            
+----------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1730.00 rows=1 width=12)
+   Output: t1.v1, t1.v2, t1.v3
+   ->  Sequence  (cost=0.00..1730.00 rows=1 width=12)
+         Output: t1.v1, t1.v2, t1.v3
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..437.00 rows=1 width=1)
+               Output: share0_ref1.ws_order_number, share0_ref1.ws_warehouse_sk
+               ->  Nested Loop  (cost=0.00..437.00 rows=1 width=8)
+                     Output: ws1.ws_order_number, ws1.ws_warehouse_sk
+                     Join Filter: true
+                     ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                           Output: ws1.ws_warehouse_sk, ws1.ws_order_number
+                           ->  Seq Scan on cte_prune.tpcds_web_sales ws1  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: ws1.ws_warehouse_sk, ws1.ws_order_number
+                     ->  Index Scan using tpcds_web_sales_pkey on cte_prune.tpcds_web_sales ws2  (cost=0.00..6.00 rows=1 width=1)
+                           Output: ws2.ws_warehouse_sk
+                           Index Cond: (ws2.ws_order_number = ws1.ws_order_number)
+                           Filter: (ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+         ->  Hash Semi Join  (cost=0.00..1293.00 rows=1 width=12)
+               Output: t1.v1, t1.v2, t1.v3
+               Hash Cond: (t1.v1 = share0_ref2.ws_warehouse_sk)
+               ->  Hash Semi Join  (cost=0.00..862.00 rows=1 width=12)
+                     Output: t1.v1, t1.v2, t1.v3
+                     Hash Cond: (t1.v1 = share0_ref3.ws_warehouse_sk)
+                     ->  Seq Scan on cte_prune.t1  (cost=0.00..431.00 rows=4 width=12)
+                           Output: t1.v1, t1.v2, t1.v3
+                     ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                           Output: share0_ref3.ws_warehouse_sk
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                                 Output: share0_ref3.ws_warehouse_sk
+                                 Hash Key: share0_ref3.ws_warehouse_sk
+                                 ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                                       Output: share0_ref3.ws_warehouse_sk
+                                       Filter: (share0_ref3.ws_order_number > 0)
+                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=1 width=8)
+                                             Output: share0_ref3.ws_order_number, share0_ref3.ws_warehouse_sk
+               ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                     Output: share0_ref2.ws_warehouse_sk
+                     ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                           Output: share0_ref2.ws_warehouse_sk
+                           Hash Key: share0_ref2.ws_warehouse_sk
+                           ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                                 Output: share0_ref2.ws_warehouse_sk
+                                 ->  Shared Scan (share slice:id 4:0)  (cost=0.00..431.00 rows=1 width=4)
+                                       Output: share0_ref2.ws_order_number, share0_ref2.ws_warehouse_sk
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(46 rows)
+
+-- start_ignore
+drop table tpcds_store_sales;
+drop table tpcds_date_dim;
+drop table tpcds_item;
+drop table tpcds_web_sales;
+drop table t1;
+drop table t2;
+-- end_ignore
+-- comm cases
+CREATE TABLE t3 AS SELECT i as a, i+1 as b from generate_series(1,10)i;
+CREATE TABLE t4 AS SELECT i as c, i+1 as d from generate_series(1,10)i;
+analyze t3;
+analyze t4;
+-- Additional filtering conditions are added to the consumer.
+-- This is caused by `PexprInferPredicates` in the ORCA preprocessor.
+explain verbose WITH t(a,b,d) AS
+(
+  SELECT t3.a,t3.b,t4.d FROM t3,t4 WHERE t3.a = t4.d
+)
+SELECT cup.*, SUM(t.d) OVER(PARTITION BY t.b) FROM
+  (
+    SELECT t4.*, AVG(t.b) OVER(PARTITION BY t.a ORDER BY t.b desc) AS e FROM t,t4
+  ) AS cup,
+t WHERE cup.e < 10
+GROUP BY cup.c,cup.d, cup.e ,t.d, t.b
+ORDER BY 1,2,3,4
+LIMIT 10;
+                                                                                                 QUERY PLAN                                                                                                 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1356697001.21 rows=10 width=24)
+   Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+   Merge Key: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+   ->  Sort  (cost=0.00..1356697001.21 rows=4 width=24)
+         Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+         Sort Key: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+         ->  Sequence  (cost=0.00..1356697001.21 rows=4 width=24)
+               Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..862.00 rows=4 width=1)
+                     Output: share0_ref1.a, share0_ref1.b, share0_ref1.d
+                     ->  Hash Join  (cost=0.00..862.00 rows=4 width=12)
+                           Output: t3.a, t3.b, t4.d
+                           Hash Cond: (t3.a = t4.d)
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=8)
+                                 Output: t3.a, t3.b
+                                 Hash Key: t3.a
+                                 ->  Seq Scan on cte_prune.t3  (cost=0.00..431.00 rows=4 width=8)
+                                       Output: t3.a, t3.b
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                 Output: t4.d
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: t4.d
+                                       Hash Key: t4.d
+                                       ->  Seq Scan on cte_prune.t4  (cost=0.00..431.00 rows=4 width=4)
+                                             Output: t4.d
+               ->  Redistribute Motion 1:3  (slice4)  (cost=0.00..1356696139.21 rows=4 width=24)
+                     Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+                     ->  Limit  (cost=0.00..1356696139.20 rows=10 width=24)
+                           Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+                           ->  Gather Motion 3:1  (slice5; segments: 3)  (cost=0.00..1356696139.20 rows=10 width=24)
+                                 Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+                                 Merge Key: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+                                 ->  Limit  (cost=0.00..1356696139.20 rows=4 width=24)
+                                       Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+                                       ->  Result  (cost=0.00..1356696139.20 rows=134 width=24)
+                                             Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+                                             ->  Sort  (cost=0.00..1356696139.20 rows=134 width=24)
+                                                   Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?)), share0_ref2.b
+                                                   Sort Key: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), (sum(share0_ref2.d) OVER (?))
+                                                   ->  WindowAgg  (cost=0.00..1356696139.08 rows=134 width=24)
+                                                         Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), sum(share0_ref2.d) OVER (?), share0_ref2.b
+                                                         Partition By: share0_ref2.b
+                                                         ->  Sort  (cost=0.00..1356696139.08 rows=134 width=24)
+                                                               Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), share0_ref2.b, share0_ref2.d
+                                                               Sort Key: share0_ref2.b
+                                                               ->  Redistribute Motion 3:3  (slice6; segments: 3)  (cost=0.00..1356696138.95 rows=134 width=24)
+                                                                     Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), share0_ref2.b, share0_ref2.d
+                                                                     Hash Key: share0_ref2.b
+                                                                     ->  HashAggregate  (cost=0.00..1356696138.94 rows=134 width=24)
+                                                                           Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), share0_ref2.b, share0_ref2.d
+                                                                           Group Key: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), share0_ref2.d, share0_ref2.b
+                                                                           ->  Redistribute Motion 3:3  (slice7; segments: 3)  (cost=0.00..1356696138.85 rows=134 width=24)
+                                                                                 Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), share0_ref2.b, share0_ref2.d
+                                                                                 Hash Key: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), share0_ref2.d, share0_ref2.b
+                                                                                 ->  Nested Loop  (cost=0.00..1356696138.84 rows=134 width=24)
+                                                                                       Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?)), share0_ref2.b, share0_ref2.d
+                                                                                       Join Filter: true
+                                                                                       ->  Result  (cost=0.00..1324036.56 rows=14 width=16)
+                                                                                             Output: t4_1.c, t4_1.d, (avg(share0_ref3.b) OVER (?))
+                                                                                             Filter: ((avg(share0_ref3.b) OVER (?)) < '10'::numeric)
+                                                                                             ->  WindowAgg  (cost=0.00..1324036.56 rows=34 width=16)
+                                                                                                   Output: avg(share0_ref3.b) OVER (?), share0_ref3.a, share0_ref3.b, t4_1.c, t4_1.d
+                                                                                                   Partition By: share0_ref3.a
+                                                                                                   Order By: share0_ref3.b
+                                                                                                   ->  Sort  (cost=0.00..1324036.56 rows=34 width=16)
+                                                                                                         Output: share0_ref3.a, share0_ref3.b, t4_1.c, t4_1.d
+                                                                                                         Sort Key: share0_ref3.a, share0_ref3.b DESC
+                                                                                                         ->  Redistribute Motion 3:3  (slice9; segments: 3)  (cost=0.00..1324036.54 rows=34 width=16)
+                                                                                                               Output: share0_ref3.a, share0_ref3.b, t4_1.c, t4_1.d
+                                                                                                               Hash Key: share0_ref3.a
+                                                                                                               ->  Nested Loop  (cost=0.00..1324036.54 rows=34 width=16)
+                                                                                                                     Output: share0_ref3.a, share0_ref3.b, t4_1.c, t4_1.d
+                                                                                                                     Join Filter: true
+                                                                                                                     ->  Broadcast Motion 3:3  (slice10; segments: 3)  (cost=0.00..431.00 rows=10 width=8)
+                                                                                                                           Output: share0_ref3.a, share0_ref3.b
+                                                                                                                           ->  Result  (cost=0.00..431.00 rows=4 width=8)
+                                                                                                                                 Output: share0_ref3.a, share0_ref3.b
+                                                                                                                                 Filter: (share0_ref3.a = share0_ref3.d)
+                                                                                                                                 ->  Shared Scan (share slice:id 10:0)  (cost=0.00..431.00 rows=4 width=12)
+                                                                                                                                       Output: share0_ref3.a, share0_ref3.b, share0_ref3.d
+                                                                                                                     ->  Seq Scan on cte_prune.t4 t4_1  (cost=0.00..431.00 rows=4 width=8)
+                                                                                                                           Output: t4_1.c, t4_1.d
+                                                                                       ->  Materialize  (cost=0.00..431.00 rows=10 width=8)
+                                                                                             Output: share0_ref2.b, share0_ref2.d
+                                                                                             ->  Broadcast Motion 3:3  (slice8; segments: 3)  (cost=0.00..431.00 rows=10 width=8)
+                                                                                                   Output: share0_ref2.b, share0_ref2.d
+                                                                                                   ->  Result  (cost=0.00..431.00 rows=4 width=8)
+                                                                                                         Output: share0_ref2.b, share0_ref2.d
+                                                                                                         Filter: (share0_ref2.a = share0_ref2.d)
+                                                                                                         ->  Shared Scan (share slice:id 8:0)  (cost=0.00..431.00 rows=4 width=12)
+                                                                                                               Output: share0_ref2.a, share0_ref2.b, share0_ref2.d
+ Settings: optimizer = 'on'
+ Optimizer: GPORCA
+(93 rows)
+
+WITH t(a,b,d) AS
+(
+  SELECT t3.a,t3.b,t4.d FROM t3,t4 WHERE t3.a = t4.d
+)
+SELECT cup.*, SUM(t.d) OVER(PARTITION BY t.b) FROM
+  (
+    SELECT t4.*, AVG(t.b) OVER(PARTITION BY t.a ORDER BY t.b desc) AS e FROM t,t4
+  ) AS cup,
+t WHERE cup.e < 10
+GROUP BY cup.c,cup.d, cup.e ,t.d, t.b
+ORDER BY 1,2,3,4
+LIMIT 10;
+ c | d |         e          | sum 
+---+---+--------------------+-----
+ 1 | 2 | 3.0000000000000000 | 140
+ 1 | 2 | 3.0000000000000000 | 210
+ 1 | 2 | 3.0000000000000000 | 280
+ 1 | 2 | 3.0000000000000000 | 350
+ 1 | 2 | 3.0000000000000000 | 420
+ 1 | 2 | 3.0000000000000000 | 490
+ 1 | 2 | 3.0000000000000000 | 560
+ 1 | 2 | 3.0000000000000000 | 630
+ 1 | 2 | 3.0000000000000000 | 700
+ 1 | 2 | 4.0000000000000000 | 140
+(10 rows)
+
+-- grouping set will generate the internal CTE.
+CREATE TABLE cte_prune_tenk1 (unique1 int4, unique2 int4, two int4, four int4, ten int4, twenty int4, hundred int4, thousand int4, twothousand int4, fivethous int4, tenthous int4, odd int4, even int4, stringu1 name, stringu2 name, string4 name);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'unique1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO cte_prune_tenk1
+SELECT
+  i AS unique1,
+  (i + 10000) AS unique2,
+  i % 2 AS two,
+  i % 4 AS four,
+  i % 10 AS ten,
+  i % 20 AS twenty,
+  i % 100 AS hundred,
+  i % 1000 AS thousand,
+  i % 2000 AS twothousand,
+  i % 5000 AS fivethous,
+  i % 10000 AS tenthous,
+  (2 * i + 1) AS odd,
+  (2 * i) AS even,
+  ('A' || lpad(i::text, 4, '0'))::name AS stringu1,
+  ('B' || lpad(i::text, 4, '0'))::name AS stringu2,
+  (CASE (i % 4)
+    WHEN 0 THEN 'AAAA'::name
+    WHEN 1 THEN 'BBBB'::name
+    WHEN 2 THEN 'CCCC'::name
+    ELSE 'DDDD'::name
+  END) AS string4
+FROM generate_series(0, 99) AS i;
+INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner
+DETAIL:  Falling back to Postgres-based planner because GPORCA does not support the following feature: Non-default collation
+explain verbose select four, x
+  from (select four, ten, 'foo'::text as x from cte_prune_tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+                                                    QUERY PLAN                                                    
+------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=1 width=12)
+   Output: (NULL::integer), share0_ref2.x
+   ->  Sequence  (cost=0.00..862.00 rows=1 width=12)
+         Output: (NULL::integer), share0_ref2.x
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=1 width=1)
+               Output: share0_ref1.four, share0_ref1.x
+               ->  Seq Scan on cte_prune.cte_prune_tenk1  (cost=0.00..431.00 rows=1 width=4)
+                     Output: cte_prune_tenk1.four, 'foo'::text
+         ->  Append  (cost=0.00..431.00 rows=1 width=12)
+               ->  GroupAggregate  (cost=0.00..431.00 rows=1 width=8)
+                     Output: NULL::integer, share0_ref2.x
+                     Group Key: share0_ref2.x
+                     ->  Sort  (cost=0.00..431.00 rows=1 width=8)
+                           Output: share0_ref2.x
+                           Sort Key: share0_ref2.x
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: share0_ref2.x
+                                 Hash Key: share0_ref2.x
+                                 ->  Result  (cost=0.00..431.00 rows=1 width=8)
+                                       Output: share0_ref2.x
+                                       Filter: (share0_ref2.x = 'foo'::text)
+                                       ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.00 rows=1 width=8)
+                                             Output: share0_ref2.four, share0_ref2.x
+               ->  Result  (cost=0.00..0.00 rows=0 width=12)
+                     Output: (NULL::integer), (NULL::text)
+                     One-Time Filter: (gp_execution_segment() = 0)
+                     ->  Result  (cost=0.00..0.00 rows=0 width=12)
+                           Output: NULL::integer, NULL::text
+                           One-Time Filter: false
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(31 rows)
+
+select four, x
+  from (select four, ten, 'foo'::text as x from cte_prune_tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+ four |  x  
+------+-----
+      | foo
+(1 row)
+
+-- nest CTE cases
+-- start_ignore
+drop table city;
+ERROR:  table "city" does not exist
+drop table country;
+ERROR:  table "country" does not exist
+drop table countrylanguage;
+ERROR:  table "countrylanguage" does not exist
+-- end_ignore
+CREATE TABLE city (
+    id integer NOT NULL,
+    name text NOT NULL,
+    countrycode character(3) NOT NULL,
+    district text NOT NULL,
+    population integer NOT NULL
+) distributed by(id);
+CREATE TABLE country (
+    code character(3) NOT NULL,
+    name text NOT NULL,
+    continent text NOT NULL,
+    region text NOT NULL,
+    surfacearea numeric(10,2) NOT NULL,
+    indepyear smallint,
+    population integer NOT NULL,
+    lifeexpectancy real,
+    gnp numeric(10,2),
+    gnpold numeric(10,2),
+    localname text NOT NULL,
+    governmentform text NOT NULL,
+    headofstate text,
+    capital integer,
+    code2 character(2) NOT NULL
+) distributed by (code);
+CREATE TABLE countrylanguage (
+    countrycode character(3) NOT NULL,
+    "language" text NOT NULL,
+    isofficial boolean NOT NULL,
+    percentage real NOT NULL
+)distributed by (countrycode,language);
+ALTER TABLE ONLY city
+    ADD CONSTRAINT city_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY country
+    ADD CONSTRAINT country_pkey PRIMARY KEY (code);
+ALTER TABLE ONLY countrylanguage
+    ADD CONSTRAINT countrylanguage_pkey PRIMARY KEY (countrycode, "language");
+-- CTE1(inlined) in CTE2(no-inlined) case
+explain verbose with country as
+(select country.code,country.name COUNTRY, city.name CAPITAL, language, isofficial, percentage
+ FROM country,city,countrylanguage
+ WHERE country.code = countrylanguage.countrycode
+ and country.capital = city.id
+ and country.continent = 'Europe'),
+countrylanguage as
+(select country.code,country.COUNTRY,country.language,country.isofficial,country.percentage
+ FROM country,countrylanguage
+ WHERE country.code = countrylanguage.countrycode
+)
+select * from
+(select * from country where isofficial='True') country,
+(select * from countrylanguage where percentage > 50) countrylanguage
+where country.percentage = countrylanguage.percentage order by countrylanguage.COUNTRY,country.language LIMIT 40;
+                                                                                                                                         QUERY PLAN                                                                                                                                         
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1736.01 rows=1 width=66)
+   Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+   Merge Key: share0_ref2.name, share0_ref3.language
+   ->  Sort  (cost=0.00..1736.01 rows=1 width=66)
+         Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+         Sort Key: share0_ref2.name, share0_ref3.language
+         ->  Sequence  (cost=0.00..1736.00 rows=1 width=66)
+               Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+               ->  Shared Scan (share slice:id 1:0)  (cost=0.00..868.00 rows=1 width=1)
+                     Output: share0_ref1.code, share0_ref1.name, share0_ref1.name_1, share0_ref1.language, share0_ref1.isofficial, share0_ref1.percentage
+                     ->  Hash Join  (cost=0.00..868.00 rows=1 width=37)
+                           Output: country.code, country.name, city.name, countrylanguage.language, countrylanguage.isofficial, countrylanguage.percentage
+                           Hash Cond: (country.capital = city.id)
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..437.00 rows=1 width=33)
+                                 Output: country.code, country.name, country.capital, countrylanguage.language, countrylanguage.isofficial, countrylanguage.percentage
+                                 Hash Key: country.capital
+                                 ->  Nested Loop  (cost=0.00..437.00 rows=1 width=33)
+                                       Output: country.code, country.name, country.capital, countrylanguage.language, countrylanguage.isofficial, countrylanguage.percentage
+                                       Join Filter: true
+                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=21)
+                                             Output: countrylanguage.countrycode, countrylanguage.language, countrylanguage.isofficial, countrylanguage.percentage
+                                             Hash Key: countrylanguage.countrycode
+                                             ->  Seq Scan on cte_prune.countrylanguage  (cost=0.00..431.00 rows=1 width=21)
+                                                   Output: countrylanguage.countrycode, countrylanguage.language, countrylanguage.isofficial, countrylanguage.percentage
+                                       ->  Index Scan using country_pkey on cte_prune.country  (cost=0.00..6.00 rows=1 width=20)
+                                             Output: country.code, country.name, country.continent, country.capital
+                                             Index Cond: (country.code = countrylanguage.countrycode)
+                                             Filter: (country.continent = 'Europe'::text)
+                           ->  Hash  (cost=431.00..431.00 rows=1 width=12)
+                                 Output: city.id, city.name
+                                 ->  Seq Scan on cte_prune.city  (cost=0.00..431.00 rows=1 width=12)
+                                       Output: city.id, city.name
+               ->  Redistribute Motion 1:3  (slice4)  (cost=0.00..868.00 rows=1 width=66)
+                     Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                     ->  Limit  (cost=0.00..868.00 rows=1 width=66)
+                           Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                           ->  Gather Motion 3:1  (slice5; segments: 3)  (cost=0.00..868.00 rows=1 width=66)
+                                 Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                 Merge Key: share0_ref2.name, share0_ref3.language
+                                 ->  Sort  (cost=0.00..868.00 rows=1 width=66)
+                                       Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                       Sort Key: share0_ref2.name, share0_ref3.language
+                                       ->  Hash Join  (cost=0.00..868.00 rows=1 width=66)
+                                             Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage, share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                             Hash Cond: (share0_ref3.percentage = share0_ref2.percentage)
+                                             ->  Redistribute Motion 3:3  (slice6; segments: 3)  (cost=0.00..431.00 rows=1 width=37)
+                                                   Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage
+                                                   Hash Key: share0_ref3.percentage
+                                                   ->  Result  (cost=0.00..431.00 rows=1 width=37)
+                                                         Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage
+                                                         Filter: (share0_ref3.isofficial AND (share0_ref3.percentage > '50'::double precision))
+                                                         ->  Shared Scan (share slice:id 6:0)  (cost=0.00..431.00 rows=1 width=37)
+                                                               Output: share0_ref3.code, share0_ref3.name, share0_ref3.name_1, share0_ref3.language, share0_ref3.isofficial, share0_ref3.percentage
+                                             ->  Hash  (cost=437.00..437.00 rows=1 width=29)
+                                                   Output: share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                                   ->  Redistribute Motion 3:3  (slice7; segments: 3)  (cost=0.00..437.00 rows=1 width=29)
+                                                         Output: share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                                         Hash Key: share0_ref2.percentage
+                                                         ->  Result  (cost=0.00..437.00 rows=1 width=29)
+                                                               Output: share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                                               Filter: (share0_ref2.percentage > '50'::double precision)
+                                                               ->  Nested Loop  (cost=0.00..437.00 rows=1 width=29)
+                                                                     Output: share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                                                     Join Filter: true
+                                                                     ->  Broadcast Motion 3:3  (slice8; segments: 3)  (cost=0.00..431.00 rows=1 width=29)
+                                                                           Output: share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                                                           ->  Result  (cost=0.00..431.00 rows=1 width=29)
+                                                                                 Output: share0_ref2.code, share0_ref2.name, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                                                                 ->  Shared Scan (share slice:id 8:0)  (cost=0.00..431.00 rows=1 width=29)
+                                                                                       Output: share0_ref2.code, share0_ref2.name, share0_ref2.name_1, share0_ref2.language, share0_ref2.isofficial, share0_ref2.percentage
+                                                                     ->  Index Scan using countrylanguage_pkey on cte_prune.countrylanguage countrylanguage_1  (cost=0.00..6.00 rows=1 width=1)
+                                                                           Index Cond: (countrylanguage_1.countrycode = share0_ref2.code)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(74 rows)
+
+-- CTE in the main query and subqueries within the main query
+explain verbose with bad_headofstates as 
+(
+ select country.code,country.name,country.headofstate,countrylanguage.language
+ from
+ country,countrylanguage
+ where country.code = countrylanguage.countrycode and countrylanguage.isofficial=true
+ and (country.gnp < country.gnpold or country.gnp < 3000)
+)
+select OUTERMOST_FOO.*,bad_headofstates.headofstate from (
+select avg(population),region from
+(
+select FOO.*,bad_headofstates.headofstate,city.name
+from
+(select bad_headofstates.code,country.capital,country.region,country.population from
+bad_headofstates,country where bad_headofstates.code = country.code) FOO, bad_headofstates,city
+where FOO.code = bad_headofstates.code and FOO.capital = city.id) OUTER_FOO
+group by region ) OUTERMOST_FOO,bad_headofstates,country 
+where country.code = bad_headofstates.code and country.region = OUTERMOST_FOO.region
+order by OUTERMOST_FOO.region,bad_headofstates.headofstate LIMIT 40;
+                                                                         QUERY PLAN                                                                          
+-------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Sequence  (cost=0.00..1748.00 rows=1 width=24)
+   Output: (avg(country_1.population)), country_1.region, share0_ref2.headofstate
+   ->  Shared Scan (share slice:id 0:0)  (cost=0.00..437.00 rows=1 width=1)
+         Output: share0_ref1.code, share0_ref1.headofstate
+         ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..437.00 rows=1 width=16)
+               Output: country.code, country.headofstate
+               ->  Nested Loop  (cost=0.00..437.00 rows=1 width=16)
+                     Output: country.code, country.headofstate
+                     Join Filter: true
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                           Output: countrylanguage.countrycode
+                           Hash Key: countrylanguage.countrycode
+                           ->  Seq Scan on cte_prune.countrylanguage  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: countrylanguage.countrycode
+                                 Filter: countrylanguage.isofficial
+                     ->  Index Scan using country_pkey on cte_prune.country  (cost=0.00..6.00 rows=1 width=16)
+                           Output: country.code, country.gnp, country.gnpold, country.headofstate
+                           Index Cond: (country.code = countrylanguage.countrycode)
+                           Filter: ((country.gnp < country.gnpold) OR (country.gnp < '3000'::numeric))
+   ->  Limit  (cost=0.00..1311.00 rows=1 width=24)
+         Output: (avg(country_1.population)), country_1.region, share0_ref2.headofstate
+         ->  Sort  (cost=0.00..1311.00 rows=1 width=24)
+               Output: (avg(country_1.population)), country_1.region, share0_ref2.headofstate
+               Sort Key: country_1.region, share0_ref2.headofstate
+               ->  Hash Join  (cost=0.00..1311.00 rows=1 width=24)
+                     Output: (avg(country_1.population)), country_1.region, share0_ref2.headofstate
+                     Hash Cond: (country_1.region = country_2.region)
+                     ->  HashAggregate  (cost=0.00..874.00 rows=1 width=16)
+                           Output: avg(country_1.population), country_1.region
+                           Group Key: country_1.region
+                           ->  Hash Join  (cost=0.00..874.00 rows=1 width=12)
+                                 Output: country_1.region, country_1.population
+                                 Hash Cond: (share0_ref4.code = share0_ref3.code)
+                                 ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..443.00 rows=1 width=20)
+                                       Output: share0_ref4.code, country_1.region, country_1.population
+                                       ->  Nested Loop  (cost=0.00..443.00 rows=1 width=20)
+                                             Output: share0_ref4.code, country_1.region, country_1.population
+                                             Join Filter: true
+                                             ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..437.00 rows=1 width=24)
+                                                   Output: share0_ref4.code, country_1.region, country_1.population, country_1.capital
+                                                   Hash Key: country_1.capital
+                                                   ->  Nested Loop  (cost=0.00..437.00 rows=1 width=24)
+                                                         Output: share0_ref4.code, country_1.region, country_1.population, country_1.capital
+                                                         Join Filter: true
+                                                         ->  Redistribute Motion 1:3  (slice5)  (cost=0.00..431.00 rows=1 width=8)
+                                                               Output: share0_ref4.code
+                                                               Hash Key: share0_ref4.code
+                                                               ->  Result  (cost=0.00..431.00 rows=1 width=8)
+                                                                     Output: share0_ref4.code
+                                                                     ->  Shared Scan (share slice:id 5:0)  (cost=0.00..431.00 rows=1 width=8)
+                                                                           Output: share0_ref4.code, share0_ref4.headofstate
+                                                         ->  Index Scan using country_pkey on cte_prune.country country_1  (cost=0.00..6.00 rows=1 width=16)
+                                                               Output: country_1.region, country_1.population, country_1.capital
+                                                               Index Cond: (country_1.code = share0_ref4.code)
+                                             ->  Index Scan using city_pkey on cte_prune.city  (cost=0.00..6.00 rows=1 width=1)
+                                                   Index Cond: (city.id = country_1.capital)
+                                 ->  Hash  (cost=431.00..431.00 rows=1 width=8)
+                                       Output: share0_ref3.code, share0_ref3.headofstate
+                                       ->  Shared Scan (share slice:id 0:0)  (cost=0.00..431.00 rows=1 width=8)
+                                             Output: share0_ref3.code, share0_ref3.headofstate
+                     ->  Hash  (cost=437.00..437.00 rows=1 width=16)
+                           Output: share0_ref2.headofstate, country_2.region
+                           ->  Gather Motion 3:1  (slice6; segments: 3)  (cost=0.00..437.00 rows=1 width=16)
+                                 Output: share0_ref2.headofstate, country_2.region
+                                 ->  Nested Loop  (cost=0.00..437.00 rows=1 width=16)
+                                       Output: share0_ref2.headofstate, country_2.region
+                                       Join Filter: true
+                                       ->  Redistribute Motion 1:3  (slice7)  (cost=0.00..431.00 rows=1 width=16)
+                                             Output: share0_ref2.code, share0_ref2.headofstate
+                                             Hash Key: share0_ref2.code
+                                             ->  Shared Scan (share slice:id 7:0)  (cost=0.00..431.00 rows=1 width=16)
+                                                   Output: share0_ref2.code, share0_ref2.headofstate
+                                       ->  Index Scan using country_pkey on cte_prune.country country_2  (cost=0.00..6.00 rows=1 width=8)
+                                             Output: country_2.region
+                                             Index Cond: (country_2.code = share0_ref2.code)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(77 rows)
+
+-- start_ignore
+drop table city;
+drop table country;
+drop table countrylanguage;
+-- end_ignore
+-- inlined CTEs
+CREATE TABLE t5 AS SELECT i as c, i+1 as d from generate_series(1,10)i;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'c' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE t6 AS SELECT i as a, i+1 as b from generate_series(1,10)i;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- inlined CTEs should have not unused columns(ex. t5.*, t6.* in output)
+explain verbose WITH w AS (SELECT a, b from t6 where b < 5)
+SELECT *
+FROM t6,
+     (WITH v AS (SELECT c, d FROM t5, w WHERE c = w.a AND c < 2)
+      SELECT v1.c, v1.d FROM v v1, v v2 WHERE v1.c = v2.c AND v1.d > 1
+     ) x
+WHERE t6.a = x.c ORDER BY 1;
+                                                        QUERY PLAN                                                         
+---------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2155.00 rows=1 width=16)
+   Output: t6_1.a, t6_1.b, share1_ref3.c, share1_ref3.d
+   Merge Key: t6_1.a
+   ->  Sort  (cost=0.00..2155.00 rows=1 width=16)
+         Output: t6_1.a, t6_1.b, share1_ref3.c, share1_ref3.d
+         Sort Key: t6_1.a
+         ->  Hash Join  (cost=0.00..2155.00 rows=1 width=16)
+               Output: t6_1.a, t6_1.b, share1_ref3.c, share1_ref3.d
+               Hash Cond: (share1_ref3.c = t6_1.a)
+               ->  Sequence  (cost=0.00..1724.00 rows=1 width=8)
+                     Output: share1_ref3.c, share1_ref3.d
+                     ->  Shared Scan (share slice:id 1:1)  (cost=0.00..862.00 rows=1 width=1)
+                           Output: share1_ref1.c, share1_ref1.d
+                           ->  Hash Join  (cost=0.00..862.00 rows=1 width=8)
+                                 Output: t5.c, t5.d
+                                 Hash Cond: (t5.c = t6.a)
+                                 ->  Seq Scan on cte_prune.t5  (cost=0.00..431.00 rows=1 width=8)
+                                       Output: t5.c, t5.d
+                                       Filter: (t5.c < 2)
+                                 ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                                       Output: t6.a
+                                       ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                                             Output: t6.a
+                                             ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                                                   Output: t6.a
+                                                   Filter: (t6.a < 2)
+                                                   ->  Seq Scan on cte_prune.t6  (cost=0.00..431.00 rows=1 width=4)
+                                                         Output: t6.a
+                                                         Filter: (t6.b < 5)
+                     ->  Hash Join  (cost=0.00..862.00 rows=1 width=8)
+                           Output: share1_ref3.c, share1_ref3.d
+                           Hash Cond: (share1_ref3.c = share1_ref2.c)
+                           ->  Result  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: share1_ref3.c, share1_ref3.d
+                                 Filter: ((share1_ref3.d > 1) AND (share1_ref3.c < 2))
+                                 ->  Shared Scan (share slice:id 1:1)  (cost=0.00..431.00 rows=1 width=8)
+                                       Output: share1_ref3.c, share1_ref3.d
+                           ->  Hash  (cost=431.00..431.00 rows=1 width=4)
+                                 Output: share1_ref2.c
+                                 ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
+                                       Output: share1_ref2.c
+                                       ->  Result  (cost=0.00..431.00 rows=1 width=4)
+                                             Output: share1_ref2.c
+                                             Filter: (share1_ref2.c < 2)
+                                             ->  Shared Scan (share slice:id 3:1)  (cost=0.00..431.00 rows=1 width=4)
+                                                   Output: share1_ref2.c, share1_ref2.d
+               ->  Hash  (cost=431.00..431.00 rows=1 width=8)
+                     Output: t6_1.a, t6_1.b
+                     ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                           Output: t6_1.a, t6_1.b
+                           ->  Seq Scan on cte_prune.t6 t6_1  (cost=0.00..431.00 rows=1 width=8)
+                                 Output: t6_1.a, t6_1.b
+                                 Filter: (t6_1.a < 2)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(55 rows)
+
+WITH w AS (SELECT a, b from t6 where b < 5)
+SELECT *
+FROM t6,
+     (WITH v AS (SELECT c, d FROM t5, w WHERE c = w.a AND c < 2)
+      SELECT v1.c, v1.d FROM v v1, v v2 WHERE v1.c = v2.c AND v1.d > 1
+     ) x
+WHERE t6.a = x.c ORDER BY 1;
+ a | b | c | d 
+---+---+---+---
+ 1 | 2 | 1 | 2
+(1 row)
+
+CREATE TABLE t7 (f1 integer, f2 integer, f3 float);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO t7 VALUES (1, 2, 3);
+INSERT INTO t7 VALUES (2, 3, 4);
+INSERT INTO t7 VALUES (3, 4, 5);
+INSERT INTO t7 VALUES (1, 1, 1);
+INSERT INTO t7 VALUES (2, 2, 2);
+INSERT INTO t7 VALUES (3, 3, 3);
+INSERT INTO t7 VALUES (6, 7, 8);
+INSERT INTO t7 VALUES (8, 9, NULL);
+-- inlined CTEs should used the origin cexpression with recreated
+explain (verbose, costs off)
+with x as (select * from (select f1 from t7) ss)
+select * from x where f1 = 1;
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   Output: f1
+   ->  Seq Scan on cte_prune.t7
+         Output: f1
+         Filter: (t7.f1 = 1)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(7 rows)
+
+with x as (select * from (select f1 from t7) ss)
+select * from x where f1 = 1;
+ f1 
+----
+  1
+  1
+(2 rows)
+
+-- start_ignore
+drop table t5;
+drop table t6;
+drop table t7;
+drop schema cte_prune cascade;
+NOTICE:  drop cascades to 2 other objects
+DETAIL:  drop cascades to table t3
+drop cascades to table t4
+-- end_ignore
diff --git a/src/test/regress/expected/dedupset.out b/src/test/regress/expected/dedupset.out
new file mode 100644
index 00000000000..bcf9b7f1123
--- /dev/null
+++ b/src/test/regress/expected/dedupset.out
@@ -0,0 +1,1936 @@
+SET optimizer_trace_fallback = on;
+-- start_ignore
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+drop table if exists pt1;
+drop table if exists pt2;
+-- end_ignore
+create table t1(v1 int, v2 int);
+create table t2(v3 int, v4 int);
+create table t3(v5 int, v6 int);
+insert into t1 values(generate_series(1, 100), generate_series(1, 100));
+insert into t2 values(generate_series(1, 100), generate_series(1, 100));
+insert into t3 values(generate_series(1, 100), generate_series(1, 100));
+CREATE TABLE pt1 (
+    v1 INT,
+    v2 INT
+) PARTITION BY RANGE (v1);
+CREATE TABLE pt1_p1 PARTITION OF pt1 FOR VALUES FROM (0) TO (20);
+CREATE TABLE pt1_p2 PARTITION OF pt1 FOR VALUES FROM (20) TO (40);
+CREATE TABLE pt1_p3 PARTITION OF pt1 FOR VALUES FROM (40) TO (60);
+CREATE TABLE pt1_p4 PARTITION OF pt1 FOR VALUES FROM (60) TO (400);
+CREATE TABLE pt2 (
+    v3 INT,
+    v4 INT
+) PARTITION BY RANGE (v3);
+CREATE TABLE pt2_p1 PARTITION OF pt2 FOR VALUES FROM (0) TO (20);
+CREATE TABLE pt2_p2 PARTITION OF pt2 FOR VALUES FROM (20) TO (40);
+CREATE TABLE pt2_p3 PARTITION OF pt2 FOR VALUES FROM (40) TO (60);
+CREATE TABLE pt2_p4 PARTITION OF pt2 FOR VALUES FROM (60) TO (400);
+insert into pt1 values(generate_series(1, 100), generate_series(1, 100));
+insert into pt2 values(generate_series(1, 100), generate_series(1, 100));
+analyze t1;
+analyze t2;
+analyze t3;
+analyze pt1;
+analyze pt2;
+-- dedup the subquery with projection
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.90..4.39 rows=3 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=2.90..4.35 rows=1 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2_1.v3)
+         ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=12)
+               Output: t1.v1, t1.v2, t2.v3
+               Hash Cond: (t1.v1 = t2.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+                     Output: t1.v1, t1.v2
+                     Filter: (t1.v1 < 10)
+               ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                     Output: t2.v3
+                     ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                           Output: t2.v3
+                           Filter: (t2.v3 < 10)
+         ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                     Output: t2_1.v3
+                     Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10) and v1 in (select v3 from t2); -- change the order 
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.90..4.39 rows=3 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=2.90..4.35 rows=1 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2_1.v3)
+         ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=12)
+               Output: t1.v1, t1.v2, t2.v3
+               Hash Cond: (t1.v1 = t2.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+                     Output: t1.v1, t1.v2
+                     Filter: (t1.v1 < 10)
+               ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                     Output: t2.v3
+                     ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                           Output: t2.v3
+                           Filter: (t2.v3 < 10)
+         ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                     Output: t2_1.v3
+                     Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10);
+                                 QUERY PLAN                                 
+----------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.45..2.93 rows=3 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+               Output: t1.v1, t1.v2
+               Filter: (t1.v1 < 10)
+         ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                     Output: t2.v3
+                     Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  1 |  1
+  5 |  5
+  6 |  6
+  9 |  9
+(9 rows)
+
+select * from t1 where v1 in (select v3 from t2 where v3 < 10);
+ v1 | v2 
+----+----
+  1 |  1
+  5 |  5
+  6 |  6
+  9 |  9
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+(9 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2 where v3 < 10);
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.23..3.50 rows=8 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=2.23..3.39 rows=3 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2_1.v3)
+         ->  Hash Semi Join  (cost=1.11..2.23 rows=3 width=12)
+               Output: pt1.v1, pt1.v2, pt2.v3
+               Hash Cond: (pt1.v1 = pt2.v3)
+               ->  Seq Scan on public.pt1_p1 pt1  (cost=0.00..1.08 rows=3 width=8)
+                     Output: pt1.v1, pt1.v2
+                     Filter: (pt1.v1 < 10)
+               ->  Hash  (cost=1.08..1.08 rows=3 width=4)
+                     Output: pt2.v3
+                     ->  Partition Selector (selector id: $0)  (cost=0.00..1.08 rows=3 width=4)
+                           Output: pt2.v3
+                           ->  Seq Scan on public.pt2_p1 pt2  (cost=0.00..1.08 rows=3 width=4)
+                                 Output: pt2.v3
+                                 Filter: (pt2.v3 < 10)
+         ->  Hash  (cost=1.08..1.08 rows=3 width=4)
+               Output: pt2_1.v3
+               ->  Partition Selector (selector id: $1)  (cost=0.00..1.08 rows=3 width=4)
+                     Output: pt2_1.v3
+                     ->  Seq Scan on public.pt2_p1 pt2_1  (cost=0.00..1.08 rows=3 width=4)
+                           Output: pt2_1.v3
+                           Filter: (pt2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(27 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2 where v3 < 10);
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.11..2.35 rows=8 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=1.11..2.23 rows=3 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Seq Scan on public.pt1_p1 pt1  (cost=0.00..1.08 rows=3 width=8)
+               Output: pt1.v1, pt1.v2
+               Filter: (pt1.v1 < 10)
+         ->  Hash  (cost=1.08..1.08 rows=3 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..1.08 rows=3 width=4)
+                     Output: pt2.v3
+                     ->  Seq Scan on public.pt2_p1 pt2  (cost=0.00..1.08 rows=3 width=4)
+                           Output: pt2.v3
+                           Filter: (pt2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(17 rows)
+
+select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2 where v3 < 10);
+ v1 | v2 
+----+----
+  1 |  1
+  5 |  5
+  6 |  6
+  9 |  9
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+(9 rows)
+
+select * from pt1 where v1 in (select v3 from pt2 where v3 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  5 |  5
+  6 |  6
+  9 |  9
+  1 |  1
+(9 rows)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+                                                              QUERY PLAN                                                              
+--------------------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=10000000015.48..10000000015.49 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000015.43..10000000015.48 rows=3 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=10000000015.43..10000000015.44 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Nested Loop  (cost=10000000004.85..10000000014.75 rows=270 width=0)
+                     ->  Result  (cost=4.85..4.86 rows=3 width=0)
+                           ->  Unique  (cost=4.85..4.86 rows=3 width=0)
+                                 Output: (RowIdExpr)
+                                 Group Key: (RowIdExpr)
+                                 ->  Sort  (cost=4.85..4.86 rows=3 width=0)
+                                       Output: (RowIdExpr)
+                                       Sort Key: (RowIdExpr)
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.96..4.83 rows=3 width=0)
+                                             Output: (RowIdExpr)
+                                             Hash Key: (RowIdExpr)
+                                             ->  Hash Join  (cost=2.96..4.78 rows=3 width=0)
+                                                   Output: (RowIdExpr)
+                                                   Hash Cond: (t2_1.v3 = t1.v1)
+                                                   ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                                         Output: t2_1.v3
+                                                   ->  Hash  (cost=2.93..2.93 rows=3 width=8)
+                                                         Output: t1.v1, t2_2.v3, (RowIdExpr)
+                                                         ->  Hash Semi Join  (cost=1.48..2.93 rows=3 width=8)
+                                                               Output: t1.v1, t2_2.v3, RowIdExpr
+                                                               Hash Cond: (t1.v1 = t2_2.v3)
+                                                               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                                                                     Output: t1.v1, t1.v2
+                                                               ->  Hash  (cost=1.44..1.44 rows=3 width=4)
+                                                                     Output: t2_2.v3
+                                                                     ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.42 rows=3 width=4)
+                                                                           Output: t2_2.v3
+                                                                           Filter: (t2_2.v3 < 10)
+                     ->  Materialize  (cost=0.00..3.17 rows=100 width=0)
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.67 rows=100 width=0)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=0)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(39 rows)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1 where v3 < 10);
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=10000000013.55..10000000013.56 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000013.49..10000000013.54 rows=3 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=10000000013.49..10000000013.50 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Nested Loop  (cost=10000000001.48..10000000012.81 rows=270 width=0)
+                     ->  Hash Semi Join  (cost=1.48..2.93 rows=3 width=0)
+                           Hash Cond: (t1.v1 = t2_1.v3)
+                           ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t1.v1, t1.v2
+                           ->  Hash  (cost=1.44..1.44 rows=3 width=4)
+                                 Output: t2_1.v3
+                                 ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                                       Output: t2_1.v3
+                                       Filter: (t2_1.v3 < 10)
+                     ->  Materialize  (cost=0.00..3.17 rows=100 width=0)
+                           ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=0)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=0)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+ count 
+-------
+   900
+(1 row)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1 where v3 < 10);
+ count 
+-------
+   900
+(1 row)
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+                                                              QUERY PLAN                                                              
+--------------------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=10000000015.48..10000000015.49 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000015.43..10000000015.48 rows=3 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=10000000015.43..10000000015.44 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Nested Loop  (cost=10000000004.85..10000000014.75 rows=270 width=0)
+                     ->  Result  (cost=4.85..4.86 rows=3 width=0)
+                           ->  Unique  (cost=4.85..4.86 rows=3 width=0)
+                                 Output: (RowIdExpr)
+                                 Group Key: (RowIdExpr)
+                                 ->  Sort  (cost=4.85..4.86 rows=3 width=0)
+                                       Output: (RowIdExpr)
+                                       Sort Key: (RowIdExpr)
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.96..4.83 rows=3 width=0)
+                                             Output: (RowIdExpr)
+                                             Hash Key: (RowIdExpr)
+                                             ->  Hash Join  (cost=2.96..4.78 rows=3 width=0)
+                                                   Output: (RowIdExpr)
+                                                   Hash Cond: (t2_1.v3 = t1.v1)
+                                                   ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                                         Output: t2_1.v3
+                                                   ->  Hash  (cost=2.93..2.93 rows=3 width=8)
+                                                         Output: t1.v1, t2_2.v3, (RowIdExpr)
+                                                         ->  Hash Semi Join  (cost=1.48..2.93 rows=3 width=8)
+                                                               Output: t1.v1, t2_2.v3, RowIdExpr
+                                                               Hash Cond: (t1.v1 = t2_2.v3)
+                                                               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                                                                     Output: t1.v1, t1.v2
+                                                               ->  Hash  (cost=1.44..1.44 rows=3 width=4)
+                                                                     Output: t2_2.v3
+                                                                     ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.42 rows=3 width=4)
+                                                                           Output: t2_2.v3
+                                                                           Filter: (t2_2.v3 < 10)
+                     ->  Materialize  (cost=0.00..3.17 rows=100 width=0)
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.67 rows=100 width=0)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=0)
+ Settings: enable_parallel = 'off', optimizer = 'off', optimizer_cte_inlining_bound = '2'
+ Optimizer: Postgres query optimizer
+(39 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+ count 
+-------
+   900
+(1 row)
+
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Aggregate  (cost=4.40..4.41 rows=1 width=8)
+   Output: sum(t1.v1)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=2.90..4.39 rows=3 width=4)
+         Output: t1.v1
+         ->  Hash Semi Join  (cost=2.90..4.35 rows=1 width=4)
+               Output: t1.v1
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=8)
+                     Output: t1.v1, t2.v3
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=4)
+                           Output: t1.v1, t1.v2
+                           Filter: (t1.v1 < 10)
+                     ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                                 Output: t2.v3
+                                 Filter: (t2.v3 < 10)
+               ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                     Output: t2_1.v3
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                           Output: t2_1.v3
+                           Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(25 rows)
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10);
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Aggregate  (cost=2.94..2.95 rows=1 width=8)
+   Output: sum(t1.v1)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=1.45..2.93 rows=3 width=4)
+         Output: t1.v1
+         ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=4)
+               Output: t1.v1
+               Hash Cond: (t1.v1 = t2.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=4)
+                     Output: t1.v1, t1.v2
+                     Filter: (t1.v1 < 10)
+               ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                     Output: t2.v3
+                     ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                           Output: t2.v3
+                           Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(17 rows)
+
+select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+ sum 
+-----
+  45
+(1 row)
+
+select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10);
+ sum 
+-----
+  45
+(1 row)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) order by v1;
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=4.36..4.41 rows=3 width=8)
+   Output: t1.v1, t1.v2
+   Merge Key: t1.v1
+   ->  Sort  (cost=4.36..4.36 rows=1 width=8)
+         Output: t1.v1, t1.v2
+         Sort Key: t1.v1
+         ->  Hash Semi Join  (cost=2.90..4.35 rows=1 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=12)
+                     Output: t1.v1, t1.v2, t2.v3
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+                           Output: t1.v1, t1.v2
+                           Filter: (t1.v1 < 10)
+                     ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                                 Output: t2.v3
+                                 Filter: (t2.v3 < 10)
+               ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                     Output: t2_1.v3
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                           Output: t2_1.v3
+                           Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(27 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10) order by v1;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.90..2.94 rows=3 width=8)
+   Output: t1.v1, t1.v2
+   Merge Key: t1.v1
+   ->  Sort  (cost=2.90..2.90 rows=1 width=8)
+         Output: t1.v1, t1.v2
+         Sort Key: t1.v1
+         ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+                     Output: t1.v1, t1.v2
+                     Filter: (t1.v1 < 10)
+               ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                     Output: t2.v3
+                     ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                           Output: t2.v3
+                           Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(19 rows)
+
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) order by v1;
+ v1 | v2 
+----+----
+  1 |  1
+  2 |  2
+  3 |  3
+  4 |  4
+  5 |  5
+  6 |  6
+  7 |  7
+  8 |  8
+  9 |  9
+(9 rows)
+
+select * from t1 where v1 in (select v3 from t2 where v3 < 10) order by v1;
+ v1 | v2 
+----+----
+  1 |  1
+  2 |  2
+  3 |  3
+  4 |  4
+  5 |  5
+  6 |  6
+  7 |  7
+  8 |  8
+  9 |  9
+(9 rows)
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) group by v2;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=4.38..4.45 rows=3 width=12)
+   Output: (sum(t1.v1)), t1.v2
+   ->  GroupAggregate  (cost=4.38..4.40 rows=1 width=12)
+         Output: sum(t1.v1), t1.v2
+         Group Key: t1.v2
+         ->  Sort  (cost=4.38..4.39 rows=1 width=8)
+               Output: t1.v2, t1.v1
+               Sort Key: t1.v2
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.90..4.37 rows=1 width=8)
+                     Output: t1.v2, t1.v1
+                     Hash Key: t1.v2
+                     ->  Hash Semi Join  (cost=2.90..4.35 rows=1 width=8)
+                           Output: t1.v2, t1.v1
+                           Hash Cond: (t1.v1 = t2_1.v3)
+                           ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=12)
+                                 Output: t1.v1, t1.v2, t2.v3
+                                 Hash Cond: (t1.v1 = t2.v3)
+                                 ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+                                       Output: t1.v1, t1.v2
+                                       Filter: (t1.v1 < 10)
+                                 ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                                       Output: t2.v3
+                                       ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                                             Output: t2.v3
+                                             Filter: (t2.v3 < 10)
+                           ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                                 Output: t2_1.v3
+                                 ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                                       Output: t2_1.v3
+                                       Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(32 rows)
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10) group by v2;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=2.92..2.98 rows=3 width=12)
+   Output: (sum(t1.v1)), t1.v2
+   ->  GroupAggregate  (cost=2.92..2.94 rows=1 width=12)
+         Output: sum(t1.v1), t1.v2
+         Group Key: t1.v2
+         ->  Sort  (cost=2.92..2.92 rows=1 width=8)
+               Output: t1.v2, t1.v1
+               Sort Key: t1.v2
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.45..2.91 rows=1 width=8)
+                     Output: t1.v2, t1.v1
+                     Hash Key: t1.v2
+                     ->  Hash Semi Join  (cost=1.45..2.89 rows=1 width=8)
+                           Output: t1.v2, t1.v1
+                           Hash Cond: (t1.v1 = t2.v3)
+                           ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+                                 Output: t1.v1, t1.v2
+                                 Filter: (t1.v1 < 10)
+                           ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                                 Output: t2.v3
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.42 rows=3 width=4)
+                                       Output: t2.v3
+                                       Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(24 rows)
+
+select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) group by v2;
+ sum 
+-----
+   1
+   5
+   6
+   9
+   2
+   3
+   4
+   7
+   8
+(9 rows)
+
+select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10) group by v2;
+ sum 
+-----
+   2
+   3
+   4
+   7
+   8
+   1
+   5
+   6
+   9
+(9 rows)
+
+-- dedup the same subqueryany
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2);
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=3.50..7.08 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=3.50..5.75 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2_1.v3)
+         ->  Hash Semi Join  (cost=1.75..3.54 rows=33 width=12)
+               Output: t1.v1, t1.v2, t2.v3
+               Hash Cond: (t1.v1 = t2.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+                     Output: t2.v3
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2.v3
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(20 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2);
+                                  QUERY PLAN                                  
+------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=1.75..4.87 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=1.75..3.54 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+select count(*) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2);
+ count 
+-------
+   100
+(1 row)
+
+select count(*) from t1 where v1 in (select v3 from t2);
+ count 
+-------
+   100
+(1 row)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2);
+                                               QUERY PLAN                                               
+--------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=9.83..16.58 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=9.83..15.25 rows=33 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2_1.v3)
+         ->  Hash Semi Join  (cost=4.92..9.87 rows=33 width=12)
+               Output: pt1.v1, pt1.v2, pt2.v3
+               Hash Cond: (pt1.v1 = pt2.v3)
+               ->  Append  (cost=0.00..4.50 rows=33 width=8)
+                     Partition Selectors: $0, $1
+                     ->  Seq Scan on public.pt1_p1 pt1_1  (cost=0.00..1.06 rows=6 width=8)
+                           Output: pt1_1.v1, pt1_1.v2
+                     ->  Seq Scan on public.pt1_p2 pt1_2  (cost=0.00..1.07 rows=7 width=8)
+                           Output: pt1_2.v1, pt1_2.v2
+                     ->  Seq Scan on public.pt1_p3 pt1_3  (cost=0.00..1.07 rows=7 width=8)
+                           Output: pt1_3.v1, pt1_3.v2
+                     ->  Seq Scan on public.pt1_p4 pt1_4  (cost=0.00..1.14 rows=14 width=8)
+                           Output: pt1_4.v1, pt1_4.v2
+               ->  Hash  (cost=4.50..4.50 rows=33 width=4)
+                     Output: pt2.v3
+                     ->  Partition Selector (selector id: $0)  (cost=0.00..4.50 rows=33 width=4)
+                           Output: pt2.v3
+                           ->  Append  (cost=0.00..4.50 rows=33 width=4)
+                                 ->  Seq Scan on public.pt2_p1 pt2_2  (cost=0.00..1.06 rows=6 width=4)
+                                       Output: pt2_2.v3
+                                 ->  Seq Scan on public.pt2_p2 pt2_3  (cost=0.00..1.07 rows=7 width=4)
+                                       Output: pt2_3.v3
+                                 ->  Seq Scan on public.pt2_p3 pt2_4  (cost=0.00..1.07 rows=7 width=4)
+                                       Output: pt2_4.v3
+                                 ->  Seq Scan on public.pt2_p4 pt2_5  (cost=0.00..1.14 rows=14 width=4)
+                                       Output: pt2_5.v3
+         ->  Hash  (cost=4.50..4.50 rows=33 width=4)
+               Output: pt2_1.v3
+               ->  Partition Selector (selector id: $1)  (cost=0.00..4.50 rows=33 width=4)
+                     Output: pt2_1.v3
+                     ->  Append  (cost=0.00..4.50 rows=33 width=4)
+                           ->  Seq Scan on public.pt2_p1 pt2_6  (cost=0.00..1.06 rows=6 width=4)
+                                 Output: pt2_6.v3
+                           ->  Seq Scan on public.pt2_p2 pt2_7  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_7.v3
+                           ->  Seq Scan on public.pt2_p3 pt2_8  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_8.v3
+                           ->  Seq Scan on public.pt2_p4 pt2_9  (cost=0.00..1.14 rows=14 width=4)
+                                 Output: pt2_9.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(46 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2);
+                                            QUERY PLAN                                            
+--------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=4.92..11.21 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=4.92..9.87 rows=33 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Append  (cost=0.00..4.50 rows=33 width=8)
+               Partition Selectors: $0
+               ->  Seq Scan on public.pt1_p1 pt1_1  (cost=0.00..1.06 rows=6 width=8)
+                     Output: pt1_1.v1, pt1_1.v2
+               ->  Seq Scan on public.pt1_p2 pt1_2  (cost=0.00..1.07 rows=7 width=8)
+                     Output: pt1_2.v1, pt1_2.v2
+               ->  Seq Scan on public.pt1_p3 pt1_3  (cost=0.00..1.07 rows=7 width=8)
+                     Output: pt1_3.v1, pt1_3.v2
+               ->  Seq Scan on public.pt1_p4 pt1_4  (cost=0.00..1.14 rows=14 width=8)
+                     Output: pt1_4.v1, pt1_4.v2
+         ->  Hash  (cost=4.50..4.50 rows=33 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..4.50 rows=33 width=4)
+                     Output: pt2.v3
+                     ->  Append  (cost=0.00..4.50 rows=33 width=4)
+                           ->  Seq Scan on public.pt2_p1 pt2_1  (cost=0.00..1.06 rows=6 width=4)
+                                 Output: pt2_1.v3
+                           ->  Seq Scan on public.pt2_p2 pt2_2  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_2.v3
+                           ->  Seq Scan on public.pt2_p3 pt2_3  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_3.v3
+                           ->  Seq Scan on public.pt2_p4 pt2_4  (cost=0.00..1.14 rows=14 width=4)
+                                 Output: pt2_4.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(30 rows)
+
+select count(*) from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2);
+ count 
+-------
+   100
+(1 row)
+
+select count(*) from pt1 where v1 in (select v3 from pt2);
+ count 
+-------
+   100
+(1 row)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=10000000137.03..10000000137.04 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000136.97..10000000137.02 rows=3 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=10000000136.97..10000000136.98 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Nested Loop  (cost=10000000004.17..10000000128.64 rows=3333 width=0)
+                     ->  Hash Semi Join  (cost=4.17..6.42 rows=33 width=0)
+                           Hash Cond: (t1.v1 = t2_2.v3)
+                           ->  Hash Semi Join  (cost=2.08..3.87 rows=33 width=8)
+                                 Output: t1.v1, t2_1.v3
+                                 Hash Cond: (t1.v1 = t2_1.v3)
+                                 ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t1.v1, t1.v2
+                                 ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                                       Output: t2_1.v3
+                                       ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                             Output: t2_1.v3
+                           ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                                 Output: t2_2.v3
+                                 ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t2_2.v3
+                     ->  Materialize  (cost=0.00..3.17 rows=100 width=0)
+                           ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=0)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=0)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(27 rows)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1);
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=10000000102.06..10000000102.07 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000102.00..10000000102.05 rows=3 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=10000000102.00..10000000102.01 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Hash Semi Join  (cost=10000000002.08..10000000093.67 rows=3333 width=0)
+                     Hash Cond: (t1.v1 = t2_1.v3)
+                     ->  Nested Loop  (cost=10000000000.00..10000000045.75 rows=3333 width=4)
+                           Output: t1.v1
+                           ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=0)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=0)
+                           ->  Materialize  (cost=0.00..1.50 rows=33 width=4)
+                                 Output: t1.v1
+                                 ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t1.v1
+                     ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                           Output: t2_1.v3
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(22 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+ count 
+-------
+ 10000
+(1 row)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1);
+ count 
+-------
+ 10000
+(1 row)
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=10000000137.03..10000000137.04 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000136.97..10000000137.02 rows=3 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=10000000136.97..10000000136.98 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Nested Loop  (cost=10000000004.17..10000000128.64 rows=3333 width=0)
+                     ->  Hash Semi Join  (cost=4.17..6.42 rows=33 width=0)
+                           Hash Cond: (t1.v1 = t2_2.v3)
+                           ->  Hash Semi Join  (cost=2.08..3.87 rows=33 width=8)
+                                 Output: t1.v1, t2_1.v3
+                                 Hash Cond: (t1.v1 = t2_1.v3)
+                                 ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t1.v1, t1.v2
+                                 ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                                       Output: t2_1.v3
+                                       ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                             Output: t2_1.v3
+                           ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                                 Output: t2_2.v3
+                                 ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t2_2.v3
+                     ->  Materialize  (cost=0.00..3.17 rows=100 width=0)
+                           ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=0)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=0)
+ Settings: enable_parallel = 'off', optimizer = 'off', optimizer_cte_inlining_bound = '2'
+ Optimizer: Postgres query optimizer
+(27 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+ count 
+-------
+ 10000
+(1 row)
+
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+-- dedup the subquery with inner join
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6);
+                                                         QUERY PLAN                                                          
+-----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=7.71..11.29 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=7.71..9.96 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Hash Semi Join  (cost=5.96..7.75 rows=33 width=12)
+               Output: t1.v1, t1.v2, t2_1.v3
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=5.54..5.54 rows=33 width=4)
+                     Output: t2_1.v3
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.42..5.54 rows=33 width=4)
+                           Output: t2_1.v3
+                           Hash Key: t2_1.v3
+                           ->  Hash Join  (cost=2.42..4.88 rows=33 width=4)
+                                 Output: t2_1.v3
+                                 Hash Cond: (t2_1.v4 = t3.v6)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.00 rows=33 width=8)
+                                       Output: t2_1.v4, t2_1.v3
+                                       Hash Key: t2_1.v4
+                                       ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=8)
+                                             Output: t2_1.v4, t2_1.v3
+                                 ->  Hash  (cost=2.00..2.00 rows=33 width=4)
+                                       Output: t3.v6
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.00 rows=33 width=4)
+                                             Output: t3.v6
+                                             Hash Key: t3.v6
+                                             ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                                   Output: t3.v6
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(36 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t3,t2 where v4=v6); -- change the join order,different index in inner join
+                                                         QUERY PLAN                                                          
+-----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=7.71..11.29 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=7.71..9.96 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Hash Semi Join  (cost=5.96..7.75 rows=33 width=12)
+               Output: t1.v1, t1.v2, t2_1.v3
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=5.54..5.54 rows=33 width=4)
+                     Output: t2_1.v3
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.42..5.54 rows=33 width=4)
+                           Output: t2_1.v3
+                           Hash Key: t2_1.v3
+                           ->  Hash Join  (cost=2.42..4.88 rows=33 width=4)
+                                 Output: t2_1.v3
+                                 Hash Cond: (t3.v6 = t2_1.v4)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.00 rows=33 width=4)
+                                       Output: t3.v6
+                                       Hash Key: t3.v6
+                                       ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                             Output: t3.v6
+                                 ->  Hash  (cost=2.00..2.00 rows=33 width=8)
+                                       Output: t2_1.v4, t2_1.v3
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.00 rows=33 width=8)
+                                             Output: t2_1.v4, t2_1.v3
+                                             Hash Key: t2_1.v4
+                                             ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=8)
+                                                   Output: t2_1.v4, t2_1.v3
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(36 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2,t3 where v4=v6);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=5.96..9.08 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=5.96..7.75 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=5.54..5.54 rows=33 width=4)
+               Output: t2.v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.42..5.54 rows=33 width=4)
+                     Output: t2.v3
+                     Hash Key: t2.v3
+                     ->  Hash Join  (cost=2.42..4.88 rows=33 width=4)
+                           Output: t2.v3
+                           Hash Cond: (t2.v4 = t3.v6)
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.00 rows=33 width=8)
+                                 Output: t2.v4, t2.v3
+                                 Hash Key: t2.v4
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=8)
+                                       Output: t2.v4, t2.v3
+                           ->  Hash  (cost=2.00..2.00 rows=33 width=4)
+                                 Output: t3.v6
+                                 ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.00 rows=33 width=4)
+                                       Output: t3.v6
+                                       Hash Key: t3.v6
+                                       ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                             Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(29 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+                                                                        QUERY PLAN                                                                        
+----------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=6.04..6.14 rows=7 width=8)
+   Output: t1.v1, t1.v2
+   ->  Result  (cost=6.04..6.05 rows=2 width=8)
+         Output: t1.v1, t1.v2
+         ->  Unique  (cost=6.04..6.05 rows=2 width=8)
+               Output: t1.v1, t1.v2, (RowIdExpr)
+               Group Key: (RowIdExpr)
+               ->  Sort  (cost=6.04..6.04 rows=2 width=8)
+                     Output: t1.v1, t1.v2, (RowIdExpr)
+                     Sort Key: (RowIdExpr)
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=4.50..6.02 rows=2 width=8)
+                           Output: t1.v1, t1.v2, (RowIdExpr)
+                           Hash Key: (RowIdExpr)
+                           ->  Hash Join  (cost=4.50..5.98 rows=2 width=8)
+                                 Output: t1.v1, t1.v2, (RowIdExpr)
+                                 Hash Cond: (t2.v3 = t1.v1)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t2.v3, t2.v4
+                                 ->  Hash  (cost=4.47..4.47 rows=2 width=12)
+                                       Output: t1.v1, t1.v2, t2_1.v3, (RowIdExpr)
+                                       ->  Hash Semi Join  (cost=3.03..4.47 rows=2 width=12)
+                                             Output: t1.v1, t1.v2, t2_1.v3, RowIdExpr
+                                             Hash Cond: (t1.v1 = t2_1.v3)
+                                             ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                                                   Output: t1.v1, t1.v2
+                                             ->  Hash  (cost=3.01..3.01 rows=1 width=4)
+                                                   Output: t2_1.v3
+                                                   ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=1.50..3.01 rows=1 width=4)
+                                                         Output: t2_1.v3
+                                                         Hash Key: t2_1.v3
+                                                         ->  Hash Join  (cost=1.50..2.99 rows=1 width=4)
+                                                               Output: t2_1.v3
+                                                               Hash Cond: (t2_1.v4 = t3.v6)
+                                                               ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..1.47 rows=3 width=8)
+                                                                     Output: t2_1.v4, t2_1.v3
+                                                                     Hash Key: t2_1.v4
+                                                                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=8)
+                                                                           Output: t2_1.v4, t2_1.v3
+                                                                           Filter: (t2_1.v4 < 10)
+                                                               ->  Hash  (cost=1.47..1.47 rows=3 width=4)
+                                                                     Output: t3.v6
+                                                                     ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=0.00..1.47 rows=3 width=4)
+                                                                           Output: t3.v6
+                                                                           Hash Key: t3.v6
+                                                                           ->  Seq Scan on public.t3  (cost=0.00..1.42 rows=3 width=4)
+                                                                                 Output: t3.v6
+                                                                                 Filter: (t3.v6 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(49 rows)
+
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  9 |  9
+  8 |  8
+  6 |  6
+  7 |  7
+  1 |  1
+  5 |  5
+(9 rows)
+
+select * from t1 where v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  5 |  5
+  6 |  6
+  9 |  9
+  1 |  1
+(9 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6);
+                                                            QUERY PLAN                                                             
+-----------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=14.04..20.79 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=14.04..19.46 rows=33 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Hash Semi Join  (cost=9.12..14.08 rows=33 width=12)
+               Output: pt1.v1, pt1.v2, pt2_1.v3
+               Hash Cond: (pt1.v1 = pt2_1.v3)
+               ->  Append  (cost=0.00..4.50 rows=33 width=8)
+                     Partition Selectors: $0, $1
+                     ->  Seq Scan on public.pt1_p1 pt1_1  (cost=0.00..1.06 rows=6 width=8)
+                           Output: pt1_1.v1, pt1_1.v2
+                     ->  Seq Scan on public.pt1_p2 pt1_2  (cost=0.00..1.07 rows=7 width=8)
+                           Output: pt1_2.v1, pt1_2.v2
+                     ->  Seq Scan on public.pt1_p3 pt1_3  (cost=0.00..1.07 rows=7 width=8)
+                           Output: pt1_3.v1, pt1_3.v2
+                     ->  Seq Scan on public.pt1_p4 pt1_4  (cost=0.00..1.14 rows=14 width=8)
+                           Output: pt1_4.v1, pt1_4.v2
+               ->  Hash  (cost=8.71..8.71 rows=33 width=4)
+                     Output: pt2_1.v3
+                     ->  Partition Selector (selector id: $0)  (cost=2.42..8.71 rows=33 width=4)
+                           Output: pt2_1.v3
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.42..8.71 rows=33 width=4)
+                                 Output: pt2_1.v3
+                                 Hash Key: pt2_1.v3
+                                 ->  Hash Join  (cost=2.42..8.04 rows=33 width=4)
+                                       Output: pt2_1.v3
+                                       Hash Cond: (pt2_1.v4 = t3.v6)
+                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..5.17 rows=33 width=8)
+                                             Output: pt2_1.v4, pt2_1.v3
+                                             Hash Key: pt2_1.v4
+                                             ->  Append  (cost=0.00..4.50 rows=33 width=8)
+                                                   ->  Seq Scan on public.pt2_p1 pt2_6  (cost=0.00..1.06 rows=6 width=8)
+                                                         Output: pt2_6.v4, pt2_6.v3
+                                                   ->  Seq Scan on public.pt2_p2 pt2_7  (cost=0.00..1.07 rows=7 width=8)
+                                                         Output: pt2_7.v4, pt2_7.v3
+                                                   ->  Seq Scan on public.pt2_p3 pt2_8  (cost=0.00..1.07 rows=7 width=8)
+                                                         Output: pt2_8.v4, pt2_8.v3
+                                                   ->  Seq Scan on public.pt2_p4 pt2_9  (cost=0.00..1.14 rows=14 width=8)
+                                                         Output: pt2_9.v4, pt2_9.v3
+                                       ->  Hash  (cost=2.00..2.00 rows=33 width=4)
+                                             Output: t3.v6
+                                             ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.00 rows=33 width=4)
+                                                   Output: t3.v6
+                                                   Hash Key: t3.v6
+                                                   ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                                         Output: t3.v6
+         ->  Hash  (cost=4.50..4.50 rows=33 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $1)  (cost=0.00..4.50 rows=33 width=4)
+                     Output: pt2.v3
+                     ->  Append  (cost=0.00..4.50 rows=33 width=4)
+                           ->  Seq Scan on public.pt2_p1 pt2_2  (cost=0.00..1.06 rows=6 width=4)
+                                 Output: pt2_2.v3
+                           ->  Seq Scan on public.pt2_p2 pt2_3  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_3.v3
+                           ->  Seq Scan on public.pt2_p3 pt2_4  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_4.v3
+                           ->  Seq Scan on public.pt2_p4 pt2_5  (cost=0.00..1.14 rows=14 width=4)
+                                 Output: pt2_5.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(62 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from t3,pt2 where v4=v6);
+                                                            QUERY PLAN                                                             
+-----------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=14.04..20.79 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=14.04..19.46 rows=33 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Hash Semi Join  (cost=9.12..14.08 rows=33 width=12)
+               Output: pt1.v1, pt1.v2, pt2_1.v3
+               Hash Cond: (pt1.v1 = pt2_1.v3)
+               ->  Append  (cost=0.00..4.50 rows=33 width=8)
+                     Partition Selectors: $0, $1
+                     ->  Seq Scan on public.pt1_p1 pt1_1  (cost=0.00..1.06 rows=6 width=8)
+                           Output: pt1_1.v1, pt1_1.v2
+                     ->  Seq Scan on public.pt1_p2 pt1_2  (cost=0.00..1.07 rows=7 width=8)
+                           Output: pt1_2.v1, pt1_2.v2
+                     ->  Seq Scan on public.pt1_p3 pt1_3  (cost=0.00..1.07 rows=7 width=8)
+                           Output: pt1_3.v1, pt1_3.v2
+                     ->  Seq Scan on public.pt1_p4 pt1_4  (cost=0.00..1.14 rows=14 width=8)
+                           Output: pt1_4.v1, pt1_4.v2
+               ->  Hash  (cost=8.71..8.71 rows=33 width=4)
+                     Output: pt2_1.v3
+                     ->  Partition Selector (selector id: $0)  (cost=2.42..8.71 rows=33 width=4)
+                           Output: pt2_1.v3
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.42..8.71 rows=33 width=4)
+                                 Output: pt2_1.v3
+                                 Hash Key: pt2_1.v3
+                                 ->  Hash Join  (cost=2.42..8.04 rows=33 width=4)
+                                       Output: pt2_1.v3
+                                       Hash Cond: (pt2_1.v4 = t3.v6)
+                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..5.17 rows=33 width=8)
+                                             Output: pt2_1.v4, pt2_1.v3
+                                             Hash Key: pt2_1.v4
+                                             ->  Append  (cost=0.00..4.50 rows=33 width=8)
+                                                   ->  Seq Scan on public.pt2_p1 pt2_6  (cost=0.00..1.06 rows=6 width=8)
+                                                         Output: pt2_6.v4, pt2_6.v3
+                                                   ->  Seq Scan on public.pt2_p2 pt2_7  (cost=0.00..1.07 rows=7 width=8)
+                                                         Output: pt2_7.v4, pt2_7.v3
+                                                   ->  Seq Scan on public.pt2_p3 pt2_8  (cost=0.00..1.07 rows=7 width=8)
+                                                         Output: pt2_8.v4, pt2_8.v3
+                                                   ->  Seq Scan on public.pt2_p4 pt2_9  (cost=0.00..1.14 rows=14 width=8)
+                                                         Output: pt2_9.v4, pt2_9.v3
+                                       ->  Hash  (cost=2.00..2.00 rows=33 width=4)
+                                             Output: t3.v6
+                                             ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.00 rows=33 width=4)
+                                                   Output: t3.v6
+                                                   Hash Key: t3.v6
+                                                   ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                                         Output: t3.v6
+         ->  Hash  (cost=4.50..4.50 rows=33 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $1)  (cost=0.00..4.50 rows=33 width=4)
+                     Output: pt2.v3
+                     ->  Append  (cost=0.00..4.50 rows=33 width=4)
+                           ->  Seq Scan on public.pt2_p1 pt2_2  (cost=0.00..1.06 rows=6 width=4)
+                                 Output: pt2_2.v3
+                           ->  Seq Scan on public.pt2_p2 pt2_3  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_3.v3
+                           ->  Seq Scan on public.pt2_p3 pt2_4  (cost=0.00..1.07 rows=7 width=4)
+                                 Output: pt2_4.v3
+                           ->  Seq Scan on public.pt2_p4 pt2_5  (cost=0.00..1.14 rows=14 width=4)
+                                 Output: pt2_5.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(62 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2,t3 where v4=v6);
+                                                         QUERY PLAN                                                          
+-----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=9.12..15.42 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=9.12..14.08 rows=33 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Append  (cost=0.00..4.50 rows=33 width=8)
+               Partition Selectors: $0
+               ->  Seq Scan on public.pt1_p1 pt1_1  (cost=0.00..1.06 rows=6 width=8)
+                     Output: pt1_1.v1, pt1_1.v2
+               ->  Seq Scan on public.pt1_p2 pt1_2  (cost=0.00..1.07 rows=7 width=8)
+                     Output: pt1_2.v1, pt1_2.v2
+               ->  Seq Scan on public.pt1_p3 pt1_3  (cost=0.00..1.07 rows=7 width=8)
+                     Output: pt1_3.v1, pt1_3.v2
+               ->  Seq Scan on public.pt1_p4 pt1_4  (cost=0.00..1.14 rows=14 width=8)
+                     Output: pt1_4.v1, pt1_4.v2
+         ->  Hash  (cost=8.71..8.71 rows=33 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=2.42..8.71 rows=33 width=4)
+                     Output: pt2.v3
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.42..8.71 rows=33 width=4)
+                           Output: pt2.v3
+                           Hash Key: pt2.v3
+                           ->  Hash Join  (cost=2.42..8.04 rows=33 width=4)
+                                 Output: pt2.v3
+                                 Hash Cond: (pt2.v4 = t3.v6)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..5.17 rows=33 width=8)
+                                       Output: pt2.v4, pt2.v3
+                                       Hash Key: pt2.v4
+                                       ->  Append  (cost=0.00..4.50 rows=33 width=8)
+                                             ->  Seq Scan on public.pt2_p1 pt2_1  (cost=0.00..1.06 rows=6 width=8)
+                                                   Output: pt2_1.v4, pt2_1.v3
+                                             ->  Seq Scan on public.pt2_p2 pt2_2  (cost=0.00..1.07 rows=7 width=8)
+                                                   Output: pt2_2.v4, pt2_2.v3
+                                             ->  Seq Scan on public.pt2_p3 pt2_3  (cost=0.00..1.07 rows=7 width=8)
+                                                   Output: pt2_3.v4, pt2_3.v3
+                                             ->  Seq Scan on public.pt2_p4 pt2_4  (cost=0.00..1.14 rows=14 width=8)
+                                                   Output: pt2_4.v4, pt2_4.v3
+                                 ->  Hash  (cost=2.00..2.00 rows=33 width=4)
+                                       Output: t3.v6
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.00 rows=33 width=4)
+                                             Output: t3.v6
+                                             Hash Key: t3.v6
+                                             ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                                   Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(46 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+                                                                         QUERY PLAN                                                                          
+-------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=15.46..15.56 rows=7 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Result  (cost=15.46..15.47 rows=2 width=8)
+         Output: pt1.v1, pt1.v2
+         ->  Unique  (cost=15.46..15.47 rows=2 width=8)
+               Output: pt1.v1, pt1.v2, (RowIdExpr)
+               Group Key: (RowIdExpr)
+               ->  Sort  (cost=15.46..15.47 rows=2 width=8)
+                     Output: pt1.v1, pt1.v2, (RowIdExpr)
+                     Sort Key: (RowIdExpr)
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=10.76..15.45 rows=2 width=8)
+                           Output: pt1.v1, pt1.v2, (RowIdExpr)
+                           Hash Key: (RowIdExpr)
+                           ->  Hash Join  (cost=10.76..15.40 rows=2 width=8)
+                                 Output: pt1.v1, pt1.v2, (RowIdExpr)
+                                 Hash Cond: (pt2.v3 = pt1.v1)
+                                 ->  Append  (cost=0.00..4.50 rows=33 width=4)
+                                       Partition Selectors: $0
+                                       ->  Seq Scan on public.pt2_p1 pt2_2  (cost=0.00..1.06 rows=6 width=4)
+                                             Output: pt2_2.v3
+                                       ->  Seq Scan on public.pt2_p2 pt2_3  (cost=0.00..1.07 rows=7 width=4)
+                                             Output: pt2_3.v3
+                                       ->  Seq Scan on public.pt2_p3 pt2_4  (cost=0.00..1.07 rows=7 width=4)
+                                             Output: pt2_4.v3
+                                       ->  Seq Scan on public.pt2_p4 pt2_5  (cost=0.00..1.14 rows=14 width=4)
+                                             Output: pt2_5.v3
+                                 ->  Hash  (cost=10.73..10.73 rows=2 width=12)
+                                       Output: pt1.v1, pt1.v2, pt2_1.v3, (RowIdExpr)
+                                       ->  Partition Selector (selector id: $0)  (cost=6.12..10.73 rows=2 width=12)
+                                             Output: pt1.v1, pt1.v2, pt2_1.v3, (RowIdExpr)
+                                             ->  Hash Semi Join  (cost=6.12..10.73 rows=2 width=12)
+                                                   Output: pt1.v1, pt1.v2, pt2_1.v3, RowIdExpr
+                                                   Hash Cond: (pt1.v1 = pt2_1.v3)
+                                                   ->  Append  (cost=0.00..4.50 rows=33 width=8)
+                                                         Partition Selectors: $1
+                                                         ->  Seq Scan on public.pt1_p1 pt1_1  (cost=0.00..1.06 rows=6 width=8)
+                                                               Output: pt1_1.v1, pt1_1.v2
+                                                         ->  Seq Scan on public.pt1_p2 pt1_2  (cost=0.00..1.07 rows=7 width=8)
+                                                               Output: pt1_2.v1, pt1_2.v2
+                                                         ->  Seq Scan on public.pt1_p3 pt1_3  (cost=0.00..1.07 rows=7 width=8)
+                                                               Output: pt1_3.v1, pt1_3.v2
+                                                         ->  Seq Scan on public.pt1_p4 pt1_4  (cost=0.00..1.14 rows=14 width=8)
+                                                               Output: pt1_4.v1, pt1_4.v2
+                                                   ->  Hash  (cost=6.11..6.11 rows=1 width=4)
+                                                         Output: pt2_1.v3
+                                                         ->  Partition Selector (selector id: $1)  (cost=1.63..6.11 rows=1 width=4)
+                                                               Output: pt2_1.v3
+                                                               ->  Hash Join  (cost=1.63..6.11 rows=1 width=4)
+                                                                     Output: pt2_1.v3
+                                                                     Hash Cond: (pt2_1.v4 = t3.v6)
+                                                                     ->  Append  (cost=0.00..4.45 rows=6 width=8)
+                                                                           ->  Seq Scan on public.pt2_p1 pt2_6  (cost=0.00..1.08 rows=3 width=8)
+                                                                                 Output: pt2_6.v4, pt2_6.v3
+                                                                                 Filter: (pt2_6.v4 < 10)
+                                                                           ->  Seq Scan on public.pt2_p2 pt2_7  (cost=0.00..1.08 rows=1 width=8)
+                                                                                 Output: pt2_7.v4, pt2_7.v3
+                                                                                 Filter: (pt2_7.v4 < 10)
+                                                                           ->  Seq Scan on public.pt2_p3 pt2_8  (cost=0.00..1.08 rows=1 width=8)
+                                                                                 Output: pt2_8.v4, pt2_8.v3
+                                                                                 Filter: (pt2_8.v4 < 10)
+                                                                           ->  Seq Scan on public.pt2_p4 pt2_9  (cost=0.00..1.17 rows=1 width=8)
+                                                                                 Output: pt2_9.v4, pt2_9.v3
+                                                                                 Filter: (pt2_9.v4 < 10)
+                                                                     ->  Hash  (cost=1.52..1.52 rows=8 width=4)
+                                                                           Output: t3.v6
+                                                                           ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..1.52 rows=8 width=4)
+                                                                                 Output: t3.v6
+                                                                                 ->  Seq Scan on public.t3  (cost=0.00..1.42 rows=3 width=4)
+                                                                                       Output: t3.v6
+                                                                                       Filter: (t3.v6 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(72 rows)
+
+select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  9 |  9
+  8 |  8
+  6 |  6
+  7 |  7
+  1 |  1
+  5 |  5
+(9 rows)
+
+select * from pt1 where v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  5 |  5
+  6 |  6
+  9 |  9
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  1 |  1
+(9 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000002.08..10000000192.76 rows=5000 width=16)
+   Output: t1.v1, t1.v2, t2.v3, t2.v4
+   ->  Nested Loop  (cost=10000000002.08..10000000126.10 rows=1667 width=16)
+         Output: t1.v1, t1.v2, t2.v3, t2.v4
+         Join Filter: (SubPlan 1)
+         ->  Hash Semi Join  (cost=2.08..3.87 rows=33 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                     Output: t2_1.v3
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2_1.v3
+         ->  Materialize  (cost=0.00..3.17 rows=100 width=8)
+               Output: t2.v3, t2.v4
+               ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=8)
+                     Output: t2.v3, t2.v4
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=8)
+                           Output: t2.v3, t2.v4
+         SubPlan 1
+           ->  Nested Loop  (cost=10000000000.00..10000000132.58 rows=10000 width=4)
+                 Output: t2_2.v3
+                 ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                       Output: t2_2.v3
+                       ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                             Output: t2_2.v3
+                             ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.33 rows=33 width=4)
+                                   Output: t2_2.v3
+                 ->  Materialize  (cost=0.00..4.67 rows=100 width=4)
+                       Output: t3.v6
+                       ->  Result  (cost=0.00..4.17 rows=100 width=4)
+                             Output: t3.v6
+                             Filter: (t2.v4 = t3.v6)
+                             ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                                   Output: t3.v6
+                                   ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                         Output: t3.v6
+                                         ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                               Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(42 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from t3,cte1 where v4=v6);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000002.08..10000000192.76 rows=5000 width=16)
+   Output: t1.v1, t1.v2, t2.v3, t2.v4
+   ->  Nested Loop  (cost=10000000002.08..10000000126.10 rows=1667 width=16)
+         Output: t1.v1, t1.v2, t2.v3, t2.v4
+         Join Filter: (SubPlan 1)
+         ->  Hash Semi Join  (cost=2.08..3.87 rows=33 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                     Output: t2_1.v3
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2_1.v3
+         ->  Materialize  (cost=0.00..3.17 rows=100 width=8)
+               Output: t2.v3, t2.v4
+               ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=8)
+                     Output: t2.v3, t2.v4
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=8)
+                           Output: t2.v3, t2.v4
+         SubPlan 1
+           ->  Nested Loop  (cost=10000000000.00..10000000132.58 rows=10000 width=4)
+                 Output: t2_2.v3
+                 ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                       Output: t2_2.v3
+                       ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                             Output: t2_2.v3
+                             ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.33 rows=33 width=4)
+                                   Output: t2_2.v3
+                 ->  Materialize  (cost=0.00..4.67 rows=100 width=4)
+                       Output: t3.v6
+                       ->  Result  (cost=0.00..4.17 rows=100 width=4)
+                             Output: t3.v6
+                             Filter: (t2.v4 = t3.v6)
+                             ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                                   Output: t3.v6
+                                   ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                         Output: t3.v6
+                                         ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                               Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(42 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+                                                         QUERY PLAN                                                          
+-----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000000.00..10000000190.22 rows=5000 width=16)
+   Output: t1.v1, t1.v2, t2.v3, t2.v4
+   ->  Nested Loop  (cost=10000000000.00..10000000123.56 rows=1667 width=16)
+         Output: t1.v1, t1.v2, t2.v3, t2.v4
+         Join Filter: (SubPlan 1)
+         ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+               Output: t1.v1, t1.v2
+         ->  Materialize  (cost=0.00..3.17 rows=100 width=8)
+               Output: t2.v3, t2.v4
+               ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=8)
+                     Output: t2.v3, t2.v4
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=8)
+                           Output: t2.v3, t2.v4
+         SubPlan 1
+           ->  Result  (cost=10000000000.00..10000000132.59 rows=10000 width=4)
+                 Output: t2_1.v3
+                 One-Time Filter: (t2.v4 < 10)
+                 ->  Nested Loop  (cost=10000000000.00..10000000132.59 rows=10000 width=4)
+                       Output: t2_1.v3
+                       ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                             Output: t2_1.v3
+                             ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                   Output: t2_1.v3
+                                   ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                         Output: t2_1.v3
+                       ->  Materialize  (cost=0.00..4.67 rows=100 width=4)
+                             Output: t3.v6
+                             ->  Result  (cost=0.00..4.17 rows=100 width=4)
+                                   Output: t3.v6
+                                   Filter: (t2.v4 = t3.v6)
+                                   ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                                         Output: t3.v6
+                                         ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                               Output: t3.v6
+                                               ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                                     Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(38 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+                                                         QUERY PLAN                                                          
+-----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000002.08..10000000192.76 rows=5000 width=16)
+   Output: t1.v1, t1.v2, t2.v3, t2.v4
+   ->  Nested Loop  (cost=10000000002.08..10000000126.10 rows=1667 width=16)
+         Output: t1.v1, t1.v2, t2.v3, t2.v4
+         Join Filter: (SubPlan 1)
+         ->  Hash Semi Join  (cost=2.08..3.87 rows=33 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                     Output: t2_1.v3
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2_1.v3
+         ->  Materialize  (cost=0.00..3.17 rows=100 width=8)
+               Output: t2.v3, t2.v4
+               ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=8)
+                     Output: t2.v3, t2.v4
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=8)
+                           Output: t2.v3, t2.v4
+         SubPlan 1
+           ->  Result  (cost=10000000000.00..10000000132.59 rows=10000 width=4)
+                 Output: t2_2.v3
+                 One-Time Filter: (t2.v4 < 10)
+                 ->  Nested Loop  (cost=10000000000.00..10000000132.59 rows=10000 width=4)
+                       Output: t2_2.v3
+                       ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                             Output: t2_2.v3
+                             ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                   Output: t2_2.v3
+                                   ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.33 rows=33 width=4)
+                                         Output: t2_2.v3
+                       ->  Materialize  (cost=0.00..4.67 rows=100 width=4)
+                             Output: t3.v6
+                             ->  Result  (cost=0.00..4.17 rows=100 width=4)
+                                   Output: t3.v6
+                                   Filter: (t2.v4 = t3.v6)
+                                   ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                                         Output: t3.v6
+                                         ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                               Output: t3.v6
+                                               ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                                     Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(45 rows)
+
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+  sum  
+-------
+ 45450
+(1 row)
+
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+  sum  
+-------
+ 45450
+(1 row)
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+                                                         QUERY PLAN                                                          
+-----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=10000000002.08..10000000192.76 rows=5000 width=16)
+   Output: t1.v1, t1.v2, t2.v3, t2.v4
+   ->  Nested Loop  (cost=10000000002.08..10000000126.10 rows=1667 width=16)
+         Output: t1.v1, t1.v2, t2.v3, t2.v4
+         Join Filter: (SubPlan 1)
+         ->  Hash Semi Join  (cost=2.08..3.87 rows=33 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2_1.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=1.67..1.67 rows=33 width=4)
+                     Output: t2_1.v3
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2_1.v3
+         ->  Materialize  (cost=0.00..3.17 rows=100 width=8)
+               Output: t2.v3, t2.v4
+               ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..2.67 rows=100 width=8)
+                     Output: t2.v3, t2.v4
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=8)
+                           Output: t2.v3, t2.v4
+         SubPlan 1
+           ->  Result  (cost=10000000000.00..10000000132.59 rows=10000 width=4)
+                 Output: t2_2.v3
+                 One-Time Filter: (t2.v4 < 10)
+                 ->  Nested Loop  (cost=10000000000.00..10000000132.59 rows=10000 width=4)
+                       Output: t2_2.v3
+                       ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                             Output: t2_2.v3
+                             ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                   Output: t2_2.v3
+                                   ->  Seq Scan on public.t2 t2_2  (cost=0.00..1.33 rows=33 width=4)
+                                         Output: t2_2.v3
+                       ->  Materialize  (cost=0.00..4.67 rows=100 width=4)
+                             Output: t3.v6
+                             ->  Result  (cost=0.00..4.17 rows=100 width=4)
+                                   Output: t3.v6
+                                   Filter: (t2.v4 = t3.v6)
+                                   ->  Materialize  (cost=0.00..3.17 rows=100 width=4)
+                                         Output: t3.v6
+                                         ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..2.67 rows=100 width=4)
+                                               Output: t3.v6
+                                               ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                                     Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'off', optimizer_cte_inlining_bound = '2'
+ Optimizer: Postgres query optimizer
+(45 rows)
+
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+  sum  
+-------
+ 45450
+(1 row)
+
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+-- dedup the subquery with semi join(still be a scalar in the pre-process)
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+                                          QUERY PLAN                                          
+----------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=5.71..9.29 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=5.71..7.96 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Hash Semi Join  (cost=3.96..5.75 rows=33 width=16)
+               Output: t1.v1, t1.v2, t2_1.v3, t3.v5
+               Hash Cond: (t1.v1 = t3.v5)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=3.54..3.54 rows=33 width=8)
+                     Output: t2_1.v3, t3.v5
+                     ->  Hash Semi Join  (cost=1.75..3.54 rows=33 width=8)
+                           Output: t2_1.v3, t3.v5
+                           Hash Cond: (t2_1.v3 = t3.v5)
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t2_1.v3, t2_1.v4
+                           ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+                                 Output: t3.v5
+                                 ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t3.v5
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(27 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=3.96..7.08 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=3.96..5.75 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t3.v5)
+         ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=3.54..3.54 rows=33 width=8)
+               Output: t2.v3, t3.v5
+               ->  Hash Semi Join  (cost=1.75..3.54 rows=33 width=8)
+                     Output: t2.v3, t3.v5
+                     Hash Cond: (t2.v3 = t3.v5)
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2.v3, t2.v4
+                     ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+                           Output: t3.v5
+                           ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t3.v5
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(20 rows)
+
+select count(*) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+ count 
+-------
+   100
+(1 row)
+
+select count(*) from t1 where v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+ count 
+-------
+   100
+(1 row)
+
+-- inner join different key
+explain verbose select v1 from t1 where v1 in (select v3 from t2) and v1 in (select v5 from t2,t3 where v5 = v3);
+                                          QUERY PLAN                                          
+----------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=5.71..9.29 rows=100 width=4)
+   Output: t1.v1
+   ->  Hash Semi Join  (cost=5.71..7.96 rows=33 width=4)
+         Output: t1.v1
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Hash Semi Join  (cost=3.96..5.75 rows=33 width=12)
+               Output: t1.v1, t2_1.v3, t3.v5
+               Hash Cond: (t1.v1 = t3.v5)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=3.54..3.54 rows=33 width=8)
+                     Output: t2_1.v3, t3.v5
+                     ->  Hash Join  (cost=1.75..3.54 rows=33 width=8)
+                           Output: t2_1.v3, t3.v5
+                           Hash Cond: (t2_1.v3 = t3.v5)
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t2_1.v3, t2_1.v4
+                           ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+                                 Output: t3.v5
+                                 ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t3.v5
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(27 rows)
+
+explain verbose select v1 from t1 where v1 in (select v5 from t2,t3 where v5 = v3);
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=3.96..7.08 rows=100 width=4)
+   Output: t1.v1
+   ->  Hash Semi Join  (cost=3.96..5.75 rows=33 width=4)
+         Output: t1.v1
+         Hash Cond: (t1.v1 = t3.v5)
+         ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=3.54..3.54 rows=33 width=8)
+               Output: t2.v3, t3.v5
+               ->  Hash Join  (cost=1.75..3.54 rows=33 width=8)
+                     Output: t2.v3, t3.v5
+                     Hash Cond: (t2.v3 = t3.v5)
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2.v3, t2.v4
+                     ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+                           Output: t3.v5
+                           ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t3.v5
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(20 rows)
+
+explain verbose select v1 from t1 where v1 in (select v3 from t2) and v1 in (select v6 from t2,t3 where v5 = v3); -- no dedup, because v6 is not the join key
+                                                QUERY PLAN                                                 
+-----------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=6.38..9.96 rows=100 width=4)
+   Output: t1.v1
+   ->  Hash Semi Join  (cost=6.38..8.62 rows=33 width=4)
+         Output: t1.v1
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Hash Semi Join  (cost=4.63..6.42 rows=33 width=8)
+               Output: t1.v1, t3.v6
+               Hash Cond: (t1.v1 = t3.v6)
+               ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=4.21..4.21 rows=33 width=4)
+                     Output: t3.v6
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.75..4.21 rows=33 width=4)
+                           Output: t3.v6
+                           Hash Key: t3.v6
+                           ->  Hash Join  (cost=1.75..3.54 rows=33 width=4)
+                                 Output: t3.v6
+                                 Hash Cond: (t2_1.v3 = t3.v5)
+                                 ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t2_1.v3, t2_1.v4
+                                 ->  Hash  (cost=1.33..1.33 rows=33 width=8)
+                                       Output: t3.v5, t3.v6
+                                       ->  Seq Scan on public.t3  (cost=0.00..1.33 rows=33 width=8)
+                                             Output: t3.v5, t3.v6
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(30 rows)
+
+select count(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v5 from t2,t3 where v5 = v3);
+ count 
+-------
+   100
+(1 row)
+
+select count(v1) from t1 where v1 in (select v5 from t2,t3 where v5 = v3);
+ count 
+-------
+   100
+(1 row)
+
+-- can't dedup
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v4 from t2 where v3 < 10); -- different outpt
+                                                               QUERY PLAN                                                               
+----------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=4.54..4.67 rows=8 width=8)
+   Output: t1.v1, t1.v2
+   ->  Result  (cost=4.54..4.56 rows=3 width=8)
+         Output: t1.v1, t1.v2
+         ->  Unique  (cost=4.54..4.56 rows=3 width=8)
+               Output: t1.v1, t1.v2, (RowIdExpr)
+               Group Key: (RowIdExpr)
+               ->  Sort  (cost=4.54..4.55 rows=3 width=8)
+                     Output: t1.v1, t1.v2, (RowIdExpr)
+                     Sort Key: (RowIdExpr)
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.99..4.53 rows=3 width=8)
+                           Output: t1.v1, t1.v2, (RowIdExpr)
+                           Hash Key: (RowIdExpr)
+                           ->  Hash Join  (cost=2.99..4.47 rows=3 width=8)
+                                 Output: t1.v1, t1.v2, (RowIdExpr)
+                                 Hash Cond: (t2.v3 = t1.v1)
+                                 ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                                       Output: t2.v3, t2.v4
+                                 ->  Hash  (cost=2.95..2.95 rows=3 width=12)
+                                       Output: t1.v1, t1.v2, t2_1.v4, (RowIdExpr)
+                                       ->  Hash Semi Join  (cost=1.50..2.95 rows=3 width=12)
+                                             Output: t1.v1, t1.v2, t2_1.v4, RowIdExpr
+                                             Hash Cond: (t1.v1 = t2_1.v4)
+                                             ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                                                   Output: t1.v1, t1.v2
+                                             ->  Hash  (cost=1.47..1.47 rows=3 width=4)
+                                                   Output: t2_1.v4
+                                                   ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..1.47 rows=3 width=4)
+                                                         Output: t2_1.v4
+                                                         Hash Key: t2_1.v4
+                                                         ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                                                               Output: t2_1.v4
+                                                               Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(35 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 where v3 < 10); -- different scalar ident
+                                                         QUERY PLAN                                                         
+----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=4.43..4.49 rows=3 width=8)
+   Output: t1.v1, t1.v2
+   ->  HashAggregate  (cost=4.43..4.44 rows=1 width=8)
+         Output: t1.v1, t1.v2
+         Group Key: (RowIdExpr)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=2.98..4.43 rows=1 width=8)
+               Output: t1.v1, t1.v2, (RowIdExpr)
+               Hash Key: (RowIdExpr)
+               ->  Hash Join  (cost=2.98..4.41 rows=1 width=8)
+                     Output: t1.v1, t1.v2, (RowIdExpr)
+                     Hash Cond: (t2.v3 = t1.v1)
+                     ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                           Output: t2.v3, t2.v4
+                     ->  Hash  (cost=2.96..2.96 rows=1 width=8)
+                           Output: t1.v1, t1.v2, (RowIdExpr)
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=1.45..2.96 rows=1 width=8)
+                                 Output: t1.v1, t1.v2, (RowIdExpr)
+                                 Hash Key: t1.v1
+                                 ->  Hash Semi Join  (cost=1.45..2.94 rows=1 width=8)
+                                       Output: t1.v1, t1.v2, RowIdExpr
+                                       Hash Cond: (t1.v2 = t2_1.v3)
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..1.47 rows=3 width=8)
+                                             Output: t1.v1, t1.v2
+                                             Hash Key: t1.v2
+                                             ->  Seq Scan on public.t1  (cost=0.00..1.42 rows=3 width=8)
+                                                   Output: t1.v1, t1.v2
+                                                   Filter: (t1.v2 < 10)
+                                       ->  Hash  (cost=1.42..1.42 rows=3 width=4)
+                                             Output: t2_1.v3
+                                             ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.42 rows=3 width=4)
+                                                   Output: t2_1.v3
+                                                   Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(34 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 group by v3); -- group by 
+                                          QUERY PLAN                                           
+-----------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=3.50..7.75 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=3.50..6.42 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v2 = t2_1.v3)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.75..4.21 rows=33 width=8)
+               Output: t1.v1, t1.v2
+               Hash Key: t1.v2
+               ->  Hash Semi Join  (cost=1.75..3.54 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                           Output: t1.v1, t1.v2
+                     ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t2.v3
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 order by v3); -- order by/limit, actully this case can be the subset
+                                          QUERY PLAN                                           
+-----------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=3.50..7.75 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=3.50..6.42 rows=33 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v2 = t2_1.v3)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.75..4.21 rows=33 width=8)
+               Output: t1.v1, t1.v2
+               Hash Key: t1.v2
+               ->  Hash Semi Join  (cost=1.75..3.54 rows=33 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..1.33 rows=33 width=8)
+                           Output: t1.v1, t1.v2
+                     ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..1.33 rows=33 width=4)
+                                 Output: t2.v3
+         ->  Hash  (cost=1.33..1.33 rows=33 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..1.33 rows=33 width=4)
+                     Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+reset optimizer_trace_fallback;
+-- start_ignore
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+drop table if exists pt1;
+drop table if exists pt2;
+-- end_ignore
diff --git a/src/test/regress/expected/dedupset_optimizer.out b/src/test/regress/expected/dedupset_optimizer.out
new file mode 100644
index 00000000000..f9369e5a87f
--- /dev/null
+++ b/src/test/regress/expected/dedupset_optimizer.out
@@ -0,0 +1,1614 @@
+SET optimizer_trace_fallback = on;
+-- start_ignore
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+drop table if exists pt1;
+drop table if exists pt2;
+-- end_ignore
+create table t1(v1 int, v2 int);
+create table t2(v3 int, v4 int);
+create table t3(v5 int, v6 int);
+insert into t1 values(generate_series(1, 100), generate_series(1, 100));
+insert into t2 values(generate_series(1, 100), generate_series(1, 100));
+insert into t3 values(generate_series(1, 100), generate_series(1, 100));
+CREATE TABLE pt1 (
+    v1 INT,
+    v2 INT
+) PARTITION BY RANGE (v1);
+CREATE TABLE pt1_p1 PARTITION OF pt1 FOR VALUES FROM (0) TO (20);
+CREATE TABLE pt1_p2 PARTITION OF pt1 FOR VALUES FROM (20) TO (40);
+CREATE TABLE pt1_p3 PARTITION OF pt1 FOR VALUES FROM (40) TO (60);
+CREATE TABLE pt1_p4 PARTITION OF pt1 FOR VALUES FROM (60) TO (400);
+CREATE TABLE pt2 (
+    v3 INT,
+    v4 INT
+) PARTITION BY RANGE (v3);
+CREATE TABLE pt2_p1 PARTITION OF pt2 FOR VALUES FROM (0) TO (20);
+CREATE TABLE pt2_p2 PARTITION OF pt2 FOR VALUES FROM (20) TO (40);
+CREATE TABLE pt2_p3 PARTITION OF pt2 FOR VALUES FROM (40) TO (60);
+CREATE TABLE pt2_p4 PARTITION OF pt2 FOR VALUES FROM (60) TO (400);
+insert into pt1 values(generate_series(1, 100), generate_series(1, 100));
+insert into pt2 values(generate_series(1, 100), generate_series(1, 100));
+analyze t1;
+analyze t2;
+analyze t3;
+analyze pt1;
+analyze pt2;
+-- dedup the subquery with projection
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                     Output: t2.v3
+                     Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(14 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10) and v1 in (select v3 from t2); -- change the order 
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                     Output: t2.v3
+                     Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(14 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10);
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                     Output: t2.v3
+                     Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(14 rows)
+
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  1 |  1
+  5 |  5
+  6 |  6
+  9 |  9
+(9 rows)
+
+select * from t1 where v1 in (select v3 from t2 where v3 < 10);
+ v1 | v2 
+----+----
+  1 |  1
+  5 |  5
+  6 |  6
+  9 |  9
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+(9 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2 where v3 < 10);
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=10 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..862.00 rows=4 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=4 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..431.00 rows=4 width=4)
+                     Output: pt2.v3
+                     ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=4 width=4)
+                           Output: pt2.v3
+                           Number of partitions to scan: 1 (out of 4)
+                           Filter: (pt2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(18 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2 where v3 < 10);
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=10 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..862.00 rows=4 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=4 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..431.00 rows=4 width=4)
+                     Output: pt2.v3
+                     ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=4 width=4)
+                           Output: pt2.v3
+                           Number of partitions to scan: 1 (out of 4)
+                           Filter: (pt2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(18 rows)
+
+select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2 where v3 < 10);
+ v1 | v2 
+----+----
+  1 |  1
+  5 |  5
+  6 |  6
+  9 |  9
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+(9 rows)
+
+select * from pt1 where v1 in (select v3 from pt2 where v3 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  5 |  5
+  6 |  6
+  9 |  9
+  1 |  1
+(9 rows)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+                                                               QUERY PLAN                                                                
+-----------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324954.52 rows=1 width=8)
+   Output: (count(*))
+   ->  Sequence  (cost=0.00..1324954.52 rows=1 width=8)
+         Output: (count(*))
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=1)
+               Output: share0_ref1.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2.v3
+         ->  Redistribute Motion 1:3  (slice2)  (cost=0.00..1324523.52 rows=1 width=8)
+               Output: (count(*))
+               ->  Finalize Aggregate  (cost=0.00..1324523.52 rows=1 width=8)
+                     Output: count(*)
+                     ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..1324523.52 rows=1 width=8)
+                           Output: (PARTIAL count(*))
+                           ->  Partial Aggregate  (cost=0.00..1324523.52 rows=1 width=8)
+                                 Output: PARTIAL count(*)
+                                 ->  Hash Semi Join  (cost=0.00..1324523.52 rows=304 width=1)
+                                       Hash Cond: (t1.v1 = share0_ref2.v3)
+                                       ->  Nested Loop  (cost=0.00..1324091.93 rows=3334 width=4)
+                                             Output: t1.v1
+                                             Join Filter: true
+                                             ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                                                   Output: t1.v1
+                                             ->  Materialize  (cost=0.00..431.00 rows=100 width=1)
+                                                   ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=100 width=1)
+                                                         ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=1)
+                                       ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                             Output: share0_ref2.v3
+                                             ->  Result  (cost=0.00..431.00 rows=4 width=4)
+                                                   Output: share0_ref2.v3
+                                                   Filter: (share0_ref2.v3 < 10)
+                                                   ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=34 width=4)
+                                                         Output: share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(35 rows)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1 where v3 < 10);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..1324523.52 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324523.52 rows=1 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=0.00..1324523.51 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Hash Semi Join  (cost=0.00..1324523.51 rows=304 width=1)
+                     Hash Cond: (t1.v1 = t2_1.v3)
+                     ->  Nested Loop  (cost=0.00..1324091.93 rows=3334 width=4)
+                           Output: t1.v1
+                           Join Filter: true
+                           ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t1.v1
+                           ->  Materialize  (cost=0.00..431.00 rows=100 width=1)
+                                 ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=100 width=1)
+                                       ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=1)
+                     ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                           Output: t2_1.v3
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t2_1.v3
+                                 Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(23 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+ count 
+-------
+   900
+(1 row)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1 where v3 < 10);
+ count 
+-------
+   900
+(1 row)
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..1324523.52 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324523.52 rows=1 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=0.00..1324523.52 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Hash Semi Join  (cost=0.00..1324523.52 rows=304 width=1)
+                     Hash Cond: (t1.v1 = t2_1.v3)
+                     ->  Nested Loop  (cost=0.00..1324091.93 rows=3334 width=4)
+                           Output: t1.v1
+                           Join Filter: true
+                           ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t1.v1
+                           ->  Materialize  (cost=0.00..431.00 rows=100 width=1)
+                                 ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=100 width=1)
+                                       ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=1)
+                     ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                           Output: t2_1.v3
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t2_1.v3
+                                 Filter: (t2_1.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on', optimizer_cte_inlining_bound = '2'
+ Optimizer: GPORCA
+(23 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+ count 
+-------
+   900
+(1 row)
+
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..862.01 rows=1 width=8)
+   Output: sum(t1.v1)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=1 width=8)
+         Output: (PARTIAL sum(t1.v1))
+         ->  Partial Aggregate  (cost=0.00..862.01 rows=1 width=8)
+               Output: PARTIAL sum(t1.v1)
+               ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=4)
+                     Output: t1.v1
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t1.v1
+                     ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t2.v3
+                                 Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(18 rows)
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10);
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..862.01 rows=1 width=8)
+   Output: sum(t1.v1)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=1 width=8)
+         Output: (PARTIAL sum(t1.v1))
+         ->  Partial Aggregate  (cost=0.00..862.01 rows=1 width=8)
+               Output: PARTIAL sum(t1.v1)
+               ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=4)
+                     Output: t1.v1
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t1.v1
+                     ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t2.v3
+                                 Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(18 rows)
+
+select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+ sum 
+-----
+  45
+(1 row)
+
+select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10);
+ sum 
+-----
+  45
+(1 row)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) order by v1;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   Merge Key: t1.v1
+   ->  Sort  (cost=0.00..862.01 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Sort Key: t1.v1
+         ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                     Output: t2.v3
+                     ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t2.v3
+                           Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(18 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10) order by v1;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   Merge Key: t1.v1
+   ->  Sort  (cost=0.00..862.01 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Sort Key: t1.v1
+         ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2.v3)
+               ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                     Output: t2.v3
+                     ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t2.v3
+                           Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(18 rows)
+
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) order by v1;
+ v1 | v2 
+----+----
+  1 |  1
+  2 |  2
+  3 |  3
+  4 |  4
+  5 |  5
+  6 |  6
+  7 |  7
+  8 |  8
+  9 |  9
+(9 rows)
+
+select * from t1 where v1 in (select v3 from t2 where v3 < 10) order by v1;
+ v1 | v2 
+----+----
+  1 |  1
+  2 |  2
+  3 |  3
+  4 |  4
+  5 |  5
+  6 |  6
+  7 |  7
+  8 |  8
+  9 |  9
+(9 rows)
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) group by v2;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=10 width=8)
+   Output: (sum(t1.v1))
+   ->  GroupAggregate  (cost=0.00..862.01 rows=4 width=8)
+         Output: sum(t1.v1)
+         Group Key: t1.v2
+         ->  Sort  (cost=0.00..862.01 rows=4 width=8)
+               Output: t1.v1, t1.v2
+               Sort Key: t1.v2
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.01 rows=4 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Key: t1.v2
+                     ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+                           Output: t1.v1, t1.v2
+                           Hash Cond: (t1.v1 = t2.v3)
+                           ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t1.v1, t1.v2
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                 Output: t2.v3
+                                 ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: t2.v3
+                                       Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(23 rows)
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10) group by v2;
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.01 rows=10 width=8)
+   Output: (sum(t1.v1))
+   ->  GroupAggregate  (cost=0.00..862.01 rows=4 width=8)
+         Output: sum(t1.v1)
+         Group Key: t1.v2
+         ->  Sort  (cost=0.00..862.01 rows=4 width=8)
+               Output: t1.v1, t1.v2
+               Sort Key: t1.v2
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.01 rows=4 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Key: t1.v2
+                     ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+                           Output: t1.v1, t1.v2
+                           Hash Cond: (t1.v1 = t2.v3)
+                           ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t1.v1, t1.v2
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                 Output: t2.v3
+                                 ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: t2.v3
+                                       Filter: (t2.v3 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(23 rows)
+
+select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) group by v2;
+ sum 
+-----
+   1
+   5
+   6
+   9
+   2
+   3
+   4
+   7
+   8
+(9 rows)
+
+select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10) group by v2;
+ sum 
+-----
+   2
+   3
+   4
+   7
+   8
+   1
+   5
+   6
+   9
+(9 rows)
+
+-- dedup the same subqueryany
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2);
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.02 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(13 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2);
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.02 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: t2.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(13 rows)
+
+select count(*) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2);
+ count 
+-------
+   100
+(1 row)
+
+select count(*) from t1 where v1 in (select v3 from t2);
+ count 
+-------
+   100
+(1 row)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2);
+                                         QUERY PLAN                                          
+---------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.02 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=34 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..431.00 rows=34 width=4)
+                     Output: pt2.v3
+                     ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=34 width=4)
+                           Output: pt2.v3
+                           Number of partitions to scan: 4 (out of 4)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(17 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2);
+                                         QUERY PLAN                                          
+---------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.02 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=34 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..431.00 rows=34 width=4)
+                     Output: pt2.v3
+                     ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=34 width=4)
+                           Output: pt2.v3
+                           Number of partitions to scan: 4 (out of 4)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(17 rows)
+
+select count(*) from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2);
+ count 
+-------
+   100
+(1 row)
+
+select count(*) from pt1 where v1 in (select v3 from pt2);
+ count 
+-------
+   100
+(1 row)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+                                                               QUERY PLAN                                                                
+-----------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324954.53 rows=1 width=8)
+   Output: (count(*))
+   ->  Sequence  (cost=0.00..1324954.53 rows=1 width=8)
+         Output: (count(*))
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=1)
+               Output: share0_ref1.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2.v3
+         ->  Redistribute Motion 1:3  (slice2)  (cost=0.00..1324523.53 rows=1 width=8)
+               Output: (count(*))
+               ->  Finalize Aggregate  (cost=0.00..1324523.53 rows=1 width=8)
+                     Output: count(*)
+                     ->  Gather Motion 3:1  (slice3; segments: 3)  (cost=0.00..1324523.53 rows=1 width=8)
+                           Output: (PARTIAL count(*))
+                           ->  Partial Aggregate  (cost=0.00..1324523.53 rows=1 width=8)
+                                 Output: PARTIAL count(*)
+                                 ->  Hash Semi Join  (cost=0.00..1324523.53 rows=3334 width=1)
+                                       Hash Cond: (t1.v1 = share0_ref2.v3)
+                                       ->  Nested Loop  (cost=0.00..1324091.93 rows=3334 width=4)
+                                             Output: t1.v1
+                                             Join Filter: true
+                                             ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                                                   Output: t1.v1
+                                             ->  Materialize  (cost=0.00..431.00 rows=100 width=1)
+                                                   ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=100 width=1)
+                                                         ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=1)
+                                       ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                             Output: share0_ref2.v3
+                                             ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.00 rows=34 width=4)
+                                                   Output: share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(32 rows)
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..1324523.53 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324523.53 rows=1 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=0.00..1324523.53 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Hash Semi Join  (cost=0.00..1324523.53 rows=3334 width=1)
+                     Hash Cond: (t1.v1 = t2_1.v3)
+                     ->  Nested Loop  (cost=0.00..1324091.93 rows=3334 width=4)
+                           Output: t1.v1
+                           Join Filter: true
+                           ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t1.v1
+                           ->  Materialize  (cost=0.00..431.00 rows=100 width=1)
+                                 ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=100 width=1)
+                                       ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=1)
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: t2_1.v3
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(22 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+ count 
+-------
+ 10000
+(1 row)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1);
+ count 
+-------
+ 10000
+(1 row)
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..1324523.53 rows=1 width=8)
+   Output: count(*)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1324523.53 rows=1 width=8)
+         Output: (PARTIAL count(*))
+         ->  Partial Aggregate  (cost=0.00..1324523.53 rows=1 width=8)
+               Output: PARTIAL count(*)
+               ->  Hash Semi Join  (cost=0.00..1324523.53 rows=3334 width=1)
+                     Hash Cond: (t1.v1 = t2_1.v3)
+                     ->  Nested Loop  (cost=0.00..1324091.93 rows=3334 width=4)
+                           Output: t1.v1
+                           Join Filter: true
+                           ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t1.v1
+                           ->  Materialize  (cost=0.00..431.00 rows=100 width=1)
+                                 ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=100 width=1)
+                                       ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=1)
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: t2_1.v3
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on', optimizer_cte_inlining_bound = '2'
+ Optimizer: GPORCA
+(22 rows)
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+ count 
+-------
+ 10000
+(1 row)
+
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+-- dedup the subquery with inner join
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6);
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: t2.v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=4)
+                     Output: t2.v3
+                     Hash Key: t2.v3
+                     ->  Hash Join  (cost=0.00..862.02 rows=34 width=4)
+                           Output: t2.v3
+                           Hash Cond: (t2.v4 = t3.v6)
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t2.v3, t2.v4
+                                 Hash Key: t2.v4
+                                 ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: t2.v3, t2.v4
+                           ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                 Output: t3.v6
+                                 ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                                       Hash Key: t3.v6
+                                       ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                             Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t3,t2 where v4=v6); -- change the join order,different index in inner join
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: t2.v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=4)
+                     Output: t2.v3
+                     Hash Key: t2.v3
+                     ->  Hash Join  (cost=0.00..862.02 rows=34 width=4)
+                           Output: t2.v3
+                           Hash Cond: (t2.v4 = t3.v6)
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t2.v3, t2.v4
+                                 Hash Key: t2.v4
+                                 ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: t2.v3, t2.v4
+                           ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                 Output: t3.v6
+                                 ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                                       Hash Key: t3.v6
+                                       ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                             Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2,t3 where v4=v6);
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: t2.v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=4)
+                     Output: t2.v3
+                     Hash Key: t2.v3
+                     ->  Hash Join  (cost=0.00..862.02 rows=34 width=4)
+                           Output: t2.v3
+                           Hash Cond: (t2.v4 = t3.v6)
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t2.v3, t2.v4
+                                 Hash Key: t2.v4
+                                 ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: t2.v3, t2.v4
+                           ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                 Output: t3.v6
+                                 ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                                       Hash Key: t3.v6
+                                       ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                             Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+                                                       QUERY PLAN                                                       
+------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.01 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.01 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=862.01..862.01 rows=4 width=4)
+               Output: t2.v3
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.01 rows=4 width=4)
+                     Output: t2.v3
+                     Hash Key: t2.v3
+                     ->  Hash Join  (cost=0.00..862.01 rows=4 width=4)
+                           Output: t2.v3
+                           Hash Cond: (t2.v4 = t3.v6)
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=4 width=8)
+                                 Output: t2.v3, t2.v4
+                                 Hash Key: t2.v4
+                                 ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=8)
+                                       Output: t2.v3, t2.v4
+                                       Filter: (t2.v4 < 10)
+                           ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                 Output: t3.v6
+                                 ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: t3.v6
+                                       Hash Key: t3.v6
+                                       ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=4 width=4)
+                                             Output: t3.v6
+                                             Filter: (t3.v6 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(31 rows)
+
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  9 |  9
+  8 |  8
+  6 |  6
+  7 |  7
+  1 |  1
+  5 |  5
+(9 rows)
+
+select * from t1 where v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  5 |  5
+  6 |  6
+  9 |  9
+  1 |  1
+(9 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6);
+                                                          QUERY PLAN                                                           
+-------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=34 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..862.02 rows=34 width=4)
+                     Output: pt2.v3
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=4)
+                           Output: pt2.v3
+                           Hash Key: pt2.v3
+                           ->  Hash Join  (cost=0.00..862.02 rows=34 width=4)
+                                 Output: pt2.v3
+                                 Hash Cond: (pt2.v4 = t3.v6)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: pt2.v3, pt2.v4
+                                       Hash Key: pt2.v4
+                                       ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=34 width=8)
+                                             Output: pt2.v3, pt2.v4
+                                             Number of partitions to scan: 4 (out of 4)
+                                 ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=34 width=4)
+                                             Output: t3.v6
+                                             Hash Key: t3.v6
+                                             ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                                   Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(33 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from t3,pt2 where v4=v6);
+                                                          QUERY PLAN                                                           
+-------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=34 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..862.02 rows=34 width=4)
+                     Output: pt2.v3
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=4)
+                           Output: pt2.v3
+                           Hash Key: pt2.v3
+                           ->  Hash Join  (cost=0.00..862.02 rows=34 width=4)
+                                 Output: pt2.v3
+                                 Hash Cond: (pt2.v4 = t3.v6)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: pt2.v3, pt2.v4
+                                       Hash Key: pt2.v4
+                                       ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=34 width=8)
+                                             Output: pt2.v3, pt2.v4
+                                             Number of partitions to scan: 4 (out of 4)
+                                 ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=34 width=4)
+                                             Output: t3.v6
+                                             Hash Key: t3.v6
+                                             ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                                   Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(33 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2,t3 where v4=v6);
+                                                          QUERY PLAN                                                           
+-------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=34 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..862.02 rows=34 width=4)
+                     Output: pt2.v3
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=4)
+                           Output: pt2.v3
+                           Hash Key: pt2.v3
+                           ->  Hash Join  (cost=0.00..862.02 rows=34 width=4)
+                                 Output: pt2.v3
+                                 Hash Cond: (pt2.v4 = t3.v6)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: pt2.v3, pt2.v4
+                                       Hash Key: pt2.v4
+                                       ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=34 width=8)
+                                             Output: pt2.v3, pt2.v4
+                                             Number of partitions to scan: 4 (out of 4)
+                                 ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=34 width=4)
+                                             Output: t3.v6
+                                             Hash Key: t3.v6
+                                             ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                                   Output: t3.v6
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(33 rows)
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+                                                          QUERY PLAN                                                          
+------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.01 rows=10 width=8)
+   Output: pt1.v1, pt1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.01 rows=4 width=8)
+         Output: pt1.v1, pt1.v2
+         Hash Cond: (pt1.v1 = pt2.v3)
+         ->  Dynamic Seq Scan on public.pt1  (cost=0.00..431.00 rows=4 width=8)
+               Output: pt1.v1, pt1.v2
+               Number of partitions to scan: 4 (out of 4)
+         ->  Hash  (cost=862.01..862.01 rows=4 width=4)
+               Output: pt2.v3
+               ->  Partition Selector (selector id: $0)  (cost=0.00..862.01 rows=4 width=4)
+                     Output: pt2.v3
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.01 rows=4 width=4)
+                           Output: pt2.v3
+                           Hash Key: pt2.v3
+                           ->  Hash Join  (cost=0.00..862.01 rows=4 width=4)
+                                 Output: pt2.v3
+                                 Hash Cond: (pt2.v4 = t3.v6)
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=4 width=8)
+                                       Output: pt2.v3, pt2.v4
+                                       Hash Key: pt2.v4
+                                       ->  Dynamic Seq Scan on public.pt2  (cost=0.00..431.00 rows=4 width=8)
+                                             Output: pt2.v3, pt2.v4
+                                             Number of partitions to scan: 4 (out of 4)
+                                             Filter: (pt2.v4 < 10)
+                                 ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                                       Output: t3.v6
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                                             Output: t3.v6
+                                             Hash Key: t3.v6
+                                             ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=4 width=4)
+                                                   Output: t3.v6
+                                                   Filter: (t3.v6 < 10)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(35 rows)
+
+select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  2 |  2
+  3 |  3
+  4 |  4
+  9 |  9
+  8 |  8
+  6 |  6
+  7 |  7
+  1 |  1
+  5 |  5
+(9 rows)
+
+select * from pt1 where v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+ v1 | v2 
+----+----
+  5 |  5
+  6 |  6
+  9 |  9
+  2 |  2
+  3 |  3
+  4 |  4
+  7 |  7
+  8 |  8
+  1 |  1
+(9 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6);
+                                                   QUERY PLAN                                                    
+-----------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2648910.08 rows=5625 width=16)
+   Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+   ->  Sequence  (cost=0.00..2648909.74 rows=1875 width=16)
+         Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=1)
+               Output: share0_ref1.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2.v3
+         ->  Hash Semi Join  (cost=0.00..2648478.71 rows=1875 width=16)
+               Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+               Hash Cond: ((t2_1.v4 = t3.v6) AND (t1.v1 = share0_ref2.v3))
+               ->  Nested Loop  (cost=0.00..1324306.71 rows=3334 width=16)
+                     Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+                     Join Filter: true
+                     ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.02 rows=100 width=8)
+                           Output: t2_1.v3, t2_1.v4
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t2_1.v3, t2_1.v4
+                     ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                           Output: t1.v1, t1.v2
+               ->  Hash  (cost=1324169.43..1324169.43 rows=3334 width=8)
+                     Output: share0_ref2.v3, t3.v6
+                     ->  Nested Loop  (cost=0.00..1324169.43 rows=3334 width=8)
+                           Output: share0_ref2.v3, t3.v6
+                           Join Filter: true
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.01 rows=100 width=4)
+                                 Output: t3.v6
+                                 ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(33 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from t3,cte1 where v4=v6);
+                                                   QUERY PLAN                                                    
+-----------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2648910.08 rows=5625 width=16)
+   Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+   ->  Sequence  (cost=0.00..2648909.74 rows=1875 width=16)
+         Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=1)
+               Output: share0_ref1.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2.v3
+         ->  Hash Semi Join  (cost=0.00..2648478.71 rows=1875 width=16)
+               Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+               Hash Cond: ((t2_1.v4 = t3.v6) AND (t1.v1 = share0_ref2.v3))
+               ->  Nested Loop  (cost=0.00..1324306.71 rows=3334 width=16)
+                     Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+                     Join Filter: true
+                     ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.02 rows=100 width=8)
+                           Output: t2_1.v3, t2_1.v4
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t2_1.v3, t2_1.v4
+                     ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                           Output: t1.v1, t1.v2
+               ->  Hash  (cost=1324169.43..1324169.43 rows=3334 width=8)
+                     Output: t3.v6, share0_ref2.v3
+                     ->  Nested Loop  (cost=0.00..1324169.43 rows=3334 width=8)
+                           Output: t3.v6, share0_ref2.v3
+                           Join Filter: true
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.01 rows=100 width=4)
+                                 Output: t3.v6
+                                 ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                       Output: t3.v6
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(33 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+                                                   QUERY PLAN                                                    
+-----------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2648354.45 rows=512 width=16)
+   Output: t1.v1, t1.v2, t2.v3, t2.v4
+   ->  Hash Semi Join  (cost=0.00..2648354.42 rows=171 width=16)
+         Output: t1.v1, t1.v2, t2.v3, t2.v4
+         Hash Cond: ((t2.v4 = t3.v6) AND (t1.v1 = t2_1.v3))
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1324306.84 rows=304 width=16)
+               Output: t1.v1, t1.v2, t2.v3, t2.v4
+               Hash Key: t1.v1
+               ->  Result  (cost=0.00..1324306.82 rows=304 width=16)
+                     Output: t1.v1, t1.v2, t2.v3, t2.v4
+                     Filter: (t2.v4 < 10)
+                     ->  Nested Loop  (cost=0.00..1324306.71 rows=3334 width=16)
+                           Output: t1.v1, t1.v2, t2.v3, t2.v4
+                           Join Filter: true
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.02 rows=100 width=8)
+                                 Output: t1.v1, t1.v2
+                                 ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: t1.v1, t1.v2
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t2.v3, t2.v4
+         ->  Hash  (cost=1324047.35..1324047.35 rows=304 width=8)
+               Output: t2_1.v3, t3.v6
+               ->  Nested Loop  (cost=0.00..1324047.35 rows=304 width=8)
+                     Output: t2_1.v3, t3.v6
+                     Join Filter: true
+                     ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=10 width=4)
+                           Output: t3.v6
+                           ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t3.v6
+                                 Filter: (t3.v6 < 10)
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(34 rows)
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2648784.74 rows=512 width=16)
+   Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+   ->  Sequence  (cost=0.00..2648784.71 rows=171 width=16)
+         Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=1)
+               Output: share0_ref1.v3
+               ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2.v3
+         ->  Hash Semi Join  (cost=0.00..2648353.70 rows=171 width=16)
+               Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+               Hash Cond: ((t2_1.v4 = t3.v6) AND (t1.v1 = share0_ref2.v3))
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1324306.84 rows=304 width=16)
+                     Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+                     Hash Key: t1.v1
+                     ->  Result  (cost=0.00..1324306.82 rows=304 width=16)
+                           Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+                           Filter: (t2_1.v4 < 10)
+                           ->  Nested Loop  (cost=0.00..1324306.71 rows=3334 width=16)
+                                 Output: t1.v1, t1.v2, t2_1.v3, t2_1.v4
+                                 Join Filter: true
+                                 ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.02 rows=100 width=8)
+                                       Output: t1.v1, t1.v2
+                                       ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                                             Output: t1.v1, t1.v2
+                                 ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: t2_1.v3, t2_1.v4
+               ->  Hash  (cost=1324046.63..1324046.63 rows=304 width=8)
+                     Output: share0_ref2.v3, t3.v6
+                     ->  Nested Loop  (cost=0.00..1324046.63 rows=304 width=8)
+                           Output: share0_ref2.v3, t3.v6
+                           Join Filter: true
+                           ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=10 width=4)
+                                 Output: t3.v6
+                                 ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=4 width=4)
+                                       Output: t3.v6
+                                       Filter: (t3.v6 < 10)
+                           ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: share0_ref2.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(40 rows)
+
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+  sum  
+-------
+ 45450
+(1 row)
+
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+  sum  
+-------
+ 45450
+(1 row)
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+                                                   QUERY PLAN                                                    
+-----------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..2648354.45 rows=512 width=16)
+   Output: t1.v1, t1.v2, t2.v3, t2.v4
+   ->  Hash Semi Join  (cost=0.00..2648354.42 rows=171 width=16)
+         Output: t1.v1, t1.v2, t2.v3, t2.v4
+         Hash Cond: ((t2.v4 = t3.v6) AND (t1.v1 = t2_1.v3))
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..1324306.84 rows=304 width=16)
+               Output: t1.v1, t1.v2, t2.v3, t2.v4
+               Hash Key: t1.v1
+               ->  Result  (cost=0.00..1324306.82 rows=304 width=16)
+                     Output: t1.v1, t1.v2, t2.v3, t2.v4
+                     Filter: (t2.v4 < 10)
+                     ->  Nested Loop  (cost=0.00..1324306.71 rows=3334 width=16)
+                           Output: t1.v1, t1.v2, t2.v3, t2.v4
+                           Join Filter: true
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.02 rows=100 width=8)
+                                 Output: t1.v1, t1.v2
+                                 ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: t1.v1, t1.v2
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t2.v3, t2.v4
+         ->  Hash  (cost=1324047.35..1324047.35 rows=304 width=8)
+               Output: t2_1.v3, t3.v6
+               ->  Nested Loop  (cost=0.00..1324047.35 rows=304 width=8)
+                     Output: t2_1.v3, t3.v6
+                     Join Filter: true
+                     ->  Broadcast Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=10 width=4)
+                           Output: t3.v6
+                           ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t3.v6
+                                 Filter: (t3.v6 < 10)
+                     ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on', optimizer_cte_inlining_bound = '2'
+ Optimizer: GPORCA
+(34 rows)
+
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+  sum  
+-------
+ 45450
+(1 row)
+
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+-- dedup the subquery with semi join(still be a scalar in the pre-process)
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: t2.v3
+               ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=4)
+                     Output: t2.v3
+                     Hash Cond: (t2.v3 = t3.v5)
+                     ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t2.v3
+                           Filter: (NOT (t2.v3 IS NULL))
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: (1), t3.v5
+                           ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: 1, t3.v5
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(21 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2.v3)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+               Output: t1.v1, t1.v2
+         ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+               Output: t2.v3
+               ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=4)
+                     Output: t2.v3
+                     Hash Cond: (t2.v3 = t3.v5)
+                     ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t2.v3
+                           Filter: (NOT (t2.v3 IS NULL))
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: (1), t3.v5
+                           ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: 1, t3.v5
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(21 rows)
+
+select count(*) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+ count 
+-------
+   100
+(1 row)
+
+select count(*) from t1 where v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+ count 
+-------
+   100
+(1 row)
+
+-- inner join different key
+explain verbose select v1 from t1 where v1 in (select v3 from t2) and v1 in (select v5 from t2,t3 where v5 = v3);
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=4)
+   Output: t1.v1
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=4)
+         Output: t1.v1
+         Hash Cond: (t1.v1 = t3.v5)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+               Output: t1.v1
+         ->  Hash  (cost=862.01..862.01 rows=34 width=4)
+               Output: t3.v5
+               ->  Hash Join  (cost=0.00..862.01 rows=34 width=4)
+                     Output: t3.v5
+                     Hash Cond: (t2.v3 = t3.v5)
+                     ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t2.v3
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: t3.v5
+                           ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t3.v5
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(20 rows)
+
+explain verbose select v1 from t1 where v1 in (select v5 from t2,t3 where v5 = v3);
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=4)
+   Output: t1.v1
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=4)
+         Output: t1.v1
+         Hash Cond: (t1.v1 = t3.v5)
+         ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+               Output: t1.v1
+         ->  Hash  (cost=862.01..862.01 rows=34 width=4)
+               Output: t3.v5
+               ->  Hash Join  (cost=0.00..862.01 rows=34 width=4)
+                     Output: t3.v5
+                     Hash Cond: (t2.v3 = t3.v5)
+                     ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t2.v3
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: t3.v5
+                           ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t3.v5
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(20 rows)
+
+explain verbose select v1 from t1 where v1 in (select v3 from t2) and v1 in (select v6 from t2,t3 where v5 = v3); -- no dedup, because v6 is not the join key
+                                                 QUERY PLAN                                                  
+-------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1724.04 rows=100 width=4)
+   Output: t1.v1
+   ->  Hash Semi Join  (cost=0.00..1724.04 rows=34 width=4)
+         Output: t1.v1
+         Hash Cond: (t1.v1 = t2_1.v3)
+         ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=4)
+               Output: t1.v1
+               Hash Cond: (t1.v1 = t3.v6)
+               ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t1.v1
+               ->  Hash  (cost=862.02..862.02 rows=34 width=4)
+                     Output: t3.v6
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=4)
+                           Output: t3.v6
+                           Hash Key: t3.v6
+                           ->  Hash Join  (cost=0.00..862.02 rows=34 width=4)
+                                 Output: t3.v6
+                                 Hash Cond: (t3.v5 = t2.v3)
+                                 ->  Seq Scan on public.t3  (cost=0.00..431.00 rows=34 width=8)
+                                       Output: t3.v5, t3.v6
+                                 ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                                       Output: t2.v3
+                                       ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                                             Output: t2.v3
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(30 rows)
+
+select count(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v5 from t2,t3 where v5 = v3);
+ count 
+-------
+   100
+(1 row)
+
+select count(v1) from t1 where v1 in (select v5 from t2,t3 where v5 = v3);
+ count 
+-------
+   100
+(1 row)
+
+-- can't dedup
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v4 from t2 where v3 < 10); -- different outpt
+                                                 QUERY PLAN                                                 
+------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.02 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.02 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2_1.v3)
+         ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+               Output: t1.v1, t1.v2
+               Hash Cond: (t1.v1 = t2.v4)
+               ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                     Output: t1.v1, t1.v2
+               ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                     Output: t2.v4
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=4 width=4)
+                           Output: t2.v4
+                           Hash Key: t2.v4
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t2.v4
+                                 Filter: (t2.v3 < 10)
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(24 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 where v3 < 10); -- different scalar ident
+                                                 QUERY PLAN                                                  
+-------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.02 rows=10 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.02 rows=4 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v1 = t2_1.v3)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.01 rows=4 width=8)
+               Output: t1.v1, t1.v2
+               Hash Key: t1.v1
+               ->  Hash Semi Join  (cost=0.00..862.01 rows=4 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Cond: (t1.v2 = t2.v3)
+                     ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
+                           Output: t1.v1, t1.v2
+                           Hash Key: t1.v2
+                           ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                                 Output: t1.v1, t1.v2
+                     ->  Hash  (cost=431.00..431.00 rows=4 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=4 width=4)
+                                 Output: t2.v3
+                                 Filter: (t2.v3 < 10)
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(27 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 group by v3); -- group by 
+                                           QUERY PLAN                                            
+-------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.04 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v2 = t2_1.v3)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=8)
+               Output: t1.v1, t1.v2
+               Hash Key: t1.v2
+               ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                           Output: t1.v1, t1.v2
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t2.v3
+         ->  Hash  (cost=431.01..431.01 rows=34 width=4)
+               Output: t2_1.v3
+               ->  GroupAggregate  (cost=0.00..431.01 rows=34 width=4)
+                     Output: t2_1.v3
+                     Group Key: t2_1.v3
+                     ->  Sort  (cost=0.00..431.00 rows=34 width=4)
+                           Output: t2_1.v3
+                           Sort Key: t2_1.v3
+                           ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(29 rows)
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 order by v3); -- order by/limit, actully this case can be the subset
+                                           QUERY PLAN                                            
+-------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1293.03 rows=100 width=8)
+   Output: t1.v1, t1.v2
+   ->  Hash Semi Join  (cost=0.00..1293.03 rows=34 width=8)
+         Output: t1.v1, t1.v2
+         Hash Cond: (t1.v2 = t2_1.v3)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..862.02 rows=34 width=8)
+               Output: t1.v1, t1.v2
+               Hash Key: t1.v2
+               ->  Hash Semi Join  (cost=0.00..862.02 rows=34 width=8)
+                     Output: t1.v1, t1.v2
+                     Hash Cond: (t1.v1 = t2.v3)
+                     ->  Seq Scan on public.t1  (cost=0.00..431.00 rows=34 width=8)
+                           Output: t1.v1, t1.v2
+                     ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+                           Output: t2.v3
+                           ->  Seq Scan on public.t2  (cost=0.00..431.00 rows=34 width=4)
+                                 Output: t2.v3
+         ->  Hash  (cost=431.00..431.00 rows=34 width=4)
+               Output: t2_1.v3
+               ->  Seq Scan on public.t2 t2_1  (cost=0.00..431.00 rows=34 width=4)
+                     Output: t2_1.v3
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(23 rows)
+
+reset optimizer_trace_fallback;
+-- start_ignore
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+drop table if exists pt1;
+drop table if exists pt2;
+-- end_ignore
diff --git a/src/test/regress/expected/direct_dispatch.out b/src/test/regress/expected/direct_dispatch.out
index 7fc4b3e4516..488260e790a 100644
--- a/src/test/regress/expected/direct_dispatch.out
+++ b/src/test/regress/expected/direct_dispatch.out
@@ -659,7 +659,7 @@ explain (costs off) select gp_segment_id, count(*) from bar_randDistr group by g
          Group Key: gp_segment_id
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Hash Key: gp_segment_id
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Group Key: gp_segment_id
                      ->  Seq Scan on bar_randdistr
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/eagerfree.out b/src/test/regress/expected/eagerfree.out
index 53be6095c14..9658e9a8dd6 100644
--- a/src/test/regress/expected/eagerfree.out
+++ b/src/test/regress/expected/eagerfree.out
@@ -49,7 +49,7 @@ explain analyze select d, count(*) from smallt group by d;
          Peak Memory Usage: 0 kB
          ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.50..3.47 rows=18 width=12) (actual time=0.395..1.643 rows=7 loops=1)
                Hash Key: d
-               ->  Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.058..0.061 rows=10 loops=1)
+               ->  Streaming Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.000..0.000 rows=10 loops=1)
                      Group Key: d
                      Peak Memory Usage: 0 kB
                      ->  Seq Scan on smallt  (cost=0.00..1.33 rows=33 width=4) (actual time=0.017..0.024 rows=50 loops=1)
@@ -183,7 +183,7 @@ where t1.d = t2.d;
                Peak Memory Usage: 0 kB
                ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.50..3.47 rows=18 width=12) (actual time=0.659..1.284 rows=7 loops=1)
                      Hash Key: smallt.d
-                     ->  Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.055..0.058 rows=10 loops=1)
+                     ->  Streaming Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.000..0.000 rows=10 loops=1)
                            Group Key: smallt.d
                            Peak Memory Usage: 0 kB
                            ->  Seq Scan on smallt  (cost=0.00..1.33 rows=33 width=4) (actual time=0.015..0.022 rows=50 loops=1)
@@ -193,7 +193,7 @@ where t1.d = t2.d;
                      Peak Memory Usage: 0 kB
                      ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=1.50..3.47 rows=18 width=12) (actual time=0.003..0.470 rows=7 loops=1)
                            Hash Key: smallt_1.d
-                           ->  Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.084..0.090 rows=10 loops=1)
+                           ->  Streaming Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.000..0.000 rows=10 loops=1)
                                  Group Key: smallt_1.d
                                  Peak Memory Usage: 0 kB
                                  ->  Seq Scan on smallt smallt_1  (cost=0.00..1.33 rows=33 width=8) (actual time=0.022..0.033 rows=50 loops=1)
@@ -282,7 +282,7 @@ explain analyze select d, count(*) from smallt group by d limit 5;
                ->  Sort  (cost=2.05..2.10 rows=18 width=12) (actual time=0.173..0.178 rows=10 loops=1)
                      Sort Key: d
                      Sort Method:  quicksort  Memory: 81kB
-                     ->  Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.108..0.130 rows=10 loops=1)
+                     ->  Streaming Partial HashAggregate  (cost=1.50..1.68 rows=18 width=12) (actual time=0.000..0.000 rows=10 loops=1)
                            Group Key: d
                            Extra Text: (seg0)   Hash chain length 1.1 avg, 2 max, using 9 of 32 buckets; total 0 expansions.
                            ->  Seq Scan on smallt  (cost=0.00..1.33 rows=33 width=4) (actual time=0.025..0.036 rows=50 loops=1)
diff --git a/src/test/regress/expected/enum.out b/src/test/regress/expected/enum.out
index 3b8af8008e1..686ab49742d 100644
--- a/src/test/regress/expected/enum.out
+++ b/src/test/regress/expected/enum.out
@@ -198,71 +198,71 @@ ORDER BY enumsortorder;
 --
 -- Basic table creation, row selection
 --
-CREATE TABLE enumtest (i int, col rainbow);
-INSERT INTO enumtest values (1, 'red'), (2, 'orange'), (3, 'yellow'), (4, 'green');
-COPY enumtest (i, col) FROM stdin;
+CREATE TABLE enumtest (col rainbow);
+INSERT INTO enumtest values ('red'), ('orange'), ('yellow'), ('green');
+COPY enumtest FROM stdin;
 SELECT * FROM enumtest;
- i |  col   
----+--------
- 5 | blue
- 6 | purple
- 2 | orange
- 3 | yellow
- 4 | green
- 1 | red
+  col   
+--------
+ red
+ orange
+ yellow
+ green
+ blue
+ purple
 (6 rows)
 
 --
 -- Operators, no index
 --
 SELECT * FROM enumtest WHERE col = 'orange';
- i |  col   
----+--------
- 2 | orange
+  col   
+--------
+ orange
 (1 row)
 
 SELECT * FROM enumtest WHERE col <> 'orange' ORDER BY col;
- i |  col   
----+--------
- 1 | red
- 3 | yellow
- 4 | green
- 5 | blue
- 6 | purple
+  col   
+--------
+ red
+ yellow
+ green
+ blue
+ purple
 (5 rows)
 
 SELECT * FROM enumtest WHERE col > 'yellow' ORDER BY col;
- i |  col   
----+--------
- 4 | green
- 5 | blue
- 6 | purple
+  col   
+--------
+ green
+ blue
+ purple
 (3 rows)
 
 SELECT * FROM enumtest WHERE col >= 'yellow' ORDER BY col;
- i |  col   
----+--------
- 3 | yellow
- 4 | green
- 5 | blue
- 6 | purple
+  col   
+--------
+ yellow
+ green
+ blue
+ purple
 (4 rows)
 
 SELECT * FROM enumtest WHERE col < 'green' ORDER BY col;
- i |  col   
----+--------
- 1 | red
- 2 | orange
- 3 | yellow
+  col   
+--------
+ red
+ orange
+ yellow
 (3 rows)
 
 SELECT * FROM enumtest WHERE col <= 'green' ORDER BY col;
- i |  col   
----+--------
- 1 | red
- 2 | orange
- 3 | yellow
- 4 | green
+  col   
+--------
+ red
+ orange
+ yellow
+ green
 (4 rows)
 
 --
@@ -311,53 +311,53 @@ SET enable_bitmapscan = off;
 --
 CREATE INDEX enumtest_btree ON enumtest USING btree (col);
 SELECT * FROM enumtest WHERE col = 'orange';
- i |  col   
----+--------
- 2 | orange
+  col   
+--------
+ orange
 (1 row)
 
 SELECT * FROM enumtest WHERE col <> 'orange' ORDER BY col;
- i |  col   
----+--------
- 1 | red
- 3 | yellow
- 4 | green
- 5 | blue
- 6 | purple
+  col   
+--------
+ red
+ yellow
+ green
+ blue
+ purple
 (5 rows)
 
 SELECT * FROM enumtest WHERE col > 'yellow' ORDER BY col;
- i |  col   
----+--------
- 4 | green
- 5 | blue
- 6 | purple
+  col   
+--------
+ green
+ blue
+ purple
 (3 rows)
 
 SELECT * FROM enumtest WHERE col >= 'yellow' ORDER BY col;
- i |  col   
----+--------
- 3 | yellow
- 4 | green
- 5 | blue
- 6 | purple
+  col   
+--------
+ yellow
+ green
+ blue
+ purple
 (4 rows)
 
 SELECT * FROM enumtest WHERE col < 'green' ORDER BY col;
- i |  col   
----+--------
- 1 | red
- 2 | orange
- 3 | yellow
+  col   
+--------
+ red
+ orange
+ yellow
 (3 rows)
 
 SELECT * FROM enumtest WHERE col <= 'green' ORDER BY col;
- i |  col   
----+--------
- 1 | red
- 2 | orange
- 3 | yellow
- 4 | green
+  col   
+--------
+ red
+ orange
+ yellow
+ green
 (4 rows)
 
 SELECT min(col) FROM enumtest;
@@ -384,9 +384,9 @@ DROP INDEX enumtest_btree;
 --
 CREATE INDEX enumtest_hash ON enumtest USING hash (col);
 SELECT * FROM enumtest WHERE col = 'orange';
- i |  col   
----+--------
- 2 | orange
+  col   
+--------
+ orange
 (1 row)
 
 DROP INDEX enumtest_hash;
@@ -537,11 +537,11 @@ DROP FUNCTION echo_me(rainbow);
 --
 -- RI triggers on enum types
 --
-CREATE TABLE enumtest_parent (i int PRIMARY KEY, id rainbow);
-CREATE TABLE enumtest_child (i int REFERENCES enumtest_parent, parent rainbow);
-INSERT INTO enumtest_parent VALUES (1, 'red');
-INSERT INTO enumtest_child VALUES (1, 'red');
-INSERT INTO enumtest_child VALUES (2, 'blue');  -- fail
+CREATE TABLE enumtest_parent (id rainbow PRIMARY KEY);
+CREATE TABLE enumtest_child (parent rainbow REFERENCES enumtest_parent);
+INSERT INTO enumtest_parent VALUES ('red');
+INSERT INTO enumtest_child VALUES ('red');
+INSERT INTO enumtest_child VALUES ('blue');  -- fail
 -- start_ignore
 -- foreign keys are not checked in GPDB, hence these pass.
 -- end_ignore
@@ -550,9 +550,9 @@ DELETE FROM enumtest_parent;  -- fail
 -- cross-type RI should fail
 --
 CREATE TYPE bogus AS ENUM('good', 'bad', 'ugly');
-CREATE TABLE enumtest_bogus_child(i int, parent bogus REFERENCES enumtest_parent);
+CREATE TABLE enumtest_bogus_child(parent bogus REFERENCES enumtest_parent);
 ERROR:  foreign key constraint "enumtest_bogus_child_parent_fkey" cannot be implemented
-DETAIL:  Key columns "parent" and "i" are of incompatible types: bogus and integer.
+DETAIL:  Key columns "parent" and "id" are of incompatible types: bogus and rainbow.
 DROP TYPE bogus;
 -- check renaming a value
 ALTER TYPE rainbow RENAME VALUE 'red' TO 'crimson';
diff --git a/src/test/regress/expected/enum_dist_part_ban.out b/src/test/regress/expected/enum_dist_part_ban.out
deleted file mode 100644
index addc5b89a5e..00000000000
--- a/src/test/regress/expected/enum_dist_part_ban.out
+++ /dev/null
@@ -1,24 +0,0 @@
--- test that distributing or hash partitioning by an enum field or expression is blocked
-CREATE DATABASE ban_enum;
-\c ban_enum
--- create a test enum
-create type colorEnum as enum ('r', 'g', 'b');
--- hash partition by enum column name
-create table part (a int, b colorEnum) partition by hash(b);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-ERROR:  cannot use ENUM column "b" in PARTITION BY statement for hash partitions
--- hash partition by enum column expression
-create table part (a int, b colorEnum) partition by hash((b));
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-ERROR:  cannot use ENUM column "(null)" in PARTITION BY statement for hash partitions
--- distribute by enum column
-create table distr (a colorEnum, b int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
-HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-ERROR:  cannot use ENUM column "a" in DISTRIBUTED BY statement
--- clean up database
-drop type colorEnum;
-\c regression
-DROP DATABASE ban_enum;
diff --git a/src/test/regress/expected/explain_format.out b/src/test/regress/expected/explain_format.out
index 1675c8a2153..a57a1fd55fc 100644
--- a/src/test/regress/expected/explain_format.out
+++ b/src/test/regress/expected/explain_format.out
@@ -17,6 +17,8 @@
 -- s/Memory used:  \d+\w?B/Memory used: ###B/
 -- m/Memory Usage: \d+\w?B/
 -- s/Memory Usage: \d+\w?B/Memory Usage: ###B/
+-- m/Memory wanted:  \d+\w?kB/
+-- s/Memory wanted:  \d+\w?kB/Memory wanted: ###kB/
 -- m/Peak Memory Usage: \d+/
 -- s/Peak Memory Usage: \d+/Peak Memory Usage: ###/
 -- m/Buckets: \d+/
@@ -583,9 +585,61 @@ QUERY PLAN
   }
 ]
 (1 row)
--- explain_processing_on
+-- start_matchsubs
+-- m/Extra Text: \(seg\d+\)   hash table\(s\): \d+; \d+ groups total in \d+ batches, \d+ spill partitions; disk usage: \d+KB; chain length \d+.\d+ avg, \d+ max; using \d+ of \d+ buckets; total \d+ expansions./
+-- s/Extra Text: \(seg\d+\)   hash table\(s\): \d+; \d+ groups total in \d+ batches, \d+ spill partitions; disk usage: \d+KB; chain length \d+.\d+ avg, \d+ max; using \d+ of \d+ buckets; total \d+ expansions./Extra Text: (seg0)   hash table(s): ###; ### groups total in ### batches, ### spill partitions; disk usage: ###KB; chain length ###.## avg, ### max; using ## of ### buckets; total ### expansions./
+-- m/Work_mem: \d+K bytes max, \d+K bytes wanted/
+-- s/Work_mem: \d+K bytes max, \d+K bytes wanted/Work_mem: ###K bytes max, ###K bytes wanted/
+-- end_matchsubs
+-- Greenplum hash table extra message
+CREATE TABLE test_src_tbl AS
+SELECT i % 10000 AS a, i % 10000 + 1 AS b FROM generate_series(1, 50000) i DISTRIBUTED BY (a);
+ANALYZE test_src_tbl;
+-- Enable optimizer_enable_hashagg, and set statement_mem to a small value to force spilling
+set optimizer_enable_hashagg = on;
+SET statement_mem = '1000kB';
+-- Hashagg with spilling
+set hash_mem_multiplier = 1;
+CREATE TABLE test_hashagg_spill AS
+SELECT a, COUNT(DISTINCT b) AS b FROM test_src_tbl GROUP BY a;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'a' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+EXPLAIN (analyze, costs off) SELECT a, COUNT(DISTINCT b) AS b FROM test_src_tbl GROUP BY a;
+QUERY PLAN
+Gather Motion 3:1  (slice1; segments: 3) (actual time=8.948..21.656 rows=10000 loops=1)
+  ->  HashAggregate (actual time=13.950..15.183 rows=3386 loops=1)
+        Group Key: a
+        Extra Text: (seg0)   hash table(s): 1; 3368 groups total in 4 batches, 2576 spill partitions; disk usage: 1024KB; chain length 2.9 avg, 9 max; using 3368 of 20480 buckets; total 0 expansions.
+
+        ->  HashAggregate (actual time=12.113..12.658 rows=3386 loops=1)
+              Group Key: a, b
+              Extra Text: (seg0)   hash table(s): 1; chain length 2.3 avg, 5 max; using 3368 of 8192 buckets; total 1 expansions.
+
+              ->  Seq Scan on test_src_tbl (actual time=0.015..1.748 rows=16930 loops=1)
+Planning Time: 0.167 ms
+  (slice0)    Executor memory: 236K bytes.
+* (slice1)    Executor memory: 657K bytes avg x 3 workers, 722K bytes max (seg0).  Work_mem: 753K bytes max, 721K bytes wanted.
+Memory used:  1000kB
+Memory wanted:  1640kB
+Optimizer: Postgres query optimizer
+Execution Time: 22.346 ms
+(17 rows)
+-- Hashagg with grouping sets
+CREATE TABLE test_hashagg_groupingsets AS
+SELECT a, avg(b) AS b FROM test_src_tbl GROUP BY grouping sets ((a), (b));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'a' as the Greenplum Database data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- The planner generates multiple hash tables but ORCA uses Shared Scan.
+-- flaky test
+-- EXPLAIN (analyze, costs off) SELECT a, avg(b) AS b FROM test_src_tbl GROUP BY grouping sets ((a), (b));
+reset hash_mem_multiplier;
+RESET optimizer_enable_hashagg;
+RESET statement_mem;
 -- Cleanup
 DROP TABLE boxes;
 DROP TABLE apples;
 DROP TABLE box_locations;
 DROP TABLE jsonexplaintest;
+DROP TABLE test_src_tbl;
+DROP TABLE test_hashagg_spill;
+DROP TABLE test_hashagg_groupingsets;
diff --git a/src/test/regress/expected/explain_format_optimizer.out b/src/test/regress/expected/explain_format_optimizer.out
index 74a0d03e09d..f778c3f2048 100644
--- a/src/test/regress/expected/explain_format_optimizer.out
+++ b/src/test/regress/expected/explain_format_optimizer.out
@@ -17,6 +17,8 @@
 -- s/Memory used:  \d+\w?B/Memory used: ###B/
 -- m/Memory Usage: \d+\w?B/
 -- s/Memory Usage: \d+\w?B/Memory Usage: ###B/
+-- m/Memory wanted:  \d+\w?kB/
+-- s/Memory wanted:  \d+\w?kB/Memory wanted: ###kB/
 -- m/Peak Memory Usage: \d+/
 -- s/Peak Memory Usage: \d+/Peak Memory Usage: ###/
 -- m/Buckets: \d+/
@@ -530,9 +532,59 @@ QUERY PLAN
   }
 ]
 (1 row)
--- explain_processing_on
+-- start_matchsubs
+-- m/Extra Text: \(seg\d+\)   hash table\(s\): \d+; \d+ groups total in \d+ batches, \d+ spill partitions; disk usage: \d+KB; chain length \d+.\d+ avg, \d+ max; using \d+ of \d+ buckets; total \d+ expansions./
+-- s/Extra Text: \(seg\d+\)   hash table\(s\): \d+; \d+ groups total in \d+ batches, \d+ spill partitions; disk usage: \d+KB; chain length \d+.\d+ avg, \d+ max; using \d+ of \d+ buckets; total \d+ expansions./Extra Text: (seg0)   hash table(s): ###; ### groups total in ### batches, ### spill partitions; disk usage: ###KB; chain length ###.## avg, ### max; using ## of ### buckets; total ### expansions./
+-- m/Work_mem: \d+K bytes max, \d+K bytes wanted/
+-- s/Work_mem: \d+K bytes max, \d+K bytes wanted/Work_mem: ###K bytes max, ###K bytes wanted/
+-- end_matchsubs
+-- Greenplum hash table extra message
+CREATE TABLE test_src_tbl AS
+SELECT i % 10000 AS a, i % 10000 + 1 AS b FROM generate_series(1, 50000) i DISTRIBUTED BY (a);
+ANALYZE test_src_tbl;
+-- Enable optimizer_enable_hashagg, and set statement_mem to a small value to force spilling
+set optimizer_enable_hashagg = on;
+SET statement_mem = '1000kB';
+-- Hashagg with spilling
+set hash_mem_multiplier = 1;
+CREATE TABLE test_hashagg_spill AS
+SELECT a, COUNT(DISTINCT b) AS b FROM test_src_tbl GROUP BY a;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+EXPLAIN (analyze, costs off) SELECT a, COUNT(DISTINCT b) AS b FROM test_src_tbl GROUP BY a;
+QUERY PLAN
+Gather Motion 3:1  (slice1; segments: 3) (actual time=9.551..21.820 rows=10000 loops=1)
+  ->  HashAggregate (actual time=9.028..10.280 rows=3386 loops=1)
+        Group Key: a
+        Extra Text: (seg0)   hash table(s): 1; 3368 groups total in 4 batches, 2576 spill partitions; disk usage: 1024KB; chain length 2.9 avg, 9 max; using 3368 of 20480 buckets; total 0 expansions.
+
+        ->  HashAggregate (actual time=7.066..7.628 rows=3386 loops=1)
+              Group Key: a, b
+              Extra Text: (seg0)   hash table(s): 1; 3368 groups total in 4 batches, 1264 spill partitions; disk usage: 1024KB; chain length 2.3 avg, 5 max; using 3368 of 40960 buckets; total 1 expansions.
+
+              ->  Seq Scan on test_src_tbl (actual time=0.020..1.349 rows=16930 loops=1)
+Planning Time: 5.518 ms
+  (slice0)    Executor memory: 236K bytes.
+* (slice1)    Executor memory: 709K bytes avg x 3 workers, 876K bytes max (seg0).  Work_mem: 753K bytes max, 721K bytes wanted.
+Memory used:  1000kB
+Memory wanted:  1640kB
+Optimizer: GPORCA
+Execution Time: 22.843 ms
+(17 rows)
+-- Hashagg with grouping sets
+CREATE TABLE test_hashagg_groupingsets AS
+SELECT a, avg(b) AS b FROM test_src_tbl GROUP BY grouping sets ((a), (b));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+-- The planner generates multiple hash tables but ORCA uses Shared Scan.
+-- flaky test
+-- EXPLAIN (analyze, costs off) SELECT a, avg(b) AS b FROM test_src_tbl GROUP BY grouping sets ((a), (b));
+reset hash_mem_multiplier;
+RESET optimizer_enable_hashagg;
+RESET statement_mem;
 -- Cleanup
 DROP TABLE boxes;
 DROP TABLE apples;
 DROP TABLE box_locations;
 DROP TABLE jsonexplaintest;
+DROP TABLE test_src_tbl;
+DROP TABLE test_hashagg_spill;
+DROP TABLE test_hashagg_groupingsets;
diff --git a/src/test/regress/expected/gin.out b/src/test/regress/expected/gin.out
index 65730adcfe0..8454ee25bb8 100644
--- a/src/test/regress/expected/gin.out
+++ b/src/test/regress/expected/gin.out
@@ -310,3 +310,12 @@ select count(*) from t_gin_test_tbl where j @> '{}'::int[];
 reset enable_seqscan;
 reset enable_bitmapscan;
 drop table t_gin_test_tbl;
+--
+-- Github issue: https://github.com/apache/cloudberry/issues/1222
+--
+begin;
+create table t_issue_1222(i int4[]) with (appendonly=true);
+create index t_issue_1222_idx on t_issue_1222 using gin (i)
+  with (fastupdate = on, gin_pending_list_limit = 4096);
+insert into t_issue_1222 select array[1, 2, g] from generate_series(1, 400000) g;
+abort;
diff --git a/src/test/regress/expected/gin_optimizer.out b/src/test/regress/expected/gin_optimizer.out
index ef5c879df76..f7df2cf49e8 100644
--- a/src/test/regress/expected/gin_optimizer.out
+++ b/src/test/regress/expected/gin_optimizer.out
@@ -308,3 +308,12 @@ select count(*) from t_gin_test_tbl where j @> '{}'::int[];
 reset enable_seqscan;
 reset enable_bitmapscan;
 drop table t_gin_test_tbl;
+--
+-- Github issue: https://github.com/apache/cloudberry/issues/1222
+--
+begin;
+create table t_issue_1222(i int4[]) with (appendonly=true);
+create index t_issue_1222_idx on t_issue_1222 using gin (i)
+  with (fastupdate = on, gin_pending_list_limit = 4096);
+insert into t_issue_1222 select array[1, 2, g] from generate_series(1, 400000) g;
+abort;
diff --git a/src/test/regress/expected/gp_aggregates_costs.out b/src/test/regress/expected/gp_aggregates_costs.out
index d4761c78b8f..1865c9ff746 100644
--- a/src/test/regress/expected/gp_aggregates_costs.out
+++ b/src/test/regress/expected/gp_aggregates_costs.out
@@ -22,7 +22,7 @@ explain select avg(b) from cost_agg_t1 group by c;
          Group Key: c
          ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=5449.00..5509.00 rows=2000 width=36)
                Hash Key: c
-               ->  Partial HashAggregate  (cost=5449.00..5469.00 rows=2000 width=36)
+               ->  Streaming Partial HashAggregate  (cost=5449.00..5469.00 rows=2000 width=36)
                      Group Key: c
                      ->  Seq Scan on cost_agg_t1  (cost=0.00..3782.33 rows=333333 width=8)
  Optimizer: Postgres query optimizer
@@ -61,7 +61,7 @@ explain select avg(b) from cost_agg_t2 group by c;
          Planned Partitions: 8
          ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=6538.00..9602.35 rows=102145 width=36)
                Hash Key: c
-               ->  Partial HashAggregate  (cost=6538.00..7559.45 rows=102145 width=36)
+               ->  Streaming Partial HashAggregate  (cost=6538.00..7574.83 rows=103683 width=36)
                      Group Key: c
                      Planned Partitions: 8
                      ->  Seq Scan on cost_agg_t2  (cost=0.00..4538.00 rows=400000 width=8)
@@ -103,7 +103,7 @@ explain (costs off) select b, sum(a) from t_planner_force_multi_stage group by b
  Finalize HashAggregate
    Group Key: b
    ->  Gather Motion 3:1  (slice1; segments: 3)
-         ->  Partial HashAggregate
+         ->  Streaming Partial HashAggregate
                Group Key: b
                ->  Seq Scan on t_planner_force_multi_stage
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/gp_create_table.out b/src/test/regress/expected/gp_create_table.out
index 88b126e4e65..8a26a9a7e33 100644
--- a/src/test/regress/expected/gp_create_table.out
+++ b/src/test/regress/expected/gp_create_table.out
@@ -202,3 +202,8 @@ c1 int,c2 int,c3 int,c4 int,c5 int,c6 int,c7 int,c8 int,c9 int,c10 int,c11 int,c
 c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,c54,c55,c56,c57,c58,c59,c60,c61,c62,c63,c64,c65,c66,c67,c68,c69,c70,c71,c72,c73,c74,c75,c76,c77,c78,c79,c80,c81,c82,c83,c84,c85,c86,c87,c88,c89,c90,c91,c92,c93,c94,c95,c96,c97,c98,c99,c100,c101,c102,c103,c104,c105,c106,c107,c108,c109,c110,c111,c112,c113,c114,c115,c116,c117,c118,c119,c120,c121,c122,c123,c124,c125,c126,c127,c128,c129,c130,c131,c132,c133,c134,c135,c136,c137,c138,c139,c140,c141,c142,c143,c144,c145,c146,c147,c148,c149,c150,c151,c152,c153,c154,c155,c156,c157,c158,c159,c160,c161,c162,c163,c164,c165,c166,c167,c168,c169,c170,c171,c172,c173,c174,c175,c176,c177,c178,c179,c180,c181,c182,c183,c184,c185,c186,c187,c188,c189,c190,c191,c192,c193,c194,c195,c196,c197,c198,c199,c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,c240,c241,c242,c243,c244,c245,c246,c247,c248,c249,c250,c251,c252,c253,c254,c255,c256,c257,c258,c259,c260,c261,c262,c263,c264,c265,c266,c267,c268,c269,c270,c271,c272,c273,c274,c275,c276,c277,c278,c279,c280,c281,c282,c283,c284,c285,c286,c287,c288,c289,c290,c291,c292,c293,c294,c295,c296,c297,c298,c299,c300,c301,c302,c303,c304,c305,c306,c307,c308,c309,c310,c311,c312,c313,c314,c315,c316,c317,c318,c319,c320,c321,c322,c323,c324,c325,c326,c327,c328,c329,c330,c331,c332,c333,c334,c335,c336,c337,c338,c339,c340,c341,c342,c343,c344,c345,c346,c347,c348,c349,c350,c351,c352,c353,c354,c355,c356,c357,c358,c359,c360,c361,c362,c363,c364,c365,c366,c367,c368,c369,c370,c371,c372,c373,c374,c375,c376,c377,c378,c379,c380,c381,c382,c383,c384,c385,c386,c387,c388,c389,c390,c391,c392,c393,c394,c395,c396,c397,c398,c399,c400,c401,c402,c403,c404,c405,c406,c407,c408,c409,c410,c411,c412,c413,c414,c415,c416,c417,c418,c419,c420,c421,c422,c423,c424,c425,c426,c427,c428,c429,c430,c431,c432,c433,c434,c435,c436,c437,c438,c439,c440,c441,c442,c443,c444,c445,c446,c447,c448,c449,c450,c451,c452,c453,c454,c455,c456,c457,c458,c459,c460,c461,c462,c463,c464,c465,c466,c467,c468,c469,c470,c471,c472,c473,c474,c475,c476,c477,c478,c479,c480,c481,c482,c483,c484,c485,c486,c487,c488,c489,c490,c491,c492,c493,c494,c495,c496,c497,c498,c499,c500,c501,c502,c503,c504,c505,c506,c507,c508,c509,c510,c511,c512,c513,c514,c515,c516,c517,c518,c519,c520,c521,c522,c523,c524,c525,c526,c527,c528,c529,c530,c531,c532,c533,c534,c535,c536,c537,c538,c539,c540,c541,c542,c543,c544,c545,c546,c547,c548,c549,c550,c551,c552,c553,c554,c555,c556,c557,c558,c559,c560,c561,c562,c563,c564,c565,c566,c567,c568,c569,c570,c571,c572,c573,c574,c575,c576,c577,c578,c579,c580,c581,c582,c583,c584,c585,c586,c587,c588,c589,c590,c591,c592,c593,c594,c595,c596,c597,c598,c599,c600,c601,c602,c603,c604,c605,c606,c607,c608,c609,c610,c611,c612,c613,c614,c615,c616,c617,c618,c619,c620,c621,c622,c623,c624,c625,c626,c627,c628,c629,c630,c631,c632,c633,c634,c635,c636,c637,c638,c639,c640,c641,c642,c643,c644,c645,c646,c647,c648,c649,c650,c651,c652,c653,c654,c655,c656,c657,c658,c659,c660,c661,c662,c663,c664,c665,c666,c667,c668,c669,c670,c671,c672,c673,c674,c675,c676,c677,c678,c679,c680,c681,c682,c683,c684,c685,c686,c687,c688,c689,c690,c691,c692,c693,c694,c695,c696,c697,c698,c699,c700,c701,c702,c703,c704,c705,c706,c707,c708,c709,c710,c711,c712,c713,c714,c715,c716,c717,c718,c719,c720,c721,c722,c723,c724,c725,c726,c727,c728,c729,c730,c731,c732,c733,c734,c735,c736,c737,c738,c739,c740,c741,c742,c743,c744,c745,c746,c747,c748,c749,c750,c751,c752,c753,c754,c755,c756,c757,c758,c759,c760,c761,c762,c763,c764,c765,c766,c767,c768,c769,c770,c771,c772,c773,c774,c775,c776,c777,c778,c779,c780,c781,c782,c783,c784,c785,c786,c787,c788,c789,c790,c791,c792,c793,c794,c795,c796,c797,c798,c799,c800,c801,c802,c803,c804,c805,c806,c807,c808,c809,c810,c811,c812,c813,c814,c815,c816,c817,c818,c819,c820,c821,c822,c823,c824,c825,c826,c827,c828,c829,c830,c831,c832,c833,c834,c835,c836,c837,c838,c839,c840,c841,c842,c843,c844,c845,c846,c847,c848,c849,c850,c851,c852,c853,c854,c855,c856,c857,c858,c859,c860,c861,c862,c863,c864,c865,c866,c867,c868,c869,c870,c871,c872,c873,c874,c875,c876,c877,c878,c879,c880,c881,c882,c883,c884,c885,c886,c887,c888,c889,c890,c891,c892,c893,c894,c895,c896,c897,c898,c899,c900,c901,c902,c903,c904,c905,c906,c907,c908,c909,c910,c911,c912,c913,c914,c915,c916,c917,c918,c919,c920,c921,c922,c923,c924,c925,c926,c927,c928,c929,c930,c931,c932,c933,c934,c935,c936,c937,c938,c939,c940,c941,c942,c943,c944,c945,c946,c947,c948,c949,c950,c951,c952,c953,c954,c955,c956,c957,c958,c959,c960,c961,c962,c963,c964,c965,c966,c967,c968,c969,c970,c971,c972,c973,c974,c975,c976,c977,c978,c979,c980,c981,c982,c983,c984,c985,c986,c987,c988,c989,c990,c991,c992,c993,c994,c995,c996,c997,c998,c999,c1000,c1001,c1002,c1003,c1004,c1005,c1006,c1007,c1008,c1009,c1010,c1011,c1012,c1013,c1014,c1015,c1016,c1017,c1018,c1019,c1020,c1021,c1022,c1023,c1024,c1025,c1026,c1027,c1028,c1029,c1030,c1031,c1032,c1033,c1034,c1035,c1036,c1037,c1038,c1039,c1040,c1041,c1042,c1043,c1044,c1045,c1046,c1047,c1048,c1049,c1050,c1051,c1052,c1053,c1054,c1055,c1056,c1057,c1058,c1059,c1060,c1061,c1062,c1063,c1064,c1065,c1066,c1067,c1068,c1069,c1070,c1071,c1072,c1073,c1074,c1075,c1076,c1077,c1078,c1079,c1080,c1081,c1082,c1083,c1084,c1085,c1086,c1087,c1088,c1089,c1090,c1091,c1092,c1093,c1094,c1095,c1096,c1097,c1098,c1099,c1100,c1101,c1102,c1103,c1104,c1105,c1106,c1107,c1108,c1109,c1110,c1111,c1112,c1113,c1114,c1115,c1116,c1117,c1118,c1119,c1120,c1121,c1122,c1123,c1124,c1125,c1126,c1127,c1128,c1129,c1130,c1131,c1132,c1133,c1134,c1135,c1136,c1137,c1138,c1139,c1140,c1141,c1142,c1143,c1144,c1145,c1146,c1147,c1148,c1149,c1150,c1151,c1152,c1153,c1154,c1155,c1156,c1157,c1158,c1159,c1160,c1161,c1162,c1163,c1164,c1165,c1166,c1167,c1168,c1169,c1170,c1171,c1172,c1173,c1174,c1175,c1176,c1177,c1178,c1179,c1180,c1181,c1182,c1183,c1184,c1185,c1186,c1187,c1188,c1189,c1190,c1191,c1192,c1193,c1194,c1195,c1196,c1197,c1198,c1199,c1200,c1201,c1202,c1203,c1204,c1205,c1206,c1207,c1208,c1209,c1210,c1211,c1212,c1213,c1214,c1215,c1216,c1217,c1218,c1219,c1220,c1221,c1222,c1223,c1224,c1225,c1226,c1227,c1228,c1229,c1230,c1231,c1232,c1233,c1234,c1235,c1236,c1237,c1238,c1239,c1240,c1241,c1242,c1243,c1244,c1245,c1246,c1247,c1248,c1249,c1250,c1251,c1252,c1253,c1254,c1255,c1256,c1257,c1258,c1259,c1260,c1261,c1262,c1263,c1264,c1265,c1266,c1267,c1268,c1269,c1270,c1271,c1272,c1273,c1274,c1275,c1276,c1277,c1278,c1279,c1280,c1281,c1282,c1283,c1284,c1285,c1286,c1287,c1288,c1289,c1290,c1291,c1292,c1293,c1294,c1295,c1296,c1297,c1298,c1299,c1300,c1301,c1302,c1303,c1304,c1305,c1306,c1307,c1308,c1309,c1310,c1311,c1312,c1313,c1314,c1315,c1316,c1317,c1318,c1319,c1320,c1321,c1322,c1323,c1324,c1325,c1326,c1327,c1328,c1329,c1330,c1331,c1332,c1333,c1334,c1335,c1336,c1337,c1338,c1339,c1340,c1341,c1342,c1343,c1344,c1345,c1346,c1347,c1348,c1349,c1350,c1351,c1352,c1353,c1354,c1355,c1356,c1357,c1358,c1359,c1360,c1361,c1362,c1363,c1364,c1365,c1366,c1367,c1368,c1369,c1370,c1371,c1372,c1373,c1374,c1375,c1376,c1377,c1378,c1379,c1380,c1381,c1382,c1383,c1384,c1385,c1386,c1387,c1388,c1389,c1390,c1391,c1392,c1393,c1394,c1395,c1396,c1397,c1398,c1399,c1400,c1401,c1402,c1403,c1404,c1405,c1406,c1407,c1408,c1409,c1410,c1411,c1412,c1413,c1414,c1415,c1416,c1417,c1418,c1419,c1420,c1421,c1422,c1423,c1424,c1425,c1426,c1427,c1428,c1429,c1430,c1431,c1432,c1433,c1434,c1435,c1436,c1437,c1438,c1439,c1440,c1441,c1442,c1443,c1444,c1445,c1446,c1447,c1448,c1449,c1450,c1451,c1452,c1453,c1454,c1455,c1456,c1457,c1458,c1459,c1460,c1461,c1462,c1463,c1464,c1465,c1466,c1467,c1468,c1469,c1470,c1471,c1472,c1473,c1474,c1475,c1476,c1477,c1478,c1479,c1480,c1481,c1482,c1483,c1484,c1485,c1486,c1487,c1488,c1489,c1490,c1491,c1492,c1493,c1494,c1495,c1496,c1497,c1498,c1499,c1500,c1501,c1502,c1503,c1504,c1505,c1506,c1507,c1508,c1509,c1510,c1511,c1512,c1513,c1514,c1515,c1516,c1517,c1518,c1519,c1520,c1521,c1522,c1523,c1524,c1525,c1526,c1527,c1528,c1529,c1530,c1531,c1532,c1533,c1534,c1535,c1536,c1537,c1538,c1539,c1540,c1541,c1542,c1543,c1544,c1545,c1546,c1547,c1548,c1549,c1550,c1551,c1552,c1553,c1554,c1555,c1556,c1557,c1558,c1559,c1560,c1561,c1562,c1563,c1564,c1565,c1566,c1567,c1568,c1569,c1570,c1571,c1572,c1573,c1574,c1575,c1576,c1577,c1578,c1579,c1580,c1581,c1582,c1583,c1584,c1585,c1586,c1587,c1588,c1589,c1590,c1591,c1592,c1593,c1594,c1595,c1596,c1597,c1598,c1599,c1600,c1601
 );
 ERROR:  tables can have at most 1600 columns
+create table dup_key_t(a int, b int, c int) distributed randomly;
+create temp table ctas_dump_key_t as select rn, a, b from
+ (select a, b, row_number() over (partition by a, b order by c) rn from dup_key_t where dup_key_t.a = dup_key_t.b) x;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'rn' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
diff --git a/src/test/regress/expected/gp_distinct_plans.out b/src/test/regress/expected/gp_distinct_plans.out
index ea9d2e06952..15f5f039bc4 100644
--- a/src/test/regress/expected/gp_distinct_plans.out
+++ b/src/test/regress/expected/gp_distinct_plans.out
@@ -45,7 +45,7 @@ explain select distinct b from distinct_test;
          Group Key: b
          ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=46.67..46.85 rows=6 width=4)
                Hash Key: b
-               ->  HashAggregate  (cost=46.67..46.73 rows=6 width=4)
+               ->  Streaming HashAggregate  (cost=46.67..46.73 rows=6 width=4)
                      Group Key: b
                      ->  Seq Scan on distinct_test  (cost=0.00..38.33 rows=3333 width=4)
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/gp_dqa.out b/src/test/regress/expected/gp_dqa.out
index e5d42dad5a7..0b8222c9a25 100644
--- a/src/test/regress/expected/gp_dqa.out
+++ b/src/test/regress/expected/gp_dqa.out
@@ -2831,7 +2831,7 @@ explain (verbose on, costs off) select distinct sum(Distinct c), count(a), sum(d
    Group Key: (sum(DISTINCT dqa_f3.c)), (count(dqa_f3.a)), (sum(dqa_f3.d))
    ->  Gather Motion 3:1  (slice1; segments: 3)
          Output: (sum(DISTINCT c)), (count(a)), (sum(d)), b
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Output: (sum(DISTINCT c)), (count(a)), (sum(d)), b
                Group Key: sum(DISTINCT dqa_f3.c), count(dqa_f3.a), sum(dqa_f3.d)
                ->  GroupAggregate
@@ -3067,5 +3067,51 @@ select count(distinct a), count(distinct b) from dqa_f4 group by c;
      1 |     1
 (3 rows)
 
+-- Test AO table dqa with multiple distinct aggs
+create table dqa_f5(a int, b int, c int) using ao_column;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into dqa_f5 values(null, null, null);
+insert into dqa_f5 values(1, 1, 1);
+insert into dqa_f5 values(2, 2, 2);
+explain (verbose on, costs off) select count(distinct a), count(distinct b) from dqa_f5 group by c;
+                                                QUERY PLAN                                                 
+-----------------------------------------------------------------------------------------------------------
+ Finalize HashAggregate
+   Output: count(a), count(b), c
+   Group Key: dqa_f5.c
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Output: c, (PARTIAL count(a)), (PARTIAL count(b))
+         ->  Partial HashAggregate
+               Output: c, PARTIAL count(a), PARTIAL count(b)
+               Group Key: dqa_f5.c
+               ->  HashAggregate
+                     Output: c, a, b, (AggExprId)
+                     Group Key: (AggExprId), dqa_f5.a, dqa_f5.b, dqa_f5.c
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                           Output: c, a, b, (AggExprId)
+                           Hash Key: c, a, b, (AggExprId)
+                           ->  Streaming HashAggregate
+                                 Output: c, a, b, (AggExprId)
+                                 Group Key: AggExprId, dqa_f5.a, dqa_f5.b, dqa_f5.c
+                                 ->  TupleSplit
+                                       Output: c, a, b, AggExprId
+                                       Split by Col: (dqa_f5.a), (dqa_f5.b)
+                                       Group Key: dqa_f5.c
+                                       ->  Seq Scan on public.dqa_f5
+                                             Output: c, a, b
+ Settings: enable_groupagg = 'off', enable_hashagg = 'on', gp_motion_cost_per_row = '2', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(25 rows)
+
+select count(distinct a), count(distinct b) from dqa_f5 group by c;
+ count | count 
+-------+-------
+     0 |     0
+     1 |     1
+     1 |     1
+(3 rows)
+
 reset optimizer_enable_multiple_distinct_aggs;
 drop table dqa_f4;
+drop table dqa_f5;
diff --git a/src/test/regress/expected/gp_dqa_optimizer.out b/src/test/regress/expected/gp_dqa_optimizer.out
index 394cf7ce670..5307bd0f909 100644
--- a/src/test/regress/expected/gp_dqa_optimizer.out
+++ b/src/test/regress/expected/gp_dqa_optimizer.out
@@ -66,20 +66,18 @@ select count(distinct d) from dqa_t1 group by i;
 (12 rows)
 
 explain (costs off) select count(distinct d) from dqa_t1 group by i;
-                         QUERY PLAN                         
-------------------------------------------------------------
+                            QUERY PLAN                            
+------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Finalize HashAggregate
+   ->  GroupAggregate
          Group Key: i
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)
-               Hash Key: i
-               ->  Partial GroupAggregate
-                     Group Key: i
-                     ->  Sort
-                           Sort Key: i, d
-                           ->  Seq Scan on dqa_t1
- Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
-(11 rows)
+         ->  Sort
+               Sort Key: i
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: i
+                     ->  Seq Scan on dqa_t1
+ Optimizer: GPORCA
+(9 rows)
 
 select count(distinct d), sum(distinct d) from dqa_t1 group by i;
  count | sum 
@@ -99,20 +97,18 @@ select count(distinct d), sum(distinct d) from dqa_t1 group by i;
 (12 rows)
 
 explain (costs off) select count(distinct d), sum(distinct d) from dqa_t1 group by i;
-                         QUERY PLAN                         
-------------------------------------------------------------
+                            QUERY PLAN                            
+------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Finalize HashAggregate
+   ->  GroupAggregate
          Group Key: i
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)
-               Hash Key: i
-               ->  Partial GroupAggregate
-                     Group Key: i
-                     ->  Sort
-                           Sort Key: i, d
-                           ->  Seq Scan on dqa_t1
- Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
-(11 rows)
+         ->  Sort
+               Sort Key: i
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: i
+                     ->  Seq Scan on dqa_t1
+ Optimizer: GPORCA
+(9 rows)
 
 select count(distinct d), count(distinct dt) from dqa_t1;
 INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner
@@ -2022,20 +2018,18 @@ select count(distinct d) from dqa_t1 group by i;
 (12 rows)
 
 explain (costs off) select count(distinct d) from dqa_t1 group by i;
-                         QUERY PLAN                         
-------------------------------------------------------------
+                            QUERY PLAN                            
+------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Finalize HashAggregate
+   ->  GroupAggregate
          Group Key: i
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)
-               Hash Key: i
-               ->  Partial GroupAggregate
-                     Group Key: i
-                     ->  Sort
-                           Sort Key: i, d
-                           ->  Seq Scan on dqa_t1
- Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
-(11 rows)
+         ->  Sort
+               Sort Key: i
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: i
+                     ->  Seq Scan on dqa_t1
+ Optimizer: GPORCA
+(9 rows)
 
 select count(distinct d), count(distinct c), count(distinct dt) from dqa_t1;
 INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner
@@ -2936,8 +2930,8 @@ select sum(Distinct e), count(b), sum(c) from dqa_f3 group by a;
  *
  */
 explain (verbose on, costs off) select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b;
-                                      QUERY PLAN                                      
---------------------------------------------------------------------------------------
+                                                            QUERY PLAN                                                             
+-----------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: (sum(c)), (count(a)), (sum(d))
    ->  Finalize HashAggregate
@@ -2946,23 +2940,20 @@ explain (verbose on, costs off) select sum(Distinct c), count(a), sum(d) from dq
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
                Hash Key: b
-               ->  Partial GroupAggregate
+               ->  Partial HashAggregate
                      Output: b, c, PARTIAL count(a), PARTIAL sum(d)
                      Group Key: dqa_f3.b, dqa_f3.c
-                     ->  Sort
+                     ->  Redistribute Motion 3:3  (slice3; segments: 3)
                            Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                           Sort Key: dqa_f3.b, dqa_f3.c
-                           ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                                 Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                                 Hash Key: b, c
-                                 ->  Streaming Partial HashAggregate
-                                       Output: b, c, PARTIAL count(a), PARTIAL sum(d)
-                                       Group Key: dqa_f3.b, dqa_f3.c
-                                       ->  Seq Scan on public.dqa_f3
-                                             Output: a, b, c, d
- Optimizer: Pivotal Optimizer (GPORCA)
- Settings: enable_groupagg = 'off', gp_motion_cost_per_row = '1'
-(24 rows)
+                           Hash Key: b, c
+                           ->  Streaming Partial HashAggregate
+                                 Output: b, c, PARTIAL count(a), PARTIAL sum(d)
+                                 Group Key: dqa_f3.b, dqa_f3.c
+                                 ->  Seq Scan on public.dqa_f3
+                                       Output: a, b, c, d
+ Settings: enable_groupagg = 'off', enable_hashagg = 'on', enable_parallel = 'off', gp_motion_cost_per_row = '2', optimizer = 'on'
+ Optimizer: GPORCA
+(21 rows)
 
 select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b;
  sum | count | sum  
@@ -2975,8 +2966,8 @@ select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b;
 (5 rows)
 
 explain (verbose on, costs off) select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b order by b;
-                                            QUERY PLAN                                            
---------------------------------------------------------------------------------------------------
+                                                            QUERY PLAN                                                             
+-----------------------------------------------------------------------------------------------------------------------------------
  Result
    Output: (sum(c)), (count(a)), (sum(d))
    ->  Gather Motion 3:1  (slice1; segments: 3)
@@ -2991,23 +2982,20 @@ explain (verbose on, costs off) select sum(Distinct c), count(a), sum(d) from dq
                      ->  Redistribute Motion 3:3  (slice2; segments: 3)
                            Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
                            Hash Key: b
-                           ->  Partial GroupAggregate
+                           ->  Partial HashAggregate
                                  Output: b, c, PARTIAL count(a), PARTIAL sum(d)
                                  Group Key: dqa_f3.b, dqa_f3.c
-                                 ->  Sort
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)
                                        Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                                       Sort Key: dqa_f3.b, dqa_f3.c
-                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                                             Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                                             Hash Key: b, c
-                                             ->  Streaming Partial HashAggregate
-                                                   Output: b, c, PARTIAL count(a), PARTIAL sum(d)
-                                                   Group Key: dqa_f3.b, dqa_f3.c
-                                                   ->  Seq Scan on public.dqa_f3
-                                                         Output: a, b, c, d
- Optimizer: Pivotal Optimizer (GPORCA)
- Settings: enable_groupagg = 'off', gp_motion_cost_per_row = '1'
-(30 rows)
+                                       Hash Key: b, c
+                                       ->  Streaming Partial HashAggregate
+                                             Output: b, c, PARTIAL count(a), PARTIAL sum(d)
+                                             Group Key: dqa_f3.b, dqa_f3.c
+                                             ->  Seq Scan on public.dqa_f3
+                                                   Output: a, b, c, d
+ Settings: enable_groupagg = 'off', enable_hashagg = 'on', enable_parallel = 'off', gp_motion_cost_per_row = '2', optimizer = 'on'
+ Optimizer: GPORCA
+(27 rows)
 
 select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b order by b;
  sum | count | sum  
@@ -3039,23 +3027,20 @@ explain (verbose on, costs off) select distinct sum(Distinct c), count(a), sum(d
                            ->  Redistribute Motion 3:3  (slice3; segments: 3)
                                  Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
                                  Hash Key: b
-                                 ->  Partial GroupAggregate
+                                 ->  Partial HashAggregate
                                        Output: b, c, PARTIAL count(a), PARTIAL sum(d)
                                        Group Key: dqa_f3.b, dqa_f3.c
-                                       ->  Sort
+                                       ->  Redistribute Motion 3:3  (slice4; segments: 3)
                                              Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                                             Sort Key: dqa_f3.b, dqa_f3.c
-                                             ->  Redistribute Motion 3:3  (slice4; segments: 3)
-                                                   Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                                                   Hash Key: b, c
-                                                   ->  Streaming Partial HashAggregate
-                                                         Output: b, c, PARTIAL count(a), PARTIAL sum(d)
-                                                         Group Key: dqa_f3.b, dqa_f3.c
-                                                         ->  Seq Scan on public.dqa_f3
-                                                               Output: a, b, c, d
+                                             Hash Key: b, c
+                                             ->  Streaming Partial HashAggregate
+                                                   Output: b, c, PARTIAL count(a), PARTIAL sum(d)
+                                                   Group Key: dqa_f3.b, dqa_f3.c
+                                                   ->  Seq Scan on public.dqa_f3
+                                                         Output: a, b, c, d
  Settings: enable_groupagg = 'off', enable_hashagg = 'on', enable_parallel = 'off', gp_motion_cost_per_row = '2', optimizer = 'on'
- Optimizer: Pivotal Optimizer (GPORCA)
-(33 rows)
+ Optimizer: GPORCA
+(30 rows)
 
 select distinct sum(Distinct c), count(a), sum(d) from dqa_f3 group by b;
  sum | count | sum  
@@ -3115,8 +3100,8 @@ select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b having avg(e) >
 -- Test gp_enable_agg_distinct_pruning is off on this branch
 set gp_enable_agg_distinct_pruning = off;
 explain (verbose on, costs off) select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b;
-                                               QUERY PLAN                                                
----------------------------------------------------------------------------------------------------------
+                                                                                QUERY PLAN                                                                                 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: (sum(c)), (count(a)), (sum(d))
    ->  Finalize HashAggregate
@@ -3125,23 +3110,20 @@ explain (verbose on, costs off) select sum(Distinct c), count(a), sum(d) from dq
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
                Hash Key: b
-               ->  Partial GroupAggregate
+               ->  Partial HashAggregate
                      Output: b, c, PARTIAL count(a), PARTIAL sum(d)
                      Group Key: dqa_f3.b, dqa_f3.c
-                     ->  Sort
+                     ->  Redistribute Motion 3:3  (slice3; segments: 3)
                            Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                           Sort Key: dqa_f3.b, dqa_f3.c
-                           ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                                 Output: b, c, (PARTIAL count(a)), (PARTIAL sum(d))
-                                 Hash Key: b, c
-                                 ->  Streaming Partial HashAggregate
-                                       Output: b, c, PARTIAL count(a), PARTIAL sum(d)
-                                       Group Key: dqa_f3.b, dqa_f3.c
-                                       ->  Seq Scan on public.dqa_f3
-                                             Output: a, b, c, d
- Optimizer: Pivotal Optimizer (GPORCA)
- Settings: enable_groupagg = 'off', gp_enable_agg_distinct_pruning = 'off', gp_motion_cost_per_row = '1'
-(24 rows)
+                           Hash Key: b, c
+                           ->  Streaming Partial HashAggregate
+                                 Output: b, c, PARTIAL count(a), PARTIAL sum(d)
+                                 Group Key: dqa_f3.b, dqa_f3.c
+                                 ->  Seq Scan on public.dqa_f3
+                                       Output: a, b, c, d
+ Settings: enable_groupagg = 'off', enable_hashagg = 'on', enable_parallel = 'off', gp_enable_agg_distinct_pruning = 'off', gp_motion_cost_per_row = '2', optimizer = 'on'
+ Optimizer: GPORCA
+(21 rows)
 
 select sum(Distinct c), count(a), sum(d) from dqa_f3 group by b;
  sum | count | sum  
@@ -3269,8 +3251,8 @@ DETAIL:  Falling back to Postgres-based planner because GPORCA does not support
 
 set optimizer_enable_multiple_distinct_aggs=on;
 explain (verbose on, costs off) select count(distinct a), count(distinct b) from dqa_f4 group by c;
-                                                                                                                                   QUERY PLAN                                                                                                                                    
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                                                 QUERY PLAN                                                                                                                  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: (count(DISTINCT share0_ref3.a)), (count(DISTINCT share0_ref2.b))
    ->  Sequence
@@ -3294,7 +3276,7 @@ explain (verbose on, costs off) select count(distinct a), count(distinct b) from
                                  ->  Result
                                        Output: share0_ref3.a, share0_ref3.c
                                        ->  Shared Scan (share slice:id 2:0)
-                                             Output: share0_ref3.a, share0_ref3.b, share0_ref3.c, share0_ref3.ctid, share0_ref3.xmin, share0_ref3.cmin, share0_ref3.xmax, share0_ref3.cmax, share0_ref3.tableoid, share0_ref3.gp_segment_id, share0_ref3.gp_foreign_server
+                                             Output: share0_ref3.a, share0_ref3.b, share0_ref3.c
                ->  Hash
                      Output: (count(DISTINCT share0_ref2.b)), share0_ref2.c
                      ->  GroupAggregate
@@ -3309,9 +3291,9 @@ explain (verbose on, costs off) select count(distinct a), count(distinct b) from
                                        ->  Result
                                              Output: share0_ref2.b, share0_ref2.c
                                              ->  Shared Scan (share slice:id 3:0)
-                                                   Output: share0_ref2.a, share0_ref2.b, share0_ref2.c, share0_ref2.ctid, share0_ref2.xmin, share0_ref2.cmin, share0_ref2.xmax, share0_ref2.cmax, share0_ref2.tableoid, share0_ref2.gp_segment_id, share0_ref2.gp_foreign_server
+                                                   Output: share0_ref2.a, share0_ref2.b, share0_ref2.c
  Settings: enable_groupagg = 'off', enable_hashagg = 'on', enable_parallel = 'off', gp_motion_cost_per_row = '2', optimizer = 'on'
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (41 rows)
 
 select count(distinct a), count(distinct b) from dqa_f4 group by c;
@@ -3322,5 +3304,67 @@ select count(distinct a), count(distinct b) from dqa_f4 group by c;
      0 |     0
 (3 rows)
 
+-- Test AO table dqa with multiple distinct aggs
+create table dqa_f5(a int, b int, c int) using ao_column;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into dqa_f5 values(null, null, null);
+insert into dqa_f5 values(1, 1, 1);
+insert into dqa_f5 values(2, 2, 2);
+explain (verbose on, costs off) select count(distinct a), count(distinct b) from dqa_f5 group by c;
+                                                                             QUERY PLAN                                                                              
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: (count(DISTINCT share0_ref3.a)), (count(DISTINCT share0_ref2.b))
+   ->  Sequence
+         Output: (count(DISTINCT share0_ref3.a)), (count(DISTINCT share0_ref2.b))
+         ->  Shared Scan (share slice:id 1:0)
+               Output: share0_ref1.a, share0_ref1.b, share0_ref1.c, share0_ref1.ctid, share0_ref1.tableoid, share0_ref1.gp_segment_id, share0_ref1.gp_foreign_server
+               ->  Seq Scan on public.dqa_f5
+                     Output: dqa_f5.a, dqa_f5.b, dqa_f5.c, dqa_f5.ctid, dqa_f5.tableoid, dqa_f5.gp_segment_id, dqa_f5.gp_foreign_server
+         ->  Hash Join
+               Output: (count(DISTINCT share0_ref3.a)), (count(DISTINCT share0_ref2.b))
+               Hash Cond: (NOT (share0_ref3.c IS DISTINCT FROM share0_ref2.c))
+               ->  GroupAggregate
+                     Output: count(DISTINCT share0_ref3.a), share0_ref3.c
+                     Group Key: share0_ref3.c
+                     ->  Sort
+                           Output: share0_ref3.a, share0_ref3.c
+                           Sort Key: share0_ref3.c
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                 Output: share0_ref3.a, share0_ref3.c
+                                 Hash Key: share0_ref3.c
+                                 ->  Result
+                                       Output: share0_ref3.a, share0_ref3.c
+                                       ->  Shared Scan (share slice:id 2:0)
+                                             Output: share0_ref3.a, share0_ref3.b, share0_ref3.c
+               ->  Hash
+                     Output: (count(DISTINCT share0_ref2.b)), share0_ref2.c
+                     ->  GroupAggregate
+                           Output: count(DISTINCT share0_ref2.b), share0_ref2.c
+                           Group Key: share0_ref2.c
+                           ->  Sort
+                                 Output: share0_ref2.b, share0_ref2.c
+                                 Sort Key: share0_ref2.c
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                                       Output: share0_ref2.b, share0_ref2.c
+                                       Hash Key: share0_ref2.c
+                                       ->  Result
+                                             Output: share0_ref2.b, share0_ref2.c
+                                             ->  Shared Scan (share slice:id 3:0)
+                                                   Output: share0_ref2.a, share0_ref2.b, share0_ref2.c
+ Settings: enable_groupagg = 'off', enable_hashagg = 'on', gp_motion_cost_per_row = '2'
+ Optimizer: GPORCA
+(41 rows)
+
+select count(distinct a), count(distinct b) from dqa_f5 group by c;
+ count | count 
+-------+-------
+     1 |     1
+     0 |     0
+     1 |     1
+(3 rows)
+
 reset optimizer_enable_multiple_distinct_aggs;
 drop table dqa_f4;
+drop table dqa_f5;
diff --git a/src/test/regress/expected/gp_hashagg.out b/src/test/regress/expected/gp_hashagg.out
index 38a293a684b..513aeb09966 100644
--- a/src/test/regress/expected/gp_hashagg.out
+++ b/src/test/regress/expected/gp_hashagg.out
@@ -154,7 +154,7 @@ EXPLAIN (COSTS OFF, VERBOSE) :qry;
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: b, (PARTIAL sum(a) FILTER (WHERE false)), (PARTIAL max(c))
                Hash Key: b
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Output: b, PARTIAL sum(a) FILTER (WHERE false), PARTIAL max(c)
                      Group Key: test_combinefn_null.b
                      ->  Seq Scan on public.test_combinefn_null
@@ -189,7 +189,7 @@ EXPLAIN (COSTS OFF, VERBOSE) :qry;
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: b, (PARTIAL var_pop((a)::integer) FILTER (WHERE false)), (PARTIAL max(c))
                Hash Key: b
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Output: b, PARTIAL var_pop((a)::integer) FILTER (WHERE false), PARTIAL max(c)
                      Group Key: test_combinefn_null.b
                      ->  Seq Scan on public.test_combinefn_null
@@ -224,7 +224,7 @@ EXPLAIN (COSTS OFF, VERBOSE) :qry;
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: b, (PARTIAL sum((a)::numeric) FILTER (WHERE false)), (PARTIAL max(c))
                Hash Key: b
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Output: b, PARTIAL sum((a)::numeric) FILTER (WHERE false), PARTIAL max(c)
                      Group Key: test_combinefn_null.b
                      ->  Seq Scan on public.test_combinefn_null
@@ -259,7 +259,7 @@ EXPLAIN (COSTS OFF, VERBOSE) :qry;
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: b, (PARTIAL var_pop((a)::numeric) FILTER (WHERE false)), (PARTIAL max(c))
                Hash Key: b
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Output: b, PARTIAL var_pop((a)::numeric) FILTER (WHERE false), PARTIAL max(c)
                      Group Key: test_combinefn_null.b
                      ->  Seq Scan on public.test_combinefn_null
@@ -274,3 +274,169 @@ EXPLAIN (COSTS OFF, VERBOSE) :qry;
         
 (1 row)
 
+drop schema if exists tinc_base_types cascade;
+NOTICE:  schema "tinc_base_types" does not exist, skipping
+create schema tinc_base_types;
+set search_path=tinc_base_types;
+CREATE FUNCTION int42_in(cstring)
+   RETURNS int42
+   AS 'int4in'
+   LANGUAGE internal IMMUTABLE STRICT;
+NOTICE:  type "int42" is not yet defined
+DETAIL:  Creating a shell type definition.
+CREATE FUNCTION int42_out(int42)
+   RETURNS cstring
+   AS 'int4out'
+   LANGUAGE internal IMMUTABLE STRICT;
+NOTICE:  argument type int42 is only a shell
+CREATE TYPE int42 (
+   internallength = 4,
+   input = int42_in,
+   output = int42_out,
+   alignment = int4,
+   default = 42,
+   passedbyvalue
+);
+CREATE TABLE aTABLE(k int, a int42);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'k' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO aTABLE VALUES(1, '21');
+INSERT INTO aTABLE VALUES(2, '22');
+INSERT INTO aTABLE VALUES(3, '23');
+INSERT INTO aTABLE VALUES(4, '24');
+SELECT * FROM aTABLE;
+ k | a  
+---+----
+ 2 | 22
+ 3 | 23
+ 4 | 24
+ 1 | 21
+(4 rows)
+
+CREATE OR REPLACE FUNCTION my_lt(int42, int42)
+RETURNS boolean AS
+'int4lt'
+language internal;
+CREATE OR REPLACE FUNCTION my_lteq(int42, int42)
+RETURNS boolean AS
+'int4le'
+language internal;
+CREATE OR REPLACE FUNCTION my_gt(int42, int42)
+RETURNS boolean AS
+'int4gt'
+language internal;
+CREATE OR REPLACE FUNCTION my_gteq(int42, int42)
+RETURNS boolean AS
+'int4ge'
+language internal;
+CREATE OR REPLACE FUNCTION my_eq(int42, int42)
+RETURNS boolean AS
+'int4eq'
+language internal;
+CREATE OPERATOR < (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_lt,
+  hashes
+);
+CREATE OPERATOR <= (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_lteq,
+  hashes
+);
+CREATE OPERATOR = (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_eq,
+  hashes
+);
+CREATE OPERATOR > (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_gt,
+  hashes
+);
+CREATE OPERATOR >= (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_gteq,
+  hashes
+);
+CREATE OR REPLACE FUNCTION my_comp_func(int42, int42)
+RETURNS int AS
+$$
+BEGIN
+IF $1 < $2 THEN
+  return -1;
+ELSIF $1 = $2 THEN
+  return 0;
+ELSE
+  return 1;
+END IF;
+END;
+$$ LANGUAGE PLPGSQL;
+CREATE OPERATOR CLASS my_operator_class_comp_type
+DEFAULT
+FOR TYPE int42 USING btree
+AS
+OPERATOR 1 <,
+OPERATOR 2 <=,
+OPERATOR 3 =,
+OPERATOR 4 >=,
+OPERATOR 5 >,
+FUNCTION 1 my_comp_func(int42, int42);
+CREATE OPERATOR CLASS my_operator_class_comp_type_hash_lt
+DEFAULT
+FOR TYPE int42 USING hash
+AS
+OPERATOR 1 <,
+FUNCTION 1 my_comp_func(int42, int42);
+ERROR:  hash function 1 must have one argument
+CREATE OPERATOR CLASS my_operator_class_comp_type_hash_eq
+FOR TYPE int42 USING hash
+AS
+OPERATOR 1 =,
+FUNCTION 1 my_comp_func(int42, int42);
+ERROR:  hash function 1 must have one argument
+select * from atable group by a,k;
+ k | a  
+---+----
+ 1 | 21
+ 2 | 22
+ 3 | 23
+ 4 | 24
+(4 rows)
+
+-- Before fix: This would fail at runtime with:
+--   ERROR: could not find hash function for hash operator XXXXX (execGrouping.c:118)
+-- After fix: ORCA should detect missing hash function at planning time
+--   and either use GroupAgg or report a clear planning error
+SET optimizer_enable_groupagg=off;
+select * from atable group by a,k;
+ k | a  
+---+----
+ 1 | 21
+ 2 | 22
+ 3 | 23
+ 4 | 24
+(4 rows)
+
+drop schema if exists tinc_base_types cascade;
+NOTICE:  drop cascades to 16 other objects
+DETAIL:  drop cascades to function int42_out(int42)
+drop cascades to type int42
+drop cascades to function int42_in(cstring)
+drop cascades to table atable
+drop cascades to function my_lt(int42,int42)
+drop cascades to function my_lteq(int42,int42)
+drop cascades to function my_gt(int42,int42)
+drop cascades to function my_gteq(int42,int42)
+drop cascades to function my_eq(int42,int42)
+drop cascades to operator <(int42,int42)
+drop cascades to operator <=(int42,int42)
+drop cascades to operator =(int42,int42)
+drop cascades to operator >(int42,int42)
+drop cascades to operator >=(int42,int42)
+drop cascades to function my_comp_func(int42,int42)
+drop cascades to operator family my_operator_class_comp_type for access method btree
diff --git a/src/test/regress/expected/gp_runtime_filter.out b/src/test/regress/expected/gp_runtime_filter.out
index cc1531a707c..cb47862576c 100644
--- a/src/test/regress/expected/gp_runtime_filter.out
+++ b/src/test/regress/expected/gp_runtime_filter.out
@@ -535,6 +535,60 @@ RESET gp_enable_runtime_filter_pushdown;
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
+-- case 7: scan partition table with dynamic scan
+CREATE TABLE t1 (c1 INT, c2 INT) DISTRIBUTED BY (c1) PARTITION BY RANGE (c2) (START (1) END (100) EVERY (50));
+CREATE TABLE t2 (c1 INT, c2 INT) DISTRIBUTED REPLICATED;
+INSERT INTO t1 SELECT generate_series(1, 99), generate_series(1, 99);
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t2 SELECT generate_series(1, 5), generate_series(1, 5);
+INSERT INTO t2 SELECT generate_series(51, 51), generate_series(51, 51);
+ANALYZE;
+SET optimizer TO on;
+EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
+SELECT t1.c2 FROM t1, t2 WHERE t1.c2 = t2.c2;
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=96 loops=1)
+   ->  Hash Join (actual rows=64 loops=1)
+         Hash Cond: (t1.c2 = t2.c2)
+         Extra Text: (seg0)   Hash chain length 1.0 avg, 1 max, using 6 of 524288 buckets.
+         ->  Dynamic Seq Scan on t1 (actual rows=608 loops=1)
+               Number of partitions to scan: 2 (out of 2)
+               Partitions scanned:  Avg 2.0 x 3 workers.  Max 2 parts (seg0).
+         ->  Hash (actual rows=6 loops=1)
+               Buckets: 524288  Batches: 1  Memory Usage: 4097kB
+               ->  Partition Selector (selector id: $0) (actual rows=6 loops=1)
+                     ->  Seq Scan on t2 (actual rows=6 loops=1)
+ Optimizer: GPORCA
+(12 rows)
+
+SET gp_enable_runtime_filter_pushdown TO on;
+EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
+SELECT t1.c2 FROM t1, t2 WHERE t1.c2 = t2.c2;
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=96 loops=1)
+   ->  Hash Join (actual rows=64 loops=1)
+         Hash Cond: (t1.c2 = t2.c2)
+         Extra Text: (seg0)   Hash chain length 1.0 avg, 1 max, using 6 of 524288 buckets.
+         ->  Dynamic Seq Scan on t1 (actual rows=64 loops=1)
+               Rows Removed by Pushdown Runtime Filter: 544
+               Number of partitions to scan: 2 (out of 2)
+               Partitions scanned:  Avg 2.0 x 3 workers.  Max 2 parts (seg0).
+         ->  Hash (actual rows=6 loops=1)
+               Buckets: 524288  Batches: 1  Memory Usage: 4097kB
+               ->  Partition Selector (selector id: $0) (actual rows=6 loops=1)
+                     ->  Seq Scan on t2 (actual rows=6 loops=1)
+ Optimizer: GPORCA
+(13 rows)
+
+RESET gp_enable_runtime_filter_pushdown;
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+SET optimizer TO off;
 RESET enable_parallel;
 -- Clean up: reset guc
 SET gp_enable_runtime_filter TO off;
diff --git a/src/test/regress/expected/gpctas.out b/src/test/regress/expected/gpctas.out
index cb0c2536bfe..d50f1b61065 100644
--- a/src/test/regress/expected/gpctas.out
+++ b/src/test/regress/expected/gpctas.out
@@ -28,7 +28,7 @@ SELECT attr, class, (select count(distinct class) from ctas_src) as dclass FROM
                                          ->  Seq Scan on ctas_src ctas_src_1
    ->  Redistribute Motion 3:3  (slice1; segments: 3)
          Hash Key: ctas_src.attr
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Group Key: ctas_src.attr, ctas_src.class
                ->  Seq Scan on ctas_src
  Optimizer: Postgres query optimizer
@@ -57,7 +57,7 @@ SELECT attr, class, (select max(class) from ctas_src) as maxclass FROM ctas_src
                        ->  Seq Scan on ctas_src ctas_src_1
    ->  Redistribute Motion 3:3  (slice1; segments: 3)
          Hash Key: ctas_src.attr
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Group Key: ctas_src.attr, ctas_src.class
                ->  Seq Scan on ctas_src
  Optimizer: Postgres query optimizer
@@ -102,7 +102,7 @@ SELECT attr, class, (select count(distinct class) from ctas_src) as dclass, (sel
                        ->  Seq Scan on ctas_src ctas_src_3
    ->  Redistribute Motion 3:3  (slice1; segments: 3)
          Hash Key: ctas_src.attr
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Group Key: ctas_src.attr, ctas_src.class
                ->  Seq Scan on ctas_src
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/gpdist_legacy_opclasses.out b/src/test/regress/expected/gpdist_legacy_opclasses.out
index 920bcb7f9ad..58b353c86d7 100644
--- a/src/test/regress/expected/gpdist_legacy_opclasses.out
+++ b/src/test/regress/expected/gpdist_legacy_opclasses.out
@@ -296,34 +296,27 @@ explain (costs off) select * from modern_int a inner join legacy_domain_over_int
  Optimizer: Postgres query optimizer
 (9 rows)
 
--- Distributing by enum has been banned, so this test is updated to instead distribute by a dummy int column
--- Banned because in backup/restore scenarios the data will be in the "wrong" segment as oids for each enum
--- entry are re-generated and hashing them will result in arbitrary segment assignment.
 create type colors as enum ('red', 'green', 'blue');
-create table legacy_enum(col1 int, color colors) distributed by(col1);
-insert into legacy_enum values (1, 'red'), (2, 'green'), (3, 'blue');
+create table legacy_enum(color colors) distributed by(color cdbhash_enum_ops);
+insert into legacy_enum values ('red'), ('green'), ('blue');
 explain (costs off) select * from legacy_enum a inner join legacy_enum b on a.color = b.color;
                  QUERY PLAN                  
 ---------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    ->  Hash Join
          Hash Cond: (a.color = b.color)
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)
-               Hash Key: a.color
-               ->  Seq Scan on legacy_enum a
+         ->  Seq Scan on legacy_enum a
          ->  Hash
-               ->  Redistribute Motion 3:3  (slice3; segments: 3)
-                     Hash Key: b.color
-                     ->  Seq Scan on legacy_enum b
+               ->  Seq Scan on legacy_enum b
  Optimizer: Postgres query optimizer
-(11 rows)
+(7 rows)
 
 select * from legacy_enum a inner join legacy_enum b on a.color = b.color;
- col1 | color | col1 | color 
-------+-------+------+-------
-    3 | blue  |    3 | blue
-    2 | green |    2 | green
-    1 | red   |    1 | red
+ color | color 
+-------+-------
+ blue  | blue
+ red   | red
+ green | green
 (3 rows)
 
 --
diff --git a/src/test/regress/expected/gpdist_legacy_opclasses_optimizer.out b/src/test/regress/expected/gpdist_legacy_opclasses_optimizer.out
index e02b9a3f00e..17ac0786a8f 100644
--- a/src/test/regress/expected/gpdist_legacy_opclasses_optimizer.out
+++ b/src/test/regress/expected/gpdist_legacy_opclasses_optimizer.out
@@ -295,31 +295,27 @@ explain (costs off) select * from modern_int a inner join legacy_domain_over_int
  Optimizer: Postgres query optimizer
 (9 rows)
 
--- Distributing by enum has been banned, so this test is updated to instead distribute by a dummy int column
--- Banned because in backup/restore scenarios the data will be in the "wrong" segment as oids for each enum
--- entry are re-generated and hashing them will result in arbitrary segment assignment.
 create type colors as enum ('red', 'green', 'blue');
-create table legacy_enum(col1 int, color colors) distributed by(col1);
-insert into legacy_enum values (1, 'red'), (2, 'green'), (3, 'blue');
+create table legacy_enum(color colors) distributed by(color cdbhash_enum_ops);
+insert into legacy_enum values ('red'), ('green'), ('blue');
 explain (costs off) select * from legacy_enum a inner join legacy_enum b on a.color = b.color;
-                 QUERY PLAN                  
----------------------------------------------
+                          QUERY PLAN                          
+--------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    ->  Hash Join
          Hash Cond: ((a.color)::anyenum = (b.color)::anyenum)
          ->  Seq Scan on legacy_enum a
          ->  Hash
-               ->  Broadcast Motion 3:3  (slice2; segments: 3)
-                     ->  Seq Scan on legacy_enum b
- Optimizer: Pivotal Optimizer (GPORCA) version 3.41.0
-(8 rows)
+               ->  Seq Scan on legacy_enum b
+ Optimizer: GPORCA
+(7 rows)
 
 select * from legacy_enum a inner join legacy_enum b on a.color = b.color;
- col1 | color | col1 | color 
-------+-------+------+-------
-    2 | green |    2 | green
-    3 | blue  |    3 | blue
-    1 | red   |    1 | red
+ color | color 
+-------+-------
+ blue  | blue
+ red   | red
+ green | green
 (3 rows)
 
 --
diff --git a/src/test/regress/expected/gporca.out b/src/test/regress/expected/gporca.out
index fc5adfd566c..50da048fb61 100644
--- a/src/test/regress/expected/gporca.out
+++ b/src/test/regress/expected/gporca.out
@@ -10297,7 +10297,7 @@ ORDER BY 1 asc ;
                Group Key: ((((tt.event_ts / 100000) / 5) * 5))
                ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=39875.47..39912.97 rows=1000 width=16)
                      Hash Key: ((((tt.event_ts / 100000) / 5) * 5))
-                     ->  Partial HashAggregate  (cost=39875.47..39892.97 rows=1000 width=16)
+                     ->  Streaming Partial HashAggregate  (cost=39875.47..39892.97 rows=1000 width=16)
                            Group Key: (((tt.event_ts / 100000) / 5) * 5)
                            ->  Hash Join  (cost=202.00..39819.05 rows=11283 width=8)
                                  Hash Cond: ((tq.sym)::bpchar = tt.symbol)
@@ -13084,7 +13084,7 @@ select * from foo join (select min_a, count(*) as cnt from (select min(a) as min
                Group Key: (min(tbitmap.a))
                ->  Redistribute Motion 3:3  (slice2; segments: 3)
                      Hash Key: (min(tbitmap.a))
-                     ->  Partial HashAggregate
+                     ->  Streaming Partial HashAggregate
                            Group Key: min(tbitmap.a)
                            ->  HashAggregate
                                  Group Key: tbitmap.b
@@ -14999,7 +14999,7 @@ explain (costs off) select max(s1) from foo inner join bar on j1 = j2 group by g
          Group Key: foo.g1
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Hash Key: foo.g1
-               ->  Partial HashAggregate
+               ->  Streaming Partial HashAggregate
                      Group Key: foo.g1
                      ->  Hash Join
                            Hash Cond: (foo.j1 = bar.j2)
@@ -15012,3 +15012,144 @@ explain (costs off) select max(s1) from foo inner join bar on j1 = j2 group by g
 drop table foo;
 drop table bar;
 reset optimizer_enable_eageragg;
+--
+-- Test CTE with nested joins to verify fix for infinite recursion during statistic derivation
+-- This test case exercises ORCA's ability to handle CTEs with complex join patterns
+-- and redistribution motions without falling into infinite recursion
+--
+create table cte_test1 (a int, b int, c int) distributed randomly;
+create table cte_test2 (a int, b int, c int) distributed randomly;
+create table cte_test3 (a int, b int, c int) distributed randomly;
+explain (costs off) with cte1 as (
+  select cte_test1.a, cte_test2.b, cte_test1.c from cte_test1 inner join cte_test2 on cte_test1.a = cte_test2.b
+),
+cte2 as (select * from cte1)
+select * from cte2 inner join cte_test3 on cte2.c = cte_test3.a;
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Hash Join
+         Hash Cond: (cte_test1.c = cte_test3.a)
+         ->  Hash Join
+               Hash Cond: (cte_test1.a = cte_test2.b)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Hash Key: cte_test1.a
+                     ->  Seq Scan on cte_test1
+               ->  Hash
+                     ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                           Hash Key: cte_test2.b
+                           ->  Seq Scan on cte_test2
+         ->  Hash
+               ->  Broadcast Motion 3:3  (slice4; segments: 3)
+                     ->  Seq Scan on cte_test3
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+drop table cte_test1;
+drop table cte_test2;
+drop table cte_test3;
+-- start_ignore
+DROP SCHEMA orca CASCADE;
+NOTICE:  drop cascades to 190 other objects
+DETAIL:  drop cascades to table bar1
+drop cascades to table bar2
+drop cascades to table r
+drop cascades to table s
+drop cascades to table m
+drop cascades to table m1
+drop cascades to table orca_w1
+drop cascades to table orca_w2
+drop cascades to table orca_w3
+drop cascades to table rcte
+drop cascades to table onek
+drop cascades to table pp
+drop cascades to table multilevel_p
+drop cascades to table t
+drop cascades to table t_date
+drop cascades to table t_text
+drop cascades to table t_ceeval_ints
+drop cascades to function csq_f(integer)
+drop cascades to table csq_r
+drop cascades to table fooh1
+drop cascades to table fooh2
+drop cascades to table t77
+drop cascades to table prod9
+drop cascades to table toanalyze
+drop cascades to table ur
+drop cascades to table us
+drop cascades to table ut
+drop cascades to table uu
+drop cascades to table twf1
+drop cascades to table twf2
+drop cascades to table tab1
+drop cascades to table tab2
+drop cascades to function sum_sfunc(anyelement,anyelement)
+drop cascades to function sum_combinefunc(anyelement,anyelement)
+drop cascades to function myagg1(anyelement)
+drop cascades to function sum_sfunc2(anyelement,anyelement,anyelement)
+drop cascades to function myagg2(anyelement,anyelement)
+drop cascades to function gptfp(anyarray,anyelement)
+drop cascades to function gpffp(anyarray)
+drop cascades to function myagg3(anyelement)
+drop cascades to table array_table
+drop cascades to table mpp22453
+drop cascades to table mpp22791
+drop cascades to table p1
+drop cascades to table tmp_verd_s_pp_provtabs_agt_0015_extract1
+drop cascades to table arrtest
+drop cascades to table foo_missing_stats
+drop cascades to table bar_missing_stats
+drop cascades to table table_with_small_statistic_precision_diff
+drop cascades to table cust
+drop cascades to table datedim
+drop cascades to function plusone(integer)
+drop cascades to table bm_test
+drop cascades to table bm_dyn_test
+drop cascades to table bm_dyn_test_onepart
+drop cascades to table bm_dyn_test_multilvl_part
+drop cascades to table my_tt_agg_opt
+drop cascades to table my_tq_agg_opt_part
+drop cascades to function plusone(numeric)
+drop cascades to table ggg
+drop cascades to table t3
+drop cascades to table index_test
+drop cascades to table btree_test
+drop cascades to table bitmap_test
+drop cascades to type rainbow
+drop cascades to table foo_ctas
+drop cascades to table input_tab1
+drop cascades to table input_tab2
+drop cascades to table tab_1
+drop cascades to table tab_2
+drop cascades to table tab_3
+drop cascades to table t_outer
+drop cascades to table t_inner
+drop cascades to table wst0
+drop cascades to table wst1
+drop cascades to table wst2
+drop cascades to table test1
+drop cascades to table t_new
+drop cascades to table x_tab
+drop cascades to table y_tab
+drop cascades to table z_tab
+drop cascades to function test_func_pg_stats()
+drop cascades to function myintin(cstring)
+drop cascades to type myint
+drop cascades to function myintout(myint)
+drop cascades to function myint_int8(myint)
+drop cascades to table csq_cast_param_outer
+drop cascades to table csq_cast_param_inner
+drop cascades to function myint_numeric(myint)
+drop cascades to cast from myint to numeric
+drop cascades to table onetimefilter1
+drop cascades to table onetimefilter2
+drop cascades to table ffoo
+drop cascades to table fbar
+drop cascades to table touter
+drop cascades to table tinnerbitmap
+drop cascades to table tinnerbtree
+drop cascades to table ds_part
+drop cascades to table non_part1
+drop cascades to table non_part2
+and 90 other objects (see server log for list)
+-- end_ignore
diff --git a/src/test/regress/expected/gporca_faults.out b/src/test/regress/expected/gporca_faults.out
index c8e6f7ff557..e60f3b048b7 100644
--- a/src/test/regress/expected/gporca_faults.out
+++ b/src/test/regress/expected/gporca_faults.out
@@ -70,3 +70,28 @@ SELECT gp_inject_fault('opt_relcache_translator_catalog_access', 'reset', 1);
  Success:
 (1 row)
 
+-- Test to check that GPOPTOptimizedPlan() does not cause std::terminate() by throwing an uncaught exception.
+CREATE TABLE test_orca_uncaught_exc(a int, b int) DISTRIBUTED RANDOMLY;
+-- Since ORCA cannot optimize this query, an exception is generated. We then inject a second exception when the
+-- first is caught and verify that it is not propagated further (no std::terminate() is called and backend is alive).
+SELECT gp_inject_fault('opt_clone_error_msg', 'skip', 1);
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+SELECT sum(distinct a), count(distinct b) FROM test_orca_uncaught_exc;
+ sum | count 
+-----+-------
+     |     0
+(1 row)
+
+SELECT gp_inject_fault('opt_clone_error_msg', 'reset', 1);
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+-- start_ignore
+DROP TABLE test_orca_uncaught_exc;
+-- end_ignore
diff --git a/src/test/regress/expected/gporca_faults_optimizer.out b/src/test/regress/expected/gporca_faults_optimizer.out
index 46ca0efe7ad..32b5b317298 100644
--- a/src/test/regress/expected/gporca_faults_optimizer.out
+++ b/src/test/regress/expected/gporca_faults_optimizer.out
@@ -62,3 +62,24 @@ SELECT gp_inject_fault('opt_relcache_translator_catalog_access', 'reset', 1);
  Success:
 (1 row)
 
+-- Test to check that GPOPTOptimizedPlan() does not cause std::terminate() by throwing an uncaught exception.
+CREATE TABLE test_orca_uncaught_exc(a int, b int) DISTRIBUTED RANDOMLY;
+-- Since ORCA cannot optimize this query, an exception is generated. We then inject a second exception when the
+-- first is caught and verify that it is not propagated further (no std::terminate() is called and backend is alive).
+SELECT gp_inject_fault('opt_clone_error_msg', 'skip', 1);
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+SELECT sum(distinct a), count(distinct b) FROM test_orca_uncaught_exc;
+ERROR:  Injected error (COptTasks.cpp:180)
+SELECT gp_inject_fault('opt_clone_error_msg', 'reset', 1);
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+-- start_ignore
+DROP TABLE test_orca_uncaught_exc;
+-- end_ignore
diff --git a/src/test/regress/expected/gporca_optimizer.out b/src/test/regress/expected/gporca_optimizer.out
index 6afe28abe77..b8b83e01ab2 100644
--- a/src/test/regress/expected/gporca_optimizer.out
+++ b/src/test/regress/expected/gporca_optimizer.out
@@ -11295,10 +11295,9 @@ EXPLAIN (COSTS OFF) WITH abc AS (SELECT onetimefilter1.a, onetimefilter1.b FROM
                        Filter: (share0_ref3.b = f1.b)
                        ->  Materialize
                              ->  Broadcast Motion 3:3  (slice6; segments: 3)
-                                   ->  Result
-                                         ->  Shared Scan (share slice:id 6:0)
+                                   ->  Shared Scan (share slice:id 6:0)
  Optimizer: GPORCA
-(43 rows)
+(42 rows)
 
 WITH abc AS (SELECT onetimefilter1.a, onetimefilter1.b FROM onetimefilter1, onetimefilter2 WHERE onetimefilter1.a=onetimefilter2.a) SELECT (SELECT 1 FROM abc WHERE f1.b = f2.b LIMIT 1), COALESCE((SELECT 2 FROM abc WHERE f1.a=random() AND f1.a=2), 0), (SELECT b FROM abc WHERE b=f1.b) FROM onetimefilter1 f1, onetimefilter2 f2 WHERE f1.b = f2.b;
  ?column? | coalesce | b  
@@ -12013,35 +12012,31 @@ EXPLAIN SELECT a, b FROM atab_old_hash FULL JOIN btab_old_hash ON a |=| b;
    ->  Result  (cost=0.00..2586.00 rows=4 width=8)
          ->  Sequence  (cost=0.00..2586.00 rows=4 width=8)
                ->  Shared Scan (share slice:id 1:2)  (cost=0.00..431.00 rows=2 width=1)
-                     ->  Seq Scan on btab_old_hash  (cost=0.00..431.00 rows=2 width=34)
+                     ->  Seq Scan on btab_old_hash  (cost=0.00..431.00 rows=2 width=38)
                ->  Sequence  (cost=0.00..2155.00 rows=4 width=8)
                      ->  Shared Scan (share slice:id 1:3)  (cost=0.00..431.00 rows=1 width=1)
-                           ->  Seq Scan on atab_old_hash  (cost=0.00..431.00 rows=1 width=34)
+                           ->  Seq Scan on atab_old_hash  (cost=0.00..431.00 rows=1 width=38)
                      ->  Append  (cost=0.00..1724.00 rows=4 width=8)
                            ->  Hash Left Join  (cost=0.00..862.00 rows=3 width=8)
                                  Hash Cond: (share2_ref2.b |=| share3_ref2.a)
                                  ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
                                        Hash Key: share2_ref2.b
-                                       ->  Result  (cost=0.00..431.00 rows=2 width=4)
-                                             ->  Shared Scan (share slice:id 2:2)  (cost=0.00..431.00 rows=2 width=4)
+                                       ->  Shared Scan (share slice:id 2:2)  (cost=0.00..431.00 rows=2 width=4)
                                  ->  Hash  (cost=431.00..431.00 rows=1 width=4)
                                        ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
                                              Hash Key: share3_ref2.a
-                                             ->  Result  (cost=0.00..431.00 rows=1 width=4)
-                                                   ->  Shared Scan (share slice:id 3:3)  (cost=0.00..431.00 rows=1 width=4)
+                                             ->  Shared Scan (share slice:id 3:3)  (cost=0.00..431.00 rows=1 width=4)
                            ->  Hash Anti Join  (cost=0.00..862.00 rows=1 width=4)
                                  Hash Cond: (share3_ref3.a |=| share2_ref3.b)
                                  ->  Redistribute Motion 3:3  (slice4; segments: 3)  (cost=0.00..431.00 rows=1 width=4)
                                        Hash Key: share3_ref3.a
-                                       ->  Result  (cost=0.00..431.00 rows=1 width=4)
-                                             ->  Shared Scan (share slice:id 4:3)  (cost=0.00..431.00 rows=1 width=4)
+                                       ->  Shared Scan (share slice:id 4:3)  (cost=0.00..431.00 rows=1 width=4)
                                  ->  Hash  (cost=431.00..431.00 rows=2 width=4)
                                        ->  Redistribute Motion 3:3  (slice5; segments: 3)  (cost=0.00..431.00 rows=2 width=4)
                                              Hash Key: share2_ref3.b
-                                             ->  Result  (cost=0.00..431.00 rows=2 width=4)
-                                                   ->  Shared Scan (share slice:id 5:2)  (cost=0.00..431.00 rows=2 width=4)
+                                             ->  Shared Scan (share slice:id 5:2)  (cost=0.00..431.00 rows=2 width=4)
  Optimizer: GPORCA
-(32 rows)
+(28 rows)
 
 SELECT a, b FROM atab_old_hash FULL JOIN btab_old_hash ON a |=| b;
  a  | b  
@@ -15054,3 +15049,144 @@ explain (costs off) select max(s1) from foo inner join bar on j1 = j2 group by g
 drop table foo;
 drop table bar;
 reset optimizer_enable_eageragg;
+--
+-- Test CTE with nested joins to verify fix for infinite recursion during statistic derivation
+-- This test case exercises ORCA's ability to handle CTEs with complex join patterns
+-- and redistribution motions without falling into infinite recursion
+--
+create table cte_test1 (a int, b int, c int) distributed randomly;
+create table cte_test2 (a int, b int, c int) distributed randomly;
+create table cte_test3 (a int, b int, c int) distributed randomly;
+explain (costs off) with cte1 as (
+  select cte_test1.a, cte_test2.b, cte_test1.c from cte_test1 inner join cte_test2 on cte_test1.a = cte_test2.b
+),
+cte2 as (select * from cte1)
+select * from cte2 inner join cte_test3 on cte2.c = cte_test3.a;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Hash Join
+         Hash Cond: (cte_test1.c = cte_test3.a)
+         ->  Redistribute Motion 3:3  (slice2; segments: 3)
+               Hash Key: cte_test1.c
+               ->  Hash Join
+                     Hash Cond: (cte_test1.a = cte_test2.b)
+                     ->  Seq Scan on cte_test1
+                     ->  Hash
+                           ->  Broadcast Motion 3:3  (slice3; segments: 3)
+                                 ->  Seq Scan on cte_test2
+         ->  Hash
+               ->  Redistribute Motion 3:3  (slice4; segments: 3)
+                     Hash Key: cte_test3.a
+                     ->  Seq Scan on cte_test3
+ Optimizer: GPORCA
+(16 rows)
+
+drop table cte_test1;
+drop table cte_test2;
+drop table cte_test3;
+-- start_ignore
+DROP SCHEMA orca CASCADE;
+NOTICE:  drop cascades to 190 other objects
+DETAIL:  drop cascades to table bar1
+drop cascades to table bar2
+drop cascades to table r
+drop cascades to table s
+drop cascades to table m
+drop cascades to table m1
+drop cascades to table orca_w1
+drop cascades to table orca_w2
+drop cascades to table orca_w3
+drop cascades to table rcte
+drop cascades to table onek
+drop cascades to table pp
+drop cascades to table multilevel_p
+drop cascades to table t
+drop cascades to table t_date
+drop cascades to table t_text
+drop cascades to table t_ceeval_ints
+drop cascades to function csq_f(integer)
+drop cascades to table csq_r
+drop cascades to table fooh1
+drop cascades to table fooh2
+drop cascades to table t77
+drop cascades to table prod9
+drop cascades to table toanalyze
+drop cascades to table ur
+drop cascades to table us
+drop cascades to table ut
+drop cascades to table uu
+drop cascades to table twf1
+drop cascades to table twf2
+drop cascades to table tab1
+drop cascades to table tab2
+drop cascades to function sum_sfunc(anyelement,anyelement)
+drop cascades to function sum_combinefunc(anyelement,anyelement)
+drop cascades to function myagg1(anyelement)
+drop cascades to function sum_sfunc2(anyelement,anyelement,anyelement)
+drop cascades to function myagg2(anyelement,anyelement)
+drop cascades to function gptfp(anyarray,anyelement)
+drop cascades to function gpffp(anyarray)
+drop cascades to function myagg3(anyelement)
+drop cascades to table array_table
+drop cascades to table mpp22453
+drop cascades to table mpp22791
+drop cascades to table p1
+drop cascades to table tmp_verd_s_pp_provtabs_agt_0015_extract1
+drop cascades to table arrtest
+drop cascades to table foo_missing_stats
+drop cascades to table bar_missing_stats
+drop cascades to table table_with_small_statistic_precision_diff
+drop cascades to table cust
+drop cascades to table datedim
+drop cascades to function plusone(integer)
+drop cascades to table bm_test
+drop cascades to table bm_dyn_test
+drop cascades to table bm_dyn_test_onepart
+drop cascades to table bm_dyn_test_multilvl_part
+drop cascades to table my_tt_agg_opt
+drop cascades to table my_tq_agg_opt_part
+drop cascades to function plusone(numeric)
+drop cascades to table ggg
+drop cascades to table t3
+drop cascades to table index_test
+drop cascades to table btree_test
+drop cascades to table bitmap_test
+drop cascades to type rainbow
+drop cascades to table foo_ctas
+drop cascades to table input_tab1
+drop cascades to table input_tab2
+drop cascades to table tab_1
+drop cascades to table tab_2
+drop cascades to table tab_3
+drop cascades to table t_outer
+drop cascades to table t_inner
+drop cascades to table wst0
+drop cascades to table wst1
+drop cascades to table wst2
+drop cascades to table test1
+drop cascades to table t_new
+drop cascades to table x_tab
+drop cascades to table y_tab
+drop cascades to table z_tab
+drop cascades to function test_func_pg_stats()
+drop cascades to function myintin(cstring)
+drop cascades to type myint
+drop cascades to function myintout(myint)
+drop cascades to function myint_int8(myint)
+drop cascades to table csq_cast_param_outer
+drop cascades to table csq_cast_param_inner
+drop cascades to function myint_numeric(myint)
+drop cascades to cast from myint to numeric
+drop cascades to table onetimefilter1
+drop cascades to table onetimefilter2
+drop cascades to table ffoo
+drop cascades to table fbar
+drop cascades to table touter
+drop cascades to table tinnerbitmap
+drop cascades to table tinnerbtree
+drop cascades to table ds_part
+drop cascades to table non_part1
+drop cascades to table non_part2
+and 90 other objects (see server log for list)
+-- end_ignore
diff --git a/src/test/regress/expected/gpsd.out b/src/test/regress/expected/gpsd.out
index 71ee193381e..7d0864bb936 100644
--- a/src/test/regress/expected/gpsd.out
+++ b/src/test/regress/expected/gpsd.out
@@ -103,10 +103,10 @@ select
 from pg_statistic where starelid IN ('gpsd_foo'::regclass, 'gpsd_foo_1'::regclass);
  staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 | stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 | staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 | stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 |                stavalues1                | stavalues2 | stavalues3 | stavalues4 | stavalues5 
 -----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------------------------------------+------------+------------+------------+------------
-         1 | t          |           0 |        4 |          -1 |        2 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1,2,3,4,5}                              |            |            |            | 
-         2 | t          |           0 |        7 |          -1 |        2 |        0 |        0 |        0 |        0 |    664 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {"a \\ and a \"",i,something,z'world',Ϩ} |            |            |            | 
-         1 | f          |           0 |        4 |          -1 |        2 |        3 |        0 |        0 |        0 |     97 |     97 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             | {1}         |             |             |             | {1,2,3,4,5}                              |            |            |            | 
-         2 | f          |           0 |        7 |          -1 |        2 |        3 |        0 |        0 |        0 |    664 |    664 |      0 |      0 |      0 |      100 |      100 |        0 |        0 |        0 |             | {-1}        |             |             |             | {"a \\ and a \"",i,something,z'world',Ϩ} |            |            |            | 
+         1 | t          |           0 |        4 |          -1 |        2 |        8 |        0 |        0 |        0 |     97 |     97 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1,2,3,4,5}                              | {5}        |            |            | 
+         2 | t          |           0 |        7 |          -1 |        2 |        8 |        0 |        0 |        0 |    664 |    664 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {"a \\ and a \"",i,something,z'world',Ϩ} | {5}        |            |            | 
+         1 | f          |           0 |        4 |          -1 |        2 |        3 |        8 |        0 |        0 |     97 |     97 |     97 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             | {1}         |             |             |             | {1,2,3,4,5}                              |            | {5}        |            | 
+         2 | f          |           0 |        7 |          -1 |        2 |        3 |        8 |        0 |        0 |    664 |    664 |    664 |      0 |      0 |      100 |      100 |      100 |        0 |        0 |             | {-1}        |             |             |             | {"a \\ and a \"",i,something,z'world',Ϩ} |            | {5}        |            | 
 (4 rows)
 
 --------------------------------------------------------------------------------
@@ -170,9 +170,9 @@ select
 from pg_statistic where starelid IN ('gpsd_foo'::regclass, 'gpsd_foo_1'::regclass);
  staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 | stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 | staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 | stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2 |   stavalues3    | stavalues4 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           stavalues5                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
 -----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+-----------------+------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-         1 | t          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |                 |            | 
-         2 | t          |           0 |       10 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            | {hello,'world'} |            | 
-         1 | f          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |       99 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |                 |            | {"\\x0e060200ffffffff0000000001000000010000000000803f0000803f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
-         2 | f          |           0 |       10 |          -1 |        0 |        0 |        0 |        0 |       99 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |                 |            | {"\\x0e060200ffffffff0000000001000000010000000000803f0000803f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
+         1 | t          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |                 |            | 
+         2 | t          |           0 |       10 |          -1 |        8 |        0 |        0 |        0 |        0 |    664 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            | {hello,'world'} |            | 
+         1 | f          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |       99 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |                 |            | {"\\x0e060200ffffffff0000000001000000010000000000803f0000803f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
+         2 | f          |           0 |       10 |          -1 |        8 |        0 |        0 |        0 |       99 |    664 |      0 |      0 |      0 |      0 |      100 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |                 |            | {"\\x0e060200ffffffff0000000001000000010000000000803f0000803f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
 (4 rows)
 
diff --git a/src/test/regress/expected/groupingsets.out b/src/test/regress/expected/groupingsets.out
index ae84ced2484..f7eefa2c8eb 100644
--- a/src/test/regress/expected/groupingsets.out
+++ b/src/test/regress/expected/groupingsets.out
@@ -1861,6 +1861,7 @@ select array(select row(v.a,s1.*) from (select two,four, count(*) from onek grou
 (2 rows)
 
 -- test the knapsack
+set hash_mem_multiplier = 1;
 set enable_indexscan = false;
 set work_mem = '64kB';
 explain (costs off)
@@ -1940,6 +1941,7 @@ explain (costs off)
  Optimizer: Postgres query optimizer
 (15 rows)
 
+reset hash_mem_multiplier;
 -- check collation-sensitive matching between grouping expressions
 -- (similar to a check for aggregates, but there are additional code
 -- paths for GROUPING, so check again here)
diff --git a/src/test/regress/expected/groupingsets_optimizer.out b/src/test/regress/expected/groupingsets_optimizer.out
index d59a83ae9cf..08ef4c1a68c 100644
--- a/src/test/regress/expected/groupingsets_optimizer.out
+++ b/src/test/regress/expected/groupingsets_optimizer.out
@@ -1924,6 +1924,7 @@ select array(select row(v.a,s1.*) from (select two,four, count(*) from onek grou
 (2 rows)
 
 -- test the knapsack
+set hash_mem_multiplier = 1;
 set enable_indexscan = false;
 set work_mem = '64kB';
 explain (costs off)
@@ -1967,12 +1968,11 @@ explain (costs off)
                            ->  Streaming Partial HashAggregate
                                  Group Key: share0_ref5.hundred
                                  ->  Shared Scan (share slice:id 5:0)
-               ->  Finalize HashAggregate
+               ->  HashAggregate
                      Group Key: share0_ref6.thousand
                      ->  Redistribute Motion 3:3  (slice6; segments: 3)
                            Hash Key: share0_ref6.thousand
-                           ->  Streaming Partial HashAggregate
-                                 Group Key: share0_ref6.thousand
+                           ->  Result
                                  ->  Shared Scan (share slice:id 6:0)
                ->  HashAggregate
                      Group Key: share0_ref7.twothousand
@@ -1984,7 +1984,7 @@ explain (costs off)
                      Group Key: share0_ref8.unique1
                      ->  Shared Scan (share slice:id 1:0)
  Optimizer: Pivotal Optimizer (GPORCA)
-(50 rows)
+(49 rows)
 
 explain (costs off)
   select unique1,
@@ -2075,12 +2075,11 @@ explain (costs off)
                            ->  Streaming Partial HashAggregate
                                  Group Key: share0_ref5.hundred
                                  ->  Shared Scan (share slice:id 5:0)
-               ->  Finalize HashAggregate
+               ->  HashAggregate
                      Group Key: share0_ref6.thousand
                      ->  Redistribute Motion 3:3  (slice6; segments: 3)
                            Hash Key: share0_ref6.thousand
-                           ->  Streaming Partial HashAggregate
-                                 Group Key: share0_ref6.thousand
+                           ->  Result
                                  ->  Shared Scan (share slice:id 6:0)
                ->  HashAggregate
                      Group Key: share0_ref7.twothousand
@@ -2092,8 +2091,9 @@ explain (costs off)
                      Group Key: share0_ref8.unique1
                      ->  Shared Scan (share slice:id 1:0)
  Optimizer: Pivotal Optimizer (GPORCA)
-(50 rows)
+(49 rows)
 
+reset hash_mem_multiplier;
 -- check collation-sensitive matching between grouping expressions
 -- (similar to a check for aggregates, but there are additional code
 -- paths for GROUPING, so check again here)
diff --git a/src/test/regress/expected/hs_primary_setup.out b/src/test/regress/expected/hs_primary_setup.out
new file mode 100644
index 00000000000..0184b2b73e9
--- /dev/null
+++ b/src/test/regress/expected/hs_primary_setup.out
@@ -0,0 +1,19 @@
+--
+-- Hot Standby tests
+--
+-- hs_primary_setup.sql
+--
+drop table if exists hs1;
+create table hs1 (col1 integer primary key);
+insert into hs1 values (1);
+drop table if exists hs2;
+create table hs2 (col1 integer primary key);
+insert into hs2 values (12);
+insert into hs2 values (13);
+drop table if exists hs3;
+create table hs3 (col1 integer primary key);
+insert into hs3 values (113);
+insert into hs3 values (114);
+insert into hs3 values (115);
+DROP sequence if exists hsseq;
+create sequence hsseq;
diff --git a/src/test/regress/expected/hs_standby_allowed.out b/src/test/regress/expected/hs_standby_allowed.out
index 00b8faf9eb6..e6b6514642f 100644
--- a/src/test/regress/expected/hs_standby_allowed.out
+++ b/src/test/regress/expected/hs_standby_allowed.out
@@ -164,31 +164,25 @@ show synchronous_commit;
 reset synchronous_commit;
 discard temp;
 discard all;
+NOTICE:  command without clusterwide effect
+HINT:  Consider alternatives as DEALLOCATE ALL, or DISCARD TEMP if a clusterwide effect is desired.
 -- CURSOR commands
 BEGIN;
-DECLARE hsc CURSOR FOR select * from hs3;
+DECLARE hsc CURSOR FOR select * from hs3 order by col1 asc;
 FETCH next from hsc;
  col1 
 ------
   113
 (1 row)
 
-fetch first from hsc;
- col1 
-------
-  113
-(1 row)
-
-fetch last from hsc;
- col1 
-------
-  115
-(1 row)
-
+-- GPDB: backward fetch isn't allowed, moved to hs_standby_disallowed
+-- fetch first from hsc;
+-- fetch last from hsc;
 fetch 1 from hsc;
  col1 
 ------
-(0 rows)
+  114
+(1 row)
 
 CLOSE hsc;
 COMMIT;
@@ -216,3 +210,5 @@ UNLISTEN *;
 -- ALLOWED COMMANDS
 CHECKPOINT;
 discard all;
+NOTICE:  command without clusterwide effect
+HINT:  Consider alternatives as DEALLOCATE ALL, or DISCARD TEMP if a clusterwide effect is desired.
diff --git a/src/test/regress/expected/hs_standby_disallowed.out b/src/test/regress/expected/hs_standby_disallowed.out
index 8d3cafa5cec..0a62e40e743 100644
--- a/src/test/regress/expected/hs_standby_disallowed.out
+++ b/src/test/regress/expected/hs_standby_disallowed.out
@@ -11,9 +11,15 @@ commit;
 WARNING:  there is no transaction in progress
 -- SELECT
 select * from hs1 FOR SHARE;
-ERROR:  cannot execute SELECT FOR SHARE in a read-only transaction
+ERROR:  cannot acquire lock mode ExclusiveLock on database objects while recovery is in progress
+LINE 1: select * from hs1 FOR SHARE;
+                      ^
+HINT:  Only RowExclusiveLock or less can be acquired on database objects during recovery.
 select * from hs1 FOR UPDATE;
-ERROR:  cannot execute SELECT FOR UPDATE in a read-only transaction
+ERROR:  cannot acquire lock mode ExclusiveLock on database objects while recovery is in progress
+LINE 1: select * from hs1 FOR UPDATE;
+                      ^
+HINT:  Only RowExclusiveLock or less can be acquired on database objects during recovery.
 -- DML
 BEGIN;
 insert into hs1 values (37);
@@ -21,11 +27,17 @@ ERROR:  cannot execute INSERT in a read-only transaction
 ROLLBACK;
 BEGIN;
 delete from hs1 where col1 = 1;
-ERROR:  cannot execute DELETE in a read-only transaction
+ERROR:  cannot acquire lock mode ExclusiveLock on database objects while recovery is in progress
+LINE 1: delete from hs1 where col1 = 1;
+                    ^
+HINT:  Only RowExclusiveLock or less can be acquired on database objects during recovery.
 ROLLBACK;
 BEGIN;
 update hs1 set col1 = NULL where col1 > 0;
-ERROR:  cannot execute UPDATE in a read-only transaction
+ERROR:  cannot acquire lock mode ExclusiveLock on database objects while recovery is in progress
+LINE 1: update hs1 set col1 = NULL where col1 > 0;
+               ^
+HINT:  Only RowExclusiveLock or less can be acquired on database objects during recovery.
 ROLLBACK;
 BEGIN;
 truncate hs3;
@@ -131,3 +143,15 @@ REVOKE SELECT ON hs1 FROM PUBLIC;
 ERROR:  cannot execute REVOKE in a read-only transaction
 GRANT SELECT ON hs1 TO PUBLIC;
 ERROR:  cannot execute GRANT in a read-only transaction
+-- GPDB: backward fetch is not supported, moved from hs_standby_allowed.
+BEGIN;
+DECLARE hsc CURSOR FOR select * from hs3 order by col1 asc;
+fetch next from hsc;
+ col1 
+------
+  113
+(1 row)
+
+fetch first from hsc;
+ERROR:  backward scan is not supported in this version of Apache Cloudberry
+COMMIT;
diff --git a/src/test/regress/expected/hs_standby_functions.out b/src/test/regress/expected/hs_standby_functions.out
index ce846b758bf..48cb480f47a 100644
--- a/src/test/regress/expected/hs_standby_functions.out
+++ b/src/test/regress/expected/hs_standby_functions.out
@@ -27,13 +27,16 @@ select * from pg_prepared_xacts;
 -------------+-----+----------+-------+----------
 (0 rows)
 
--- just the startup process
-select locktype, virtualxid, virtualtransaction, mode, granted
+-- just the startup processes of all standby coordinator and segments, since pg_locks show cluster-wide view
+select gp_segment_id, locktype, virtualxid, virtualtransaction, mode, granted
 from pg_locks where virtualxid = '1/1';
-  locktype  | virtualxid | virtualtransaction |     mode      | granted 
-------------+------------+--------------------+---------------+---------
- virtualxid | 1/1        | 1/0                | ExclusiveLock | t
-(1 row)
+ gp_segment_id |  locktype  | virtualxid | virtualtransaction |     mode      | granted 
+---------------+------------+------------+--------------------+---------------+---------
+            -1 | virtualxid | 1/1        | 1/0                | ExclusiveLock | t
+             0 | virtualxid | 1/1        | 1/0                | ExclusiveLock | t
+             1 | virtualxid | 1/1        | 1/0                | ExclusiveLock | t
+             2 | virtualxid | 1/1        | 1/0                | ExclusiveLock | t
+(4 rows)
 
 -- suicide is painless
 select pg_cancel_backend(pg_backend_pid());
diff --git a/src/test/regress/expected/icudp/gp_interconnect_fc_method.out b/src/test/regress/expected/icudp/gp_interconnect_fc_method.out
index b115c95a393..4dcda3b8124 100644
--- a/src/test/regress/expected/icudp/gp_interconnect_fc_method.out
+++ b/src/test/regress/expected/icudp/gp_interconnect_fc_method.out
@@ -96,3 +96,49 @@ SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(len
     29 |   100 |         2600
 (30 rows)
 
+SET gp_interconnect_fc_method = "loss_advance";
+SHOW gp_interconnect_fc_method;
+ gp_interconnect_fc_method 
+---------------------------
+ loss_advance
+(1 row)
+
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
diff --git a/src/test/regress/expected/icudp/queue_depth_combination_capacity.out b/src/test/regress/expected/icudp/queue_depth_combination_capacity.out
index ec8ea9594d6..64c177e36d5 100644
--- a/src/test/regress/expected/icudp/queue_depth_combination_capacity.out
+++ b/src/test/regress/expected/icudp/queue_depth_combination_capacity.out
@@ -266,3 +266,260 @@ SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(len
     29 |   100 |         2600
 (30 rows)
 
+-- Skew with gather+redistribute
+SET gp_interconnect_fc_method = "loss_advance";
+SHOW gp_interconnect_fc_method;
+ gp_interconnect_fc_method 
+---------------------------
+ loss_advance
+(1 row)
+
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1024;
+SET gp_interconnect_queue_depth = 1024;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
diff --git a/src/test/regress/expected/icudp/queue_depth_combination_loss_advance.out b/src/test/regress/expected/icudp/queue_depth_combination_loss_advance.out
new file mode 100644
index 00000000000..c509dd84ef7
--- /dev/null
+++ b/src/test/regress/expected/icudp/queue_depth_combination_loss_advance.out
@@ -0,0 +1,260 @@
+-- 
+-- @description Interconncet flow control test case: combination guc value
+-- @created 2025-09-12
+-- Set mode
+SET gp_interconnect_fc_method = "loss_advance";
+-- Create a table
+CREATE TEMP TABLE small_table(dkey INT, jkey INT, rval REAL, tval TEXT default 'abcdefghijklmnopqrstuvwxyz') DISTRIBUTED BY (dkey);
+-- Generate some data
+INSERT INTO small_table VALUES(generate_series(1, 5000), generate_series(5001, 10000), sqrt(generate_series(5001, 10000)));
+-- Functional tests
+-- Skew with gather+redistribute
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1024;
+SET gp_interconnect_queue_depth = 1024;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+ rval2 | count | sum_len_tval 
+-------+-------+--------------
+     0 |   100 |         2600
+     1 |   100 |         2600
+     2 |   100 |         2600
+     3 |   100 |         2600
+     4 |   100 |         2600
+     5 |   100 |         2600
+     6 |   100 |         2600
+     7 |   100 |         2600
+     8 |   100 |         2600
+     9 |   100 |         2600
+    10 |   100 |         2600
+    11 |   100 |         2600
+    12 |   100 |         2600
+    13 |   100 |         2600
+    14 |   100 |         2600
+    15 |   100 |         2600
+    16 |   100 |         2600
+    17 |   100 |         2600
+    18 |   100 |         2600
+    19 |   100 |         2600
+    20 |   100 |         2600
+    21 |   100 |         2600
+    22 |   100 |         2600
+    23 |   100 |         2600
+    24 |   100 |         2600
+    25 |   100 |         2600
+    26 |   100 |         2600
+    27 |   100 |         2600
+    28 |   100 |         2600
+    29 |   100 |         2600
+(30 rows)
+
diff --git a/src/test/regress/expected/incremental_analyze.out b/src/test/regress/expected/incremental_analyze.out
index 99646363b17..a2caf59e0e9 100644
--- a/src/test/regress/expected/incremental_analyze.out
+++ b/src/test/regress/expected/incremental_analyze.out
@@ -1949,7 +1949,7 @@ SELECT staattnum, stakind1, stakind2, stakind3, stakind4, stakind5,
 FROM pg_statistic WHERE starelid = 'simple_table_no_hll'::regclass;
  staattnum | stakind1 | stakind2 | stakind3 | stakind4 | stakind5 |  stavalues1  | stavalues2 | stavalues3 | stavalues4 | stavalues5 
 -----------+----------+----------+----------+----------+----------+--------------+------------+------------+------------+------------
-         1 |        2 |        3 |        0 |        0 |        0 | {1,3,5,7,10} |            |            |            | 
+         1 |        2 |        3 |        8 |        0 |        0 | {1,3,5,7,10} |            | {10}       |            | 
 (1 row)
 
 -- Make sure analyze rootpartition option works in an option list
diff --git a/src/test/regress/expected/incremental_sort.out b/src/test/regress/expected/incremental_sort.out
index 9bdd3486d2b..c5f52e1e97f 100644
--- a/src/test/regress/expected/incremental_sort.out
+++ b/src/test/regress/expected/incremental_sort.out
@@ -589,7 +589,6 @@ select explain_analyze_without_memory('select * from (select * from t order by a
  Optimizer: Postgres query optimizer
 (13 rows)
 
-reset max_parallel_workers_per_gather;
 select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from (select * from t order by a) s order by a, b limit 55'));
                   jsonb_pretty                   
 -------------------------------------------------
@@ -626,6 +625,7 @@ select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from
  ]
 (1 row)
 
+reset max_parallel_workers_per_gather;
 select explain_analyze_inc_sort_nodes_verify_invariants('select * from (select * from t order by a) s order by a, b limit 55');
  explain_analyze_inc_sort_nodes_verify_invariants 
 --------------------------------------------------
@@ -815,7 +815,6 @@ select explain_analyze_without_memory('select * from (select * from t order by a
  Optimizer: Postgres query optimizer
 (14 rows)
 
-reset max_parallel_workers_per_gather;
 select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from (select * from t order by a) s order by a, b limit 70'));
                   jsonb_pretty                   
 -------------------------------------------------
@@ -861,6 +860,7 @@ select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from
  ]
 (1 row)
 
+reset max_parallel_workers_per_gather;
 select explain_analyze_inc_sort_nodes_verify_invariants('select * from (select * from t order by a) s order by a, b limit 70');
  explain_analyze_inc_sort_nodes_verify_invariants 
 --------------------------------------------------
diff --git a/src/test/regress/expected/incremental_sort_optimizer.out b/src/test/regress/expected/incremental_sort_optimizer.out
index 97550c1beda..f5fd24f81ba 100644
--- a/src/test/regress/expected/incremental_sort_optimizer.out
+++ b/src/test/regress/expected/incremental_sort_optimizer.out
@@ -560,7 +560,6 @@ select explain_analyze_without_memory('select * from (select * from t order by a
  Optimizer: Pivotal Optimizer (GPORCA)
 (9 rows)
 
-reset max_parallel_workers_per_gather;
 select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from (select * from t order by a) s order by a, b limit 55'));
  jsonb_pretty 
 --------------
@@ -568,6 +567,7 @@ select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from
  ]
 (1 row)
 
+reset max_parallel_workers_per_gather;
 select explain_analyze_inc_sort_nodes_verify_invariants('select * from (select * from t order by a) s order by a, b limit 55');
  explain_analyze_inc_sort_nodes_verify_invariants 
 --------------------------------------------------
@@ -743,7 +743,6 @@ select explain_analyze_without_memory('select * from (select * from t order by a
  Optimizer: Pivotal Optimizer (GPORCA)
 (10 rows)
 
-reset max_parallel_workers_per_gather;
 select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from (select * from t order by a) s order by a, b limit 70'));
  jsonb_pretty 
 --------------
@@ -751,6 +750,7 @@ select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from
  ]
 (1 row)
 
+reset max_parallel_workers_per_gather;
 select explain_analyze_inc_sort_nodes_verify_invariants('select * from (select * from t order by a) s order by a, b limit 70');
  explain_analyze_inc_sort_nodes_verify_invariants 
 --------------------------------------------------
diff --git a/src/test/regress/expected/indexjoin.out b/src/test/regress/expected/indexjoin.out
index 6b032575f12..a154a134aeb 100644
--- a/src/test/regress/expected/indexjoin.out
+++ b/src/test/regress/expected/indexjoin.out
@@ -37,7 +37,7 @@ ORDER BY 1 asc ;
                Group Key: ((((tt.event_ts / 100000) / 5) * 5))
                ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1236.97..1252.45 rows=413 width=16)
                      Hash Key: ((((tt.event_ts / 100000) / 5) * 5))
-                     ->  Partial HashAggregate  (cost=1236.97..1244.19 rows=413 width=16)
+                     ->  Streaming Partial HashAggregate  (cost=1236.97..1244.19 rows=413 width=16)
                            Group Key: (((tt.event_ts / 100000) / 5) * 5)
                            ->  Hash Join  (cost=17.20..1161.31 rows=15131 width=8)
                                  Hash Cond: (tt.symbol = (tq.sym)::bpchar)
diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out
index ebb973cb151..635016d4aad 100644
--- a/src/test/regress/expected/jsonb.out
+++ b/src/test/regress/expected/jsonb.out
@@ -1558,6 +1558,13 @@ SELECT jsonb_object_agg(name, type) FROM foo;
 INSERT INTO foo VALUES (999999, NULL, 'bar');
 SELECT jsonb_object_agg(name, type) FROM foo;
 ERROR:  field name must not be null
+-- edge case for parser
+SELECT jsonb_object_agg(DISTINCT 'a', 'abc');
+ jsonb_object_agg 
+------------------
+ {"a": "abc"}
+(1 row)
+
 -- jsonb_object
 -- empty object, one dimension
 SELECT jsonb_object('{}');
diff --git a/src/test/regress/expected/jsonb_optimizer.out b/src/test/regress/expected/jsonb_optimizer.out
index 6250207107a..1f5510c9982 100644
--- a/src/test/regress/expected/jsonb_optimizer.out
+++ b/src/test/regress/expected/jsonb_optimizer.out
@@ -1560,6 +1560,13 @@ SELECT jsonb_object_agg(name, type) FROM foo;
 INSERT INTO foo VALUES (999999, NULL, 'bar');
 SELECT jsonb_object_agg(name, type) FROM foo;
 ERROR:  field name must not be null
+-- edge case for parser
+SELECT jsonb_object_agg(DISTINCT 'a', 'abc');
+ jsonb_object_agg 
+------------------
+ {"a": "abc"}
+(1 row)
+
 -- jsonb_object
 -- empty object, one dimension
 SELECT jsonb_object('{}');
diff --git a/src/test/regress/expected/limit_gp.out b/src/test/regress/expected/limit_gp.out
index 1c067690068..5d075e30e71 100644
--- a/src/test/regress/expected/limit_gp.out
+++ b/src/test/regress/expected/limit_gp.out
@@ -136,7 +136,7 @@ explain select distinct(a), sum(b) from t_volatile_limit_1 group by a order by a
                            Group Key: a
                            ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=464.50..494.50 rows=1000 width=12)
                                  Hash Key: a
-                                 ->  Partial HashAggregate  (cost=464.50..474.50 rows=1000 width=12)
+                                 ->  Streaming Partial HashAggregate  (cost=464.50..474.50 rows=1000 width=12)
                                        Group Key: a
                                        ->  Seq Scan on t_volatile_limit_1  (cost=0.00..321.00 rows=28700 width=8)
  Optimizer: Postgres query optimizer
@@ -156,7 +156,7 @@ explain select distinct(a), sum(b) from t_volatile_limit_1 group by a order by a
                            Group Key: a
                            ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=464.50..494.50 rows=1000 width=12)
                                  Hash Key: a
-                                 ->  Partial HashAggregate  (cost=464.50..474.50 rows=1000 width=12)
+                                 ->  Streaming Partial HashAggregate  (cost=464.50..474.50 rows=1000 width=12)
                                        Group Key: a
                                        ->  Seq Scan on t_volatile_limit_1  (cost=0.00..321.00 rows=28700 width=8)
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/limit_optimizer.out b/src/test/regress/expected/limit_optimizer.out
index 6508365fc81..e8a00fe3a40 100644
--- a/src/test/regress/expected/limit_optimizer.out
+++ b/src/test/regress/expected/limit_optimizer.out
@@ -358,32 +358,31 @@ order by s2 desc;
 explain (verbose, costs off)
 select sum(tenthous) as s1, sum(tenthous) + random()*0 as s2
   from tenk1 group by thousand order by thousand limit 3;
-                                                             QUERY PLAN                                                              
--------------------------------------------------------------------------------------------------------------------------------------
+                                                               QUERY PLAN                                                                
+-----------------------------------------------------------------------------------------------------------------------------------------
  Result
-   Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision)))
+   Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision)))
    ->  Limit
-         Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision))), thousand
+         Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision))), thousand
          ->  Gather Motion 3:1  (slice1; segments: 3)
-               Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision))), thousand
+               Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision))), thousand
                Merge Key: thousand
                ->  Limit
-                     Output: (sum(tenthous)), (((sum(tenthous))::double precision + (random() * '0'::double precision))), thousand
-                     ->  Finalize GroupAggregate
-                           Output: sum(tenthous), ((sum(tenthous))::double precision + (random() * '0'::double precision)), thousand
-                           Group Key: tenk1.thousand
+                     Output: (sum(tenthous)), ((((sum(tenthous)))::double precision + (random() * '0'::double precision))), thousand
+                     ->  Result
+                           Output: (sum(tenthous)), (((sum(tenthous)))::double precision + (random() * '0'::double precision)), thousand
                            ->  Sort
-                                 Output: thousand, (PARTIAL sum(tenthous)), (PARTIAL sum(tenthous))
+                                 Output: (sum(tenthous)), (sum(tenthous)), thousand
                                  Sort Key: tenk1.thousand
-                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)
-                                       Output: thousand, (PARTIAL sum(tenthous)), (PARTIAL sum(tenthous))
-                                       Hash Key: thousand
-                                       ->  Streaming Partial HashAggregate
-                                             Output: thousand, PARTIAL sum(tenthous), PARTIAL sum(tenthous)
-                                             Group Key: tenk1.thousand
+                                 ->  HashAggregate
+                                       Output: sum(tenthous), sum(tenthous), thousand
+                                       Group Key: tenk1.thousand
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                             Output: thousand, tenthous
+                                             Hash Key: thousand
                                              ->  Seq Scan on public.tenk1
                                                    Output: thousand, tenthous
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (24 rows)
 
 select sum(tenthous) as s1, sum(tenthous) + random()*0 as s2
diff --git a/src/test/regress/expected/matview_data.out b/src/test/regress/expected/matview_data.out
index dc7aaa8aea5..91a06d6cbf9 100644
--- a/src/test/regress/expected/matview_data.out
+++ b/src/test/regress/expected/matview_data.out
@@ -491,7 +491,7 @@ select mvname, datastatus from gp_matview_aux where mvname like 'mv_par%';
  mv_par1_1 | i
  mv_par1   | i
  mv_par    | i
- mv_par2   | u
+ mv_par2   | i
 (6 rows)
 
 refresh materialized view mv_par;
@@ -893,6 +893,48 @@ select count(*) from gp_matview_aux where mvname = 'mv_name2';
 (1 row)
 
 abort;
+-- start_ignore
+CREATE EXTENSION IF NOT EXISTS gp_inject_fault;
+NOTICE:  extension "gp_inject_fault" already exists, skipping
+-- end_ignore
+create table par_normal_oid(a int, b int) partition by range(a) using ao_row distributed randomly;
+select gp_inject_fault('bump_oid', 'skip', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+create table sub_par1_large_oid partition of par_normal_oid for values from (1) to (2) using ao_row;
+NOTICE:  table has parent, setting distribution columns to match parent table
+select 'sub_par1_large_oid'::regclass::oid > x'7FFFFFFF'::bigint;
+ ?column? 
+----------
+ t
+(1 row)
+
+select gp_inject_fault('bump_oid', 'reset', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+create materialized view mv_par_normal_oid as
+    select count(*) from par_normal_oid;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'count' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+select mvname, datastatus from gp_matview_aux where mvname = 'mv_par_normal_oid';
+      mvname       | datastatus 
+-------------------+------------
+ mv_par_normal_oid | u
+(1 row)
+
+insert into par_normal_oid values(1, 2);
+select mvname, datastatus from gp_matview_aux where mvname = 'mv_par_normal_oid';
+      mvname       | datastatus 
+-------------------+------------
+ mv_par_normal_oid | i
+(1 row)
+
 --start_ignore
 drop schema matview_data_schema cascade;
 NOTICE:  drop cascades to 3 other objects
diff --git a/src/test/regress/expected/minirepro.out b/src/test/regress/expected/minirepro.out
index 40e0401750e..3b876793628 100644
--- a/src/test/regress/expected/minirepro.out
+++ b/src/test/regress/expected/minirepro.out
@@ -132,12 +132,12 @@ select
 from pg_statistic where starelid IN ('minirepro_foo'::regclass, 'minirepro_foo_1'::regclass);
  staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 | stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 | staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 | stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2 | stavalues3 | stavalues4 | stavalues5 
 -----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+------------+------------+------------
-         1 | t          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | 
-         2 | t          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | 
-         3 | t          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | 
-         1 | f          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | 
-         2 | f          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | 
-         3 | f          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | 
+         1 | t          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | 
+         2 | t          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | 
+         3 | t          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | 
+         1 | f          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | 
+         2 | f          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | 
+         3 | f          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | 
 (6 rows)
 
 -- Cleanup
@@ -220,8 +220,8 @@ select
 from pg_statistic where starelid IN ('minirepro_foo'::regclass, 'minirepro_foo_1'::regclass);
  staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 | stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 | staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 | stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2 | stavalues3 | stavalues4 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           stavalues5                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
 -----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+------------+------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-         1 | t          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |        0 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | 
-         1 | f          |           0 |        4 |          -1 |        0 |        0 |        0 |        0 |       99 |      0 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             |            |            |            |            | {"\\x0e060200ffffffff0000000001000000010000000000803f0000803f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
+         1 | t          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |        0 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | 
+         1 | f          |           0 |        4 |          -1 |        8 |        0 |        0 |        0 |       99 |     97 |      0 |      0 |      0 |      0 |        0 |        0 |        0 |        0 |        0 |             |             |             |             |             | {1}        |            |            |            | {"\\x0e060200ffffffff0000000001000000010000000000803f0000803f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}
 (2 rows)
 
 -- Cleanup
diff --git a/src/test/regress/expected/misc_functions_optimizer.out b/src/test/regress/expected/misc_functions_optimizer.out
index f5187fad45b..e5723fea5f3 100644
--- a/src/test/regress/expected/misc_functions_optimizer.out
+++ b/src/test/regress/expected/misc_functions_optimizer.out
@@ -256,8 +256,8 @@ CREATE FUNCTION my_int_eq(int, int) RETURNS bool
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1 a JOIN tenk1 b ON a.unique1 = b.unique1
 WHERE my_int_eq(a.unique2, 42);
-                      QUERY PLAN                      
-------------------------------------------------------
+                     QUERY PLAN                     
+----------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    ->  Hash Join
          Hash Cond: (b.unique1 = a.unique1)
@@ -265,7 +265,7 @@ WHERE my_int_eq(a.unique2, 42);
          ->  Hash
                ->  Seq Scan on tenk1 a
                      Filter: my_int_eq(unique2, 42)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (8 rows)
 
 -- With support function that knows it's int4eq, we get a different plan
@@ -273,17 +273,16 @@ ALTER FUNCTION my_int_eq(int, int) SUPPORT test_support_func;
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1 a JOIN tenk1 b ON a.unique1 = b.unique1
 WHERE my_int_eq(a.unique2, 42);
-                      QUERY PLAN                      
-------------------------------------------------------
+                      QUERY PLAN                       
+-------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Hash Join
-         Hash Cond: (b.unique1 = a.unique1)
-         ->  Seq Scan on tenk1 b
-         ->  Hash
-               ->  Seq Scan on tenk1 a
-                     Filter: my_int_eq(unique2, 42)
- Optimizer: Pivotal Optimizer (GPORCA)
-(8 rows)
+   ->  Nested Loop
+         ->  Seq Scan on tenk1 a
+               Filter: my_int_eq(unique2, 42)
+         ->  Index Scan using tenk1_unique1 on tenk1 b
+               Index Cond: (unique1 = a.unique1)
+ Optimizer: Postgres query optimizer
+(7 rows)
 
 -- Also test non-default rowcount estimate
 CREATE FUNCTION my_gen_series(int, int) RETURNS SETOF integer
@@ -292,27 +291,26 @@ CREATE FUNCTION my_gen_series(int, int) RETURNS SETOF integer
   SUPPORT test_support_func;
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1 a JOIN my_gen_series(1,1000) g ON a.unique1 = g;
-                            QUERY PLAN                            
-------------------------------------------------------------------
+                  QUERY PLAN                  
+----------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    ->  Hash Join
-         Hash Cond: (a.unique1 = my_gen_series.my_gen_series)
-         ->  Seq Scan on tenk1 a
+         Hash Cond: (g.g = a.unique1)
+         ->  Function Scan on my_gen_series g
          ->  Hash
-               ->  Function Scan on my_gen_series
- Optimizer: Pivotal Optimizer (GPORCA)
+               ->  Seq Scan on tenk1 a
+ Optimizer: Postgres query optimizer
 (7 rows)
 
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1 a JOIN my_gen_series(1,10) g ON a.unique1 = g;
-                            QUERY PLAN                            
-------------------------------------------------------------------
+                      QUERY PLAN                       
+-------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
-   ->  Hash Join
-         Hash Cond: (a.unique1 = my_gen_series.my_gen_series)
-         ->  Seq Scan on tenk1 a
-         ->  Hash
-               ->  Function Scan on my_gen_series
- Optimizer: Pivotal Optimizer (GPORCA)
-(7 rows)
+   ->  Nested Loop
+         ->  Function Scan on my_gen_series g
+         ->  Index Scan using tenk1_unique1 on tenk1 a
+               Index Cond: (unique1 = g.g)
+ Optimizer: Postgres query optimizer
+(6 rows)
 
diff --git a/src/test/regress/expected/olap_plans.out b/src/test/regress/expected/olap_plans.out
index f5ddcc039d4..8861e4a5c5f 100644
--- a/src/test/regress/expected/olap_plans.out
+++ b/src/test/regress/expected/olap_plans.out
@@ -86,7 +86,7 @@ explain select a, sum(d) from olap_test group by a;
          Group Key: a
          ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=56.00..56.09 rows=3 width=12)
                Hash Key: a
-               ->  Partial HashAggregate  (cost=56.00..56.03 rows=3 width=12)
+               ->  Streaming Partial HashAggregate  (cost=56.00..56.03 rows=3 width=12)
                      Group Key: a
                      ->  Seq Scan on olap_test  (cost=0.00..39.33 rows=3333 width=8)
  Optimizer: Postgres query optimizer
@@ -306,7 +306,7 @@ explain create table bar_ctas as select * from foo_ctas group by a, b distribute
    Group Key: a, b
    ->  Redistribute Motion 3:3  (slice1; segments: 3)  (cost=1.50..11.42 rows=10 width=8)
          Hash Key: b
-         ->  HashAggregate  (cost=1.50..1.60 rows=10 width=8)
+         ->  Streaming HashAggregate  (cost=1.50..1.60 rows=10 width=8)
                Group Key: a, b
                ->  Seq Scan on foo_ctas  (cost=0.00..1.33 rows=33 width=8)
  Optimizer: Postgres query optimizer
@@ -325,7 +325,7 @@ explain insert into bar_ctas select * from foo_ctas group by a, b;
                Group Key: foo_ctas.a, foo_ctas.b
                ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=1.50..11.42 rows=10 width=8)
                      Hash Key: foo_ctas.a, foo_ctas.b
-                     ->  HashAggregate  (cost=1.50..1.60 rows=10 width=8)
+                     ->  Streaming HashAggregate  (cost=1.50..1.60 rows=10 width=8)
                            Group Key: foo_ctas.a, foo_ctas.b
                            ->  Seq Scan on foo_ctas  (cost=0.00..1.33 rows=33 width=8)
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/olap_plans_optimizer.out b/src/test/regress/expected/olap_plans_optimizer.out
index 7753de8c0b8..e2198882b9f 100644
--- a/src/test/regress/expected/olap_plans_optimizer.out
+++ b/src/test/regress/expected/olap_plans_optimizer.out
@@ -79,18 +79,20 @@ select a, b, c, sum(d) from olap_test group by a, b, c;
 
 -- If it's not a superset, redistribution is needed.
 explain select a, sum(d) from olap_test group by a;
-                                           QUERY PLAN                                            
--------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.54 rows=3 width=12)
-   ->  Finalize HashAggregate  (cost=0.00..431.54 rows=1 width=12)
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.55 rows=3 width=12)
+   ->  Finalize GroupAggregate  (cost=0.00..431.55 rows=1 width=12)
          Group Key: a
-         ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.54 rows=1 width=12)
-               Hash Key: a
-               ->  Streaming Partial HashAggregate  (cost=0.00..431.54 rows=1 width=12)
-                     Group Key: a
-                     ->  Seq Scan on olap_test  (cost=0.00..431.08 rows=3334 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
-(9 rows)
+         ->  Sort  (cost=0.00..431.55 rows=2 width=12)
+               Sort Key: a
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.55 rows=2 width=12)
+                     Hash Key: a
+                     ->  Streaming Partial HashAggregate  (cost=0.00..431.55 rows=2 width=12)
+                           Group Key: a
+                           ->  Seq Scan on olap_test  (cost=0.00..431.09 rows=3334 width=8)
+ Optimizer: GPORCA
+(11 rows)
 
 select a, sum(d) from olap_test group by a;
  a |   sum    
@@ -185,12 +187,12 @@ set gp_motion_cost_per_row=1.0;
 -- If the query produces a relatively small number of groups in comparison to
 -- the number of input rows, two-stage aggregation will be picked.
 explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c));
-                                                  QUERY PLAN                                                  
---------------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1726.50 rows=152 width=20)
-   ->  Sequence  (cost=0.00..1726.49 rows=51 width=20)
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1726.51 rows=152 width=20)
+   ->  Sequence  (cost=0.00..1726.50 rows=51 width=20)
          ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.19 rows=3334 width=1)
-               ->  Seq Scan on olap_test  (cost=0.00..431.08 rows=3334 width=16)
+               ->  Seq Scan on olap_test  (cost=0.00..431.09 rows=3334 width=16)
          ->  Append  (cost=0.00..1295.30 rows=51 width=20)
                ->  Finalize HashAggregate  (cost=0.00..431.92 rows=44 width=16)
                      Group Key: share0_ref2.b, share0_ref2.c
@@ -199,17 +201,19 @@ explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a)
                            ->  Streaming Partial HashAggregate  (cost=0.00..431.91 rows=44 width=16)
                                  Group Key: share0_ref2.b, share0_ref2.c
                                  ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.10 rows=3334 width=12)
-               ->  Finalize HashAggregate  (cost=0.00..431.47 rows=1 width=12)
+               ->  Finalize GroupAggregate  (cost=0.00..431.47 rows=1 width=12)
                      Group Key: share0_ref3.a
-                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.48 rows=1 width=12)
+                     ->  Sort  (cost=0.00..431.47 rows=2 width=12)
+                           Sort Key: share0_ref3.a
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=2 width=12)
                                  Hash Key: share0_ref3.a
-                                 ->  Streaming Partial HashAggregate  (cost=0.00..431.48 rows=1 width=12)
+                                 ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=2 width=12)
                                        Group Key: share0_ref3.a
                                        ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
                ->  HashAggregate  (cost=0.00..431.91 rows=7 width=16)
                      Group Key: share0_ref4.a, share0_ref4.b
                      ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.10 rows=3334 width=12)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (25 rows)
 
 select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c));
@@ -257,10 +261,10 @@ select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c)
 explain select a, b, d, sum(d) from olap_test group by grouping sets((a, b), (a), (b, d));
                                                     QUERY PLAN                                                     
 -------------------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1727.49 rows=10022 width=20)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1727.48 rows=10022 width=20)
    ->  Sequence  (cost=0.00..1726.74 rows=3341 width=20)
-         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.16 rows=3334 width=1)
-               ->  Seq Scan on olap_test  (cost=0.00..431.08 rows=3334 width=12)
+         ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.17 rows=3334 width=1)
+               ->  Seq Scan on olap_test  (cost=0.00..431.09 rows=3334 width=12)
          ->  Append  (cost=0.00..1295.50 rows=3341 width=20)
                ->  HashAggregate  (cost=0.00..431.99 rows=3334 width=16)
                      Group Key: share0_ref2.b, share0_ref2.d
@@ -268,18 +272,20 @@ explain select a, b, d, sum(d) from olap_test group by grouping sets((a, b), (a)
                            Hash Key: share0_ref2.b, share0_ref2.d
                            ->  Result  (cost=0.00..431.06 rows=3334 width=8)
                                  ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.06 rows=3334 width=8)
-               ->  Finalize HashAggregate  (cost=0.00..431.47 rows=1 width=12)
+               ->  Finalize GroupAggregate  (cost=0.00..431.47 rows=1 width=12)
                      Group Key: share0_ref3.a
-                     ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=1 width=12)
-                           Hash Key: share0_ref3.a
-                           ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=1 width=12)
-                                 Group Key: share0_ref3.a
-                                 ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
+                     ->  Sort  (cost=0.00..431.47 rows=2 width=12)
+                           Sort Key: share0_ref3.a
+                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=2 width=12)
+                                 Hash Key: share0_ref3.a
+                                 ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=2 width=12)
+                                       Group Key: share0_ref3.a
+                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
                ->  HashAggregate  (cost=0.00..431.91 rows=7 width=16)
                      Group Key: share0_ref4.a, share0_ref4.b
                      ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.10 rows=3334 width=12)
- Optimizer: Pivotal Optimizer (GPORCA)
-(22 rows)
+ Optimizer: GPORCA
+(24 rows)
 
 -- do not execute this query as it would produce too many tuples.
 -- Test that when the second-stage Agg doesn't try to preserve the
@@ -292,13 +298,13 @@ explain select a, b, d, sum(d) from olap_test group by grouping sets((a, b), (a)
 -- from the Merge Key.
 set enable_hashagg=off;
 explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a), (b, c)) limit 200;
-                                                     QUERY PLAN                                                     
---------------------------------------------------------------------------------------------------------------------
- Limit  (cost=0.00..1726.50 rows=152 width=20)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1726.50 rows=152 width=20)
-         ->  Sequence  (cost=0.00..1726.49 rows=51 width=20)
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..1726.51 rows=152 width=20)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1726.51 rows=152 width=20)
+         ->  Sequence  (cost=0.00..1726.50 rows=51 width=20)
                ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.19 rows=3334 width=1)
-                     ->  Seq Scan on olap_test  (cost=0.00..431.08 rows=3334 width=16)
+                     ->  Seq Scan on olap_test  (cost=0.00..431.09 rows=3334 width=16)
                ->  Append  (cost=0.00..1295.30 rows=51 width=20)
                      ->  Finalize HashAggregate  (cost=0.00..431.92 rows=44 width=16)
                            Group Key: share0_ref2.b, share0_ref2.c
@@ -307,18 +313,20 @@ explain select a, b, c, sum(d) from olap_test group by grouping sets((a, b), (a)
                                  ->  Streaming Partial HashAggregate  (cost=0.00..431.91 rows=44 width=16)
                                        Group Key: share0_ref2.b, share0_ref2.c
                                        ->  Shared Scan (share slice:id 2:0)  (cost=0.00..431.10 rows=3334 width=12)
-                     ->  Finalize HashAggregate  (cost=0.00..431.47 rows=1 width=12)
+                     ->  Finalize GroupAggregate  (cost=0.00..431.47 rows=1 width=12)
                            Group Key: share0_ref3.a
-                           ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=1 width=12)
-                                 Hash Key: share0_ref3.a
-                                 ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=1 width=12)
-                                       Group Key: share0_ref3.a
-                                       ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
+                           ->  Sort  (cost=0.00..431.47 rows=2 width=12)
+                                 Sort Key: share0_ref3.a
+                                 ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.47 rows=2 width=12)
+                                       Hash Key: share0_ref3.a
+                                       ->  Streaming Partial HashAggregate  (cost=0.00..431.47 rows=2 width=12)
+                                             Group Key: share0_ref3.a
+                                             ->  Shared Scan (share slice:id 3:0)  (cost=0.00..431.06 rows=3334 width=8)
                      ->  HashAggregate  (cost=0.00..431.91 rows=7 width=16)
                            Group Key: share0_ref4.a, share0_ref4.b
                            ->  Shared Scan (share slice:id 1:0)  (cost=0.00..431.10 rows=3334 width=12)
- Optimizer: Pivotal Optimizer (GPORCA)
-(24 rows)
+ Optimizer: GPORCA
+(26 rows)
 
 reset enable_hashagg;
 --
@@ -331,48 +339,40 @@ create table foo_ctas(a int, b int) distributed randomly;
 insert into foo_ctas select g%5, g%2 from generate_series(1, 100) g;
 analyze foo_ctas;
 explain create table bar_ctas as select * from foo_ctas group by a, b distributed by (b);
-                                                 QUERY PLAN                                                 
-------------------------------------------------------------------------------------------------------------
+                                                 QUERY PLAN                                                  
+-------------------------------------------------------------------------------------------------------------
  Result  (cost=0.00..431.10 rows=6 width=8)
    ->  Redistribute Motion 3:3  (slice1; segments: 3)  (cost=0.00..431.01 rows=6 width=8)
          Hash Key: b
          ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
                Group Key: a, b
-               ->  Sort  (cost=0.00..431.01 rows=2 width=8)
+               ->  Sort  (cost=0.00..431.01 rows=34 width=8)
                      Sort Key: a, b
-                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.01 rows=2 width=8)
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
                            Hash Key: a, b
-                           ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
-                                 Group Key: a, b
-                                 ->  Sort  (cost=0.00..431.01 rows=34 width=8)
-                                       Sort Key: a, b
-                                       ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
-(15 rows)
+                           ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
+ Optimizer: GPORCA
+(11 rows)
 
 create table bar_ctas as select * from foo_ctas group by a, b distributed by (b);
 -- Currently, the planner misses this optimization with INSERT, so this
 -- needs an extra Redistribute Motion.
 explain insert into bar_ctas select * from foo_ctas group by a, b;
-                                                    QUERY PLAN                                                    
-------------------------------------------------------------------------------------------------------------------
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
  Insert on bar_ctas  (cost=0.00..431.10 rows=2 width=8)
    ->  Result  (cost=0.00..431.01 rows=6 width=12)
          ->  Redistribute Motion 3:3  (slice1; segments: 3)  (cost=0.00..431.01 rows=6 width=8)
                Hash Key: foo_ctas.b
                ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
                      Group Key: foo_ctas.a, foo_ctas.b
-                     ->  Sort  (cost=0.00..431.01 rows=2 width=8)
+                     ->  Sort  (cost=0.00..431.01 rows=34 width=8)
                            Sort Key: foo_ctas.a, foo_ctas.b
-                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.01 rows=2 width=8)
+                           ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=34 width=8)
                                  Hash Key: foo_ctas.a, foo_ctas.b
-                                 ->  GroupAggregate  (cost=0.00..431.01 rows=2 width=8)
-                                       Group Key: foo_ctas.a, foo_ctas.b
-                                       ->  Sort  (cost=0.00..431.01 rows=34 width=8)
-                                             Sort Key: foo_ctas.a, foo_ctas.b
-                                             ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
- Optimizer: Pivotal Optimizer (GPORCA)
-(16 rows)
+                                 ->  Seq Scan on foo_ctas  (cost=0.00..431.00 rows=34 width=8)
+ Optimizer: GPORCA
+(12 rows)
 
 drop table foo_ctas;
 drop table bar_ctas;
diff --git a/src/test/regress/expected/partition.out b/src/test/regress/expected/partition.out
index ae7dc6b2b2a..1e70e47b872 100755
--- a/src/test/regress/expected/partition.out
+++ b/src/test/regress/expected/partition.out
@@ -2314,9 +2314,9 @@ DETAIL:  Partition key of the failing row contains (i) = (5).
 drop table bar_p;
 -- Drop should not leave anything lingering for bar_p or its
 -- subpartitions in pg_partition* catalog tables.
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
- relid | level | template 
--------+-------+----------
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- MPP-4172
@@ -2437,28 +2437,28 @@ select relid::regclass, level from gp_partition_template where relid = 'rank_set
 
 alter table rank_settemp set subpartition template (default subpartition def2);
 -- def2 is there
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
-    relid     | level |                                                                                                   template                                                                                                   
---------------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName def2 :boundSpec <> :subSpec <> :isDefault true :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                   pg_get_expr                    
+--------------+-------+--------------------------------------------------
+ rank_settemp |     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION def2)
 (1 row)
 
 alter table rank_settemp set subpartition template (default subpartition def2);
 -- Should still be there
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
-    relid     | level |                                                                                                   template                                                                                                   
---------------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName def2 :boundSpec <> :subSpec <> :isDefault true :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                   pg_get_expr                    
+--------------+-------+--------------------------------------------------
+ rank_settemp |     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION def2)
 (1 row)
 
 alter table rank_settemp set subpartition template (start (date '2006-01-01') with (appendonly=true));
 alter table rank_settemp add partition f1 values ('N');
 alter table rank_settemp set subpartition template (start (date '2007-01-01') with (appendonly=true, compresslevel=5));
 alter table rank_settemp add partition f2 values ('C');
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
-    relid     | level |                                                                                                                                                                                                                                                                                                  template                                                                                                                                                                                                                                                                                                  
---------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName <> :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2007-01-01" :location 64} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 59} :location -1}) :edge 1} :partEnd <> :partEvery <>} :subSpec <> :isDefault false :options ({DEFELEM :defnamespace <> :defname compresslevel :arg 5 :defaction 0 :location 101}) :accessMethod ao_row :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                                                   pg_get_expr                                                    
+--------------+-------+------------------------------------------------------------------------------------------------------------------
+ rank_settemp |     1 | SUBPARTITION TEMPLATE( START ('01-01-2007'::date),  WITH (appendonly=true, orientation=column, compresslevel=5))
 (1 row)
 
 drop table rank_settemp;
@@ -3593,12 +3593,12 @@ subpartition l2 values (6,7,8,9,10) );
 alter table mpp5992 
 set subpartition template (subpartition l1 values (1,2,3), 
 subpartition l2 values (4,5,6), subpartition l3 values (7,8,9,10));
-select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
-  relid  | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                                                                                                                                                                                                                                            
----------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- mpp5992 |     3 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName lll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "M" :location 133}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName lll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "F" :location 165}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     2 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName ll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "Engineering" :location 108}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName ll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "QA" :location 149}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName l1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 1 :location 72}) ({A_CONST :val 2 :location 74}) ({A_CONST :val 3 :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 4 :location 105}) ({A_CONST :val 5 :location 107}) ({A_CONST :val 6 :location 109}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l3 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 7 :location 137}) ({A_CONST :val 8 :location 139}) ({A_CONST :val 9 :location 141}) ({A_CONST :val 10 :location 143}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'mpp5992'::regclass;
+  relid  | level |                                                           pg_get_expr                                                           
+---------+-------+---------------------------------------------------------------------------------------------------------------------------------
+ mpp5992 |     1 | SUBPARTITION TEMPLATE(SUBPARTITION l1 VALUES (1, 2, 3), SUBPARTITION l2 VALUES (4, 5, 6), SUBPARTITION l3 VALUES (7, 8, 9, 10))
+ mpp5992 |     3 | SUBPARTITION TEMPLATE(SUBPARTITION lll1 VALUES ('M'), SUBPARTITION lll2 VALUES ('F'))
+ mpp5992 |     2 | SUBPARTITION TEMPLATE(SUBPARTITION ll1 VALUES ('Engineering'), SUBPARTITION ll2 VALUES ('QA'))
 (3 rows)
 
 -- Now we can add a new partition
@@ -3847,12 +3847,12 @@ select relname, relam, pg_get_expr(relpartbound, oid) from pg_class where relnam
  mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
 (112 rows)
 
-select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
-  relid  | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                                                                                                                                                                                                                                            
----------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- mpp5992 |     3 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName lll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "M" :location 133}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName lll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "F" :location 165}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     2 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName ll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "Engineering" :location 108}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName ll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "QA" :location 149}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName l1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 1 :location 72}) ({A_CONST :val 2 :location 74}) ({A_CONST :val 3 :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 4 :location 105}) ({A_CONST :val 5 :location 107}) ({A_CONST :val 6 :location 109}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l3 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 7 :location 137}) ({A_CONST :val 8 :location 139}) ({A_CONST :val 9 :location 141}) ({A_CONST :val 10 :location 143}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'mpp5992'::regclass;
+  relid  | level |                                                           pg_get_expr                                                           
+---------+-------+---------------------------------------------------------------------------------------------------------------------------------
+ mpp5992 |     1 | SUBPARTITION TEMPLATE(SUBPARTITION l1 VALUES (1, 2, 3), SUBPARTITION l2 VALUES (4, 5, 6), SUBPARTITION l3 VALUES (7, 8, 9, 10))
+ mpp5992 |     3 | SUBPARTITION TEMPLATE(SUBPARTITION lll1 VALUES ('M'), SUBPARTITION lll2 VALUES ('F'))
+ mpp5992 |     2 | SUBPARTITION TEMPLATE(SUBPARTITION ll1 VALUES ('Engineering'), SUBPARTITION ll2 VALUES ('QA'))
 (3 rows)
 
 -- MPP-10223: split subpartitions
@@ -4051,10 +4051,10 @@ subpartition template (start (1) end (10) every (1))
 (start (20) end (30) every (1));
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-select relid::regclass, level, template from gp_partition_template where relid = 'MPP10480'::regclass;
-  relid   | level |                                                                                                                                                                                                                  template                                                                                                                                                                                                                  
-----------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- mpp10480 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName <> :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({A_CONST :val 1 :location 122}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({A_CONST :val 10 :location 130}) :edge 2} :partEvery ({A_CONST :val 1 :location 141})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'MPP10480'::regclass;
+  relid   | level |                     pg_get_expr                      
+----------+-------+------------------------------------------------------
+ mpp10480 |     1 | SUBPARTITION TEMPLATE( START (1) END (10) Every (1))
 (1 row)
 
 -- MPP-10421: fix SPLIT of partitions with PRIMARY KEY constraint/indexes
diff --git a/src/test/regress/expected/partition_aggregate.out b/src/test/regress/expected/partition_aggregate.out
index 871b8e3c39a..e8d78fc6643 100644
--- a/src/test/regress/expected/partition_aggregate.out
+++ b/src/test/regress/expected/partition_aggregate.out
@@ -39,7 +39,7 @@ SELECT c, sum(a), avg(b), count(*), min(a), max(b) FROM pagg_tab GROUP BY c HAVI
                      Filter: (avg(pagg_tab.d) < '15'::numeric)
                      ->  Redistribute Motion 3:3  (slice2; segments: 3)
                            Hash Key: pagg_tab.c
-                           ->  Partial HashAggregate
+                           ->  Streaming Partial HashAggregate
                                  Group Key: pagg_tab.c
                                  ->  Seq Scan on pagg_tab_p1 pagg_tab
                ->  Finalize HashAggregate
@@ -47,7 +47,7 @@ SELECT c, sum(a), avg(b), count(*), min(a), max(b) FROM pagg_tab GROUP BY c HAVI
                      Filter: (avg(pagg_tab_1.d) < '15'::numeric)
                      ->  Redistribute Motion 3:3  (slice3; segments: 3)
                            Hash Key: pagg_tab_1.c
-                           ->  Partial HashAggregate
+                           ->  Streaming Partial HashAggregate
                                  Group Key: pagg_tab_1.c
                                  ->  Seq Scan on pagg_tab_p2 pagg_tab_1
                ->  Finalize GroupAggregate
@@ -57,7 +57,7 @@ SELECT c, sum(a), avg(b), count(*), min(a), max(b) FROM pagg_tab GROUP BY c HAVI
                            Sort Key: pagg_tab_2.c
                            ->  Redistribute Motion 3:3  (slice4; segments: 3)
                                  Hash Key: pagg_tab_2.c
-                                 ->  Partial HashAggregate
+                                 ->  Streaming Partial HashAggregate
                                        Group Key: pagg_tab_2.c
                                        ->  Seq Scan on pagg_tab_p3 pagg_tab_2
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/partition_append.out b/src/test/regress/expected/partition_append.out
new file mode 100755
index 00000000000..fff341d680a
--- /dev/null
+++ b/src/test/regress/expected/partition_append.out
@@ -0,0 +1,6974 @@
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+drop table if exists d;
+drop table if exists c;
+drop table if exists b;
+drop table if exists a;
+-- Check multi level partition COPY
+create table region
+(
+	r_regionkey integer not null,
+	r_name char(25),
+	r_comment varchar(152)
+)
+distributed by (r_regionkey)
+partition by range (r_regionkey)
+subpartition by list (r_name) subpartition template
+(
+	subpartition africa values ('AFRICA'),
+	subpartition america values ('AMERICA'),
+	subpartition asia values ('ASIA'),
+	subpartition europe values ('EUROPE'),
+	subpartition mideast values ('MIDDLE EAST'),
+	subpartition australia values ('AUSTRALIA'),
+	subpartition antarctica values ('ANTARCTICA')
+)
+(
+	partition region1 start (0),
+	partition region2 start (3),
+	partition region3 start (5) end (8)
+);
+-- root and internal parent partitions should have relfrozenxid as 0
+select relname, relkind from pg_class where relkind in ('r', 'p') and relname like 'region%' and relfrozenxid=0;
+       relname        | relkind 
+----------------------+---------
+ region               | p
+ region_1_prt_region1 | p
+ region_1_prt_region2 | p
+ region_1_prt_region3 | p
+(4 rows)
+
+select gp_segment_id, relname, relkind from gp_dist_random('pg_class') where relkind in ('r', 'p') and relname like 'region%' and relfrozenxid=0;
+ gp_segment_id |       relname        | relkind 
+---------------+----------------------+---------
+             1 | region               | p
+             1 | region_1_prt_region1 | p
+             1 | region_1_prt_region2 | p
+             1 | region_1_prt_region3 | p
+             2 | region               | p
+             2 | region_1_prt_region1 | p
+             2 | region_1_prt_region2 | p
+             2 | region_1_prt_region3 | p
+             0 | region               | p
+             0 | region_1_prt_region1 | p
+             0 | region_1_prt_region2 | p
+             0 | region_1_prt_region3 | p
+(12 rows)
+
+create unique index region_pkey on region(r_regionkey, r_name);
+copy region from stdin with delimiter '|';
+-- Test indexes
+set enable_seqscan to off;
+select * from region where r_regionkey = 1;
+ r_regionkey |          r_name           |            r_comment            
+-------------+---------------------------+---------------------------------
+           1 | AMERICA                   | hs use ironic, even requests. s
+(1 row)
+
+select * from region where r_regionkey = 2;
+ r_regionkey |          r_name           |            r_comment            
+-------------+---------------------------+---------------------------------
+           2 | ASIA                      | ges. thinly even pinto beans ca
+(1 row)
+
+select * from region where r_regionkey = 3;
+ r_regionkey |          r_name           |                   r_comment                   
+-------------+---------------------------+-----------------------------------------------
+           3 | EUROPE                    | ly final courts cajole furiously final excuse
+(1 row)
+
+select * from region where r_regionkey = 4;
+ r_regionkey |          r_name           |                        r_comment                         
+-------------+---------------------------+----------------------------------------------------------
+           4 | MIDDLE EAST               | uickly special accounts cajole carefully blithely close 
+(1 row)
+
+select * from region where r_regionkey = 5;
+ r_regionkey |          r_name           | r_comment 
+-------------+---------------------------+-----------
+           5 | AUSTRALIA                 | sdf
+(1 row)
+
+select * from region where r_regionkey = 6;
+ r_regionkey |          r_name           | r_comment 
+-------------+---------------------------+-----------
+           6 | ANTARCTICA                | dsfdfg
+(1 row)
+
+-- Test indexes with insert
+insert into region values(7, 'AUSTRALIA', 'def');
+select * from region where r_regionkey = '7';
+ r_regionkey |          r_name           | r_comment 
+-------------+---------------------------+-----------
+           7 | AUSTRALIA                 | def
+(1 row)
+
+-- test duplicate key. We shouldn't really allow primary keys on partitioned
+-- tables since we cannot enforce them. But since this insert maps to a
+-- single definitive partition, we can detect it.
+insert into region values(7, 'AUSTRALIA', 'def');
+ERROR:  duplicate key value violates unique constraint "region_1_prt_region3_2_prt_australia_r_regionkey_r_name_idx"
+DETAIL:  Key (r_regionkey, r_name)=(7, AUSTRALIA                ) already exists.
+drop table region;
+-- exchange
+-- 1) test all sanity checking
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+-- policies are different
+create table bar_p_diff_pol (i int, j int) distributed by (j);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_pol;
+ERROR:  distribution policy for "bar_p_diff_pol" must be the same as that for "foo_p"
+-- random policy vs. hash policy
+create table bar_p_rand_pol (i int, j int) distributed randomly;
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_rand_pol;
+ERROR:  distribution policy for "bar_p_rand_pol" must be the same as that for "foo_p"
+-- different number of columns
+create table bar_p_diff_col (i int, j int, k int) distributed by (i);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_col;
+ERROR:  table "bar_p_diff_col" contains column "k" not found in parent "foo_p"
+DETAIL:  The new partition may contain only the columns present in parent.
+-- different types
+create table bar_p_diff_typ (i int, j int8) distributed by (i);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_typ;
+ERROR:  child table "bar_p_diff_typ" has different type for column "j"
+-- different column names
+create table bar_p_diff_colnam (i int, m int) distributed by (i);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_colnam;
+ERROR:  table "bar_p_diff_colnam" contains column "m" not found in parent "foo_p"
+DETAIL:  The new partition may contain only the columns present in parent.
+-- still different schema, but more than one level partitioning
+CREATE TABLE two_level_pt(a int, b int, c int)
+DISTRIBUTED BY (a)
+PARTITION BY RANGE (b)
+      SUBPARTITION BY RANGE (c)
+      SUBPARTITION TEMPLATE (
+      START (11) END (12) EVERY (1))
+      ( START (1) END (2) EVERY (1));
+CREATE TABLE candidate_for_leaf(a int, c int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- should fail
+ALTER TABLE two_level_pt ALTER PARTITION FOR (1)
+      EXCHANGE PARTITION FOR (11) WITH TABLE candidate_for_leaf;
+ERROR:  child table is missing column "b"
+-- different owner 
+create role part_role_append;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+create table bar_p (i int, j int) distributed by (i);
+set session authorization part_role_append;
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+ERROR:  must be owner of table foo_p
+-- back to superuser
+\c -
+alter table bar_p owner to part_role_append;
+set session authorization part_role_append;
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+ERROR:  must be owner of table foo_p
+\c -
+-- owners should be the same, error out 
+alter table foo_p exchange partition for(6) with table bar_p;
+drop table foo_p;
+drop table bar_p;
+-- should work, and new partition should inherit ownership (mpp-6538)
+set role part_role_append;
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(6) every(3));
+reset role;
+alter table foo_p split partition for (1) at (2) into (partition prt_11, partition prt_12);
+\dt foo_*
+                              List of relations
+ Schema |        Name        |       Type        |      Owner       | Storage 
+--------+--------------------+-------------------+------------------+---------
+ public | foo_p              | partitioned table | part_role_append | 
+ public | foo_p_1_prt_2      | table             | part_role_append | heap
+ public | foo_p_1_prt_prt_11 | table             | part_role_append | heap
+ public | foo_p_1_prt_prt_12 | table             | part_role_append | heap
+(4 rows)
+
+drop table foo_p;
+drop role part_role_append;
+-- WITH OIDS is no longer supported. Check that it't rejected with the GPDB
+-- partitioning syntax, too.
+create table foo_p (i int, j int) with (oids = true) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+ERROR:  tables declared WITH OIDS are not supported
+-- non-partition table involved in inheritance
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table barparent(i int, j int) distributed by (i);
+create table bar_p () inherits(barparent);
+NOTICE:  table has parent, setting distribution columns to match parent table
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+ERROR:  cannot attach inheritance child as partition
+drop table bar_p;
+drop table barparent;
+-- non-partition table involved in inheritance
+create table bar_p(i int, j int) distributed by (i);
+create table barchild () inherits(bar_p);
+NOTICE:  table has parent, setting distribution columns to match parent table
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+ERROR:  cannot attach inheritance parent as partition
+drop table barchild;
+drop table bar_p;
+-- rules on non-partition table
+create table bar_p(i int, j int) distributed by (i);
+create table baz_p(i int, j int) distributed by (i);
+create rule bar_baz as on insert to bar_p do instead insert into baz_p
+  values(NEW.i, NEW.j);
+alter table foo_p exchange partition for(2) with table bar_p;
+drop table foo_p, bar_p, baz_p;
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(5) every(1));
+-- Shouldn't fail: check constraint matches partition rule.
+-- Note this test is slightly different from prior versions to get
+-- in line with constraint consistency requirement.
+create table bar_d(i int, j int check (j >= 2 and j < 3 ))
+distributed by (i);
+insert into bar_d values(100000, 2);
+alter table foo_p exchange partition for(2) with table bar_d;
+insert into bar_d values(200000, 2);
+select * from bar_d;
+   i    | j 
+--------+---
+ 200000 | 2
+(1 row)
+
+drop table foo_p, bar_d;
+-- permissions
+create role part_role_append;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+create table foo_p (i int) partition by range(i) (start(1) end(10) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table bar_p (i int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+grant select on foo_p to part_role_append;
+revoke all on bar_p from part_role_append;
+NOTICE:  no privileges could be revoked
+select has_table_privilege('part_role_append', 'foo_p_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append', 'bar_p'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+alter table foo_p exchange partition for(6) with table bar_p;
+select has_table_privilege('part_role_append', 'foo_p_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+select has_table_privilege('part_role_append', 'bar_p'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+-- the ONLY keyword will affect just the partition root for both grant/revoke
+create role part_role_append2;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+grant select on only foo_p to part_role_append2;
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+grant select on foo_p to part_role_append2;
+revoke select on only foo_p from part_role_append2;
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+revoke select on foo_p from part_role_append2;
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+create table foo_p2 (a int, b int) partition by range(a) (start(1) end(10) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+grant select on foo_p, only foo_p2 to part_role_append2; -- multiple tables in same statement
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append2', 'foo_p2'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append2', 'foo_p2_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+-- more cases
+revoke all on foo_p from part_role_append2;
+revoke all on foo_p2 from part_role_append2;
+grant select on only public.foo_p to part_role_append2; -- with schema
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+grant update(b) on only foo_p2 to part_role_append2; -- column level priviledge
+select relname, has_column_privilege('part_role_append2', oid, 'b', 'update') from pg_class
+where relname = 'foo_p2' or relname = 'foo_p2_1_prt_6';
+    relname     | has_column_privilege 
+----------------+----------------------
+ foo_p2         | t
+ foo_p2_1_prt_6 | f
+(2 rows)
+
+drop table foo_p;
+drop table foo_p2;
+drop table bar_p;
+drop role part_role_append;
+drop role part_role_append2;
+-- validation
+create table foo_p (i int) partition by range(i)
+(start(1) end(10) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table bar_p (i int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into bar_p values(6);
+insert into bar_p values(100);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+ERROR:  partition constraint of relation "bar_p" is violated by some row
+alter table foo_p exchange partition for(6) with table bar_p without
+validation;
+NOTICE:  specifying "WITHOUT VALIDATION" acts as no operation
+DETAIL:  If the new partition is a regular table, validation is performed to make sure all the rows obey partition constraint. If the new partition is external or foreign table, no validation is performed.
+ERROR:  partition constraint of relation "bar_p" is violated by some row
+analyze foo_p;
+select * from foo_p;
+ i 
+---
+(0 rows)
+
+drop table foo_p, bar_p;
+-- basic test
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+insert into bar_p values(0,6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+ i | j 
+---+---
+ 0 | 6
+(1 row)
+
+select * from bar_p;
+ i | j 
+---+---
+(0 rows)
+
+-- test that we got the dependencies right
+drop table bar_p;
+select * from foo_p;
+ i | j 
+---+---
+ 0 | 6
+(1 row)
+
+drop table foo_p;
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+insert into bar_p values(10, 10);
+drop table foo_p;
+select * from bar_p;
+ i  | j  
+----+----
+ 10 | 10
+(1 row)
+
+insert into bar_p values(6, 6);
+select * from bar_p;
+ i  | j  
+----+----
+ 10 | 10
+  6 |  6
+(2 rows)
+
+drop table bar_p;
+-- AO exchange with heap
+create table foo_p (i int, j int) with(appendonly = true) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+insert into foo_p values(1, 1), (2, 1), (3, 1);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+ i | j 
+---+---
+ 2 | 1
+ 6 | 6
+ 1 | 1
+ 3 | 1
+(4 rows)
+
+drop table bar_p;
+drop table foo_p;
+-- other way around
+create table foo_p (i int, j int) with(appendonly = false) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) with(appendonly = true) distributed by (i);
+insert into foo_p values(1, 1), (2, 1), (3, 2);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+ i | j 
+---+---
+ 1 | 1
+ 3 | 2
+ 2 | 1
+ 6 | 6
+(4 rows)
+
+drop table bar_p;
+drop table foo_p;
+-- exchange AO with AO
+create table foo_p (i int, j int) with(appendonly = true) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) with(appendonly = true) distributed by (i);
+insert into foo_p values(1, 2), (2, 3), (3, 4);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+ i | j 
+---+---
+ 2 | 3
+ 6 | 6
+ 1 | 2
+ 3 | 4
+(4 rows)
+
+drop table bar_p;
+drop table foo_p;
+-- exchange same table more than once
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+ i | j 
+---+---
+ 6 | 6
+(1 row)
+
+select * from bar_p;
+ i | j 
+---+---
+(0 rows)
+
+alter table foo_p exchange partition for(6) with table bar_p;
+select * from foo_p;
+ i | j 
+---+---
+(0 rows)
+
+select * from bar_p;
+ i | j 
+---+---
+ 6 | 6
+(1 row)
+
+alter table foo_p exchange partition for(6) with table bar_p;
+select * from foo_p;
+ i | j 
+---+---
+ 6 | 6
+(1 row)
+
+select * from bar_p;
+ i | j 
+---+---
+(0 rows)
+
+drop table foo_p;
+drop table bar_p;
+-- exchange default partition is not allowed (single level)
+drop table if exists dex;
+NOTICE:  table "dex" does not exist, skipping
+drop table if exists exh_abc;
+NOTICE:  table "exh_abc" does not exist, skipping
+create table dex (i int,  j int) partition by range(j)
+(partition a start (1) end(10), partition b start(11) end(20),
+default partition abc);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table exh_abc (like dex);
+NOTICE:  table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table
+alter table dex exchange default partition with table exh_abc;
+drop table dex;
+drop table exh_abc;
+-- exchange default partition is not allowed (multi level)
+Drop table if exists sto_ao_ao;
+NOTICE:  table "sto_ao_ao" does not exist, skipping
+drop table if exists exh_ao_ao;
+NOTICE:  table "exh_ao_ao" does not exist, skipping
+Create table sto_ao_ao
+ (
+ col1 bigint, col2 date, col3 text, col4 int) with(appendonly=true)
+ distributed randomly  partition by range(col2)
+ subpartition by list (col3)
+ subpartition template ( default subpartition subothers, subpartition sub1 values ('one'), subpartition sub2 values ('two'))
+ (default partition others, start(date '2008-01-01') end(date '2008-04-30') every(interval '1 month'));
+create table exh_ao_ao (like sto_ao_ao) with (appendonly=true);
+NOTICE:  table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table
+alter table sto_ao_ao alter partition for ('2008-03-01') exchange default partition with table exh_ao_ao;
+-- Exchange a non-default sub-partition of a default partition, should fail
+alter table sto_ao_ao alter default partition exchange partition for ('one') with table exh_ao_ao;
+ERROR:  cannot specify a name, rank, or value for a DEFAULT partition in this context
+-- Exchange a partition that has sub partitions, should fail.
+alter table sto_ao_ao exchange partition for ('2008-01-01') with table exh_ao_ao;
+ERROR:  cannot EXCHANGE PARTITION for relation "sto_ao_ao" -- partition has children
+-- XXX: not yet: VALIDATE parameter
+-- Exchange a partition with an external table;
+create table foo_p (i int, j int) distributed by (i) partition by range(j) (start(1) end(10) every(2));
+create readable external table bar_p(i int, j int) location ('gpfdist://host.invalid:8000/file') format 'text';
+alter table foo_p exchange partition for(3) with table bar_p;
+NOTICE:  partition constraints are not validated when attaching a readable external table
+truncate foo_p;
+ERROR:  cannot truncate foreign table "foo_p_1_prt_2"
+drop table foo_p;
+drop table bar_p;
+-- Check for overflow of circular data types like time
+-- Should fail
+CREATE TABLE TIME_TBL_HOUR_2 (f1 time(2)) distributed by (f1)
+partition by range (f1)
+(
+  start (time '00:00') end (time '24:00') EVERY (INTERVAL '1 hour')
+);
+ERROR:  END parameter not reached before type overflows
+LINE 4:   start (time '00:00') end (time '24:00') EVERY (INTERVAL '1...
+                                    ^
+-- Should fail
+CREATE TABLE TIME_TBL_HOUR_2 (f1 time(2)) distributed by (f1)
+partition by range (f1)
+(
+  start (time '00:00') end (time '23:59') EVERY (INTERVAL '1 hour')
+);
+ERROR:  END parameter not reached before type overflows
+LINE 4:   start (time '00:00') end (time '23:59') EVERY (INTERVAL '1...
+                                    ^
+-- Should work
+CREATE TABLE TIME_TBL_HOUR_2 (f1 time(2)) distributed by (f1)
+partition by range (f1)
+(
+  start (time '00:00') end (time '23:00') EVERY (INTERVAL '1 hour')
+);
+drop table TIME_TBL_HOUR_2;
+-- Check for every parameters that just don't make sense
+create table hhh_r2 (a char(1), b date, d char(3))
+distributed by (a) partition by range (b)
+(                                                              
+partition aa start (date '2007-01-01') end (date '2008-01-01') 
+      every (interval '0 days')
+);
+ERROR:  EVERY parameter too small
+LINE 5:       every (interval '0 days')
+                     ^
+create table foo_p (i int) distributed by(i)
+partition by range(i)
+(start (1) end (20) every(0));
+ERROR:  EVERY parameter too small
+LINE 3: (start (1) end (20) every(0));
+                                  ^
+-- Check for ambiguous EVERY parameters
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (3) every (0.6));
+\d+ foo_p
+                             Partitioned table "public.foo_p"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: foo_p_1_prt_1 FOR VALUES FROM (1) TO (2),
+            foo_p_1_prt_2 FOR VALUES FROM (2) TO (3)
+Distributed by: (i)
+
+drop table foo_p;
+-- should fail
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (3) every (0.3));
+ERROR:  EVERY parameter too small
+LINE 3: (start (1) end (3) every (0.3));
+                                  ^
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (3) every (1.3));
+\d+ foo_p
+                             Partitioned table "public.foo_p"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: foo_p_1_prt_1 FOR VALUES FROM (1) TO (2),
+            foo_p_1_prt_2 FOR VALUES FROM (2) TO (3)
+Distributed by: (i)
+
+drop table foo_p;
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (20) every (10.9));
+\d+ foo_p
+                             Partitioned table "public.foo_p"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: foo_p_1_prt_1 FOR VALUES FROM (1) TO (12),
+            foo_p_1_prt_2 FOR VALUES FROM (12) TO (20)
+Distributed by: (i)
+
+drop table foo_p;
+-- should fail
+create table foo_p (i int, j date) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2008-01-01') every (interval '0.5 days'));
+ERROR:  EVERY parameter too small
+LINE 3: (start ('2007-01-01') end ('2008-01-01') every (interval '0....
+                                                        ^
+-- should fail
+create table foo_p (i int, j date) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2008-01-01') every (interval '12 hours'));
+ERROR:  EVERY parameter too small
+LINE 3: (start ('2007-01-01') end ('2008-01-01') every (interval '12...
+                                                        ^
+create table foo_p (i int, j date) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2007-01-05') every (interval '1.2 days'));
+\d+ foo_p
+                             Partitioned table "public.foo_p"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+ j      | date    |           |          |         | plain   |              | 
+Partition key: RANGE (j)
+Partitions: foo_p_1_prt_1 FOR VALUES FROM ('01-01-2007') TO ('01-02-2007'),
+            foo_p_1_prt_2 FOR VALUES FROM ('01-02-2007') TO ('01-03-2007'),
+            foo_p_1_prt_3 FOR VALUES FROM ('01-03-2007') TO ('01-04-2007'),
+            foo_p_1_prt_4 FOR VALUES FROM ('01-04-2007') TO ('01-05-2007')
+Distributed by: (i)
+
+drop table foo_p;
+-- should work
+create table foo_p (i int, j timestamp) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2007-01-05') every (interval '1.2 days'));
+\d+ foo_p
+                                       Partitioned table "public.foo_p"
+ Column |            Type             | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+-----------------------------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer                     |           |          |         | plain   |              | 
+ j      | timestamp without time zone |           |          |         | plain   |              | 
+Partition key: RANGE (j)
+Partitions: foo_p_1_prt_1 FOR VALUES FROM ('Mon Jan 01 00:00:00 2007') TO ('Tue Jan 02 04:48:00 2007'),
+            foo_p_1_prt_2 FOR VALUES FROM ('Tue Jan 02 04:48:00 2007') TO ('Wed Jan 03 09:36:00 2007'),
+            foo_p_1_prt_3 FOR VALUES FROM ('Wed Jan 03 09:36:00 2007') TO ('Thu Jan 04 14:24:00 2007'),
+            foo_p_1_prt_4 FOR VALUES FROM ('Thu Jan 04 14:24:00 2007') TO ('Fri Jan 05 00:00:00 2007')
+Distributed by: (i)
+
+drop table foo_p;
+-- test inclusive/exclusive
+CREATE TABLE supplier2(
+                S_SUPPKEY INTEGER,
+                S_NAME CHAR(25),
+                S_ADDRESS VARCHAR(40),
+                S_NATIONKEY INTEGER,
+                S_PHONECHAR char(15),
+                S_ACCTBAL decimal,
+				S_COMMENT VARCHAR(100)
+)
+partition by range (s_nationkey)
+(
+partition p1 start(0) , 
+partition p2 start(12) end(13), 
+partition p3 end(20) inclusive, 
+partition p4 start(20) exclusive , 
+partition p5 start(22) end(25)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_suppkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ supplier2
+                                     Partitioned table "public.supplier2"
+   Column    |          Type          | Collation | Nullable | Default | Storage  | Stats target | Description 
+-------------+------------------------+-----------+----------+---------+----------+--------------+-------------
+ s_suppkey   | integer                |           |          |         | plain    |              | 
+ s_name      | character(25)          |           |          |         | extended |              | 
+ s_address   | character varying(40)  |           |          |         | extended |              | 
+ s_nationkey | integer                |           |          |         | plain    |              | 
+ s_phonechar | character(15)          |           |          |         | extended |              | 
+ s_acctbal   | numeric                |           |          |         | main     |              | 
+ s_comment   | character varying(100) |           |          |         | extended |              | 
+Partition key: RANGE (s_nationkey)
+Partitions: supplier2_1_prt_p1 FOR VALUES FROM (0) TO (12),
+            supplier2_1_prt_p2 FOR VALUES FROM (12) TO (13),
+            supplier2_1_prt_p3 FOR VALUES FROM (13) TO (21),
+            supplier2_1_prt_p4 FOR VALUES FROM (21) TO (22),
+            supplier2_1_prt_p5 FOR VALUES FROM (22) TO (25)
+Distributed by: (s_suppkey)
+
+insert into supplier2 (s_suppkey, s_nationkey) select i, i 
+from generate_series(1, 24) i;
+select * from supplier2_1_prt_p1 order by S_NATIONKEY;
+ s_suppkey | s_name | s_address | s_nationkey | s_phonechar | s_acctbal | s_comment 
+-----------+--------+-----------+-------------+-------------+-----------+-----------
+         1 |        |           |           1 |             |           | 
+         2 |        |           |           2 |             |           | 
+         3 |        |           |           3 |             |           | 
+         4 |        |           |           4 |             |           | 
+         5 |        |           |           5 |             |           | 
+         6 |        |           |           6 |             |           | 
+         7 |        |           |           7 |             |           | 
+         8 |        |           |           8 |             |           | 
+         9 |        |           |           9 |             |           | 
+        10 |        |           |          10 |             |           | 
+        11 |        |           |          11 |             |           | 
+(11 rows)
+
+select * from supplier2_1_prt_p2 order by S_NATIONKEY;
+ s_suppkey | s_name | s_address | s_nationkey | s_phonechar | s_acctbal | s_comment 
+-----------+--------+-----------+-------------+-------------+-----------+-----------
+        12 |        |           |          12 |             |           | 
+(1 row)
+
+select * from supplier2_1_prt_p3 order by S_NATIONKEY;
+ s_suppkey | s_name | s_address | s_nationkey | s_phonechar | s_acctbal | s_comment 
+-----------+--------+-----------+-------------+-------------+-----------+-----------
+        13 |        |           |          13 |             |           | 
+        14 |        |           |          14 |             |           | 
+        15 |        |           |          15 |             |           | 
+        16 |        |           |          16 |             |           | 
+        17 |        |           |          17 |             |           | 
+        18 |        |           |          18 |             |           | 
+        19 |        |           |          19 |             |           | 
+        20 |        |           |          20 |             |           | 
+(8 rows)
+
+select * from supplier2_1_prt_p4 order by S_NATIONKEY;
+ s_suppkey | s_name | s_address | s_nationkey | s_phonechar | s_acctbal | s_comment 
+-----------+--------+-----------+-------------+-------------+-----------+-----------
+        21 |        |           |          21 |             |           | 
+(1 row)
+
+select * from supplier2_1_prt_p5 order by S_NATIONKEY;
+ s_suppkey | s_name | s_address | s_nationkey | s_phonechar | s_acctbal | s_comment 
+-----------+--------+-----------+-------------+-------------+-----------+-----------
+        22 |        |           |          22 |             |           | 
+        23 |        |           |          23 |             |           | 
+        24 |        |           |          24 |             |           | 
+(3 rows)
+
+drop table supplier2;
+-- mpp3238
+create table foo_p (i int) partition by range (i)
+(
+ partition p1 start('1') ,
+ partition p2 start('2639161') ,
+ partition p3 start('5957166') ,
+ partition p4 start('5981976') end('5994376') inclusive,
+ partition p5 end('6000001')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ foo_p
+                             Partitioned table "public.foo_p"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: foo_p_1_prt_p1 FOR VALUES FROM (1) TO (2639161),
+            foo_p_1_prt_p2 FOR VALUES FROM (2639161) TO (5957166),
+            foo_p_1_prt_p3 FOR VALUES FROM (5957166) TO (5981976),
+            foo_p_1_prt_p4 FOR VALUES FROM (5981976) TO (5994377),
+            foo_p_1_prt_p5 FOR VALUES FROM (5994377) TO (6000001)
+Distributed by: (i)
+
+insert into foo_p values(5994400);
+insert into foo_p values(1);
+insert into foo_p values(6000002);
+ERROR:  no partition of relation "foo_p" found for row
+DETAIL:  Partition key of the failing row contains (i) = (6000002).
+insert into foo_p values(5994376);
+drop table foo_p;
+create table foo_p (i int) 
+partition by range(i)
+(partition p1 start(1) end(5),
+ partition p2 start(10),
+ partition p3 end(10) exclusive);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ foo_p
+                             Partitioned table "public.foo_p"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: foo_p_1_prt_p1 FOR VALUES FROM (1) TO (5),
+            foo_p_1_prt_p2 FOR VALUES FROM (10) TO (MAXVALUE),
+            foo_p_1_prt_p3 FOR VALUES FROM (5) TO (10)
+Distributed by: (i)
+
+drop table foo_p;
+create table foo_p (i int) 
+partition by range(i)
+(partition p1 start(1) end(5),
+ partition p2 start(10) exclusive,
+ partition p3 end(10) inclusive);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ foo_p
+                             Partitioned table "public.foo_p"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: foo_p_1_prt_p1 FOR VALUES FROM (1) TO (5),
+            foo_p_1_prt_p2 FOR VALUES FROM (11) TO (MAXVALUE),
+            foo_p_1_prt_p3 FOR VALUES FROM (5) TO (11)
+Distributed by: (i)
+
+insert into foo_p values(1), (5), (10);
+drop table foo_p;
+-- MPP-3264
+-- mix AO with master HEAP and see if copy works
+create table foo_p (i int)
+partition by list(i)
+(partition p1 values(1, 2, 3) with (appendonly = true),
+ partition p2 values(4)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+copy foo_p from stdin;
+select * from foo_p;
+ i 
+---
+ 1
+ 3
+ 2
+ 4
+(4 rows)
+
+select * from foo_p_1_prt_p1;
+ i 
+---
+ 1
+ 3
+ 2
+(3 rows)
+
+select * from foo_p_1_prt_p2;
+ i 
+---
+ 4
+(1 row)
+
+drop table foo_p;
+-- other way around
+create table foo_p (i int) with(appendonly = true)
+partition by list(i)
+(partition p1 values(1, 2, 3) with (appendonly = false),
+ partition p2 values(4)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+copy foo_p from stdin;
+select * from foo_p;
+ i 
+---
+ 1
+ 3
+ 2
+ 4
+(4 rows)
+
+select * from foo_p_1_prt_p1;
+ i 
+---
+ 2
+ 1
+ 3
+(3 rows)
+
+select * from foo_p_1_prt_p2;
+ i 
+---
+ 4
+(1 row)
+
+drop table foo_p;
+-- Same as above, but the input is ordered so that the inserts to the heap
+-- partition happen first. Had a bug related flushing the multi-insert
+-- buffers in that scenario at one point.
+-- (https://github.com/greenplum-db/gpdb/issues/6678
+create table mixed_ao_part(distkey int, partkey int)
+with (appendonly=true) distributed by(distkey)
+partition by range(partkey) (
+  partition p1 start(0) end(100) with (appendonly = false),
+   partition p2 start(100) end(199)
+);
+copy mixed_ao_part from stdin;
+select * from mixed_ao_part;
+ distkey | partkey 
+---------+---------
+       1 |      95
+       1 |     100
+       2 |      96
+       2 |     101
+       3 |      97
+       3 |     102
+       4 |      98
+       4 |     103
+       5 |      99
+       5 |     104
+(10 rows)
+
+-- Don't drop the table, so that we leave behind a mixed table in the
+-- regression database for pg_dump/restore testing.
+-- MPP-3283
+CREATE TABLE PARTSUPP (
+PS_PARTKEY INTEGER,
+PS_SUPPKEY INTEGER,
+PS_AVAILQTY integer,
+PS_SUPPLYCOST decimal,
+PS_COMMENT VARCHAR(199)
+)
+partition by range (ps_suppkey)
+subpartition by range (ps_partkey)
+subpartition by range (ps_supplycost) subpartition template (start('1')
+end('1001') every(500))
+(
+partition p1 start('1') end('10001') every(5000)
+(subpartition sp1 start('1') end('200001') every(66666)
+)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into partsupp values(1,2,3325,771.64,', even theodolites. regular, final
+theodolites eat after the carefully pending foxes. furiously regular deposits
+sleep slyly. carefully bold realms above the ironic dependencies haggle
+careful');
+copy partsupp from stdin with delimiter '|';
+drop table partsupp;
+--MPP-3285
+CREATE TABLE PARTLINEITEM (
+                L_ORDERKEY INT8,
+                L_PARTKEY INTEGER,
+                L_SUPPKEY INTEGER,
+                L_LINENUMBER integer,
+                L_QUANTITY decimal,
+                L_EXTENDEDPRICE decimal,
+                L_DISCOUNT decimal,
+                L_TAX decimal,
+                L_RETURNFLAG CHAR(1),
+                L_LINESTATUS CHAR(1),
+                L_SHIPDATE date,
+                L_COMMITDATE date,
+                L_RECEIPTDATE date,
+                L_SHIPINSTRUCT CHAR(25),
+                L_SHIPMODE CHAR(10),
+                L_COMMENT VARCHAR(44)
+                )
+partition by range (l_commitdate)
+(
+partition p1 start('1992-01-31') end('1998-11-01') every(interval '20 months')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'l_orderkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+copy partlineitem from stdin with delimiter '|';
+\d+ partlineitem
+                                     Partitioned table "public.partlineitem"
+     Column      |         Type          | Collation | Nullable | Default | Storage  | Stats target | Description 
+-----------------+-----------------------+-----------+----------+---------+----------+--------------+-------------
+ l_orderkey      | bigint                |           |          |         | plain    |              | 
+ l_partkey       | integer               |           |          |         | plain    |              | 
+ l_suppkey       | integer               |           |          |         | plain    |              | 
+ l_linenumber    | integer               |           |          |         | plain    |              | 
+ l_quantity      | numeric               |           |          |         | main     |              | 
+ l_extendedprice | numeric               |           |          |         | main     |              | 
+ l_discount      | numeric               |           |          |         | main     |              | 
+ l_tax           | numeric               |           |          |         | main     |              | 
+ l_returnflag    | character(1)          |           |          |         | extended |              | 
+ l_linestatus    | character(1)          |           |          |         | extended |              | 
+ l_shipdate      | date                  |           |          |         | plain    |              | 
+ l_commitdate    | date                  |           |          |         | plain    |              | 
+ l_receiptdate   | date                  |           |          |         | plain    |              | 
+ l_shipinstruct  | character(25)         |           |          |         | extended |              | 
+ l_shipmode      | character(10)         |           |          |         | extended |              | 
+ l_comment       | character varying(44) |           |          |         | extended |              | 
+Partition key: RANGE (l_commitdate)
+Partitions: partlineitem_1_prt_p1_1 FOR VALUES FROM ('01-31-1992') TO ('09-30-1993'),
+            partlineitem_1_prt_p1_2 FOR VALUES FROM ('09-30-1993') TO ('05-30-1995'),
+            partlineitem_1_prt_p1_3 FOR VALUES FROM ('05-30-1995') TO ('01-30-1997'),
+            partlineitem_1_prt_p1_4 FOR VALUES FROM ('01-30-1997') TO ('09-30-1998'),
+            partlineitem_1_prt_p1_5 FOR VALUES FROM ('09-30-1998') TO ('11-01-1998')
+Distributed by: (l_orderkey)
+
+drop table partlineitem;
+-- Make sure ADD creates dependencies
+create table i (i int) partition by range(i) (start (1) end(3) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table i add partition foo2 start(40) end (50);
+drop table i;
+create table i (i int) partition by range(i) (start (1) end(3) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table i add partition foo2 start(40) end (50);
+alter table i drop partition foo2;
+-- when using the partition name to find target partition table,
+-- we shoud check whether the matched table belong to the partitioned table.
+-- raise error instead of executing on the irrelevant table.
+create table i_1_prt_3 (like i);
+-- create another partitioned table which contains a partition table that
+-- could be matched by partition name when targeted on an irrelevant table.
+create table i2 (i int) partition by range(i) (start (1) end(3) every(1));
+create table i_1_prt_4 partition of i2 for values from (4) to (5);
+-- the matechd table name is i_1_prt_3, but it's a normal table, raise error.
+alter table i drop partition "3";
+ERROR:  partition "3" of "i" does not exist
+-- the matched table name is i_1_prt_4, but it belongs to i2, raise error
+alter table i drop partition "4";
+ERROR:  partition "4" of "i" does not exist
+-- should raise error since we always make sure the partitioned table at least have one partition;
+alter table i drop partition "1", drop partition "2";
+ERROR:  cannot drop partition "i_1_prt_2" of "i" -- only one remains
+HINT:  Use DROP TABLE "i" to remove the table and the final partition
+drop table i;
+drop table i2;
+drop table i_1_prt_3;
+create table i (i int) partition by range(i) (start(1) end(3) every(1), default partition extra);
+-- should raise error since we always make sure the partitioned table at least have one partition;
+alter table i drop partition "2", drop partition "3", drop default partition;
+ERROR:  cannot drop partition "i_1_prt_extra" of "i" -- only one remains
+HINT:  Use DROP TABLE "i" to remove the table and the final partition
+drop table i;
+create table i (i int, c text) partition by range(i) subpartition by list(c)
+subpartition template (subpartition a values ('a'), subpartition b values ('b'))
+(start (1) end(3) every(1));
+-- should raise error since we always make sure the partitioned table at least have one partition;
+alter table i alter partition "1" drop partition a, alter partition "1" drop partition b;
+ERROR:  cannot drop partition "i_1_prt_1_2_prt_b" of "i_1_prt_1" -- only one remains
+HINT:  Use DROP TABLE "i_1_prt_1" to remove the table and the final partition
+drop table i;
+CREATE TABLE PARTSUPP (
+PS_PARTKEY INTEGER,
+PS_SUPPKEY INTEGER,
+PS_AVAILQTY integer,
+PS_SUPPLYCOST decimal,
+PS_COMMENT VARCHAR(199)
+)
+partition by range (ps_suppkey)
+subpartition by range (ps_partkey)
+subpartition by range (ps_supplycost) subpartition template (start('1')
+end('1001') every(500))
+(
+partition p1 start('1') end('10001') every(5000)
+(subpartition sp1 start('1') end('200001') every(66666)
+)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'partsupp%';
+                 relname                 |             pg_get_expr              
+-----------------------------------------+--------------------------------------
+ partsupp                                | 
+ partsupp_1_prt_p1_1                     | FOR VALUES FROM (1) TO (5001)
+ partsupp_1_prt_p1_1_2_prt_sp1_1         | FOR VALUES FROM (1) TO (66667)
+ partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_1_2_prt_sp1_1_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+ partsupp_1_prt_p1_1_2_prt_sp1_2         | FOR VALUES FROM (66667) TO (133333)
+ partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_1_2_prt_sp1_2_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+ partsupp_1_prt_p1_1_2_prt_sp1_3         | FOR VALUES FROM (133333) TO (199999)
+ partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_1_2_prt_sp1_3_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+ partsupp_1_prt_p1_1_2_prt_sp1_4         | FOR VALUES FROM (199999) TO (200001)
+ partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_1_2_prt_sp1_4_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+ partsupp_1_prt_p1_2                     | FOR VALUES FROM (5001) TO (10001)
+ partsupp_1_prt_p1_2_2_prt_sp1_1         | FOR VALUES FROM (1) TO (66667)
+ partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_2_2_prt_sp1_1_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+ partsupp_1_prt_p1_2_2_prt_sp1_2         | FOR VALUES FROM (66667) TO (133333)
+ partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_2_2_prt_sp1_2_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+ partsupp_1_prt_p1_2_2_prt_sp1_3         | FOR VALUES FROM (133333) TO (199999)
+ partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_2_2_prt_sp1_3_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+ partsupp_1_prt_p1_2_2_prt_sp1_4         | FOR VALUES FROM (199999) TO (200001)
+ partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_1 | FOR VALUES FROM ('1') TO ('501')
+ partsupp_1_prt_p1_2_2_prt_sp1_4_3_prt_2 | FOR VALUES FROM ('501') TO ('1001')
+(27 rows)
+
+drop table partsupp;
+-- ALTER TABLE ALTER PARTITION tests
+CREATE TABLE ataprank (id int, rank int,
+year date, gender char(1),
+usstate char(2))
+DISTRIBUTED BY (id, gender, year, usstate)
+partition by list (gender)
+subpartition by range (year)
+subpartition template (
+subpartition jan01 start (date '2001-01-01'),
+subpartition jan02 start (date '2002-01-01'),
+subpartition jan03 start (date '2003-01-01'),
+subpartition jan04 start (date '2004-01-01'),
+subpartition jan05 start (date '2005-01-01')
+)
+subpartition by list (usstate)
+subpartition template (
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+)
+(
+  partition boys values ('M'),
+  partition girls values ('F')
+);
+-- and without subpartition templates...
+CREATE TABLE ataprank2 (id int, rank int,
+year date, gender char(1),
+usstate char(2))
+DISTRIBUTED BY (id, gender, year, usstate)
+partition by list (gender)
+subpartition by range (year)
+subpartition by list (usstate)
+(
+  partition boys values ('M') 
+(
+subpartition jan01 start (date '2001-01-01') 
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan02 start (date '2002-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan03 start (date '2003-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan04 start (date '2004-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan05 start (date '2005-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+)
+),
+  partition girls values ('F')
+(
+subpartition jan01 start (date '2001-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan02 start (date '2002-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan03 start (date '2003-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan04 start (date '2004-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan05 start (date '2005-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+)
+)
+);
+-- ok
+alter table ataprank truncate partition girls;
+alter table ataprank alter partition girls truncate partition for ('2001-01-01');
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') truncate partition mass;
+-- addressing partitions by RANK is no longer supported
+alter table ataprank truncate partition for (rank (1));
+ERROR:  addressing partition by RANK is no longer supported
+LINE 1: alter table ataprank truncate partition for (rank (1));
+                                                     ^
+HINT:  Use partition name or FOR (<partition key value>) instead.
+-- don't NOTIFY of children if cascade
+alter table ataprank truncate partition girls cascade;
+-- fail - no partition for '1999-01-01'
+alter table ataprank alter partition girls truncate partition for ('1999-01-01');
+ERROR:  partition for specified value of ataprank_1_prt_girls does not exist
+-- fail - no funky
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') truncate partition "funky";
+ERROR:  relation "public.ataprank_1_prt_girls_2_prt_jan01_3_prt_funky" does not exist
+-- fail - no funky (drop)
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') drop partition "funky";
+ERROR:  relation "public.ataprank_1_prt_girls_2_prt_jan01_3_prt_funky" does not exist
+-- fail - missing name
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') drop partition ;
+ERROR:  syntax error at or near ";"
+LINE 2: for ('2001-01-01') drop partition ;
+                                          ^
+-- ok
+alter table ataprank alter partition girls drop partition 
+for ('2001-01-01') ;
+-- ok , skipping
+alter table ataprank alter partition girls drop partition if exists jan01;
+NOTICE:  partition "jan01" of partition "girls" of relation "ataprank" does not exist, skipping
+-- ok
+alter table ataprank alter partition girls drop partition for ('2002-01-01');
+alter table ataprank alter partition girls drop partition for ('2003-01-01');
+alter table ataprank alter partition girls drop partition for ('2004-01-01');
+-- ok, skipping
+alter table ataprank alter partition girls drop partition if exists for ('2004-01-01');
+-- ok
+alter table ataprank alter partition girls rename partition jan05 
+to "funky fresh";
+alter table ataprank alter partition girls rename partition "funky fresh"
+to jan05;
+-- fail , not exist
+alter table ataprank alter partition girls alter partition jan05 rename
+partition jan01 to foo;
+ERROR:  relation "public.ataprank_1_prt_girls_2_prt_jan05_3_prt_jan01" does not exist
+-- fail not exist
+alter table ataprank alter partition girls alter partition jan05 alter
+partition cali rename partition foo to bar;
+ERROR:  table "ataprank_1_prt_girls_2_prt_jan05_3_prt_cali" is not partitioned
+-- fail not partitioned
+alter table ataprank alter partition girls alter partition jan05 alter
+partition cali alter partition foo drop partition bar;
+ERROR:  table "ataprank_1_prt_girls_2_prt_jan05_3_prt_cali" is not partitioned
+-- ADD PARTITION, with and without templates
+-- fails for ataprank (due to template), works for ataprank2
+alter table ataprank
+add partition neuter values ('N')
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition bar values ('AZ')));
+ERROR:  subpartition configuration conflicts with subpartition template
+LINE 3:     (subpartition foo
+             ^
+alter table ataprank2
+add partition neuter values ('N')
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition bar values ('AZ')));
+-- fail , no subpartition spec for ataprank2, works for ataprank
+alter table ataprank alter partition boys
+add partition jan00 start ('2000-01-01') end ('2001-01-01');
+alter table ataprank2 alter partition boys
+add partition jan00 start ('2000-01-01') end ('2001-01-01');
+ERROR:  no partitions specified at depth 3
+-- work - create subpartition for ataprank2, fail for ataprank
+alter table ataprank alter partition boys
+add partition jan99 start ('1999-01-01') end ('2000-01-01')
+  (subpartition ariz values ('AZ'));
+ERROR:  subpartition configuration conflicts with subpartition template
+alter table ataprank2 alter partition boys
+add partition jan00 start ('2000-01-01') end ('2001-01-01')
+  (subpartition ariz values ('AZ'));
+-- works for both -- adding leaf partition doesn't conflict with template
+alter table ataprank alter partition boys
+alter partition jan00 
+add partition haw values ('HI');
+alter table ataprank2 alter partition boys
+alter partition jan00 
+add partition haw values ('HI');
+alter table ataprank drop partition neuter;
+ERROR:  relation "public.ataprank_1_prt_neuter" does not exist
+alter table ataprank2 drop partition neuter;
+-- fail , no subpartition spec for ataprank2, work for ataprank
+alter table ataprank
+add default partition neuter ;
+alter table ataprank2
+add default partition neuter ;
+ERROR:  no partitions specified at depth 2
+alter table ataprank
+add default partition neuter 
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition ariz values ('AZ')));
+ERROR:  subpartition configuration conflicts with subpartition template
+LINE 3:     (subpartition foo
+             ^
+alter table ataprank2
+add default partition neuter 
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition ariz values ('AZ')));
+-- fail
+alter table ataprank
+alter default partition add default partition def1 
+(subpartition haw values ('HI'));
+ERROR:  subpartition configuration conflicts with subpartition template
+-- fail
+alter table ataprank
+alter default partition alter default partition 
+add default partition def2;
+ERROR:  DEFAULT partition of relation "ataprank_1_prt_neuter" does not exist
+-- work
+alter table ataprank
+alter default partition add default partition def1;
+alter table ataprank
+alter default partition alter default partition 
+add default partition def2;
+alter table ataprank2
+alter default partition add default partition def1 
+(subpartition haw values ('HI'));
+alter table ataprank2
+alter default partition alter default partition 
+add default partition def2;
+drop table ataprank ;
+drop table ataprank2 ;
+-- **END** ALTER TABLE ALTER PARTITION tests
+-- Test casting
+create table f (i int) partition by range (i) (start(1::int) end(10::int));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table f;
+create table f (i bigint) partition by range (i) (start(1::int8)
+end(1152921504606846976::int8) every(576460752303423488));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table f;
+create table f (n numeric(20, 2)) partition by range(n) (start(1::bigint)
+end(10000::bigint));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'n' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table f;
+--should fail, there's no assignment cast from text to numeric
+create table f (n numeric(20, 2)) partition by range(n) (start(1::bigint)
+end(10000::text));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'n' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  specified value cannot be cast to type numeric for column "n"
+LINE 2: end(10000::text));
+            ^
+--should fail. there's no assignment cast from bool to numeric
+create table f (n numeric(20, 2)) partition by range(n) (start(1::bigint)
+end('f'::bool));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'n' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  specified value cannot be cast to type numeric for column "n"
+LINE 2: end('f'::bool));
+            ^
+-- see that grant and revoke cascade to children
+create role part_role_append;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+create table granttest (i int, j int) partition by range(i) 
+subpartition by list(j) subpartition template (values(1, 2, 3))
+(start(1) end(4) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+select relname, has_table_privilege('part_role_append', oid,'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+          relname          | tabpriv | i_priv | j_priv 
+---------------------------+---------+--------+--------
+ granttest_1_prt_2         | f       | f      | f
+ granttest_1_prt_2_2_prt_1 | f       | f      | f
+ granttest_1_prt_3         | f       | f      | f
+ granttest_1_prt_3_2_prt_1 | f       | f      | f
+ granttest                 | f       | f      | f
+ granttest_1_prt_1         | f       | f      | f
+ granttest_1_prt_1_2_prt_1 | f       | f      | f
+(7 rows)
+
+grant select (i) on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid,'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+          relname          | tabpriv | i_priv | j_priv 
+---------------------------+---------+--------+--------
+ granttest_1_prt_2         | f       | t      | f
+ granttest_1_prt_2_2_prt_1 | f       | t      | f
+ granttest_1_prt_3         | f       | t      | f
+ granttest_1_prt_3_2_prt_1 | f       | t      | f
+ granttest                 | f       | t      | f
+ granttest_1_prt_1         | f       | t      | f
+ granttest_1_prt_1_2_prt_1 | f       | t      | f
+(7 rows)
+
+grant select on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid,'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+          relname          | tabpriv | i_priv | j_priv 
+---------------------------+---------+--------+--------
+ granttest_1_prt_1         | t       | t      | t
+ granttest_1_prt_1_2_prt_1 | t       | t      | t
+ granttest_1_prt_2         | t       | t      | t
+ granttest_1_prt_2_2_prt_1 | t       | t      | t
+ granttest_1_prt_3         | t       | t      | t
+ granttest_1_prt_3_2_prt_1 | t       | t      | t
+ granttest                 | t       | t      | t
+(7 rows)
+
+grant insert on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+          relname          | tabpriv | i_priv | j_priv 
+---------------------------+---------+--------+--------
+ granttest_1_prt_1         | t       | t      | t
+ granttest_1_prt_1_2_prt_1 | t       | t      | t
+ granttest_1_prt_2         | t       | t      | t
+ granttest_1_prt_2_2_prt_1 | t       | t      | t
+ granttest_1_prt_3         | t       | t      | t
+ granttest_1_prt_3_2_prt_1 | t       | t      | t
+ granttest                 | t       | t      | t
+(7 rows)
+
+revoke insert on granttest from part_role_append;
+grant insert (j) on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+          relname          | tabpriv | i_priv | j_priv 
+---------------------------+---------+--------+--------
+ granttest_1_prt_1         | f       | f      | t
+ granttest_1_prt_1_2_prt_1 | f       | f      | t
+ granttest_1_prt_2         | f       | f      | t
+ granttest_1_prt_2_2_prt_1 | f       | f      | t
+ granttest_1_prt_3         | f       | f      | t
+ granttest_1_prt_3_2_prt_1 | f       | f      | t
+ granttest                 | f       | f      | t
+(7 rows)
+
+-- Check that when a new partition is created, it inherits the permissions
+-- from the parent.
+alter table granttest add partition newpart start(100) end (101);
+-- same with the new upstream syntax.
+create table granttest_newpartsyntax partition of granttest for values from (110) to (120);
+select relname, has_table_privilege('part_role_append', oid, 'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+             relname             | tabpriv | i_priv | j_priv 
+---------------------------------+---------+--------+--------
+ granttest                       | t       | t      | t
+ granttest_1_prt_1               | t       | t      | t
+ granttest_1_prt_1_2_prt_1       | t       | t      | t
+ granttest_1_prt_2               | t       | t      | t
+ granttest_1_prt_2_2_prt_1       | t       | t      | t
+ granttest_1_prt_3               | t       | t      | t
+ granttest_1_prt_3_2_prt_1       | t       | t      | t
+ granttest_1_prt_newpart         | t       | t      | t
+ granttest_1_prt_newpart_2_prt_1 | t       | t      | t
+ granttest_newpartsyntax         | t       | t      | t
+(10 rows)
+
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+             relname             | tabpriv | i_priv | j_priv 
+---------------------------------+---------+--------+--------
+ granttest                       | f       | f      | t
+ granttest_1_prt_1               | f       | f      | t
+ granttest_1_prt_1_2_prt_1       | f       | f      | t
+ granttest_1_prt_2               | f       | f      | t
+ granttest_1_prt_2_2_prt_1       | f       | f      | t
+ granttest_1_prt_3               | f       | f      | t
+ granttest_1_prt_3_2_prt_1       | f       | f      | t
+ granttest_1_prt_newpart         | f       | f      | t
+ granttest_1_prt_newpart_2_prt_1 | f       | f      | t
+ granttest_newpartsyntax         | f       | f      | t
+(10 rows)
+
+revoke all on granttest from part_role_append;
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+             relname             | tabpriv | i_priv | j_priv 
+---------------------------------+---------+--------+--------
+ granttest                       | f       | f      | f
+ granttest_1_prt_1               | f       | f      | f
+ granttest_1_prt_1_2_prt_1       | f       | f      | f
+ granttest_1_prt_2               | f       | f      | f
+ granttest_1_prt_2_2_prt_1       | f       | f      | f
+ granttest_1_prt_3               | f       | f      | f
+ granttest_1_prt_3_2_prt_1       | f       | f      | f
+ granttest_1_prt_newpart         | f       | f      | f
+ granttest_1_prt_newpart_2_prt_1 | f       | f      | f
+ granttest_newpartsyntax         | f       | f      | f
+(10 rows)
+
+drop table granttest;
+drop role part_role_append;
+-- deep inline + optional subpartition comma:
+CREATE TABLE partsupp_1 (
+    ps_partkey integer,
+    ps_suppkey integer,
+    ps_availqty integer,
+    ps_supplycost numeric,
+    ps_comment character varying(199)
+) distributed by (ps_partkey) PARTITION BY RANGE(ps_suppkey)
+          SUBPARTITION BY RANGE(ps_partkey)
+                  SUBPARTITION BY RANGE(ps_supplycost) 
+          (
+          PARTITION p1_1 START (1) END (1666667) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  ), 
+          PARTITION p1_2 START (1666667) END (3333333) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  ), 
+          PARTITION p1_3 START (3333333) END (4999999) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  ), 
+          PARTITION p1_4 START (4999999) END (5000001) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  )
+          );
+-- Accept negative values trivially:
+create table partition_g (i int) partition by range(i) (start((-1)) end(10));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table partition_g;
+create table partition_g (i int) partition by range(i) (start(-1) end(10));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table partition_g;
+CREATE TABLE orders (
+    o_orderkey bigint,
+    o_custkey integer,
+    o_orderstatus character(1),
+    o_totalprice numeric,
+    o_orderdate date,
+    o_orderpriority character(15),
+    o_clerk character(15),
+    o_shippriority integer,
+    o_comment character varying(79)
+)
+WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) PARTITION BY RANGE(o_orderdate)
+          SUBPARTITION BY RANGE(o_custkey)
+                  SUBPARTITION BY RANGE(o_orderkey) 
+          (
+          PARTITION p1_1 START ('1992-01-01'::date) END ('1993-06-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_2 START ('1993-06-01'::date) END ('1994-11-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_3 START ('1994-11-01'::date) END ('1996-04-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_4 START ('1996-04-01'::date) END ('1997-09-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_5 START ('1997-09-01'::date) END ('1998-08-03'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  )
+          );
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'o_orderkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- grammar bug: MPP-3361
+create table i2 (i int) partition by range(i) (start(-2::int) end(20));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table i2;
+create table i2 (i int) partition by range(i) (start((-2)::int) end(20));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table i2;
+create table i2 (i int) partition by range(i) (start(cast ((-2)::bigint as int))
+end(20));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+drop table i2;
+CREATE TABLE partsupp (
+    ps_partkey integer,
+    ps_suppkey integer,
+    ps_availqty integer,
+    ps_supplycost numeric,
+    ps_comment character varying(199)
+) PARTITION BY RANGE(ps_supplycost)
+          (
+          PARTITION newpart START ((-10000)::numeric) EXCLUSIVE END (1::numeric)
+,
+          PARTITION p1 START (1::numeric) END (1001::numeric)
+          );
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  START EXCLUSIVE not supported for partition key data type: numeric
+HINT:  Specify an inclusive START value and remove the EXCLUSIVE keyword
+drop table partsupp;
+ERROR:  table "partsupp" does not exist
+-- Deletion tests
+CREATE TABLE tmp_nation_region (n_regionkey integer);
+drop table if exists tmp_nation;
+NOTICE:  table "tmp_nation" does not exist, skipping
+CREATE TABLE tmp_nation (N_NATIONKEY INTEGER, N_NAME CHAR(25), N_REGIONKEY INTEGER, N_COMMENT VARCHAR(152))  
+partition by range (n_nationkey) 
+ (
+partition p1 start('0')  WITH (appendonly=true,checksum=true,blocksize=1998848,compresslevel=4),  
+partition p2 start('11') end('15') inclusive WITH (checksum=false,appendonly=true,blocksize=655360,compresslevel=4),
+partition p3 start('15') exclusive end('19'), partition p4 start('19')  WITH (compresslevel=8,appendonly=true,checksum=false,blocksize=884736), 
+partition p5 start('20')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'n_nationkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+delete from tmp_nation where n_regionkey in (select n_regionkey from tmp_nation_region) and n_nationkey between 1 and 5;
+drop table tmp_nation;
+-- SPLIT tests
+-- basic sanity tests. All should pass.
+create table k (i int) partition by range(i) (start(1) end(10) every(2), 
+default partition mydef);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into k select i from generate_series(1, 100) i;
+alter table k split partition mydef at (20) into (partition mydef, 
+partition foo);
+ERROR:  AT clause cannot be used when splitting a default RANGE partition
+drop table k;
+create table j (i int) partition by list(i) (partition a values(1, 2, 3, 4),
+partition b values(5, 6, 7, 8));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into j select i from generate_series(1, 8) i;
+alter table j split partition for(1) at (2, 3) into (partition fa, partition
+fb);
+select * from j_1_prt_fa;
+ i 
+---
+ 1
+ 4
+(2 rows)
+
+select * from j_1_prt_fb;
+ i 
+---
+ 3
+ 2
+(2 rows)
+
+alter table j split partition for(5) at (6);
+select * from j;
+ i 
+---
+ 1
+ 3
+ 5
+ 7
+ 4
+ 2
+ 8
+ 6
+(8 rows)
+
+-- should fail
+alter table j split partition for (1) at (100);
+ERROR:  AT clause parameter is not a member of the target partition specification
+drop table j;
+create table k (i int) partition by range(i) (start(1) end(10) every(2), 
+default partition mydef);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- should fail
+alter table k split default partition start(30) end (300) into (partition mydef, partition mydef);
+ERROR:  both INTO partitions already exist
+alter table k split partition for(3) at (20);
+ERROR:  partition "k_1_prt_1" would overlap partition "k_1_prt_4"
+drop table k;
+-- should work
+create table k (i int) partition by range(i) (start(1) end(10) every(2), 
+default partition mydef);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into k select i from generate_series(1, 30) i;
+alter table k split default partition start(15) end(20) into
+(partition mydef, partition foo);
+select * from k_1_prt_foo;
+ i  
+----
+ 16
+ 18
+ 15
+ 17
+ 19
+(5 rows)
+
+alter table k split default partition start(22) exclusive end(25) inclusive
+into (partition bar, partition mydef);
+select * from k_1_prt_bar;
+ i  
+----
+ 23
+ 25
+ 24
+(3 rows)
+
+-- This fails, because it would create a partition with an empty range. Before
+-- GPDB 7, this passed, because a partition like "start (22) exclusive end (23)
+-- exclusive" was considered valid.
+alter table k split partition bar at (23) into (partition baz, partition foz);
+ERROR:  empty range bound specified for partition "k_1_prt_baz"
+DETAIL:  Specified lower bound (23) is greater than or equal to upper bound (23).
+\d+ k
+                               Partitioned table "public.k"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: k_1_prt_2 FOR VALUES FROM (1) TO (3),
+            k_1_prt_3 FOR VALUES FROM (3) TO (5),
+            k_1_prt_4 FOR VALUES FROM (5) TO (7),
+            k_1_prt_5 FOR VALUES FROM (7) TO (9),
+            k_1_prt_6 FOR VALUES FROM (9) TO (10),
+            k_1_prt_bar FOR VALUES FROM (23) TO (26),
+            k_1_prt_foo FOR VALUES FROM (15) TO (20),
+            k_1_prt_mydef DEFAULT
+Distributed by: (i)
+
+drop table k;
+-- Add CO partition and split, reported in MPP-17761
+create table k (i int) with (appendonly = true, orientation = column) distributed by (i) partition by range(i) (start(1) end(10) every(5));
+alter table k add partition co start(11) end (17) with (appendonly = true, orientation = column);
+alter table k split partition co at (14) into (partition co1, partition co2);
+drop table k;
+create table k (a int, b int) with (appendonly = true) distributed by (a) partition by list(b)
+(
+	partition a values (1, 2, 3, 4) with (appendonly = true, orientation = column),
+	partition b values (5, 6, 7 ,8) with (appendonly = true, orientation = column)
+);
+alter table k split partition for(2) at(2) into (partition one, partition two);
+drop table k;
+-- Test errors for default handling
+create table k (i int) partition by range(i) (start(1) end(2), 
+default partition mydef);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table k split partition mydef at (25) into (partition foo, partition
+mydef);
+ERROR:  AT clause cannot be used when splitting a default RANGE partition
+drop table k;
+create table k (i int) partition by list(i) (values(1), values(2),
+default partition mydef);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table k split default partition start(10) end(20);
+ERROR:  cannot SPLIT LIST PARTITION with START
+HINT:  Use SPLIT with the AT clause instead.
+drop table k;
+-- Check that we support int2
+CREATE TABLE myINT2_TBL(q1 int2)
+ partition by range (q1)
+ (start (1) end (3) every (1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'q1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into myint2_tbl values(1), (2);
+drop table myint2_tbl;
+-- try SREH on a partitioned table.
+create table ao_p (i int) with (appendonly = true)
+ partition by range(i)
+ (start(1) end(5) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+copy ao_p from stdin log errors segment reject limit 100;
+NOTICE:  found 2 data formatting errors (2 or more input rows), rejected related input data
+select * from ao_p;
+ i 
+---
+ 2
+ 3
+(2 rows)
+
+drop table ao_p;
+-- MPP-3591: make sure we get inclusive/exclusive right with every().
+create table k (i int) partition by range(i)
+(start(0) exclusive end(100) inclusive every(25));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ k
+                               Partitioned table "public.k"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ i      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (i)
+Partitions: k_1_prt_1 FOR VALUES FROM (1) TO (26),
+            k_1_prt_2 FOR VALUES FROM (26) TO (51),
+            k_1_prt_3 FOR VALUES FROM (51) TO (76),
+            k_1_prt_4 FOR VALUES FROM (76) TO (101)
+Distributed by: (i)
+
+insert into k select i from generate_series(1, 100) i;
+drop table k;
+-- ADD and SPLIT must get inherit permissions of the partition they're
+-- modifying
+create role part_role_append;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+create table a (a int, b int, c int) partition by range(a) subpartition by
+range(b) subpartition template (subpartition h start(1) end(10)) 
+subpartition by range(c)
+subpartition template(subpartition i start(1) end(10)) 
+(partition g start(1) end(2));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+revoke all on a from public;
+NOTICE:  no privileges could be revoked
+grant insert on a to part_role_append;
+-- revoke it from one existing partition, to make sure we don't screw up
+-- existing permissions
+revoke all on a_1_prt_g_2_prt_h_3_prt_i from part_role_append;
+alter table a add partition b start(40) end(50);
+set session authorization part_role_append;
+select has_table_privilege('part_role_append', 'a'::regclass,'insert');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h'::regclass,'insert');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h_3_prt_i'::regclass,'insert');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_g_2_prt_h_3_prt_i'::regclass,
+'insert');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+insert into a values(45, 5, 5);
+-- didn't grant select
+select has_table_privilege('part_role_append', 'a'::regclass,'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h'::regclass,'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h_3_prt_i'::regclass,'select');
+ has_table_privilege 
+---------------------
+ f
+(1 row)
+
+\c -
+drop table a;
+create table a (i date) partition by range(i) 
+(partition f start(date '2005-01-01') end (date '2009-01-01')
+	every(interval '2 years'));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+revoke all on a from public;
+NOTICE:  no privileges could be revoked
+grant insert on a to part_role_append;
+alter table a split partition for ('2005-01-01') at (date '2006-01-01')
+  into (partition f, partition g);
+alter table a add default partition mydef;
+alter table a split default partition start(date '2010-01-01') end(date
+'2011-01-01') into(partition mydef, partition other);
+set session authorization part_role_append;
+select has_table_privilege('part_role_append', 'a'::regclass,'insert');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_f'::regclass,'insert');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_mydef'::regclass,'insert');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+select has_table_privilege('part_role_append', 'a_1_prt_other'::regclass,'insert');
+ has_table_privilege 
+---------------------
+ t
+(1 row)
+
+insert into a values('2005-05-05');
+insert into a values('2006-05-05');
+insert into a values('2010-10-10');
+\c -
+drop table a;
+drop role part_role_append;
+-- Check that when we split a default, the INTO clause must named the default
+create table k (i date) partition by range(i) (start('2008-01-01')
+end('2009-01-01') every(interval '1 month'), default partition default_part);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table k split default partition start ('2009-01-01') end ('2009-02-01')
+into (partition aa, partition nodate);
+ERROR:  default partition name missing from INTO clause
+alter table k split default partition start ('2009-01-01') end ('2009-02-01')
+into (partition aa, partition default_part);
+-- check that it works without INTO
+alter table k split default partition start ('2009-02-01') end ('2009-03-01');
+drop table k;
+-- List too
+create table k (i int) partition by list(i) (partition a values(1, 2),
+partition b values(3, 4), default partition mydef);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table k split partition mydef at (5) into (partition foo, partition bar);
+ERROR:  default partition name missing from INTO clause
+alter table k split partition mydef at (5) into (partition foo, partition mydef);
+alter table k split partition mydef at (10);
+drop table k;
+-- For LIST, make sure that we reject AT() clauses which match all parameters
+create table j (i int) partition by list(i) (partition a values(1, 2, 3, 4),
+ partition b values(5, 6, 7, 8));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table j split partition for(1) at (1,2) into (partition fa, partition fb);
+alter table j split partition for(1) at (1,2) 
+into (partition f1a, partition f1b); -- This has partition rules that overlaps
+ERROR:  AT clause cannot contain all values in the partition to be split
+drop table j;
+-- Check that we can split LIST partitions that have a default partition
+create table j (i int) partition by list(i) (partition a values(1, 2, 3, 4),
+partition b values(5, 6, 7, 8), default partition default_part);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table j split partition for(1) at (1,2) into (partition f1a, partition
+f1b);
+drop table j;
+-- Make sure range can too
+create table j (i int) partition by range(i) (partition a start(1) end(10),
+default partition default_part);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table j split partition for(1) at (5) into (partition f1a, partition f1b);
+drop table j;
+-- MPP-3667 ADD PARTITION overlaps
+create table mpp3621 (aa date, bb date) partition by range (bb)
+(partition foo start('2008-01-01'));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'aa' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- these are ok
+alter table mpp3621 add partition a1 start ('2007-01-01') end ('2007-02-01');
+alter table mpp3621 add partition a2 start ('2007-02-01') end ('2007-03-01');
+alter table mpp3621 add partition a3 start ('2007-03-01') end ('2007-04-01');
+alter table mpp3621 add partition a4 start ('2007-09-01') end ('2007-10-01');
+alter table mpp3621 add partition a5 start ('2007-08-01') end ('2007-09-01');
+alter table mpp3621 add partition a6 start ('2007-04-01') end ('2007-05-01');
+alter table mpp3621 add partition a7 start ('2007-05-01') end ('2007-06-01');
+ -- was error due to startSearchpoint != endSearchpoint
+alter table mpp3621 add partition a8 start ('2007-07-01') end ('2007-08-01');
+-- ok
+alter table mpp3621 add partition a9 start ('2007-06-01') end ('2007-07-01');
+drop table mpp3621;
+-- Check for MPP-3679 and MPP-3692
+create table list_test (a text, b text) partition by list (a) (
+  partition foo values ('foo'),
+  partition bar values ('bar'),
+  default partition baz);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into list_test values ('foo', 'blah');
+insert into list_test values ('bar', 'blah');
+insert into list_test values ('baz', 'blah');
+alter table list_test split default partition at ('baz')
+  into (partition bing, default partition);
+drop table list_test;
+-- MPP-3816: cannot drop column  which is the subject of partition config
+create table list_test(a int, b int, c int) distributed by (a)
+  partition by list(b) 
+  subpartition by list(c) subpartition template(subpartition c values(2))
+  (partition b values(1));
+-- should fail
+alter table list_test drop column b;
+ERROR:  cannot drop column "b" because it is part of the partition key of relation "list_test"
+alter table list_test drop column c;
+ERROR:  cannot drop column "c" because it is part of the partition key of relation "list_test_1_prt_b"
+drop table list_test;
+-- MPP-3678: allow exchange and split on tables with subpartitioning
+CREATE TABLE rank_exc (
+id int,
+rank int,
+year int,
+gender char(1),
+count int ) 
+DISTRIBUTED BY (id)
+PARTITION BY LIST (gender)
+SUBPARTITION BY RANGE (year)
+SUBPARTITION TEMPLATE (
+SUBPARTITION year1 START (2001),
+SUBPARTITION year2 START (2002),
+SUBPARTITION year3 START (2003),
+SUBPARTITION year4 START (2004),
+SUBPARTITION year5 START (2005),
+SUBPARTITION year6 START (2006) END (2007) )
+(PARTITION girls VALUES ('F'),
+PARTITION boys VALUES ('M')
+);
+alter table rank_exc alter partition girls add default partition gfuture;
+alter table rank_exc alter partition boys add default partition bfuture;
+insert into rank_exc values(1, 1, 2007, 'M', 1);
+insert into rank_exc values(2, 2, 2008, 'M', 3);
+select * from rank_exc;
+ id | rank | year | gender | count 
+----+------+------+--------+-------
+  1 |    1 | 2007 | M      |     1
+  2 |    2 | 2008 | M      |     3
+(2 rows)
+
+alter table rank_exc alter partition boys split default partition start ('2007')
+end ('2008') into (partition bfuture, partition year7);
+select * from rank_exc_1_prt_boys_2_prt_bfuture;
+ id | rank | year | gender | count 
+----+------+------+--------+-------
+  2 |    2 | 2008 | M      |     3
+(1 row)
+
+select * from rank_exc_1_prt_boys_2_prt_year7;
+ id | rank | year | gender | count 
+----+------+------+--------+-------
+  1 |    1 | 2007 | M      |     1
+(1 row)
+
+select * from rank_exc;
+ id | rank | year | gender | count 
+----+------+------+--------+-------
+  2 |    2 | 2008 | M      |     3
+  1 |    1 | 2007 | M      |     1
+(2 rows)
+
+--exchange test
+create table r (like rank_exc);
+NOTICE:  table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table
+insert into rank_exc values(3, 3, 2004, 'F', 100);
+insert into r values(3, 3, 2004, 'F', 100000);
+alter table rank_exc alter partition girls exchange partition year4 with table r;
+select * from rank_exc_1_prt_girls_2_prt_year4;
+ id | rank | year | gender | count  
+----+------+------+--------+--------
+  3 |    3 | 2004 | F      | 100000
+(1 row)
+
+select * from r;
+ id | rank | year | gender | count 
+----+------+------+--------+-------
+  3 |    3 | 2004 | F      |   100
+(1 row)
+
+alter table rank_exc alter partition girls exchange partition year4 with table r;
+select * from rank_exc_1_prt_girls_2_prt_year4;
+ id | rank | year | gender | count 
+----+------+------+--------+-------
+  3 |    3 | 2004 | F      |   100
+(1 row)
+
+select * from r;
+ id | rank | year | gender | count  
+----+------+------+--------+--------
+  3 |    3 | 2004 | F      | 100000
+(1 row)
+
+-- Split test
+alter table rank_exc alter partition girls split default partition start('2008')
+  end('2020') into (partition years, partition gfuture);
+insert into rank_exc values(4, 4, 2009, 'F', 100);
+drop table rank_exc;
+drop table r;
+-- MPP-4245: remove virtual subpartition templates when we drop the partitioned
+-- table
+create table bar_p (i int, j int) partition by range(i) subpartition by range(j)
+subpartition template(start(1) end(10) every(1)) subpartition by range(i)
+subpartition template(start(1) end(10) every(5)) (start(1) end(10));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table bar_p alter partition for ('5') alter partition for ('5')
+  drop partition for ('5');
+insert into bar_p values(1, 1);
+insert into bar_p values(5, 5);
+ERROR:  no partition of relation "bar_p_1_prt_1_2_prt_5" found for row
+DETAIL:  Partition key of the failing row contains (i) = (5).
+drop table bar_p;
+-- Drop should not leave anything lingering for bar_p or its
+-- subpartitions in pg_partition* catalog tables.
+select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | template 
+-------+-------+----------
+(0 rows)
+
+-- MPP-4172
+-- should fail
+create table ggg (a char(1), b int)
+distributed by (b)
+partition by range(a)
+(
+partition aa start ('2006') end ('2009'), partition bb start ('2007') end ('2008')
+);
+ERROR:  value too long for type character(1)
+-- MPP-4892 SET SUBPARTITION TEMPLATE
+create table mpp4892 (a char, b int, d char)
+partition by range (b)
+subpartition by list (d)
+subpartition template (
+ subpartition sp1 values ('a'),
+ subpartition sp2 values ('b'))
+(
+start (1) end (10) every (1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- works
+alter table mpp4892 add partition p1 end (11);
+-- complain about existing template
+alter table mpp4892 add partition p3 end (13) (subpartition sp3 values ('c'));
+ERROR:  subpartition configuration conflicts with subpartition template
+LINE 1: alter table mpp4892 add partition p3 end (13) (subpartition ...
+                                                       ^
+-- remove template
+alter table mpp4892 set	subpartition template ();
+-- should work (because the template is gone)
+alter table mpp4892 add partition p3 end (13) (subpartition sp3 values ('c'));
+-- complain because the template is already gone
+alter table mpp4892 set	subpartition template ();
+ERROR:  relation "mpp4892" does not have a level 1 subpartition template specification
+-- should work
+alter table mpp4892 set subpartition template (subpartition sp3 values ('c'));
+-- should work
+alter table mpp4892 add partition p4 end (15);
+drop table mpp4892;
+-- make sure we do not allow overlapping range intervals
+-- should fail
+-- unordered elems
+create table ttt (t int) partition by range(t) (
+partition a start (1) end(10) inclusive,
+partition c start(11) end(14),
+partition b start(5) end(15)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 't' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  partition "ttt_1_prt_b" would overlap partition "ttt_1_prt_a"
+-- should fail, this time it's ordered
+create table ttt (t int) partition by range(t) (
+partition a start (1) end(10) inclusive,
+partition b start(5) end(15),
+partition c start(11) end(14)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 't' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  partition "ttt_1_prt_b" would overlap partition "ttt_1_prt_a"
+-- should fail
+create table ttt (t date) partition by range(t) (
+partition a start ('2005-01-01') end('2006-01-01') inclusive,
+partition b start('2005-05-01') end('2005-06-11'),
+partition c start('2006-01-01') exclusive end('2006-01-10')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 't' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  partition "ttt_1_prt_b" would overlap partition "ttt_1_prt_a"
+-- should fail
+create table ttt (t char) partition by range(t) (
+partition a start('a') end('f'),
+partition b start('e') end('g')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 't' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  partition "ttt_1_prt_b" would overlap partition "ttt_1_prt_a"
+-- MPP-5159 MPP-26829
+-- Should fail -- missing partition spec and subpartition template follows the
+-- partition declaration.
+CREATE TABLE list_sales (trans_id int, date date, amount
+decimal(9,2), region text)
+DISTRIBUTED BY (trans_id)
+PARTITION BY LIST (region)
+SUBPARTITION TEMPLATE
+( SUBPARTITION usa VALUES ('usa'),
+  SUBPARTITION asia VALUES ('asia'),
+  SUBPARTITION europe VALUES ('europe')
+);
+ERROR:  syntax error at or near "TEMPLATE"
+LINE 5: SUBPARTITION TEMPLATE
+                     ^
+-- MPP-5185 MPP-26829
+-- Should work
+CREATE TABLE rank_settemp (id int, rank int, year date, gender
+char(1)) DISTRIBUTED BY (id, gender, year)
+partition by list (gender)
+subpartition by range (year)
+subpartition template (
+start (date '2001-01-01'),
+start (date '2002-01-01'),
+start (date '2003-01-01'),
+start (date '2004-01-01'),
+start (date '2005-01-01')
+)
+(
+partition boys values ('M'),
+partition girls values ('F')
+);
+alter table rank_settemp set subpartition template ();
+-- nothing there
+select relid::regclass, level from gp_partition_template where relid = 'rank_settemp'::regclass;
+ relid | level 
+-------+-------
+(0 rows)
+
+alter table rank_settemp set subpartition template (default subpartition def2);
+-- def2 is there
+select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                                                                                                   template                                                                                                   
+--------------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName def2 :boundSpec <> :subSpec <> :isDefault true :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+(1 row)
+
+alter table rank_settemp set subpartition template (default subpartition def2);
+-- Should still be there
+select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                                                                                                   template                                                                                                   
+--------------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName def2 :boundSpec <> :subSpec <> :isDefault true :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+(1 row)
+
+alter table rank_settemp set subpartition template (start (date '2006-01-01') with (appendonly=true));
+alter table rank_settemp add partition f1 values ('N');
+alter table rank_settemp set subpartition template (start (date '2007-01-01') with (appendonly=true, compresslevel=5));
+alter table rank_settemp add partition f2 values ('C');
+select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                                                                                                                                                                                                                                                                                                  template                                                                                                                                                                                                                                                                                                  
+--------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName <> :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2007-01-01" :location 64} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 59} :location -1}) :edge 1} :partEnd <> :partEvery <>} :subSpec <> :isDefault false :options ({DEFELEM :defnamespace <> :defname compresslevel :arg 5 :defaction 0 :location 101}) :accessMethod ao_row :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+(1 row)
+
+drop table rank_settemp;
+-- MPP-5397 and MPP-7002
+-- should be able to add/split/exchange partition after dropped a col
+create table mpp_5397 (a int, b int, c int, d int)
+  distributed by (a) 
+  partition by range (b)  
+  (partition a1 start (0) end (5), 
+   partition a2 end (10),  
+   partition a3 end(15));
+alter table mpp_5397 drop column c;
+-- should work now
+alter table mpp_5397 add partition z end (20);
+-- ensure splitting default partition also works
+alter table mpp_5397 add default partition adefault;
+alter table mpp_5397 drop column d;
+alter table mpp_5397 split default partition start (21) inclusive end (25) inclusive;
+drop table mpp_5397;
+-- MPP-4987 -- make sure we can't damage a partitioning configuration
+-- this works
+create table rank_damage (i int, j int)
+partition by range(j) (start(1) end(5) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- should all fail
+alter table rank_damage_1_prt_1 no inherit rank_damage;
+ERROR:  cannot change inheritance of a partition
+create table rank2_damage(like rank_damage);
+NOTICE:  table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table
+alter table rank_damage_1_prt_1 inherit rank2_damage;
+ERROR:  cannot change inheritance of a partition
+alter table rank_damage_1_prt_1 alter column i type bigint;
+ERROR:  cannot alter inherited column "i"
+alter table rank_damage_1_prt_1 set without oids; -- no-op
+alter table rank_damage add partition ppo end (22) with (oids = true);
+ERROR:  tables declared WITH OIDS are not supported
+drop table rank_damage, rank2_damage;
+-- MPP-5831, type cast in SPLIT
+CREATE TABLE sg_cal_event_silvertail_hour (
+caldt date NOT NULL,
+calhr smallint NOT NULL,
+ip character varying(128),
+transactionid character varying(32),
+transactiontime timestamp(2) without time zone
+)
+WITH (appendonly=true, compresslevel=5)
+distributed by (ip) PARTITION BY RANGE(transactiontime)
+(
+PARTITION "P2009041607"
+START ('2009-04-16 07:00:00'::timestamp without time zone)
+END ('2009-04-16 08:00:00'::timestamp without time zone),
+PARTITION "P2009041608"
+START ('2009-04-16 08:00:00'::timestamp without time zone)
+END ('2009-04-16 09:00:00'::timestamp without time zone),
+DEFAULT PARTITION st_default
+);
+ALTER TABLE SG_CAL_EVENT_SILVERTAIL_HOUR SPLIT DEFAULT PARTITION
+START ('2009-04-29 07:00:00'::timestamp) INCLUSIVE END ('2009-04-29
+08:00:00'::timestamp) EXCLUSIVE INTO ( PARTITION P2009042907 ,
+PARTITION st_default );
+\d+ sg_cal_event_silvertail_hour
+                                  Partitioned table "public.sg_cal_event_silvertail_hour"
+     Column      |              Type              | Collation | Nullable | Default | Storage  | Stats target | Description 
+-----------------+--------------------------------+-----------+----------+---------+----------+--------------+-------------
+ caldt           | date                           |           | not null |         | plain    |              | 
+ calhr           | smallint                       |           | not null |         | plain    |              | 
+ ip              | character varying(128)         |           |          |         | extended |              | 
+ transactionid   | character varying(32)          |           |          |         | extended |              | 
+ transactiontime | timestamp(2) without time zone |           |          |         | plain    |              | 
+Partition key: RANGE (transactiontime)
+Partitions: "sg_cal_event_silvertail_hour_1_prt_P2009041607" FOR VALUES FROM ('Thu Apr 16 07:00:00 2009') TO ('Thu Apr 16 08:00:00 2009'),
+            "sg_cal_event_silvertail_hour_1_prt_P2009041608" FOR VALUES FROM ('Thu Apr 16 08:00:00 2009') TO ('Thu Apr 16 09:00:00 2009'),
+            sg_cal_event_silvertail_hour_1_prt_p2009042907 FOR VALUES FROM ('Wed Apr 29 07:00:00 2009') TO ('Wed Apr 29 08:00:00 2009'),
+            sg_cal_event_silvertail_hour_1_prt_st_default DEFAULT
+Distributed by: (ip)
+Options: compresslevel=5
+
+\d+ sg_cal_event_silvertail_hour_1_prt_P2009042907
+                               Table "public.sg_cal_event_silvertail_hour_1_prt_p2009042907"
+     Column      |              Type              | Collation | Nullable | Default | Storage  | Stats target | Description 
+-----------------+--------------------------------+-----------+----------+---------+----------+--------------+-------------
+ caldt           | date                           |           | not null |         | plain    |              | 
+ calhr           | smallint                       |           | not null |         | plain    |              | 
+ ip              | character varying(128)         |           |          |         | extended |              | 
+ transactionid   | character varying(32)          |           |          |         | extended |              | 
+ transactiontime | timestamp(2) without time zone |           |          |         | plain    |              | 
+Partition of: sg_cal_event_silvertail_hour FOR VALUES FROM ('Wed Apr 29 07:00:00 2009') TO ('Wed Apr 29 08:00:00 2009')
+Partition constraint: ((transactiontime IS NOT NULL) AND (transactiontime >= 'Wed Apr 29 07:00:00 2009'::timestamp(2) without time zone) AND (transactiontime < 'Wed Apr 29 08:00:00 2009'::timestamp(2) without time zone))
+Compression Type: zlib
+Compression Level: 5
+Block Size: 32768
+Checksum: t
+Distributed by: (ip)
+Options: compresslevel=5
+
+drop table sg_cal_event_silvertail_hour;
+-- Make sure we inherit master's storage settings
+create table foo_p (i int, j int, k text)
+with (appendonly = true, compresslevel = 5)
+partition by range(j) (start(1) end(10) every(1), default partition def);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into foo_p select i, i+1, repeat('fooo', 9000) from generate_series(1, 100) i;
+alter table foo_p split default partition start (10) end(20) 
+into (partition p10_20, default partition);
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid = 'foo_p_1_prt_p10_20'::regclass;
+        oid         | relkind | amname |    reloptions     
+--------------------+---------+--------+-------------------
+ foo_p_1_prt_p10_20 | r       | ao_row | {compresslevel=5}
+(1 row)
+
+select count(distinct k) from foo_p;
+ count 
+-------
+     1
+(1 row)
+
+drop table foo_p;
+create table foo_p (i int, j int, k text)
+partition by range(j) (start(1) end(10) every(1), default partition def
+with(appendonly = true));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into foo_p select i, i+1, repeat('fooo', 9000) from generate_series(1, 100) i;
+alter table foo_p split default partition start (10) end(20) 
+into (partition p10_20, default partition);
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid in ('foo_p_1_prt_p10_20'::regclass, 'foo_p_1_prt_def'::regclass);
+        oid         | relkind | amname | reloptions 
+--------------------+---------+--------+------------
+ foo_p_1_prt_p10_20 | r       | ao_row | 
+ foo_p_1_prt_def    | r       | ao_row | 
+(2 rows)
+
+select count(distinct k) from foo_p;
+ count 
+-------
+     1
+(1 row)
+
+drop table foo_p;
+-- MPP-5941: work with many levels of templates
+CREATE TABLE mpp5941 (a int, b date, c char, 
+	   		 		 d char(4), e varchar(20), f timestamp)
+partition by range (b)
+subpartition by list (a) 
+subpartition template ( 
+subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) )
+subpartition by list (e) 
+subpartition template ( 
+subpartition ll1 values ('Engineering'), 
+subpartition ll2 values ('QA') )
+subpartition by list (c) 
+subpartition template ( 
+subpartition lll1 values ('M'), 
+subpartition lll2 values ('F') )
+(
+  start (date '2007-01-01')
+  end (date '2010-01-01') every (interval '1 year')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- just truncate for fun to see that everything is there
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) alter partition for ('QA')
+truncate partition for ('M');
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) truncate partition for ('QA');
+alter table mpp5941 alter partition for ('2008-01-01') 
+truncate partition for (1);
+alter table mpp5941 truncate partition for ('2008-01-01') ;
+truncate table mpp5941;
+-- now look at the templates that we have
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+  relid  | level 
+---------+-------
+ mpp5941 |     1
+ mpp5941 |     2
+ mpp5941 |     3
+(3 rows)
+
+-- clear level 1
+alter table mpp5941 set subpartition template ();
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+  relid  | level 
+---------+-------
+ mpp5941 |     2
+ mpp5941 |     3
+(2 rows)
+
+-- clear level 2
+alter table mpp5941 alter partition for ('2008-01-01') 
+set subpartition template ();
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+  relid  | level 
+---------+-------
+ mpp5941 |     3
+(1 row)
+
+-- clear level 3
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1)
+set subpartition template ();
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+ relid | level 
+-------+-------
+(0 rows)
+
+-- no level 4 (error)
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) alter partition for ('QA')
+set subpartition template ();
+ERROR:  relation "mpp5941" does not have a level 4 subpartition template specification
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+ relid | level 
+-------+-------
+(0 rows)
+
+-- no level 5 (error)
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) alter partition for ('QA')
+alter partition for ('M')
+set subpartition template ();
+ERROR:  table "mpp5941_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll1" is not partitioned
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+ relid | level 
+-------+-------
+(0 rows)
+
+-- set level 1 (error, because no templates for level 2, 3)
+alter table mpp5941 set subpartition template (
+subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) );
+ERROR:  can't add sub-partition template at level 1 since next level template doesn't exist
+HINT:  Add sub-partition template for next level.
+-- MPP-5992 - add deep templates correctly
+-- Note: need to re-add the templates from deepest to shallowest,
+-- because adding a template has a dependency on the existence of the
+-- deeper template.
+-- set level 3
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1)
+set subpartition template (
+subpartition lll1 values ('M'), 
+subpartition lll2 values ('F') );
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+  relid  | level 
+---------+-------
+ mpp5941 |     3
+(1 row)
+
+-- set level 2
+alter table mpp5941 alter partition for ('2008-01-01') 
+set subpartition template (
+subpartition ll1 values ('Engineering'), 
+subpartition ll2 values ('QA') );
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+  relid  | level 
+---------+-------
+ mpp5941 |     3
+ mpp5941 |     2
+(2 rows)
+
+-- set level 1
+alter table mpp5941 set subpartition template (
+subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) );
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+  relid  | level 
+---------+-------
+ mpp5941 |     3
+ mpp5941 |     2
+ mpp5941 |     1
+(3 rows)
+
+drop table mpp5941;
+-- MPP-5984 - NULL is not allowed in RANGE partition
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (NULL) end (300)
+);
+ERROR:  cannot use NULL with range partition specification
+LINE 6: partition nnull start (NULL) end (300)
+                               ^
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (300) end (NULL)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  cannot use NULL with range partition specification
+LINE 6: partition nnull start (300) end (NULL)
+                                         ^
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (300) end (NULL::int)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ERROR:  cannot use NULL with range partition specification
+LINE 6: partition nnull start (300) end (NULL::int)
+                                         ^
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition p1 start(1) end(10),
+partition p2 start(10) end(20),
+default partition def
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table partsupp split partition p2 at (NULL);
+ERROR:  cannot use NULL with range partition specification
+LINE 1: alter table partsupp split partition p2 at (NULL);
+                                                    ^
+alter table partsupp split default partition start(null) end(200);
+ERROR:  cannot use NULL with range partition specification
+LINE 1: ...table partsupp split default partition start(null) end(200);
+                                                              ^
+drop table partsupp;
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (300) end (400)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'ps_partkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table partsupp add partition foo start(500) end(NULL);
+ERROR:  cannot use NULL with range partition specification
+LINE 1: alter table partsupp add partition foo start(500) end(NULL);
+                                                              ^
+drop table partsupp;
+-- Test for an old bug, where we used to crash on NULLs, because the code
+-- to order the partitions by their start/end boundaries did not anticipate
+-- NULLs. NULLs in boundaries are not accepted, but because we check for
+-- them only after ordering the partitions, the sorting code needs to
+-- handle them. (This test needs at least two partitions, so that there
+-- is something to sort.)
+create table partnulltest (
+  col1 int,
+  col2 numeric
+)
+distributed by (col1)
+partition by range(col2)
+(
+  partition part2 start(1) end(10) ,
+  partition part1 start (NULL)
+);
+ERROR:  cannot use NULL with range partition specification
+LINE 9:   partition part1 start (NULL)
+                                 ^
+-- Test pg_dump on a somewhat complicated partitioned table. (MPP-6240)
+-- We actually just create the table here, and leave it behind, so that
+-- it gets dumped by pg_dump at end of the regression test suite.
+CREATE TABLE supplier_hybrid_part(
+                S_SUPPKEY INTEGER,
+                S_NAME CHAR(25),
+                S_ADDRESS VARCHAR(40),
+                S_NATIONKEY INTEGER,                S_PHONE CHAR(15),
+                S_ACCTBAL decimal,
+                S_COMMENT VARCHAR(101)
+                )
+partition by range (s_suppkey) 
+subpartition by list (s_nationkey) subpartition template (
+    values('22','21','17'),
+    values('6','11','1','7','16','2') WITH (checksum=false,appendonly=true,blocksize=1171456,         compresslevel=3),
+    values('18','20'),
+    values('9','23','13') WITH (checksum=true,appendonly=true,blocksize=1335296,compresslevel=7),
+    values('0','3','12','15','14','8','4','24','19','10','5')
+)               
+(               
+partition p1 start('1') end('10001') every(10000)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_suppkey' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- MPP-3544
+-- Domain
+create domain domainvarchar varchar(5);
+create domain domainnumeric numeric(8,2);
+create domain domainint4 int4;
+create domain domaintext text;
+-- Test tables using domains
+-- list
+create table basictest1
+           ( testint4 domainint4
+           , testtext domaintext
+           , testvarchar domainvarchar
+           , testnumeric domainnumeric
+           )
+partition by LIST(testvarchar)
+(
+partition aa values ('aaaaa'),
+partition bb values ('bbbbb'),
+partition cc values ('ccccc')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'testint4' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table basictest1 add partition dd values('ddddd');
+insert into basictest1 values(1, 1, 'ddddd', 1);
+insert into basictest1 values(1, 1, 'ccccc', 1);
+insert into basictest1 values(1, 1, 'bbbbb', 1);
+insert into basictest1 values(1, 1, 'aaaaa', 1);
+drop table basictest1;
+--range
+create table basictest1 (testnumeric domainint4)
+partition by range(testnumeric)
+ (start(1) end(10) every(5));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'testnumeric' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into basictest1 values(1);
+insert into basictest1 values(2);
+alter table basictest1 add partition ff start(10) end(20);
+insert into basictest1 values(10);
+drop table basictest1;
+drop domain domainvarchar, domainnumeric, domainint4, domaintext;
+-- Test index inheritance with partitions
+create table ti (i int not null, j int)
+distributed by (i)
+partition by range (j) 
+(start(1) end(3) every(1));
+create unique index ti_pkey on ti(i,j);
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+ schemaname | tablename  |     indexname      | tablespace |                                    indexdef                                    
+------------+------------+--------------------+------------+--------------------------------------------------------------------------------
+ public     | ti_1_prt_1 | ti_1_prt_1_i_j_idx |            | CREATE UNIQUE INDEX ti_1_prt_1_i_j_idx ON public.ti_1_prt_1 USING btree (i, j)
+ public     | ti         | ti_pkey            |            | CREATE UNIQUE INDEX ti_pkey ON ONLY public.ti USING btree (i, j)
+ public     | ti_1_prt_2 | ti_1_prt_2_i_j_idx |            | CREATE UNIQUE INDEX ti_1_prt_2_i_j_idx ON public.ti_1_prt_2 USING btree (i, j)
+(3 rows)
+
+create index ti_j_idx on ti using bitmap(j);
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+ schemaname | tablename  |     indexname      | tablespace |                                    indexdef                                    
+------------+------------+--------------------+------------+--------------------------------------------------------------------------------
+ public     | ti_1_prt_1 | ti_1_prt_1_i_j_idx |            | CREATE UNIQUE INDEX ti_1_prt_1_i_j_idx ON public.ti_1_prt_1 USING btree (i, j)
+ public     | ti         | ti_pkey            |            | CREATE UNIQUE INDEX ti_pkey ON ONLY public.ti USING btree (i, j)
+ public     | ti_1_prt_2 | ti_1_prt_2_i_j_idx |            | CREATE UNIQUE INDEX ti_1_prt_2_i_j_idx ON public.ti_1_prt_2 USING btree (i, j)
+ public     | ti_1_prt_1 | ti_1_prt_1_j_idx   |            | CREATE INDEX ti_1_prt_1_j_idx ON public.ti_1_prt_1 USING bitmap (j)
+ public     | ti         | ti_j_idx           |            | CREATE INDEX ti_j_idx ON ONLY public.ti USING bitmap (j)
+ public     | ti_1_prt_2 | ti_1_prt_2_j_idx   |            | CREATE INDEX ti_1_prt_2_j_idx ON public.ti_1_prt_2 USING bitmap (j)
+(6 rows)
+
+alter table ti add partition p3 start(3) end(10);
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+ schemaname |  tablename  |      indexname      | tablespace |                                     indexdef                                     
+------------+-------------+---------------------+------------+----------------------------------------------------------------------------------
+ public     | ti_1_prt_1  | ti_1_prt_1_i_j_idx  |            | CREATE UNIQUE INDEX ti_1_prt_1_i_j_idx ON public.ti_1_prt_1 USING btree (i, j)
+ public     | ti          | ti_pkey             |            | CREATE UNIQUE INDEX ti_pkey ON ONLY public.ti USING btree (i, j)
+ public     | ti_1_prt_2  | ti_1_prt_2_i_j_idx  |            | CREATE UNIQUE INDEX ti_1_prt_2_i_j_idx ON public.ti_1_prt_2 USING btree (i, j)
+ public     | ti_1_prt_1  | ti_1_prt_1_j_idx    |            | CREATE INDEX ti_1_prt_1_j_idx ON public.ti_1_prt_1 USING bitmap (j)
+ public     | ti          | ti_j_idx            |            | CREATE INDEX ti_j_idx ON ONLY public.ti USING bitmap (j)
+ public     | ti_1_prt_2  | ti_1_prt_2_j_idx    |            | CREATE INDEX ti_1_prt_2_j_idx ON public.ti_1_prt_2 USING bitmap (j)
+ public     | ti_1_prt_p3 | ti_1_prt_p3_i_j_idx |            | CREATE UNIQUE INDEX ti_1_prt_p3_i_j_idx ON public.ti_1_prt_p3 USING btree (i, j)
+ public     | ti_1_prt_p3 | ti_1_prt_p3_j_idx   |            | CREATE INDEX ti_1_prt_p3_j_idx ON public.ti_1_prt_p3 USING bitmap (j)
+(8 rows)
+
+-- Should not be able to drop child indexes added implicitly via ADD PARTITION
+drop index ti_1_prt_p3_i_j_idx;
+ERROR:  cannot drop index ti_1_prt_p3_i_j_idx because index ti_pkey requires it
+HINT:  You can drop index ti_pkey instead.
+drop index ti_1_prt_p3_j_idx;
+ERROR:  cannot drop index ti_1_prt_p3_j_idx because index ti_j_idx requires it
+HINT:  You can drop index ti_j_idx instead.
+alter table ti split partition p3 at (7) into (partition pnew1, partition pnew2);
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+ schemaname |   tablename    |       indexname        | tablespace |                                        indexdef                                        
+------------+----------------+------------------------+------------+----------------------------------------------------------------------------------------
+ public     | ti_1_prt_1     | ti_1_prt_1_i_j_idx     |            | CREATE UNIQUE INDEX ti_1_prt_1_i_j_idx ON public.ti_1_prt_1 USING btree (i, j)
+ public     | ti             | ti_pkey                |            | CREATE UNIQUE INDEX ti_pkey ON ONLY public.ti USING btree (i, j)
+ public     | ti_1_prt_2     | ti_1_prt_2_i_j_idx     |            | CREATE UNIQUE INDEX ti_1_prt_2_i_j_idx ON public.ti_1_prt_2 USING btree (i, j)
+ public     | ti_1_prt_1     | ti_1_prt_1_j_idx       |            | CREATE INDEX ti_1_prt_1_j_idx ON public.ti_1_prt_1 USING bitmap (j)
+ public     | ti             | ti_j_idx               |            | CREATE INDEX ti_j_idx ON ONLY public.ti USING bitmap (j)
+ public     | ti_1_prt_2     | ti_1_prt_2_j_idx       |            | CREATE INDEX ti_1_prt_2_j_idx ON public.ti_1_prt_2 USING bitmap (j)
+ public     | ti_1_prt_pnew1 | ti_1_prt_pnew1_i_j_idx |            | CREATE UNIQUE INDEX ti_1_prt_pnew1_i_j_idx ON public.ti_1_prt_pnew1 USING btree (i, j)
+ public     | ti_1_prt_pnew1 | ti_1_prt_pnew1_j_idx   |            | CREATE INDEX ti_1_prt_pnew1_j_idx ON public.ti_1_prt_pnew1 USING bitmap (j)
+ public     | ti_1_prt_pnew2 | ti_1_prt_pnew2_i_j_idx |            | CREATE UNIQUE INDEX ti_1_prt_pnew2_i_j_idx ON public.ti_1_prt_pnew2 USING btree (i, j)
+ public     | ti_1_prt_pnew2 | ti_1_prt_pnew2_j_idx   |            | CREATE INDEX ti_1_prt_pnew2_j_idx ON public.ti_1_prt_pnew2 USING bitmap (j)
+(10 rows)
+
+-- Should not be able to drop child indexes added implicitly via SPLIT PARTITION
+drop index ti_1_prt_pnew1_i_j_idx;
+ERROR:  cannot drop index ti_1_prt_pnew1_i_j_idx because index ti_pkey requires it
+HINT:  You can drop index ti_pkey instead.
+drop index ti_1_prt_pnew1_j_idx;
+ERROR:  cannot drop index ti_1_prt_pnew1_j_idx because index ti_j_idx requires it
+HINT:  You can drop index ti_j_idx instead.
+drop index ti_1_prt_pnew2_i_j_idx;
+ERROR:  cannot drop index ti_1_prt_pnew2_i_j_idx because index ti_pkey requires it
+HINT:  You can drop index ti_pkey instead.
+drop index ti_1_prt_pnew2_j_idx;
+ERROR:  cannot drop index ti_1_prt_pnew2_j_idx because index ti_j_idx requires it
+HINT:  You can drop index ti_j_idx instead.
+-- Index drop should cascade to all partitions- including those later added via
+-- ADD PARTITION or SPLIT PARTITION
+drop index ti_pkey;
+drop index ti_j_idx;
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+ schemaname | tablename | indexname | tablespace | indexdef 
+------------+-----------+-----------+------------+----------
+(0 rows)
+
+drop table ti;
+-- Partitioned table with btree index and hash aggregate should use a correct
+-- memory context for its tuples` descriptor
+drop table if exists dis_tupdesc;
+NOTICE:  table "dis_tupdesc" does not exist, skipping
+create table dis_tupdesc (a int, b int, c int)
+distributed by (a)
+partition by list (b)
+(
+    partition p1 values (1),
+    partition p2 values (2),
+    default partition junk_data
+);
+NOTICE:  CREATE TABLE will create partition "dis_tupdesc_1_prt_p1" for table "dis_tupdesc"
+NOTICE:  CREATE TABLE will create partition "dis_tupdesc_1_prt_p2" for table "dis_tupdesc"
+NOTICE:  CREATE TABLE will create partition "dis_tupdesc_1_prt_junk_data" for table "dis_tupdesc"
+create index dis_tupdesc_idx on dis_tupdesc using btree (c);
+insert into dis_tupdesc select i, i % 3, i % 4 from generate_series (1, 240) as i;
+analyze dis_tupdesc;
+set gp_segments_for_planner = 2;
+set optimizer_segments = 2;
+select distinct b from dis_tupdesc where c >= 2;
+ b 
+---
+ 0
+ 1
+ 2
+(3 rows)
+
+reset gp_segments_for_planner;
+reset optimizer_segments;
+-- MPP-6611, make sure rename works with default partitions
+create table it (i int, j int) partition by range(i) 
+subpartition by range(j) subpartition template(start(1) end(10) every(5))
+(start(1) end(3) every(1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table it rename to newit;
+select schemaname, tablename from pg_tables where schemaname = 'public' and tablename like 'newit%';
+ schemaname |       tablename       
+------------+-----------------------
+ public     | newit
+ public     | newit_1_prt_1
+ public     | newit_1_prt_1_2_prt_1
+ public     | newit_1_prt_1_2_prt_2
+ public     | newit_1_prt_2
+ public     | newit_1_prt_2_2_prt_1
+ public     | newit_1_prt_2_2_prt_2
+(7 rows)
+
+alter table newit add default partition def;
+select schemaname, tablename from pg_tables where schemaname = 'public' and tablename like 'newit%';
+ schemaname |        tablename        
+------------+-------------------------
+ public     | newit
+ public     | newit_1_prt_1
+ public     | newit_1_prt_1_2_prt_1
+ public     | newit_1_prt_1_2_prt_2
+ public     | newit_1_prt_2
+ public     | newit_1_prt_2_2_prt_1
+ public     | newit_1_prt_2_2_prt_2
+ public     | newit_1_prt_def_2_prt_1
+ public     | newit_1_prt_def_2_prt_2
+ public     | newit_1_prt_def
+(10 rows)
+
+alter table newit rename to anotherit;
+select schemaname, tablename from pg_tables where schemaname = 'public' and tablename like
+'anotherit%';
+ schemaname |          tablename          
+------------+-----------------------------
+ public     | anotherit
+ public     | anotherit_1_prt_1
+ public     | anotherit_1_prt_1_2_prt_1
+ public     | anotherit_1_prt_1_2_prt_2
+ public     | anotherit_1_prt_2
+ public     | anotherit_1_prt_2_2_prt_1
+ public     | anotherit_1_prt_2_2_prt_2
+ public     | anotherit_1_prt_def
+ public     | anotherit_1_prt_def_2_prt_1
+ public     | anotherit_1_prt_def_2_prt_2
+(10 rows)
+
+drop table anotherit;
+--
+-- Test table constraint inheritance
+--
+-- with a named UNIQUE constraint
+create table it (i int) distributed by (i) partition by range(i) (start(1) end(3) every(1));
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+ schemaname | tablename | indexname 
+------------+-----------+-----------
+(0 rows)
+
+alter table it add constraint it_unique_i unique (i);
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+ schemaname | tablename  |    indexname     
+------------+------------+------------------
+ public     | it         | it_unique_i
+ public     | it_1_prt_1 | it_1_prt_1_i_key
+ public     | it_1_prt_2 | it_1_prt_2_i_key
+(3 rows)
+
+alter table it drop constraint it_unique_i;
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+ schemaname | tablename | indexname 
+------------+-----------+-----------
+(0 rows)
+
+drop table it;
+-- with a PRIMARY KEY constraint, without giving it a name explicitly.
+create table it (i int) distributed by (i) partition by range(i) (start(1) end(3) every(1));
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+ schemaname | tablename | indexname 
+------------+-----------+-----------
+(0 rows)
+
+alter table it add primary key(i);
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+ schemaname | tablename  |    indexname    
+------------+------------+-----------------
+ public     | it         | it_pkey
+ public     | it_1_prt_1 | it_1_prt_1_pkey
+ public     | it_1_prt_2 | it_1_prt_2_pkey
+(3 rows)
+
+-- FIXME: dropping a primary key doesn't currently work correctly. It doesn't
+-- drop the key on the partitions, only the parent. See
+-- https://github.com/greenplum-db/gpdb/issues/3750
+--
+-- alter table it add primary key(i);
+-- select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+drop table it;
+create table it (i int) distributed by (i) partition by range(i) (start(1) end(3) every(1));
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+ schemaname | tablename | indexname 
+------------+-----------+-----------
+(0 rows)
+
+alter table it add primary key(i);
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+ schemaname | tablename  |    indexname    
+------------+------------+-----------------
+ public     | it         | it_pkey
+ public     | it_1_prt_1 | it_1_prt_1_pkey
+ public     | it_1_prt_2 | it_1_prt_2_pkey
+(3 rows)
+
+drop table it;
+--
+-- Exclusion constraints are currently not supported on partitioned tables.
+--
+create table parttab_with_excl_constraint (
+  i int,
+  j int,
+  CONSTRAINT part_excl EXCLUDE (i WITH =) )
+distributed by (i) partition by list (i) (
+  partition a values (1),
+  partition b values (2),
+  partition c values (3)
+);
+ERROR:  exclusion constraints are not supported on partitioned tables
+LINE 4:   CONSTRAINT part_excl EXCLUDE (i WITH =) )
+          ^
+create table parttab_with_excl_constraint (
+  i int,
+  j int)
+distributed by (i) partition by list (i) (
+  partition a values (1),
+  partition b values (2),
+  partition c values (3)
+);
+alter table parttab_with_excl_constraint ADD CONSTRAINT part_excl EXCLUDE (i WITH =);
+ERROR:  exclusion constraints are not supported on partitioned tables
+LINE 1: alter table parttab_with_excl_constraint ADD CONSTRAINT part...
+                                                     ^
+drop table parttab_with_excl_constraint;
+-- MPP-6297: test special WITH(tablename=...) syntax for dump/restore
+-- original table was:
+-- PARTITION BY RANGE(l_commitdate) 
+-- (
+--     PARTITION p1 
+--       START ('1992-01-31'::date) END ('1995-04-30'::date) 
+--       EVERY ('1 year 1 mon'::interval)
+-- )
+-- dump used to give a definition like this:
+-- without the WITH(tablename=...), the vagaries of EVERY arithmetic
+-- create >3 partitions
+CREATE TABLE mpp6297 ( l_orderkey bigint,
+l_commitdate date
+)
+distributed BY (l_orderkey) PARTITION BY RANGE(l_commitdate)
+(
+PARTITION p1_1 START ('1992-01-31'::date) END ('1993-02-28'::date)
+EVERY ('1 year 1 mon'::interval)
+,
+PARTITION p1_2 START ('1993-02-28'::date) END ('1994-03-31'::date)
+EVERY ('1 year 1 mon'::interval)
+,
+PARTITION p1_3 START ('1994-03-31'::date) END ('1995-04-30'::date)
+EVERY ('1 year 1 mon'::interval)
+);
+\d+ mpp6297
+                              Partitioned table "public.mpp6297"
+    Column    |  Type  | Collation | Nullable | Default | Storage | Stats target | Description 
+--------------+--------+-----------+----------+---------+---------+--------------+-------------
+ l_orderkey   | bigint |           |          |         | plain   |              | 
+ l_commitdate | date   |           |          |         | plain   |              | 
+Partition key: RANGE (l_commitdate)
+Partitions: mpp6297_1_prt_p1_1_1 FOR VALUES FROM ('01-31-1992') TO ('02-28-1993'),
+            mpp6297_1_prt_p1_2_1 FOR VALUES FROM ('02-28-1993') TO ('03-28-1994'),
+            mpp6297_1_prt_p1_2_2 FOR VALUES FROM ('03-28-1994') TO ('03-31-1994'),
+            mpp6297_1_prt_p1_3_1 FOR VALUES FROM ('03-31-1994') TO ('04-30-1995')
+Distributed by: (l_orderkey)
+
+drop table mpp6297;
+-- when WITH(tablename=...) is specified, the EVERY is stored as an
+-- attribute, but not expanded into additional partitions
+CREATE TABLE mpp6297 ( l_orderkey bigint,
+l_commitdate date
+)
+distributed BY (l_orderkey) PARTITION BY RANGE(l_commitdate)
+(
+PARTITION p1_1 START ('1992-01-31'::date) END ('1993-02-28'::date)
+EVERY ('1 year 1 mon'::interval)
+WITH (tablename='mpp6297_1_prt_p1_1'),
+PARTITION p1_2 START ('1993-02-28'::date) END ('1994-03-31'::date)
+EVERY ('1 year 1 mon'::interval)
+WITH (tablename='mpp6297_1_prt_p1_2'),
+PARTITION p1_3 START ('1994-03-31'::date) END ('1995-04-30'::date)
+EVERY ('1 year 1 mon'::interval)
+WITH (tablename='mpp6297_1_prt_p1_3')
+);
+\d+ mpp6297
+                              Partitioned table "public.mpp6297"
+    Column    |  Type  | Collation | Nullable | Default | Storage | Stats target | Description 
+--------------+--------+-----------+----------+---------+---------+--------------+-------------
+ l_orderkey   | bigint |           |          |         | plain   |              | 
+ l_commitdate | date   |           |          |         | plain   |              | 
+Partition key: RANGE (l_commitdate)
+Partitions: mpp6297_1_prt_p1_1 FOR VALUES FROM ('01-31-1992') TO ('02-28-1993'),
+            mpp6297_1_prt_p1_2 FOR VALUES FROM ('02-28-1993') TO ('03-31-1994'),
+            mpp6297_1_prt_p1_3 FOR VALUES FROM ('03-31-1994') TO ('04-30-1995')
+Distributed by: (l_orderkey)
+
+drop table mpp6297;
+-- more with basic cases
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (10) every (1),
+end (11)		
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp6297_1_prt_10 FOR VALUES FROM (10) TO (11),
+            mpp6297_1_prt_2 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_3 FOR VALUES FROM (3) TO (4),
+            mpp6297_1_prt_4 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_5 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_6 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_7 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_8 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_9 FOR VALUES FROM (9) TO (10)
+Distributed by: (a)
+
+alter table mpp6297 drop partition for (3);
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp6297_1_prt_10 FOR VALUES FROM (10) TO (11),
+            mpp6297_1_prt_2 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_4 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_5 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_6 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_7 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_8 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_9 FOR VALUES FROM (9) TO (10)
+Distributed by: (a)
+
+-- this isn't legal (but it would be nice)
+alter table mpp6297 add partition start (3) end (4) every (1);
+ERROR:  syntax error at or near "every"
+LINE 1: ...ter table mpp6297 add partition start (3) end (4) every (1);
+                                                             ^
+-- this is legal but it doesn't fix the EVERY clause
+alter table mpp6297 add partition start (3) end (4) ;
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp6297_1_prt_10 FOR VALUES FROM (10) TO (11),
+            mpp6297_1_prt_11 FOR VALUES FROM (3) TO (4),
+            mpp6297_1_prt_2 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_4 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_5 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_6 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_7 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_8 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_9 FOR VALUES FROM (9) TO (10)
+Distributed by: (a)
+
+drop table mpp6297;
+-- similarly, we can merge adjacent EVERY clauses if they match
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (5) every (1),
+start (5) end (10) every (1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp6297_1_prt_2 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_3 FOR VALUES FROM (3) TO (4),
+            mpp6297_1_prt_4 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_5 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_6 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_7 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_8 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_9 FOR VALUES FROM (9) TO (10)
+Distributed by: (a)
+
+drop table mpp6297;
+-- we cannot merge adjacent EVERY clauses if inclusivity/exclusivity is wrong
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (5) every (1),
+start (5) exclusive end (10) every (1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp6297_1_prt_2 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_3 FOR VALUES FROM (3) TO (4),
+            mpp6297_1_prt_4 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_5 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_6 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_7 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_8 FOR VALUES FROM (9) TO (10)
+Distributed by: (a)
+
+drop table mpp6297;
+-- more fun with inclusivity/exclusivity (normal case)
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) inclusive end (10) exclusive every (1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp6297_1_prt_2 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_3 FOR VALUES FROM (3) TO (4),
+            mpp6297_1_prt_4 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_5 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_6 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_7 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_8 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_9 FOR VALUES FROM (9) TO (10)
+Distributed by: (a)
+
+drop table mpp6297;
+-- more fun with inclusivity/exclusivity (abnormal case)
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) exclusive end (10) inclusive every (1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_2 FOR VALUES FROM (3) TO (4),
+            mpp6297_1_prt_3 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_4 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_5 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_6 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_7 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_8 FOR VALUES FROM (9) TO (10),
+            mpp6297_1_prt_9 FOR VALUES FROM (10) TO (11)
+Distributed by: (a)
+
+alter table mpp6297 drop partition for (3);
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_3 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_4 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_5 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_6 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_7 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_8 FOR VALUES FROM (9) TO (10),
+            mpp6297_1_prt_9 FOR VALUES FROM (10) TO (11)
+Distributed by: (a)
+
+drop table mpp6297;
+-- we cannot merge adjacent EVERY clauses, even though the
+-- inclusivity/exclusivity matches, because it is different from the
+-- normal start inclusive/end exclusive
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (5) inclusive every (1),
+start (5) exclusive end (10) every (1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+\d+ mpp6297
+                            Partitioned table "public.mpp6297"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp6297_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp6297_1_prt_2 FOR VALUES FROM (2) TO (3),
+            mpp6297_1_prt_3 FOR VALUES FROM (3) TO (4),
+            mpp6297_1_prt_4 FOR VALUES FROM (4) TO (5),
+            mpp6297_1_prt_5 FOR VALUES FROM (5) TO (6),
+            mpp6297_1_prt_6 FOR VALUES FROM (6) TO (7),
+            mpp6297_1_prt_7 FOR VALUES FROM (7) TO (8),
+            mpp6297_1_prt_8 FOR VALUES FROM (8) TO (9),
+            mpp6297_1_prt_9 FOR VALUES FROM (9) TO (10)
+Distributed by: (a)
+
+drop table mpp6297;
+-- MPP-6589: SPLITting an "open" ended partition (ie, no start or end)
+CREATE TABLE mpp6589a
+(
+  id bigint,
+  day_dt date
+)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE(day_dt)
+          (
+          PARTITION p20090312  END ('2009-03-12'::date)
+          );
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589a%';
+         relname          |                 pg_get_expr                  
+--------------------------+----------------------------------------------
+ mpp6589a                 | 
+ mpp6589a_1_prt_p20090312 | FOR VALUES FROM (MINVALUE) TO ('03-12-2009')
+(2 rows)
+
+-- should work
+ALTER TABLE mpp6589a 
+SPLIT PARTITION p20090312 AT( '20090310' ) 
+INTO( PARTITION p20090309, PARTITION p20090312_tmp);
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589a%';
+           relname            |                   pg_get_expr                    
+------------------------------+--------------------------------------------------
+ mpp6589a                     | 
+ mpp6589a_1_prt_p20090309     | FOR VALUES FROM (MINVALUE) TO ('03-10-2009')
+ mpp6589a_1_prt_p20090312_tmp | FOR VALUES FROM ('03-10-2009') TO ('03-12-2009')
+(3 rows)
+
+CREATE TABLE mpp6589i(a int, b int) 
+partition by range (b) (start (1) end (3));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589i%';
+     relname      |        pg_get_expr         
+------------------+----------------------------
+ mpp6589i         | 
+ mpp6589i_1_prt_1 | FOR VALUES FROM (1) TO (3)
+(2 rows)
+
+-- should fail (overlap)
+ALTER TABLE mpp6589i ADD PARTITION start (2);
+ERROR:  partition "mpp6589i_1_prt_11" would overlap partition "mpp6589i_1_prt_1"
+-- should work (there's a "point" hole at value 2)
+ALTER TABLE mpp6589i ADD PARTITION start (3) exclusive;
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589i%';
+      relname      |            pg_get_expr            
+-------------------+-----------------------------------
+ mpp6589i          | 
+ mpp6589i_1_prt_1  | FOR VALUES FROM (1) TO (3)
+ mpp6589i_1_prt_11 | FOR VALUES FROM (4) TO (MAXVALUE)
+(3 rows)
+
+-- test open-ended SPLIT
+CREATE TABLE mpp6589b
+(
+  id bigint,
+  day_dt date
+)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE(day_dt)
+          (
+          PARTITION p20090312  START ('2008-03-12'::date)
+          );
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589b%';
+         relname          |                 pg_get_expr                  
+--------------------------+----------------------------------------------
+ mpp6589b                 | 
+ mpp6589b_1_prt_p20090312 | FOR VALUES FROM ('03-12-2008') TO (MAXVALUE)
+(2 rows)
+
+-- should work
+ALTER TABLE mpp6589b 
+SPLIT PARTITION p20090312 AT( '20090310' ) 
+INTO( PARTITION p20090309, PARTITION p20090312_tmp);
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589b%';
+           relname            |                   pg_get_expr                    
+------------------------------+--------------------------------------------------
+ mpp6589b                     | 
+ mpp6589b_1_prt_p20090309     | FOR VALUES FROM ('03-12-2008') TO ('03-10-2009')
+ mpp6589b_1_prt_p20090312_tmp | FOR VALUES FROM ('03-10-2009') TO (MAXVALUE)
+(3 rows)
+
+-- MPP-7191, MPP-7193: partitioned tables - fully-qualify storage type
+-- if not specified (and not a template)
+CREATE TABLE mpp5992 (a int, b date, c char,
+                     d char(4), e varchar(20), f timestamp)
+WITH (orientation=column,appendonly=true)
+partition by range (b)
+subpartition by list (a)
+subpartition template (
+subpartition l1 values (1,2,3,4,5),
+subpartition l2 values (6,7,8,9,10) )
+subpartition by list (e)
+subpartition template (
+subpartition ll1 values ('Engineering'),
+subpartition ll2 values ('QA') )
+subpartition by list (c)
+subpartition template (
+subpartition lll1 values ('M'),
+subpartition lll2 values ('F') )
+(
+  start (date '2007-01-01')
+  end (date '2010-01-01') every (interval '1 year')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- Delete subpartition template
+alter table mpp5992 alter partition for ('2008-01-01')
+set subpartition template ();
+alter table mpp5992 alter partition for ('2008-01-01')
+alter partition for (1)
+set subpartition template ();
+alter table mpp5992 set subpartition template ();
+-- Add subpartition template
+alter table mpp5992 alter partition for ('2008-01-01')
+alter partition for (1)
+set subpartition template ( subpartition lll1 values ('M'),
+subpartition lll2 values ('F'));
+alter table mpp5992 alter partition for ('2008-01-01')
+set subpartition template (
+subpartition ll1 values ('Engineering'),
+subpartition ll2 values ('QA')
+);
+alter table mpp5992 
+set subpartition template (subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) );
+alter table mpp5992 
+set subpartition template (subpartition l1 values (1,2,3), 
+subpartition l2 values (4,5,6), subpartition l3 values (7,8,9,10));
+select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
+  relid  | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+---------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ mpp5992 |     3 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName lll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "M" :location 133}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName lll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "F" :location 165}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+ mpp5992 |     2 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName ll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "Engineering" :location 108}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName ll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "QA" :location 149}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+ mpp5992 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName l1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 1 :location 72}) ({A_CONST :val 2 :location 74}) ({A_CONST :val 3 :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 4 :location 105}) ({A_CONST :val 5 :location 107}) ({A_CONST :val 6 :location 109}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l3 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 7 :location 137}) ({A_CONST :val 8 :location 139}) ({A_CONST :val 9 :location 141}) ({A_CONST :val 10 :location 143}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+(3 rows)
+
+-- Now we can add a new partition
+alter table mpp5992 
+add partition foo1 
+start (date '2011-01-01') 
+end (date '2012-01-01'); -- should inherit from parent storage option
+alter table mpp5992 
+add partition foo2 
+start (date '2012-01-01') 
+end (date '2013-01-01') WITH (orientation=column,appendonly=true);
+alter table mpp5992 
+add partition foo3 
+start (date '2013-01-01') end (date '2014-01-01') WITH (appendonly=true);
+select * from pg_partition_tree('mpp5992');
+                      relid                       |              parentrelid              | isleaf | level 
+--------------------------------------------------+---------------------------------------+--------+-------
+ mpp5992                                          |                                       | f      |     0
+ mpp5992_1_prt_1                                  | mpp5992                               | f      |     1
+ mpp5992_1_prt_2                                  | mpp5992                               | f      |     1
+ mpp5992_1_prt_3                                  | mpp5992                               | f      |     1
+ mpp5992_1_prt_foo1                               | mpp5992                               | f      |     1
+ mpp5992_1_prt_foo2                               | mpp5992                               | f      |     1
+ mpp5992_1_prt_foo3                               | mpp5992                               | f      |     1
+ mpp5992_1_prt_1_2_prt_l1                         | mpp5992_1_prt_1                       | f      |     2
+ mpp5992_1_prt_1_2_prt_l2                         | mpp5992_1_prt_1                       | f      |     2
+ mpp5992_1_prt_2_2_prt_l1                         | mpp5992_1_prt_2                       | f      |     2
+ mpp5992_1_prt_2_2_prt_l2                         | mpp5992_1_prt_2                       | f      |     2
+ mpp5992_1_prt_3_2_prt_l1                         | mpp5992_1_prt_3                       | f      |     2
+ mpp5992_1_prt_3_2_prt_l2                         | mpp5992_1_prt_3                       | f      |     2
+ mpp5992_1_prt_foo1_2_prt_l1                      | mpp5992_1_prt_foo1                    | f      |     2
+ mpp5992_1_prt_foo1_2_prt_l2                      | mpp5992_1_prt_foo1                    | f      |     2
+ mpp5992_1_prt_foo1_2_prt_l3                      | mpp5992_1_prt_foo1                    | f      |     2
+ mpp5992_1_prt_foo2_2_prt_l1                      | mpp5992_1_prt_foo2                    | f      |     2
+ mpp5992_1_prt_foo2_2_prt_l2                      | mpp5992_1_prt_foo2                    | f      |     2
+ mpp5992_1_prt_foo2_2_prt_l3                      | mpp5992_1_prt_foo2                    | f      |     2
+ mpp5992_1_prt_foo3_2_prt_l1                      | mpp5992_1_prt_foo3                    | f      |     2
+ mpp5992_1_prt_foo3_2_prt_l2                      | mpp5992_1_prt_foo3                    | f      |     2
+ mpp5992_1_prt_foo3_2_prt_l3                      | mpp5992_1_prt_foo3                    | f      |     2
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll1               | mpp5992_1_prt_1_2_prt_l1              | f      |     3
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll2               | mpp5992_1_prt_1_2_prt_l1              | f      |     3
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll1               | mpp5992_1_prt_1_2_prt_l2              | f      |     3
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll2               | mpp5992_1_prt_1_2_prt_l2              | f      |     3
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll1               | mpp5992_1_prt_2_2_prt_l1              | f      |     3
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll2               | mpp5992_1_prt_2_2_prt_l1              | f      |     3
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll1               | mpp5992_1_prt_2_2_prt_l2              | f      |     3
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll2               | mpp5992_1_prt_2_2_prt_l2              | f      |     3
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll1               | mpp5992_1_prt_3_2_prt_l1              | f      |     3
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll2               | mpp5992_1_prt_3_2_prt_l1              | f      |     3
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll1               | mpp5992_1_prt_3_2_prt_l2              | f      |     3
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll2               | mpp5992_1_prt_3_2_prt_l2              | f      |     3
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1            | mpp5992_1_prt_foo1_2_prt_l1           | f      |     3
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2            | mpp5992_1_prt_foo1_2_prt_l1           | f      |     3
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1            | mpp5992_1_prt_foo1_2_prt_l2           | f      |     3
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2            | mpp5992_1_prt_foo1_2_prt_l2           | f      |     3
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1            | mpp5992_1_prt_foo1_2_prt_l3           | f      |     3
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2            | mpp5992_1_prt_foo1_2_prt_l3           | f      |     3
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1            | mpp5992_1_prt_foo2_2_prt_l1           | f      |     3
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2            | mpp5992_1_prt_foo2_2_prt_l1           | f      |     3
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1            | mpp5992_1_prt_foo2_2_prt_l2           | f      |     3
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2            | mpp5992_1_prt_foo2_2_prt_l2           | f      |     3
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1            | mpp5992_1_prt_foo2_2_prt_l3           | f      |     3
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2            | mpp5992_1_prt_foo2_2_prt_l3           | f      |     3
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1            | mpp5992_1_prt_foo3_2_prt_l1           | f      |     3
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2            | mpp5992_1_prt_foo3_2_prt_l1           | f      |     3
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1            | mpp5992_1_prt_foo3_2_prt_l2           | f      |     3
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2            | mpp5992_1_prt_foo3_2_prt_l2           | f      |     3
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1            | mpp5992_1_prt_foo3_2_prt_l3           | f      |     3
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2            | mpp5992_1_prt_foo3_2_prt_l3           | f      |     3
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll1    | mpp5992_1_prt_1_2_prt_l1_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll2    | mpp5992_1_prt_1_2_prt_l1_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll1    | mpp5992_1_prt_1_2_prt_l1_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll2    | mpp5992_1_prt_1_2_prt_l1_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll1    | mpp5992_1_prt_1_2_prt_l2_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll2    | mpp5992_1_prt_1_2_prt_l2_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll1    | mpp5992_1_prt_1_2_prt_l2_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll2    | mpp5992_1_prt_1_2_prt_l2_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll1    | mpp5992_1_prt_2_2_prt_l1_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll2    | mpp5992_1_prt_2_2_prt_l1_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll1    | mpp5992_1_prt_2_2_prt_l1_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll2    | mpp5992_1_prt_2_2_prt_l1_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll1    | mpp5992_1_prt_2_2_prt_l2_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll2    | mpp5992_1_prt_2_2_prt_l2_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll1    | mpp5992_1_prt_2_2_prt_l2_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll2    | mpp5992_1_prt_2_2_prt_l2_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll1    | mpp5992_1_prt_3_2_prt_l1_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll2    | mpp5992_1_prt_3_2_prt_l1_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll1    | mpp5992_1_prt_3_2_prt_l1_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll2    | mpp5992_1_prt_3_2_prt_l1_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll1    | mpp5992_1_prt_3_2_prt_l2_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll2    | mpp5992_1_prt_3_2_prt_l2_3_prt_ll1    | t      |     4
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll2_4_prt_lll1    | mpp5992_1_prt_3_2_prt_l2_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll2_4_prt_lll2    | mpp5992_1_prt_3_2_prt_l2_3_prt_ll2    | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1_4_prt_lll1 | mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1_4_prt_lll2 | mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2_4_prt_lll1 | mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2 | t      |     4
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2_4_prt_lll2 | mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2 | t      |     4
+(112 rows)
+
+select relname, relam, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp5992%';
+                     relname                      | relam |                   pg_get_expr                    
+--------------------------------------------------+-------+--------------------------------------------------
+ mpp5992                                          |  7166 | 
+ mpp5992_1_prt_1                                  |  7166 | FOR VALUES FROM ('01-01-2007') TO ('01-01-2008')
+ mpp5992_1_prt_1_2_prt_l1                         |  7166 | FOR VALUES IN (1, 2, 3, 4, 5)
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll1               |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll1_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll2               |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_1_2_prt_l1_3_prt_ll2_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_1_2_prt_l2                         |  7166 | FOR VALUES IN (6, 7, 8, 9, 10)
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll1               |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll1_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll2               |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_1_2_prt_l2_3_prt_ll2_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_2                                  |  7166 | FOR VALUES FROM ('01-01-2008') TO ('01-01-2009')
+ mpp5992_1_prt_2_2_prt_l1                         |  7166 | FOR VALUES IN (1, 2, 3, 4, 5)
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll1               |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll1_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll2               |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_2_2_prt_l1_3_prt_ll2_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_2_2_prt_l2                         |  7166 | FOR VALUES IN (6, 7, 8, 9, 10)
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll1               |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll1_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll2               |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_2_2_prt_l2_3_prt_ll2_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_3                                  |  7166 | FOR VALUES FROM ('01-01-2009') TO ('01-01-2010')
+ mpp5992_1_prt_3_2_prt_l1                         |  7166 | FOR VALUES IN (1, 2, 3, 4, 5)
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll1               |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll1_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll2               |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_3_2_prt_l1_3_prt_ll2_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_3_2_prt_l2                         |  7166 | FOR VALUES IN (6, 7, 8, 9, 10)
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll1               |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll1_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll2               |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll2_4_prt_lll1    |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_3_2_prt_l2_3_prt_ll2_4_prt_lll2    |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo1                               |  7166 | FOR VALUES FROM ('01-01-2011') TO ('01-01-2012')
+ mpp5992_1_prt_foo1_2_prt_l1                      |  7166 | FOR VALUES IN (1, 2, 3)
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1            |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll1_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2            |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo1_2_prt_l1_3_prt_ll2_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo1_2_prt_l2                      |  7166 | FOR VALUES IN (4, 5, 6)
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1            |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll1_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2            |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo1_2_prt_l2_3_prt_ll2_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo1_2_prt_l3                      |  7166 | FOR VALUES IN (7, 8, 9, 10)
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1            |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll1_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2            |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo1_2_prt_l3_3_prt_ll2_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo2                               |  7166 | FOR VALUES FROM ('01-01-2012') TO ('01-01-2013')
+ mpp5992_1_prt_foo2_2_prt_l1                      |  7166 | FOR VALUES IN (1, 2, 3)
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1            |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll1_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2            |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo2_2_prt_l1_3_prt_ll2_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo2_2_prt_l2                      |  7166 | FOR VALUES IN (4, 5, 6)
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1            |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll1_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2            |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo2_2_prt_l2_3_prt_ll2_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo2_2_prt_l3                      |  7166 | FOR VALUES IN (7, 8, 9, 10)
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1            |  7166 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll1_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2            |  7166 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2_4_prt_lll1 |  7166 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo2_2_prt_l3_3_prt_ll2_4_prt_lll2 |  7166 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo3                               |  7024 | FOR VALUES FROM ('01-01-2013') TO ('01-01-2014')
+ mpp5992_1_prt_foo3_2_prt_l1                      |  7024 | FOR VALUES IN (1, 2, 3)
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1            |  7024 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll1 |  7024 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll1_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2            |  7024 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll1 |  7024 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo3_2_prt_l1_3_prt_ll2_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo3_2_prt_l2                      |  7024 | FOR VALUES IN (4, 5, 6)
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1            |  7024 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll1 |  7024 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll1_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2            |  7024 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll1 |  7024 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo3_2_prt_l2_3_prt_ll2_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo3_2_prt_l3                      |  7024 | FOR VALUES IN (7, 8, 9, 10)
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1            |  7024 | FOR VALUES IN ('Engineering')
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1_4_prt_lll1 |  7024 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll1_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2            |  7024 | FOR VALUES IN ('QA')
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2_4_prt_lll1 |  7024 | FOR VALUES IN ('M')
+ mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
+(112 rows)
+
+select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
+  relid  | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+---------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ mpp5992 |     3 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName lll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "M" :location 133}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName lll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "F" :location 165}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+ mpp5992 |     2 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName ll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "Engineering" :location 108}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName ll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "QA" :location 149}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+ mpp5992 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName l1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 1 :location 72}) ({A_CONST :val 2 :location 74}) ({A_CONST :val 3 :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 4 :location 105}) ({A_CONST :val 5 :location 107}) ({A_CONST :val 6 :location 109}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l3 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 7 :location 137}) ({A_CONST :val 8 :location 139}) ({A_CONST :val 9 :location 141}) ({A_CONST :val 10 :location 143}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+(3 rows)
+
+-- MPP-10223: split subpartitions
+CREATE TABLE MPP10223pk
+(
+rnc VARCHAR(100),
+wbts VARCHAR(100),
+axc VARCHAR(100),
+vptt VARCHAR(100),
+vcct VARCHAR(100),
+agg_level CHAR(5),
+period_start_time TIMESTAMP WITH TIME ZONE,
+load_time TIMESTAMP WITH TIME ZONE DEFAULT now(),
+interval INTEGER,
+totcellsegress double precision,
+totcellsingress double precision,
+ 
+  CONSTRAINT "axc_vcct1_atmvcct_pk_test2" 
+PRIMARY KEY (rnc,wbts,axc,vptt,vcct,agg_level,period_start_time)
+)
+ 
+DISTRIBUTED BY (rnc,wbts,axc,vptt,vcct)
+ 
+PARTITION BY LIST (AGG_LEVEL)
+  SUBPARTITION BY RANGE (PERIOD_START_TIME)
+(
+  PARTITION min15part  VALUES ('15min')
+    (
+       SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+       SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                              END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION hourpart   VALUES ('hour')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION daypart    VALUES ('day')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    )
+);
+-- MPP-10421: works -- can re-use name for non-DEFAULT partitions, and
+-- primary key problems fixed
+ALTER TABLE MPP10223pk
+ ALTER PARTITION min15part 
+SPLIT PARTITION  P_FUTURE AT ('2010-06-25') 
+INTO (PARTITION P20010101, PARTITION P_FUTURE);
+drop table mpp10223pk;
+-- rebuild the table without a primary key
+CREATE TABLE MPP10223
+(
+rnc VARCHAR(100),
+wbts VARCHAR(100),
+axc VARCHAR(100),
+vptt VARCHAR(100),
+vcct VARCHAR(100),
+agg_level CHAR(5),
+period_start_time TIMESTAMP WITH TIME ZONE,
+load_time TIMESTAMP WITH TIME ZONE DEFAULT now(),
+interval INTEGER,
+totcellsegress double precision,
+totcellsingress double precision
+)
+ 
+DISTRIBUTED BY (rnc,wbts,axc,vptt,vcct)
+ 
+PARTITION BY LIST (AGG_LEVEL)
+  SUBPARTITION BY RANGE (PERIOD_START_TIME)
+(
+  PARTITION min15part  VALUES ('15min')
+    (
+       SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+       SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                              END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION hourpart   VALUES ('hour')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION daypart    VALUES ('day')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    )
+);
+-- this works
+ALTER TABLE MPP10223
+ ALTER PARTITION min15part 
+SPLIT PARTITION  P_FUTURE AT ('2010-06-25') 
+INTO (PARTITION P20010101, PARTITION P_FUTURE2);
+select * from pg_partition_tree('mpp10223');
+                  relid                   |       parentrelid        | isleaf | level 
+------------------------------------------+--------------------------+--------+-------
+ mpp10223                                 |                          | f      |     0
+ mpp10223_1_prt_min15part                 | mpp10223                 | f      |     1
+ mpp10223_1_prt_hourpart                  | mpp10223                 | f      |     1
+ mpp10223_1_prt_daypart                   | mpp10223                 | f      |     1
+ mpp10223_1_prt_min15part_2_prt_p_endpart | mpp10223_1_prt_min15part | t      |     2
+ mpp10223_1_prt_min15part_2_prt_p20010101 | mpp10223_1_prt_min15part | t      |     2
+ mpp10223_1_prt_min15part_2_prt_p_future2 | mpp10223_1_prt_min15part | t      |     2
+ mpp10223_1_prt_hourpart_2_prt_p_future   | mpp10223_1_prt_hourpart  | t      |     2
+ mpp10223_1_prt_hourpart_2_prt_p20100622  | mpp10223_1_prt_hourpart  | t      |     2
+ mpp10223_1_prt_hourpart_2_prt_p20100623  | mpp10223_1_prt_hourpart  | t      |     2
+ mpp10223_1_prt_hourpart_2_prt_p20100624  | mpp10223_1_prt_hourpart  | t      |     2
+ mpp10223_1_prt_hourpart_2_prt_p20100625  | mpp10223_1_prt_hourpart  | t      |     2
+ mpp10223_1_prt_hourpart_2_prt_p20100626  | mpp10223_1_prt_hourpart  | t      |     2
+ mpp10223_1_prt_hourpart_2_prt_p_endpart  | mpp10223_1_prt_hourpart  | t      |     2
+ mpp10223_1_prt_daypart_2_prt_p_future    | mpp10223_1_prt_daypart   | t      |     2
+ mpp10223_1_prt_daypart_2_prt_p20100622   | mpp10223_1_prt_daypart   | t      |     2
+ mpp10223_1_prt_daypart_2_prt_p20100623   | mpp10223_1_prt_daypart   | t      |     2
+ mpp10223_1_prt_daypart_2_prt_p20100624   | mpp10223_1_prt_daypart   | t      |     2
+ mpp10223_1_prt_daypart_2_prt_p20100625   | mpp10223_1_prt_daypart   | t      |     2
+ mpp10223_1_prt_daypart_2_prt_p20100626   | mpp10223_1_prt_daypart   | t      |     2
+ mpp10223_1_prt_daypart_2_prt_p_endpart   | mpp10223_1_prt_daypart   | t      |     2
+(21 rows)
+
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp10223%';
+                 relname                  |                                     pg_get_expr                                      
+------------------------------------------+--------------------------------------------------------------------------------------
+ mpp10223                                 | 
+ mpp10223_1_prt_daypart                   | FOR VALUES IN ('day  ')
+ mpp10223_1_prt_daypart_2_prt_p20100622   | FOR VALUES FROM ('Tue Jun 22 00:00:00 2010 PDT') TO ('Wed Jun 23 00:00:00 2010 PDT')
+ mpp10223_1_prt_daypart_2_prt_p20100623   | FOR VALUES FROM ('Wed Jun 23 00:00:00 2010 PDT') TO ('Thu Jun 24 00:00:00 2010 PDT')
+ mpp10223_1_prt_daypart_2_prt_p20100624   | FOR VALUES FROM ('Thu Jun 24 00:00:00 2010 PDT') TO ('Fri Jun 25 00:00:00 2010 PDT')
+ mpp10223_1_prt_daypart_2_prt_p20100625   | FOR VALUES FROM ('Fri Jun 25 00:00:00 2010 PDT') TO ('Sat Jun 26 00:00:00 2010 PDT')
+ mpp10223_1_prt_daypart_2_prt_p20100626   | FOR VALUES FROM ('Sat Jun 26 00:00:00 2010 PDT') TO ('Mon Dec 30 00:00:00 2999 PST')
+ mpp10223_1_prt_daypart_2_prt_p_endpart   | FOR VALUES FROM ('Mon Dec 30 00:00:00 2999 PST') TO ('Tue Dec 31 00:00:00 2999 PST')
+ mpp10223_1_prt_daypart_2_prt_p_future    | FOR VALUES FROM ('Mon Jan 01 00:00:00 2001 PST') TO ('Tue Jun 22 00:00:00 2010 PDT')
+ mpp10223_1_prt_hourpart                  | FOR VALUES IN ('hour ')
+ mpp10223_1_prt_hourpart_2_prt_p20100622  | FOR VALUES FROM ('Tue Jun 22 00:00:00 2010 PDT') TO ('Wed Jun 23 00:00:00 2010 PDT')
+ mpp10223_1_prt_hourpart_2_prt_p20100623  | FOR VALUES FROM ('Wed Jun 23 00:00:00 2010 PDT') TO ('Thu Jun 24 00:00:00 2010 PDT')
+ mpp10223_1_prt_hourpart_2_prt_p20100624  | FOR VALUES FROM ('Thu Jun 24 00:00:00 2010 PDT') TO ('Fri Jun 25 00:00:00 2010 PDT')
+ mpp10223_1_prt_hourpart_2_prt_p20100625  | FOR VALUES FROM ('Fri Jun 25 00:00:00 2010 PDT') TO ('Sat Jun 26 00:00:00 2010 PDT')
+ mpp10223_1_prt_hourpart_2_prt_p20100626  | FOR VALUES FROM ('Sat Jun 26 00:00:00 2010 PDT') TO ('Mon Dec 30 00:00:00 2999 PST')
+ mpp10223_1_prt_hourpart_2_prt_p_endpart  | FOR VALUES FROM ('Mon Dec 30 00:00:00 2999 PST') TO ('Tue Dec 31 00:00:00 2999 PST')
+ mpp10223_1_prt_hourpart_2_prt_p_future   | FOR VALUES FROM ('Mon Jan 01 00:00:00 2001 PST') TO ('Tue Jun 22 00:00:00 2010 PDT')
+ mpp10223_1_prt_min15part                 | FOR VALUES IN ('15min')
+ mpp10223_1_prt_min15part_2_prt_p20010101 | FOR VALUES FROM ('Mon Jan 01 00:00:00 2001 PST') TO ('Fri Jun 25 00:00:00 2010 PDT')
+ mpp10223_1_prt_min15part_2_prt_p_endpart | FOR VALUES FROM ('Mon Dec 30 00:00:00 2999 PST') TO ('Tue Dec 31 00:00:00 2999 PST')
+ mpp10223_1_prt_min15part_2_prt_p_future2 | FOR VALUES FROM ('Fri Jun 25 00:00:00 2010 PDT') TO ('Mon Dec 30 00:00:00 2999 PST')
+(21 rows)
+
+-- simpler version
+create table mpp10223b (a int, b int , d int)
+partition by range (b)
+subpartition by range (d)
+(partition p1 start (1) end (10)
+(subpartition sp2 start (20) end (30)));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- MPP-10421: allow re-use sp2 for non-DEFAULT partition
+alter table mpp10223b alter partition p1 
+split partition for (20) at (25)
+into (partition sp2, partition sp3);
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp10223b%';
+           relname            |         pg_get_expr          
+------------------------------+------------------------------
+ mpp10223b                    | 
+ mpp10223b_1_prt_p1           | FOR VALUES FROM (1) TO (10)
+ mpp10223b_1_prt_p1_2_prt_sp2 | FOR VALUES FROM (20) TO (25)
+ mpp10223b_1_prt_p1_2_prt_sp3 | FOR VALUES FROM (25) TO (30)
+(4 rows)
+
+-- MPP-10480: dump templates (but don't use "foo")
+create table MPP10480 (a int, b int, d int)
+partition by range (b)
+subpartition by range(d)
+subpartition template (start (1) end (10) every (1))
+(start (20) end (30) every (1));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+select relid::regclass, level, template from gp_partition_template where relid = 'MPP10480'::regclass;
+  relid   | level |                                                                                                                                                                                                                  template                                                                                                                                                                                                                  
+----------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ mpp10480 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName <> :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({A_CONST :val 1 :location 122}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({A_CONST :val 10 :location 130}) :edge 2} :partEvery ({A_CONST :val 1 :location 141})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+(1 row)
+
+-- MPP-10421: fix SPLIT of partitions with PRIMARY KEY constraint/indexes
+CREATE TABLE mpp10321a
+(
+        rnc VARCHAR(100),
+        wbts VARCHAR(100),
+        axc VARCHAR(100),
+        vptt VARCHAR(100),
+        vcct VARCHAR(100),
+        agg_level CHAR(5),
+        period_start_time TIMESTAMP WITH TIME ZONE,
+        load_time TIMESTAMP WITH TIME ZONE DEFAULT now(),
+        interval INTEGER,
+        totcellsegress double precision,
+        totcellsingress double precision,
+  CONSTRAINT "mpp10321a_pk"
+PRIMARY KEY (rnc,wbts,axc,vptt,vcct,agg_level,period_start_time)
+)
+DISTRIBUTED BY (rnc,wbts,axc,vptt,vcct)
+PARTITION BY LIST (AGG_LEVEL)
+  SUBPARTITION BY RANGE (PERIOD_START_TIME)
+(
+  PARTITION min15part  VALUES ('15min')
+    (
+         SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+         SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION hourpart   VALUES ('hour')
+    (
+          SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+          SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                 END (date '2999-12-31') EXCLUSIVE
+    )
+);
+ALTER TABLE mpp10321a
+ALTER PARTITION min15part
+SPLIT PARTITION  P_FUTURE AT ('2010-06-25')
+INTO (PARTITION P20010101, PARTITION P_FUTURE);
+DROP TABLE mpp10321a;
+-- test for default partition with boundary spec
+create table bhagp_range (a int, b int) 
+distributed by (a) 
+partition by range (b) 
+( 
+  default partition x 
+  start (0) inclusive 
+  end (2) exclusive 
+  every (1) 
+);
+ERROR:  syntax error at or near "start"
+LINE 6:   start (0) inclusive 
+          ^
+create table bhagp_list (a int, b int) 
+distributed by (a) 
+partition by list (b) 
+( 
+  default partition x 
+  values (1,2)
+);
+ERROR:  syntax error at or near "values"
+LINE 6:   values (1,2)
+          ^
+-- more coverage tests
+-- bad partition by type
+create table cov1 (a int, b int)
+distributed by (a)
+partition by (b)
+(
+start (1) end (10) every (1)
+);
+ERROR:  syntax error at or near "("
+LINE 3: partition by (b)
+                     ^
+-- bad partition by type
+create table cov1 (a int, b int)
+distributed by (a)
+partition by funky (b)
+(
+start (1) end (10) every (1)
+);
+ERROR:  unrecognized partitioning strategy "funky"
+drop table cov1;
+ERROR:  table "cov1" does not exist
+create table cov1 (a int, b int)
+distributed by (a)
+partition by range (b)
+(
+start (1) end (10) every (1)
+);
+-- syntax error
+alter table cov1 drop partition for (funky(1));
+ERROR:  syntax error at or near ")"
+LINE 1: alter table cov1 drop partition for (funky(1));
+                                                     ^
+-- no rank for default
+alter table cov1 drop default partition for (1);
+ERROR:  cannot specify a name, rank, or value for a DEFAULT partition in this context
+-- no default
+alter table cov1 split default partition at (9);
+ERROR:  DEFAULT partition of relation "cov1" does not exist
+alter table cov1 drop default partition;
+ERROR:  DEFAULT partition of relation "cov1" does not exist
+-- cannot add except by name
+alter table cov1 add partition for (1);
+ERROR:  can only ADD a partition by name
+-- bad template
+alter table cov1 set subpartition template (values (1,2) (values (2,3)));
+ERROR:  template cannot contain specification for child partition
+-- create and drop default partition in one statement!
+alter table cov1 add default partition def1, drop default partition;
+drop table cov1;
+-- every 5 (1) now disallowed...
+create table cov1 (a int, b int)
+distributed by (a)
+partition by range (b)
+(
+start (1) end(20) every 5 (1)
+);
+ERROR:  syntax error at or near "5"
+LINE 5: start (1) end(20) every 5 (1)
+                                ^
+drop table if exists cov1;
+NOTICE:  table "cov1" does not exist, skipping
+create table cov1 (a int, b int)
+distributed by (a)
+partition by list (b)
+(
+partition p1 values (1,2,3,4,5,6,7,8)
+);
+-- bad split
+alter table cov1 split partition p1 at (5,50);
+ERROR:  AT clause parameter is not a member of the target partition specification
+-- good split
+alter table cov1 split partition p1 at (5,6,7) 
+into (partition p1, partition p2);
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'cov1%';
+    relname    |          pg_get_expr          
+---------------+-------------------------------
+ cov1          | 
+ cov1_1_prt_p1 | FOR VALUES IN (1, 2, 3, 4, 8)
+ cov1_1_prt_p2 | FOR VALUES IN (5, 6, 7)
+(3 rows)
+
+drop table cov1;
+-- MPP-11120
+--  ADD PARTITION didn't explicitly specify the distribution policy in the
+-- CreateStmt distributedBy field and as such we followed the behaviour encoded
+-- in transformDistributedBy(). Unfortunately, it chooses to set the
+-- distribution policy to that of the primary key if the distribution policy
+-- is not explicitly set.
+create table tbl11120 (
+	a	int,
+	b	int,
+	c	int,
+	primary key (a,b,c)
+)
+distributed by (a)
+partition by range (b)
+(
+	default partition default_partition,
+	partition p1 start (1) end (2)
+);
+insert into tbl11120 values(1,2,3);
+select * from tbl11120; -- expected: (1,2,3)
+ a | b | c 
+---+---+---
+ 1 | 2 | 3
+(1 row)
+
+delete from tbl11120 where a=1 and b=2 and c=3; -- this should delete the row in tbl11120
+select * from tbl11120; -- expected, no rows
+ a | b | c 
+---+---+---
+(0 rows)
+
+insert into tbl11120 values(1,2,3); -- reinsert data
+-- all partitions should have same distribution policy
+select relname, distkey as distribution_attributes from
+gp_distribution_policy p, pg_class c
+where p.localoid = c.oid and relname like 'tbl11120%' order by p.localoid;
+             relname              | distribution_attributes 
+----------------------------------+-------------------------
+ tbl11120                         | 1
+ tbl11120_1_prt_default_partition | 1
+ tbl11120_1_prt_p1                | 1
+(3 rows)
+
+alter table tbl11120 split default partition
+        start (3)
+	end (4)
+	into (partition p2, default partition);
+select relname, distkey as distribution_attributes from
+gp_distribution_policy p, pg_class c where p.localoid = c.oid and 
+relname like 'tbl11120%' order by p.localoid;
+             relname              | distribution_attributes 
+----------------------------------+-------------------------
+ tbl11120                         | 1
+ tbl11120_1_prt_p1                | 1
+ tbl11120_1_prt_p2                | 1
+ tbl11120_1_prt_default_partition | 1
+(4 rows)
+
+delete from tbl11120 where a=1 and b=2 and c=3; -- this should delete the row in tbl11120
+select * from tbl11120; -- expected, no rows! But we see the row. Wrong results!
+ a | b | c 
+---+---+---
+(0 rows)
+
+alter table tbl11120 drop partition default_partition;
+alter table tbl11120 add partition foo start(10) end(20);
+select relname, distkey as distribution_attributes from
+gp_distribution_policy p, pg_class c where p.localoid = c.oid and
+relname like 'tbl11120%' order by p.localoid;
+      relname       | distribution_attributes 
+--------------------+-------------------------
+ tbl11120           | 1
+ tbl11120_1_prt_p1  | 1
+ tbl11120_1_prt_p2  | 1
+ tbl11120_1_prt_foo | 1
+(4 rows)
+
+drop table tbl11120;
+-- MPP-6979: EXCHANGE partitions - fix namespaces if they differ
+-- new schema
+create schema mpp6979dummy;
+create table mpp6979part(a int, b int) 
+partition by range(b) 
+(
+start (1) end (10) every (1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- append-only table in new schema 
+create table mpp6979dummy.mpp6979tab(like mpp6979part) with (appendonly=true);
+NOTICE:  table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table
+-- check that table and all parts in public schema
+select relname, nspname, relispartition from pg_class c, pg_namespace n
+where c.relnamespace = n.oid and relname like ('mpp6979%');
+       relname       |   nspname    | relispartition 
+---------------------+--------------+----------------
+ mpp6979part         | public       | f
+ mpp6979part_1_prt_1 | public       | t
+ mpp6979part_1_prt_2 | public       | t
+ mpp6979part_1_prt_3 | public       | t
+ mpp6979part_1_prt_4 | public       | t
+ mpp6979part_1_prt_5 | public       | t
+ mpp6979part_1_prt_6 | public       | t
+ mpp6979part_1_prt_7 | public       | t
+ mpp6979part_1_prt_8 | public       | t
+ mpp6979part_1_prt_9 | public       | t
+ mpp6979tab          | mpp6979dummy | f
+(11 rows)
+
+-- note that we have heap partitions in public, and ao table in mpp6979dummy
+select nspname, relname, amname
+from pg_class pc
+inner join pg_namespace ns on pc.relnamespace=ns.oid
+left join pg_am am on am.oid = pc.relam
+where relname like ('mpp6979%');
+   nspname    |       relname       | amname 
+--------------+---------------------+--------
+ public       | mpp6979part         | 
+ public       | mpp6979part_1_prt_1 | heap
+ public       | mpp6979part_1_prt_2 | heap
+ public       | mpp6979part_1_prt_3 | heap
+ public       | mpp6979part_1_prt_4 | heap
+ public       | mpp6979part_1_prt_5 | heap
+ public       | mpp6979part_1_prt_6 | heap
+ public       | mpp6979part_1_prt_7 | heap
+ public       | mpp6979part_1_prt_8 | heap
+ public       | mpp6979part_1_prt_9 | heap
+ mpp6979dummy | mpp6979tab          | ao_row
+(11 rows)
+
+-- exchange the partition with the ao table.  
+-- Now we have an ao partition and mpp6979tab is heap!
+alter table mpp6979part exchange partition for (1) 
+with table mpp6979dummy.mpp6979tab;
+-- after the exchange, all partitions are still in public
+select relname, nspname, relispartition from pg_class c, pg_namespace n
+where c.relnamespace = n.oid and relname like ('mpp6979%');
+       relname       |   nspname    | relispartition 
+---------------------+--------------+----------------
+ mpp6979part         | public       | f
+ mpp6979part_1_prt_1 | public       | t
+ mpp6979part_1_prt_2 | public       | t
+ mpp6979part_1_prt_3 | public       | t
+ mpp6979part_1_prt_4 | public       | t
+ mpp6979part_1_prt_5 | public       | t
+ mpp6979part_1_prt_6 | public       | t
+ mpp6979part_1_prt_7 | public       | t
+ mpp6979part_1_prt_8 | public       | t
+ mpp6979part_1_prt_9 | public       | t
+ mpp6979tab          | mpp6979dummy | f
+(11 rows)
+
+-- the rank 1 partition is ao, but still in public, and 
+-- table mpp6979tab is now heap, but still in mpp6979dummy
+select relname, nspname, relispartition, amname
+from pg_class c inner join pg_namespace n on c.relnamespace = n.oid
+left join pg_am am on am.oid = c.relam
+where relname like ('mpp6979%');
+       relname       |   nspname    | relispartition | amname 
+---------------------+--------------+----------------+--------
+ mpp6979part         | public       | f              | 
+ mpp6979part_1_prt_1 | public       | t              | ao_row
+ mpp6979part_1_prt_2 | public       | t              | heap
+ mpp6979part_1_prt_3 | public       | t              | heap
+ mpp6979part_1_prt_4 | public       | t              | heap
+ mpp6979part_1_prt_5 | public       | t              | heap
+ mpp6979part_1_prt_6 | public       | t              | heap
+ mpp6979part_1_prt_7 | public       | t              | heap
+ mpp6979part_1_prt_8 | public       | t              | heap
+ mpp6979part_1_prt_9 | public       | t              | heap
+ mpp6979tab          | mpp6979dummy | f              | heap
+(11 rows)
+
+drop table mpp6979part;
+drop table mpp6979dummy.mpp6979tab;
+drop schema mpp6979dummy;
+-- MPP-7898:
+create table parent_s
+    (a int, b text) 
+    distributed by (a);
+    
+insert into parent_s values
+    (1, 'one');
+-- Try to create a table that mixes inheritance and partitioning.
+-- Correct behavior: ERROR
+create table child_r
+    ( c int, d int) 
+    inherits (parent_s)
+    partition by range(d) 
+    (
+        start (0) 
+        end (2) 
+        every (1)
+    );
+ERROR:  cannot create partitioned table as inheritance child
+ -- If (incorrectly) the previous statement works, the next one is 
+ -- likely to fail with in unexpected internal error.  This is residual 
+ -- issue MPP-7898.
+insert into child_r values
+    (0, 'from r', 0, 0);
+ERROR:  relation "child_r" does not exist
+LINE 1: insert into child_r values
+                    ^
+drop table if exists parent_s cascade; --ignore
+drop table if exists child_r cascade; --ignore
+NOTICE:  table "child_r" does not exist, skipping
+create table parent_r
+    ( a int, b text, c int, d int ) 
+    distributed by (a)
+    partition by range(d) 
+    (
+        start (0) 
+        end (2) 
+        every (1)
+    );
+ 
+insert into parent_r values
+    (0, 'from r', 0, 0);
+create table parent_s
+    ( a int, b text, c int, d int ) 
+    distributed by (a);
+    
+insert into parent_s values
+    (1, 'from s', 555, 555);
+create table child_t
+    ( )
+    inherits (parent_s)
+    distributed by (a);
+insert into child_t values
+    (0, 'from t', 666, 666);
+-- Try to exchange in the child and parent.  
+-- Correct behavior: ERROR in both cases.
+alter table parent_r exchange partition for (1) with table child_t;
+ERROR:  cannot attach inheritance child as partition
+alter table parent_r exchange partition for (1) with table parent_s;
+ERROR:  cannot attach inheritance parent as partition
+drop table child_t cascade; --ignore
+drop table parent_s cascade; --ignore
+drop table parent_r cascade; --ignore
+-- MPP-7898 end.
+-- ( MPP-13750 
+CREATE TABLE s (id int, date date, amt decimal(10,2), units int) 
+DISTRIBUTED BY (id) 
+PARTITION BY RANGE (date) 
+( START (date '2008-01-01') INCLUSIVE 
+   END (date '2008-01-02') EXCLUSIVE 
+   EVERY (INTERVAL '1 day') );
+create index s_i on s(amt) 
+  where (id > 1)
+  ;
+create index s_j on s(units)
+  where (id <= 1)
+  ;
+create index s_i_expr on s(log(units));
+alter table s add partition s_test 
+    start(date '2008-01-03') end (date '2008-01-05');
+alter table s split partition for (date '2008-01-03') at (date '2008-01-04')
+  into (partition s_test, partition s_test2);
+select 
+    relname, 
+    (select count(distinct content) - 1 
+     from gp_segment_configuration) - count(*) as missing, 
+    count(distinct relid) oid_count 
+from (
+    select gp_execution_segment(), oid, relname 
+    from gp_dist_random('pg_class') 
+    ) seg_class(segid, relid, relname) 
+where relname ~ '^s_' 
+group by relname; 
+          relname          | missing | oid_count 
+---------------------------+---------+-----------
+ s_1_prt_1_amt_idx         |       0 |         1
+ s_1_prt_1_units_idx       |       0 |         1
+ s_1_prt_s_test2_log_idx   |       0 |         1
+ s_1_prt_s_test_log_idx1   |       0 |         1
+ s_i_expr                  |       0 |         1
+ s_j                       |       0 |         1
+ s_1_prt_s_test2_amt_idx   |       0 |         1
+ s_1_prt_s_test2_units_idx |       0 |         1
+ s_1_prt_s_test_amt_idx1   |       0 |         1
+ s_1_prt_s_test_units_idx1 |       0 |         1
+ s_1_prt_1                 |       0 |         1
+ s_1_prt_1_log_idx         |       0 |         1
+ s_1_prt_s_test            |       0 |         1
+ s_1_prt_s_test2           |       0 |         1
+ s_i                       |       0 |         1
+(15 rows)
+
+drop table s cascade;
+--   MPP-13750 )
+-- MPP-14471 start
+-- No unenforceable PK/UK constraints!  (UNIQUE INDEXes still allowed; tested above)
+drop table if exists tc cascade;
+NOTICE:  table "tc" does not exist, skipping
+drop table if exists cc cascade;
+NOTICE:  table "cc" does not exist, skipping
+drop table if exists at cascade;
+NOTICE:  table "at" does not exist, skipping
+create table tc
+    (a int, b int, c int, primary key(a) )
+    distributed by (a)
+    partition by range (b)
+    ( 
+        default partition d,
+        start (0) inclusive end(100) inclusive every (50)
+    );
+DETAIL:  PRIMARY KEY constraint on table "tc" lacks column "b" which is part of the partition key.
+ERROR:  unique constraint on partitioned table must include all partitioning columns
+create table cc
+    (a int primary key, b int, c int)
+    distributed by (a)
+    partition by range (b)
+    ( 
+        default partition d,
+        start (0) inclusive end(100) inclusive every (50)
+    );
+DETAIL:  PRIMARY KEY constraint on table "cc" lacks column "b" which is part of the partition key.
+ERROR:  unique constraint on partitioned table must include all partitioning columns
+create table at
+    (a int, b int, c int)
+    distributed by (a)
+    partition by range (b)
+    ( 
+        default partition d,
+        start (0) inclusive end(100) inclusive every (50)
+    );
+alter table at
+    add primary key (a);
+DETAIL:  PRIMARY KEY constraint on table "at" lacks column "b" which is part of the partition key.
+ERROR:  unique constraint on partitioned table must include all partitioning columns
+-- MPP-14471 end
+-- MPP-17606 (using table "at" from above)
+alter table at
+    alter column b
+	type numeric;
+ERROR:  cannot alter column "b" because it is part of the partition key of relation "at"
+	
+-- MPP-17606 end
+-- MPP-17707 start
+create table mpp17707
+( d int, p int ,x text)
+with (appendonly = true)
+distributed by (d)
+partition by range (p)
+(start (0) end (3) every (2));
+-- Create a expression index on the partitioned table
+create index idx_abc on mpp17707(upper(x));
+-- split partition 1 of table
+alter table mpp17707 split partition for (0) at (1)
+	into (partition x1, partition x2);
+-- MPP-17707 end
+-- MPP-17814 start
+drop table if exists plst2 cascade;
+NOTICE:  table "plst2" does not exist, skipping
+-- positive; bug was that it failed whereas it should succeed
+create type plst2_partkey as (a integer, c integer);
+create table plst2
+    (            
+        b integer not null,
+	d plst2_partkey
+    )                                                                                                                   
+    distributed by (b) 
+    partition by list (d)
+    (
+        partition p1 values ( CAST('(1,2)' as plst2_partkey), CAST('(3,4)' as plst2_partkey) ),
+        partition p2 values ( CAST('(5,6)' as plst2_partkey) ),
+        partition p3 values ( CAST('(2,1)' as plst2_partkey) )
+    );
+\d+ plst2
+                                Partitioned table "public.plst2"
+ Column |     Type      | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+---------------+-----------+----------+---------+----------+--------------+-------------
+ b      | integer       |           | not null |         | plain    |              | 
+ d      | plst2_partkey |           |          |         | extended |              | 
+Partition key: LIST (d)
+Partitions: plst2_1_prt_p1 FOR VALUES IN ('(1,2)', '(3,4)'),
+            plst2_1_prt_p2 FOR VALUES IN ('(5,6)'),
+            plst2_1_prt_p3 FOR VALUES IN ('(2,1)')
+Distributed by: (b)
+
+drop table if exists plst2 cascade;
+--negative; test legitimate failure
+create table plst2
+    (            
+        b integer not null,
+	d plst2_partkey
+    )                                                                                                                   
+    distributed by (b) 
+    partition by list (d)
+    (
+        partition p1 values ( CAST('(1,2)' as plst2_partkey), CAST('(3,4)' as plst2_partkey) ),
+        partition p2 values ( CAST('(5,6)' as plst2_partkey) ),
+        partition p3 values ( CAST('(1,2)' as plst2_partkey) )
+    );
+ERROR:  partition "plst2_1_prt_p3" would overlap partition "plst2_1_prt_p1"
+LINE 11:         partition p3 values ( CAST('(1,2)' as plst2_partkey)...
+                                            ^
+-- postive; make sure inner part duplicates are accepted and quietly removed.
+drop table if exists plst2;
+NOTICE:  table "plst2" does not exist, skipping
+drop type plst2_partkey;
+create type plst2_partkey as (a int, b int);
+create table plst2
+    ( d int, c plst2_partkey)
+    distributed by (d)
+    partition by list (c) 
+        (
+        partition p0 values ( CAST('(1,2)' as plst2_partkey), CAST('(3,4)' as plst2_partkey) ),
+        partition p1 values ( CAST('(4,3)' as plst2_partkey), CAST('(2,1)' as plst2_partkey) ),
+        partition p2 values ( CAST('(4,4)' as plst2_partkey), CAST('(5,5)' as plst2_partkey), CAST('(4,4)' as plst2_partkey), CAST('(5,5)' as plst2_partkey), CAST('(4,4)' as plst2_partkey), CAST('(5,5)' as plst2_partkey)),
+	partition p3 values (CAST('(4,5)' as plst2_partkey), CAST('(5,6)' as plst2_partkey))
+        );
+-- positive; make sure legitimate alters work.
+alter table plst2 add partition p4 values (CAST('(5,4)' as plst2_partkey), CAST('(6,5)' as plst2_partkey));
+alter table plst2 add partition p5 values (CAST('(7,8)' as plst2_partkey), CAST('(7,8)' as plst2_partkey));
+\d+ plst2
+                                Partitioned table "public.plst2"
+ Column |     Type      | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+---------------+-----------+----------+---------+----------+--------------+-------------
+ d      | integer       |           |          |         | plain    |              | 
+ c      | plst2_partkey |           |          |         | extended |              | 
+Partition key: LIST (c)
+Partitions: plst2_1_prt_p0 FOR VALUES IN ('(1,2)', '(3,4)'),
+            plst2_1_prt_p1 FOR VALUES IN ('(4,3)', '(2,1)'),
+            plst2_1_prt_p2 FOR VALUES IN ('(4,4)', '(5,5)'),
+            plst2_1_prt_p3 FOR VALUES IN ('(4,5)', '(5,6)'),
+            plst2_1_prt_p4 FOR VALUES IN ('(5,4)', '(6,5)'),
+            plst2_1_prt_p5 FOR VALUES IN ('(7,8)')
+Distributed by: (d)
+
+-- negative; make sure conflicting alters fail.
+alter table plst2 add partition p6 values (CAST('(7,8)' as plst2_partkey), CAST('(2,1)' as plst2_partkey));
+ERROR:  partition "plst2_1_prt_p6" would overlap partition "plst2_1_prt_p5"
+LINE 1: alter table plst2 add partition p6 values (CAST('(7,8)' as p...
+                                          ^
+drop table if exists plst2;
+-- MPP-17814 end
+-- MPP-18441
+create table s_heap (i1 int, t1 text, t2 text, i2 int, i3 int, n1 numeric, b1 bool)
+partition by list (t1)
+     (partition abc values('abc0', 'abc1', 'abc2'));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into s_heap (t1, i1, i2, i3, n1, b1) select 'abc0', 1, 1, 1, 2.3, true
+    from generate_series(1, 5);
+alter table s_heap drop column t2;
+alter table s_heap drop column i3;
+-- create co table for exchange
+create table s_heap_ex_abc (i1 int, t1 text, f1 float, i2 int, n1 numeric, b1 bool)
+    WITH (appendonly=true, orientation=column, compresstype=zlib);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table s_heap_ex_abc drop column f1;
+insert into s_heap_ex_abc select 1, 'abc1', 2, 2, true from generate_series(1, 5);
+-- exchange partition
+alter table s_heap exchange partition abc with table s_heap_ex_abc;
+alter table s_heap exchange partition abc with table s_heap_ex_abc;
+drop table s_heap, s_heap_ex_abc;
+-- MPP-18441 end
+-- MPP-18443
+create table s_heap (i1 int, t1 text, i2 int , i3 int, n1 numeric,b1 bool)
+partition by list (t1)
+    (partition def values('def0', 'def1', 'def2', 'def3', 'def4', 'def5', 'def6', 'def7', 'def8', 'def9'));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into s_heap(t1, i1, i2, i3, n1, b1)
+    select 'def0', 1, 1, 1, 2.3 , true from generate_series(1, 5);
+alter table s_heap drop column i3;
+create index s_heap_index on s_heap (i2);
+alter table s_heap split partition def
+    at ('def0', 'def1', 'def2', 'def3', 'def4') into (partition def5, partition def0);
+select * from s_heap_1_prt_def0;
+ i1 |  t1  | i2 | n1  | b1 
+----+------+----+-----+----
+  1 | def0 |  1 | 2.3 | t
+  1 | def0 |  1 | 2.3 | t
+  1 | def0 |  1 | 2.3 | t
+  1 | def0 |  1 | 2.3 | t
+  1 | def0 |  1 | 2.3 | t
+(5 rows)
+
+drop table s_heap;
+-- MPP-18443 end
+-- MPP-18445
+create table s_heap_ao ( i1 int, t1 text, i2 int , i3 int, n1 numeric,b1 bool)
+partition by list (t1)
+    (partition def values('def0', 'def1', 'def2', 'def3', 'def4', 'def5', 'def6', 'def7', 'def8', 'def9')
+        with (appendonly=true, orientation=row));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into s_heap_ao(t1, i1, i2, i3, n1, b1)
+    select 'def4', 1, 1, 1, 2.3, true from generate_series(1, 2);
+insert into s_heap_ao(t1, i1, i2, i3, n1, b1)
+    select 'def5', 1, 1, 1, 2.3, true from generate_series(1, 2);
+alter table s_heap_ao drop column i3;
+create index s_heap_ao_index on s_heap_ao (i2);
+alter table s_heap_ao split partition def
+    at ('def0', 'def1', 'def2', 'def3', 'def4') into (partition def5, partition def0);
+select * from s_heap_ao_1_prt_def0;
+ i1 |  t1  | i2 | n1  | b1 
+----+------+----+-----+----
+  1 | def4 |  1 | 2.3 | t
+  1 | def4 |  1 | 2.3 | t
+(2 rows)
+
+drop table s_heap_ao;
+-- MPP-18445 end
+-- MPP-18456
+create table s_heap_co (i1 int, t1 text, i2 int, i3 int, n1 numeric, b1 bool)
+partition by list (t1)
+    (partition def values('def0', 'def1', 'def2', 'def3', 'def4', 'def5', 'def6', 'def7', 'def8', 'def9')
+        with (appendonly=true, orientation=column));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into s_heap_co(t1, i1, i2, i3, n1, b1)
+    select 'def4', 1,1, 1, 2.3, true from generate_series(1, 2);
+insert into s_heap_co(t1, i1, i2, i3, n1, b1)
+    select 'def5', 1,1, 1, 2.3, true from generate_series(1, 2);
+alter table s_heap_co drop column i3;
+create index s_heap_co_index on s_heap_co (i2);
+alter table s_heap_co split partition def
+    at ('def0', 'def1', 'def2', 'def3', 'def4') into (partition def5, partition def0);
+select * from s_heap_co_1_prt_def0;
+ i1 |  t1  | i2 | n1  | b1 
+----+------+----+-----+----
+  1 | def4 |  1 | 2.3 | t
+  1 | def4 |  1 | 2.3 | t
+(2 rows)
+
+drop table s_heap_co;
+-- MPP-18456 end
+-- MPP-18457, MPP-18415
+CREATE TABLE non_ws_phone_leads (
+    lead_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    source_system_lead_id character varying(60) NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_event_type_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_site_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_date_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_time_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_number_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    duration_second smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_program_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_call_status_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_department_set_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_channel_set_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_provider_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_ad_set_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768)
+)
+WITH (appendonly=true, compresstype=zlib, orientation=column) DISTRIBUTED BY (dim_site_key ,dim_date_key) PARTITION BY RANGE(dim_date_key) 
+          (
+          PARTITION p_max START (2451545) END (9999999) WITH (tablename='non_ws_phone_leads_1_prt_p_max', orientation=column, appendonly=true ) 
+                    COLUMN lead_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN source_system_lead_id ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_event_type_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_site_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_date_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_time_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_number_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN duration_second ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_program_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_call_status_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_department_set_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_channel_set_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_provider_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_ad_set_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768)
+          );
+INSERT INTO non_ws_phone_leads VALUES (63962490, 'CA6qOEyxOmNJUQC7', 5058, 999901, 2455441, 40435, 999904, 207, 79, 2, 9901, 9901, 1, 9901);
+CREATE TABLE dim_phone_numbers (
+    dim_phone_number_key integer NOT NULL,
+    media_tracker_description character varying(40) NOT NULL,
+    formatted_phone_number character varying(20) NOT NULL,
+    source_system_phone_number_id character varying(100) NOT NULL,
+    last_modified_date timestamp without time zone NOT NULL
+) DISTRIBUTED BY (dim_phone_number_key);
+ALTER TABLE ONLY dim_phone_numbers
+    ADD CONSTRAINT dim_phone_numbers_pk1 PRIMARY KEY (dim_phone_number_key);
+INSERT INTO dim_phone_numbers VALUES (999902, 'test', '800-123-4568', '8001234568', '2012-09-25 13:34:35.037637');
+INSERT INTO dim_phone_numbers VALUES (999904, 'test', '(800) 123-4570', '8001234570', '2012-09-25 13:34:35.148104');
+INSERT INTO dim_phone_numbers VALUES (999903, 'test', '(800) 123-4569', '8001234569', '2012-09-25 13:34:35.093523');
+INSERT INTO dim_phone_numbers VALUES (999901, 'test', '(800)123-4567', '8001234567', '2012-09-25 13:34:34.781042');
+INSERT INTO dim_phone_numbers SELECT gs.*, dim_phone_numbers.media_tracker_description, dim_phone_numbers.formatted_phone_number, dim_phone_numbers.source_system_phone_number_id, dim_phone_numbers.last_modified_date FROM dim_phone_numbers, generate_series(1,100000) gs WHERE dim_phone_numbers.dim_phone_number_key = 999901;
+ANALYZE dim_phone_numbers;  
+-- Table NON_WS_PHONE_LEADS has two distribution keys
+-- Equality condition with constant on one distribution key
+-- Redistribute over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+LEFT outer JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441;
+ duration_second | dim_program_key | dim_site_key | dim_date_key 
+-----------------+-----------------+--------------+--------------
+             207 |              79 |       999901 |      2455441
+(1 row)
+
+-- Table NON_WS_PHONE_LEADS has two distribution keys
+-- Equality conditions with constants on all distribution keys
+-- Redistribute over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+LEFT outer JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441
+AND PL.dim_site_key = 999901;
+ duration_second | dim_program_key | dim_site_key | dim_date_key 
+-----------------+-----------------+--------------+--------------
+             207 |              79 |       999901 |      2455441
+(1 row)
+
+-- Table NON_WS_PHONE_LEADS has two distribution keys
+-- Broadcast over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441
+AND PL.dim_site_key = 999901;
+ duration_second | dim_program_key | dim_site_key | dim_date_key 
+-----------------+-----------------+--------------+--------------
+             207 |              79 |       999901 |      2455441
+(1 row)
+
+-- Join condition uses functions
+-- Broadcast over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY + 1 = DPN.DIM_PHONE_NUMBER_KEY + 1
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441
+AND PL.dim_site_key = 999901;
+ duration_second | dim_program_key | dim_site_key | dim_date_key 
+-----------------+-----------------+--------------+--------------
+             207 |              79 |       999901 |      2455441
+(1 row)
+
+-- Equality condition with constant on one distribution key
+-- Redistribute over Append
+-- Accessing a varchar in the SELECT clause should cause a SIGSEGV
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY, source_system_lead_id
+FROM NON_WS_PHONE_LEADS PL
+LEFT outer JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441;
+ duration_second | dim_program_key | dim_site_key | dim_date_key | source_system_lead_id 
+-----------------+-----------------+--------------+--------------+-----------------------
+             207 |              79 |       999901 |      2455441 | CA6qOEyxOmNJUQC7
+(1 row)
+
+DROP TABLE non_ws_phone_leads;
+DROP TABLE dim_phone_numbers;
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+-- Equality condition with a constant expression on one distribution key
+drop table if exists foo_p;
+NOTICE:  table "foo_p" does not exist, skipping
+drop table if exists bar;
+NOTICE:  table "bar" does not exist, skipping
+create table foo_p( a int, b int, k int, t text, p int) distributed by (a,b) partition by range(p) ( start(0) end(10) every (2), default partition other);
+create table bar( a int, b int, k int, t text, p int) distributed by (a);
+insert into foo_p select i, i % 10, i , i || 'SOME NUMBER SOME NUMBER', i % 10 from generate_series(1, 1000) i;
+insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 100) i;
+insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 10000) i;
+insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 10000) i;
+analyze foo_p;
+analyze bar;
+set optimizer_segments = 3;
+set optimizer_nestloop_factor = 1.0;
+explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1];
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Hash Right Join  (cost=0.00..863.16 rows=2237 width=30)
+   Hash Cond: (bar.k = foo_p_1_prt_2.a)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.50 rows=2237 width=4)
+         ->  Seq Scan on bar  (cost=0.00..431.47 rows=746 width=4)
+               Filter: (k = 1)
+   ->  Hash  (cost=431.04..431.04 rows=1 width=34)
+         ->  Gather Motion 3:1  (slice2; segments: 3)  (cost=0.00..431.04 rows=1 width=34)
+               ->  Append  (cost=0.00..431.04 rows=1 width=34)
+                     ->  Seq Scan on foo_p_1_prt_2  (cost=0.00..431.04 rows=1 width=34)
+                           Filter: ((NOT (t IS NULL)) AND (a = 1))
+                     ->  Seq Scan on foo_p_1_prt_3  (cost=0.00..431.04 rows=1 width=34)
+                           Filter: ((NOT (t IS NULL)) AND (a = 1))
+                     ->  Seq Scan on foo_p_1_prt_4  (cost=0.00..431.04 rows=1 width=34)
+                           Filter: ((NOT (t IS NULL)) AND (a = 1))
+                     ->  Seq Scan on foo_p_1_prt_5  (cost=0.00..431.04 rows=1 width=34)
+                           Filter: ((NOT (t IS NULL)) AND (a = 1))
+                     ->  Seq Scan on foo_p_1_prt_6  (cost=0.00..431.04 rows=1 width=34)
+                           Filter: ((NOT (t IS NULL)) AND (a = 1))
+                     ->  Seq Scan on foo_p_1_prt_other  (cost=0.00..431.04 rows=1 width=34)
+                           Filter: ((NOT (t IS NULL)) AND (a = 1))
+ Optimizer: GPORCA
+(21 rows)
+
+reset optimizer_segments;
+drop table if exists foo_p;
+drop table if exists bar;
+-- MPP-18457, MPP-18415 end
+drop table if exists pnx;
+NOTICE:  table "pnx" does not exist, skipping
+create table pnx 
+    (x int , y text)
+    distributed randomly
+    partition by list (y)
+        ( 
+            partition a values ('x1', 'x2'),
+            partition c values ('x3', 'x4')
+        );
+insert into pnx values
+    (1,'x1'),
+    (2,'x2'),
+    (3,'x3'), 
+    (4,'x4');
+select tableoid::regclass, * 
+from pnx;
+  tableoid   | x | y  
+-------------+---+----
+ pnx_1_prt_a | 1 | x1
+ pnx_1_prt_c | 3 | x3
+ pnx_1_prt_a | 2 | x2
+ pnx_1_prt_c | 4 | x4
+(4 rows)
+
+alter table pnx
+    split partition a at ('x1')
+    into (partition b, partition c);
+ERROR:  relation "pnx_1_prt_c" already exists
+select tableoid::regclass, * 
+from pnx;
+  tableoid   | x | y  
+-------------+---+----
+ pnx_1_prt_a | 1 | x1
+ pnx_1_prt_c | 3 | x3
+ pnx_1_prt_a | 2 | x2
+ pnx_1_prt_c | 4 | x4
+(4 rows)
+
+select tableoid::regclass, *
+from pnx
+where y = 'x1';
+  tableoid   | x | y  
+-------------+---+----
+ pnx_1_prt_a | 1 | x1
+(1 row)
+
+select tableoid::regclass, *
+from pnx
+where x = 1;
+  tableoid   | x | y  
+-------------+---+----
+ pnx_1_prt_a | 1 | x1
+(1 row)
+
+drop table if exists pxn;
+NOTICE:  table "pxn" does not exist, skipping
+create table pxn 
+    (x int , y text)
+    distributed randomly
+    partition by list (y)
+        ( 
+            partition a values ('x1', 'x2'),
+            partition c values ('x3', 'x4')
+        );
+insert into pxn values
+    (1,'x1'),
+    (2,'x2'),
+    (3,'x3'), 
+    (4,'x4');
+select tableoid::regclass, * 
+from pxn;
+  tableoid   | x | y  
+-------------+---+----
+ pxn_1_prt_a | 1 | x1
+ pxn_1_prt_c | 3 | x3
+ pxn_1_prt_a | 2 | x2
+ pxn_1_prt_c | 4 | x4
+(4 rows)
+
+alter table pxn
+    split partition a at ('x1')
+    into (partition c, partition b);
+ERROR:  relation "pxn_1_prt_c" already exists
+select tableoid::regclass, * 
+from pxn;
+  tableoid   | x | y  
+-------------+---+----
+ pxn_1_prt_a | 2 | x2
+ pxn_1_prt_c | 4 | x4
+ pxn_1_prt_a | 1 | x1
+ pxn_1_prt_c | 3 | x3
+(4 rows)
+
+select tableoid::regclass, *
+from pxn
+where y = 'x2';
+  tableoid   | x | y  
+-------------+---+----
+ pxn_1_prt_a | 2 | x2
+(1 row)
+
+select tableoid::regclass, *
+from pxn
+where x = 2;
+  tableoid   | x | y  
+-------------+---+----
+ pxn_1_prt_a | 2 | x2
+(1 row)
+
+drop table if exists pxn;
+create table pxn 
+    (x int , y int)
+    distributed randomly
+    partition by range (y)
+        ( 
+            partition a start (0) end (10),
+            partition c start (11) end (20)
+        );
+insert into pxn values
+    (4,4),
+    (9,9),
+    (14,14), 
+    (19,19);
+select tableoid::regclass, * 
+from pxn;
+  tableoid   | x  | y  
+-------------+----+----
+ pxn_1_prt_a |  4 |  4
+ pxn_1_prt_c | 14 | 14
+ pxn_1_prt_a |  9 |  9
+ pxn_1_prt_c | 19 | 19
+(4 rows)
+
+alter table pxn
+    split partition a at (5)
+    into (partition b, partition c);
+ERROR:  relation "pxn_1_prt_c" already exists
+select tableoid::regclass, * 
+from pxn;
+  tableoid   | x  | y  
+-------------+----+----
+ pxn_1_prt_a |  9 |  9
+ pxn_1_prt_c | 19 | 19
+ pxn_1_prt_a |  4 |  4
+ pxn_1_prt_c | 14 | 14
+(4 rows)
+
+select tableoid::regclass, *
+from pxn
+where y = 4;
+  tableoid   | x | y 
+-------------+---+---
+ pxn_1_prt_a | 4 | 4
+(1 row)
+
+select tableoid::regclass, *
+from pxn
+where x = 4;
+  tableoid   | x | y 
+-------------+---+---
+ pxn_1_prt_a | 4 | 4
+(1 row)
+
+drop table if exists pxn;
+create table pxn 
+    (x int , y int)
+    distributed randomly
+    partition by range (y)
+        ( 
+            partition a start (0) end (10),
+            partition c start (11) end (20)
+        );
+insert into pxn values
+    (4,4),
+    (9,9),
+    (14,14), 
+    (19,19);
+select tableoid::regclass, * 
+from pxn;
+  tableoid   | x  | y  
+-------------+----+----
+ pxn_1_prt_a |  4 |  4
+ pxn_1_prt_c | 14 | 14
+ pxn_1_prt_a |  9 |  9
+ pxn_1_prt_c | 19 | 19
+(4 rows)
+
+alter table pxn
+    split partition a at (5)
+    into (partition c, partition b);
+ERROR:  relation "pxn_1_prt_c" already exists
+select tableoid::regclass, * 
+from pxn;
+  tableoid   | x  | y  
+-------------+----+----
+ pxn_1_prt_a |  9 |  9
+ pxn_1_prt_c | 19 | 19
+ pxn_1_prt_a |  4 |  4
+ pxn_1_prt_c | 14 | 14
+(4 rows)
+
+select tableoid::regclass, *
+from pxn
+where y = 9;
+  tableoid   | x | y 
+-------------+---+---
+ pxn_1_prt_a | 9 | 9
+(1 row)
+
+select tableoid::regclass, *
+from pxn
+where x = 9;
+  tableoid   | x | y 
+-------------+---+---
+ pxn_1_prt_a | 9 | 9
+(1 row)
+
+-- MPP-18359 end
+-- MPP-19105
+-- Base partitions with trailing dropped columns
+create table parttest_t (
+	a int,
+	b int,
+	c char,
+	d varchar(50)
+) distributed by (c) 
+partition by range (a) 
+( 
+	partition p1 start(1) end(5),
+	partition p2 start(5)
+);
+-- Drop column
+alter table parttest_t drop column d;
+-- Alter table split partition
+alter table parttest_t split partition for(1) at (2) into (partition p11, partition p22);
+insert into  parttest_t values(1,2,'a');
+select * from parttest_t;
+ a | b | c 
+---+---+---
+ 1 | 2 | a
+(1 row)
+
+-- END MPP-19105
+reset optimizer_nestloop_factor;
+-- Sub-partition insertion with checking if the user provided correct leaf part
+create table part_tab ( i int, j int) distributed by (i) partition by range(j) (start(0) end(10) every(2));
+-- Wrong part
+insert into part_tab_1_prt_1 values(5,5);
+ERROR:  new row for relation "part_tab_1_prt_1" violates partition constraint
+DETAIL:  Failing row contains (5, 5).
+select * from part_tab;
+ i | j 
+---+---
+(0 rows)
+
+select * from part_tab_1_prt_1;
+ i | j 
+---+---
+(0 rows)
+
+insert into part_tab_1_prt_2 values(5,5);
+ERROR:  new row for relation "part_tab_1_prt_2" violates partition constraint
+DETAIL:  Failing row contains (5, 5).
+select * from part_tab;
+ i | j 
+---+---
+(0 rows)
+
+select * from part_tab_1_prt_2;
+ i | j 
+---+---
+(0 rows)
+
+-- Right part
+insert into part_tab_1_prt_3 values(5,5);
+analyze part_tab;
+select * from part_tab;
+ i | j 
+---+---
+ 5 | 5
+(1 row)
+
+select * from part_tab_1_prt_3;
+ i | j 
+---+---
+ 5 | 5
+(1 row)
+
+-- Root part
+insert into part_tab values(5,5);
+select * from part_tab;
+ i | j 
+---+---
+ 5 | 5
+ 5 | 5
+(2 rows)
+
+drop table if exists input1;
+NOTICE:  table "input1" does not exist, skipping
+create table input1 (x int, y int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'x' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into input1 select i, i from (select generate_series(1,10) as i) as t;
+drop table if exists input2;
+NOTICE:  table "input2" does not exist, skipping
+create table input2 (x int, y int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'x' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into input2 select i, i from (select generate_series(1,10) as i) as t;
+-- Multiple range table entries in the plan
+insert into part_tab_1_prt_1 select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i2.y = 5;
+ERROR:  new row for relation "part_tab_1_prt_1" violates partition constraint
+DETAIL:  Failing row contains (5, 5).
+analyze part_tab;
+select * from part_tab;
+ i | j 
+---+---
+ 5 | 5
+ 5 | 5
+(2 rows)
+
+select * from part_tab_1_prt_1;
+ i | j 
+---+---
+(0 rows)
+
+insert into part_tab_1_prt_2 select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i2.y = 5;
+ERROR:  new row for relation "part_tab_1_prt_2" violates partition constraint
+DETAIL:  Failing row contains (5, 5).
+select * from part_tab;
+ i | j 
+---+---
+ 5 | 5
+ 5 | 5
+(2 rows)
+
+select * from part_tab_1_prt_2;
+ i | j 
+---+---
+(0 rows)
+
+-- Right part
+insert into part_tab_1_prt_3 select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i1.x between 4 and 5;
+select * from part_tab;
+ i | j 
+---+---
+ 4 | 4
+ 5 | 5
+ 5 | 5
+ 5 | 5
+(4 rows)
+
+select * from part_tab_1_prt_3;
+ i | j 
+---+---
+ 4 | 4
+ 5 | 5
+ 5 | 5
+ 5 | 5
+(4 rows)
+
+-- Root part but no matching part for i2.y == 10
+insert into part_tab select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x;
+ERROR:  no partition of relation "part_tab" found for row
+DETAIL:  Partition key of the failing row contains (j) = (10).
+select * from part_tab;
+ i | j 
+---+---
+ 5 | 5
+ 5 | 5
+ 5 | 5
+ 4 | 4
+(4 rows)
+
+-- Root part
+insert into part_tab select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i2.y < 10;
+select * from part_tab;
+ i | j 
+---+---
+ 1 | 1
+ 2 | 2
+ 3 | 3
+ 5 | 5
+ 5 | 5
+ 4 | 4
+ 5 | 5
+ 4 | 4
+ 5 | 5
+ 6 | 6
+ 7 | 7
+ 8 | 8
+ 9 | 9
+(13 rows)
+
+-- Multi-level partitioning
+create table deep_part ( i int, j int, k int, s char(5)) 
+distributed by (i) 
+partition by list(s)
+subpartition by range (j) subpartition template (start(1)  end(10) every(2))
+subpartition by range (k) subpartition template (start(1)  end(10) every(2))
+(partition female values('F'), partition male values('M'))
+;
+-- Intermediate partition insert is allowed
+insert into deep_part_1_prt_male_2_prt_2 values(1,3,1,'M');
+-- but only if it's the right partition.
+insert into deep_part_1_prt_male_2_prt_2 values(1,1,1,'M');
+ERROR:  new row for relation "deep_part_1_prt_male_2_prt_2" violates partition constraint
+DETAIL:  Failing row contains (1, 1, 1, M    ).
+-- Wrong sub-partition (inserting a female value in male partition)
+insert into deep_part_1_prt_male_2_prt_2_3_prt_2 values (1, 1, 1, 'F');
+ERROR:  new row for relation "deep_part_1_prt_male_2_prt_2_3_prt_2" violates partition constraint
+DETAIL:  Failing row contains (1, 1, 1, F    ).
+select * from deep_part;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 3 | 1 | M    
+(1 row)
+
+-- Correct leaf part
+insert into deep_part_1_prt_male_2_prt_1_3_prt_1 values (1, 1, 1, 'M');
+analyze deep_part;
+select * from deep_part;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | M    
+ 1 | 3 | 1 | M    
+(2 rows)
+
+select * from deep_part_1_prt_male_2_prt_1_3_prt_1;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | M    
+(1 row)
+
+-- Root part of a multi-level partitioned table
+insert into deep_part values (1, 1, 1, 'M');
+select * from deep_part;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | M    
+ 1 | 1 | 1 | M    
+ 1 | 3 | 1 | M    
+(3 rows)
+
+select * from deep_part_1_prt_male_2_prt_1_3_prt_1;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | M    
+ 1 | 1 | 1 | M    
+(2 rows)
+
+insert into deep_part values (1, 1, 1, 'F');
+select * from deep_part;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | F    
+ 1 | 1 | 1 | M    
+ 1 | 1 | 1 | M    
+ 1 | 3 | 1 | M    
+(4 rows)
+
+select * from deep_part_1_prt_female_2_prt_1_3_prt_1;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | F    
+(1 row)
+
+insert into deep_part values (5, 5, 5, 'M');
+select * from deep_part;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | F    
+ 1 | 1 | 1 | M    
+ 1 | 1 | 1 | M    
+ 1 | 3 | 1 | M    
+ 5 | 5 | 5 | M    
+(5 rows)
+
+select * from deep_part_1_prt_male_2_prt_3_3_prt_3;
+ i | j | k |   s   
+---+---+---+-------
+ 5 | 5 | 5 | M    
+(1 row)
+
+insert into deep_part values (9, 9, 9, 'F');
+select * from deep_part;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | F    
+ 9 | 9 | 9 | F    
+ 1 | 1 | 1 | M    
+ 1 | 1 | 1 | M    
+ 1 | 3 | 1 | M    
+ 5 | 5 | 5 | M    
+(6 rows)
+
+select * from deep_part_1_prt_female_2_prt_5_3_prt_5;
+ i | j | k |   s   
+---+---+---+-------
+ 9 | 9 | 9 | F    
+(1 row)
+
+-- Out of range partition
+insert into deep_part values (9, 9, 10, 'F');
+ERROR:  no partition of relation "deep_part_1_prt_female_2_prt_5" found for row
+DETAIL:  Partition key of the failing row contains (k) = (10).
+select * from deep_part;
+ i | j | k |   s   
+---+---+---+-------
+ 1 | 1 | 1 | F    
+ 9 | 9 | 9 | F    
+ 1 | 1 | 1 | M    
+ 1 | 1 | 1 | M    
+ 1 | 3 | 1 | M    
+ 5 | 5 | 5 | M    
+(6 rows)
+
+drop table input2;
+drop table input1;
+-- Avoid TupleDesc leak when COPY partition table from files
+-- This also covers the bug reported in MPP-9548 where insertion
+-- into a dropped/added column yielded incorrect results
+drop table if exists pt_td_leak;
+NOTICE:  table "pt_td_leak" does not exist, skipping
+CREATE TABLE pt_td_leak
+(
+col1 int,
+col2 int,
+col3 int
+)
+distributed by (col1)
+partition by range(col2)
+(
+    partition part1 start(1) end(5),
+    partition part2 start(5) end(10)
+);
+insert into pt_td_leak select i,i,i from generate_series(1,9) i;
+copy pt_td_leak to '/tmp/pt_td_leak.out' csv;
+alter table pt_td_leak drop column col3;
+alter table pt_td_leak add column col3 int default 7;
+drop table if exists pt_td_leak_exchange;
+NOTICE:  table "pt_td_leak_exchange" does not exist, skipping
+CREATE TABLE pt_td_leak_exchange ( col1 int, col2 int, col3 int) distributed by (col1);
+alter table pt_td_leak exchange partition part2 with table pt_td_leak_exchange;
+insert into pt_td_leak values(1,8,1);
+copy pt_td_leak from '/tmp/pt_td_leak.out' with delimiter ',';
+select * from pt_td_leak where col1 = 5;
+ col1 | col2 | col3 
+------+------+------
+    5 |    5 |    5
+(1 row)
+
+-- Check that data inserted into dropped/added column is correct
+select * from pt_td_leak where col3 = 1;
+ col1 | col2 | col3 
+------+------+------
+    1 |    1 |    1
+    1 |    8 |    1
+(2 rows)
+
+drop table pt_td_leak;
+drop table pt_td_leak_exchange;
+--
+-- Test COPY, when distribution keys have different attribute numbers,
+-- because of dropped columns
+--
+CREATE TABLE pt_dropped_col_distkey (i int, to_be_dropped text, t text)
+DISTRIBUTED BY (t) PARTITION BY RANGE (i) (START (1) END(10) EVERY (5));
+INSERT INTO pt_dropped_col_distkey SELECT g, 'dropped' || g, 'before drop ' || g FROM generate_series(1, 7) g;
+ALTER TABLE pt_dropped_col_distkey DROP COLUMN to_be_dropped;
+-- This new partition won't have the dropped column. Because the distribution
+-- key was after the dropped column, the attribute number of the distribution
+-- key column will be different in this partition and the parent.
+ALTER TABLE pt_dropped_col_distkey ADD PARTITION pt_dropped_col_distkey_new_part START (10) END (100);
+INSERT INTO pt_dropped_col_distkey SELECT g, 'after drop ' || g FROM generate_series(8, 15) g;
+SELECT * FROM pt_dropped_col_distkey ORDER BY i;
+ i  |       t       
+----+---------------
+  1 | before drop 1
+  2 | before drop 2
+  3 | before drop 3
+  4 | before drop 4
+  5 | before drop 5
+  6 | before drop 6
+  7 | before drop 7
+  8 | after drop 8
+  9 | after drop 9
+ 10 | after drop 10
+ 11 | after drop 11
+ 12 | after drop 12
+ 13 | after drop 13
+ 14 | after drop 14
+ 15 | after drop 15
+(15 rows)
+
+COPY pt_dropped_col_distkey TO '/tmp/pt_dropped_col_distkey.out';
+DELETE FROM pt_dropped_col_distkey;
+COPY pt_dropped_col_distkey FROM '/tmp/pt_dropped_col_distkey.out';
+SELECT * FROM pt_dropped_col_distkey ORDER BY i;
+ i  |       t       
+----+---------------
+  1 | before drop 1
+  2 | before drop 2
+  3 | before drop 3
+  4 | before drop 4
+  5 | before drop 5
+  6 | before drop 6
+  7 | before drop 7
+  8 | after drop 8
+  9 | after drop 9
+ 10 | after drop 10
+ 11 | after drop 11
+ 12 | after drop 12
+ 13 | after drop 13
+ 14 | after drop 14
+ 15 | after drop 15
+(15 rows)
+
+-- don't drop the table, so that we have a partitioned table like this still
+-- in the database, when we test pg_upgrade later.
+--
+-- Test split default partition while per tuple memory context is reset
+--
+drop table if exists test_split_part cascade;
+NOTICE:  table "test_split_part" does not exist, skipping
+CREATE TABLE test_split_part ( log_id int NOT NULL, f_array int[] NOT NULL)
+DISTRIBUTED BY (log_id)
+PARTITION BY RANGE(log_id)
+(
+    START (1::int) END (100::int) EVERY (5) WITH (appendonly=false),
+    PARTITION "Old" START (101::int) END (201::int) WITH (appendonly=false),
+    DEFAULT PARTITION other_log_ids  WITH (appendonly=false)
+);
+insert into test_split_part (log_id , f_array) select id, '{10}' from generate_series(1,1000) id;
+ALTER TABLE test_split_part SPLIT DEFAULT PARTITION START (201) INCLUSIVE END (301) EXCLUSIVE INTO (PARTITION "New", DEFAULT PARTITION);
+-- In GPDB 6 and below, an automatic array type was only created for the root
+-- partition. Nowadays we rely on upstream partitioning code, which creates
+-- an array type for all partition.
+select typname, typtype, typcategory from pg_type where typname like '%test_split_part%' and typcategory = 'A';
+               typname                | typtype | typcategory 
+--------------------------------------+---------+-------------
+ _test_split_part                     | b       | A
+ _test_split_part_1_prt_2             | b       | A
+ _test_split_part_1_prt_3             | b       | A
+ _test_split_part_1_prt_4             | b       | A
+ _test_split_part_1_prt_5             | b       | A
+ _test_split_part_1_prt_6             | b       | A
+ _test_split_part_1_prt_7             | b       | A
+ _test_split_part_1_prt_8             | b       | A
+ _test_split_part_1_prt_9             | b       | A
+ _test_split_part_1_prt_10            | b       | A
+ _test_split_part_1_prt_11            | b       | A
+ _test_split_part_1_prt_12            | b       | A
+ _test_split_part_1_prt_13            | b       | A
+ _test_split_part_1_prt_14            | b       | A
+ _test_split_part_1_prt_15            | b       | A
+ _test_split_part_1_prt_16            | b       | A
+ _test_split_part_1_prt_17            | b       | A
+ _test_split_part_1_prt_18            | b       | A
+ _test_split_part_1_prt_19            | b       | A
+ _test_split_part_1_prt_20            | b       | A
+ _test_split_part_1_prt_21            | b       | A
+ _test_split_part_1_prt_Old           | b       | A
+ _test_split_part_1_prt_New           | b       | A
+ _test_split_part_1_prt_other_log_ids | b       | A
+(24 rows)
+
+select array_agg(test_split_part) from test_split_part where log_id = 500;
+   array_agg    
+----------------
+ {"(500,{10})"}
+(1 row)
+
+select array_agg(test_split_part_1_prt_other_log_ids) from test_split_part_1_prt_other_log_ids where log_id = 500;
+   array_agg    
+----------------
+ {"(500,{10})"}
+(1 row)
+
+-- Originally reported in MPP-7232
+create table mpp7232a (a int, b int) distributed by (a) partition by range (b) (start (1) end (3) every (1));
+\d+ mpp7232a
+                           Partitioned table "public.mpp7232a"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp7232a_1_prt_1 FOR VALUES FROM (1) TO (2),
+            mpp7232a_1_prt_2 FOR VALUES FROM (2) TO (3)
+Distributed by: (a)
+
+alter table mpp7232a rename partition for (1) to alpha;
+alter table mpp7232a rename partition for (2) to bravo;
+\d+ mpp7232a
+                           Partitioned table "public.mpp7232a"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp7232a_1_prt_alpha FOR VALUES FROM (1) TO (2),
+            mpp7232a_1_prt_bravo FOR VALUES FROM (2) TO (3)
+Distributed by: (a)
+
+create table mpp7232b (a int, b int) distributed by (a) partition by range (b) (partition alpha start (1) end (3) every (1));
+alter table mpp7232b rename partition for (1) to foo;
+\d+ mpp7232b
+                           Partitioned table "public.mpp7232b"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+ b      | integer |           |          |         | plain   |              | 
+Partition key: RANGE (b)
+Partitions: mpp7232b_1_prt_alpha_2 FOR VALUES FROM (2) TO (3),
+            mpp7232b_1_prt_foo FOR VALUES FROM (1) TO (2)
+Distributed by: (a)
+
+-- Test .. WITH (tablename = <foo> ..) syntax.
+create table mpp17740 (a integer, b integer, e date) with (appendonly = true, orientation = column)
+distributed by (a)
+partition by range(e)
+(
+    partition mpp17740_20120523 start ('2012-05-23'::date) inclusive end ('2012-05-24'::date) exclusive with (tablename = 'mpp17740_20120523', appendonly = true),
+    partition mpp17740_20120524 start ('2012-05-24'::date) inclusive end ('2012-05-25'::date) exclusive with (tablename = 'mpp17740_20120524', appendonly = true)
+);
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp17740%';
+      relname      |                   pg_get_expr                    
+-------------------+--------------------------------------------------
+ mpp17740          | 
+ mpp17740_20120523 | FOR VALUES FROM ('05-23-2012') TO ('05-24-2012')
+ mpp17740_20120524 | FOR VALUES FROM ('05-24-2012') TO ('05-25-2012')
+(3 rows)
+
+alter table mpp17740 add partition mpp17740_20120520 start ('2012-05-20'::date) inclusive end ('2012-05-21'::date) exclusive with (tablename = 'mpp17740_20120520', appendonly=true);
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp17740%';
+      relname      |                   pg_get_expr                    
+-------------------+--------------------------------------------------
+ mpp17740          | 
+ mpp17740_20120520 | FOR VALUES FROM ('05-20-2012') TO ('05-21-2012')
+ mpp17740_20120523 | FOR VALUES FROM ('05-23-2012') TO ('05-24-2012')
+ mpp17740_20120524 | FOR VALUES FROM ('05-24-2012') TO ('05-25-2012')
+(4 rows)
+
+-- Test mix of add and drop various column before split, and exchange partition at the end
+create table sales (pkid serial, option1 int, option2 int, option3 int, constraint partable_pkey primary key(pkid, option3))
+distributed by (pkid) partition by range (option3)
+(
+	partition aa start(1) end(100),
+	partition bb start(101) end(200),
+	partition cc start(201) end (300)
+);
+-- should error out since no subpartition in sales.
+alter table sales add partition dd start(301) end(300)
+	( subpartition opt1_1 VALUES (1),
+	  subpartition opt1_2 VALUES (2) );
+ERROR:  subpartition specification provided but table doesn't have SUBPARTITION BY clause
+LINE 2:  ( subpartition opt1_1 VALUES (1),
+           ^
+-- root partition (and only root) should have relfrozenxid as 0
+select relname, relkind from pg_class where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+          relname           | relkind 
+----------------------------+---------
+ sales                      | p
+ sales                      | p
+ sales_1_prt_2              | p
+ sales_1_prt_3              | p
+ sales_1_prt_4              | p
+ sales_1_prt_5              | p
+ sales_1_prt_outlying_dates | p
+(7 rows)
+
+select gp_segment_id, relname, relkind from gp_dist_random('pg_class') where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+ gp_segment_id |          relname           | relkind 
+---------------+----------------------------+---------
+             0 | sales                      | p
+             0 | sales                      | p
+             0 | sales_1_prt_2              | p
+             0 | sales_1_prt_3              | p
+             0 | sales_1_prt_4              | p
+             0 | sales_1_prt_5              | p
+             0 | sales_1_prt_outlying_dates | p
+             1 | sales                      | p
+             1 | sales                      | p
+             1 | sales_1_prt_2              | p
+             1 | sales_1_prt_3              | p
+             1 | sales_1_prt_4              | p
+             1 | sales_1_prt_5              | p
+             1 | sales_1_prt_outlying_dates | p
+             2 | sales                      | p
+             2 | sales                      | p
+             2 | sales_1_prt_2              | p
+             2 | sales_1_prt_3              | p
+             2 | sales_1_prt_4              | p
+             2 | sales_1_prt_5              | p
+             2 | sales_1_prt_outlying_dates | p
+(21 rows)
+
+alter table sales add column tax float;
+-- root partition (and only root) continues to have relfrozenxid as 0
+select relname, relkind from pg_class where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+          relname           | relkind 
+----------------------------+---------
+ sales                      | p
+ sales                      | p
+ sales_1_prt_2              | p
+ sales_1_prt_3              | p
+ sales_1_prt_4              | p
+ sales_1_prt_5              | p
+ sales_1_prt_outlying_dates | p
+(7 rows)
+
+select gp_segment_id, relname, relkind from gp_dist_random('pg_class') where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+ gp_segment_id |          relname           | relkind 
+---------------+----------------------------+---------
+             0 | sales                      | p
+             0 | sales                      | p
+             0 | sales_1_prt_2              | p
+             0 | sales_1_prt_3              | p
+             0 | sales_1_prt_4              | p
+             0 | sales_1_prt_5              | p
+             0 | sales_1_prt_outlying_dates | p
+             1 | sales                      | p
+             1 | sales                      | p
+             1 | sales_1_prt_2              | p
+             1 | sales_1_prt_3              | p
+             1 | sales_1_prt_4              | p
+             1 | sales_1_prt_5              | p
+             1 | sales_1_prt_outlying_dates | p
+             2 | sales                      | p
+             2 | sales                      | p
+             2 | sales_1_prt_2              | p
+             2 | sales_1_prt_3              | p
+             2 | sales_1_prt_4              | p
+             2 | sales_1_prt_5              | p
+             2 | sales_1_prt_outlying_dates | p
+(21 rows)
+
+alter table sales drop column tax;
+create table newpart(like sales);
+alter table newpart add constraint newpart_pkey primary key(pkid, option3);
+alter table sales split partition for(1) at (50) into (partition aa1, partition aa2);
+select table_schema, table_name, constraint_name, constraint_type
+	from information_schema.table_constraints
+	where table_name in ('sales', 'newpart')
+	and constraint_name in ('partable_pkey', 'newpart_pkey')
+	order by table_name desc;
+ table_schema | table_name | constraint_name | constraint_type 
+--------------+------------+-----------------+-----------------
+ public       | sales      | partable_pkey   | PRIMARY KEY
+ public       | newpart    | newpart_pkey    | PRIMARY KEY
+(2 rows)
+
+alter table sales exchange partition for (101) with table newpart;
+select * from sales order by pkid;
+ pkid | option1 | option2 | option3 
+------+---------+---------+---------
+(0 rows)
+
+-- Create exchange table before drop column, make sure the consistency check still exist
+create table newpart2(like sales);
+alter table sales drop column option2;
+alter table sales exchange partition for (101) with table newpart2;
+ERROR:  table "newpart2" contains column "option2" not found in parent "sales"
+DETAIL:  The new partition may contain only the columns present in parent.
+select * from sales order by pkid;
+ pkid | option1 | option3 
+------+---------+---------
+(0 rows)
+
+drop table sales cascade;
+NOTICE:  drop cascades to default value for column pkid of table newpart
+-- Exchage partition table with a table having dropped column
+create table exchange_part(a int, b int) partition by range(b) (start (0) end (10) every (5));
+create table exchange1(a int, c int, b int);
+alter table exchange1 drop column c;
+alter table exchange_part exchange partition for (1) with table exchange1;
+copy exchange_part from STDIN DELIMITER as '|';
+select * from exchange_part;
+  a   | b 
+------+---
+ 9797 | 3
+ 9799 | 4
+ 9801 | 5
+ 9836 | 5
+ 9802 | 6
+ 9840 | 6
+ 9803 | 7
+ 9822 | 7
+ 9806 | 8
+ 9824 | 8
+ 9807 | 9
+ 9794 | 1
+ 9808 | 1
+ 9810 | 2
+ 9828 | 2
+ 9831 | 3
+ 9817 | 5
+ 9818 | 6
+ 9843 | 7
+ 9844 | 8
+ 9825 | 9
+ 9827 | 1
+ 9795 | 2
+ 9814 | 3
+ 9815 | 4
+ 9832 | 4
+(26 rows)
+
+drop table exchange_part;
+drop table exchange1;
+-- Ensure that new partitions get the correct attributes (MPP17110)
+CREATE TABLE pt_tab_encode (a int, b text)
+with (appendonly=true, orientation=column, compresstype=zlib, compresslevel=1)
+distributed by (a)
+partition by list(b) (partition s_abc values ('abc') with (appendonly=true, orientation=column, compresstype=zlib, compresslevel=1));
+alter table pt_tab_encode add partition "s_xyz" values ('xyz') WITH (appendonly=true, orientation=column, compresstype=zlib, compresslevel=1);
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'pt_tab_encode%';
+          relname          |      pg_get_expr      
+---------------------------+-----------------------
+ pt_tab_encode             | 
+ pt_tab_encode_1_prt_s_abc | FOR VALUES IN ('abc')
+ pt_tab_encode_1_prt_s_xyz | FOR VALUES IN ('xyz')
+(3 rows)
+
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from pg_attribute_encoding where attrelid = 'pt_tab_encode_1_prt_s_abc'::regclass;
+ gp_segment_id |         attrelid          | attnum | filenum |                     attoptions                      
+---------------+---------------------------+--------+---------+-----------------------------------------------------
+            -1 | pt_tab_encode_1_prt_s_abc |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+            -1 | pt_tab_encode_1_prt_s_abc |      2 |       2 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+(2 rows)
+
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from gp_dist_random('pg_attribute_encoding') where attrelid = 'pt_tab_encode_1_prt_s_abc'::regclass order by 1,3 limit 5;
+ gp_segment_id |         attrelid          | attnum | filenum |                     attoptions                      
+---------------+---------------------------+--------+---------+-----------------------------------------------------
+             0 | pt_tab_encode_1_prt_s_abc |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             0 | pt_tab_encode_1_prt_s_abc |      2 |       2 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             1 | pt_tab_encode_1_prt_s_abc |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             1 | pt_tab_encode_1_prt_s_abc |      2 |       2 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             2 | pt_tab_encode_1_prt_s_abc |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+(5 rows)
+
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from pg_attribute_encoding where attrelid = 'pt_tab_encode_1_prt_s_xyz'::regclass;
+ gp_segment_id |         attrelid          | attnum | filenum |                     attoptions                      
+---------------+---------------------------+--------+---------+-----------------------------------------------------
+            -1 | pt_tab_encode_1_prt_s_xyz |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+            -1 | pt_tab_encode_1_prt_s_xyz |      2 |       2 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+(2 rows)
+
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from gp_dist_random('pg_attribute_encoding') where attrelid = 'pt_tab_encode_1_prt_s_xyz'::regclass order by 1,3 limit 5;
+ gp_segment_id |         attrelid          | attnum | filenum |                     attoptions                      
+---------------+---------------------------+--------+---------+-----------------------------------------------------
+             0 | pt_tab_encode_1_prt_s_xyz |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             0 | pt_tab_encode_1_prt_s_xyz |      2 |       2 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             1 | pt_tab_encode_1_prt_s_xyz |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             1 | pt_tab_encode_1_prt_s_xyz |      2 |       2 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+             2 | pt_tab_encode_1_prt_s_xyz |      1 |       1 | {compresstype=zlib,compresslevel=1,blocksize=32768}
+(5 rows)
+
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid = 'pt_tab_encode_1_prt_s_abc'::regclass;
+            oid            | relkind |  amname   |             reloptions              
+---------------------------+---------+-----------+-------------------------------------
+ pt_tab_encode_1_prt_s_abc | r       | ao_column | {compresstype=zlib,compresslevel=1}
+(1 row)
+
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid = 'pt_tab_encode_1_prt_s_xyz'::regclass;
+            oid            | relkind |  amname   |             reloptions              
+---------------------------+---------+-----------+-------------------------------------
+ pt_tab_encode_1_prt_s_xyz | r       | ao_column | {compresstype=zlib,compresslevel=1}
+(1 row)
+
+-- Ensure that only the correct type of partitions can be added
+create table at_range (a int) partition by range (a) (start(1) end(5));
+create table at_list (i int) partition by list(i) (partition p1 values(1));
+alter table at_list add partition foo2 start(6) end (10);
+ERROR:  invalid boundary specification for LIST partition
+LINE 1: alter table at_list add partition foo2 start(6) end (10);
+                                               ^
+alter table at_range add partition test values(5);
+ERROR:  invalid boundary specification for RANGE partition
+LINE 1: alter table at_range add partition test values(5);
+                                                ^
+-- Ensure array type for the non-partition table is there after partition exchange.
+CREATE TABLE pt_xchg(a int) PARTITION BY RANGE(a) (START(1) END(4) EVERY (2));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table xchg_tab1(a int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE SCHEMA xchg_schema;
+create table xchg_schema.xchg_tab2(a int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+alter table pt_xchg exchange partition for (1) with table xchg_tab1;
+alter table pt_xchg exchange partition for (3) with table xchg_schema.xchg_tab2;
+select a.typowner=b.typowner from pg_type a join pg_type b on true where a.typname = 'xchg_tab1' and b.typname = '_xchg_tab1';
+ ?column? 
+----------
+ t
+(1 row)
+
+select nspname from pg_namespace join pg_type on pg_namespace.oid = pg_type.typnamespace where pg_type.typname = 'xchg_tab1' or pg_type.typname = '_xchg_tab1';
+ nspname 
+---------
+ public
+ public
+(2 rows)
+
+select nspname from pg_namespace join pg_type on pg_namespace.oid = pg_type.typnamespace where pg_type.typname = 'xchg_tab2' or pg_type.typname = '_xchg_tab2';
+   nspname   
+-------------
+ xchg_schema
+ xchg_schema
+(2 rows)
+
+select typname from pg_type where typelem = 'xchg_tab1'::regtype;
+  typname   
+------------
+ _xchg_tab1
+(1 row)
+
+select typname from pg_type where typelem = 'xchg_schema.xchg_tab2'::regtype;
+  typname   
+------------
+ _xchg_tab2
+(1 row)
+
+select typname from pg_type where typarray = '_xchg_tab1'::regtype;
+  typname  
+-----------
+ xchg_tab1
+(1 row)
+
+select typname from pg_type where typarray = 'xchg_schema._xchg_tab2'::regtype;
+  typname  
+-----------
+ xchg_tab2
+(1 row)
+
+alter table pt_xchg exchange partition for (1) with table xchg_tab1;
+select a.typowner=b.typowner from pg_type a join pg_type b on true where a.typname = 'xchg_tab1' and b.typname = '_xchg_tab1';
+ ?column? 
+----------
+ t
+(1 row)
+
+select nspname from pg_namespace join pg_type on pg_namespace.oid = pg_type.typnamespace where pg_type.typname = 'xchg_tab1' or pg_type.typname = '_xchg_tab1';
+ nspname 
+---------
+ public
+ public
+(2 rows)
+
+select typname from pg_type where typelem = 'xchg_tab1'::regtype;
+  typname   
+------------
+ _xchg_tab1
+(1 row)
+
+select typname from pg_type where typarray = '_xchg_tab1'::regtype;
+  typname  
+-----------
+ xchg_tab1
+(1 row)
+
+DROP SCHEMA xchg_schema CASCADE;
+NOTICE:  drop cascades to table xchg_schema.xchg_tab2
+-- Test with an incomplete operator class. Create a custom operator class and
+-- only define equality on it. You can't do much with that.
+--
+-- Before GPDB 7, Cloudberry used to allow creating the table, but you got an
+-- error when inserting to it. Nowadays we rely on PostgreSQL partitioning
+-- code, which rejects it at CREATE TABLE already.
+create type employee_type as (empid int, empname text);
+create function emp_equal(employee_type, employee_type) returns boolean
+  as 'select $1.empid = $2.empid;'
+  language sql
+  immutable
+  returns null on null input;
+create operator = (
+        leftarg = employee_type,
+        rightarg = employee_type,
+        procedure = emp_equal
+);
+create operator class employee_incomplete_op_class default for type employee_type
+  using btree as
+  operator 3 =;
+create table employee_table(timest date, user_id numeric(16,0) not null, tag1 char(5), emp employee_type)
+  distributed by (user_id)
+  partition by list(emp)
+  (partition part1 values('(1, ''foo'')'::employee_type), partition part2 values('(2, ''foo'')'::employee_type));
+ERROR:  operator class "employee_incomplete_op_class" of access method btree is missing support function 1 for type employee_type
+-- Test partition table with ACL.
+-- We grant default SELECT permission to a new user, this new user should be
+-- able to SELECT from any partition table we create later.
+-- (https://github.com/greenplum-db/gpdb/issues/9524)
+DROP TABLE IF EXISTS user_prt_acl_append.t_part_acl;
+DROP SCHEMA IF EXISTS user_prt_acl_append;
+DROP ROLE IF EXISTS user_prt_acl_append;
+CREATE ROLE user_prt_acl_append;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+CREATE SCHEMA schema_part_acl_append;
+GRANT USAGE ON SCHEMA schema_part_acl_append TO user_prt_acl_append;
+ALTER DEFAULT PRIVILEGES IN SCHEMA schema_part_acl_append GRANT SELECT ON TABLES TO user_prt_acl_append;
+CREATE TABLE schema_part_acl_append.t_part_acl (dt date)
+PARTITION BY RANGE (dt)
+(
+    START (date '2019-12-01') INCLUSIVE
+    END (date '2020-02-01') EXCLUSIVE
+    EVERY (INTERVAL '1 month')
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'dt' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO schema_part_acl_append.t_part_acl VALUES (date '2019-12-01'), (date '2020-01-31');
+-- check if parent and child table have same relacl
+SELECT relname FROM pg_class
+WHERE relname LIKE 't_part_acl%'
+  AND relacl = (SELECT relacl FROM pg_class WHERE relname = 't_part_acl');
+      relname       
+--------------------
+ t_part_acl
+ t_part_acl_1_prt_1
+ t_part_acl_1_prt_2
+(3 rows)
+
+-- check if new user can SELECT all data
+SET ROLE user_prt_acl_append;
+SELECT * FROM schema_part_acl_append.t_part_acl;
+     dt     
+------------
+ 12-01-2019
+ 01-31-2020
+(2 rows)
+
+RESET ROLE;
+-- we don't drop the table, schema and role here in order to test upgrade
+--
+-- Github issue: https://github.com/apache/cloudberry/issues/547
+-- Test COPY FROM on partitions tables.
+--
+create table t_issue_547_aoco(a int, b int) partition by range(b) (start(1) end(34) every(1)) using ao_column distributed by (a);
+\copy t_issue_547_aoco from 'data/partition_copy.csv' (format csv);
+analyze t_issue_547_aoco;
+select count(*) from t_issue_547_aoco;
+ count 
+-------
+  1001
+(1 row)
+
+create table t_issue_547_ao(a int, b int) partition by range(b) (start(1) end(34) every(1)) using ao_row distributed by (a);
+\copy t_issue_547_ao from 'data/partition_copy.csv' (format csv);
+analyze t_issue_547_ao;
+select count(*) from t_issue_547_ao;
+ count 
+-------
+  1001
+(1 row)
+
+drop table t_issue_547_aoco;
+drop table t_issue_547_ao;
+-- test on commit behavior used on partition table
+-- test on commit delete rows
+begin;
+create temp table temp_parent (a int) partition by range(a) (start(1) end(10) every(10)) on commit delete rows;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into temp_parent select i from generate_series(1, 5) i;
+select count(*) from temp_parent;
+ count 
+-------
+     5
+(1 row)
+
+commit;
+-- DELETE ROWS will not cascaded to its partitions when we use DELETE ROWS behavior
+select count(*) from temp_parent;
+ count 
+-------
+     5
+(1 row)
+
+drop table temp_parent;
+-- test on commit drop
+begin;
+create temp table temp_parent (a int) partition by range(a) (start(1) end(10) every(1)) on commit drop;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into temp_parent select i from generate_series(1, 5) i;
+select count(*) from pg_class where relname like 'temp_parent_%';
+ count 
+-------
+     9
+(1 row)
+
+commit;
+-- no relations remain in this case.
+select count(*) from pg_class where relname like 'temp_parent_%';
+ count 
+-------
+     0
+(1 row)
+
+-- check ATTACH PARTITION on parent table with different distribution policy
+CREATE EXTENSION IF NOT EXISTS gp_debug_numsegments;
+SELECT gp_debug_set_create_table_default_numsegments(1);
+ gp_debug_set_create_table_default_numsegments 
+-----------------------------------------------
+ 1
+(1 row)
+
+CREATE TABLE expanded_parent(a int, b int) PARTITION BY RANGE(b) (START (0) END (6) EVERY (3));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE expanded_parent2(a int, b int) PARTITION BY RANGE(b) (START (0) END (6) EVERY (3));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE unexpanded_parent(a int, b int) PARTITION BY RANGE(b) (START (0) END (6) EVERY (3));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE unexpanded_attach(a int, b int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE unexpanded_attach2(a int, b int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE expanded_attach(a int, b int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+CREATE TABLE expanded_attach2(a int, b int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+SELECT gp_debug_reset_create_table_default_numsegments();
+ gp_debug_reset_create_table_default_numsegments 
+-------------------------------------------------
+ 
+(1 row)
+
+-- attaching unexpanded partition to expanded table should fail
+ALTER TABLE expanded_parent EXPAND TABLE;
+ALTER TABLE expanded_parent ATTACH PARTITION unexpanded_attach FOR VALUES FROM (6) TO (9);
+ERROR:  distribution policy for "unexpanded_attach" must be the same as that for "expanded_parent"
+-- attaching unexpanded partition to expanded table with partition prepare should fail
+ALTER TABLE expanded_parent2 EXPAND PARTITION PREPARE;
+ALTER TABLE expanded_parent2 ATTACH PARTITION unexpanded_attach2 FOR VALUES FROM (6) TO (9);
+ERROR:  distribution policy for "unexpanded_attach2" must be the same as that for "expanded_parent2"
+-- attaching expanded partition to unexpanded table should fail
+ALTER TABLE expanded_attach EXPAND TABLE;
+ALTER TABLE unexpanded_parent ATTACH PARTITION expanded_attach FOR VALUES FROM (6) TO (9);
+ERROR:  distribution policy for "expanded_attach" must be the same as that for "unexpanded_parent"
+-- attaching expanded partition to expanded table should succeed
+ALTER TABLE expanded_attach2 EXPAND TABLE;
+ALTER TABLE expanded_parent2 ATTACH PARTITION expanded_attach2 FOR VALUES FROM (6) TO (9);
+ALTER TABLE expanded_parent ATTACH PARTITION expanded_attach FOR VALUES FROM (6) TO (9);
+-- cleanup
+DROP TABLE expanded_parent;
+DROP TABLE expanded_parent2;
+DROP TABLE unexpanded_parent;
+DROP TABLE unexpanded_attach;
+DROP TABLE unexpanded_attach2;
+--
+-- Verify inheritance behavior of new partition child using various syntax
+--
+-- set owner for partition root (should be inherited except for ATTACH, EXCHANGE)
+CREATE ROLE part_inherit_role CREATEROLE;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+CREATE ROLE part_inherit_other_role IN ROLE part_inherit_role;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+CREATE ROLE part_inherit_priv_role;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+CREATE ROLE part_inherit_attach_priv_role;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+CREATE ROLE part_inherit_exchange_out_priv_role;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+SET ROLE part_inherit_role;
+CREATE TABLE part_inherit (
+    a int,
+    b int,
+-- non-partition constraint should be inherited except for ATTACH, EXCHANGE
+    CONSTRAINT con1 CHECK (a >= 0)
+)
+PARTITION BY RANGE (a)
+SUBPARTITION BY RANGE (b)
+SUBPARTITION TEMPLATE
+(SUBPARTITION l2_child START(10100) END(10200))
+(DEFAULT PARTITION l1_default,
+       PARTITION l1_child1 START (0) END (100),
+       PARTITION l1_to_split START (100) END (200),
+       PARTITION l1_to_exchange START (200) END (300))
+--AM and reloption should be inherited except for ATTACH, EXCHANGE
+WITH (appendonly = TRUE, compresslevel = 7);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- Set more properties for the root.
+-- index are inherited 
+CREATE INDEX part_inherit_i on part_inherit(a);
+-- privileges are inherited except for ATTACH, EXCHANGE
+GRANT UPDATE ON part_inherit TO part_inherit_priv_role;
+-- triggers are inherited except for subpartitions 
+-- FIXME: In 6X we used to not inherit triggers at all, in 7X we start to inherit
+-- trigger like the upstream, but the subpartitions created from the subpartition 
+-- template still don't inherit the triggers. We should fix that.
+CREATE FUNCTION part_inherit_trig() RETURNS TRIGGER LANGUAGE plpgsql
+  AS $$ BEGIN RETURN NULL; END $$;
+CREATE TRIGGER part_inherit_tg AFTER INSERT ON part_inherit
+  FOR EACH ROW EXECUTE FUNCTION part_inherit_trig();
+-- rules are not inherited
+CREATE RULE part_inherit_rule AS ON UPDATE TO part_inherit DO INSERT INTO part_inherit values(1);
+-- row-level security policies are not inherited
+ALTER TABLE part_inherit ENABLE ROW LEVEL SECURITY;
+-- Check the current status 
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit%' AND 
+        c.relkind NOT IN ('i', 'I');
+                     relname                      |    reloptions     | relkind |   am   | hasindex |       owner       |                                           acl                                            | numchecks | hasrules | hastriggers | rowsecurity 
+--------------------------------------------------+-------------------+---------+--------+----------+-------------------+------------------------------------------------------------------------------------------+-----------+----------+-------------+-------------
+ part_inherit                                     | {compresslevel=7} | p       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | t        | t           | t
+ part_inherit_1_prt_l1_child1                     | {compresslevel=7} | p       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_child1_2_prt_l2_child      | {compresslevel=7} | r       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_default                    | {compresslevel=7} | p       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_default_2_prt_l2_child     | {compresslevel=7} | r       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_exchange                | {compresslevel=7} | p       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_exchange_2_prt_l2_child | {compresslevel=7} | r       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_split                   | {compresslevel=7} | p       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_split_2_prt_l2_child    | {compresslevel=7} | r       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+(9 rows)
+
+-- Now create child partitions in various forms 
+-- set an alternative role
+SET ROLE part_inherit_other_role;
+-- CREATE TABLE PARTITION OF
+CREATE TABLE part_inherit_partof PARTITION OF part_inherit FOR VALUES FROM (300) TO (400);
+NOTICE:  table has parent, setting distribution columns to match parent table
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname = 'part_inherit_partof';
+       relname       |    reloptions     | relkind |   am   | hasindex |          owner          |                                           acl                                            | numchecks | hasrules | hastriggers | rowsecurity 
+---------------------+-------------------+---------+--------+----------+-------------------------+------------------------------------------------------------------------------------------+-----------+----------+-------------+-------------
+ part_inherit_partof | {compresslevel=7} | r       | ao_row | t        | part_inherit_other_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+(1 row)
+
+-- Now create child partitions in various forms 
+-- ATTACH PARTITION
+-- error if the partition-to-be doesn't have the same constraint as the parent.
+CREATE TABLE part_inherit_attach(a int, b int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ALTER TABLE part_inherit ATTACH PARTITION part_inherit_attach FOR VALUES FROM (400) TO (500);
+ERROR:  child table is missing constraint "con1"
+DROP TABLE part_inherit_attach;
+-- good case: have the same constraint as parent. Can have other constraint too.
+CREATE TABLE part_inherit_attach(a int, b int, CONSTRAINT con1 CHECK (a>=0), CONSTRAINT con2 CHECK (b>=0));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- reloptions and AM ('heap' which is different than the future parent) will be kept
+ALTER TABLE part_inherit_attach SET (fillfactor=30);
+-- privilege will be kept
+GRANT UPDATE ON part_inherit_attach TO part_inherit_attach_priv_role;
+-- do the attach
+ALTER TABLE part_inherit ATTACH PARTITION part_inherit_attach FOR VALUES FROM (400) TO (500);
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname = 'part_inherit_attach';
+       relname       |   reloptions    | relkind |  am  | hasindex |          owner          |                                                        acl                                                        | numchecks | hasrules | hastriggers | rowsecurity 
+---------------------+-----------------+---------+------+----------+-------------------------+-------------------------------------------------------------------------------------------------------------------+-----------+----------+-------------+-------------
+ part_inherit_attach | {fillfactor=30} | r       | heap | t        | part_inherit_other_role | {part_inherit_other_role=arwdDxt/part_inherit_other_role,part_inherit_attach_priv_role=w/part_inherit_other_role} |         2 | f        | t           | f
+(1 row)
+
+-- ADD PARTITION
+ALTER TABLE part_inherit ADD PARTITION added START(500) END(600);
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit_1_prt_added%' AND 
+        c.relkind NOT IN ('i', 'I');
+                 relname                 |    reloptions     | relkind |   am   | hasindex |       owner       |                                           acl                                            | numchecks | hasrules | hastriggers | rowsecurity 
+-----------------------------------------+-------------------+---------+--------+----------+-------------------+------------------------------------------------------------------------------------------+-----------+----------+-------------+-------------
+ part_inherit_1_prt_added                | {compresslevel=7} | p       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_added_2_prt_l2_child | {compresslevel=7} | r       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+(2 rows)
+
+-- EXCHANGE PARTITION - same behavior as ATTACH PARTITION
+-- error if the partition-to-be doesn't have the same constraint as the parent.
+CREATE TABLE part_inherit_exchange_out(a int, b int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+ALTER TABLE part_inherit_1_prt_l1_to_exchange EXCHANGE PARTITION l2_child WITH TABLE part_inherit_exchange_out;
+ERROR:  child table is missing constraint "con1"
+DROP TABLE part_inherit_exchange_out;
+-- good case: have the same constraint as parent. Can have other constraint too.
+CREATE TABLE part_inherit_exchange_out(a int, b int, CONSTRAINT con1 CHECK (a>=0), CONSTRAINT con2 CHECK (b>=0));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- reloptions and AM ('heap' which is different than the future parent) will be kept
+ALTER TABLE part_inherit_exchange_out SET (fillfactor=30);
+-- privilege will be kept
+GRANT UPDATE ON part_inherit_exchange_out TO part_inherit_exchange_out_priv_role;
+-- do the exchange
+ALTER TABLE part_inherit_1_prt_l1_to_exchange EXCHANGE PARTITION l2_child WITH TABLE part_inherit_exchange_out;
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE (c.relname LIKE 'part_inherit_1_prt_l1_to_exchange%' OR c.relname = 'part_inherit_exchange_out')
+	AND c.relkind NOT IN ('i', 'I');
+                     relname                      |    reloptions     | relkind |   am   | hasindex |          owner          |                                                           acl                                                           | numchecks | hasrules | hastriggers | rowsecurity 
+--------------------------------------------------+-------------------+---------+--------+----------+-------------------------+-------------------------------------------------------------------------------------------------------------------------+-----------+----------+-------------+-------------
+ part_inherit_1_prt_l1_to_exchange_2_prt_l2_child | {fillfactor=30}   | r       | heap   | t        | part_inherit_other_role | {part_inherit_other_role=arwdDxt/part_inherit_other_role,part_inherit_exchange_out_priv_role=w/part_inherit_other_role} |         2 | f        | t           | f
+ part_inherit_1_prt_l1_to_exchange                | {compresslevel=7} | p       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_exchange_out                        | {compresslevel=7} | r       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+(3 rows)
+
+-- SPLIT PARTITION
+ALTER TABLE part_inherit_1_prt_l1_to_split SPLIT PARTITION l2_child AT (10150) INTO (PARTITION split1, PARTITION split2);
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit_1_prt_l1_to_split%' AND 
+        c.relkind NOT IN ('i', 'I');
+                   relname                   |    reloptions     | relkind |   am   | hasindex |       owner       |                                           acl                                            | numchecks | hasrules | hastriggers | rowsecurity 
+---------------------------------------------+-------------------+---------+--------+----------+-------------------+------------------------------------------------------------------------------------------+-----------+----------+-------------+-------------
+ part_inherit_1_prt_l1_to_split              | {compresslevel=7} | p       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_split_2_prt_split1 | {compresslevel=7} | r       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_split_2_prt_split2 | {compresslevel=7} | r       | ao_row | t        | part_inherit_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role} |         1 | f        | t           | f
+(3 rows)
+
+-- Now print everything for comparison
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit%' AND 
+        c.relkind NOT IN ('i', 'I');
+                     relname                      |    reloptions     | relkind |   am   | hasindex |          owner          |                                                           acl                                                           | numchecks | hasrules | hastriggers | rowsecurity 
+--------------------------------------------------+-------------------+---------+--------+----------+-------------------------+-------------------------------------------------------------------------------------------------------------------------+-----------+----------+-------------+-------------
+ part_inherit_1_prt_l1_to_exchange_2_prt_l2_child | {fillfactor=30}   | r       | heap   | t        | part_inherit_other_role | {part_inherit_other_role=arwdDxt/part_inherit_other_role,part_inherit_exchange_out_priv_role=w/part_inherit_other_role} |         2 | f        | t           | f
+ part_inherit_attach                              | {fillfactor=30}   | r       | heap   | t        | part_inherit_other_role | {part_inherit_other_role=arwdDxt/part_inherit_other_role,part_inherit_attach_priv_role=w/part_inherit_other_role}       |         2 | f        | t           | f
+ part_inherit_partof                              | {compresslevel=7} | r       | ao_row | t        | part_inherit_other_role | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit                                     | {compresslevel=7} | p       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | t        | t           | t
+ part_inherit_1_prt_added                         | {compresslevel=7} | p       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_added_2_prt_l2_child          | {compresslevel=7} | r       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_child1                     | {compresslevel=7} | p       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_child1_2_prt_l2_child      | {compresslevel=7} | r       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_default                    | {compresslevel=7} | p       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_default_2_prt_l2_child     | {compresslevel=7} | r       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_exchange                | {compresslevel=7} | p       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_split                   | {compresslevel=7} | p       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_split_2_prt_split1      | {compresslevel=7} | r       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_1_prt_l1_to_split_2_prt_split2      | {compresslevel=7} | r       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+ part_inherit_exchange_out                        | {compresslevel=7} | r       | ao_row | t        | part_inherit_role       | {part_inherit_role=arwdDxt/part_inherit_role,part_inherit_priv_role=w/part_inherit_role}                                |         1 | f        | t           | f
+(15 rows)
+
+RESET ROLE;
+DROP TABLE part_inherit;
+DROP FUNCTION part_inherit_trig CASCADE;
+DROP TABLE part_inherit_exchange_out;
+DROP ROLE part_inherit_role;
+DROP ROLE part_inherit_other_role;
+DROP ROLE part_inherit_priv_role;
+DROP ROLE part_inherit_attach_priv_role;
+DROP ROLE part_inherit_exchange_out_priv_role;
+--Test cases for data selection from range partitioned tables with predicate on date or timestamp type-------------
+drop table if exists test_rangePartition;
+NOTICE:  table "test_rangepartition" does not exist, skipping
+create table public.test_rangePartition
+(datedday date)
+    WITH (
+        appendonly=false
+        )
+    PARTITION BY RANGE(datedday)
+(
+    PARTITION pn_20221022 START ('2022-10-22'::date) END ('2022-10-23'::date),
+    PARTITION pn_20221023 START ('2022-10-23'::date) END ('2022-10-24'::date),
+    DEFAULT PARTITION pdefault
+    );
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'datedday' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into public.test_rangePartition(datedday)
+select ('2022-10-22'::date)
+union
+select ('2022-10-23'::date);
+--Test case with condition on date and timestamp
+explain (costs off) select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                                                 QUERY PLAN                                                                  
+---------------------------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Partial Aggregate
+               ->  Append
+                     ->  Seq Scan on test_rangepartition_1_prt_pn_20221022
+                           Filter: ((datedday = '10-23-2022'::date) OR (datedday = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+                     ->  Seq Scan on test_rangepartition_1_prt_pn_20221023
+                           Filter: ((datedday = '10-23-2022'::date) OR (datedday = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+ Optimizer: GPORCA
+(9 rows)
+
+select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+    max     
+------------
+ 10-23-2022
+(1 row)
+
+--Test case with condition on date and timestamp
+explain (costs off) select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday='2022-10-22';
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                               QUERY PLAN                                               
+--------------------------------------------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Partial Aggregate
+               ->  Append
+                     ->  Seq Scan on test_rangepartition_1_prt_pn_20221022
+                           Filter: ((datedday = '10-23-2022'::date) OR (datedday = '10-22-2022'::date))
+                     ->  Seq Scan on test_rangepartition_1_prt_pn_20221023
+                           Filter: ((datedday = '10-23-2022'::date) OR (datedday = '10-22-2022'::date))
+ Optimizer: GPORCA
+(9 rows)
+
+select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday='2022-10-22';
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+    max     
+------------
+ 10-23-2022
+(1 row)
+
+--Test case with condition on timestamp and timestamp
+explain (costs off) select max(datedday) from public.test_rangePartition where datedday=('2022-10-23'::date -interval '0 day') or datedday=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                                                                    QUERY PLAN                                                                                    
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Partial Aggregate
+               ->  Append
+                     ->  Seq Scan on test_rangepartition_1_prt_pn_20221022
+                           Filter: ((datedday = 'Sun Oct 23 00:00:00 2022'::timestamp without time zone) OR (datedday = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+                     ->  Seq Scan on test_rangepartition_1_prt_pn_20221023
+                           Filter: ((datedday = 'Sun Oct 23 00:00:00 2022'::timestamp without time zone) OR (datedday = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+ Optimizer: GPORCA
+(9 rows)
+
+select max(datedday) from public.test_rangePartition where datedday=('2022-10-23'::date -interval '0 day') or datedday=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+    max     
+------------
+ 10-23-2022
+(1 row)
+
+--Test case with condition on date and timestamp
+explain (costs off) select datedday from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                                           QUERY PLAN                                                            
+---------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on test_rangepartition_1_prt_pn_20221022
+               Filter: ((datedday = '10-23-2022'::date) OR (datedday = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+         ->  Seq Scan on test_rangepartition_1_prt_pn_20221023
+               Filter: ((datedday = '10-23-2022'::date) OR (datedday = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+ Optimizer: GPORCA
+(7 rows)
+
+select datedday from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_rangepartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+  datedday  
+------------
+ 10-22-2022
+ 10-23-2022
+(2 rows)
+
+drop table test_rangePartition;
+--Test cases for data selection from List partitioned tables with predicate on date or timestamp type-------------
+drop table if exists test_listPartition;
+NOTICE:  table "test_listpartition" does not exist, skipping
+create table test_listPartition (i int, d date)
+    partition by list(d)
+ (partition p1 values('2022-10-22'), partition p2 values('2022-10-23'),
+ default partition pdefault  );
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into test_listPartition values(1,'2022-10-22');
+insert into test_listPartition values(2,'2022-10-23');
+insert into test_listPartition values(3,'2022-10-24');
+--Test case with condition on date and timestamp
+explain (costs off) select max(d) from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Append
+               ->  Seq Scan on test_listpartition_1_prt_p1
+                     Filter: ((d = '10-23-2022'::date) OR (d = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+               ->  Seq Scan on test_listpartition_1_prt_p2
+                     Filter: ((d = '10-23-2022'::date) OR (d = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+ Optimizer: GPORCA
+(8 rows)
+
+select max(d) from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+    max     
+------------
+ 10-23-2022
+(1 row)
+
+--Test case with condition on date and date
+explain (costs off) select max(d) from test_listPartition where d='2022-10-23' or d='2022-10-22';
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Append
+               ->  Seq Scan on test_listpartition_1_prt_p1
+                     Filter: ((d = '10-23-2022'::date) OR (d = '10-22-2022'::date))
+               ->  Seq Scan on test_listpartition_1_prt_p2
+                     Filter: ((d = '10-23-2022'::date) OR (d = '10-22-2022'::date))
+ Optimizer: GPORCA
+(8 rows)
+
+select max(d) from test_listPartition where d='2022-10-23' or d='2022-10-22';
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+    max     
+------------
+ 10-23-2022
+(1 row)
+
+--Test case with condition on timestamp and timestamp
+explain (costs off) select max(d) from test_listPartition where d=('2022-10-23'::date -interval '0 day') or d=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                                                          QUERY PLAN                                                                          
+--------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Append
+               ->  Seq Scan on test_listpartition_1_prt_p1
+                     Filter: ((d = 'Sun Oct 23 00:00:00 2022'::timestamp without time zone) OR (d = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+               ->  Seq Scan on test_listpartition_1_prt_p2
+                     Filter: ((d = 'Sun Oct 23 00:00:00 2022'::timestamp without time zone) OR (d = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+ Optimizer: GPORCA
+(8 rows)
+
+select max(d) from test_listPartition where d=('2022-10-23'::date -interval '0 day') or d=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+    max     
+------------
+ 10-23-2022
+(1 row)
+
+--Test case with condition on timestamp and timestamp
+explain (costs off) select d from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on test_listpartition_1_prt_p1
+               Filter: ((d = '10-23-2022'::date) OR (d = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+         ->  Seq Scan on test_listpartition_1_prt_p2
+               Filter: ((d = '10-23-2022'::date) OR (d = 'Sat Oct 22 00:00:00 2022'::timestamp without time zone))
+ Optimizer: GPORCA
+(7 rows)
+
+select d from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+NOTICE:  One or more columns in the following table(s) do not have statistics: test_listpartition
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+     d      
+------------
+ 10-23-2022
+ 10-22-2022
+(2 rows)
+
+drop table test_listPartition;
+-- test guc gp_max_partition_level
+drop table p3_sales;
+ERROR:  table "p3_sales" does not exist
+set gp_max_partition_level = 2;
+CREATE TABLE p3_sales (id int, year int, month int, day int,
+region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+ SUBPARTITION BY RANGE (month)
+  SUBPARTITION TEMPLATE (
+    START (1) END (3) EVERY (1),
+    DEFAULT SUBPARTITION other_months )
+    SUBPARTITION BY LIST (region)
+      SUBPARTITION TEMPLATE (
+       SUBPARTITION usa VALUES ('usa'),
+       SUBPARTITION europe VALUES ('europe'),
+       DEFAULT SUBPARTITION other_regions )
+( START (2010) END (2012) EVERY (1),
+  DEFAULT PARTITION outlying_years );
+ERROR:  Exceeds maximum configured partitioning level of 2
+set gp_max_partition_level = 3;
+CREATE TABLE p3_sales (id int, year int, month int, day int,
+region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+ SUBPARTITION BY RANGE (month)
+  SUBPARTITION TEMPLATE (
+    START (1) END (3) EVERY (1),
+    DEFAULT SUBPARTITION other_months )
+    SUBPARTITION BY LIST (region)
+      SUBPARTITION TEMPLATE (
+       SUBPARTITION usa VALUES ('usa'),
+       SUBPARTITION europe VALUES ('europe'),
+       DEFAULT SUBPARTITION other_regions )
+( START (2010) END (2012) EVERY (1),
+  DEFAULT PARTITION outlying_years );
+drop table p3_sales;
+set gp_max_partition_level = 0;
+CREATE TABLE p3_sales (id int, year int, month int, day int,
+region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+ SUBPARTITION BY RANGE (month)
+  SUBPARTITION TEMPLATE (
+    START (1) END (3) EVERY (1),
+    DEFAULT SUBPARTITION other_months )
+    SUBPARTITION BY LIST (region)
+      SUBPARTITION TEMPLATE (
+       SUBPARTITION usa VALUES ('usa'),
+       SUBPARTITION europe VALUES ('europe'),
+       DEFAULT SUBPARTITION other_regions )
+( START (2010) END (2012) EVERY (1),
+  DEFAULT PARTITION outlying_years );
+drop table p3_sales;
+-- We should not allow subpartition by clause when creating empty partition hierarchy
+-- Should error out
+CREATE TABLE empty_partition_disallow_subpartition(i int, j int)
+PARTITION BY range(i) SUBPARTITION BY range(j);
+ERROR:  SUBPARTITION BY clause is not allowed when no partitions specified at depth 1
+-- Check with other Partition syntax
+CREATE TABLE empty_partition_disallow_subpartition_2(i int, j int)
+    DISTRIBUTED BY (i) PARTITION BY range(i) SUBPARTITION BY range(j);
+ERROR:  SUBPARTITION BY clause is not allowed when no partitions specified at depth 1
+-- Should work fine for empty hierarchy when subpartition is not specified
+CREATE TABLE empty_partition(i int, j int) PARTITION BY range(i);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- Check with other Partition syntax
+CREATE TABLE empty_partition2(i int, j int) DISTRIBUTED BY (i) PARTITION BY range(i);
+-- https://github.com/apache/cloudberry/issues/795
+CREATE TABLE t_issue_795_par (
+  name character varying,
+  last_modified_date timestamp without time zone
+)
+WITH (appendoptimized=true, orientation=column, compresslevel=1)
+DISTRIBUTED BY (name)
+PARTITION BY RANGE (last_modified_date)
+(
+    PARTITION partition_202411 START ('2024-11-01 00:00:00') INCLUSIVE END ('2024-12-01 00:00:00') EXCLUSIVE,
+    PARTITION partition_max START ('2024-12-01 00:00:00') INCLUSIVE END (MAXVALUE)
+);
+\d+ t_issue_795_par
+                                                                  Partitioned table "public.t_issue_795_par"
+       Column       |            Type             | Collation | Nullable | Default | Storage  | Stats target | Compression Type | Compression Level | Block Size | Description 
+--------------------+-----------------------------+-----------+----------+---------+----------+--------------+------------------+-------------------+------------+-------------
+ name               | character varying           |           |          |         | extended |              | zlib             | 1                 | 32768      | 
+ last_modified_date | timestamp without time zone |           |          |         | plain    |              | zlib             | 1                 | 32768      | 
+Partition key: RANGE (last_modified_date)
+Partitions: t_issue_795_par_1_prt_partition_202411 FOR VALUES FROM ('Fri Nov 01 00:00:00 2024') TO ('Sun Dec 01 00:00:00 2024'),
+            t_issue_795_par_1_prt_partition_max FOR VALUES FROM ('Sun Dec 01 00:00:00 2024') TO (MAXVALUE)
+Distributed by: (name)
+Options: compresslevel=1
+
+DROP TABLE t_issue_795_par;
+-- test the row-level security
+DROP USER IF EXISTS new_user_append;
+NOTICE:  role "new_user_append" does not exist, skipping
+create user new_user_append;
+NOTICE:  resource queue required -- using default resource queue "pg_default"
+create table foo_part_rls ( a int, b int, c int) distributed by (a)
+partition by range(b) (start(0) end(100) every(20), default partition other_part);
+insert into foo_part_rls select i,i*10,i*100 from generate_series(1,5)i;
+insert into foo_part_rls values (NULL,50,500);;
+insert into foo_part_rls values (NULL,60,NULL);
+insert into foo_part_rls values (NULL,70,NULL);
+insert into foo_part_rls values (NULL,NULL,600);
+insert into foo_part_rls values (NULL,NULL,700);
+analyze foo_part_rls;
+grant select on foo_part_rls to new_user_append;
+alter table foo_part_rls enable row level security;
+create policy p1 on foo_part_rls using (a * 10 = b and c > 300);
+set session authorization new_user_append;
+explain select * from foo_part_rls;
+                                               QUERY PLAN                                                
+---------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.38 rows=18 width=12)
+   ->  Append  (cost=0.00..6.14 rows=6 width=12)
+         ->  Seq Scan on foo_part_rls_1_prt_2 foo_part_rls_1  (cost=0.00..1.02 rows=1 width=12)
+               Filter: ((c > 300) AND ((a * 10) = b))
+         ->  Seq Scan on foo_part_rls_1_prt_3 foo_part_rls_2  (cost=0.00..1.02 rows=1 width=12)
+               Filter: ((c > 300) AND ((a * 10) = b))
+         ->  Seq Scan on foo_part_rls_1_prt_4 foo_part_rls_3  (cost=0.00..1.02 rows=1 width=12)
+               Filter: ((c > 300) AND ((a * 10) = b))
+         ->  Seq Scan on foo_part_rls_1_prt_5 foo_part_rls_4  (cost=0.00..1.02 rows=1 width=12)
+               Filter: ((c > 300) AND ((a * 10) = b))
+         ->  Seq Scan on foo_part_rls_1_prt_6 foo_part_rls_5  (cost=0.00..1.02 rows=1 width=12)
+               Filter: ((c > 300) AND ((a * 10) = b))
+         ->  Seq Scan on foo_part_rls_1_prt_other_part foo_part_rls_6  (cost=0.00..1.02 rows=1 width=12)
+               Filter: ((c > 300) AND ((a * 10) = b))
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+select * from foo_part_rls;
+ a | b  |  c  
+---+----+-----
+ 5 | 50 | 500
+ 4 | 40 | 400
+(2 rows)
+
+reset session authorization;
+drop policy p1 on foo_part_rls;
+drop table foo_part_rls cascade;
+drop user new_user;
+ERROR:  role "new_user" does not exist
+-- test index-only scan
+create table pt(dist int, pt1 text, pt2 text, pt3 text, ptid int) DISTRIBUTED BY (dist) 
+PARTITION BY RANGE(ptid) (START (0) END (5) EVERY (1), DEFAULT PARTITION junk_data);
+create table pt1(dist int, pt1 text, pt2 text, pt3 text, ptid int) DISTRIBUTED BY (dist) 
+PARTITION BY RANGE(ptid) (START (0) END (5) EVERY (1), DEFAULT PARTITION junk_data);
+create table pt2(dist int, tid int, t1 text, t2 text);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'dist' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create index pt1_idx on pt using btree (pt1);
+create index ptid_idx on pt using btree (ptid);
+create index ptid_pt1_idx on pt using btree (ptid, pt1);
+insert into pt select i, 'hello' || i, 'world', 'drop this', i % 6 from generate_series(0,53) i;
+insert into pt2 select i, i % 6, 'hello' || i, 'bar' from generate_series(0,1) i;
+insert into pt1 select * from pt;
+NOTICE:  One or more columns in the following table(s) do not have statistics: pt
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+insert into pt1 select dist, pt1, pt2, pt3, ptid-100 from pt;
+NOTICE:  One or more columns in the following table(s) do not have statistics: pt
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+alter table pt1 set with(REORGANIZE=false) DISTRIBUTED RANDOMLY;
+vacuum analyze pt;
+analyze pt1;
+analyze pt2;
+explain (costs off, timing off, summary off, analyze) select * from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid);
+                                         QUERY PLAN                                          
+---------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=18 loops=1)
+   ->  Hash Semi Join (actual rows=8 loops=1)
+         Hash Cond: (pt_1_prt_2.ptid = pt2.tid)
+         Extra Text: (seg1)   Hash chain length 1.0 avg, 1 max, using 2 of 524288 buckets.
+         ->  Append (actual rows=8 loops=1)
+               Partition Selectors: $0
+               ->  Seq Scan on pt_1_prt_2 (actual rows=5 loops=1)
+               ->  Seq Scan on pt_1_prt_3 (actual rows=3 loops=1)
+               ->  Seq Scan on pt_1_prt_4 (never executed)
+               ->  Seq Scan on pt_1_prt_5 (never executed)
+               ->  Seq Scan on pt_1_prt_6 (never executed)
+               ->  Seq Scan on pt_1_prt_junk_data (never executed)
+         ->  Hash (actual rows=2 loops=1)
+               Buckets: 524288  Batches: 1  Memory Usage: 4097kB
+               ->  Partition Selector (selector id: $0) (actual rows=2 loops=1)
+                     ->  Broadcast Motion 3:3  (slice2; segments: 3) (actual rows=2 loops=1)
+                           ->  Seq Scan on pt2 (actual rows=2 loops=1)
+                                 Filter: (t1 = ('hello'::text || (tid)::text))
+ Optimizer: GPORCA
+(19 rows)
+
+select * from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid);
+ dist |   pt1   |  pt2  |    pt3    | ptid 
+------+---------+-------+-----------+------
+    0 | hello0  | world | drop this |    0
+    6 | hello6  | world | drop this |    0
+   12 | hello12 | world | drop this |    0
+   18 | hello18 | world | drop this |    0
+   24 | hello24 | world | drop this |    0
+   30 | hello30 | world | drop this |    0
+   36 | hello36 | world | drop this |    0
+   42 | hello42 | world | drop this |    0
+   48 | hello48 | world | drop this |    0
+    1 | hello1  | world | drop this |    1
+    7 | hello7  | world | drop this |    1
+   13 | hello13 | world | drop this |    1
+   19 | hello19 | world | drop this |    1
+   25 | hello25 | world | drop this |    1
+   31 | hello31 | world | drop this |    1
+   37 | hello37 | world | drop this |    1
+   43 | hello43 | world | drop this |    1
+   49 | hello49 | world | drop this |    1
+(18 rows)
+
+explain (costs off, timing off, summary off, analyze) select ptid from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid) and pt1 = 'hello1';
+                                                          QUERY PLAN                                                           
+-------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=1 loops=1)
+   ->  Hash Join (actual rows=1 loops=1)
+         Hash Cond: (pt2.tid = pt_1_prt_2.ptid)
+         Extra Text: (seg1)   Hash chain length 1.0 avg, 1 max, using 1 of 262144 buckets.
+         ->  GroupAggregate (actual rows=2 loops=1)
+               Group Key: pt2.tid
+               ->  Sort (actual rows=2 loops=1)
+                     Sort Key: pt2.tid
+                     Sort Method:  quicksort  Memory: 25kB
+                     ->  Redistribute Motion 3:3  (slice2; segments: 3) (actual rows=2 loops=1)
+                           Hash Key: pt2.tid
+                           ->  Seq Scan on pt2 (actual rows=2 loops=1)
+                                 Filter: (t1 = ('hello'::text || (tid)::text))
+         ->  Hash (actual rows=1 loops=1)
+               Buckets: 262144  Batches: 1  Memory Usage: 2049kB
+               ->  Redistribute Motion 3:3  (slice3; segments: 3) (actual rows=1 loops=1)
+                     Hash Key: pt_1_prt_2.ptid
+                     ->  Result (actual rows=1 loops=1)
+                           ->  Append (actual rows=1 loops=1)
+                                 ->  Index Scan using pt_1_prt_2_pt1_idx on pt_1_prt_2 (actual rows=0 loops=1)
+                                       Index Cond: (pt1 = 'hello1'::text)
+                                 ->  Index Scan using pt_1_prt_3_pt1_idx on pt_1_prt_3 (actual rows=1 loops=1)
+                                       Index Cond: (pt1 = 'hello1'::text)
+                                 ->  Index Scan using pt_1_prt_4_pt1_idx on pt_1_prt_4 (actual rows=0 loops=1)
+                                       Index Cond: (pt1 = 'hello1'::text)
+                                 ->  Index Scan using pt_1_prt_5_pt1_idx on pt_1_prt_5 (actual rows=0 loops=1)
+                                       Index Cond: (pt1 = 'hello1'::text)
+                                 ->  Index Scan using pt_1_prt_6_pt1_idx on pt_1_prt_6 (actual rows=0 loops=1)
+                                       Index Cond: (pt1 = 'hello1'::text)
+                                 ->  Index Scan using pt_1_prt_junk_data_pt1_idx on pt_1_prt_junk_data (actual rows=0 loops=1)
+                                       Index Cond: (pt1 = 'hello1'::text)
+ Optimizer: GPORCA
+(32 rows)
+
+select ptid from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid) and pt1 = 'hello1';
+ ptid 
+------
+    1
+(1 row)
+
+drop table pt;
+drop table pt1;
+drop table pt2;
+-- test bitmap heap/bitmap index scan
+CREATE TABLE rp_multi_inds (a int, b int, c int) DISTRIBUTED BY (a) PARTITION BY RANGE (b);
+CREATE TABLE rp_multi_inds_part1 PARTITION OF rp_multi_inds FOR VALUES FROM (MINVALUE) TO (10);
+NOTICE:  table has parent, setting distribution columns to match parent table
+CREATE TABLE rp_multi_inds_part2 PARTITION OF rp_multi_inds FOR VALUES FROM (10) TO (20);
+NOTICE:  table has parent, setting distribution columns to match parent table
+CREATE TABLE rp_multi_inds_part3 PARTITION OF rp_multi_inds FOR VALUES FROM (4201) TO (4203);
+NOTICE:  table has parent, setting distribution columns to match parent table
+INSERT INTO rp_multi_inds VALUES (0, 0, 0), (11, 11, 11), (4201, 4201, 4201);
+analyze rp_multi_inds;
+-- Create an index only on the selected partition
+CREATE INDEX other_idx ON rp_multi_inds_part2 USING btree(b);
+-- Create indexes on root table
+CREATE INDEX rp_btree_idx ON rp_multi_inds USING btree(c);
+CREATE INDEX rp_bitmap_idx ON rp_multi_inds USING bitmap(b);
+-- Expect a plan that only uses the two indexes inherited from root
+SET optimizer_enable_dynamictablescan TO off;
+EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM rp_multi_inds WHERE b = 11 AND (c = 11 OR c = 4201);
+                                                           QUERY PLAN                                                            
+---------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: a, b, c
+   ->  Append
+         ->  Bitmap Heap Scan on public.rp_multi_inds_part2
+               Output: a, b, c
+               Recheck Cond: (((rp_multi_inds_part2.c = 11) OR (rp_multi_inds_part2.c = 4201)) AND (rp_multi_inds_part2.b = 11))
+               ->  BitmapAnd
+                     ->  BitmapOr
+                           ->  Bitmap Index Scan on rp_multi_inds_part2_c_idx
+                                 Index Cond: (rp_multi_inds_part2.c = 11)
+                           ->  Bitmap Index Scan on rp_multi_inds_part2_c_idx
+                                 Index Cond: (rp_multi_inds_part2.c = 4201)
+                     ->  Bitmap Index Scan on rp_multi_inds_part2_b_idx
+                           Index Cond: (rp_multi_inds_part2.b = 11)
+ Settings: enable_parallel = 'off', optimizer = 'on'
+ Optimizer: GPORCA
+(16 rows)
+
+RESET optimizer_enable_dynamictablescan;
+drop table rp_multi_inds;
diff --git a/src/test/regress/expected/partition_append_setup.out b/src/test/regress/expected/partition_append_setup.out
new file mode 100755
index 00000000000..4af8586cc04
--- /dev/null
+++ b/src/test/regress/expected/partition_append_setup.out
@@ -0,0 +1,5 @@
+-- start_ignore
+DROP DATABASE IF EXISTS partition_append;
+NOTICE:  database "partition_append" does not exist, skipping
+-- end_ignore
+create database partition_append;
diff --git a/src/test/regress/expected/partition_append_teardown.out b/src/test/regress/expected/partition_append_teardown.out
new file mode 100755
index 00000000000..95ad713c03c
--- /dev/null
+++ b/src/test/regress/expected/partition_append_teardown.out
@@ -0,0 +1,3 @@
+DROP DATABASE IF EXISTS partition_append;
+reset optimizer_disable_dynamic_table_scan;
+reset optimizer;
diff --git a/src/test/regress/expected/partition_join.out b/src/test/regress/expected/partition_join.out
index 80bde64b3db..98431e7a104 100644
--- a/src/test/regress/expected/partition_join.out
+++ b/src/test/regress/expected/partition_join.out
@@ -1881,7 +1881,7 @@ SELECT avg(t1.a), avg(t2.b), t1.c, t2.c FROM plt1 t1 RIGHT JOIN plt2 t2 ON t1.c
                Group Key: t1.c, t2.c
                ->  Redistribute Motion 3:3  (slice2; segments: 3)
                      Hash Key: t1.c, t1.c
-                     ->  Partial HashAggregate
+                     ->  Streaming Partial HashAggregate
                            Group Key: t1.c, t2.c
                            ->  Append
                                  ->  Hash Join
@@ -5700,3 +5700,98 @@ SELECT t1.*, t2.* FROM alpha t1 INNER JOIN beta t2 ON (t1.a = t2.a AND t1.b = t2
   1 | 209 | 0009 |  1 | 209 | 0009
 (8 rows)
 
+--
+-- test issue https://github.com/apache/cloudberry/issues/1301
+--
+begin;
+create table t_issue_1301_big(
+	id varchar(32),
+	t varchar(32)
+) distributed by (id)
+partition by range(t)
+(
+partition p1 start ('0') end ('5'),
+partition p2 start ('5') end ('9999999999999999999')
+);
+create index idx_t_issue_1301_big_id on t_issue_1301_big(id);
+insert into t_issue_1301_big select seq, seq from generate_series(1, 100000) as seq;
+create table t_issue_1301_small(
+  id varchar(32),
+  t varchar(32)
+) distributed by (id);
+insert into t_issue_1301_small select seq*10000, seq*10000 from generate_series(1, 100) as seq;
+set local optimizer = off;
+set local enable_nestloop to on;
+analyze t_issue_1301_big;
+analyze t_issue_1301_small;
+explain(costs off) select a.* from t_issue_1301_small a left join t_issue_1301_big b on a.id=b.id;
+                                                QUERY PLAN                                                 
+-----------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Nested Loop Left Join
+         ->  Seq Scan on t_issue_1301_small a
+         ->  Append
+               ->  Index Only Scan using t_issue_1301_big_1_prt_p1_id_idx on t_issue_1301_big_1_prt_p1 b_1
+                     Index Cond: (id = (a.id)::text)
+               ->  Index Only Scan using t_issue_1301_big_1_prt_p2_id_idx on t_issue_1301_big_1_prt_p2 b_2
+                     Index Cond: (id = (a.id)::text)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+abort;
+BEGIN;
+CREATE TABLE t1 (id varchar(32), date date) DISTRIBUTED BY (id)
+PARTITION BY RANGE (date)
+(START (date '2016-01-01') INCLUSIVE END (date '2016-01-04') EXCLUSIVE EVERY (INTERVAL '1 day'));
+CREATE TABLE t2 (id varchar(32)) DISTRIBUTED BY (id);
+analyze t1;
+analyze t2;
+\d+ t1;
+                                      Partitioned table "public.t1"
+ Column |         Type          | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+-----------------------+-----------+----------+---------+----------+--------------+-------------
+ id     | character varying(32) |           |          |         | extended |              | 
+ date   | date                  |           |          |         | plain    |              | 
+Partition key: RANGE (date)
+Partitions: t1_1_prt_1 FOR VALUES FROM ('01-01-2016') TO ('01-02-2016'),
+            t1_1_prt_2 FOR VALUES FROM ('01-02-2016') TO ('01-03-2016'),
+            t1_1_prt_3 FOR VALUES FROM ('01-03-2016') TO ('01-04-2016')
+Distributed by: (id)
+
+\d+ t2;
+                                            Table "public.t2"
+ Column |         Type          | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+-----------------------+-----------+----------+---------+----------+--------------+-------------
+ id     | character varying(32) |           |          |         | extended |              | 
+Distributed by: (id)
+
+EXPLAIN(COSTS OFF) SELECT COUNT(*) FROM t1_1_prt_1 JOIN t2 USING(id);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Hash Join
+               Hash Cond: ((t1_1_prt_1.id)::text = (t2.id)::text)
+               ->  Seq Scan on t1_1_prt_1
+               ->  Hash
+                     ->  Seq Scan on t2
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+EXPLAIN(COSTS OFF) SELECT COUNT(*) FROM t1 JOIN t2 USING(id);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Aggregate
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         ->  Hash Join
+               Hash Cond: ((t1.id)::text = (t2.id)::text)
+               ->  Append
+                     ->  Seq Scan on t1_1_prt_1 t1_1
+                     ->  Seq Scan on t1_1_prt_2 t1_2
+                     ->  Seq Scan on t1_1_prt_3 t1_3
+               ->  Hash
+                     ->  Seq Scan on t2
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+ABORT;
diff --git a/src/test/regress/expected/partition_optimizer.out b/src/test/regress/expected/partition_optimizer.out
index 8e738bb508b..c237e41bcad 100755
--- a/src/test/regress/expected/partition_optimizer.out
+++ b/src/test/regress/expected/partition_optimizer.out
@@ -2315,9 +2315,9 @@ DETAIL:  Partition key of the failing row contains (i) = (5).
 drop table bar_p;
 -- Drop should not leave anything lingering for bar_p or its
 -- subpartitions in pg_partition* catalog tables.
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
- relid | level | template 
--------+-------+----------
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+ relid | level | pg_get_expr 
+-------+-------+-------------
 (0 rows)
 
 -- MPP-4172
@@ -2438,28 +2438,28 @@ select relid::regclass, level from gp_partition_template where relid = 'rank_set
 
 alter table rank_settemp set subpartition template (default subpartition def2);
 -- def2 is there
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
-    relid     | level |                                                                                                   template                                                                                                   
---------------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName def2 :boundSpec <> :subSpec <> :isDefault true :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                   pg_get_expr                    
+--------------+-------+--------------------------------------------------
+ rank_settemp |     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION def2)
 (1 row)
 
 alter table rank_settemp set subpartition template (default subpartition def2);
 -- Should still be there
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
-    relid     | level |                                                                                                   template                                                                                                   
---------------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName def2 :boundSpec <> :subSpec <> :isDefault true :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                   pg_get_expr                    
+--------------+-------+--------------------------------------------------
+ rank_settemp |     1 | SUBPARTITION TEMPLATE(DEFAULT SUBPARTITION def2)
 (1 row)
 
 alter table rank_settemp set subpartition template (start (date '2006-01-01') with (appendonly=true));
 alter table rank_settemp add partition f1 values ('N');
 alter table rank_settemp set subpartition template (start (date '2007-01-01') with (appendonly=true, compresslevel=5));
 alter table rank_settemp add partition f2 values ('C');
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
-    relid     | level |                                                                                                                                                                                                                                                                                                  template                                                                                                                                                                                                                                                                                                  
---------------+-------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- rank_settemp |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName <> :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({TYPECAST :arg {A_CONST :val "\2007-01-01" :location 64} :typeName {TYPENAME :names ("date") :typeOid 0 :setof false :pct_type false :typmods <> :typemod -1 :arrayBounds <> :location 59} :location -1}) :edge 1} :partEnd <> :partEvery <>} :subSpec <> :isDefault false :options ({DEFELEM :defnamespace <> :defname compresslevel :arg 5 :defaction 0 :location 101}) :accessMethod ao_row :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
+    relid     | level |                                                   pg_get_expr                                                    
+--------------+-------+------------------------------------------------------------------------------------------------------------------
+ rank_settemp |     1 | SUBPARTITION TEMPLATE( START ('01-01-2007'::date),  WITH (appendonly=true, orientation=column, compresslevel=5))
 (1 row)
 
 drop table rank_settemp;
@@ -3594,12 +3594,12 @@ subpartition l2 values (6,7,8,9,10) );
 alter table mpp5992 
 set subpartition template (subpartition l1 values (1,2,3), 
 subpartition l2 values (4,5,6), subpartition l3 values (7,8,9,10));
-select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
-  relid  | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                                                                                                                                                                                                                                            
----------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- mpp5992 |     3 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName lll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "M" :location 133}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName lll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "F" :location 165}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     2 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName ll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "Engineering" :location 108}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName ll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "QA" :location 149}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName l1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 1 :location 72}) ({A_CONST :val 2 :location 74}) ({A_CONST :val 3 :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 4 :location 105}) ({A_CONST :val 5 :location 107}) ({A_CONST :val 6 :location 109}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l3 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 7 :location 137}) ({A_CONST :val 8 :location 139}) ({A_CONST :val 9 :location 141}) ({A_CONST :val 10 :location 143}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'mpp5992'::regclass;
+  relid  | level |                                                           pg_get_expr                                                           
+---------+-------+---------------------------------------------------------------------------------------------------------------------------------
+ mpp5992 |     1 | SUBPARTITION TEMPLATE(SUBPARTITION l1 VALUES (1, 2, 3), SUBPARTITION l2 VALUES (4, 5, 6), SUBPARTITION l3 VALUES (7, 8, 9, 10))
+ mpp5992 |     3 | SUBPARTITION TEMPLATE(SUBPARTITION lll1 VALUES ('M'), SUBPARTITION lll2 VALUES ('F'))
+ mpp5992 |     2 | SUBPARTITION TEMPLATE(SUBPARTITION ll1 VALUES ('Engineering'), SUBPARTITION ll2 VALUES ('QA'))
 (3 rows)
 
 -- Now we can add a new partition
@@ -3848,12 +3848,12 @@ select relname, relam, pg_get_expr(relpartbound, oid) from pg_class where relnam
  mpp5992_1_prt_foo3_2_prt_l3_3_prt_ll2_4_prt_lll2 |  7024 | FOR VALUES IN ('F')
 (112 rows)
 
-select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
-  relid  | level |                                                                                                                                                                                                                                                                                                                                                                                                                                                            template                                                                                                                                                                                                                                                                                                                                                                                                                                                            
----------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- mpp5992 |     3 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName lll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "M" :location 133}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName lll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "F" :location 165}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     2 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName ll1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "Engineering" :location 108}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName ll2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val "QA" :location 149}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
- mpp5992 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName l1 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 1 :location 72}) ({A_CONST :val 2 :location 74}) ({A_CONST :val 3 :location 76}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l2 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 4 :location 105}) ({A_CONST :val 5 :location 107}) ({A_CONST :val 6 :location 109}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>} {GPPARTDEFELEM :partName l3 :boundSpec {GPPARTITIONLISTSPEC :partValues (({A_CONST :val 7 :location 137}) ({A_CONST :val 8 :location 139}) ({A_CONST :val 9 :location 141}) ({A_CONST :val 10 :location 143}))} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'mpp5992'::regclass;
+  relid  | level |                                                           pg_get_expr                                                           
+---------+-------+---------------------------------------------------------------------------------------------------------------------------------
+ mpp5992 |     1 | SUBPARTITION TEMPLATE(SUBPARTITION l1 VALUES (1, 2, 3), SUBPARTITION l2 VALUES (4, 5, 6), SUBPARTITION l3 VALUES (7, 8, 9, 10))
+ mpp5992 |     3 | SUBPARTITION TEMPLATE(SUBPARTITION lll1 VALUES ('M'), SUBPARTITION lll2 VALUES ('F'))
+ mpp5992 |     2 | SUBPARTITION TEMPLATE(SUBPARTITION ll1 VALUES ('Engineering'), SUBPARTITION ll2 VALUES ('QA'))
 (3 rows)
 
 -- MPP-10223: split subpartitions
@@ -4052,10 +4052,10 @@ subpartition template (start (1) end (10) every (1))
 (start (20) end (30) every (1));
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
-select relid::regclass, level, template from gp_partition_template where relid = 'MPP10480'::regclass;
-  relid   | level |                                                                                                                                                                                                                  template                                                                                                                                                                                                                  
-----------+-------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- mpp10480 |     1 | {GPPARTITIONDEFINITION :partDefElems ({GPPARTDEFELEM :partName <> :boundSpec {GPPARTITIONRANGESPEC :partStart {GPPARTITIONRANGEITEM :val ({A_CONST :val 1 :location 122}) :edge 1} :partEnd {GPPARTITIONRANGEITEM :val ({A_CONST :val 10 :location 130}) :edge 2} :partEvery ({A_CONST :val 1 :location 141})} :subSpec <> :isDefault false :options <> :accessMethod <> :tablespacename <> :colencs <>}) :encClauses <> :isTemplate true}
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'MPP10480'::regclass;
+  relid   | level |                     pg_get_expr                      
+----------+-------+------------------------------------------------------
+ mpp10480 |     1 | SUBPARTITION TEMPLATE( START (1) END (10) Every (1))
 (1 row)
 
 -- MPP-10421: fix SPLIT of partitions with PRIMARY KEY constraint/indexes
diff --git a/src/test/regress/expected/partition_prune.out b/src/test/regress/expected/partition_prune.out
index b3673b2ce48..75e646374be 100644
--- a/src/test/regress/expected/partition_prune.out
+++ b/src/test/regress/expected/partition_prune.out
@@ -3770,13 +3770,13 @@ explain (costs off) select * from pph_arrpart where a in ('{4, 5}', '{1}');
 drop table pph_arrpart;
 -- enum type list partition key
 create type pp_colors as enum ('green', 'blue', 'black');
-create table pp_enumpart (col1 int, a pp_colors) partition by list (a);
+create table pp_enumpart (a pp_colors) partition by list (a);
 create table pp_enumpart_green partition of pp_enumpart for values in ('green');
 create table pp_enumpart_blue partition of pp_enumpart for values in ('blue');
 explain (costs off) select * from pp_enumpart where a = 'blue';
                 QUERY PLAN                
 ------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)
+ Gather Motion 1:1  (slice1; segments: 1)
    ->  Seq Scan on pp_enumpart_blue pp_enumpart
          Filter: (a = 'blue'::pp_colors)
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/partition_prune_append.out b/src/test/regress/expected/partition_prune_append.out
new file mode 100644
index 00000000000..68934130ab9
--- /dev/null
+++ b/src/test/regress/expected/partition_prune_append.out
@@ -0,0 +1,4144 @@
+--
+-- Test partitioning planner code
+--
+-- GPDB:
+-- One of the queries EXPLAINed in this file executes on one or two segments,
+-- depending on random choice by the planner. Accept either plan.
+-- start_matchsubs
+-- m/ Gather Motion [12]:1  \(slice1; segments: [12]\)/
+-- s/ Gather Motion [12]:1  \(slice1; segments: [12]\)/ Gather Motion XXX/
+-- m/Memory Usage: \d+\w?B/
+-- s/Memory Usage: \d+\w?B/Memory Usage: ###B/
+-- m/Buckets: \d+/
+-- s/Buckets: \d+/Buckets: ###/
+-- m/Batches: \d+/
+-- s/Batches: \d+/Batches: ###/
+-- m/Extra Text: \(seg\d+\)/
+-- s/Extra Text: \(seg\d+\)/Extra Text: ###/
+-- m/Hash chain length \d+\.\d+ avg, \d+ max/
+-- s/Hash chain length \d+\.\d+ avg, \d+ max/Hash chain length ###/
+-- m/using \d+ of \d+ buckets/
+-- s/using \d+ of \d+ buckets/using ## of ### buckets/
+-- m/((0[1-9]|1[0-2])-(0[1-9]|1[0-9]|2[0-9])|(0[13-9]|1[0-2])-30|(0[13578]|1[02])-31)-(?!0000)[0-9]{4}/
+-- s/((0[1-9]|1[0-2])-(0[1-9]|1[0-9]|2[0-9])|(0[13-9]|1[0-2])-30|(0[13578]|1[02])-31)-(?!0000)[0-9]{4}/xx-xx-xxxx/
+-- m/((Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (0[1-9]|[12][0-9]|3[01]) ([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](.[0-9]+)? (?!0000)[0-9]{4}.*)+(['"])/
+-- s/((Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (0[1-9]|[12][0-9]|3[01]) ([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](.[0-9]+)? (?!0000)[0-9]{4}.*)+(['"])/xxx xx xx xx:xx:xx xxxx"/
+-- end_matchsubs
+-- Force generic plans to be used for all prepared statements in this file.
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+set plan_cache_mode = force_generic_plan;
+create table lp (a char) partition by list (a);
+create table lp_default partition of lp default;
+create table lp_ef partition of lp for values in ('e', 'f');
+create table lp_ad partition of lp for values in ('a', 'd');
+create table lp_bc partition of lp for values in ('b', 'c');
+create table lp_g partition of lp for values in ('g');
+create table lp_null partition of lp for values in (null);
+explain (costs off) select * from lp;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_ad
+         ->  Seq Scan on lp_bc
+         ->  Seq Scan on lp_ef
+         ->  Seq Scan on lp_g
+         ->  Seq Scan on lp_null
+         ->  Seq Scan on lp_default
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from lp where a > 'a' and a < 'd';
+                           QUERY PLAN                            
+-----------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_bc
+               Filter: ((a > 'a'::bpchar) AND (a < 'd'::bpchar))
+         ->  Seq Scan on lp_default
+               Filter: ((a > 'a'::bpchar) AND (a < 'd'::bpchar))
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) select * from lp where a > 'a' and a <= 'd';
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: ((a > 'a'::bpchar) AND (a <= 'd'::bpchar))
+         ->  Seq Scan on lp_bc
+               Filter: ((a > 'a'::bpchar) AND (a <= 'd'::bpchar))
+         ->  Seq Scan on lp_default
+               Filter: ((a > 'a'::bpchar) AND (a <= 'd'::bpchar))
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from lp where a = 'a';
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: (a = 'a'::bpchar)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from lp where 'a' = a;	/* commuted */
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: (a = 'a'::bpchar)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from lp where a is not null;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: (NOT (a IS NULL))
+         ->  Seq Scan on lp_bc
+               Filter: (NOT (a IS NULL))
+         ->  Seq Scan on lp_ef
+               Filter: (NOT (a IS NULL))
+         ->  Seq Scan on lp_g
+               Filter: (NOT (a IS NULL))
+         ->  Seq Scan on lp_default
+               Filter: (NOT (a IS NULL))
+ Optimizer: GPORCA
+(13 rows)
+
+explain (costs off) select * from lp where a is null;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on lp_null
+               Filter: (a IS NULL)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from lp where a = 'a' or a = 'c';
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: ((a = 'a'::bpchar) OR (a = 'c'::bpchar))
+         ->  Seq Scan on lp_bc
+               Filter: ((a = 'a'::bpchar) OR (a = 'c'::bpchar))
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) select * from lp where a is not null and (a = 'a' or a = 'c');
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: ((NOT (a IS NULL)) AND ((a = 'a'::bpchar) OR (a = 'c'::bpchar)))
+         ->  Seq Scan on lp_bc
+               Filter: ((NOT (a IS NULL)) AND ((a = 'a'::bpchar) OR (a = 'c'::bpchar)))
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) select * from lp where a <> 'g';
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: (a <> 'g'::bpchar)
+         ->  Seq Scan on lp_bc
+               Filter: (a <> 'g'::bpchar)
+         ->  Seq Scan on lp_ef
+               Filter: (a <> 'g'::bpchar)
+         ->  Seq Scan on lp_default
+               Filter: (a <> 'g'::bpchar)
+ Optimizer: GPORCA
+(11 rows)
+
+explain (costs off) select * from lp where a <> 'a' and a <> 'd';
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_bc
+               Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+         ->  Seq Scan on lp_ef
+               Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+         ->  Seq Scan on lp_g
+               Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+         ->  Seq Scan on lp_default
+               Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+ Optimizer: GPORCA
+(11 rows)
+
+explain (costs off) select * from lp where a not in ('a', 'd');
+                      QUERY PLAN                      
+------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_bc
+               Filter: (a <> ALL ('{a,d}'::bpchar[]))
+         ->  Seq Scan on lp_ef
+               Filter: (a <> ALL ('{a,d}'::bpchar[]))
+         ->  Seq Scan on lp_g
+               Filter: (a <> ALL ('{a,d}'::bpchar[]))
+         ->  Seq Scan on lp_default
+               Filter: (a <> ALL ('{a,d}'::bpchar[]))
+ Optimizer: GPORCA
+(11 rows)
+
+-- collation matches the partitioning collation, pruning works
+create table coll_pruning (a text collate "C") partition by list (a);
+create table coll_pruning_a partition of coll_pruning for values in ('a');
+create table coll_pruning_b partition of coll_pruning for values in ('b');
+create table coll_pruning_def partition of coll_pruning default;
+explain (costs off) select * from coll_pruning where a collate "C" = 'a' collate "C";
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on coll_pruning_a coll_pruning
+         Filter: (a = 'a'::text COLLATE "C")
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+-- collation doesn't match the partitioning collation, no pruning occurs
+explain (costs off) select * from coll_pruning where a collate "POSIX" = 'a' collate "POSIX";
+                          QUERY PLAN                           
+---------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on coll_pruning_a coll_pruning_1
+               Filter: ((a)::text = 'a'::text COLLATE "POSIX")
+         ->  Seq Scan on coll_pruning_b coll_pruning_2
+               Filter: ((a)::text = 'a'::text COLLATE "POSIX")
+         ->  Seq Scan on coll_pruning_def coll_pruning_3
+               Filter: ((a)::text = 'a'::text COLLATE "POSIX")
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+create table rlp (a int, b varchar) partition by range (a);
+create table rlp_default partition of rlp default partition by list (a);
+create table rlp_default_default partition of rlp_default default;
+create table rlp_default_10 partition of rlp_default for values in (10);
+create table rlp_default_30 partition of rlp_default for values in (30);
+create table rlp_default_null partition of rlp_default for values in (null);
+create table rlp1 partition of rlp for values from (minvalue) to (1);
+create table rlp2 partition of rlp for values from (1) to (10);
+create table rlp3 (b varchar, a int) partition by list (b varchar_ops);
+-- GPDB: distribution policy must match the parent table.
+alter table rlp3 set distributed by (a);
+create table rlp3_default partition of rlp3 default;
+create table rlp3abcd partition of rlp3 for values in ('ab', 'cd');
+create table rlp3efgh partition of rlp3 for values in ('ef', 'gh');
+create table rlp3nullxy partition of rlp3 for values in (null, 'xy');
+alter table rlp attach partition rlp3 for values from (15) to (20);
+create table rlp4 partition of rlp for values from (20) to (30) partition by range (a);
+create table rlp4_default partition of rlp4 default;
+create table rlp4_1 partition of rlp4 for values from (20) to (25);
+create table rlp4_2 partition of rlp4 for values from (25) to (29);
+create table rlp5 partition of rlp for values from (31) to (maxvalue) partition by range (a);
+create table rlp5_default partition of rlp5 default;
+create table rlp5_1 partition of rlp5 for values from (31) to (40);
+explain (costs off) select * from rlp where a < 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on rlp1 rlp
+         Filter: (a < 1)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where 1 > a;	/* commuted */
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on rlp1 rlp
+         Filter: (1 > a)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a <= 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: (a <= 1)
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: (a <= 1)
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) select * from rlp where a = 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp2 rlp
+         Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a = 1::bigint;		/* same as above */
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp2 rlp
+         Filter: (a = '1'::bigint)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a = 1::numeric;		/* no pruning */
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp3abcd rlp_3
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp3efgh rlp_4
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp3nullxy rlp_5
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp3_default rlp_6
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp4_1 rlp_7
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp4_2 rlp_8
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp4_default rlp_9
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp5_1 rlp_10
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp5_default rlp_11
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp_default_10 rlp_12
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp_default_30 rlp_13
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp_default_null rlp_14
+               Filter: ((a)::numeric = '1'::numeric)
+         ->  Seq Scan on rlp_default_default rlp_15
+               Filter: ((a)::numeric = '1'::numeric)
+ Optimizer: Postgres query optimizer
+(33 rows)
+
+explain (costs off) select * from rlp where a <= 10;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: (a <= 10)
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: (a <= 10)
+         ->  Seq Scan on rlp_default_10 rlp_3
+               Filter: (a <= 10)
+         ->  Seq Scan on rlp_default_default rlp_4
+               Filter: (a <= 10)
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from rlp where a > 10;
+                     QUERY PLAN                     
+----------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp3abcd rlp_1
+               Filter: (a > 10)
+         ->  Seq Scan on rlp3efgh rlp_2
+               Filter: (a > 10)
+         ->  Seq Scan on rlp3nullxy rlp_3
+               Filter: (a > 10)
+         ->  Seq Scan on rlp3_default rlp_4
+               Filter: (a > 10)
+         ->  Seq Scan on rlp4_1 rlp_5
+               Filter: (a > 10)
+         ->  Seq Scan on rlp4_2 rlp_6
+               Filter: (a > 10)
+         ->  Seq Scan on rlp4_default rlp_7
+               Filter: (a > 10)
+         ->  Seq Scan on rlp5_1 rlp_8
+               Filter: (a > 10)
+         ->  Seq Scan on rlp5_default rlp_9
+               Filter: (a > 10)
+         ->  Seq Scan on rlp_default_30 rlp_10
+               Filter: (a > 10)
+         ->  Seq Scan on rlp_default_default rlp_11
+               Filter: (a > 10)
+ Optimizer: Postgres query optimizer
+(25 rows)
+
+explain (costs off) select * from rlp where a < 15;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: (a < 15)
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: (a < 15)
+         ->  Seq Scan on rlp_default_10 rlp_3
+               Filter: (a < 15)
+         ->  Seq Scan on rlp_default_default rlp_4
+               Filter: (a < 15)
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from rlp where a <= 15;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: (a <= 15)
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: (a <= 15)
+         ->  Seq Scan on rlp3abcd rlp_3
+               Filter: (a <= 15)
+         ->  Seq Scan on rlp3efgh rlp_4
+               Filter: (a <= 15)
+         ->  Seq Scan on rlp3nullxy rlp_5
+               Filter: (a <= 15)
+         ->  Seq Scan on rlp3_default rlp_6
+               Filter: (a <= 15)
+         ->  Seq Scan on rlp_default_10 rlp_7
+               Filter: (a <= 15)
+         ->  Seq Scan on rlp_default_default rlp_8
+               Filter: (a <= 15)
+ Optimizer: Postgres query optimizer
+(19 rows)
+
+explain (costs off) select * from rlp where a > 15 and b = 'ab';
+                          QUERY PLAN                           
+---------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp3abcd rlp_1
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp4_1 rlp_2
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp4_2 rlp_3
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp4_default rlp_4
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp5_1 rlp_5
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp5_default rlp_6
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp_default_30 rlp_7
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp_default_default rlp_8
+               Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+ Optimizer: Postgres query optimizer
+(19 rows)
+
+explain (costs off) select * from rlp where a = 16;
+                 QUERY PLAN                 
+--------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on rlp3abcd rlp_1
+               Filter: (a = 16)
+         ->  Seq Scan on rlp3efgh rlp_2
+               Filter: (a = 16)
+         ->  Seq Scan on rlp3nullxy rlp_3
+               Filter: (a = 16)
+         ->  Seq Scan on rlp3_default rlp_4
+               Filter: (a = 16)
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from rlp where a = 16 and b in ('not', 'in', 'here');
+                                 QUERY PLAN                                 
+----------------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp3_default rlp
+         Filter: ((a = 16) AND ((b)::text = ANY ('{not,in,here}'::text[])))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a = 16 and b < 'ab';
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp3_default rlp
+         Filter: (((b)::text < 'ab'::text) AND (a = 16))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a = 16 and b <= 'ab';
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on rlp3abcd rlp_1
+               Filter: (((b)::text <= 'ab'::text) AND (a = 16))
+         ->  Seq Scan on rlp3_default rlp_2
+               Filter: (((b)::text <= 'ab'::text) AND (a = 16))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) select * from rlp where a = 16 and b is null;
+                 QUERY PLAN                 
+--------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp3nullxy rlp
+         Filter: ((b IS NULL) AND (a = 16))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a = 16 and b is not null;
+                      QUERY PLAN                      
+------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on rlp3abcd rlp_1
+               Filter: ((b IS NOT NULL) AND (a = 16))
+         ->  Seq Scan on rlp3efgh rlp_2
+               Filter: ((b IS NOT NULL) AND (a = 16))
+         ->  Seq Scan on rlp3nullxy rlp_3
+               Filter: ((b IS NOT NULL) AND (a = 16))
+         ->  Seq Scan on rlp3_default rlp_4
+               Filter: ((b IS NOT NULL) AND (a = 16))
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from rlp where a is null;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp_default_null rlp
+         Filter: (a IS NULL)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a is not null;
+                     QUERY PLAN                     
+----------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp3abcd rlp_3
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp3efgh rlp_4
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp3nullxy rlp_5
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp3_default rlp_6
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp4_1 rlp_7
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp4_2 rlp_8
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp4_default rlp_9
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp5_1 rlp_10
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp5_default rlp_11
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp_default_10 rlp_12
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp_default_30 rlp_13
+               Filter: (a IS NOT NULL)
+         ->  Seq Scan on rlp_default_default rlp_14
+               Filter: (a IS NOT NULL)
+ Optimizer: Postgres query optimizer
+(31 rows)
+
+explain (costs off) select * from rlp where a > 30;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp5_1 rlp_1
+               Filter: (a > 30)
+         ->  Seq Scan on rlp5_default rlp_2
+               Filter: (a > 30)
+         ->  Seq Scan on rlp_default_default rlp_3
+               Filter: (a > 30)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+explain (costs off) select * from rlp where a = 30;	/* only default is scanned */
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp_default_30 rlp
+         Filter: (a = 30)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a <= 31;
+                     QUERY PLAN                     
+----------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp3abcd rlp_3
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp3efgh rlp_4
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp3nullxy rlp_5
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp3_default rlp_6
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp4_1 rlp_7
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp4_2 rlp_8
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp4_default rlp_9
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp5_1 rlp_10
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp_default_10 rlp_11
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp_default_30 rlp_12
+               Filter: (a <= 31)
+         ->  Seq Scan on rlp_default_default rlp_13
+               Filter: (a <= 31)
+ Optimizer: Postgres query optimizer
+(29 rows)
+
+explain (costs off) select * from rlp where a = 1 or a = 7;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 2:1  (slice1; segments: 2)
+   ->  Seq Scan on rlp2 rlp
+         Filter: ((a = 1) OR (a = 7))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a = 1 or b = 'ab';
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp2 rlp_2
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp3abcd rlp_3
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp4_1 rlp_4
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp4_2 rlp_5
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp4_default rlp_6
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp5_1 rlp_7
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp5_default rlp_8
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp_default_10 rlp_9
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp_default_30 rlp_10
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp_default_null rlp_11
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+         ->  Seq Scan on rlp_default_default rlp_12
+               Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+ Optimizer: Postgres query optimizer
+(27 rows)
+
+explain (costs off) select * from rlp where a > 20 and a < 27;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp4_1 rlp_1
+               Filter: ((a > 20) AND (a < 27))
+         ->  Seq Scan on rlp4_2 rlp_2
+               Filter: ((a > 20) AND (a < 27))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) select * from rlp where a = 29;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp4_default rlp
+         Filter: (a = 29)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a >= 29;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp4_default rlp_1
+               Filter: (a >= 29)
+         ->  Seq Scan on rlp5_1 rlp_2
+               Filter: (a >= 29)
+         ->  Seq Scan on rlp5_default rlp_3
+               Filter: (a >= 29)
+         ->  Seq Scan on rlp_default_30 rlp_4
+               Filter: (a >= 29)
+         ->  Seq Scan on rlp_default_default rlp_5
+               Filter: (a >= 29)
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+explain (costs off) select * from rlp where a < 1 or (a > 20 and a < 25);
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp1 rlp_1
+               Filter: ((a < 1) OR ((a > 20) AND (a < 25)))
+         ->  Seq Scan on rlp4_1 rlp_2
+               Filter: ((a < 1) OR ((a > 20) AND (a < 25)))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+-- where clause contradicts sub-partition's constraint
+explain (costs off) select * from rlp where a = 20 or a = 40;
+                  QUERY PLAN                  
+----------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on rlp4_1 rlp_1
+               Filter: ((a = 20) OR (a = 40))
+         ->  Seq Scan on rlp5_default rlp_2
+               Filter: ((a = 20) OR (a = 40))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) select * from rlp3 where a = 20;   /* empty */
+              QUERY PLAN               
+---------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+-- redundant clauses are eliminated
+explain (costs off) select * from rlp where a > 1 and a = 10;	/* only default */
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on rlp_default_10 rlp
+         Filter: ((a > 1) AND (a = 10))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from rlp where a > 1 and a >=15;	/* rlp3 onwards, including default */
+                     QUERY PLAN                     
+----------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rlp3abcd rlp_1
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp3efgh rlp_2
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp3nullxy rlp_3
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp3_default rlp_4
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp4_1 rlp_5
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp4_2 rlp_6
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp4_default rlp_7
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp5_1 rlp_8
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp5_default rlp_9
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp_default_30 rlp_10
+               Filter: ((a > 1) AND (a >= 15))
+         ->  Seq Scan on rlp_default_default rlp_11
+               Filter: ((a > 1) AND (a >= 15))
+ Optimizer: Postgres query optimizer
+(25 rows)
+
+explain (costs off) select * from rlp where a = 1 and a = 3;	/* empty */
+             QUERY PLAN              
+-------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Postgres query optimizer
+(3 rows)
+
+explain (costs off) select * from rlp where (a = 1 and a = 3) or (a > 1 and a = 15);
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on rlp2 rlp_1
+               Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+         ->  Seq Scan on rlp3abcd rlp_2
+               Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+         ->  Seq Scan on rlp3efgh rlp_3
+               Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+         ->  Seq Scan on rlp3nullxy rlp_4
+               Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+         ->  Seq Scan on rlp3_default rlp_5
+               Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+-- multi-column keys
+create table mc3p (a int, b int, c int) partition by range (a, abs(b), c);
+create table mc3p_default partition of mc3p default;
+create table mc3p0 partition of mc3p for values from (minvalue, minvalue, minvalue) to (1, 1, 1);
+create table mc3p1 partition of mc3p for values from (1, 1, 1) to (10, 5, 10);
+create table mc3p2 partition of mc3p for values from (10, 5, 10) to (10, 10, 10);
+create table mc3p3 partition of mc3p for values from (10, 10, 10) to (10, 10, 20);
+create table mc3p4 partition of mc3p for values from (10, 10, 20) to (10, maxvalue, maxvalue);
+create table mc3p5 partition of mc3p for values from (11, 1, 1) to (20, 10, 10);
+create table mc3p6 partition of mc3p for values from (20, 10, 10) to (20, 20, 20);
+create table mc3p7 partition of mc3p for values from (20, 20, 20) to (maxvalue, maxvalue, maxvalue);
+explain (costs off) select * from mc3p where a = 1;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: (a = 1)
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: (a = 1)
+         ->  Seq Scan on mc3p_default mc3p_3
+               Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+explain (costs off) select * from mc3p where a = 1 and abs(b) < 1;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: ((a = 1) AND (abs(b) < 1))
+         ->  Seq Scan on mc3p_default mc3p_2
+               Filter: ((a = 1) AND (abs(b) < 1))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: ((a = 1) AND (abs(b) = 1))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: ((a = 1) AND (abs(b) = 1))
+         ->  Seq Scan on mc3p_default mc3p_3
+               Filter: ((a = 1) AND (abs(b) = 1))
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1 and c < 8;
+                          QUERY PLAN                          
+--------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: ((c < 8) AND (a = 1) AND (abs(b) = 1))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: ((c < 8) AND (a = 1) AND (abs(b) = 1))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) select * from mc3p where a = 10 and abs(b) between 5 and 35;
+                              QUERY PLAN                               
+-----------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on mc3p1 mc3p_1
+               Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+         ->  Seq Scan on mc3p2 mc3p_2
+               Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+         ->  Seq Scan on mc3p3 mc3p_3
+               Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+         ->  Seq Scan on mc3p4 mc3p_4
+               Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+         ->  Seq Scan on mc3p_default mc3p_5
+               Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+explain (costs off) select * from mc3p where a > 10;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p5 mc3p_1
+               Filter: (a > 10)
+         ->  Seq Scan on mc3p6 mc3p_2
+               Filter: (a > 10)
+         ->  Seq Scan on mc3p7 mc3p_3
+               Filter: (a > 10)
+         ->  Seq Scan on mc3p_default mc3p_4
+               Filter: (a > 10)
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from mc3p where a >= 10;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p1 mc3p_1
+               Filter: (a >= 10)
+         ->  Seq Scan on mc3p2 mc3p_2
+               Filter: (a >= 10)
+         ->  Seq Scan on mc3p3 mc3p_3
+               Filter: (a >= 10)
+         ->  Seq Scan on mc3p4 mc3p_4
+               Filter: (a >= 10)
+         ->  Seq Scan on mc3p5 mc3p_5
+               Filter: (a >= 10)
+         ->  Seq Scan on mc3p6 mc3p_6
+               Filter: (a >= 10)
+         ->  Seq Scan on mc3p7 mc3p_7
+               Filter: (a >= 10)
+         ->  Seq Scan on mc3p_default mc3p_8
+               Filter: (a >= 10)
+ Optimizer: Postgres query optimizer
+(19 rows)
+
+explain (costs off) select * from mc3p where a < 10;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: (a < 10)
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: (a < 10)
+         ->  Seq Scan on mc3p_default mc3p_3
+               Filter: (a < 10)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+explain (costs off) select * from mc3p where a <= 10 and abs(b) < 10;
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: ((a <= 10) AND (abs(b) < 10))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: ((a <= 10) AND (abs(b) < 10))
+         ->  Seq Scan on mc3p2 mc3p_3
+               Filter: ((a <= 10) AND (abs(b) < 10))
+         ->  Seq Scan on mc3p_default mc3p_4
+               Filter: ((a <= 10) AND (abs(b) < 10))
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from mc3p where a = 11 and abs(b) = 0;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc3p_default mc3p
+         Filter: ((a = 11) AND (abs(b) = 0))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from mc3p where a = 20 and abs(b) = 10 and c = 100;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc3p6 mc3p
+         Filter: ((a = 20) AND (c = 100) AND (abs(b) = 10))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from mc3p where a > 20;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p7 mc3p_1
+               Filter: (a > 20)
+         ->  Seq Scan on mc3p_default mc3p_2
+               Filter: (a > 20)
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) select * from mc3p where a >= 20;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p5 mc3p_1
+               Filter: (a >= 20)
+         ->  Seq Scan on mc3p6 mc3p_2
+               Filter: (a >= 20)
+         ->  Seq Scan on mc3p7 mc3p_3
+               Filter: (a >= 20)
+         ->  Seq Scan on mc3p_default mc3p_4
+               Filter: (a >= 20)
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20);
+                                                              QUERY PLAN                                                               
+---------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p1 mc3p_1
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+         ->  Seq Scan on mc3p2 mc3p_2
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+         ->  Seq Scan on mc3p5 mc3p_3
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+         ->  Seq Scan on mc3p_default mc3p_4
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1;
+                                                                    QUERY PLAN                                                                    
+--------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+         ->  Seq Scan on mc3p2 mc3p_3
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+         ->  Seq Scan on mc3p5 mc3p_4
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+         ->  Seq Scan on mc3p_default mc3p_5
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1 or a = 1;
+                                                                         QUERY PLAN                                                                          
+-------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+         ->  Seq Scan on mc3p2 mc3p_3
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+         ->  Seq Scan on mc3p5 mc3p_4
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+         ->  Seq Scan on mc3p_default mc3p_5
+               Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+explain (costs off) select * from mc3p where a = 1 or abs(b) = 1 or c = 1;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p2 mc3p_3
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p3 mc3p_4
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p4 mc3p_5
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p5 mc3p_6
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p6 mc3p_7
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p7 mc3p_8
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+         ->  Seq Scan on mc3p_default mc3p_9
+               Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 10);
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Gather Motion 2:1  (slice1; segments: 2)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+         ->  Seq Scan on mc3p2 mc3p_3
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+         ->  Seq Scan on mc3p3 mc3p_4
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+         ->  Seq Scan on mc3p4 mc3p_5
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+         ->  Seq Scan on mc3p_default mc3p_6
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 9);
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Gather Motion 2:1  (slice1; segments: 2)
+   ->  Append
+         ->  Seq Scan on mc3p0 mc3p_1
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+         ->  Seq Scan on mc3p1 mc3p_2
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+         ->  Seq Scan on mc3p2 mc3p_3
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+         ->  Seq Scan on mc3p_default mc3p_4
+               Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+-- a simpler multi-column keys case
+create table mc2p (a int, b int) partition by range (a, b);
+create table mc2p_default partition of mc2p default;
+create table mc2p0 partition of mc2p for values from (minvalue, minvalue) to (1, minvalue);
+create table mc2p1 partition of mc2p for values from (1, minvalue) to (1, 1);
+create table mc2p2 partition of mc2p for values from (1, 1) to (2, minvalue);
+create table mc2p3 partition of mc2p for values from (2, minvalue) to (2, 1);
+create table mc2p4 partition of mc2p for values from (2, 1) to (2, maxvalue);
+create table mc2p5 partition of mc2p for values from (2, maxvalue) to (maxvalue, maxvalue);
+explain (costs off) select * from mc2p where a < 2;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc2p0 mc2p_1
+               Filter: (a < 2)
+         ->  Seq Scan on mc2p1 mc2p_2
+               Filter: (a < 2)
+         ->  Seq Scan on mc2p2 mc2p_3
+               Filter: (a < 2)
+         ->  Seq Scan on mc2p_default mc2p_4
+               Filter: (a < 2)
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+explain (costs off) select * from mc2p where a = 2 and b < 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc2p3 mc2p
+         Filter: ((b < 1) AND (a = 2))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from mc2p where a > 1;
+                 QUERY PLAN                  
+---------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on mc2p2 mc2p_1
+               Filter: (a > 1)
+         ->  Seq Scan on mc2p3 mc2p_2
+               Filter: (a > 1)
+         ->  Seq Scan on mc2p4 mc2p_3
+               Filter: (a > 1)
+         ->  Seq Scan on mc2p5 mc2p_4
+               Filter: (a > 1)
+         ->  Seq Scan on mc2p_default mc2p_5
+               Filter: (a > 1)
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+explain (costs off) select * from mc2p where a = 1 and b > 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc2p2 mc2p
+         Filter: ((b > 1) AND (a = 1))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+-- all partitions but the default one should be pruned
+explain (costs off) select * from mc2p where a = 1 and b is null;
+                QUERY PLAN                 
+-------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc2p_default mc2p
+         Filter: ((b IS NULL) AND (a = 1))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from mc2p where a is null and b is null;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc2p_default mc2p
+         Filter: ((a IS NULL) AND (b IS NULL))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from mc2p where a is null and b = 1;
+                QUERY PLAN                 
+-------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc2p_default mc2p
+         Filter: ((a IS NULL) AND (b = 1))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from mc2p where a is null;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on mc2p_default mc2p
+         Filter: (a IS NULL)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from mc2p where b is null;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on mc2p_default mc2p
+         Filter: (b IS NULL)
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+-- boolean partitioning
+create table boolpart (a bool) partition by list (a);
+create table boolpart_default partition of boolpart default;
+create table boolpart_t partition of boolpart for values in ('true');
+create table boolpart_f partition of boolpart for values in ('false');
+explain (costs off) select * from boolpart where a in (true, false);
+                      QUERY PLAN                      
+------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on boolpart_f
+               Filter: (a = ANY ('{t,f}'::boolean[]))
+         ->  Seq Scan on boolpart_t
+               Filter: (a = ANY ('{t,f}'::boolean[]))
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) select * from boolpart where a = false;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on boolpart_f
+               Filter: (NOT a)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from boolpart where not a = false;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on boolpart_t
+               Filter: a
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from boolpart where a is true or a is not true;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on boolpart_f
+               Filter: ((a IS TRUE) OR (a IS NOT TRUE))
+         ->  Seq Scan on boolpart_t
+               Filter: ((a IS TRUE) OR (a IS NOT TRUE))
+         ->  Seq Scan on boolpart_default
+               Filter: ((a IS TRUE) OR (a IS NOT TRUE))
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from boolpart where a is not true;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on boolpart_f
+               Filter: (a IS NOT TRUE)
+         ->  Seq Scan on boolpart_default
+               Filter: (a IS NOT TRUE)
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) select * from boolpart where a is not true and a is not false;
+                          QUERY PLAN                          
+--------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on boolpart_default
+               Filter: ((a IS NOT TRUE) AND (a IS NOT FALSE))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from boolpart where a is unknown;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on boolpart_default
+               Filter: (a IS UNKNOWN)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from boolpart where a is not unknown;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on boolpart_f
+               Filter: (a IS NOT UNKNOWN)
+         ->  Seq Scan on boolpart_t
+               Filter: (a IS NOT UNKNOWN)
+ Optimizer: GPORCA
+(7 rows)
+
+create table boolrangep (a bool, b bool, c int) partition by range (a,b,c);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table boolrangep_tf partition of boolrangep for values from ('true', 'false', 0) to ('true', 'false', 100);
+NOTICE:  table has parent, setting distribution columns to match parent table
+create table boolrangep_ft partition of boolrangep for values from ('false', 'true', 0) to ('false', 'true', 100);
+NOTICE:  table has parent, setting distribution columns to match parent table
+create table boolrangep_ff1 partition of boolrangep for values from ('false', 'false', 0) to ('false', 'false', 50);
+NOTICE:  table has parent, setting distribution columns to match parent table
+create table boolrangep_ff2 partition of boolrangep for values from ('false', 'false', 50) to ('false', 'false', 100);
+NOTICE:  table has parent, setting distribution columns to match parent table
+-- try a more complex case that's been known to trip up pruning in the past
+explain (costs off)  select * from boolrangep where not a and not b and c = 25;
+                     QUERY PLAN                     
+----------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on boolrangep_ff1 boolrangep
+         Filter: ((NOT a) AND (NOT b) AND (c = 25))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+-- test scalar-to-array operators
+create table coercepart (a varchar) partition by list (a);
+create table coercepart_ab partition of coercepart for values in ('ab');
+create table coercepart_bc partition of coercepart for values in ('bc');
+create table coercepart_cd partition of coercepart for values in ('cd');
+explain (costs off) select * from coercepart where a in ('ab', to_char(125, '999'));
+                           QUERY PLAN                            
+-----------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ANY ('{ab," 125"}'::text[]))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from coercepart where a ~ any ('{ab}');
+                        QUERY PLAN                        
+----------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text ~ ANY ('{ab}'::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text ~ ANY ('{ab}'::text[]))
+         ->  Seq Scan on coercepart_cd
+               Filter: ((a)::text ~ ANY ('{ab}'::text[]))
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from coercepart where a !~ all ('{ab}');
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text !~ ALL ('{ab}'::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text !~ ALL ('{ab}'::text[]))
+         ->  Seq Scan on coercepart_cd
+               Filter: ((a)::text !~ ALL ('{ab}'::text[]))
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from coercepart where a ~ any ('{ab,bc}');
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text ~ ANY ('{ab,bc}'::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text ~ ANY ('{ab,bc}'::text[]))
+         ->  Seq Scan on coercepart_cd
+               Filter: ((a)::text ~ ANY ('{ab,bc}'::text[]))
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from coercepart where a !~ all ('{ab,bc}');
+                          QUERY PLAN                          
+--------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text !~ ALL ('{ab,bc}'::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text !~ ALL ('{ab,bc}'::text[]))
+         ->  Seq Scan on coercepart_cd
+               Filter: ((a)::text !~ ALL ('{ab,bc}'::text[]))
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from coercepart where a = any ('{ab,bc}');
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ANY ('{ab,bc}'::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text = ANY ('{ab,bc}'::text[]))
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) select * from coercepart where a = any ('{ab,null}');
+                          QUERY PLAN                           
+---------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ANY ('{ab,NULL}'::text[]))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from coercepart where a = any (null::text[]);
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ANY (NULL::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text = ANY (NULL::text[]))
+         ->  Seq Scan on coercepart_cd
+               Filter: ((a)::text = ANY (NULL::text[]))
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from coercepart where a = all ('{ab}');
+                        QUERY PLAN                        
+----------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ALL ('{ab}'::text[]))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from coercepart where a = all ('{ab,bc}');
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ALL ('{ab,bc}'::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text = ALL ('{ab,bc}'::text[]))
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) select * from coercepart where a = all ('{ab,null}');
+                          QUERY PLAN                           
+---------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ALL ('{ab,NULL}'::text[]))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from coercepart where a = all (null::text[]);
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coercepart_ab
+               Filter: ((a)::text = ALL (NULL::text[]))
+         ->  Seq Scan on coercepart_bc
+               Filter: ((a)::text = ALL (NULL::text[]))
+         ->  Seq Scan on coercepart_cd
+               Filter: ((a)::text = ALL (NULL::text[]))
+ Optimizer: GPORCA
+(9 rows)
+
+drop table coercepart;
+CREATE TABLE part (a INT, b INT) PARTITION BY LIST (a);
+CREATE TABLE part_p1 PARTITION OF part FOR VALUES IN (-2,-1,0,1,2);
+CREATE TABLE part_p2 PARTITION OF part DEFAULT PARTITION BY RANGE(a);
+CREATE TABLE part_p2_p1 PARTITION OF part_p2 DEFAULT;
+CREATE TABLE part_rev (b INT, c INT, a INT);
+-- The distribution key must be the same for partition tables.
+ALTER TABLE part_rev SET DISTRIBUTED BY(a);
+ALTER TABLE part ATTACH PARTITION part_rev FOR VALUES IN (3);  -- fail
+ERROR:  table "part_rev" contains column "c" not found in parent "part"
+DETAIL:  The new partition may contain only the columns present in parent.
+ALTER TABLE part_rev DROP COLUMN c;
+ALTER TABLE part ATTACH PARTITION part_rev FOR VALUES IN (3);  -- now it's ok
+INSERT INTO part VALUES (-1,-1), (1,1), (2,NULL), (NULL,-2),(NULL,NULL);
+EXPLAIN (COSTS OFF) SELECT tableoid::regclass as part, a, b FROM part WHERE a IS NULL ORDER BY 1, 2, 3;
+                          QUERY PLAN                           
+---------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   Merge Key: ((part.tableoid)::regclass), part.a, part.b
+   ->  Sort
+         Sort Key: ((part.tableoid)::regclass), part.a, part.b
+         ->  Seq Scan on part_p2_p1 part
+               Filter: (a IS NULL)
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+EXPLAIN (VERBOSE, COSTS OFF) SELECT * FROM part p(x) ORDER BY x;
+                             QUERY PLAN                             
+--------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: p.x, p.b
+   Merge Key: p.x
+   ->  Sort
+         Output: p.x, p.b
+         Sort Key: p.x
+         ->  Append
+               ->  Seq Scan on public.part_p1 p_1
+                     Output: p_1.x, p_1.b
+               ->  Seq Scan on public.part_rev p_2
+                     Output: p_2.x, p_2.b
+               ->  Seq Scan on public.part_p2_p1 p_3
+                     Output: p_3.x, p_3.b
+ Settings: optimizer = 'on', plan_cache_mode = 'force_generic_plan'
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+--
+-- some more cases
+--
+--
+-- pruning for partitioned table appearing inside a sub-query
+--
+-- pruning won't work for mc3p, because some keys are Params
+explain (costs off) select * from mc2p t1, lateral (select count(*) from mc3p t2 where t2.a = t1.b and abs(t2.b) = 1 and t2.c = 1) s where t1.a = 1;
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Nested Loop
+   ->  Gather Motion 1:1  (slice1; segments: 1)
+         ->  Append
+               ->  Seq Scan on mc2p1 t1_1
+                     Filter: (a = 1)
+               ->  Seq Scan on mc2p2 t1_2
+                     Filter: (a = 1)
+               ->  Seq Scan on mc2p_default t1_3
+                     Filter: (a = 1)
+   ->  Materialize
+         ->  Aggregate
+               ->  Result
+                     Filter: (t2.a = t1.b)
+                     ->  Materialize
+                           ->  Gather Motion 3:1  (slice2; segments: 3)
+                                 ->  Append
+                                       ->  Seq Scan on mc3p0 t2_1
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p1 t2_2
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p2 t2_3
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p3 t2_4
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p4 t2_5
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p5 t2_6
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p6 t2_7
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p7 t2_8
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p_default t2_9
+                                             Filter: ((c = 1) AND (abs(b) = 1))
+ Optimizer: Postgres query optimizer
+(35 rows)
+
+-- pruning should work fine, because values for a prefix of keys (a, b) are
+-- available
+explain (costs off) select * from mc2p t1, lateral (select count(*) from mc3p t2 where t2.c = t1.b and abs(t2.b) = 1 and t2.a = 1) s where t1.a = 1;
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Nested Loop
+   ->  Gather Motion 1:1  (slice1; segments: 1)
+         ->  Append
+               ->  Seq Scan on mc2p1 t1_1
+                     Filter: (a = 1)
+               ->  Seq Scan on mc2p2 t1_2
+                     Filter: (a = 1)
+               ->  Seq Scan on mc2p_default t1_3
+                     Filter: (a = 1)
+   ->  Materialize
+         ->  Aggregate
+               ->  Result
+                     Filter: (t2.c = t1.b)
+                     ->  Materialize
+                           ->  Gather Motion 1:1  (slice2; segments: 1)
+                                 ->  Append
+                                       ->  Seq Scan on mc3p0 t2_1
+                                             Filter: ((a = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p1 t2_2
+                                             Filter: ((a = 1) AND (abs(b) = 1))
+                                       ->  Seq Scan on mc3p_default t2_3
+                                             Filter: ((a = 1) AND (abs(b) = 1))
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+-- also here, because values for all keys are provided
+explain (costs off) select * from mc2p t1, lateral (select count(*) from mc3p t2 where t2.a = 1 and abs(t2.b) = 1 and t2.c = 1) s where t1.a = 1;
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Nested Loop
+         ->  Redistribute Motion 1:3  (slice2; segments: 1)
+               Hash Key: 1
+               ->  Aggregate
+                     ->  Gather Motion 1:1  (slice3; segments: 1)
+                           ->  Seq Scan on mc3p1 t2
+                                 Filter: ((a = 1) AND (c = 1) AND (abs(b) = 1))
+         ->  Append
+               ->  Seq Scan on mc2p1 t1_1
+                     Filter: (a = 1)
+               ->  Seq Scan on mc2p2 t1_2
+                     Filter: (a = 1)
+               ->  Seq Scan on mc2p_default t1_3
+                     Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+--
+-- pruning with clauses containing <> operator
+--
+-- doesn't prune range partitions
+create table rp (a int) partition by range (a);
+create table rp0 partition of rp for values from (minvalue) to (1);
+create table rp1 partition of rp for values from (1) to (2);
+create table rp2 partition of rp for values from (2) to (maxvalue);
+explain (costs off) select * from rp where a <> 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rp0
+               Filter: (a <> 1)
+         ->  Seq Scan on rp1
+               Filter: (a <> 1)
+         ->  Seq Scan on rp2
+               Filter: (a <> 1)
+ Optimizer: GPORCA
+(9 rows)
+
+explain (costs off) select * from rp where a <> 1 and a <> 2;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rp0
+               Filter: ((a <> 1) AND (a <> 2))
+         ->  Seq Scan on rp1
+               Filter: ((a <> 1) AND (a <> 2))
+         ->  Seq Scan on rp2
+               Filter: ((a <> 1) AND (a <> 2))
+ Optimizer: GPORCA
+(9 rows)
+
+-- null partition should be eliminated due to strict <> clause.
+explain (costs off) select * from lp where a <> 'a';
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_ad
+               Filter: (a <> 'a'::bpchar)
+         ->  Seq Scan on lp_bc
+               Filter: (a <> 'a'::bpchar)
+         ->  Seq Scan on lp_ef
+               Filter: (a <> 'a'::bpchar)
+         ->  Seq Scan on lp_g
+               Filter: (a <> 'a'::bpchar)
+         ->  Seq Scan on lp_default
+               Filter: (a <> 'a'::bpchar)
+ Optimizer: GPORCA
+(13 rows)
+
+-- ensure we detect contradictions in clauses; a can't be NULL and NOT NULL.
+explain (costs off) select * from lp where a <> 'a' and a is null;
+              QUERY PLAN               
+---------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+explain (costs off) select * from lp where (a <> 'a' and a <> 'd') or a is null;
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on lp_bc
+               Filter: (((a <> 'a'::bpchar) AND (a <> 'd'::bpchar)) OR (a IS NULL))
+         ->  Seq Scan on lp_ef
+               Filter: (((a <> 'a'::bpchar) AND (a <> 'd'::bpchar)) OR (a IS NULL))
+         ->  Seq Scan on lp_g
+               Filter: (((a <> 'a'::bpchar) AND (a <> 'd'::bpchar)) OR (a IS NULL))
+         ->  Seq Scan on lp_null
+               Filter: (((a <> 'a'::bpchar) AND (a <> 'd'::bpchar)) OR (a IS NULL))
+         ->  Seq Scan on lp_default
+               Filter: (((a <> 'a'::bpchar) AND (a <> 'd'::bpchar)) OR (a IS NULL))
+ Optimizer: GPORCA
+(13 rows)
+
+-- check that it also works for a partitioned table that's not root,
+-- which in this case are partitions of rlp that are themselves
+-- list-partitioned on b
+explain (costs off) select * from rlp where a = 15 and b <> 'ab' and b <> 'cd' and b <> 'xy' and b is not null;
+                                                                   QUERY PLAN                                                                   
+------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on rlp3efgh rlp_1
+               Filter: ((b IS NOT NULL) AND ((b)::text <> 'ab'::text) AND ((b)::text <> 'cd'::text) AND ((b)::text <> 'xy'::text) AND (a = 15))
+         ->  Seq Scan on rlp3_default rlp_2
+               Filter: ((b IS NOT NULL) AND ((b)::text <> 'ab'::text) AND ((b)::text <> 'cd'::text) AND ((b)::text <> 'xy'::text) AND (a = 15))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+--
+-- different collations for different keys with same expression
+--
+create table coll_pruning_multi (a text) partition by range (substr(a, 1) collate "POSIX", substr(a, 1) collate "C");
+create table coll_pruning_multi1 partition of coll_pruning_multi for values from ('a', 'a') to ('a', 'e');
+create table coll_pruning_multi2 partition of coll_pruning_multi for values from ('a', 'e') to ('a', 'z');
+create table coll_pruning_multi3 partition of coll_pruning_multi for values from ('b', 'a') to ('b', 'e');
+-- no pruning, because no value for the leading key
+explain (costs off) select * from coll_pruning_multi where substr(a, 1) = 'e' collate "C";
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coll_pruning_multi1 coll_pruning_multi_1
+               Filter: (substr(a, 1) = 'e'::text COLLATE "C")
+         ->  Seq Scan on coll_pruning_multi2 coll_pruning_multi_2
+               Filter: (substr(a, 1) = 'e'::text COLLATE "C")
+         ->  Seq Scan on coll_pruning_multi3 coll_pruning_multi_3
+               Filter: (substr(a, 1) = 'e'::text COLLATE "C")
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+-- pruning, with a value provided for the leading key
+explain (costs off) select * from coll_pruning_multi where substr(a, 1) = 'a' collate "POSIX";
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on coll_pruning_multi1 coll_pruning_multi_1
+               Filter: (substr(a, 1) = 'a'::text COLLATE "POSIX")
+         ->  Seq Scan on coll_pruning_multi2 coll_pruning_multi_2
+               Filter: (substr(a, 1) = 'a'::text COLLATE "POSIX")
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+-- pruning, with values provided for both keys
+explain (costs off) select * from coll_pruning_multi where substr(a, 1) = 'e' collate "C" and substr(a, 1) = 'a' collate "POSIX";
+                                               QUERY PLAN                                                
+---------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on coll_pruning_multi2 coll_pruning_multi
+         Filter: ((substr(a, 1) = 'e'::text COLLATE "C") AND (substr(a, 1) = 'a'::text COLLATE "POSIX"))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+--
+-- LIKE operators don't prune
+--
+create table like_op_noprune (a text) partition by list (a);
+create table like_op_noprune1 partition of like_op_noprune for values in ('ABC');
+create table like_op_noprune2 partition of like_op_noprune for values in ('BCD');
+explain (costs off) select * from like_op_noprune where a like '%BC';
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on like_op_noprune1
+               Filter: (a ~~ '%BC'::text)
+         ->  Seq Scan on like_op_noprune2
+               Filter: (a ~~ '%BC'::text)
+ Optimizer: GPORCA
+(7 rows)
+
+--
+-- tests wherein clause value requires a cross-type comparison function
+--
+create table lparted_by_int2 (a smallint) partition by list (a);
+create table lparted_by_int2_1 partition of lparted_by_int2 for values in (1);
+create table lparted_by_int2_16384 partition of lparted_by_int2 for values in (16384);
+explain (costs off) select * from lparted_by_int2 where a = 100000000000000;
+              QUERY PLAN               
+---------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+create table rparted_by_int2 (a smallint) partition by range (a);
+create table rparted_by_int2_1 partition of rparted_by_int2 for values from (1) to (10);
+create table rparted_by_int2_16384 partition of rparted_by_int2 for values from (10) to (16384);
+-- all partitions pruned
+explain (costs off) select * from rparted_by_int2 where a > 100000000000000;
+             QUERY PLAN              
+-------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+create table rparted_by_int2_maxvalue partition of rparted_by_int2 for values from (16384) to (maxvalue);
+-- all partitions but rparted_by_int2_maxvalue pruned
+explain (costs off) select * from rparted_by_int2 where a > 100000000000000;
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on rparted_by_int2_maxvalue
+               Filter: (a > '100000000000000'::bigint)
+ Optimizer: GPORCA
+(5 rows)
+
+drop table lp, coll_pruning, rlp, mc3p, mc2p, boolpart, boolrangep, rp, coll_pruning_multi, like_op_noprune, lparted_by_int2, rparted_by_int2;
+--
+-- Test runtime partition pruning
+--
+create table ab (a int not null, b int not null) partition by list (a);
+create table ab_a2 partition of ab for values in(2) partition by list (b);
+create table ab_a2_b1 partition of ab_a2 for values in (1);
+create table ab_a2_b2 partition of ab_a2 for values in (2);
+create table ab_a2_b3 partition of ab_a2 for values in (3);
+create table ab_a1 partition of ab for values in(1) partition by list (b);
+create table ab_a1_b1 partition of ab_a1 for values in (1);
+create table ab_a1_b2 partition of ab_a1 for values in (2);
+create table ab_a1_b3 partition of ab_a1 for values in (3);
+create table ab_a3 partition of ab for values in(3) partition by list (b);
+create table ab_a3_b1 partition of ab_a3 for values in (1);
+create table ab_a3_b2 partition of ab_a3 for values in (2);
+create table ab_a3_b3 partition of ab_a3 for values in (3);
+-- Disallow index only scans as concurrent transactions may stop visibility
+-- bits being set causing "Heap Fetches" to be unstable in the EXPLAIN ANALYZE
+-- output.
+set enable_indexonlyscan = off;
+prepare ab_q1 (int, int, int) as
+select * from ab where a between $1 and $2 and b <= $3;
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (2, 2, 3);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 6
+         ->  Seq Scan on ab_a2_b1 ab_1 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+         ->  Seq Scan on ab_a2_b2 ab_2 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+         ->  Seq Scan on ab_a2_b3 ab_3 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (1, 2, 3);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 3
+         ->  Seq Scan on ab_a1_b1 ab_1 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+         ->  Seq Scan on ab_a1_b2 ab_2 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+         ->  Seq Scan on ab_a1_b3 ab_3 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+         ->  Seq Scan on ab_a2_b1 ab_4 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+         ->  Seq Scan on ab_a2_b2 ab_5 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+         ->  Seq Scan on ab_a2_b3 ab_6 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b <= $3))
+ Optimizer: Postgres query optimizer
+(16 rows)
+
+deallocate ab_q1;
+-- Runtime pruning after optimizer pruning
+prepare ab_q1 (int, int) as
+select a from ab where a between $1 and $2 and b < 3;
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (2, 2);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 4
+         ->  Seq Scan on ab_a2_b1 ab_1 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < 3))
+         ->  Seq Scan on ab_a2_b2 ab_2 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < 3))
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (2, 4);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 2
+         ->  Seq Scan on ab_a2_b1 ab_1 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < 3))
+         ->  Seq Scan on ab_a2_b2 ab_2 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < 3))
+         ->  Seq Scan on ab_a3_b1 ab_3 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < 3))
+         ->  Seq Scan on ab_a3_b2 ab_4 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < 3))
+ Optimizer: Postgres query optimizer
+(12 rows)
+
+-- Ensure a mix of PARAM_EXTERN and PARAM_EXEC Params work together at
+-- different levels of partitioning.
+prepare ab_q2 (int, int) as
+select a from ab where a between $1 and $2 and b < (select 3);
+explain (analyze, costs off, summary off, timing off) execute ab_q2 (2, 2);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 6
+         ->  Seq Scan on ab_a2_b1 ab_1 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < $0))
+         ->  Seq Scan on ab_a2_b2 ab_2 (actual rows=0 loops=1)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < $0))
+         ->  Seq Scan on ab_a2_b3 ab_3 (never executed)
+               Filter: ((a >= $1) AND (a <= $2) AND (b < $0))
+ Optimizer: Postgres query optimizer
+(12 rows)
+
+-- As above, but swap the PARAM_EXEC Param to the first partition level
+prepare ab_q3 (int, int) as
+select a from ab where b between $1 and $2 and a < (select 3);
+explain (analyze, costs off, summary off, timing off) execute ab_q3 (2, 2);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 6
+         ->  Seq Scan on ab_a1_b2 ab_1 (actual rows=0 loops=1)
+               Filter: ((b >= $1) AND (b <= $2) AND (a < $0))
+         ->  Seq Scan on ab_a2_b2 ab_2 (actual rows=0 loops=1)
+               Filter: ((b >= $1) AND (b <= $2) AND (a < $0))
+         ->  Seq Scan on ab_a3_b2 ab_3 (never executed)
+               Filter: ((b >= $1) AND (b <= $2) AND (a < $0))
+ Optimizer: Postgres query optimizer
+(12 rows)
+
+-- Test a backwards Append scan
+create table list_part (a int) partition by list (a);
+create table list_part1 partition of list_part for values in (1);
+create table list_part2 partition of list_part for values in (2);
+create table list_part3 partition of list_part for values in (3);
+create table list_part4 partition of list_part for values in (4);
+insert into list_part select generate_series(1,4);
+begin;
+-- Don't select an actual value out of the table as the order of the Append's
+-- subnodes may not be stable.
+declare cur SCROLL CURSOR for select 1 from list_part where a > (select 1) and a < (select 4);
+-- move beyond the final row
+move 3 from cur;
+-- Ensure we get two rows.
+fetch backward all from cur;
+ERROR:  backward scan is not supported in this version of Apache Cloudberry
+commit;
+begin;
+-- Test run-time pruning using stable functions
+create function list_part_fn(int) returns int as $$ begin return $1; end;$$ language plpgsql stable;
+-- Ensure pruning works using a stable function containing no Vars
+explain (analyze, costs off, summary off, timing off) select * from list_part where a = list_part_fn(1);
+NOTICE:  One or more columns in the following table(s) do not have statistics: list_part
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1) (actual rows=1 loops=1)
+   ->  Append (actual rows=1 loops=1)
+         ->  Seq Scan on list_part1 (actual rows=1 loops=1)
+               Filter: (a = 1)
+ Optimizer: GPORCA
+(5 rows)
+
+-- Ensure pruning does not take place when the function has a Var parameter
+explain (analyze, costs off, summary off, timing off) select * from list_part where a = list_part_fn(a);
+NOTICE:  One or more columns in the following table(s) do not have statistics: list_part
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=4 loops=1)
+   ->  Append (actual rows=3 loops=1)
+         ->  Seq Scan on list_part1 (actual rows=1 loops=1)
+               Filter: (a = list_part_fn(a))
+         ->  Seq Scan on list_part2 (actual rows=1 loops=1)
+               Filter: (a = list_part_fn(a))
+         ->  Seq Scan on list_part3 (actual rows=1 loops=1)
+               Filter: (a = list_part_fn(a))
+         ->  Seq Scan on list_part4 (actual rows=1 loops=1)
+               Filter: (a = list_part_fn(a))
+ Optimizer: GPORCA
+(11 rows)
+
+-- Ensure pruning does not take place when the expression contains a Var.
+explain (analyze, costs off, summary off, timing off) select * from list_part where a = list_part_fn(1) + a;
+NOTICE:  One or more columns in the following table(s) do not have statistics: list_part
+HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on list_part1 (actual rows=0 loops=1)
+               Filter: (a = (1 + a))
+         ->  Seq Scan on list_part2 (actual rows=0 loops=1)
+               Filter: (a = (1 + a))
+               Rows Removed by Filter: 1
+         ->  Seq Scan on list_part3 (actual rows=0 loops=1)
+               Filter: (a = (1 + a))
+               Rows Removed by Filter: 1
+         ->  Seq Scan on list_part4 (actual rows=0 loops=1)
+               Filter: (a = (1 + a))
+               Rows Removed by Filter: 1
+ Optimizer: GPORCA
+(14 rows)
+
+rollback;
+drop table list_part;
+-- Parallel append
+-- Parallel queries won't necessarily get as many workers as the planner
+-- asked for.  This affects not only the "Workers Launched:" field of EXPLAIN
+-- results, but also row counts and loop counts for parallel scans, Gathers,
+-- and everything in between.  This function filters out the values we can't
+-- rely on to be stable.
+-- This removes enough info that you might wonder why bother with EXPLAIN
+-- ANALYZE at all.  The answer is that we need to see '(never executed)'
+-- notations because that's the only way to verify runtime pruning.
+create function explain_parallel_append(text) returns setof text
+language plpgsql as
+$$
+declare
+    ln text;
+begin
+    set local enable_parallel = off;
+    for ln in
+        execute format('explain (analyze, costs off, summary off, timing off) %s',
+            $1)
+    loop
+        ln := regexp_replace(ln, 'Workers Launched: \d+', 'Workers Launched: N');
+        ln := regexp_replace(ln, 'actual rows=\d+ loops=\d+', 'actual rows=N loops=N');
+        ln := regexp_replace(ln, 'Rows Removed by Filter: \d+', 'Rows Removed by Filter: N');
+        return next ln;
+    end loop;
+    reset enable_parallel;
+end;
+$$;
+prepare ab_q4 (int, int) as
+select avg(a) from ab where a between $1 and $2 and b < 4;
+-- Encourage use of parallel plans
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set min_parallel_table_scan_size = 0;
+set max_parallel_workers_per_gather = 2;
+select explain_parallel_append('execute ab_q4 (2, 2)');
+                          explain_parallel_append                          
+---------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Append (actual rows=N loops=N)
+                     Subplans Removed: 6
+                     ->  Seq Scan on ab_a2_b1 ab_1 (actual rows=N loops=N)
+                           Filter: ((a >= $1) AND (a <= $2) AND (b < 4))
+                     ->  Seq Scan on ab_a2_b2 ab_2 (actual rows=N loops=N)
+                           Filter: ((a >= $1) AND (a <= $2) AND (b < 4))
+                     ->  Seq Scan on ab_a2_b3 ab_3 (actual rows=N loops=N)
+                           Filter: ((a >= $1) AND (a <= $2) AND (b < 4))
+ Optimizer: Postgres query optimizer
+(12 rows)
+
+-- Test run-time pruning with IN lists.
+prepare ab_q5 (int, int, int) as
+select avg(a) from ab where a in($1,$2,$3) and b < 4;
+select explain_parallel_append('execute ab_q5 (1, 1, 1)');
+                            explain_parallel_append                            
+-------------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Append (actual rows=N loops=N)
+                     Subplans Removed: 6
+                     ->  Seq Scan on ab_a1_b1 ab_1 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+                     ->  Seq Scan on ab_a1_b2 ab_2 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+                     ->  Seq Scan on ab_a1_b3 ab_3 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+ Optimizer: Postgres query optimizer
+(12 rows)
+
+select explain_parallel_append('execute ab_q5 (2, 3, 3)');
+                            explain_parallel_append                            
+-------------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Append (actual rows=N loops=N)
+                     Subplans Removed: 3
+                     ->  Seq Scan on ab_a2_b1 ab_1 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+                     ->  Seq Scan on ab_a2_b2 ab_2 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+                     ->  Seq Scan on ab_a2_b3 ab_3 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+                     ->  Seq Scan on ab_a3_b1 ab_4 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+                     ->  Seq Scan on ab_a3_b2 ab_5 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+                     ->  Seq Scan on ab_a3_b3 ab_6 (actual rows=N loops=N)
+                           Filter: ((b < 4) AND (a = ANY (ARRAY[$1, $2, $3])))
+ Optimizer: Postgres query optimizer
+(18 rows)
+
+-- Try some params whose values do not belong to any partition.
+select explain_parallel_append('execute ab_q5 (33, 44, 55)');
+                        explain_parallel_append                         
+------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Append (actual rows=N loops=N)
+                     Subplans Removed: 9
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+-- Test Parallel Append with PARAM_EXEC Params
+select explain_parallel_append('select count(*) from ab where (a = (select 1) or a = (select 3)) and b = 2');
+                          explain_parallel_append                          
+---------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=N loops=N)
+   InitPlan 2 (returns $1)  (slice3)
+     ->  Result (actual rows=N loops=N)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Append (actual rows=N loops=N)
+                     ->  Seq Scan on ab_a1_b2 ab_1 (actual rows=N loops=N)
+                           Filter: ((b = 2) AND ((a = $0) OR (a = $1)))
+                     ->  Seq Scan on ab_a2_b2 ab_2 (never executed)
+                           Filter: ((b = 2) AND ((a = $0) OR (a = $1)))
+                     ->  Seq Scan on ab_a3_b2 ab_3 (actual rows=N loops=N)
+                           Filter: ((b = 2) AND ((a = $0) OR (a = $1)))
+ Optimizer: Postgres query optimizer
+(15 rows)
+
+-- Test pruning during parallel nested loop query
+create table lprt_a (a int not null);
+-- Insert some values we won't find in ab
+insert into lprt_a select 0 from generate_series(1,100);
+-- and insert some values that we should find.
+insert into lprt_a values(1),(1);
+analyze lprt_a;
+create index ab_a2_b1_a_idx on ab_a2_b1 (a);
+create index ab_a2_b2_a_idx on ab_a2_b2 (a);
+create index ab_a2_b3_a_idx on ab_a2_b3 (a);
+create index ab_a1_b1_a_idx on ab_a1_b1 (a);
+create index ab_a1_b2_a_idx on ab_a1_b2 (a);
+create index ab_a1_b3_a_idx on ab_a1_b3 (a);
+create index ab_a3_b1_a_idx on ab_a3_b1 (a);
+create index ab_a3_b2_a_idx on ab_a3_b2 (a);
+create index ab_a3_b3_a_idx on ab_a3_b3 (a);
+set enable_hashjoin = 0;
+set enable_mergejoin = 0;
+set enable_memoize = 0;
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(0, 0, 1)');
+                                        explain_parallel_append                                        
+-------------------------------------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 1:1  (slice1; segments: 1) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Merge Join (actual rows=N loops=N)
+                     Merge Cond: (ab.a = a.a)
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: ab.a
+                           Sort Method:  quicksort  Memory: 25kB
+                           ->  Append (actual rows=N loops=N)
+                                 Partition Selectors: $0
+                                 ->  Bitmap Heap Scan on ab_a1_b1 ab_1 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{0,0,1}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b1_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{0,0,1}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b2 ab_2 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{0,0,1}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b2_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{0,0,1}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b3 ab_3 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{0,0,1}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b3_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{0,0,1}'::integer[]))
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: a.a
+                           Sort Method:  quicksort  Memory: 60kB
+                           ->  Partition Selector (selector id: $0) (actual rows=N loops=N)
+                                 ->  Seq Scan on lprt_a a (actual rows=N loops=N)
+                                       Filter: (a = ANY ('{0,0,1}'::integer[]))
+ Optimizer: Postgres query optimizer
+(29 rows)
+
+-- Ensure the same partitions are pruned when we make the nested loop
+-- parameter an Expr rather than a plain Param.
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a + 0 where a.a in(0, 0, 1)');
+                                        explain_parallel_append                                         
+--------------------------------------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Nested Loop (actual rows=N loops=N)
+                     ->  Redistribute Motion 1:3  (slice2; segments: 1) (actual rows=N loops=N)
+                           Hash Key: (a.a + 0)
+                           ->  Seq Scan on lprt_a a (actual rows=N loops=N)
+                                 Filter: (a = ANY ('{0,0,1}'::integer[]))
+                     ->  Append (actual rows=N loops=N)
+                           ->  Index Scan using ab_a1_b1_a_idx on ab_a1_b1 ab_1 (actual rows=N loops=N)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a1_b2_a_idx on ab_a1_b2 ab_2 (actual rows=N loops=N)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a1_b3_a_idx on ab_a1_b3 ab_3 (actual rows=N loops=N)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a2_b1_a_idx on ab_a2_b1 ab_4 (never executed)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a2_b2_a_idx on ab_a2_b2 ab_5 (never executed)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a2_b3_a_idx on ab_a2_b3 ab_6 (never executed)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a3_b1_a_idx on ab_a3_b1 ab_7 (never executed)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a3_b2_a_idx on ab_a3_b2 ab_8 (never executed)
+                                 Index Cond: (a = (a.a + 0))
+                           ->  Index Scan using ab_a3_b3_a_idx on ab_a3_b3 ab_9 (never executed)
+                                 Index Cond: (a = (a.a + 0))
+ Optimizer: Postgres query optimizer
+(28 rows)
+
+insert into lprt_a values(3),(3);
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(1, 0, 3)');
+                                        explain_parallel_append                                        
+-------------------------------------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 2:1  (slice1; segments: 2) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Merge Join (actual rows=N loops=N)
+                     Merge Cond: (ab.a = a.a)
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: ab.a
+                           Sort Method:  quicksort  Memory: 50kB
+                           ->  Append (actual rows=N loops=N)
+                                 Partition Selectors: $0
+                                 ->  Bitmap Heap Scan on ab_a1_b1 ab_1 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b1_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b2 ab_2 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b2_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b3 ab_3 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b3_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a3_b1 ab_4 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a3_b1_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a3_b2 ab_5 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a3_b2_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a3_b3 ab_6 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,3}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a3_b3_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,3}'::integer[]))
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: a.a
+                           Sort Method:  quicksort  Memory: 110kB
+                           ->  Partition Selector (selector id: $0) (actual rows=N loops=N)
+                                 ->  Seq Scan on lprt_a a (actual rows=N loops=N)
+                                       Filter: (a = ANY ('{1,0,3}'::integer[]))
+ Optimizer: Postgres query optimizer
+(41 rows)
+
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(1, 0, 0)');
+                                        explain_parallel_append                                        
+-------------------------------------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 1:1  (slice1; segments: 1) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Merge Join (actual rows=N loops=N)
+                     Merge Cond: (ab.a = a.a)
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: ab.a
+                           Sort Method:  quicksort  Memory: 25kB
+                           ->  Append (actual rows=N loops=N)
+                                 Partition Selectors: $0
+                                 ->  Bitmap Heap Scan on ab_a1_b1 ab_1 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b1_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b2 ab_2 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b2_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b3 ab_3 (actual rows=N loops=N)
+                                       Recheck Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b3_a_idx (actual rows=N loops=N)
+                                             Index Cond: (a = ANY ('{1,0,0}'::integer[]))
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: a.a
+                           Sort Method:  quicksort  Memory: 60kB
+                           ->  Partition Selector (selector id: $0) (actual rows=N loops=N)
+                                 ->  Seq Scan on lprt_a a (actual rows=N loops=N)
+                                       Filter: (a = ANY ('{1,0,0}'::integer[]))
+ Optimizer: Postgres query optimizer
+(29 rows)
+
+delete from lprt_a where a = 1;
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(1, 0, 0)');
+                                    explain_parallel_append                                     
+------------------------------------------------------------------------------------------------
+ Finalize Aggregate (actual rows=N loops=N)
+   ->  Gather Motion 1:1  (slice1; segments: 1) (actual rows=N loops=N)
+         ->  Partial Aggregate (actual rows=N loops=N)
+               ->  Merge Join (actual rows=N loops=N)
+                     Merge Cond: (ab.a = a.a)
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: ab.a
+                           Sort Method:  quicksort  Memory: 25kB
+                           ->  Append (actual rows=N loops=N)
+                                 Partition Selectors: $0
+                                 ->  Bitmap Heap Scan on ab_a1_b1 ab_1 (never executed)
+                                       Recheck Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b1_a_idx (never executed)
+                                             Index Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b2 ab_2 (never executed)
+                                       Recheck Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b2_a_idx (never executed)
+                                             Index Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                 ->  Bitmap Heap Scan on ab_a1_b3 ab_3 (never executed)
+                                       Recheck Cond: (a = ANY ('{1,0,0}'::integer[]))
+                                       ->  Bitmap Index Scan on ab_a1_b3_a_idx (never executed)
+                                             Index Cond: (a = ANY ('{1,0,0}'::integer[]))
+                     ->  Sort (actual rows=N loops=N)
+                           Sort Key: a.a
+                           Sort Method:  quicksort  Memory: 60kB
+                           ->  Partition Selector (selector id: $0) (actual rows=N loops=N)
+                                 ->  Seq Scan on lprt_a a (actual rows=N loops=N)
+                                       Filter: (a = ANY ('{1,0,0}'::integer[]))
+ Optimizer: Postgres query optimizer
+(29 rows)
+
+reset enable_hashjoin;
+reset enable_mergejoin;
+reset enable_memoize;
+reset parallel_setup_cost;
+reset parallel_tuple_cost;
+reset min_parallel_table_scan_size;
+reset max_parallel_workers_per_gather;
+-- Test run-time partition pruning with an initplan
+explain (analyze, costs off, summary off, timing off)
+select * from ab where a = (select max(a) from lprt_a) and b = (select max(a)-1 from lprt_a);
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Finalize Aggregate (actual rows=1 loops=1)
+           ->  Gather Motion 3:1  (slice3; segments: 3) (actual rows=3 loops=1)
+                 ->  Partial Aggregate (actual rows=1 loops=1)
+                       ->  Seq Scan on lprt_a (actual rows=100 loops=1)
+   InitPlan 2 (returns $1)  (slice4)
+     ->  Finalize Aggregate (actual rows=1 loops=1)
+           ->  Gather Motion 3:1  (slice5; segments: 3) (actual rows=3 loops=1)
+                 ->  Partial Aggregate (actual rows=1 loops=1)
+                       ->  Seq Scan on lprt_a lprt_a_1 (actual rows=100 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Bitmap Heap Scan on ab_a1_b1 ab_1 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a1_b1_a_idx (never executed)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a1_b2 ab_2 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a1_b2_a_idx (never executed)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a1_b3 ab_3 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a1_b3_a_idx (never executed)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a2_b1 ab_4 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a2_b1_a_idx (never executed)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a2_b2 ab_5 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a2_b2_a_idx (never executed)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a2_b3 ab_6 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a2_b3_a_idx (never executed)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a3_b1 ab_7 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a3_b1_a_idx (never executed)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a3_b2 ab_8 (actual rows=0 loops=1)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a3_b2_a_idx (actual rows=0 loops=1)
+                     Index Cond: (a = $0)
+         ->  Bitmap Heap Scan on ab_a3_b3 ab_9 (never executed)
+               Recheck Cond: (a = $0)
+               Filter: (b = $1)
+               ->  Bitmap Index Scan on ab_a3_b3_a_idx (never executed)
+                     Index Cond: (a = $0)
+ Optimizer: Postgres query optimizer
+(58 rows)
+
+-- Test run-time partition pruning with UNION ALL parents
+explain (analyze, costs off, summary off, timing off)
+select * from (select * from ab where a = 1 union all select * from ab) ab where b = (select 1);
+                                  QUERY PLAN                                  
+------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Append (actual rows=0 loops=1)
+               ->  Bitmap Heap Scan on ab_a1_b1 ab_11 (actual rows=0 loops=1)
+                     Recheck Cond: (a = 1)
+                     Filter: (b = $0)
+                     ->  Bitmap Index Scan on ab_a1_b1_a_idx (actual rows=0 loops=1)
+                           Index Cond: (a = 1)
+               ->  Bitmap Heap Scan on ab_a1_b2 ab_12 (never executed)
+                     Recheck Cond: (a = 1)
+                     Filter: (b = $0)
+                     ->  Bitmap Index Scan on ab_a1_b2_a_idx (never executed)
+                           Index Cond: (a = 1)
+               ->  Bitmap Heap Scan on ab_a1_b3 ab_13 (never executed)
+                     Recheck Cond: (a = 1)
+                     Filter: (b = $0)
+                     ->  Bitmap Index Scan on ab_a1_b3_a_idx (never executed)
+                           Index Cond: (a = 1)
+         ->  Seq Scan on ab_a1_b1 ab_1 (actual rows=0 loops=1)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a1_b2 ab_2 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a1_b3 ab_3 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a2_b1 ab_4 (actual rows=0 loops=1)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a2_b2 ab_5 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a2_b3 ab_6 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a3_b1 ab_7 (actual rows=0 loops=1)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a3_b2 ab_8 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a3_b3 ab_9 (never executed)
+               Filter: (b = $0)
+ Optimizer: Postgres query optimizer
+(39 rows)
+
+-- A case containing a UNION ALL with a non-partitioned child.
+explain (analyze, costs off, summary off, timing off)
+select * from (select * from ab where a = 1 union all (values(10,5)) union all select * from ab) ab where b = (select 1);
+                                  QUERY PLAN                                  
+------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Append (actual rows=0 loops=1)
+               ->  Bitmap Heap Scan on ab_a1_b1 ab_11 (actual rows=0 loops=1)
+                     Recheck Cond: (a = 1)
+                     Filter: (b = $0)
+                     ->  Bitmap Index Scan on ab_a1_b1_a_idx (actual rows=0 loops=1)
+                           Index Cond: (a = 1)
+               ->  Bitmap Heap Scan on ab_a1_b2 ab_12 (never executed)
+                     Recheck Cond: (a = 1)
+                     Filter: (b = $0)
+                     ->  Bitmap Index Scan on ab_a1_b2_a_idx (never executed)
+                           Index Cond: (a = 1)
+               ->  Bitmap Heap Scan on ab_a1_b3 ab_13 (never executed)
+                     Recheck Cond: (a = 1)
+                     Filter: (b = $0)
+                     ->  Bitmap Index Scan on ab_a1_b3_a_idx (never executed)
+                           Index Cond: (a = 1)
+         ->  Result (actual rows=0 loops=1)
+               One-Time Filter: (gp_execution_segment() = 0)
+               ->  Result (actual rows=0 loops=1)
+                     One-Time Filter: (5 = $0)
+         ->  Seq Scan on ab_a1_b1 ab_1 (actual rows=0 loops=1)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a1_b2 ab_2 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a1_b3 ab_3 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a2_b1 ab_4 (actual rows=0 loops=1)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a2_b2 ab_5 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a2_b3 ab_6 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a3_b1 ab_7 (actual rows=0 loops=1)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a3_b2 ab_8 (never executed)
+               Filter: (b = $0)
+         ->  Seq Scan on ab_a3_b3 ab_9 (never executed)
+               Filter: (b = $0)
+ Optimizer: Postgres query optimizer
+(43 rows)
+
+-- Another UNION ALL test, but containing a mix of exec init and exec run-time pruning.
+create table xy_1 (x int, y int);
+insert into xy_1 values(100,-10);
+set enable_bitmapscan = 0;
+set enable_indexscan = 0;
+prepare ab_q6 as
+select * from (
+	select tableoid::regclass,a,b from ab
+union all
+	select tableoid::regclass,x,y from xy_1
+union all
+	select tableoid::regclass,a,b from ab
+) ab where a = $1 and b = (select -10);
+-- Ensure the xy_1 subplan is not pruned.
+explain (analyze, costs off, summary off, timing off) execute ab_q6(1);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 12
+         ->  Seq Scan on ab_a1_b1 ab_1 (never executed)
+               Filter: ((a = $1) AND (b = $0))
+         ->  Seq Scan on ab_a1_b2 ab_2 (never executed)
+               Filter: ((a = $1) AND (b = $0))
+         ->  Seq Scan on ab_a1_b3 ab_3 (never executed)
+               Filter: ((a = $1) AND (b = $0))
+         ->  Seq Scan on xy_1 (actual rows=0 loops=1)
+               Filter: ((x = $1) AND (y = $0))
+         ->  Seq Scan on ab_a1_b1 ab_4 (never executed)
+               Filter: ((a = $1) AND (b = $0))
+         ->  Seq Scan on ab_a1_b2 ab_5 (never executed)
+               Filter: ((a = $1) AND (b = $0))
+         ->  Seq Scan on ab_a1_b3 ab_6 (never executed)
+               Filter: ((a = $1) AND (b = $0))
+ Optimizer: Postgres query optimizer
+(20 rows)
+
+-- Ensure we see just the xy_1 row.
+execute ab_q6(100);
+ tableoid |  a  |  b  
+----------+-----+-----
+ xy_1     | 100 | -10
+(1 row)
+
+reset enable_bitmapscan;
+reset enable_indexscan;
+deallocate ab_q1;
+deallocate ab_q2;
+deallocate ab_q3;
+deallocate ab_q4;
+deallocate ab_q5;
+deallocate ab_q6;
+-- UPDATE on a partition subtree has been seen to have problems.
+insert into ab values (1,2);
+explain (analyze, costs off, summary off, timing off)
+update ab_a1 set b = 3 from ab where ab.a = 1 and ab.a = ab_a1.a;
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ Update on ab_a1 (actual rows=0 loops=1)
+   Update on ab_a1_b1 ab_a1_1
+   Update on ab_a1_b2 ab_a1_2
+   Update on ab_a1_b3 ab_a1_3
+   ->  Nested Loop (actual rows=1 loops=1)
+         ->  Append (actual rows=1 loops=1)
+               ->  Bitmap Heap Scan on ab_a1_b1 ab_a1_1 (actual rows=0 loops=1)
+                     Recheck Cond: (a = 1)
+                     ->  Bitmap Index Scan on ab_a1_b1_a_idx (actual rows=0 loops=1)
+                           Index Cond: (a = 1)
+               ->  Bitmap Heap Scan on ab_a1_b2 ab_a1_2 (actual rows=1 loops=1)
+                     Recheck Cond: (a = 1)
+                     ->  Bitmap Index Scan on ab_a1_b2_a_idx (actual rows=1 loops=1)
+                           Index Cond: (a = 1)
+               ->  Bitmap Heap Scan on ab_a1_b3 ab_a1_3 (actual rows=0 loops=1)
+                     Recheck Cond: (a = 1)
+                     ->  Bitmap Index Scan on ab_a1_b3_a_idx (actual rows=1 loops=1)
+                           Index Cond: (a = 1)
+         ->  Materialize (actual rows=1 loops=1)
+               ->  Append (actual rows=1 loops=1)
+                     ->  Bitmap Heap Scan on ab_a1_b1 ab_1 (actual rows=0 loops=1)
+                           Recheck Cond: (a = 1)
+                           ->  Bitmap Index Scan on ab_a1_b1_a_idx (actual rows=0 loops=1)
+                                 Index Cond: (a = 1)
+                     ->  Bitmap Heap Scan on ab_a1_b2 ab_2 (actual rows=1 loops=1)
+                           Recheck Cond: (a = 1)
+                           ->  Bitmap Index Scan on ab_a1_b2_a_idx (actual rows=1 loops=1)
+                                 Index Cond: (a = 1)
+                     ->  Bitmap Heap Scan on ab_a1_b3 ab_3 (actual rows=0 loops=1)
+                           Recheck Cond: (a = 1)
+                           ->  Bitmap Index Scan on ab_a1_b3_a_idx (actual rows=1 loops=1)
+                                 Index Cond: (a = 1)
+ Optimizer: Postgres query optimizer
+(33 rows)
+
+table ab;
+ a | b 
+---+---
+ 1 | 3
+(1 row)
+
+-- Test UPDATE where source relation has run-time pruning enabled
+truncate ab;
+insert into ab values (1, 1), (1, 2), (1, 3), (2, 1);
+explain (analyze, costs off, summary off, timing off)
+update ab_a1 set b = 3 from ab_a2 where ab_a2.b = (select 1);
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Update on ab_a1 (actual rows=0 loops=1)
+   Update on ab_a1_b1 ab_a1_1
+   Update on ab_a1_b2 ab_a1_2
+   Update on ab_a1_b3 ab_a1_3
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Nested Loop (actual rows=3 loops=1)
+         ->  Broadcast Motion 3:3  (slice1; segments: 3) (actual rows=1 loops=1)
+               ->  Append (actual rows=1 loops=1)
+                     ->  Seq Scan on ab_a2_b1 ab_a2_1 (actual rows=1 loops=1)
+                           Filter: (b = $0)
+                     ->  Seq Scan on ab_a2_b2 ab_a2_2 (never executed)
+                           Filter: (b = $0)
+                     ->  Seq Scan on ab_a2_b3 ab_a2_3 (never executed)
+                           Filter: (b = $0)
+         ->  Materialize (actual rows=3 loops=1)
+               ->  Append (actual rows=3 loops=1)
+                     ->  Seq Scan on ab_a1_b1 ab_a1_1 (actual rows=1 loops=1)
+                     ->  Seq Scan on ab_a1_b2 ab_a1_2 (actual rows=1 loops=1)
+                     ->  Seq Scan on ab_a1_b3 ab_a1_3 (actual rows=1 loops=1)
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+select tableoid::regclass, * from ab;
+ tableoid | a | b 
+----------+---+---
+ ab_a1_b3 | 1 | 3
+ ab_a1_b3 | 1 | 3
+ ab_a1_b3 | 1 | 3
+ ab_a2_b1 | 2 | 1
+(4 rows)
+
+drop table ab, lprt_a;
+-- Join
+create table tbl1(col1 int);
+insert into tbl1 values (501), (505);
+analyze tbl1;
+-- Basic table
+create table tprt (col1 int) partition by range (col1);
+create table tprt_1 partition of tprt for values from (1) to (501);
+create table tprt_2 partition of tprt for values from (501) to (1001);
+create table tprt_3 partition of tprt for values from (1001) to (2001);
+create table tprt_4 partition of tprt for values from (2001) to (3001);
+create table tprt_5 partition of tprt for values from (3001) to (4001);
+create table tprt_6 partition of tprt for values from (4001) to (5001);
+create index tprt1_idx on tprt_1 (col1);
+create index tprt2_idx on tprt_2 (col1);
+create index tprt3_idx on tprt_3 (col1);
+create index tprt4_idx on tprt_4 (col1);
+create index tprt5_idx on tprt_5 (col1);
+create index tprt6_idx on tprt_6 (col1);
+insert into tprt values (10), (20), (501), (502), (505), (1001), (4500);
+set enable_hashjoin = off;
+set enable_mergejoin = off;
+set enable_seqscan=off;
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 > tprt.col1;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=6 loops=1)
+   ->  Nested Loop (actual rows=4 loops=1)
+         Join Filter: (tbl1.col1 > tprt_1.col1)
+         Rows Removed by Join Filter: 3
+         ->  Broadcast Motion 3:3  (slice2; segments: 3) (actual rows=7 loops=1)
+               ->  Append (actual rows=3 loops=1)
+                     ->  Seq Scan on tprt_1 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_2 (actual rows=2 loops=1)
+                     ->  Seq Scan on tprt_3 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_4 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_5 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_6 (actual rows=1 loops=1)
+         ->  Seq Scan on tbl1 (actual rows=1 loops=8)
+ Optimizer: GPORCA
+(14 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 = tprt.col1;
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=2 loops=1)
+   ->  Hash Join (actual rows=1 loops=1)
+         Hash Cond: (tbl1.col1 = tprt_1.col1)
+         Extra Text: (seg0)   Hash chain length 1.0 avg, 1 max, using 3 of 524288 buckets.
+         ->  Seq Scan on tbl1 (actual rows=1 loops=1)
+         ->  Hash (actual rows=3 loops=1)
+               Buckets: 524288  Batches: 1  Memory Usage: 4097kB
+               ->  Append (actual rows=3 loops=1)
+                     ->  Seq Scan on tprt_1 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_2 (actual rows=2 loops=1)
+                     ->  Seq Scan on tprt_3 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_4 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_5 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_6 (actual rows=1 loops=1)
+ Optimizer: GPORCA
+(15 rows)
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 > tprt.col1
+order by tbl1.col1, tprt.col1;
+ col1 | col1 
+------+------
+  501 |   10
+  501 |   20
+  505 |   10
+  505 |   20
+  505 |  501
+  505 |  502
+(6 rows)
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 = tprt.col1
+order by tbl1.col1, tprt.col1;
+ col1 | col1 
+------+------
+  501 |  501
+  505 |  505
+(2 rows)
+
+-- Multiple partitions
+insert into tbl1 values (1001), (1010), (1011);
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 inner join tprt on tbl1.col1 > tprt.col1;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=23 loops=1)
+   ->  Nested Loop (actual rows=15 loops=1)
+         Join Filter: (tbl1.col1 > tprt_1.col1)
+         Rows Removed by Join Filter: 6
+         ->  Broadcast Motion 3:3  (slice2; segments: 3) (actual rows=7 loops=1)
+               ->  Append (actual rows=3 loops=1)
+                     ->  Seq Scan on tprt_1 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_2 (actual rows=2 loops=1)
+                     ->  Seq Scan on tprt_3 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_4 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_5 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_6 (actual rows=1 loops=1)
+         ->  Seq Scan on tbl1 (actual rows=3 loops=8)
+ Optimizer: GPORCA
+(14 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 inner join tprt on tbl1.col1 = tprt.col1;
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=3 loops=1)
+   ->  Hash Join (actual rows=2 loops=1)
+         Hash Cond: (tbl1.col1 = tprt_1.col1)
+         Extra Text: (seg2)   Hash chain length 1.0 avg, 1 max, using 3 of 524288 buckets.
+         ->  Seq Scan on tbl1 (actual rows=3 loops=1)
+         ->  Hash (actual rows=3 loops=1)
+               Buckets: 524288  Batches: 1  Memory Usage: 4097kB
+               ->  Append (actual rows=3 loops=1)
+                     ->  Seq Scan on tprt_1 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_2 (actual rows=2 loops=1)
+                     ->  Seq Scan on tprt_3 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_4 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_5 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_6 (actual rows=1 loops=1)
+ Optimizer: GPORCA
+(15 rows)
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 > tprt.col1
+order by tbl1.col1, tprt.col1;
+ col1 | col1 
+------+------
+  501 |   10
+  501 |   20
+  505 |   10
+  505 |   20
+  505 |  501
+  505 |  502
+ 1001 |   10
+ 1001 |   20
+ 1001 |  501
+ 1001 |  502
+ 1001 |  505
+ 1010 |   10
+ 1010 |   20
+ 1010 |  501
+ 1010 |  502
+ 1010 |  505
+ 1010 | 1001
+ 1011 |   10
+ 1011 |   20
+ 1011 |  501
+ 1011 |  502
+ 1011 |  505
+ 1011 | 1001
+(23 rows)
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 = tprt.col1
+order by tbl1.col1, tprt.col1;
+ col1 | col1 
+------+------
+  501 |  501
+  505 |  505
+ 1001 | 1001
+(3 rows)
+
+-- Last partition
+delete from tbl1;
+insert into tbl1 values (4400);
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 < tprt.col1;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=1 loops=1)
+   ->  Nested Loop (actual rows=1 loops=1)
+         Join Filter: (tbl1.col1 < tprt_1.col1)
+         Rows Removed by Join Filter: 6
+         ->  Broadcast Motion 3:3  (slice2; segments: 3) (actual rows=7 loops=1)
+               ->  Append (actual rows=3 loops=1)
+                     ->  Seq Scan on tprt_1 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_2 (actual rows=2 loops=1)
+                     ->  Seq Scan on tprt_3 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_4 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_5 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_6 (actual rows=1 loops=1)
+         ->  Seq Scan on tbl1 (actual rows=1 loops=8)
+ Optimizer: GPORCA
+(14 rows)
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 < tprt.col1
+order by tbl1.col1, tprt.col1;
+ col1 | col1 
+------+------
+ 4400 | 4500
+(1 row)
+
+reset enable_seqscan;
+-- No matching partition
+delete from tbl1;
+insert into tbl1 values (10000);
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 = tprt.col1;
+                             QUERY PLAN                             
+--------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Hash Join (actual rows=0 loops=1)
+         Hash Cond: (tbl1.col1 = tprt_1.col1)
+         ->  Seq Scan on tbl1 (actual rows=1 loops=1)
+         ->  Hash (actual rows=3 loops=1)
+               Buckets: 524288  Batches: 1  Memory Usage: 4097kB
+               ->  Append (actual rows=3 loops=1)
+                     ->  Seq Scan on tprt_1 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_2 (actual rows=2 loops=1)
+                     ->  Seq Scan on tprt_3 (actual rows=1 loops=1)
+                     ->  Seq Scan on tprt_4 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_5 (actual rows=0 loops=1)
+                     ->  Seq Scan on tprt_6 (actual rows=1 loops=1)
+ Optimizer: GPORCA
+(14 rows)
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 = tprt.col1
+order by tbl1.col1, tprt.col1;
+ col1 | col1 
+------+------
+(0 rows)
+
+drop table tbl1, tprt;
+-- Test with columns defined in varying orders between each level
+create table part_abc (a int not null, b int not null, c int not null) partition by list (a);
+create table part_bac (b int not null, a int not null, c int not null) partition by list (b);
+create table part_cab (c int not null, a int not null, b int not null) partition by list (c);
+create table part_abc_p1 (a int not null, b int not null, c int not null);
+-- GPDB: the distribution keys must be the same in all parts of partition
+-- hierarchy.
+alter table part_bac set distributed by (a);
+alter table part_cab set distributed by (a);
+alter table part_abc attach partition part_bac for values in(1);
+alter table part_bac attach partition part_cab for values in(2);
+alter table part_cab attach partition part_abc_p1 for values in(3);
+prepare part_abc_q1 (int, int, int) as
+select * from part_abc where a = $1 and b = $2 and c = $3;
+-- Single partition should be scanned.
+explain (analyze, costs off, summary off, timing off) execute part_abc_q1 (1, 2, 3);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Seq Scan on part_abc_p1 part_abc (actual rows=0 loops=1)
+         Filter: ((a = $1) AND (b = $2) AND (c = $3))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+deallocate part_abc_q1;
+drop table part_abc;
+-- Ensure that an Append node properly handles a sub-partitioned table
+-- matching without any of its leaf partitions matching the clause.
+create table listp (a int, b int) partition by list (a);
+create table listp_1 partition of listp for values in(1) partition by list (b);
+create table listp_1_1 partition of listp_1 for values in(1);
+create table listp_2 partition of listp for values in(2) partition by list (b);
+create table listp_2_1 partition of listp_2 for values in(2);
+select * from listp where b = 1;
+ a | b 
+---+---
+(0 rows)
+
+-- Ensure that an Append node properly can handle selection of all first level
+-- partitions before finally detecting the correct set of 2nd level partitions
+-- which match the given parameter.
+prepare q1 (int,int) as select * from listp where b in ($1,$2);
+explain (analyze, costs off, summary off, timing off)  execute q1 (1,1);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 1
+         ->  Seq Scan on listp_1_1 listp_1 (actual rows=0 loops=1)
+               Filter: (b = ANY (ARRAY[$1, $2]))
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+explain (analyze, costs off, summary off, timing off)  execute q1 (2,2);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 1
+         ->  Seq Scan on listp_2_1 listp_1 (actual rows=0 loops=1)
+               Filter: (b = ANY (ARRAY[$1, $2]))
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+-- Try with no matching partitions.
+explain (analyze, costs off, summary off, timing off)  execute q1 (0,0);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 2
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+deallocate q1;
+-- Test more complex cases where a not-equal condition further eliminates partitions.
+prepare q1 (int,int,int,int) as select * from listp where b in($1,$2) and $3 <> b and $4 <> b;
+-- Both partitions allowed by IN clause, but one disallowed by <> clause
+explain (analyze, costs off, summary off, timing off)  execute q1 (1,2,2,0);
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 1
+         ->  Seq Scan on listp_1_1 listp_1 (actual rows=0 loops=1)
+               Filter: ((b = ANY (ARRAY[$1, $2])) AND ($3 <> b) AND ($4 <> b))
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+-- Both partitions allowed by IN clause, then both excluded again by <> clauses.
+explain (analyze, costs off, summary off, timing off)  execute q1 (1,2,2,1);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         Subplans Removed: 2
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+-- Ensure Params that evaluate to NULL properly prune away all partitions
+explain (analyze, costs off, summary off, timing off)
+select * from listp where a = (select null::int);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on listp_1_1 listp_1 (never executed)
+               Filter: (a = $0)
+         ->  Seq Scan on listp_2_1 listp_2 (never executed)
+               Filter: (a = $0)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+drop table listp;
+--
+-- check that stable query clauses are only used in run-time pruning
+-- because a is the distributed key by default in stable_qual_pruning,
+-- to get consistent results, we make the table distributed randomly.
+--
+create table stable_qual_pruning (a timestamp) distributed randomly partition by range (a);
+create table stable_qual_pruning1 partition of stable_qual_pruning
+  for values from ('2000-01-01') to ('2000-02-01');
+create table stable_qual_pruning2 partition of stable_qual_pruning
+  for values from ('2000-02-01') to ('2000-03-01');
+create table stable_qual_pruning3 partition of stable_qual_pruning
+  for values from ('3000-02-01') to ('3000-03-01');
+-- comparison against a stable value requires run-time pruning
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning where a < localtimestamp;
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on stable_qual_pruning1 (actual rows=0 loops=1)
+               Filter: (a < 'Mon Apr 07 00:46:26.535463 2025'::timestamp without time zone)
+         ->  Seq Scan on stable_qual_pruning2 (actual rows=0 loops=1)
+               Filter: (a < 'Mon Apr 07 00:46:26.535463 2025'::timestamp without time zone)
+ Optimizer: GPORCA
+(7 rows)
+
+-- timestamp < timestamptz comparison is only stable, not immutable
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning where a < '2000-02-01'::timestamptz;
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on stable_qual_pruning1 (actual rows=0 loops=1)
+               Filter: (a < 'Tue Feb 01 00:00:00 2000 PST'::timestamp with time zone)
+ Optimizer: GPORCA
+(5 rows)
+
+-- check ScalarArrayOp cases
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2010-02-01', '2020-01-01']::timestamp[]);
+              QUERY PLAN               
+---------------------------------------
+ Result (actual rows=0 loops=1)
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2000-02-01', '2010-01-01']::timestamp[]);
+                                                         QUERY PLAN                                                         
+----------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on stable_qual_pruning2 (actual rows=0 loops=1)
+               Filter: (a = ANY ('{"Tue Feb 01 00:00:00 2000","Fri Jan 01 00:00:00 2010"}'::timestamp without time zone[]))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2000-02-01', localtimestamp]::timestamp[]);
+                                                            QUERY PLAN                                                             
+-----------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on stable_qual_pruning2 (actual rows=0 loops=1)
+               Filter: (a = ANY ('{"Tue Feb 01 00:00:00 2000","Mon Apr 07 00:46:26.575057 2025"}'::timestamp without time zone[]))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2010-02-01', '2020-01-01']::timestamptz[]);
+              QUERY PLAN               
+---------------------------------------
+ Result (actual rows=0 loops=1)
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2000-02-01', '2010-01-01']::timestamptz[]);
+                                                           QUERY PLAN                                                            
+---------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on stable_qual_pruning2 (actual rows=0 loops=1)
+               Filter: (a = ANY ('{"Tue Feb 01 00:00:00 2000 PST","Fri Jan 01 00:00:00 2010 PST"}'::timestamp with time zone[]))
+ Optimizer: GPORCA
+(5 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(null::timestamptz[]);
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Seq Scan on stable_qual_pruning1 (actual rows=0 loops=1)
+               Filter: (a = ANY (NULL::timestamp with time zone[]))
+         ->  Seq Scan on stable_qual_pruning2 (actual rows=0 loops=1)
+               Filter: (a = ANY (NULL::timestamp with time zone[]))
+         ->  Seq Scan on stable_qual_pruning3 (actual rows=0 loops=1)
+               Filter: (a = ANY (NULL::timestamp with time zone[]))
+ Optimizer: GPORCA
+(9 rows)
+
+drop table stable_qual_pruning;
+--
+-- Check that pruning with composite range partitioning works correctly when
+-- it must ignore clauses for trailing keys once it has seen a clause with
+-- non-inclusive operator for an earlier key
+--
+create table mc3p (a int, b int, c int) partition by range (a, abs(b), c);
+create table mc3p0 partition of mc3p
+  for values from (0, 0, 0) to (0, maxvalue, maxvalue);
+create table mc3p1 partition of mc3p
+  for values from (1, 1, 1) to (2, minvalue, minvalue);
+create table mc3p2 partition of mc3p
+  for values from (2, minvalue, minvalue) to (3, maxvalue, maxvalue);
+insert into mc3p values (0, 1, 1), (1, 1, 1), (2, 1, 1);
+explain (analyze, costs off, summary off, timing off)
+select * from mc3p where a < 3 and abs(b) = 1;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=3 loops=1)
+   ->  Append (actual rows=2 loops=1)
+         ->  Seq Scan on mc3p0 mc3p_1 (actual rows=1 loops=1)
+               Filter: ((a < 3) AND (abs(b) = 1))
+         ->  Seq Scan on mc3p1 mc3p_2 (actual rows=1 loops=1)
+               Filter: ((a < 3) AND (abs(b) = 1))
+         ->  Seq Scan on mc3p2 mc3p_3 (actual rows=1 loops=1)
+               Filter: ((a < 3) AND (abs(b) = 1))
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+--
+-- Check that pruning with composite range partitioning works correctly when
+-- a combination of runtime parameters is specified, not all of whose values
+-- are available at the same time
+--
+prepare ps1 as
+  select * from mc3p where a = $1 and abs(b) < (select 3);
+explain (analyze, costs off, summary off, timing off)
+execute ps1(1);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=1 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=1 loops=1)
+         Subplans Removed: 2
+         ->  Seq Scan on mc3p1 mc3p_1 (actual rows=1 loops=1)
+               Filter: ((a = $1) AND (abs(b) < $0))
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+deallocate ps1;
+prepare ps2 as
+  select * from mc3p where a <= $1 and abs(b) < (select 3);
+explain (analyze, costs off, summary off, timing off)
+execute ps2(1);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=2 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=2 loops=1)
+         Subplans Removed: 1
+         ->  Seq Scan on mc3p0 mc3p_1 (actual rows=1 loops=1)
+               Filter: ((a <= $1) AND (abs(b) < $0))
+         ->  Seq Scan on mc3p1 mc3p_2 (actual rows=1 loops=1)
+               Filter: ((a <= $1) AND (abs(b) < $0))
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+deallocate ps2;
+drop table mc3p;
+-- Ensure runtime pruning works with initplans params with boolean types
+create table boolvalues (value bool not null);
+insert into boolvalues values('t'),('f');
+create table boolp (a bool) partition by list (a);
+create table boolp_t partition of boolp for values in('t');
+create table boolp_f partition of boolp for values in('f');
+explain (analyze, costs off, summary off, timing off)
+select * from boolp where a = (select value from boolvalues where value);
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Hash Join (actual rows=0 loops=1)
+         Hash Cond: (boolvalues.value = boolp_f.a)
+         ->  Redistribute Motion 1:3  (slice2) (never executed)
+               ->  Assert (actual rows=1 loops=1)
+                     Assert Cond: ((row_number() OVER (?)) = 1)
+                     ->  WindowAgg (actual rows=1 loops=1)
+                           ->  Gather Motion 3:1  (slice3; segments: 3) (actual rows=1 loops=1)
+                                 ->  Seq Scan on boolvalues (actual rows=1 loops=1)
+                                       Filter: value
+                                       Rows Removed by Filter: 1
+         ->  Hash (actual rows=0 loops=1)
+               Buckets: 262144  Batches: 1  Memory Usage: 2048kB
+               ->  Broadcast Motion 3:3  (slice4; segments: 3) (actual rows=0 loops=1)
+                     ->  Append (actual rows=0 loops=1)
+                           ->  Seq Scan on boolp_f (actual rows=0 loops=1)
+                           ->  Seq Scan on boolp_t (actual rows=0 loops=1)
+ Optimizer: GPORCA
+(18 rows)
+
+explain (analyze, costs off, summary off, timing off)
+select * from boolp where a = (select value from boolvalues where not value);
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   ->  Hash Join (actual rows=0 loops=1)
+         Hash Cond: (boolvalues.value = boolp_f.a)
+         ->  Redistribute Motion 1:3  (slice2) (never executed)
+               ->  Assert (actual rows=1 loops=1)
+                     Assert Cond: ((row_number() OVER (?)) = 1)
+                     ->  WindowAgg (actual rows=1 loops=1)
+                           ->  Gather Motion 3:1  (slice3; segments: 3) (actual rows=1 loops=1)
+                                 ->  Seq Scan on boolvalues (actual rows=1 loops=1)
+                                       Filter: (NOT value)
+                                       Rows Removed by Filter: 1
+         ->  Hash (actual rows=0 loops=1)
+               Buckets: 262144  Batches: 1  Memory Usage: 2048kB
+               ->  Broadcast Motion 3:3  (slice4; segments: 3) (actual rows=0 loops=1)
+                     ->  Append (actual rows=0 loops=1)
+                           ->  Seq Scan on boolp_f (actual rows=0 loops=1)
+                           ->  Seq Scan on boolp_t (actual rows=0 loops=1)
+ Optimizer: GPORCA
+(18 rows)
+
+drop table boolp;
+--
+-- Test run-time pruning of MergeAppend subnodes
+--
+set enable_seqscan = off;
+set enable_sort = off;
+create table ma_test (a int, b int) partition by range (a);
+create table ma_test_p1 partition of ma_test for values from (0) to (10);
+create table ma_test_p2 partition of ma_test for values from (10) to (20);
+create table ma_test_p3 partition of ma_test for values from (20) to (30);
+insert into ma_test select x,x from generate_series(0,29) t(x);
+create index on ma_test (b);
+analyze ma_test;
+prepare mt_q1 (int) as select a from ma_test where a >= $1 and a % 10 = 5 order by b;
+explain (analyze, costs off, summary off, timing off) execute mt_q1(15);
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Result (actual rows=2 loops=1)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=2 loops=1)
+         Merge Key: ma_test_p1.b
+         ->  Sort (actual rows=1 loops=1)
+               Sort Key: ma_test_p1.b
+               Sort Method:  quicksort  Memory: 75kB
+               ->  Append (actual rows=1 loops=1)
+                     ->  Seq Scan on ma_test_p1 (actual rows=0 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 5
+                     ->  Seq Scan on ma_test_p2 (actual rows=1 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 1
+                     ->  Seq Scan on ma_test_p3 (actual rows=1 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 2
+ Optimizer: GPORCA
+(17 rows)
+
+execute mt_q1(15);
+ a  
+----
+ 15
+ 25
+(2 rows)
+
+explain (analyze, costs off, summary off, timing off) execute mt_q1(25);
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Result (actual rows=1 loops=1)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=1 loops=1)
+         Merge Key: ma_test_p1.b
+         ->  Sort (actual rows=1 loops=1)
+               Sort Key: ma_test_p1.b
+               Sort Method:  quicksort  Memory: 75kB
+               ->  Append (actual rows=1 loops=1)
+                     ->  Seq Scan on ma_test_p1 (actual rows=0 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 5
+                     ->  Seq Scan on ma_test_p2 (actual rows=0 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 3
+                     ->  Seq Scan on ma_test_p3 (actual rows=1 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 2
+ Optimizer: GPORCA
+(17 rows)
+
+execute mt_q1(25);
+ a  
+----
+ 25
+(1 row)
+
+-- Ensure MergeAppend behaves correctly when no subplans match
+explain (analyze, costs off, summary off, timing off) execute mt_q1(35);
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Result (actual rows=0 loops=1)
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+         Merge Key: ma_test_p1.b
+         ->  Sort (actual rows=0 loops=1)
+               Sort Key: ma_test_p1.b
+               Sort Method:  quicksort  Memory: 75kB
+               ->  Append (actual rows=0 loops=1)
+                     ->  Seq Scan on ma_test_p1 (actual rows=0 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 5
+                     ->  Seq Scan on ma_test_p2 (actual rows=0 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 3
+                     ->  Seq Scan on ma_test_p3 (actual rows=0 loops=1)
+                           Filter: ((a >= $1) AND ((a % 10) = 5))
+                           Rows Removed by Filter: 4
+ Optimizer: GPORCA
+(17 rows)
+
+execute mt_q1(35);
+ a 
+---
+(0 rows)
+
+deallocate mt_q1;
+prepare mt_q2 (int) as select * from ma_test where a >= $1 order by b limit 1;
+-- Ensure output list looks sane when the MergeAppend has no subplans.
+explain (analyze, verbose, costs off, summary off, timing off) execute mt_q2 (35);
+                                                                                                        QUERY PLAN                                                                                                         
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit (actual rows=0 loops=1)
+   Output: ma_test_p1.a, ma_test_p1.b
+   ->  Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+         Output: ma_test_p1.a, ma_test_p1.b
+         Merge Key: ma_test_p1.b
+         ->  Limit (actual rows=0 loops=1)
+               Output: ma_test_p1.a, ma_test_p1.b
+               ->  Sort (actual rows=0 loops=1)
+                     Output: ma_test_p1.a, ma_test_p1.b
+                     Sort Key: ma_test_p1.b
+                     Sort Method:  quicksort  Memory: 75kB
+   Max Memory: 25kB  Avg Memory: 25kB (3 segments)
+                     ->  Append (actual rows=0 loops=1)
+                           ->  Seq Scan on public.ma_test_p1 (actual rows=0 loops=1)
+                                 Output: ma_test_p1.a, ma_test_p1.b
+                                 Filter: (ma_test_p1.a >= $1)
+                                 Rows Removed by Filter: 5
+                           ->  Seq Scan on public.ma_test_p2 (actual rows=0 loops=1)
+                                 Output: ma_test_p2.a, ma_test_p2.b
+                                 Filter: (ma_test_p2.a >= $1)
+                                 Rows Removed by Filter: 3
+                           ->  Seq Scan on public.ma_test_p3 (actual rows=0 loops=1)
+                                 Output: ma_test_p3.a, ma_test_p3.b
+                                 Filter: (ma_test_p3.a >= $1)
+                                 Rows Removed by Filter: 4
+ Settings: enable_hashjoin = 'off', enable_indexonlyscan = 'off', enable_mergejoin = 'off', enable_parallel = 'off', enable_seqscan = 'off', enable_sort = 'off', optimizer = 'on', plan_cache_mode = 'force_generic_plan'
+ Optimizer: GPORCA
+(27 rows)
+
+deallocate mt_q2;
+-- ensure initplan params properly prune partitions
+explain (analyze, costs off, summary off, timing off) select * from ma_test where a >= (select min(b) from ma_test_p2) order by b;
+                                                              QUERY PLAN                                                              
+--------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=20 loops=1)
+   Merge Key: ma_test_p1.b
+   ->  Sort (actual rows=8 loops=1)
+         Sort Key: ma_test_p1.b
+         Sort Method:  quicksort  Memory: 75kB
+         ->  Nested Loop (actual rows=8 loops=1)
+               Join Filter: (ma_test_p1.a >= (min(ma_test_p2_1.b)))
+               Rows Removed by Join Filter: 3
+               ->  Broadcast Motion 1:3  (slice2) (actual rows=1 loops=1)
+                     ->  Aggregate (actual rows=1 loops=1)
+                           ->  Limit (actual rows=1 loops=1)
+                                 ->  Gather Motion 3:1  (slice3; segments: 3) (actual rows=1 loops=1)
+                                       Merge Key: ma_test_p2_1.b
+                                       ->  Limit (actual rows=1 loops=1)
+                                             ->  Index Scan using ma_test_p2_b_idx on ma_test_p2 ma_test_p2_1 (actual rows=1 loops=1)
+                                                   Index Cond: (b IS NOT NULL)
+               ->  Append (actual rows=6 loops=2)
+                     ->  Seq Scan on ma_test_p1 (actual rows=3 loops=2)
+                     ->  Seq Scan on ma_test_p2 (actual rows=5 loops=1)
+                     ->  Seq Scan on ma_test_p3 (actual rows=4 loops=1)
+ Optimizer: GPORCA
+(21 rows)
+
+reset enable_seqscan;
+reset enable_sort;
+drop table ma_test;
+reset enable_indexonlyscan;
+--
+-- check that pruning works properly when the partition key is of a
+-- pseudotype
+--
+-- array type list partition key
+create table pp_arrpart (a int[]) partition by list (a);
+create table pp_arrpart1 partition of pp_arrpart for values in ('{1}');
+create table pp_arrpart2 partition of pp_arrpart for values in ('{2, 3}', '{4, 5}');
+explain (costs off) select * from pp_arrpart where a = '{1}';
+                  QUERY PLAN                  
+----------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on pp_arrpart1
+               Filter: (a = '{1}'::integer[])
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from pp_arrpart where a = '{1, 2}';
+             QUERY PLAN              
+-------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+explain (costs off) select * from pp_arrpart where a in ('{4, 5}', '{1}');
+                                 QUERY PLAN                                 
+----------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on pp_arrpart1
+               Filter: ((a = '{4,5}'::integer[]) OR (a = '{1}'::integer[]))
+         ->  Seq Scan on pp_arrpart2
+               Filter: ((a = '{4,5}'::integer[]) OR (a = '{1}'::integer[]))
+ Optimizer: GPORCA
+(7 rows)
+
+explain (costs off) update pp_arrpart set a = a where a = '{1}';
+                 QUERY PLAN                 
+--------------------------------------------
+ Update on pp_arrpart
+   Update on pp_arrpart1 pp_arrpart_1
+   ->  Seq Scan on pp_arrpart1 pp_arrpart_1
+         Filter: (a = '{1}'::integer[])
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+explain (costs off) delete from pp_arrpart where a = '{1}';
+                 QUERY PLAN                 
+--------------------------------------------
+ Delete on pp_arrpart
+   Delete on pp_arrpart1 pp_arrpart_1
+   ->  Seq Scan on pp_arrpart1 pp_arrpart_1
+         Filter: (a = '{1}'::integer[])
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+drop table pp_arrpart;
+-- array type hash partition key
+create table pph_arrpart (a int[]) partition by hash (a);
+create table pph_arrpart1 partition of pph_arrpart for values with (modulus 2, remainder 0);
+create table pph_arrpart2 partition of pph_arrpart for values with (modulus 2, remainder 1);
+insert into pph_arrpart values ('{1}'), ('{1, 2}'), ('{4, 5}');
+select tableoid::regclass, * from pph_arrpart order by 1;
+   tableoid   |   a   
+--------------+-------
+ pph_arrpart1 | {1,2}
+ pph_arrpart1 | {4,5}
+ pph_arrpart2 | {1}
+(3 rows)
+
+explain (costs off) select * from pph_arrpart where a = '{1}';
+                 QUERY PLAN                 
+--------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on pph_arrpart2 pph_arrpart
+         Filter: (a = '{1}'::integer[])
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from pph_arrpart where a = '{1, 2}';
+                 QUERY PLAN                 
+--------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on pph_arrpart1 pph_arrpart
+         Filter: (a = '{1,2}'::integer[])
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+explain (costs off) select * from pph_arrpart where a in ('{4, 5}', '{1}');
+                                 QUERY PLAN                                 
+----------------------------------------------------------------------------
+ Gather Motion 2:1  (slice1; segments: 2)
+   ->  Append
+         ->  Seq Scan on pph_arrpart1 pph_arrpart_1
+               Filter: ((a = '{4,5}'::integer[]) OR (a = '{1}'::integer[]))
+         ->  Seq Scan on pph_arrpart2 pph_arrpart_2
+               Filter: ((a = '{4,5}'::integer[]) OR (a = '{1}'::integer[]))
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+drop table pph_arrpart;
+-- enum type list partition key
+create type pp_colors as enum ('green', 'blue', 'black');
+create table pp_enumpart (col1 int, a pp_colors) partition by list (a);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table pp_enumpart_green partition of pp_enumpart for values in ('green');
+create table pp_enumpart_blue partition of pp_enumpart for values in ('blue');
+explain (costs off) select * from pp_enumpart where a = 'blue';
+                  QUERY PLAN                   
+-----------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on pp_enumpart_blue
+               Filter: (a = 'blue'::pp_colors)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from pp_enumpart where a = 'black';
+              QUERY PLAN               
+---------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+drop table pp_enumpart;
+drop type pp_colors;
+-- record type as partition key
+create type pp_rectype as (a int, b int);
+create table pp_recpart (a pp_rectype) partition by list (a);
+create table pp_recpart_11 partition of pp_recpart for values in ('(1,1)');
+create table pp_recpart_23 partition of pp_recpart for values in ('(2,3)');
+explain (costs off) select * from pp_recpart where a = '(1,1)'::pp_rectype;
+                   QUERY PLAN                    
+-------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on pp_recpart_11
+               Filter: (a = '(1,1)'::pp_rectype)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from pp_recpart where a = '(1,2)'::pp_rectype;
+              QUERY PLAN               
+---------------------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+drop table pp_recpart;
+drop type pp_rectype;
+-- range type partition key
+create table pp_intrangepart (a int4range) partition by list (a);
+create table pp_intrangepart12 partition of pp_intrangepart for values in ('[1,2]');
+create table pp_intrangepart2inf partition of pp_intrangepart for values in ('[2,)');
+explain (costs off) select * from pp_intrangepart where a = '[1,2]'::int4range;
+                   QUERY PLAN                   
+------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on pp_intrangepart12
+               Filter: (a = '[1,3)'::int4range)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from pp_intrangepart where a = '(1,2)'::int4range;
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+drop table pp_intrangepart;
+--
+-- Ensure the enable_partition_prune GUC properly disables partition pruning.
+--
+create table pp_lp (a int, value int) partition by list (a);
+create table pp_lp1 partition of pp_lp for values in(1);
+create table pp_lp2 partition of pp_lp for values in(2);
+explain (costs off) select * from pp_lp where a = 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on pp_lp1
+               Filter: (a = 1)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) update pp_lp set value = 10 where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Update on pp_lp
+   Update on pp_lp1 pp_lp_1
+   ->  Seq Scan on pp_lp1 pp_lp_1
+         Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+explain (costs off) delete from pp_lp where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Delete on pp_lp
+   Delete on pp_lp1 pp_lp_1
+   ->  Seq Scan on pp_lp1 pp_lp_1
+         Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+set enable_partition_pruning = off;
+set constraint_exclusion = 'partition'; -- this should not affect the result.
+explain (costs off) select * from pp_lp where a = 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on pp_lp1
+               Filter: (a = 1)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) update pp_lp set value = 10 where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Update on pp_lp
+   Update on pp_lp1 pp_lp_1
+   Update on pp_lp2 pp_lp_2
+   ->  Append
+         ->  Seq Scan on pp_lp1 pp_lp_1
+               Filter: (a = 1)
+         ->  Seq Scan on pp_lp2 pp_lp_2
+               Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+explain (costs off) delete from pp_lp where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Delete on pp_lp
+   Delete on pp_lp1 pp_lp_1
+   Delete on pp_lp2 pp_lp_2
+   ->  Append
+         ->  Seq Scan on pp_lp1 pp_lp_1
+               Filter: (a = 1)
+         ->  Seq Scan on pp_lp2 pp_lp_2
+               Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+set constraint_exclusion = 'off'; -- this should not affect the result.
+explain (costs off) select * from pp_lp where a = 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on pp_lp1
+               Filter: (a = 1)
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) update pp_lp set value = 10 where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Update on pp_lp
+   Update on pp_lp1 pp_lp_1
+   Update on pp_lp2 pp_lp_2
+   ->  Append
+         ->  Seq Scan on pp_lp1 pp_lp_1
+               Filter: (a = 1)
+         ->  Seq Scan on pp_lp2 pp_lp_2
+               Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+explain (costs off) delete from pp_lp where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Delete on pp_lp
+   Delete on pp_lp1 pp_lp_1
+   Delete on pp_lp2 pp_lp_2
+   ->  Append
+         ->  Seq Scan on pp_lp1 pp_lp_1
+               Filter: (a = 1)
+         ->  Seq Scan on pp_lp2 pp_lp_2
+               Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+drop table pp_lp;
+-- Ensure enable_partition_prune does not affect non-partitioned tables.
+create table inh_lp (a int, value int);
+create table inh_lp1 (a int, value int, check(a = 1)) inherits (inh_lp);
+NOTICE:  merging column "a" with inherited definition
+NOTICE:  merging column "value" with inherited definition
+create table inh_lp2 (a int, value int, check(a = 2)) inherits (inh_lp);
+NOTICE:  merging column "a" with inherited definition
+NOTICE:  merging column "value" with inherited definition
+set constraint_exclusion = 'partition';
+-- inh_lp2 should be removed in the following 3 cases.
+explain (costs off) select * from inh_lp where a = 1;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on inh_lp inh_lp_1
+               Filter: (a = 1)
+         ->  Seq Scan on inh_lp1 inh_lp_2
+               Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+explain (costs off) update inh_lp set value = 10 where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Update on inh_lp
+   Update on inh_lp inh_lp_1
+   Update on inh_lp1 inh_lp_2
+   ->  Result
+         ->  Append
+               ->  Seq Scan on inh_lp inh_lp_1
+                     Filter: (a = 1)
+               ->  Seq Scan on inh_lp1 inh_lp_2
+                     Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+explain (costs off) delete from inh_lp where a = 1;
+             QUERY PLAN              
+-------------------------------------
+ Delete on inh_lp
+   Delete on inh_lp inh_lp_1
+   Delete on inh_lp1 inh_lp_2
+   ->  Append
+         ->  Seq Scan on inh_lp inh_lp_1
+               Filter: (a = 1)
+         ->  Seq Scan on inh_lp1 inh_lp_2
+               Filter: (a = 1)
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+-- Ensure we don't exclude normal relations when we only expect to exclude
+-- inheritance children
+explain (costs off) update inh_lp1 set value = 10 where a = 2;
+             QUERY PLAN              
+-------------------------------------
+ Update on inh_lp1
+   ->  Result
+         ->  Result
+               ->  Result
+                     One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(6 rows)
+
+drop table inh_lp cascade;
+NOTICE:  drop cascades to 2 other objects
+DETAIL:  drop cascades to table inh_lp1
+drop cascades to table inh_lp2
+reset enable_partition_pruning;
+reset constraint_exclusion;
+-- Check pruning for a partition tree containing only temporary relations
+create temp table pp_temp_parent (a int) partition by list (a);
+create temp table pp_temp_part_1 partition of pp_temp_parent for values in (1);
+create temp table pp_temp_part_def partition of pp_temp_parent default;
+explain (costs off) select * from pp_temp_parent where true;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Append
+         ->  Seq Scan on pp_temp_part_1
+         ->  Seq Scan on pp_temp_part_def
+ Optimizer: GPORCA
+(5 rows)
+
+explain (costs off) select * from pp_temp_parent where a = 2;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Append
+         ->  Seq Scan on pp_temp_part_def
+               Filter: (a = 2)
+ Optimizer: GPORCA
+(5 rows)
+
+drop table pp_temp_parent;
+-- Stress run-time partition pruning a bit more, per bug reports
+create temp table p (a int, b int, c int) partition by list (a);
+create temp table p1 partition of p for values in (1);
+create temp table p2 partition of p for values in (2);
+create temp table q (a int, b int, c int) partition by list (a);
+create temp table q1 partition of q for values in (1) partition by list (b);
+create temp table q11 partition of q1 for values in (1) partition by list (c);
+create temp table q111 partition of q11 for values in (1);
+create temp table q2 partition of q for values in (2) partition by list (b);
+create temp table q21 partition of q2 for values in (1);
+create temp table q22 partition of q2 for values in (2);
+insert into q22 values (2, 2, 3);
+-- GPDB: This is the query that needs the "matchsubs" rule at the top of the file
+-- The constant third branch of the UNION is executed at random segment. If the
+-- randomly chosen segment is the same as the one that needed for the other branches,
+-- the whole query runs on that one segment. Otherwise, it runs on two segments.
+-- The choice is made randomly, so accept both plans.
+explain (costs off)
+select *
+from (
+      select * from p
+      union all
+      select * from q1
+      union all
+      select 1, 1, 1
+     ) s(a, b, c)
+where s.a = 1 and s.b = 1 and s.c = (select 1);
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result
+   ->  Append
+         ->  Seq Scan on p1 p
+               Filter: ((a = 1) AND (b = 1) AND (c = $0))
+         ->  Seq Scan on q111 q1
+               Filter: ((a = 1) AND (b = 1) AND (c = $0))
+         ->  Result
+               One-Time Filter: (gp_execution_segment() = 1)
+               ->  Result
+                     One-Time Filter: (1 = $0)
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+select *
+from (
+      select * from p
+      union all
+      select * from q1
+      union all
+      select 1, 1, 1
+     ) s(a, b, c)
+where s.a = 1 and s.b = 1 and s.c = (select 1);
+ a | b | c 
+---+---+---
+ 1 | 1 | 1
+(1 row)
+
+prepare q (int, int) as
+select *
+from (
+      select * from p
+      union all
+      select * from q1
+      union all
+      select 1, 1, 1
+     ) s(a, b, c)
+where s.a = $1 and s.b = $2 and s.c = (select 1);
+explain (costs off) execute q (1, 1);
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result
+   ->  Append
+         Subplans Removed: 1
+         ->  Seq Scan on p1 p
+               Filter: ((a = $1) AND (b = $2) AND (c = $0))
+         ->  Seq Scan on q111 q1
+               Filter: ((a = $1) AND (b = $2) AND (c = $0))
+         ->  Result
+               One-Time Filter: (gp_execution_segment() = 1)
+               ->  Result
+                     One-Time Filter: ((1 = $1) AND (1 = $2) AND (1 = $0))
+ Optimizer: Postgres query optimizer
+(14 rows)
+
+execute q (1, 1);
+ a | b | c 
+---+---+---
+ 1 | 1 | 1
+(1 row)
+
+drop table p, q;
+-- Ensure run-time pruning works correctly when we match a partitioned table
+-- on the first level but find no matching partitions on the second level.
+create table listp (a int, b int) partition by list (a);
+create table listp1 partition of listp for values in(1);
+create table listp2 partition of listp for values in(2) partition by list(b);
+create table listp2_10 partition of listp2 for values in (10);
+explain (analyze, costs off, summary off, timing off)
+select * from listp where a = (select 2) and b <> 10;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   ->  Seq Scan on listp1 listp (actual rows=0 loops=1)
+         Filter: ((b <> 10) AND (a = $0))
+ Optimizer: Postgres query optimizer
+(6 rows)
+
+--
+-- check that a partition directly accessed in a query is excluded with
+-- constraint_exclusion = on
+--
+-- turn off partition pruning, so that it doesn't interfere
+set enable_partition_pruning to off;
+-- setting constraint_exclusion to 'partition' disables exclusion
+set constraint_exclusion to 'partition';
+explain (costs off) select * from listp1 where a = 2;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on listp1
+         Filter: (a = 2)
+ Optimizer: Pivotal Optimizer (GPORCA)
+(4 rows)
+
+explain (costs off) update listp1 set a = 1 where a = 2;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Update on listp1
+   ->  Result
+         One-Time Filter: true
+         ->  Result
+               ->  Redistribute Motion 3:3  (slice1; segments: 3)
+                     Hash Key: a
+                     ->  Split
+                           ->  Seq Scan on listp1
+                                 Filter: (a = 2)
+ Optimizer: Pivotal Optimizer (GPORCA)
+(10 rows)
+
+-- constraint exclusion enabled
+set constraint_exclusion to 'on';
+explain (costs off) select * from listp1 where a = 2;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)
+   ->  Seq Scan on listp1
+         Filter: (a = 2)
+ Optimizer: Pivotal Optimizer (GPORCA)
+(4 rows)
+
+explain (costs off) update listp1 set a = 1 where a = 2;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Update on listp1
+   ->  Result
+         One-Time Filter: true
+         ->  Result
+               ->  Redistribute Motion 3:3  (slice1; segments: 3)
+                     Hash Key: a
+                     ->  Split
+                           ->  Seq Scan on listp1
+                                 Filter: (a = 2)
+ Optimizer: Pivotal Optimizer (GPORCA)
+(10 rows)
+
+reset constraint_exclusion;
+reset enable_partition_pruning;
+drop table listp;
+-- Ensure run-time pruning works correctly for nested Append nodes
+set parallel_setup_cost to 0;
+set parallel_tuple_cost to 0;
+create table listp (a int) partition by list(a);
+create table listp_12 partition of listp for values in(1,2) partition by list(a);
+create table listp_12_1 partition of listp_12 for values in(1);
+create table listp_12_2 partition of listp_12 for values in(2);
+-- Force the 2nd subnode of the Append to be non-parallel.  This results in
+-- a nested Append node because the mixed parallel / non-parallel paths cannot
+-- be pulled into the top-level Append.
+alter table listp_12_1 set (parallel_workers = 0);
+-- Ensure that listp_12_2 is not scanned.  (The nested Append is not seen in
+-- the plan as it's pulled in setref.c due to having just a single subnode).
+select explain_parallel_append('select * from listp where a = (select 1);');
+                      explain_parallel_append                       
+--------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=N loops=N)
+   ->  Append (actual rows=N loops=N)
+         ->  Seq Scan on listp_12_1 listp_1 (actual rows=N loops=N)
+               Filter: (a = $0)
+         ->  Seq Scan on listp_12_2 listp_2 (never executed)
+               Filter: (a = $0)
+ Optimizer: Postgres query optimizer
+(9 rows)
+
+-- Like the above but throw some more complexity at the planner by adding
+-- a UNION ALL.  We expect both sides of the union not to scan the
+-- non-required partitions.
+select explain_parallel_append(
+'select * from listp where a = (select 1)
+  union all
+select * from listp where a = (select 2);');
+                         explain_parallel_append                          
+--------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=N loops=N)
+   ->  Append (actual rows=N loops=N)
+         ->  Append (actual rows=N loops=N)
+               InitPlan 1 (returns $0)  (slice2)
+                 ->  Result (actual rows=N loops=N)
+               ->  Seq Scan on listp_12_1 listp_1 (actual rows=N loops=N)
+                     Filter: (a = $0)
+               ->  Seq Scan on listp_12_2 listp_2 (never executed)
+                     Filter: (a = $0)
+         ->  Append (actual rows=N loops=N)
+               InitPlan 2 (returns $1)  (slice3)
+                 ->  Result (actual rows=N loops=N)
+               ->  Seq Scan on listp_12_1 listp_4 (never executed)
+                     Filter: (a = $1)
+               ->  Seq Scan on listp_12_2 listp_5 (actual rows=N loops=N)
+                     Filter: (a = $1)
+ Optimizer: Postgres query optimizer
+(17 rows)
+
+drop table listp;
+reset parallel_tuple_cost;
+reset parallel_setup_cost;
+-- Test case for run-time pruning with a nested Merge Append
+set enable_sort to 0;
+create table rangep (a int, b int) partition by range (a);
+create table rangep_0_to_100 partition of rangep for values from (0) to (100) partition by list (b);
+-- We need 3 sub-partitions. 1 to validate pruning worked and another two
+-- because a single remaining partition would be pulled up to the main Append.
+create table rangep_0_to_100_1 partition of rangep_0_to_100 for values in(1);
+create table rangep_0_to_100_2 partition of rangep_0_to_100 for values in(2);
+create table rangep_0_to_100_3 partition of rangep_0_to_100 for values in(3);
+create table rangep_100_to_200 partition of rangep for values from (100) to (200);
+create index on rangep (a);
+-- Ensure run-time pruning works on the nested Merge Append
+explain (analyze on, costs off, timing off, summary off)
+select * from rangep where b IN((select 1),(select 2)) order by a;
+                                                QUERY PLAN                                                 
+-----------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3) (actual rows=0 loops=1)
+   Merge Key: rangep.a
+   InitPlan 1 (returns $0)  (slice2)
+     ->  Result (actual rows=1 loops=1)
+   InitPlan 2 (returns $1)  (slice3)
+     ->  Result (actual rows=1 loops=1)
+   ->  Append (actual rows=0 loops=1)
+         ->  Merge Append (actual rows=0 loops=1)
+               Sort Key: rangep_2.a
+               ->  Index Scan using rangep_0_to_100_1_a_idx on rangep_0_to_100_1 rangep_2 (actual rows=0 loops=1)
+                     Filter: (b = ANY (ARRAY[$0, $1]))
+               ->  Index Scan using rangep_0_to_100_2_a_idx on rangep_0_to_100_2 rangep_3 (actual rows=0 loops=1)
+                     Filter: (b = ANY (ARRAY[$0, $1]))
+               ->  Index Scan using rangep_0_to_100_3_a_idx on rangep_0_to_100_3 rangep_4 (never executed)
+                     Filter: (b = ANY (ARRAY[$0, $1]))
+         ->  Index Scan using rangep_100_to_200_a_idx on rangep_100_to_200 rangep_5 (actual rows=0 loops=1)
+               Filter: (b = ANY (ARRAY[$0, $1]))
+ Optimizer: Postgres query optimizer
+(18 rows)
+
+reset enable_sort;
+drop table rangep;
+--
+-- Check that gen_prune_steps_from_opexps() works well for various cases of
+-- clauses for different partition keys
+--
+create table rp_prefix_test1 (a int, b varchar) partition by range(a, b);
+create table rp_prefix_test1_p1 partition of rp_prefix_test1 for values from (1, 'a') to (1, 'b');
+create table rp_prefix_test1_p2 partition of rp_prefix_test1 for values from (2, 'a') to (2, 'b');
+-- Don't call get_steps_using_prefix() with the last partition key b plus
+-- an empty prefix
+explain (costs off) select * from rp_prefix_test1 where a <= 1 and b = 'a';
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on rp_prefix_test1_p1 rp_prefix_test1
+         Filter: ((a <= 1) AND ((b)::text = 'a'::text))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+create table rp_prefix_test2 (a int, b int, c int) partition by range(a, b, c);
+create table rp_prefix_test2_p1 partition of rp_prefix_test2 for values from (1, 1, 0) to (1, 1, 10);
+create table rp_prefix_test2_p2 partition of rp_prefix_test2 for values from (2, 2, 0) to (2, 2, 10);
+-- Don't call get_steps_using_prefix() with the last partition key c plus
+-- an invalid prefix (ie, b = 1)
+explain (costs off) select * from rp_prefix_test2 where a <= 1 and b = 1 and c >= 0;
+                      QUERY PLAN                      
+------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on rp_prefix_test2_p1 rp_prefix_test2
+         Filter: ((a <= 1) AND (c >= 0) AND (b = 1))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+create table rp_prefix_test3 (a int, b int, c int, d int) partition by range(a, b, c, d);
+create table rp_prefix_test3_p1 partition of rp_prefix_test3 for values from (1, 1, 1, 0) to (1, 1, 1, 10);
+create table rp_prefix_test3_p2 partition of rp_prefix_test3 for values from (2, 2, 2, 0) to (2, 2, 2, 10);
+-- Test that get_steps_using_prefix() handles a prefix that contains multiple
+-- clauses for the partition key b (ie, b >= 1 and b >= 2)
+explain (costs off) select * from rp_prefix_test3 where a >= 1 and b >= 1 and b >= 2 and c >= 2 and d >= 0;
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on rp_prefix_test3_p2 rp_prefix_test3
+         Filter: ((a >= 1) AND (b >= 1) AND (b >= 2) AND (c >= 2) AND (d >= 0))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
+-- Test that get_steps_using_prefix() handles a prefix that contains multiple
+-- clauses for the partition key b (ie, b >= 1 and b = 2)  (This also tests
+-- that the caller arranges clauses in that prefix in the required order)
+explain (costs off) select * from rp_prefix_test3 where a >= 1 and b >= 1 and b = 2 and c = 2 and d >= 0;
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  Seq Scan on rp_prefix_test3_p2 rp_prefix_test3
+         Filter: ((a >= 1) AND (b >= 1) AND (d >= 0) AND (c >= 1) AND (b = 2) AND (c = 2))
+ Optimizer: Postgres query optimizer
+(4 rows)
+
diff --git a/src/test/regress/expected/partition_prune_opfamily_append.out b/src/test/regress/expected/partition_prune_opfamily_append.out
new file mode 100644
index 00000000000..ed67b78005b
--- /dev/null
+++ b/src/test/regress/expected/partition_prune_opfamily_append.out
@@ -0,0 +1,393 @@
+-- https://gist.github.com/kainwen/df7c0d3149684e1256d31b5c39e02de7#file-gp7-sql
+-- This test is included in https://github.com/greenplum-db/gpdb/issues/14982
+-- The test creates an operator that performs absolute value comparisons of the input data.
+-- The operator belongs to a customized btree opfamily 16433, which supports cross-type (20, 23) comparisons.
+-- The test then creates two tables, t1 and t2.
+-- Both are distributed by column a, and partitioned by column b.
+-- t1.a is of type int, belonging to hash opfamily 1977, which supports cross-type (20, 21, 23) comparisons.
+-- t2.a is of type int, belonging to hash opfamily 1977, which supports cross-type (20, 21, 23) comparisons.
+-- t1.b is of type int4, belonging to btree opfamily 1976, which supports cross-type (20, 21, 23) comparisons.
+-- t2.b is of type int8, belonging to btree opfamily 1976, which supports cross-type (20, 21, 23) comparisons.
+-- As of now, ORCA doesn't consider partition key's opfamily when performing partition pruning
+-- Internally, operator |=| of opfamily 16433 is treated as operator = of opfamily 1977 or 1976, and generated
+-- incorrect hash join condition and unjustified partition pruning. This fix compares the operator to the
+-- column's opfamily, thence deriving correct properties from the predicates.
+-- greenplum
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+create schema partition_prune_opfamily;
+set search_path=partition_prune_opfamily;
+SET optimizer_trace_fallback=on;
+-- start_ignore
+create language plpython3u;
+-- end_ignore
+-- proc for int4
+create function abseq4(a int4, b int4) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+create function abslt4(a int4, b int4) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+create function absle4(a int4, b int4) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+create function absgt4(a int4, b int4) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+create function absge4(a int4, b int4) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+create function abscmp4(a int4, b int4) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+-- procs for int8
+create function abseq8(a int8, b int8) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+create function abslt8(a int8, b int8) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+create function absle8(a int8, b int8) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+create function absgt8(a int8, b int8) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+create function absge8(a int8, b int8) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+create function abscmp8(a int8, b int8) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+-- procs for cross type int4 int8
+create function abseq48(a int4, b int8) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+create function abslt48(a int4, b int8) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+create function absle48(a int4, b int8) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+create function absgt48(a int4, b int8) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+create function absge48(a int4, b int8) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+create function abscmp48(a int4, b int8) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+--procs for cross type int8 int4
+create function abseq84(a int8, b int4) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+create function abslt84(a int8, b int4) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+create function absle84(a int8, b int4) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+create function absgt84(a int8, b int4) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+create function absge84(a int8, b int4) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+create function abscmp84(a int8, b int4) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+-- |=|
+create operator |=| (
+  procedure = abseq4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |=|,
+  merges);
+create operator |=| (
+  procedure = abseq8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |=|,
+  merges);
+create operator |=| (
+  procedure = abseq48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |=|,
+  merges);
+create operator |=| (
+  procedure = abseq84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |=|,
+  merges);
+-- |<|
+create operator |<| (
+  procedure = abslt4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |<|);
+create operator |<| (
+  procedure = abslt8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |<|);
+create operator |<| (
+  procedure = abslt48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |<|);
+create operator |<| (
+  procedure = abslt84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |<|);
+-- |>|
+create operator |>| (
+  procedure = absgt4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |>|);
+create operator |>| (
+  procedure = absgt8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |>|);
+create operator |>| (
+  procedure = absgt48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |>|);
+create operator |>| (
+  procedure = absgt84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |>|);
+-- |<=|
+create operator |<=| (
+  procedure = absle4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |<=|);
+create operator |<=| (
+  procedure = absle8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |<=|);
+create operator |<=| (
+  procedure = absle48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |<=|);
+ 
+create operator |<=| (
+  procedure = absle84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |<=|);
+-- |>=|
+create operator |>=| (
+  procedure = absge4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |>=|);
+create operator |>=| (
+  procedure = absge8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |>=|);
+create operator |>=| (
+  procedure = absge48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |>=|);
+create operator |>=| (
+  procedure = absge84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |>=|);
+--------
+create operator family abs_int_ops using btree;
+create operator class abs_int4_ops for type int4
+  using btree FAMILY abs_int_ops  as
+  operator 1 |<|,
+  operator 3 |=|,
+  operator 5 |>|,
+  function 1 abscmp4(int4, int4);
+create operator class abs_int8_ops for type int8
+  using btree FAMILY abs_int_ops as
+  operator 1 |<|,
+  operator 3 |=|,
+  operator 5 |>|,
+  function 1 abscmp8(int8, int8);
+alter operator family abs_int_ops using btree add
+  -- cross-type comparisons int4 vs int8
+  operator 1 |<| (int4, int8),
+  operator 2 |<=| (int4, int8),
+  operator 3 |=| (int4, int8),
+  operator 4 |>=| (int4, int8),
+  operator 5 |>| (int4, int8),
+  function 1 abscmp48(int4, int8),
+  
+  -- cross-type comparisons int8 vs int4
+  operator 1 |<| (int8, int4),
+  operator 2 |<=| (int8, int4),
+  operator 3 |=| (int8, int4),
+  operator 4 |>=| (int8, int4),
+  operator 5 |>| (int8, int4),
+  function 1 abscmp84(int8, int4);
+-- gpdb
+-- start_ignore
+DROP TABLE t1;
+ERROR:  table "t1" does not exist
+DROP TABLE t2;
+ERROR:  table "t2" does not exist
+-- end_ignore
+create table t1 (a int, b int4)
+partition by list (b)
+(
+  partition p1 values (1),
+  partition p2 values (-1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table t2 (a int, b int8)
+partition by list (b)
+(
+  partition p1 values (1),
+  partition p2 values (-1)
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into t1 values (1,1), (1,-1), (-1,1), (-1,-1);
+insert into t2 values (1,1), (1,-1), (-1,1), (-1,-1);
+explain select * from t1 where t1.b |=| 1;
+                                  QUERY PLAN                                  
+------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+   ->  Append  (cost=0.00..431.00 rows=1 width=8)
+         ->  Seq Scan on t1_1_prt_p2  (cost=0.00..431.00 rows=1 width=8)
+               Filter: (b |=| 1)
+         ->  Seq Scan on t1_1_prt_p1  (cost=0.00..431.00 rows=1 width=8)
+               Filter: (b |=| 1)
+ Optimizer: GPORCA
+(7 rows)
+
+select * from t1 where t1.b |=| 1;
+ a  | b  
+----+----
+ -1 | -1
+ -1 |  1
+  1 | -1
+  1 |  1
+(4 rows)
+
+explain select * from t1, t2 where t1.b = t2.b and t2.b |=| 1;
+                                               QUERY PLAN                                                
+---------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=1 width=20)
+   ->  Hash Join  (cost=0.00..862.00 rows=1 width=20)
+         Hash Cond: (t2_1_prt_p2.b = (t1_1_prt_p2.b)::bigint)
+         ->  Append  (cost=0.00..431.00 rows=1 width=12)
+               Partition Selectors: $0
+               ->  Seq Scan on t2_1_prt_p2  (cost=0.00..431.00 rows=1 width=12)
+                     Filter: (b |=| 1)
+               ->  Seq Scan on t2_1_prt_p1  (cost=0.00..431.00 rows=1 width=12)
+                     Filter: (b |=| 1)
+         ->  Hash  (cost=431.00..431.00 rows=1 width=8)
+               ->  Partition Selector (selector id: $0)  (cost=0.00..431.00 rows=1 width=8)
+                     ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=1 width=8)
+                           ->  Append  (cost=0.00..431.00 rows=1 width=8)
+                                 ->  Seq Scan on t1_1_prt_p2  (cost=0.00..431.00 rows=1 width=8)
+                                 ->  Seq Scan on t1_1_prt_p1  (cost=0.00..431.00 rows=1 width=8)
+ Optimizer: GPORCA
+(16 rows)
+
+select * from t1, t2 where t1.b = t2.b and t2.b |=| 1;
+ a  | b  | a  | b  
+----+----+----+----
+ -1 | -1 | -1 | -1
+  1 | -1 | -1 | -1
+ -1 |  1 | -1 |  1
+  1 |  1 | -1 |  1
+ -1 | -1 |  1 | -1
+  1 | -1 |  1 | -1
+ -1 |  1 |  1 |  1
+  1 |  1 |  1 |  1
+(8 rows)
+
+explain select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=1 width=20)
+   ->  Hash Join  (cost=0.00..862.00 rows=1 width=20)
+         Hash Cond: (t2_1_prt_p2.a = t1_1_prt_p2.a)
+         Join Filter: (t1_1_prt_p2.b |=| t2_1_prt_p2.b)
+         ->  Append  (cost=0.00..431.00 rows=1 width=12)
+               ->  Seq Scan on t2_1_prt_p2  (cost=0.00..431.00 rows=1 width=12)
+               ->  Seq Scan on t2_1_prt_p1  (cost=0.00..431.00 rows=1 width=12)
+         ->  Hash  (cost=431.00..431.00 rows=1 width=8)
+               ->  Append  (cost=0.00..431.00 rows=1 width=8)
+                     ->  Seq Scan on t1_1_prt_p2  (cost=0.00..431.00 rows=1 width=8)
+                     ->  Seq Scan on t1_1_prt_p1  (cost=0.00..431.00 rows=1 width=8)
+ Optimizer: GPORCA
+(12 rows)
+
+select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b;
+ a  | b  | a  | b  
+----+----+----+----
+  1 |  1 |  1 | -1
+  1 | -1 |  1 | -1
+  1 |  1 |  1 |  1
+  1 | -1 |  1 |  1
+ -1 |  1 | -1 | -1
+ -1 | -1 | -1 | -1
+ -1 |  1 | -1 |  1
+ -1 | -1 | -1 |  1
+(8 rows)
+
+explain select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b and t2.b = 1;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..862.00 rows=1 width=20)
+   ->  Hash Join  (cost=0.00..862.00 rows=1 width=20)
+         Hash Cond: (t2_1_prt_p1.a = t1_1_prt_p2.a)
+         Join Filter: (t1_1_prt_p2.b |=| t2_1_prt_p1.b)
+         ->  Append  (cost=0.00..431.00 rows=1 width=12)
+               ->  Seq Scan on t2_1_prt_p1  (cost=0.00..431.00 rows=1 width=12)
+                     Filter: (b = 1)
+         ->  Hash  (cost=431.00..431.00 rows=1 width=8)
+               ->  Append  (cost=0.00..431.00 rows=1 width=8)
+                     ->  Seq Scan on t1_1_prt_p2  (cost=0.00..431.00 rows=1 width=8)
+                     ->  Seq Scan on t1_1_prt_p1  (cost=0.00..431.00 rows=1 width=8)
+ Optimizer: GPORCA
+(12 rows)
+
+select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b and t2.b = 1;
+ a  | b  | a  | b 
+----+----+----+---
+ -1 |  1 | -1 | 1
+ -1 | -1 | -1 | 1
+  1 |  1 |  1 | 1
+  1 | -1 |  1 | 1
+(4 rows)
+
+-- CLEANUP
diff --git a/src/test/regress/expected/partition_prune_optimizer.out b/src/test/regress/expected/partition_prune_optimizer.out
index f3640ade989..72e87807c8a 100644
--- a/src/test/regress/expected/partition_prune_optimizer.out
+++ b/src/test/regress/expected/partition_prune_optimizer.out
@@ -3597,7 +3597,7 @@ explain (costs off) select * from pph_arrpart where a in ('{4, 5}', '{1}');
 drop table pph_arrpart;
 -- enum type list partition key
 create type pp_colors as enum ('green', 'blue', 'black');
-create table pp_enumpart (col1 int, a pp_colors) partition by list (a);
+create table pp_enumpart (a pp_colors) partition by list (a);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 create table pp_enumpart_green partition of pp_enumpart for values in ('green');
@@ -3605,7 +3605,7 @@ create table pp_enumpart_blue partition of pp_enumpart for values in ('blue');
 explain (costs off) select * from pp_enumpart where a = 'blue';
                 QUERY PLAN                
 ------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)
+ Gather Motion 1:1  (slice1; segments: 1)
    ->  Dynamic Seq Scan on pp_enumpart
          Number of partitions to scan: 1 (out of 2)
          Filter: (a = 'blue'::pp_colors)
diff --git a/src/test/regress/expected/partition_pruning_append.out b/src/test/regress/expected/partition_pruning_append.out
new file mode 100644
index 00000000000..9c2e5e6beaf
--- /dev/null
+++ b/src/test/regress/expected/partition_pruning_append.out
@@ -0,0 +1,3879 @@
+-- TODO: incremental sort is turned off by default, because it may have
+-- wrong result for some core case. Turn it on to run the existing tests
+-- and minimize the difference from upstream.
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+set enable_incremental_sort=on;
+--
+-- Tests on partition pruning (with ORCA) or constraint exclusion (with the
+-- Postgres planner). These tests check that you get an "expected" plan, that
+-- only scans the partitions that are needed.
+--
+-- The "correct" plan for a given query depends a lot on the capabilities of
+-- the planner and the rest of the system, so the expected output can need
+-- updating, as the system improves.
+--
+-- Create test table with two partitions, for values equal to '1' and values equal to '2'.
+create table parttab (n numeric, t text)
+  partition by list (n)(partition one values ('1'), partition two values('2'));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'n' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- Insert three rows. They're all equal to '1', but different number of zeros after decimal point.
+insert into parttab values
+  ('1', 'one'),
+  ('1.0', 'one point zero'),
+  ('1.00', 'one point zero zero');
+-- select rows whose text representation is three characters long. This should return the '1.0' row.
+select * from parttab where length(n::text) = 3;
+  n  |       t        
+-----+----------------
+ 1.0 | one point zero
+(1 row)
+
+explain select * from parttab where length(n::text) = 3;
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=16)
+   ->  Append  (cost=0.00..431.00 rows=1 width=16)
+         ->  Seq Scan on parttab_1_prt_one  (cost=0.00..431.00 rows=1 width=16)
+               Filter: (length((n)::text) = 3)
+         ->  Seq Scan on parttab_1_prt_two  (cost=0.00..431.00 rows=1 width=16)
+               Filter: (length((n)::text) = 3)
+ Optimizer: GPORCA
+(7 rows)
+
+-- Use index scans when possible. That exercises more code, and allows us to
+-- spot the cases where the planner cannot use even when it exists.
+set enable_seqscan=off;
+set enable_bitmapscan=on;
+set enable_indexscan=on;
+create schema partition_pruning_append;
+set search_path to partition_pruning_append;
+-- Set up common test tables.
+CREATE TABLE pt_lt_tab
+(
+  col1 int,
+  col2 decimal,
+  col3 text,
+  col4 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(1,2,3,4,5,6,7,8,9,10),
+  partition part2 values(11,12,13,14,15,16,17,18,19,20),
+  partition part3 values(21,22,23,24,25,26,27,28,29,30),
+  partition part4 values(31,32,33,34,35,36,37,38,39,40),
+  partition part5 values(41,42,43,44,45,46,47,48,49,50)
+);
+INSERT INTO pt_lt_tab SELECT i, i,'a',True FROM generate_series(1,3)i;
+INSERT INTO pt_lt_tab SELECT i, i,'b',True FROM generate_series(4,6)i;
+INSERT INTO pt_lt_tab SELECT i, i,'c',True FROM generate_series(7,10)i;
+INSERT INTO pt_lt_tab SELECT i, i,'e',True FROM generate_series(11,13)i;
+INSERT INTO pt_lt_tab SELECT i, i,'f',True FROM generate_series(14,16)i;
+INSERT INTO pt_lt_tab SELECT i, i,'g',True FROM generate_series(17,20)i;
+INSERT INTO pt_lt_tab SELECT i, i,'i',False FROM generate_series(21,23)i;
+INSERT INTO pt_lt_tab SELECT i, i,'k',False FROM generate_series(24,26)i;
+INSERT INTO pt_lt_tab SELECT i, i,'h',False FROM generate_series(27,30)i;
+INSERT INTO pt_lt_tab SELECT i, i,'m',False FROM generate_series(31,33)i;
+INSERT INTO pt_lt_tab SELECT i, i,'o',False FROM generate_series(34,36)i;
+INSERT INTO pt_lt_tab SELECT i, i,'n',False FROM generate_series(37,40)i;
+INSERT INTO pt_lt_tab SELECT i, i,'p',False FROM generate_series(41,43)i;
+INSERT INTO pt_lt_tab SELECT i, i,'s',False FROM generate_series(44,46)i;
+INSERT INTO pt_lt_tab SELECT i, i,'q',False FROM generate_series(47,50)i;
+ANALYZE pt_lt_tab;
+-- pt_lt_tab_df is the same as pt_lt_tab, but with a default partition (and some
+-- values in the default partition, including NULLs).
+CREATE TABLE pt_lt_tab_df
+(
+  col1 int,
+  col2 decimal,
+  col3 text,
+  col4 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 VALUES(1,2,3,4,5,6,7,8,9,10),
+  partition part2 VALUES(11,12,13,14,15,16,17,18,19,20),
+  partition part3 VALUES(21,22,23,24,25,26,27,28,29,30),
+  partition part4 VALUES(31,32,33,34,35,36,37,38,39,40),
+  partition part5 VALUES(41,42,43,44,45,46,47,48,49,50),
+  default partition def
+);
+INSERT INTO pt_lt_tab_df SELECT i, i,'a',True FROM generate_series(1,3)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'b',True FROM generate_series(4,6)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'c',True FROM generate_series(7,10)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'e',True FROM generate_series(11,13)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'f',True FROM generate_series(14,16)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'g',True FROM generate_series(17,20)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'i',False FROM generate_series(21,23)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'k',False FROM generate_series(24,26)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'h',False FROM generate_series(27,30)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'m',False FROM generate_series(31,33)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'o',False FROM generate_series(34,36)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'n',False FROM generate_series(37,40)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'p',False FROM generate_series(41,43)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'s',False FROM generate_series(44,46)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'q',False FROM generate_series(47,50)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'u',True FROM generate_series(51,53)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'x',True FROM generate_series(54,56)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'w',True FROM generate_series(57,60)i;
+INSERT INTO pt_lt_tab_df VALUES(NULL,NULL,NULL,NULL);
+INSERT INTO pt_lt_tab_df VALUES(NULL,NULL,NULL,NULL);
+INSERT INTO pt_lt_tab_df VALUES(NULL,NULL,NULL,NULL);
+ANALYZE pt_lt_tab_df;
+--
+-- Test that stable functions are evaluated when constructing the plan. This
+-- differs from PostgreSQL. In PostgreSQL, PREPARE/EXECUTE creates a reusable
+-- plan, while in GPDB, we re-plan the query on every execution, so that the
+-- stable function is executed during planning, and we can therefore do
+-- partition pruning based on its result.
+--
+create or replace function stabletestfunc() returns integer as $$
+begin
+  return 10;
+end;
+$$ language plpgsql stable;
+PREPARE prep_prune AS select * from pt_lt_tab WHERE col2 = stabletestfunc();
+-- The plan should only scan one partition, where col2 = 10.
+EXPLAIN EXECUTE prep_prune;
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
+   ->  Append  (cost=0.00..431.00 rows=1 width=12)
+         ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=12)
+               Filter: (col2 = '10'::numeric)
+ Optimizer: GPORCA
+(5 rows)
+
+-- Also test that Params are const-evaluated.
+PREPARE prep_prune_param AS select * from pt_lt_tab WHERE col2 = $1;
+EXPLAIN EXECUTE prep_prune_param(10);
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
+   ->  Append  (cost=0.00..431.00 rows=1 width=12)
+         ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=12)
+               Filter: (col2 = '10'::numeric)
+ Optimizer: GPORCA
+(5 rows)
+
+-- @description B-tree single index key = non-partitioning key
+CREATE INDEX idx1 on pt_lt_tab(col1);
+SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+                                                                QUERY PLAN                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.00 rows=4 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=4 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col1_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col1_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col1_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col1_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col1_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+                                                             QUERY PLAN                                                              
+-------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_1_prt_part1_col1_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part2_col1_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part3_col1_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part4_col1_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part5_col1_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+ Optimizer: GPORCA
+(17 rows)
+
+SELECT * FROM pt_lt_tab WHERE col1 = 25 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   25 |   25 | k    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 = 25 ORDER BY col2,col3 LIMIT 5;
+                                                             QUERY PLAN                                                              
+-------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_1_prt_part1_col1_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 = 25)
+                     ->  Index Scan using pt_lt_tab_1_prt_part2_col1_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 = 25)
+                     ->  Index Scan using pt_lt_tab_1_prt_part3_col1_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 = 25)
+                     ->  Index Scan using pt_lt_tab_1_prt_part4_col1_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 = 25)
+                     ->  Index Scan using pt_lt_tab_1_prt_part5_col1_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 = 25)
+ Optimizer: GPORCA
+(17 rows)
+
+SELECT * FROM pt_lt_tab WHERE col1 <> 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 <> 10 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 <> 10)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 <> 10)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 <> 10)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 <> 10)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 <> 10)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col1 > 10 AND col1 < 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 10 AND col1 < 50 ORDER BY col2,col3 LIMIT 5;
+                                                                 QUERY PLAN                                                                 
+--------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.01 rows=13 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=13 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col1_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col1 > 10) AND (col1 < 50))
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col1_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col1 > 10) AND (col1 < 50))
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col1_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col1 > 10) AND (col1 < 50))
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col1_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col1 > 10) AND (col1 < 50))
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col1_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col1 > 10) AND (col1 < 50))
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col1 > 10 OR col1 = 25 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 10 OR col1 = 25 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.00 rows=14 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=14 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col1 > 10) OR (col1 = 25))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col1 > 10) OR (col1 = 25))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col1 > 10) OR (col1 = 25))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col1 > 10) OR (col1 = 25))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col1 > 10) OR (col1 = 25))
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col1 between 10 AND 25 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   10 |   10 | c    | t
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 between 10 AND 25 ORDER BY col2,col3 LIMIT 5;
+                                                                QUERY PLAN                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.00 rows=6 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=6 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col1_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=6 width=12)
+                                 Index Cond: ((col1 >= 10) AND (col1 <= 25))
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col1_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=6 width=12)
+                                 Index Cond: ((col1 >= 10) AND (col1 <= 25))
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col1_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=6 width=12)
+                                 Index Cond: ((col1 >= 10) AND (col1 <= 25))
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col1_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=6 width=12)
+                                 Index Cond: ((col1 >= 10) AND (col1 <= 25))
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col1_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=6 width=12)
+                                 Index Cond: ((col1 >= 10) AND (col1 <= 25))
+ Optimizer: GPORCA
+(18 rows)
+
+DROP INDEX idx1;
+-- @description B-tree single index key = partitioning key
+CREATE INDEX idx1 on pt_lt_tab(col2);
+SELECT * FROM pt_lt_tab WHERE col2 < 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 < 10 ORDER BY col2,col3 LIMIT 5;
+                                                                QUERY PLAN                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=5 width=12)
+         Merge Key: col2, col3
+         ->  Limit  (cost=0.00..6.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.00 rows=3 width=12)
+                     Sort Key: col2, col3
+                     ->  Append  (cost=0.00..6.00 rows=4 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col2_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col2 < '10'::numeric)
+ Optimizer: GPORCA
+(10 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Limit  (cost=0.00..0.00 rows=0 width=21)
+   ->  Result  (cost=0.00..0.00 rows=0 width=21)
+         ->  Sort  (cost=0.00..0.00 rows=0 width=21)
+               Sort Key: (NULL::numeric), (NULL::text)
+               ->  Result  (cost=0.00..0.00 rows=0 width=21)
+                     One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(7 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   25 |   25 | k    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+                                                             QUERY PLAN                                                              
+-------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: col2, col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: col2, col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_1_prt_part3_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col2 = '25'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col2 < 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col2 < 50 ORDER BY col2,col3 LIMIT 5;
+                                                                 QUERY PLAN                                                                 
+--------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part2.col2, pt_lt_tab_1_prt_part2.col3
+         ->  Limit  (cost=0.00..6.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.01 rows=13 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part2.col2, pt_lt_tab_1_prt_part2.col3
+                     ->  Append  (cost=0.00..6.00 rows=13 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col2_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col2 > '10'::numeric) AND (col2 < '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col2 > '10'::numeric) AND (col2 < '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col2_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col2 > '10'::numeric) AND (col2 < '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col2_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=13 width=12)
+                                 Index Cond: ((col2 > '10'::numeric) AND (col2 < '50'::numeric))
+ Optimizer: GPORCA
+(16 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 > 10 OR col2 = 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10 OR col2 = 50 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part2.col2, pt_lt_tab_1_prt_part2.col3
+         ->  Limit  (cost=0.00..431.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.00 rows=14 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part2.col2, pt_lt_tab_1_prt_part2.col3
+                     ->  Append  (cost=0.00..431.00 rows=14 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > '10'::numeric) OR (col2 = '50'::numeric))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > '10'::numeric) OR (col2 = '50'::numeric))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > '10'::numeric) OR (col2 = '50'::numeric))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > '10'::numeric) OR (col2 = '50'::numeric))
+ Optimizer: GPORCA
+(16 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   10 |   10 | c    | t
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+                                                                 QUERY PLAN                                                                 
+--------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.01 rows=14 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=14 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col2_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col2_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col2_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col2_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+ Optimizer: GPORCA
+(18 rows)
+
+DROP INDEX idx1;
+-- @description multiple column b-tree index
+CREATE INDEX idx1 on pt_lt_tab(col1,col2);
+SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+                                                                   QUERY PLAN                                                                   
+------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.00 rows=4 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=4 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col1_col2_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col1_col2_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col1_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col1_col2_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col1_col2_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+                                                                QUERY PLAN                                                                
+------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_1_prt_part1_col1_col2_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part2_col1_col2_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part3_col1_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part4_col1_col2_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+                     ->  Index Scan using pt_lt_tab_1_prt_part5_col1_col2_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col1 > 50)
+ Optimizer: GPORCA
+(17 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   25 |   25 | k    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+                                                                QUERY PLAN                                                                
+------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: col2, col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: col2, col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_1_prt_part3_col1_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col2 = '25'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+                                                                QUERY PLAN                                                                
+------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_1_prt_part2.col2, pt_lt_tab_1_prt_part2.col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_1_prt_part2.col2, pt_lt_tab_1_prt_part2.col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_1_prt_part2_col1_col2_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col1 = 10) AND (col2 > '10'::numeric))
+                     ->  Index Scan using pt_lt_tab_1_prt_part3_col1_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col1 = 10) AND (col2 > '10'::numeric))
+                     ->  Index Scan using pt_lt_tab_1_prt_part4_col1_col2_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col1 = 10) AND (col2 > '10'::numeric))
+                     ->  Index Scan using pt_lt_tab_1_prt_part5_col1_col2_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col1 = 10) AND (col2 > '10'::numeric))
+ Optimizer: GPORCA
+(15 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=14 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=14 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=14 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   10 |   10 | c    | t
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+                                                                   QUERY PLAN                                                                    
+-------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.01 rows=14 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.01 rows=14 width=12)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col1_col2_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col1_col2_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col1_col2_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col1_col2_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col1_col2_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+ Optimizer: GPORCA
+(18 rows)
+
+DROP INDEX idx1;
+-- @description multi-column unique constraint (= b-tree index). Essentially the
+-- same as the previous case, but the columns are the other way 'round, and we
+-- do this on the table with default partition.
+ALTER TABLE pt_lt_tab_df ADD CONSTRAINT col2_col1_unique unique(col2,col1);
+SELECT * FROM pt_lt_tab_df WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+                                                                      QUERY PLAN                                                                      
+------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.00 rows=4 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=4 width=12)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part1_col2_col1_key on pt_lt_tab_df_1_prt_part1  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part2_col2_col1_key on pt_lt_tab_df_1_prt_part2  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part3_col2_col1_key on pt_lt_tab_df_1_prt_part3  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part4_col2_col1_key on pt_lt_tab_df_1_prt_part4  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part5_col2_col1_key on pt_lt_tab_df_1_prt_part5  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_def_col2_col1_key on pt_lt_tab_df_1_prt_def  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 < 10)
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   51 |   51 | u    | t
+   52 |   52 | u    | t
+   53 |   53 | u    | t
+   54 |   54 | x    | t
+   55 |   55 | x    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+                                                                      QUERY PLAN                                                                      
+------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.00 rows=4 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=4 width=12)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part1_col2_col1_key on pt_lt_tab_df_1_prt_part1  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 > 50)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part2_col2_col1_key on pt_lt_tab_df_1_prt_part2  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 > 50)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part3_col2_col1_key on pt_lt_tab_df_1_prt_part3  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 > 50)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part4_col2_col1_key on pt_lt_tab_df_1_prt_part4  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 > 50)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part5_col2_col1_key on pt_lt_tab_df_1_prt_part5  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 > 50)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_def_col2_col1_key on pt_lt_tab_df_1_prt_def  (cost=0.00..6.00 rows=4 width=12)
+                                 Index Cond: (col1 > 50)
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   25 |   25 | k    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+                                                                   QUERY PLAN                                                                   
+------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: col2, col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: col2, col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_df_1_prt_part3_col2_col1_key on pt_lt_tab_df_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: (col2 = '25'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=20 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=20 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+                                                                   QUERY PLAN                                                                   
+------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.00 rows=1 width=12)
+   ->  Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..6.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part2.col2, pt_lt_tab_df_1_prt_part2.col3
+         ->  Sort  (cost=0.00..6.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_df_1_prt_part2.col2, pt_lt_tab_df_1_prt_part2.col3
+               ->  Append  (cost=0.00..6.00 rows=1 width=12)
+                     ->  Index Scan using pt_lt_tab_df_1_prt_part2_col2_col1_key on pt_lt_tab_df_1_prt_part2  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col2 > '10'::numeric) AND (col1 = 10))
+                     ->  Index Scan using pt_lt_tab_df_1_prt_part3_col2_col1_key on pt_lt_tab_df_1_prt_part3  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col2 > '10'::numeric) AND (col1 = 10))
+                     ->  Index Scan using pt_lt_tab_df_1_prt_part4_col2_col1_key on pt_lt_tab_df_1_prt_part4  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col2 > '10'::numeric) AND (col1 = 10))
+                     ->  Index Scan using pt_lt_tab_df_1_prt_part5_col2_col1_key on pt_lt_tab_df_1_prt_part5  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col2 > '10'::numeric) AND (col1 = 10))
+                     ->  Index Scan using pt_lt_tab_df_1_prt_def_col2_col1_key on pt_lt_tab_df_1_prt_def  (cost=0.00..6.00 rows=1 width=12)
+                           Index Cond: ((col2 > '10'::numeric) AND (col1 = 10))
+ Optimizer: GPORCA
+(17 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > 10.00) OR (col1 = 50))
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   10 |   10 | c    | t
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+                                                                      QUERY PLAN                                                                       
+-------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..6.01 rows=14 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.01 rows=14 width=12)
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part1_col2_col1_key on pt_lt_tab_df_1_prt_part1  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part2_col2_col1_key on pt_lt_tab_df_1_prt_part2  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part3_col2_col1_key on pt_lt_tab_df_1_prt_part3  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part4_col2_col1_key on pt_lt_tab_df_1_prt_part4  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_df_1_prt_part5_col2_col1_key on pt_lt_tab_df_1_prt_part5  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Index Scan using pt_lt_tab_df_1_prt_def_col2_col1_key on pt_lt_tab_df_1_prt_def  (cost=0.00..6.01 rows=14 width=12)
+                                 Index Cond: ((col2 >= '10'::numeric) AND (col2 <= '50'::numeric))
+ Optimizer: GPORCA
+(20 rows)
+
+ALTER TABLE pt_lt_tab_df DROP CONSTRAINT col2_col1_unique;
+-- @description Heterogeneous index, index on partition key, b-tree index on all partitions
+CREATE INDEX idx1 on pt_lt_tab_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_1_prt_part3(col2);
+CREATE INDEX idx4 on pt_lt_tab_1_prt_part4(col2);
+CREATE INDEX idx5 on pt_lt_tab_1_prt_part5(col2);
+SELECT * FROM pt_lt_tab WHERE col2 between 1 AND 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 between 1 AND 50 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '50'::numeric))
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '50'::numeric))
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 > 5 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    6 |    6 | b    | t
+    7 |    7 | c    | t
+    8 |    8 | c    | t
+    9 |    9 | c    | t
+   10 |   10 | c    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 5 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=15 width=12)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=15 width=12)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '5'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '5'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '5'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '5'::numeric)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '5'::numeric)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 = 5 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    5 |    5 | b    | t
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 = 5 ORDER BY col2,col3 LIMIT 5;
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Sort  (cost=0.00..431.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+               ->  Append  (cost=0.00..431.00 rows=1 width=12)
+                     ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col2 = '5'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+-- @description Heterogeneous index,b-tree index on all parts,index, index on non-partition col
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col1);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col1);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col1);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col1);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col1);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col1);
+SELECT * FROM pt_lt_tab_df WHERE col1 between 1 AND 100 ORDER BY col1 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 between 1 AND 100 ORDER BY col1 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col1
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=20 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col1
+                     ->  Append  (cost=0.00..431.00 rows=20 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col1 >= 1) AND (col1 <= 100))
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col1 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   51 |   51 | u    | t
+   52 |   52 | u    | t
+   53 |   53 | u    | t
+   54 |   54 | x    | t
+   55 |   55 | x    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col1 LIMIT 5;
+                                               QUERY PLAN                                                
+---------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col1
+         ->  Limit  (cost=0.00..431.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.00 rows=4 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col1
+                     ->  Append  (cost=0.00..431.00 rows=4 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=4 width=12)
+                                 Filter: (col1 > 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=4 width=12)
+                                 Filter: (col1 > 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=4 width=12)
+                                 Filter: (col1 > 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=4 width=12)
+                                 Filter: (col1 > 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=4 width=12)
+                                 Filter: (col1 > 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=4 width=12)
+                                 Filter: (col1 > 50)
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col1 < 50 ORDER BY col1 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 < 50 ORDER BY col1 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col1
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col1
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 < 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 < 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 < 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 < 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 < 50)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: (col1 < 50)
+ Optimizer: GPORCA
+(20 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+DROP INDEX idx6;
+-- @description Heterogeneous index,b-tree index on all parts including default, index on partition col
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col2);
+SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=20 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=20 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   51 |   51 | u    | t
+   52 |   52 | u    | t
+   53 |   53 | u    | t
+   54 |   54 | x    | t
+   55 |   55 | x    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_def.col2, pt_lt_tab_df_1_prt_def.col3
+         ->  Limit  (cost=0.00..431.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.00 rows=3 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_def.col2, pt_lt_tab_df_1_prt_def.col3
+                     ->  Append  (cost=0.00..431.00 rows=3 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=3 width=12)
+                                 Filter: (col2 > '50'::numeric)
+ Optimizer: GPORCA
+(10 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   50 |   50 | q    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part5.col2, pt_lt_tab_df_1_prt_part5.col3
+         ->  Sort  (cost=0.00..431.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_df_1_prt_part5.col2, pt_lt_tab_df_1_prt_part5.col3
+               ->  Append  (cost=0.00..431.00 rows=1 width=12)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col2 = '50'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=20 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=20 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: (col2 <> '10'::numeric)
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+    1 |    1 | a    | t
+    2 |    2 | a    | t
+    3 |    3 | a    | t
+    4 |    4 | b    | t
+    5 |    5 | b    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=20 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=20 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=20 width=12)
+                                 Filter: ((col2 >= '1'::numeric) AND (col2 <= '100'::numeric))
+ Optimizer: GPORCA
+(20 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 < 50 AND col1 > 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 < 50 AND col1 > 10 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 < '50'::numeric) AND (col1 > 10))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 < '50'::numeric) AND (col1 > 10))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 < '50'::numeric) AND (col1 > 10))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 < '50'::numeric) AND (col1 > 10))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 < '50'::numeric) AND (col1 > 10))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 < '50'::numeric) AND (col1 > 10))
+ Optimizer: GPORCA
+(20 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+DROP INDEX idx6;
+-- @description Negative tests Combination tests, no index on default partition
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+SELECT * FROM pt_lt_tab_df WHERE col2 > 51 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   52 |   52 | u    | t
+   53 |   53 | u    | t
+   54 |   54 | x    | t
+   55 |   55 | x    | t
+   56 |   56 | x    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 51 ORDER BY col2,col3 LIMIT 5;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_def.col2, pt_lt_tab_df_1_prt_def.col3
+         ->  Limit  (cost=0.00..431.00 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.00 rows=3 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_def.col2, pt_lt_tab_df_1_prt_def.col3
+                     ->  Append  (cost=0.00..431.00 rows=3 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=3 width=12)
+                                 Filter: (col2 > '51'::numeric)
+ Optimizer: GPORCA
+(10 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   50 |   50 | q    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part5.col2, pt_lt_tab_df_1_prt_part5.col3
+         ->  Sort  (cost=0.00..431.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_df_1_prt_part5.col2, pt_lt_tab_df_1_prt_part5.col3
+               ->  Append  (cost=0.00..431.00 rows=1 width=12)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col2 = '50'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+-- @description Negative tests Combination tests ,index exists on some regular partitions and not on the default partition
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+SELECT * FROM pt_lt_tab_df WHERE col2 is NULL ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+      |      |      | 
+      |      |      | 
+      |      |      | 
+(3 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx5;
+-- @description Heterogeneous index,b-tree index on all parts,index , multiple index 
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2,col1);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2,col1);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2,col1);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col2,col1);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2,col1);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col2,col1);
+SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   50 |   50 | q    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part5.col2, pt_lt_tab_df_1_prt_part5.col3
+         ->  Sort  (cost=0.00..431.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_df_1_prt_part5.col2, pt_lt_tab_df_1_prt_part5.col3
+               ->  Append  (cost=0.00..431.00 rows=1 width=12)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col2 = '50'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   11 |   11 | e    | t
+   12 |   12 | e    | t
+   13 |   13 | e    | t
+   14 |   14 | f    | t
+   15 |   15 | f    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part2.col2, pt_lt_tab_df_1_prt_part2.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=17 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part2.col2, pt_lt_tab_df_1_prt_part2.col3
+                     ->  Append  (cost=0.00..431.00 rows=17 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > '10'::numeric) AND (col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > '10'::numeric) AND (col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > '10'::numeric) AND (col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > '10'::numeric) AND (col1 >= 1) AND (col1 <= 100))
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=17 width=12)
+                                 Filter: ((col2 > '10'::numeric) AND (col1 >= 1) AND (col1 <= 100))
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab_df WHERE col1 = 10 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   10 |   10 | c    | t
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 = 10 ORDER BY col2,col3 LIMIT 5;
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=2 width=12)
+   ->  Gather Motion 1:1  (slice1; segments: 1)  (cost=0.00..431.00 rows=2 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+         ->  Sort  (cost=0.00..431.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_df_1_prt_part1.col2, pt_lt_tab_df_1_prt_part1.col3
+               ->  Append  (cost=0.00..431.00 rows=1 width=12)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col1 = 10)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col1 = 10)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col1 = 10)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col1 = 10)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col1 = 10)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col1 = 10)
+ Optimizer: GPORCA
+(19 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+DROP INDEX idx6;
+-- @description Index exists on some continuous set of partitions, e.g. p1,p2,p3
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2);
+SELECT * FROM pt_lt_tab_df WHERE col2 = 35 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   35 |   35 | o    | f
+(1 row)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 35 ORDER BY col2,col3 LIMIT 5;
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=1 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part4.col2, pt_lt_tab_df_1_prt_part4.col3
+         ->  Sort  (cost=0.00..431.00 rows=1 width=12)
+               Sort Key: pt_lt_tab_df_1_prt_part4.col2, pt_lt_tab_df_1_prt_part4.col3
+               ->  Append  (cost=0.00..431.00 rows=1 width=12)
+                     ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=1 width=12)
+                           Filter: (col2 = '35'::numeric)
+ Optimizer: GPORCA
+(9 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+-- @description Index exists on some regular partitions and on the default partition [INDEX exists on non-consecutive partitions, e.g. p1,p3,p5]
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col2);
+SELECT * FROM pt_lt_tab_df WHERE col2 > 15 ORDER BY col2,col3 LIMIT 5;
+ col1 | col2 | col3 | col4 
+------+------+------+------
+   16 |   16 | f    | t
+   17 |   17 | g    | t
+   18 |   18 | g    | t
+   19 |   19 | g    | t
+   20 |   20 | g    | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 15 ORDER BY col2,col3 LIMIT 5;
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.01 rows=5 width=12)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.01 rows=5 width=12)
+         Merge Key: pt_lt_tab_df_1_prt_part2.col2, pt_lt_tab_df_1_prt_part2.col3
+         ->  Limit  (cost=0.00..431.01 rows=2 width=12)
+               ->  Sort  (cost=0.00..431.01 rows=15 width=12)
+                     Sort Key: pt_lt_tab_df_1_prt_part2.col2, pt_lt_tab_df_1_prt_part2.col3
+                     ->  Append  (cost=0.00..431.00 rows=15 width=12)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part2  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '15'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part3  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '15'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part4  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '15'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_part5  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '15'::numeric)
+                           ->  Seq Scan on pt_lt_tab_df_1_prt_def  (cost=0.00..431.00 rows=15 width=12)
+                                 Filter: (col2 > '15'::numeric)
+ Optimizer: GPORCA
+(18 rows)
+
+DROP INDEX idx1;
+DROP INDEX idx5;
+DROP INDEX idx6;
+--
+-- Finally, after running all the other tests on pg_lt_tab, test that
+-- partition pruning still works after dropping a column
+--
+CREATE INDEX idx1 on pt_lt_tab(col4);
+ALTER TABLE pt_lt_tab DROP column col1;
+NOTICE:  dropping a column that is part of the distribution policy forces a random distribution policy
+NOTICE:  dropping a column that is part of the distribution policy forces a random distribution policy
+NOTICE:  dropping a column that is part of the distribution policy forces a random distribution policy
+NOTICE:  dropping a column that is part of the distribution policy forces a random distribution policy
+NOTICE:  dropping a column that is part of the distribution policy forces a random distribution policy
+NOTICE:  dropping a column that is part of the distribution policy forces a random distribution policy
+SELECT * FROM pt_lt_tab WHERE col4 is False ORDER BY col2,col3 LIMIT 5;
+ col2 | col3 | col4 
+------+------+------
+   21 | i    | f
+   22 | i    | f
+   23 | i    | f
+   24 | k    | f
+   25 | k    | f
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col4 is False ORDER BY col2,col3 LIMIT 5;
+                                             QUERY PLAN                                              
+-----------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=5 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=8)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..431.00 rows=2 width=8)
+               ->  Sort  (cost=0.00..431.00 rows=7 width=8)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..431.00 rows=7 width=8)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part1  (cost=0.00..431.00 rows=7 width=8)
+                                 Filter: (col4 IS FALSE)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part2  (cost=0.00..431.00 rows=7 width=8)
+                                 Filter: (col4 IS FALSE)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part3  (cost=0.00..431.00 rows=7 width=8)
+                                 Filter: (col4 IS FALSE)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part4  (cost=0.00..431.00 rows=7 width=8)
+                                 Filter: (col4 IS FALSE)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=7 width=8)
+                                 Filter: (col4 IS FALSE)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col4 = False ORDER BY col2,col3 LIMIT 5;
+ col2 | col3 | col4 
+------+------+------
+   21 | i    | f
+   22 | i    | f
+   23 | i    | f
+   24 | k    | f
+   25 | k    | f
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col4 = False ORDER BY col2,col3 LIMIT 5;
+                                                                QUERY PLAN                                                                 
+-------------------------------------------------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..6.01 rows=5 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..6.01 rows=5 width=8)
+         Merge Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+         ->  Limit  (cost=0.00..6.01 rows=2 width=8)
+               ->  Sort  (cost=0.00..6.01 rows=10 width=8)
+                     Sort Key: pt_lt_tab_1_prt_part1.col2, pt_lt_tab_1_prt_part1.col3
+                     ->  Append  (cost=0.00..6.00 rows=10 width=8)
+                           ->  Index Scan using pt_lt_tab_1_prt_part1_col4_idx on pt_lt_tab_1_prt_part1  (cost=0.00..6.00 rows=10 width=8)
+                                 Index Cond: (col4 = false)
+                           ->  Index Scan using pt_lt_tab_1_prt_part2_col4_idx on pt_lt_tab_1_prt_part2  (cost=0.00..6.00 rows=10 width=8)
+                                 Index Cond: (col4 = false)
+                           ->  Index Scan using pt_lt_tab_1_prt_part3_col4_idx on pt_lt_tab_1_prt_part3  (cost=0.00..6.00 rows=10 width=8)
+                                 Index Cond: (col4 = false)
+                           ->  Index Scan using pt_lt_tab_1_prt_part4_col4_idx on pt_lt_tab_1_prt_part4  (cost=0.00..6.00 rows=10 width=8)
+                                 Index Cond: (col4 = false)
+                           ->  Index Scan using pt_lt_tab_1_prt_part5_col4_idx on pt_lt_tab_1_prt_part5  (cost=0.00..6.00 rows=10 width=8)
+                                 Index Cond: (col4 = false)
+ Optimizer: GPORCA
+(18 rows)
+
+SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+ col2 | col3 | col4 
+------+------+------
+   42 | p    | f
+   43 | p    | f
+   44 | s    | f
+   45 | s    | f
+   46 | s    | f
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+                                             QUERY PLAN                                              
+-----------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=5 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=8)
+         Merge Key: pt_lt_tab_1_prt_part5.col2, pt_lt_tab_1_prt_part5.col3
+         ->  Limit  (cost=0.00..431.00 rows=2 width=8)
+               ->  Sort  (cost=0.00..431.00 rows=4 width=8)
+                     Sort Key: pt_lt_tab_1_prt_part5.col2, pt_lt_tab_1_prt_part5.col3
+                     ->  Append  (cost=0.00..431.00 rows=4 width=8)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=4 width=8)
+                                 Filter: (col2 > '41'::numeric)
+ Optimizer: GPORCA
+(10 rows)
+
+ALTER TABLE pt_lt_tab DROP column col4;
+SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+ col2 | col3 
+------+------
+   42 | p
+   43 | p
+   44 | s
+   45 | s
+   46 | s
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+                                             QUERY PLAN                                              
+-----------------------------------------------------------------------------------------------------
+ Limit  (cost=0.00..431.00 rows=5 width=7)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=5 width=7)
+         Merge Key: pt_lt_tab_1_prt_part5.col2, pt_lt_tab_1_prt_part5.col3
+         ->  Limit  (cost=0.00..431.00 rows=2 width=7)
+               ->  Sort  (cost=0.00..431.00 rows=4 width=7)
+                     Sort Key: pt_lt_tab_1_prt_part5.col2, pt_lt_tab_1_prt_part5.col3
+                     ->  Append  (cost=0.00..431.00 rows=4 width=7)
+                           ->  Seq Scan on pt_lt_tab_1_prt_part5  (cost=0.00..431.00 rows=4 width=7)
+                                 Filter: (col2 > '41'::numeric)
+ Optimizer: GPORCA
+(10 rows)
+
+--
+-- Test a more complicated partitioning scheme, with subpartitions.
+--
+CREATE TABLE pt_complex (i int, j int, k int, l int, m int) DISTRIBUTED BY (i)
+PARTITION BY list(k)
+  SUBPARTITION BY list(j) SUBPARTITION TEMPLATE (subpartition p11 values (1), subpartition p12 values(2))
+  SUBPARTITION BY list(l) SUBPARTITION TEMPLATE (subpartition p11 values (1), subpartition p12 values(2))
+( partition p1 values(1), partition p2 values(2));
+INSERT INTO pt_complex VALUES (1, 1, 1, 1, 1), (2, 2, 2, 2, 2);
+CREATE INDEX i_pt_complex ON pt_complex (i);
+SELECT * FROM pt_complex WHERE i = 1 AND j = 1;
+ i | j | k | l | m 
+---+---+---+---+---
+ 1 | 1 | 1 | 1 | 1
+(1 row)
+
+EXPLAIN SELECT * FROM pt_complex WHERE i = 1 AND j = 1;
+                                                        QUERY PLAN                                                        
+--------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 1:1  (slice1; segments: 1)  (cost=4.65..147.85 rows=12 width=20)
+   ->  Append  (cost=4.65..147.69 rows=4 width=20)
+         ->  Bitmap Heap Scan on pt_complex_1_prt_p1_2_prt_p11_3_prt_p11 pt_complex_1  (cost=4.65..36.92 rows=1 width=20)
+               Recheck Cond: (i = 1)
+               Filter: (j = 1)
+               ->  Bitmap Index Scan on pt_complex_1_prt_p1_2_prt_p11_3_prt_p11_i_idx  (cost=0.00..4.65 rows=22 width=0)
+                     Index Cond: (i = 1)
+         ->  Bitmap Heap Scan on pt_complex_1_prt_p1_2_prt_p11_3_prt_p12 pt_complex_2  (cost=4.65..36.92 rows=1 width=20)
+               Recheck Cond: (i = 1)
+               Filter: (j = 1)
+               ->  Bitmap Index Scan on pt_complex_1_prt_p1_2_prt_p11_3_prt_p12_i_idx  (cost=0.00..4.65 rows=22 width=0)
+                     Index Cond: (i = 1)
+         ->  Bitmap Heap Scan on pt_complex_1_prt_p2_2_prt_p11_3_prt_p11 pt_complex_3  (cost=4.65..36.92 rows=1 width=20)
+               Recheck Cond: (i = 1)
+               Filter: (j = 1)
+               ->  Bitmap Index Scan on pt_complex_1_prt_p2_2_prt_p11_3_prt_p11_i_idx  (cost=0.00..4.65 rows=22 width=0)
+                     Index Cond: (i = 1)
+         ->  Bitmap Heap Scan on pt_complex_1_prt_p2_2_prt_p11_3_prt_p12 pt_complex_4  (cost=4.65..36.92 rows=1 width=20)
+               Recheck Cond: (i = 1)
+               Filter: (j = 1)
+               ->  Bitmap Index Scan on pt_complex_1_prt_p2_2_prt_p11_3_prt_p12_i_idx  (cost=0.00..4.65 rows=22 width=0)
+                     Index Cond: (i = 1)
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+--
+-- See MPP-6861
+--
+CREATE TABLE ds_4
+(
+  month_id character varying(6),
+  cust_group_acc numeric(10),
+  mobile_no character varying(10),
+  source character varying(12),
+  vas_group numeric(10),
+  vas_type numeric(10),
+  count_vas integer,
+  amt_vas numeric(10,2),
+  network_type character varying(3),
+  execution_id integer
+)
+WITH (
+  OIDS=FALSE
+)
+DISTRIBUTED BY (cust_group_acc, mobile_no)
+PARTITION BY LIST(month_id)
+          (
+          PARTITION p200800 VALUES('200800'),
+          PARTITION p200801 VALUES('200801'),
+          PARTITION p200802 VALUES('200802'),
+          PARTITION p200803 VALUES('200803')
+);
+-- this is the case that worked before MPP-6861
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id = '200800';
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::text = '200800'::text)
+ Optimizer: GPORCA
+(5 rows)
+
+-- now we can evaluate this function at planning/prune time
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int = 200800;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = 200800)
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = 200800)
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = 200800)
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = 200800)
+ Optimizer: GPORCA
+(11 rows)
+
+-- this will be satisfied by 200800
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int - 801 < 200000;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (((month_id)::integer - 801) < 200000)
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (((month_id)::integer - 801) < 200000)
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (((month_id)::integer - 801) < 200000)
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (((month_id)::integer - 801) < 200000)
+ Optimizer: GPORCA
+(11 rows)
+
+-- test OR case -- should NOT get pruning
+explain select * from ds_4 where month_id::int - 801 < 200000 OR count_vas > 10;
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) OR (count_vas > 10))
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) OR (count_vas > 10))
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) OR (count_vas > 10))
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) OR (count_vas > 10))
+ Optimizer: GPORCA
+(11 rows)
+
+-- test AND case -- should still get pruning
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int - 801 < 200000 AND count_vas > 10;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) AND (count_vas > 10))
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) AND (count_vas > 10))
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) AND (count_vas > 10))
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((((month_id)::integer - 801) < 200000) AND (count_vas > 10))
+ Optimizer: GPORCA
+(11 rows)
+
+-- test expression case : should get pruning
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where case when month_id = '200800' then 100 else 2 end = 100;
+                                           QUERY PLAN                                            
+-------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN 100 ELSE 2 END = 100)
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN 100 ELSE 2 END = 100)
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN 100 ELSE 2 END = 100)
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN 100 ELSE 2 END = 100)
+ Optimizer: GPORCA
+(11 rows)
+
+-- test expression case : should get pruning
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where case when month_id = '200800' then NULL else 2 end IS NULL;
+                                                 QUERY PLAN                                                  
+-------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN NULL::integer ELSE 2 END IS NULL)
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN NULL::integer ELSE 2 END IS NULL)
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN NULL::integer ELSE 2 END IS NULL)
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::text = '200800'::text) THEN NULL::integer ELSE 2 END IS NULL)
+ Optimizer: GPORCA
+(11 rows)
+
+-- should still get pruning here -- count_vas is only used in the path for month id = 200800
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where case when month_id::int = 200800 then count_vas else 2 end IS NULL;
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::integer = 200800) THEN count_vas ELSE 2 END IS NULL)
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::integer = 200800) THEN count_vas ELSE 2 END IS NULL)
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::integer = 200800) THEN count_vas ELSE 2 END IS NULL)
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: (CASE WHEN ((month_id)::integer = 200800) THEN count_vas ELSE 2 END IS NULL)
+ Optimizer: GPORCA
+(11 rows)
+
+-- do one that matches a couple partitions
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int in (200801, 1,55,6,6,6,6,66,565,65,65,200803);
+                                                 QUERY PLAN                                                 
+------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   ->  Append  (cost=0.00..431.00 rows=1 width=71)
+         ->  Seq Scan on ds_4_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = ANY ('{200801,1,55,6,6,6,6,66,565,65,65,200803}'::integer[]))
+         ->  Seq Scan on ds_4_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = ANY ('{200801,1,55,6,6,6,6,66,565,65,65,200803}'::integer[]))
+         ->  Seq Scan on ds_4_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = ANY ('{200801,1,55,6,6,6,6,66,565,65,65,200803}'::integer[]))
+         ->  Seq Scan on ds_4_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+               Filter: ((month_id)::integer = ANY ('{200801,1,55,6,6,6,6,66,565,65,65,200803}'::integer[]))
+ Optimizer: GPORCA
+(11 rows)
+
+-- cleanup
+drop table ds_4;
+--
+-- See MPP-18979
+--
+CREATE TABLE ds_2
+(
+  month_id character varying(6),
+  cust_group_acc numeric(10),
+  mobile_no character varying(10),
+  source character varying(12),
+  vas_group numeric(10),
+  vas_type numeric(10),
+  count_vas integer,
+  amt_vas numeric(10,2),
+  network_type character varying(3),
+  execution_id integer
+)
+WITH (
+  OIDS=FALSE
+)
+DISTRIBUTED BY (cust_group_acc, mobile_no)
+PARTITION BY LIST(month_id)
+          (
+          PARTITION p200800 VALUES('200800'),
+          PARTITION p200801 VALUES('200801'),
+          PARTITION p200802 VALUES('200802'),
+          PARTITION p200803 VALUES('200803'),
+          PARTITION p200804 VALUES('200804'),
+          PARTITION p200805 VALUES('200805'),
+          PARTITION p200806 VALUES('200806'),
+          PARTITION p200807 VALUES('200807'),
+          PARTITION p200808 VALUES('200808'),
+          PARTITION p200809 VALUES('200809')
+);
+insert into ds_2(month_id) values('200800');
+insert into ds_2(month_id) values('200801');
+insert into ds_2(month_id) values('200802');
+insert into ds_2(month_id) values('200803');
+insert into ds_2(month_id) values('200804');
+insert into ds_2(month_id) values('200805');
+insert into ds_2(month_id) values('200806');
+insert into ds_2(month_id) values('200807');
+insert into ds_2(month_id) values('200808');
+insert into ds_2(month_id) values('200809');
+-- queries without bitmap scan
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+set optimizer_segments=2;
+explain select * from ds_2 where month_id::int in (200808, 1315) order by month_id;
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   Merge Key: ds_2_1_prt_p200800.month_id
+   ->  Sort  (cost=0.00..431.00 rows=1 width=71)
+         Sort Key: ds_2_1_prt_p200800.month_id
+         ->  Append  (cost=0.00..431.00 rows=1 width=71)
+               ->  Seq Scan on ds_2_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200804  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200805  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200806  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200807  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200808  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200809  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,1315}'::integer[]))
+ Optimizer: GPORCA
+(26 rows)
+
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain  select * from ds_2 where month_id::int in (200808, 200801, 2008010) order by month_id;
+                                           QUERY PLAN                                           
+------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=71)
+   Merge Key: ds_2_1_prt_p200800.month_id
+   ->  Sort  (cost=0.00..431.00 rows=1 width=71)
+         Sort Key: ds_2_1_prt_p200800.month_id
+         ->  Append  (cost=0.00..431.00 rows=1 width=71)
+               ->  Seq Scan on ds_2_1_prt_p200800  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200801  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200802  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200803  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200804  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200805  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200806  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200807  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200808  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+               ->  Seq Scan on ds_2_1_prt_p200809  (cost=0.00..431.00 rows=1 width=71)
+                     Filter: ((month_id)::integer = ANY ('{200808,200801,2008010}'::integer[]))
+ Optimizer: GPORCA
+(26 rows)
+
+reset optimizer_segments;
+select * from ds_2 where month_id::int in (200907, 1315) order by month_id;
+ month_id | cust_group_acc | mobile_no | source | vas_group | vas_type | count_vas | amt_vas | network_type | execution_id 
+----------+----------------+-----------+--------+-----------+----------+-----------+---------+--------------+--------------
+(0 rows)
+
+select * from ds_2 where month_id::int in (200808, 1315) order by month_id;
+ month_id | cust_group_acc | mobile_no | source | vas_group | vas_type | count_vas | amt_vas | network_type | execution_id 
+----------+----------------+-----------+--------+-----------+----------+-----------+---------+--------------+--------------
+ 200808   |                |           |        |           |          |           |         |              |             
+(1 row)
+
+select * from ds_2 where month_id::int in (200808, 200801) order by month_id;
+ month_id | cust_group_acc | mobile_no | source | vas_group | vas_type | count_vas | amt_vas | network_type | execution_id 
+----------+----------------+-----------+--------+-----------+----------+-----------+---------+--------------+--------------
+ 200801   |                |           |        |           |          |           |         |              |             
+ 200808   |                |           |        |           |          |           |         |              |             
+(2 rows)
+
+select * from ds_2 where month_id::int in (200808, 200801, 2008010) order by month_id;
+ month_id | cust_group_acc | mobile_no | source | vas_group | vas_type | count_vas | amt_vas | network_type | execution_id 
+----------+----------------+-----------+--------+-----------+----------+-----------+---------+--------------+--------------
+ 200801   |                |           |        |           |          |           |         |              |             
+ 200808   |                |           |        |           |          |           |         |              |             
+(2 rows)
+
+-- cleanup
+drop table ds_2;
+drop table if exists dnsdata cascade;
+NOTICE:  table "dnsdata" does not exist, skipping
+CREATE TABLE dnsdata(dnsname text) DISTRIBUTED RANDOMLY;
+CREATE INDEX dnsdata_d1_idx ON dnsdata USING bitmap (split_part(reverse(dnsname),'.'::text,1));
+CREATE INDEX dnsdata_d2_idx ON dnsdata USING bitmap (split_part(reverse(dnsname),'.'::text,2));
+insert into dnsdata values('www.google.com');
+insert into dnsdata values('www.google1.com');
+insert into dnsdata values('1.google.com');
+insert into dnsdata values('2.google.com');
+insert into dnsdata select 'www.b.com' from generate_series(1, 100000) as x(a);
+analyze dnsdata;
+-- queries with bitmap scan enabled
+set enable_bitmapscan=on;
+set enable_indexscan=on;
+set enable_seqscan=off;
+Select dnsname from dnsdata
+where (split_part(reverse('cache.google.com'),'.',1))=(split_part(reverse(dnsname),'.',1))
+and (split_part(reverse('cache.google.com'),'.',2))=(split_part(reverse(dnsname),'.',2)) 
+order by dnsname;
+    dnsname     
+----------------
+ 1.google.com
+ 2.google.com
+ www.google.com
+(3 rows)
+
+Select dnsname from dnsdata
+where (split_part(reverse('cache.google.com'),'.',1))=(split_part(reverse(dnsname),'.',1))
+and (split_part(reverse('cache.google.com'),'.',2))=(split_part(reverse(dnsname),'.',2))
+and dnsname = 'cache.google.com'
+order by dnsname;
+ dnsname 
+---------
+(0 rows)
+
+-- cleanup
+drop table dnsdata cascade;
+Create or replace function ZeroFunc(int) Returns int as $BODY$
+BEGIN
+  RETURN 0;
+END;
+$BODY$ LANGUAGE plpgsql IMMUTABLE;
+drop table if exists mytable cascade;
+NOTICE:  table "mytable" does not exist, skipping
+create table mytable(i int, j int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into mytable select x, x+1 from generate_series(1, 100000) as x;
+analyze mytable;
+CREATE INDEX mytable_idx1 ON mytable USING bitmap(ZeroFunc(i));
+select * from mytable where ZeroFunc(i)=0 and i=100 order by i;
+  i  |  j  
+-----+-----
+ 100 | 101
+(1 row)
+
+select * from mytable where ZeroFunc(i)=0 and i=-1 order by i;
+ i | j 
+---+---
+(0 rows)
+
+-- cleanup
+drop function ZeroFunc(int) cascade;
+NOTICE:  drop cascades to index mytable_idx1
+drop table mytable cascade;
+-- @description Tests for static partition selection (MPP-24709, GPSQL-2879)
+-- GPDB_12_MERGE_FIXME: this function extract the number such as [5,10] out of
+-- the string "Partition selected: 5 out of 10". We have temporarily broken
+-- that when we reimplemented dynamic seq scan. Currently only the number of
+-- selected partitions is avalable, get the total number of partitions back
+-- post merge.
+create or replace function get_selected_parts(explain_query text) returns text as
+$$
+import re
+rv = plpy.execute(explain_query)
+search_text = 'Dynamic Seq Scan on '
+result = []
+result.append(0)
+result.append(0)
+selected = 0
+out_of = 0
+pattern = re.compile(r"\s+Number of partitions to scan: (?P<selected>\d+)")
+for i in range(len(rv)):
+    cur_line = rv[i]['QUERY PLAN']
+    if search_text.lower() in cur_line.lower():
+        j = i+1
+        temp_line = rv[j]['QUERY PLAN']
+        while (not pattern.match(temp_line)):
+            j += 1
+            if j == len(rv) - 1:
+                break
+            temp_line = rv[j]['QUERY PLAN']
+
+        else:
+            selected += int(pattern.match(temp_line).group('selected'))
+result[0] = selected
+result[1] = out_of
+return result
+$$
+language plpython3u;
+drop table if exists partprune_foo;
+create table partprune_foo(a int, b int, c int) partition by range (b) (start (1) end (101) every (10));
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into partprune_foo select g % 5 + 1, g + 1, g % 10 + 1 from generate_series(0, 99) g;
+analyze partprune_foo;
+select get_selected_parts('explain select * from partprune_foo;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo;
+ a |  b  | c  
+---+-----+----
+ 1 |   1 |  1
+ 3 |   3 |  3
+ 5 |   5 |  5
+ 1 |   6 |  6
+ 3 |   8 |  8
+ 5 |  10 | 10
+ 1 |  11 |  1
+ 3 |  13 |  3
+ 5 |  15 |  5
+ 1 |  16 |  6
+ 3 |  18 |  8
+ 5 |  20 | 10
+ 1 |  21 |  1
+ 3 |  23 |  3
+ 5 |  25 |  5
+ 1 |  26 |  6
+ 3 |  28 |  8
+ 5 |  30 | 10
+ 1 |  31 |  1
+ 3 |  33 |  3
+ 5 |  35 |  5
+ 1 |  36 |  6
+ 3 |  38 |  8
+ 5 |  40 | 10
+ 1 |  41 |  1
+ 3 |  43 |  3
+ 5 |  45 |  5
+ 1 |  46 |  6
+ 3 |  48 |  8
+ 5 |  50 | 10
+ 1 |  51 |  1
+ 3 |  53 |  3
+ 5 |  55 |  5
+ 1 |  56 |  6
+ 3 |  58 |  8
+ 5 |  60 | 10
+ 1 |  61 |  1
+ 3 |  63 |  3
+ 5 |  65 |  5
+ 1 |  66 |  6
+ 3 |  68 |  8
+ 5 |  70 | 10
+ 1 |  71 |  1
+ 3 |  73 |  3
+ 5 |  75 |  5
+ 1 |  76 |  6
+ 3 |  78 |  8
+ 5 |  80 | 10
+ 1 |  81 |  1
+ 3 |  83 |  3
+ 5 |  85 |  5
+ 1 |  86 |  6
+ 3 |  88 |  8
+ 5 |  90 | 10
+ 1 |  91 |  1
+ 3 |  93 |  3
+ 5 |  95 |  5
+ 1 |  96 |  6
+ 3 |  98 |  8
+ 5 | 100 | 10
+ 2 |   2 |  2
+ 4 |   4 |  4
+ 2 |   7 |  7
+ 4 |   9 |  9
+ 2 |  12 |  2
+ 4 |  14 |  4
+ 2 |  17 |  7
+ 4 |  19 |  9
+ 2 |  22 |  2
+ 4 |  24 |  4
+ 2 |  27 |  7
+ 4 |  29 |  9
+ 2 |  32 |  2
+ 4 |  34 |  4
+ 2 |  37 |  7
+ 4 |  39 |  9
+ 2 |  42 |  2
+ 4 |  44 |  4
+ 2 |  47 |  7
+ 4 |  49 |  9
+ 2 |  52 |  2
+ 4 |  54 |  4
+ 2 |  57 |  7
+ 4 |  59 |  9
+ 2 |  62 |  2
+ 4 |  64 |  4
+ 2 |  67 |  7
+ 4 |  69 |  9
+ 2 |  72 |  2
+ 4 |  74 |  4
+ 2 |  77 |  7
+ 4 |  79 |  9
+ 2 |  82 |  2
+ 4 |  84 |  4
+ 2 |  87 |  7
+ 4 |  89 |  9
+ 2 |  92 |  2
+ 4 |  94 |  4
+ 2 |  97 |  7
+ 4 |  99 |  9
+(100 rows)
+
+select get_selected_parts('explain select * from partprune_foo where b = 35;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b = 35;
+ a | b  | c 
+---+----+---
+ 5 | 35 | 5
+(1 row)
+
+select get_selected_parts('explain select * from partprune_foo where b < 35;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b < 35;
+ a | b  | c  
+---+----+----
+ 2 |  2 |  2
+ 4 |  4 |  4
+ 2 |  7 |  7
+ 4 |  9 |  9
+ 2 | 12 |  2
+ 4 | 14 |  4
+ 2 | 17 |  7
+ 4 | 19 |  9
+ 2 | 22 |  2
+ 4 | 24 |  4
+ 2 | 27 |  7
+ 4 | 29 |  9
+ 2 | 32 |  2
+ 4 | 34 |  4
+ 1 |  1 |  1
+ 3 |  3 |  3
+ 5 |  5 |  5
+ 1 |  6 |  6
+ 3 |  8 |  8
+ 5 | 10 | 10
+ 1 | 11 |  1
+ 3 | 13 |  3
+ 5 | 15 |  5
+ 1 | 16 |  6
+ 3 | 18 |  8
+ 5 | 20 | 10
+ 1 | 21 |  1
+ 3 | 23 |  3
+ 5 | 25 |  5
+ 1 | 26 |  6
+ 3 | 28 |  8
+ 5 | 30 | 10
+ 1 | 31 |  1
+ 3 | 33 |  3
+(34 rows)
+
+select get_selected_parts('explain select * from partprune_foo where b in (5, 6, 14, 23);');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b in (5, 6, 14, 23);
+ a | b  | c 
+---+----+---
+ 5 |  5 | 5
+ 1 |  6 | 6
+ 3 | 23 | 3
+ 4 | 14 | 4
+(4 rows)
+
+select get_selected_parts('explain select * from partprune_foo where b < 15 or b > 60;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b < 15 or b > 60;
+ a |  b  | c  
+---+-----+----
+ 2 |   2 |  2
+ 4 |   4 |  4
+ 2 |   7 |  7
+ 4 |   9 |  9
+ 2 |  12 |  2
+ 4 |  14 |  4
+ 2 |  62 |  2
+ 4 |  64 |  4
+ 2 |  67 |  7
+ 4 |  69 |  9
+ 2 |  72 |  2
+ 4 |  74 |  4
+ 2 |  77 |  7
+ 4 |  79 |  9
+ 2 |  82 |  2
+ 4 |  84 |  4
+ 2 |  87 |  7
+ 4 |  89 |  9
+ 2 |  92 |  2
+ 4 |  94 |  4
+ 2 |  97 |  7
+ 4 |  99 |  9
+ 1 |   1 |  1
+ 3 |   3 |  3
+ 5 |   5 |  5
+ 1 |   6 |  6
+ 3 |   8 |  8
+ 5 |  10 | 10
+ 1 |  11 |  1
+ 3 |  13 |  3
+ 1 |  61 |  1
+ 3 |  63 |  3
+ 5 |  65 |  5
+ 1 |  66 |  6
+ 3 |  68 |  8
+ 5 |  70 | 10
+ 1 |  71 |  1
+ 3 |  73 |  3
+ 5 |  75 |  5
+ 1 |  76 |  6
+ 3 |  78 |  8
+ 5 |  80 | 10
+ 1 |  81 |  1
+ 3 |  83 |  3
+ 5 |  85 |  5
+ 1 |  86 |  6
+ 3 |  88 |  8
+ 5 |  90 | 10
+ 1 |  91 |  1
+ 3 |  93 |  3
+ 5 |  95 |  5
+ 1 |  96 |  6
+ 3 |  98 |  8
+ 5 | 100 | 10
+(54 rows)
+
+select get_selected_parts('explain select * from partprune_foo where b = 150;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b = 150;
+ a | b | c 
+---+---+---
+(0 rows)
+
+select get_selected_parts('explain select * from partprune_foo where b = a*5;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b = a*5;
+ a | b  | c 
+---+----+---
+ 5 | 25 | 5
+(1 row)
+
+-- Test with IN() lists
+-- Number of elements > threshold, partition elimination is not performed
+set optimizer_array_expansion_threshold = 3;
+select get_selected_parts('explain select * from partprune_foo where b in (5, 6, 14, 23);');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b in (5, 6, 14, 23);
+ a | b  | c 
+---+----+---
+ 3 | 23 | 3
+ 5 |  5 | 5
+ 4 | 14 | 4
+ 1 |  6 | 6
+(4 rows)
+
+reset optimizer_array_expansion_threshold;
+-- Test "ANY (<array>)" syntax.
+select get_selected_parts($$ explain select * from partprune_foo where b = ANY ('{5, 6, 14}') $$);
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b = ANY ('{5, 6, 14}');
+ a | b  | c 
+---+----+---
+ 1 |  6 | 6
+ 5 |  5 | 5
+ 4 | 14 | 4
+(3 rows)
+
+select get_selected_parts($$ explain select * from partprune_foo where b < ANY ('{12, 14, 11}') $$);
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from partprune_foo where b < ANY ('{12, 14, 11}');
+ a | b  | c  
+---+----+----
+ 1 |  1 |  1
+ 2 |  2 |  2
+ 1 |  6 |  6
+ 2 |  7 |  7
+ 1 | 11 |  1
+ 2 | 12 |  2
+ 3 |  3 |  3
+ 4 |  4 |  4
+ 5 |  5 |  5
+ 3 |  8 |  8
+ 4 |  9 |  9
+ 5 | 10 | 10
+ 3 | 13 |  3
+(13 rows)
+
+-- Check for all the different number of partition selections
+DROP TABLE IF EXISTS DATE_PARTS;
+NOTICE:  table "date_parts" does not exist, skipping
+CREATE TABLE DATE_PARTS (id int, year int, month int, day int, region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+    SUBPARTITION BY LIST (month)
+       SUBPARTITION TEMPLATE (
+        SUBPARTITION Q1 VALUES (1, 2, 3), 
+        SUBPARTITION Q2 VALUES (4 ,5 ,6),
+        SUBPARTITION Q3 VALUES (7, 8, 9),
+        SUBPARTITION Q4 VALUES (10, 11, 12),
+        DEFAULT SUBPARTITION other_months )
+        	SUBPARTITION BY RANGE(day)
+        		SUBPARTITION TEMPLATE (
+        		START (1) END (31) EVERY (10), 
+		        DEFAULT SUBPARTITION other_days)
+( START (2002) END (2012) EVERY (4), 
+  DEFAULT PARTITION outlying_years );
+insert into DATE_PARTS select i, extract(year from dt), extract(month from dt), extract(day from dt), NULL from (select i, '2002-01-01'::date + i * interval '1 day' day as dt from generate_series(1, 3650) as i) as t;
+-- Expected total parts => 4 * 1 * 4 => 16: 
+-- TODO #141973839: we selected extra parts because of disjunction: 32 parts: 4 * 2 * 4
+select get_selected_parts('explain analyze select * from DATE_PARTS where month between 1 and 3;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- Expected total parts => 4 * 2 * 4 => 32: 
+-- TODO #141973839: we selected extra parts because of disjunction: 48 parts: 4 * 3 * 4
+select get_selected_parts('explain analyze select * from DATE_PARTS where month between 1 and 4;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- Expected total parts => 1 * 2 * 4 => 8: 
+-- TODO #141973839: we selected extra parts because of disjunction: 24 parts: 2 * 3 * 4
+select get_selected_parts('explain analyze select * from DATE_PARTS where year = 2003 and month between 1 and 4;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- 1 :: 5 :: 4 => 20 // Only default for year
+select get_selected_parts('explain analyze select * from DATE_PARTS where year = 1999;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- 4 :: 1 :: 4 => 16 // Only default for month
+select get_selected_parts('explain analyze select * from DATE_PARTS where month = 13;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- 1 :: 1 :: 4 => 4 // Default for both year and month
+select get_selected_parts('explain analyze select * from DATE_PARTS where year = 1999 and month = 13;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- 4 :: 5 :: 1 => 20 // Only default part for day
+select get_selected_parts('explain analyze select * from DATE_PARTS where day = 40;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- General predicate
+-- TODO #141973839. We expected 112 parts: (month = 1) =>   4 * 1 * 4 => 16, month > 3 => 4 * 4 * 4 => 64, month in (0, 1, 2) => 4 * 1 * 4 => 16, month is NULL => 4 * 1 * 4 => 16.
+-- However, we selected 128 parts: (month = 1) =>   4 * 1 * 4 => 16, month > 3 => 4 * 4 * 4 => 64, month in (0, 1, 2) => 4 * 2 * 4 => 32, month is NULL => 4 * 1 * 4 => 16.
+select get_selected_parts('explain analyze select * from DATE_PARTS where month = 1 union all select * from DATE_PARTS where month > 3 union all select * from DATE_PARTS where month in (0,1,2) union all select * from DATE_PARTS where month is null;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- Equality predicate
+-- 16 partitions => 4 from year x 1 from month x 4 from days.
+select get_selected_parts('explain analyze select * from DATE_PARTS where month = 3;');  -- Not working (it only produces general)
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- More Equality and General Predicates ---
+create table foo(a int, b int)
+partition by list (b)
+(partition p1 values(1,3), partition p2 values(4,2), default partition other);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- General predicate
+-- Total 6 parts. b = 1: 1 part, b > 3: 2 parts, b in (0, 1): 2 parts. b is null: 1 part
+select get_selected_parts('explain analyze select * from foo where b = 1 union all select * from foo where b > 3 union all select * from foo where b in (0,1) union all select * from foo where b is null;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+drop table if exists pt;
+NOTICE:  table "pt" does not exist, skipping
+CREATE TABLE pt (id int, gender varchar(2)) 
+DISTRIBUTED BY (id)
+PARTITION BY LIST (gender)
+( PARTITION girls VALUES ('F', NULL), 
+  PARTITION boys VALUES ('M'), 
+  DEFAULT PARTITION other );
+-- General filter
+-- TODO #141916623. Expecting 6 parts, but optimizer plan selects 7 parts. The 6 parts breakdown is: gender = 'F': 1 part, gender < 'M': 2 parts (including default), gender in ('F', F'M'): 2 parts, gender is null => 1 part
+select get_selected_parts('explain analyze select * from pt where gender = ''F'' union all select * from pt where gender < ''M'' union all select * from pt where gender in (''F'', ''FM'') union all select * from pt where gender is null;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- DML
+-- Non-default part
+insert into DATE_PARTS values (-1, 2004, 11, 30, NULL);
+select * from date_parts_1_prt_2_2_prt_q4_3_prt_4 where id < 0;
+ id | year | month | day | region 
+----+------+-------+-----+--------
+ -1 | 2004 |    11 |  30 | 
+(1 row)
+
+-- Default year
+insert into DATE_PARTS values (-2, 1999, 11, 30, NULL);
+select * from date_parts_1_prt_outlying_years_2_prt_q4_3_prt_4 where id < 0;
+ id | year | month | day | region 
+----+------+-------+-----+--------
+ -2 | 1999 |    11 |  30 | 
+(1 row)
+
+-- Default month
+insert into DATE_PARTS values (-3, 2004, 20, 30, NULL);
+select * from date_parts_1_prt_2_2_prt_other_months where id < 0;
+ id | year | month | day | region 
+----+------+-------+-----+--------
+ -3 | 2004 |    20 |  30 | 
+(1 row)
+
+-- Default day
+insert into DATE_PARTS values (-4, 2004, 10, 50, NULL);
+select * from date_parts_1_prt_2_2_prt_q4_3_prt_other_days where id < 0;
+ id | year | month | day | region 
+----+------+-------+-----+--------
+ -4 | 2004 |    10 |  50 | 
+(1 row)
+
+-- Default everything
+insert into DATE_PARTS values (-5, 1999, 20, 50, NULL);
+select * from date_parts_1_prt_outlying_years_2_prt_other_mo_3_prt_other_days where id < 0;
+ id | year | month | day | region 
+----+------+-------+-----+--------
+ -5 | 1999 |    20 |  50 | 
+(1 row)
+
+-- Default month + day but not year
+insert into DATE_PARTS values (-6, 2002, 20, 50, NULL);
+select * from date_parts_1_prt_2_2_prt_other_months_3_prt_other_days where id < 0;
+ id | year | month | day | region 
+----+------+-------+-----+--------
+ -6 | 2002 |    20 |  50 | 
+(1 row)
+
+-- Dropped columns with exchange
+drop table if exists sales;
+NOTICE:  table "sales" does not exist, skipping
+CREATE TABLE sales (trans_id int, to_be_dropped1 int, date date, amount 
+decimal(9,2), to_be_dropped2 int, region text) 
+DISTRIBUTED BY (trans_id)
+PARTITION BY RANGE (date)
+SUBPARTITION BY LIST (region)
+SUBPARTITION TEMPLATE
+( SUBPARTITION usa VALUES ('usa'), 
+  SUBPARTITION asia VALUES ('asia'), 
+  SUBPARTITION europe VALUES ('europe'), 
+  DEFAULT SUBPARTITION other_regions)
+  (START (date '2011-01-01') INCLUSIVE
+   END (date '2012-01-01') EXCLUSIVE
+   EVERY (INTERVAL '3 month'), 
+   DEFAULT PARTITION outlying_dates );
+-- This will introduce different column numbers in subsequent part tables
+alter table sales drop column to_be_dropped1;
+alter table sales drop column to_be_dropped2;
+-- Create the exchange candidate without dropped columns
+drop table if exists sales_exchange_part;
+NOTICE:  table "sales_exchange_part" does not exist, skipping
+create table sales_exchange_part (trans_id int, date date, amount 
+decimal(9,2), region text);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'trans_id' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+-- Insert some data
+insert into sales_exchange_part values(1, '2011-01-01', 10.1, 'usa');
+-- Exchange
+ALTER TABLE sales 
+ALTER PARTITION FOR (date '2011-01-01')
+EXCHANGE PARTITION FOR ('usa') WITH TABLE sales_exchange_part ;
+ANALYZE sales;
+-- TODO: #141973839. Expected 10 parts, currently selecting 15 parts. First level: 4 parts + 1 default. Second level 2 parts. Total 10 parts.
+select get_selected_parts('explain analyze select * from sales where region = ''usa'' or region = ''asia'';');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+select * from sales where region = 'usa' or region = 'asia';
+ trans_id |    date    | amount | region 
+----------+------------+--------+--------
+        1 | 01-01-2011 |  10.10 | usa
+(1 row)
+
+-- Test DynamicIndexScan with extra filter
+create index idx_sales_date on sales(date);
+explain select * from sales where date = '2011-01-01' and region = 'usa';
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.12..8.16 rows=1 width=19)
+   ->  Index Scan using sales_1_prt_2_2_prt_usa_date_idx on sales_1_prt_2_2_prt_usa sales  (cost=0.12..8.14 rows=1 width=19)
+         Index Cond: (date = '01-01-2011'::date)
+         Filter: (region = 'usa'::text)
+ Optimizer: Postgres query optimizer
+(5 rows)
+
+select * from sales where date = '2011-01-01' and region = 'usa';
+ trans_id |    date    | amount | region 
+----------+------------+--------+--------
+        1 | 01-01-2011 |  10.10 | usa
+(1 row)
+
+-- Updating partition key
+select * from sales_1_prt_2_2_prt_usa;
+ trans_id |    date    | amount | region 
+----------+------------+--------+--------
+        1 | 01-01-2011 |  10.10 | usa
+(1 row)
+
+select * from sales_1_prt_2_2_prt_europe;
+ trans_id | date | amount | region 
+----------+------+--------+--------
+(0 rows)
+
+update sales set region = 'europe' where trans_id = 1;
+select * from sales_1_prt_2_2_prt_europe;
+ trans_id |    date    | amount | region 
+----------+------------+--------+--------
+        1 | 01-01-2011 |  10.10 | europe
+(1 row)
+
+select * from sales_1_prt_2_2_prt_usa;
+ trans_id | date | amount | region 
+----------+------+--------+--------
+(0 rows)
+
+select * from sales;
+ trans_id |    date    | amount | region 
+----------+------------+--------+--------
+        1 | 01-01-2011 |  10.10 | europe
+(1 row)
+
+-- Distinct From
+drop table if exists bar;
+NOTICE:  table "bar" does not exist, skipping
+CREATE TABLE bar (i INTEGER, j decimal)
+partition by list (j)
+subpartition by range (i) subpartition template (start(1) end(4) every(2))
+(partition p1 values(0.2,2.8, NULL), partition p2 values(1.7,3.1),
+partition p3 values(5.6), default partition other);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into bar values(1, 0.2); --p1
+insert into bar values(1, 1.7); --p2
+insert into bar values(1, 2.1); --default
+insert into bar values(1, 5.6); --default
+insert into bar values(1, NULL); --p1
+-- In-equality
+-- 8 parts: All 4 parts on first level and each will have 2 range parts 
+select get_selected_parts('explain analyze select * from bar where j>0.02;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- 6 parts: Excluding 1 list parts at first level. So, 3 at first level and each has 2 at second level.
+select get_selected_parts('explain analyze select * from bar where j>2.8;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- Distinct From
+-- 6 parts: Everything except 1 part that contains 5.6.
+select get_selected_parts('explain analyze select * from bar where j is distinct from 5.6;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- 8 parts: NULL is shared with others on p1. So, all 8 parts.
+select get_selected_parts('explain analyze select * from bar where j is distinct from NULL;');
+ get_selected_parts 
+--------------------
+ [0, 0]
+(1 row)
+
+-- Table partitioned by boolean column
+CREATE TABLE pt_bool_tab
+(
+  col1 int,
+  col2 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(true),
+  partition part2 values(false)
+);
+INSERT INTO pt_bool_tab SELECT i, true FROM generate_series(1,3)i;
+INSERT INTO pt_bool_tab SELECT i, false FROM generate_series(1,2)i;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS true;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS true;
+ col1 | col2 
+------+------
+    1 | t
+    2 | t
+    3 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS false;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS false;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NULL;
+                QUERY PLAN                
+------------------------------------------
+ Result  (cost=0.00..0.00 rows=0 width=5)
+   One-Time Filter: false
+ Optimizer: Pivotal Optimizer (GPORCA)
+(3 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS NULL;
+ col1 | col2 
+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS unknown;
+                QUERY PLAN                
+------------------------------------------
+ Result  (cost=0.00..0.00 rows=0 width=5)
+   One-Time Filter: false
+ Optimizer: GPORCA
+(3 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS unknown;
+ col1 | col2 
+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT true;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT true;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT false;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT false;
+ col1 | col2 
+------+------
+    2 | t
+    3 | t
+    1 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT unknown;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT UNKNOWN)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT unknown;
+ col1 | col2 
+------+------
+    1 | f
+    1 | t
+    2 | f
+    2 | t
+    3 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT NULL;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT (col2 IS NULL))
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT (col2 IS NULL))
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT NULL;
+ col1 | col2 
+------+------
+    1 | f
+    1 | t
+    2 | f
+    2 | t
+    3 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS true;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS true;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS false;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS false;
+ col1 | col2 
+------+------
+    2 | t
+    3 | t
+    1 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NULL;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NULL;
+ col1 | col2 
+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS unknown;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS unknown;
+ col1 | col2 
+------+------
+(0 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT true;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT true;
+ col1 | col2 
+------+------
+    2 | t
+    3 | t
+    1 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT false;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT false;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT unknown;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT unknown;
+ col1 | col2 
+------+------
+    1 | f
+    1 | t
+    2 | f
+    2 | t
+    3 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT NULL;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+         ->  Seq Scan on pt_bool_tab_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT NULL;
+ col1 | col2 
+------+------
+    1 | f
+    1 | t
+    2 | f
+    2 | t
+    3 | t
+(5 rows)
+
+CREATE TABLE pt_bool_tab_df
+(
+  col1 int,
+  col2 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(true),
+  partition part2 values(false),
+  default partition def
+);
+INSERT INTO pt_bool_tab_df SELECT i, true FROM generate_series(1,3)i;
+INSERT INTO pt_bool_tab_df SELECT i, false FROM generate_series(1,2)i;
+INSERT INTO pt_bool_tab_df SELECT i, NULL FROM generate_series(1,1)i;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS true;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS true;
+ col1 | col2 
+------+------
+    1 | t
+    2 | t
+    3 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS false;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS false;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NULL;
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NULL)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NULL;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS unknown;
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS UNKNOWN)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS unknown;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT true;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT TRUE)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT TRUE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT true;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+    1 | 
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT false;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT FALSE)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT FALSE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT false;
+ col1 | col2 
+------+------
+    2 | t
+    3 | t
+    1 | t
+    1 | 
+(4 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT unknown;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT UNKNOWN)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT unknown;
+ col1 | col2 
+------+------
+    2 | f
+    2 | t
+    3 | t
+    1 | f
+    1 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT NULL;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT (col2 IS NULL))
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT (col2 IS NULL))
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT NULL;
+ col1 | col2 
+------+------
+    2 | f
+    2 | t
+    3 | t
+    1 | f
+    1 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS true;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS true;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS false;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS false;
+ col1 | col2 
+------+------
+    2 | t
+    3 | t
+    1 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NULL;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NULL;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS unknown;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS unknown;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT true;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT TRUE)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT TRUE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT true;
+ col1 | col2 
+------+------
+    2 | t
+    3 | t
+    1 | t
+    1 | 
+(4 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT false;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT FALSE)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT FALSE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT false;
+ col1 | col2 
+------+------
+    2 | f
+    1 | f
+    1 | 
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT unknown;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT unknown;
+ col1 | col2 
+------+------
+    2 | f
+    2 | t
+    3 | t
+    1 | f
+    1 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT NULL;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+         ->  Seq Scan on pt_bool_tab_df_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+         ->  Seq Scan on pt_bool_tab_df_1_prt_def  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT NULL;
+ col1 | col2 
+------+------
+    2 | f
+    2 | t
+    3 | t
+    1 | f
+    1 | t
+(5 rows)
+
+CREATE TABLE pt_bool_tab_null
+(
+  col1 int,
+  col2 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(true),
+  partition part2 values(false),
+  partition part3 values(null)
+);
+INSERT INTO pt_bool_tab_null SELECT i, true FROM generate_series(1,3)i;
+INSERT INTO pt_bool_tab_null SELECT i, false FROM generate_series(1,2)i;
+INSERT INTO pt_bool_tab_null SELECT i, NULL FROM generate_series(1,1)i;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS true;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS true;
+ col1 | col2 
+------+------
+    1 | t
+    2 | t
+    3 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS false;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS false;
+ col1 | col2 
+------+------
+    1 | f
+    2 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NULL;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NULL)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NULL;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS unknown;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS UNKNOWN)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS unknown;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT true;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT TRUE)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT TRUE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT true;
+ col1 | col2 
+------+------
+    1 | f
+    2 | f
+    1 | 
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT false;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT FALSE)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT FALSE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT false;
+ col1 | col2 
+------+------
+    2 | t
+    3 | t
+    1 | t
+    1 | 
+(4 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT unknown;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (col2 IS NOT UNKNOWN)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT unknown;
+ col1 | col2 
+------+------
+    2 | f
+    2 | t
+    3 | t
+    1 | f
+    1 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT NULL;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT (col2 IS NULL))
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT (col2 IS NULL))
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT NULL;
+ col1 | col2 
+------+------
+    2 | f
+    2 | t
+    3 | t
+    1 | f
+    1 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS true;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS TRUE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS true;
+ col1 | col2 
+------+------
+    1 | f
+    2 | f
+(2 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS false;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS FALSE)
+ Optimizer: GPORCA
+(5 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS false;
+ col1 | col2 
+------+------
+    1 | t
+    2 | t
+    3 | t
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NULL;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NULL)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NULL;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS unknown;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS UNKNOWN)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS unknown;
+ col1 | col2 
+------+------
+    1 | 
+(1 row)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT true;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT TRUE)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT TRUE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT true;
+ col1 | col2 
+------+------
+    1 | t
+    1 | 
+    2 | t
+    3 | t
+(4 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT false;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT FALSE)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT FALSE)
+ Optimizer: GPORCA
+(7 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT false;
+ col1 | col2 
+------+------
+    1 | f
+    1 | 
+    2 | f
+(3 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT unknown;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: ((NOT col2) IS NOT UNKNOWN)
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT unknown;
+ col1 | col2 
+------+------
+    1 | f
+    1 | t
+    2 | f
+    2 | t
+    3 | t
+(5 rows)
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT NULL;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..431.00 rows=1 width=5)
+   ->  Append  (cost=0.00..431.00 rows=1 width=5)
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part2  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part1  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+         ->  Seq Scan on pt_bool_tab_null_1_prt_part3  (cost=0.00..431.00 rows=1 width=5)
+               Filter: (NOT ((NOT col2) IS NULL))
+ Optimizer: GPORCA
+(9 rows)
+
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT NULL;
+ col1 | col2 
+------+------
+    1 | f
+    1 | t
+    2 | f
+    2 | t
+    3 | t
+(5 rows)
+
+RESET ALL;
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 49504f1665b..a5951c0c6d1 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -2864,6 +2864,13 @@ Access method: heap_psql
  f2     | character(100) |           |          |         | extended |              | 
 Access method: heap
 
+\dit+ tbl_heap
+                                                         List of relations
+     Schema      |   Name   | Type  |        Owner         | Storage | Table | Persistence | Access method |  Size   | Description 
+-----------------+----------+-------+----------------------+---------+-------+-------------+---------------+---------+-------------
+ tableam_display | tbl_heap | table | regress_display_role | heap    |       | permanent   | heap          | 0 bytes | 
+(1 row)
+
 -- AM is displayed for tables, indexes and materialized views.
 \d+
                                                                  List of relations
diff --git a/src/test/regress/expected/qp_misc_jiras.out b/src/test/regress/expected/qp_misc_jiras.out
index 4cbafc3e684..3ed092217fd 100644
--- a/src/test/regress/expected/qp_misc_jiras.out
+++ b/src/test/regress/expected/qp_misc_jiras.out
@@ -4732,7 +4732,7 @@ else 'Unidentify' end
          Group Key: (CASE WHEN (ir_call_supplementary_svc_code = ANY ('{S20,S21}'::bpchar[])) THEN 'MO'::text ELSE 'foo'::text END), (CASE WHEN ((ir_call_type_group_code)::text = ANY ('{H,VH,PCB}'::text[])) THEN 'Thailland'::text ELSE 'Unidentify'::text END)
          ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=75.08..180.27 rows=905 width=102)
                Hash Key: (CASE WHEN (ir_call_supplementary_svc_code = ANY ('{S20,S21}'::bpchar[])) THEN 'MO'::text ELSE 'foo'::text END), (CASE WHEN ((ir_call_type_group_code)::text = ANY ('{H,VH,PCB}'::text[])) THEN 'Thailland'::text ELSE 'Unidentify'::text END)
-               ->  HashAggregate  (cost=75.08..89.79 rows=905 width=102)
+               ->  Streaming HashAggregate  (cost=75.08..89.79 rows=905 width=64)
                      Group Key: CASE WHEN (ir_call_supplementary_svc_code = ANY ('{S20,S21}'::bpchar[])) THEN 'MO'::text ELSE 'foo'::text END, CASE WHEN ((ir_call_type_group_code)::text = ANY ('{H,VH,PCB}'::text[])) THEN 'Thailland'::text ELSE 'Unidentify'::text END
                      ->  Seq Scan on ir_voice_sms_and_data  (cost=0.00..65.42 rows=1933 width=102)
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/qp_with_clause.out b/src/test/regress/expected/qp_with_clause.out
index b87845ca82b..8aaa6f73dae 100644
--- a/src/test/regress/expected/qp_with_clause.out
+++ b/src/test/regress/expected/qp_with_clause.out
@@ -11090,7 +11090,7 @@ ORDER BY 1, 2, 3, 4 DESC LIMIT 25;
  35NAME        |              7 | 5NAME        |              1
 (25 rows)
 
--- Test that SharedInputScan within the same slice is always executed 
+-- Test that ShareInputScan within the same slice is always executed 
 set gp_cte_sharing=on;
 -- start_ignore
 CREATE TABLE car (a int, b int);
diff --git a/src/test/regress/expected/qp_with_clause_optimizer.out b/src/test/regress/expected/qp_with_clause_optimizer.out
index ddfae1d3747..e70be54b656 100644
--- a/src/test/regress/expected/qp_with_clause_optimizer.out
+++ b/src/test/regress/expected/qp_with_clause_optimizer.out
@@ -11139,7 +11139,7 @@ ORDER BY 1, 2, 3, 4 DESC LIMIT 25;
  35NAME        |              7 | 5NAME        |              1
 (25 rows)
 
--- Test that SharedInputScan within the same slice is always executed 
+-- Test that ShareInputScan within the same slice is always executed 
 set gp_cte_sharing=on;
 -- start_ignore
 CREATE TABLE car (a int, b int);
diff --git a/src/test/regress/expected/query_finish_pending.out b/src/test/regress/expected/query_finish_pending.out
index cd162170e13..f075a0f75a2 100644
--- a/src/test/regress/expected/query_finish_pending.out
+++ b/src/test/regress/expected/query_finish_pending.out
@@ -92,7 +92,7 @@ select gp_inject_fault('execsort_sort_bounded_heap', 'status', 2);
  
 (1 row)
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node
 drop table if exists testsisc;
 NOTICE:  table "testsisc" does not exist, skipping
@@ -104,7 +104,7 @@ insert into testsisc select i, i % 1000, i % 100000, i % 75 from
 	(select count(*) as nsegments from gp_segment_configuration where role='p' and content >= 0) foo) bar; 
 set gp_resqueue_print_operator_memory_limits=on;
 set statement_mem='2MB';
--- ORCA does not generate SharedInputScan with a Sort node underneath it. For
+-- ORCA does not generate ShareInputScan with a Sort node underneath it. For
 -- the following query, ORCA disregards the order by inside the cte definition;
 -- planner on the other hand does not.
 set optimizer=off;
@@ -114,8 +114,8 @@ select gp_inject_fault('execshare_input_next', 'reset', 2);
  Success:
 (1 row)
 
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
  gp_inject_fault 
 -----------------
@@ -137,7 +137,7 @@ select gp_inject_fault('execshare_input_next', 'status', 2);
  
 (1 row)
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node and sort_mk algorithm is used
 select gp_inject_fault('execshare_input_next', 'reset', 2);
  gp_inject_fault 
@@ -145,8 +145,8 @@ select gp_inject_fault('execshare_input_next', 'reset', 2);
  Success:
 (1 row)
 
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
  gp_inject_fault 
 -----------------
diff --git a/src/test/regress/expected/rowhints_optimizer.out b/src/test/regress/expected/rowhints_optimizer.out
index 391afa5a6d9..f9266812319 100644
--- a/src/test/regress/expected/rowhints_optimizer.out
+++ b/src/test/regress/expected/rowhints_optimizer.out
@@ -33,14 +33,14 @@ ANALYZE my_table, your_table, our_table;
 EXPLAIN SELECT t1.a, t2.a FROM my_table AS t1, your_table AS t2, our_table AS t3;
                                                 QUERY PLAN
 -----------------------------------------------------------------------------------------------------------
- Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1356765552.28 rows=1000000 width=8)
-   ->  Nested Loop  (cost=0.00..1356765522.47 rows=333334 width=8)
+ Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..1356765398.57 rows=1000000 width=8)
+   ->  Nested Loop  (cost=0.00..1356765368.75 rows=333334 width=8)
          Join Filter: true
          ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.01 rows=100 width=4)
-               ->  Seq Scan on your_table t2  (cost=0.00..431.00 rows=34 width=4)
-         ->  Nested Loop  (cost=0.00..1324091.78 rows=3334 width=4)
-               Join Filter: true
                ->  Seq Scan on my_table t1  (cost=0.00..431.00 rows=34 width=4)
+         ->  Nested Loop  (cost=0.00..1324091.63 rows=3334 width=4)
+               Join Filter: true
+               ->  Seq Scan on your_table t2  (cost=0.00..431.00 rows=34 width=4)
                ->  Materialize  (cost=0.00..431.00 rows=100 width=1)
                      ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.00 rows=100 width=1)
                            ->  Dynamic Seq Scan on our_table t3  (cost=0.00..431.00 rows=34 width=1)
@@ -78,10 +78,10 @@ not used hint:
    ->  Nested Loop  (cost=xxx..xxx rows=41 width=xxx)
          Join Filter: true
          ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=xxx..xxx rows=100 width=xxx)
-               ->  Seq Scan on your_table t2  (cost=xxx..xxx rows=34 width=xxx)
+               ->  Seq Scan on my_table t1  (cost=xxx..xxx rows=34 width=xxx)
          ->  Nested Loop  (cost=xxx..xxx rows=3334 width=xxx)
                Join Filter: true
-               ->  Seq Scan on my_table t1  (cost=xxx..xxx rows=34 width=xxx)
+               ->  Seq Scan on your_table t2  (cost=xxx..xxx rows=34 width=xxx)
                ->  Materialize  (cost=xxx..xxx rows=100 width=xxx)
                      ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=xxx..xxx rows=100 width=xxx)
                            ->  Dynamic Seq Scan on our_table t3  (cost=xxx..xxx rows=34 width=xxx)
@@ -110,10 +110,10 @@ not used hint:
    ->  Nested Loop  (cost=xxx..xxx rows=333375 width=xxx)
          Join Filter: true
          ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=xxx..xxx rows=100 width=xxx)
-               ->  Seq Scan on your_table t2  (cost=xxx..xxx rows=34 width=xxx)
+               ->  Seq Scan on my_table t1  (cost=xxx..xxx rows=34 width=xxx)
          ->  Nested Loop  (cost=xxx..xxx rows=3334 width=xxx)
                Join Filter: true
-               ->  Seq Scan on my_table t1  (cost=xxx..xxx rows=34 width=xxx)
+               ->  Seq Scan on your_table t2  (cost=xxx..xxx rows=34 width=xxx)
                ->  Materialize  (cost=xxx..xxx rows=100 width=xxx)
                      ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=xxx..xxx rows=100 width=xxx)
                            ->  Dynamic Seq Scan on our_table t3  (cost=xxx..xxx rows=34 width=xxx)
@@ -142,10 +142,10 @@ not used hint:
    ->  Nested Loop  (cost=xxx..xxx rows=333293 width=xxx)
          Join Filter: true
          ->  Broadcast Motion 3:3  (slice3; segments: 3)  (cost=xxx..xxx rows=100 width=xxx)
-               ->  Seq Scan on your_table t2  (cost=xxx..xxx rows=34 width=xxx)
+               ->  Seq Scan on my_table t1  (cost=xxx..xxx rows=34 width=xxx)
          ->  Nested Loop  (cost=xxx..xxx rows=3334 width=xxx)
                Join Filter: true
-               ->  Seq Scan on my_table t1  (cost=xxx..xxx rows=34 width=xxx)
+               ->  Seq Scan on your_table t2  (cost=xxx..xxx rows=34 width=xxx)
                ->  Materialize  (cost=xxx..xxx rows=100 width=xxx)
                      ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=xxx..xxx rows=100 width=xxx)
                            ->  Dynamic Seq Scan on our_table t3  (cost=xxx..xxx rows=34 width=xxx)
diff --git a/src/test/regress/expected/select_distinct.out b/src/test/regress/expected/select_distinct.out
index 9d2882fd143..ce0f24e9f8f 100644
--- a/src/test/regress/expected/select_distinct.out
+++ b/src/test/regress/expected/select_distinct.out
@@ -144,7 +144,7 @@ SELECT count(*) FROM
                      ->  Redistribute Motion 3:3  (slice2; segments: 3)
                            Output: tenk1.two, tenk1.four, tenk1.two
                            Hash Key: tenk1.two, tenk1.four, tenk1.two
-                           ->  HashAggregate
+                           ->  Streaming HashAggregate
                                  Output: tenk1.two, tenk1.four, tenk1.two
                                  Group Key: tenk1.two, tenk1.four, tenk1.two
                                  ->  Seq Scan on public.tenk1
diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out
index eb36bb11f88..4de01f4f632 100644
--- a/src/test/regress/expected/select_parallel.out
+++ b/src/test/regress/expected/select_parallel.out
@@ -1056,6 +1056,7 @@ select count(*) from tenk1;
 reset force_parallel_mode;
 reset role;
 -- Window function calculation can't be pushed to workers.
+-- CBDB_PARALLEL: window function's subpath could be parallel.
 explain (costs off, verbose)
   select count(*) from tenk1 a where (unique1, two) in
     (select unique1, row_number() over() from tenk1 b);
@@ -1063,28 +1064,29 @@ explain (costs off, verbose)
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Finalize Aggregate
    Output: count(*)
-   ->  Gather Motion 3:1  (slice1; segments: 3)
+   ->  Gather Motion 6:1  (slice1; segments: 6)
          Output: (PARTIAL count(*))
          ->  Partial Aggregate
                Output: PARTIAL count(*)
-               ->  Hash Semi Join
+               ->  Parallel Hash Semi Join
                      Hash Cond: ((a.unique1 = b.unique1) AND (a.two = (row_number() OVER (?))))
-                     ->  Seq Scan on public.tenk1 a
+                     ->  Parallel Seq Scan on public.tenk1 a
                            Output: a.unique1, a.unique2, a.two, a.four, a.ten, a.twenty, a.hundred, a.thousand, a.twothousand, a.fivethous, a.tenthous, a.odd, a.even, a.stringu1, a.stringu2, a.string4
-                     ->  Hash
+                     ->  Parallel Hash
                            Output: b.unique1, (row_number() OVER (?))
-                           ->  Redistribute Motion 1:3  (slice2; segments: 1)
+                           ->  Redistribute Motion 1:6  (slice2; segments: 1)
                                  Output: b.unique1, (row_number() OVER (?))
                                  Hash Key: b.unique1
+                                 Hash Module: 3
                                  ->  WindowAgg
                                        Output: b.unique1, row_number() OVER (?)
-                                       ->  Gather Motion 3:1  (slice3; segments: 3)
+                                       ->  Gather Motion 6:1  (slice3; segments: 6)
                                              Output: b.unique1
-                                             ->  Seq Scan on public.tenk1 b
+                                             ->  Parallel Seq Scan on public.tenk1 b
                                                    Output: b.unique1
  Settings: enable_parallel = 'on', min_parallel_table_scan_size = '0', optimizer = 'off', parallel_setup_cost = '0', parallel_tuple_cost = '0'
  Optimizer: Postgres query optimizer
-(23 rows)
+(24 rows)
 
 -- LIMIT/OFFSET within sub-selects can't be pushed to workers.
 explain (costs off)
diff --git a/src/test/regress/expected/shared_scan.out b/src/test/regress/expected/shared_scan.out
index 2e4548d7235..2673aff0f8c 100644
--- a/src/test/regress/expected/shared_scan.out
+++ b/src/test/regress/expected/shared_scan.out
@@ -206,7 +206,7 @@ where
                                  Group Key: pk_list.schema_name, pk_list.table_name
                                  ->  Redistribute Motion 3:3  (slice3; segments: 3)
                                        Hash Key: pk_list.schema_name, pk_list.table_name
-                                       ->  HashAggregate
+                                       ->  Streaming HashAggregate
                                              Group Key: pk_list.schema_name, pk_list.table_name
                                              ->  Seq Scan on pk_list
                ->  Materialize
@@ -219,7 +219,7 @@ where
                                  Group Key: pk_list_1.schema_name, pk_list_1.table_name
                                  ->  Redistribute Motion 3:3  (slice5; segments: 3)
                                        Hash Key: pk_list_1.schema_name, pk_list_1.table_name
-                                       ->  HashAggregate
+                                       ->  Streaming HashAggregate
                                              Group Key: pk_list_1.schema_name, pk_list_1.table_name
                                              ->  Seq Scan on pk_list pk_list_1
                            SubPlan 1
diff --git a/src/test/regress/expected/shared_scan_optimizer.out b/src/test/regress/expected/shared_scan_optimizer.out
index a8ab8bd0c23..57ec36089d2 100644
--- a/src/test/regress/expected/shared_scan_optimizer.out
+++ b/src/test/regress/expected/shared_scan_optimizer.out
@@ -111,7 +111,7 @@ WITH cte AS (SELECT * FROM t1 WHERE random() < 0.1 LIMIT 10) SELECT a, 1, 1 FROM
                                  ->  Shared Scan (share slice:id 3:0)
                      ->  Hash
                            ->  Seq Scan on t2
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (17 rows)
 
 -- This functions returns one more column than expected.
@@ -214,7 +214,7 @@ where
                                  Group Key: pk_list.schema_name, pk_list.table_name
                                  ->  Redistribute Motion 3:3  (slice3; segments: 3)
                                        Hash Key: pk_list.schema_name, pk_list.table_name
-                                       ->  HashAggregate
+                                       ->  Streaming HashAggregate
                                              Group Key: pk_list.schema_name, pk_list.table_name
                                              ->  Seq Scan on pk_list
                ->  Materialize
@@ -227,7 +227,7 @@ where
                                  Group Key: pk_list_1.schema_name, pk_list_1.table_name
                                  ->  Redistribute Motion 3:3  (slice5; segments: 3)
                                        Hash Key: pk_list_1.schema_name, pk_list_1.table_name
-                                       ->  HashAggregate
+                                       ->  Streaming HashAggregate
                                              Group Key: pk_list_1.schema_name, pk_list_1.table_name
                                              ->  Seq Scan on pk_list pk_list_1
                            SubPlan 1
diff --git a/src/test/regress/expected/statement_mem_for_windowagg.out b/src/test/regress/expected/statement_mem_for_windowagg.out
index d41610f6a30..fd1d066b7bd 100644
--- a/src/test/regress/expected/statement_mem_for_windowagg.out
+++ b/src/test/regress/expected/statement_mem_for_windowagg.out
@@ -2,6 +2,7 @@ CREATE TABLE dummy_table(x int, y int) DISTRIBUTED BY (y);
 INSERT INTO dummy_table SELECT generate_series(0, 20000), 0;
 INSERT INTO dummy_table SELECT generate_series(0, 20000), 3;
 INSERT INTO dummy_table SELECT generate_series(0, 20000), 10;
+set enable_parallel = off; 
 -- 1. Test that if we set statement_mem to a larger value, the tuplestore
 -- for caching the tuples in partition used in WindowAgg is able to be fitted
 -- in memory.
@@ -172,5 +173,6 @@ SELECT gp_inject_fault_infinite('distinct_winagg_perform_sort', 'reset', dbid)
 (3 rows)
 
 -- Do some clean-ups.
+reset enable_parallel;
 DROP TABLE dummy_table;
 RESET statement_mem;
diff --git a/src/test/regress/expected/stats_ext.out b/src/test/regress/expected/stats_ext.out
index 9b8580f59c2..3fc90553026 100644
--- a/src/test/regress/expected/stats_ext.out
+++ b/src/test/regress/expected/stats_ext.out
@@ -3240,3 +3240,16 @@ NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to table tststats.priv_test_tbl
 drop cascades to view tststats.priv_test_view
 DROP USER regress_stats_user1;
+-- test analyze with extended statistics 
+CREATE TABLE tbl_issue1293 (col1 int, col2 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'col1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO tbl_issue1293
+SELECT i / 10000, i / 100000
+FROM generate_series(1, 1000000) s(i);
+ANALYZE tbl_issue1293;
+-- Create extended statistics on col1, col2
+CREATE STATISTICS s1 (dependencies) ON col1, col2 FROM tbl_issue1293;
+-- Trigger extended stats collection
+ANALYZE tbl_issue1293;
+DROP TABLE tbl_issue1293;
diff --git a/src/test/regress/expected/stats_ext_optimizer.out b/src/test/regress/expected/stats_ext_optimizer.out
index f62d399b4ca..d19caa775d1 100644
--- a/src/test/regress/expected/stats_ext_optimizer.out
+++ b/src/test/regress/expected/stats_ext_optimizer.out
@@ -3275,3 +3275,16 @@ NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to table tststats.priv_test_tbl
 drop cascades to view tststats.priv_test_view
 DROP USER regress_stats_user1;
+-- test analyze with extended statistics 
+CREATE TABLE tbl_issue1293 (col1 int, col2 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'col1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO tbl_issue1293
+SELECT i / 10000, i / 100000
+FROM generate_series(1, 1000000) s(i);
+ANALYZE tbl_issue1293;
+-- Create extended statistics on col1, col2
+CREATE STATISTICS s1 (dependencies) ON col1, col2 FROM tbl_issue1293;
+-- Trigger extended stats collection
+ANALYZE tbl_issue1293;
+DROP TABLE tbl_issue1293;
diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out
index ea96cc3ca7b..8c3f7dfe580 100644
--- a/src/test/regress/expected/subselect.out
+++ b/src/test/regress/expected/subselect.out
@@ -2046,7 +2046,7 @@ group by j, q1;
          ->  Redistribute Motion 3:3  (slice2; segments: 3)
                Output: t.j, ((SubPlan 1))
                Hash Key: t.j, ((SubPlan 1))
-               ->  HashAggregate
+               ->  Streaming HashAggregate
                      Output: t.j, ((SubPlan 1))
                      Group Key: t.j, (SubPlan 1)
                      ->  Seq Scan on public.t
diff --git a/src/test/regress/expected/subselect_gp_optimizer.out b/src/test/regress/expected/subselect_gp_optimizer.out
index 72830e65e08..51344116edd 100644
--- a/src/test/regress/expected/subselect_gp_optimizer.out
+++ b/src/test/regress/expected/subselect_gp_optimizer.out
@@ -1812,102 +1812,94 @@ EXPLAIN SELECT '' AS six, f1 AS "Correlated Field", f2 AS "Second Field"
 EXPLAIN select count(*) from
   (select 1 from tenk1 a
    where unique1 IN (select hundred from tenk1 b)) ss;
-                                                          QUERY PLAN                                                           
--------------------------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=0.00..864.06 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.06 rows=1 width=8)
-         ->  Partial Aggregate  (cost=0.00..864.06 rows=1 width=8)
-               ->  Hash Join  (cost=0.00..864.06 rows=34 width=1)
+                                                        QUERY PLAN                                                        
+--------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..864.08 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.08 rows=1 width=8)
+         ->  Partial Aggregate  (cost=0.00..864.08 rows=1 width=8)
+               ->  Hash Join  (cost=0.00..864.08 rows=34 width=1)
                      Hash Cond: (a.unique1 = b.hundred)
-                     ->  Seq Scan on tenk1 a  (cost=0.00..431.50 rows=3334 width=4)
-                     ->  Hash  (cost=431.94..431.94 rows=34 width=4)
-                           ->  GroupAggregate  (cost=0.00..431.94 rows=34 width=4)
+                     ->  Seq Scan on tenk1 a  (cost=0.00..431.51 rows=3334 width=4)
+                     ->  Hash  (cost=431.95..431.95 rows=34 width=4)
+                           ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                                  Group Key: b.hundred
-                                 ->  Sort  (cost=0.00..431.94 rows=34 width=4)
-                                       Sort Key: b.hundred
-                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.93 rows=34 width=4)
-                                             Hash Key: b.hundred
-                                             ->  Streaming HashAggregate  (cost=0.00..431.93 rows=34 width=4)
-                                                   Group Key: b.hundred
-                                                   ->  Seq Scan on tenk1 b  (cost=0.00..431.50 rows=3334 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
-(17 rows)
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                       Hash Key: b.hundred
+                                       ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                             Group Key: b.hundred
+                                             ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+ Optimizer: GPORCA
+(15 rows)
 
 EXPLAIN select count(distinct ss.ten) from
   (select ten from tenk1 a
    where unique1 IN (select hundred from tenk1 b)) ss;
-                                                             QUERY PLAN                                                              
--------------------------------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=0.00..864.09 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.09 rows=1 width=8)
-         ->  Partial Aggregate  (cost=0.00..864.09 rows=1 width=8)
-               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..864.09 rows=34 width=4)
+                                                           QUERY PLAN                                                           
+--------------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..864.11 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.11 rows=1 width=8)
+         ->  Partial Aggregate  (cost=0.00..864.11 rows=1 width=8)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..864.11 rows=34 width=4)
                      Hash Key: a.ten
-                     ->  Hash Join  (cost=0.00..864.09 rows=34 width=4)
+                     ->  Hash Join  (cost=0.00..864.11 rows=34 width=4)
                            Hash Cond: (a.unique1 = b.hundred)
-                           ->  Seq Scan on tenk1 a  (cost=0.00..431.50 rows=3334 width=8)
-                           ->  Hash  (cost=431.93..431.93 rows=34 width=4)
-                                 ->  GroupAggregate  (cost=0.00..431.93 rows=34 width=4)
+                           ->  Seq Scan on tenk1 a  (cost=0.00..431.51 rows=3334 width=8)
+                           ->  Hash  (cost=431.95..431.95 rows=34 width=4)
+                                 ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                                        Group Key: b.hundred
-                                       ->  Sort  (cost=0.00..431.93 rows=34 width=4)
-                                             Sort Key: b.hundred
-                                             ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.93 rows=34 width=4)
-                                                   Hash Key: b.hundred
-                                                   ->  Streaming HashAggregate  (cost=0.00..431.93 rows=34 width=4)
-                                                         Group Key: b.hundred
-                                                         ->  Seq Scan on tenk1 b  (cost=0.00..431.50 rows=3334 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
-(19 rows)
+                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                             Hash Key: b.hundred
+                                             ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                                   Group Key: b.hundred
+                                                   ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+ Optimizer: GPORCA
+(17 rows)
 
 EXPLAIN select count(*) from
   (select 1 from tenk1 a
    where unique1 IN (select distinct hundred from tenk1 b)) ss;
-                                                          QUERY PLAN                                                           
--------------------------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=0.00..864.06 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.06 rows=1 width=8)
-         ->  Partial Aggregate  (cost=0.00..864.06 rows=1 width=8)
-               ->  Hash Semi Join  (cost=0.00..864.06 rows=34 width=1)
+                                                        QUERY PLAN                                                        
+--------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..864.08 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.08 rows=1 width=8)
+         ->  Partial Aggregate  (cost=0.00..864.08 rows=1 width=8)
+               ->  Hash Semi Join  (cost=0.00..864.08 rows=34 width=1)
                      Hash Cond: (a.unique1 = b.hundred)
-                     ->  Seq Scan on tenk1 a  (cost=0.00..431.50 rows=3334 width=4)
-                     ->  Hash  (cost=431.94..431.94 rows=34 width=4)
-                           ->  GroupAggregate  (cost=0.00..431.94 rows=34 width=4)
+                     ->  Seq Scan on tenk1 a  (cost=0.00..431.51 rows=3334 width=4)
+                     ->  Hash  (cost=431.95..431.95 rows=34 width=4)
+                           ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                                  Group Key: b.hundred
-                                 ->  Sort  (cost=0.00..431.94 rows=34 width=4)
-                                       Sort Key: b.hundred
-                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.93 rows=34 width=4)
-                                             Hash Key: b.hundred
-                                             ->  Streaming HashAggregate  (cost=0.00..431.93 rows=34 width=4)
-                                                   Group Key: b.hundred
-                                                   ->  Seq Scan on tenk1 b  (cost=0.00..431.50 rows=3334 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
-(17 rows)
+                                 ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                       Hash Key: b.hundred
+                                       ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                             Group Key: b.hundred
+                                             ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+ Optimizer: GPORCA
+(15 rows)
 
 EXPLAIN select count(distinct ss.ten) from
   (select ten from tenk1 a
    where unique1 IN (select distinct hundred from tenk1 b)) ss;
-                                                             QUERY PLAN                                                              
--------------------------------------------------------------------------------------------------------------------------------------
- Finalize Aggregate  (cost=0.00..864.09 rows=1 width=8)
-   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.09 rows=1 width=8)
-         ->  Partial Aggregate  (cost=0.00..864.09 rows=1 width=8)
-               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..864.09 rows=34 width=4)
+                                                           QUERY PLAN                                                           
+--------------------------------------------------------------------------------------------------------------------------------
+ Finalize Aggregate  (cost=0.00..864.11 rows=1 width=8)
+   ->  Gather Motion 3:1  (slice1; segments: 3)  (cost=0.00..864.11 rows=1 width=8)
+         ->  Partial Aggregate  (cost=0.00..864.11 rows=1 width=8)
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)  (cost=0.00..864.11 rows=34 width=4)
                      Hash Key: a.ten
-                     ->  Hash Semi Join  (cost=0.00..864.09 rows=34 width=4)
+                     ->  Hash Semi Join  (cost=0.00..864.11 rows=34 width=4)
                            Hash Cond: (a.unique1 = b.hundred)
-                           ->  Seq Scan on tenk1 a  (cost=0.00..431.50 rows=3334 width=8)
-                           ->  Hash  (cost=431.93..431.93 rows=34 width=4)
-                                 ->  GroupAggregate  (cost=0.00..431.93 rows=34 width=4)
+                           ->  Seq Scan on tenk1 a  (cost=0.00..431.51 rows=3334 width=8)
+                           ->  Hash  (cost=431.95..431.95 rows=34 width=4)
+                                 ->  HashAggregate  (cost=0.00..431.95 rows=34 width=4)
                                        Group Key: b.hundred
-                                       ->  Sort  (cost=0.00..431.93 rows=34 width=4)
-                                             Sort Key: b.hundred
-                                             ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.93 rows=34 width=4)
-                                                   Hash Key: b.hundred
-                                                   ->  Streaming HashAggregate  (cost=0.00..431.93 rows=34 width=4)
-                                                         Group Key: b.hundred
-                                                         ->  Seq Scan on tenk1 b  (cost=0.00..431.50 rows=3334 width=4)
- Optimizer: Pivotal Optimizer (GPORCA)
-(19 rows)
+                                       ->  Redistribute Motion 3:3  (slice3; segments: 3)  (cost=0.00..431.94 rows=100 width=4)
+                                             Hash Key: b.hundred
+                                             ->  Streaming HashAggregate  (cost=0.00..431.94 rows=100 width=4)
+                                                   Group Key: b.hundred
+                                                   ->  Seq Scan on tenk1 b  (cost=0.00..431.51 rows=3334 width=4)
+ Optimizer: GPORCA
+(17 rows)
 
 --
 -- In case of simple exists query, planner can generate alternative
diff --git a/src/test/regress/expected/toast.out b/src/test/regress/expected/toast.out
index b86c2f44925..78affbd6e87 100644
--- a/src/test/regress/expected/toast.out
+++ b/src/test/regress/expected/toast.out
@@ -130,7 +130,7 @@ select gp_segment_id, get_rel_toast_count('toastable_heap') from gp_dist_random(
 select gp_segment_id, get_rel_toast_count('toastable_ao') from gp_dist_random('gp_id') order by gp_segment_id;
  gp_segment_id | get_rel_toast_count 
 ---------------+---------------------
-             0 |                  14
+             0 |                  13
              1 |                   0
              2 |                   0
 (3 rows)
diff --git a/src/test/regress/expected/tpcds_q04.out b/src/test/regress/expected/tpcds_q04.out
new file mode 100644
index 00000000000..be34e94a761
--- /dev/null
+++ b/src/test/regress/expected/tpcds_q04.out
@@ -0,0 +1,5531 @@
+CREATE SCHEMA cte_bug;
+SET gp_default_storage_options = '';
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+ set_config 
+------------
+ 
+(1 row)
+
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+SET default_tablespace = '';
+SET default_table_access_method = ao_column;
+--
+-- Name: catalog_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.catalog_sales;
+CREATE TABLE cte_bug.catalog_sales (
+    cs_sold_date_sk integer,
+    cs_sold_time_sk integer,
+    cs_ship_date_sk integer,
+    cs_bill_customer_sk integer,
+    cs_bill_cdemo_sk integer,
+    cs_bill_hdemo_sk integer,
+    cs_bill_addr_sk integer,
+    cs_ship_customer_sk integer,
+    cs_ship_cdemo_sk integer,
+    cs_ship_hdemo_sk integer,
+    cs_ship_addr_sk integer,
+    cs_call_center_sk integer,
+    cs_catalog_page_sk integer,
+    cs_ship_mode_sk integer,
+    cs_warehouse_sk integer,
+    cs_item_sk integer NOT NULL,
+    cs_promo_sk integer,
+    cs_order_number bigint NOT NULL,
+    cs_quantity integer,
+    cs_wholesale_cost numeric(7,2),
+    cs_list_price numeric(7,2),
+    cs_sales_price numeric(7,2),
+    cs_ext_discount_amt numeric(7,2),
+    cs_ext_sales_price numeric(7,2),
+    cs_ext_wholesale_cost numeric(7,2),
+    cs_ext_list_price numeric(7,2),
+    cs_ext_tax numeric(7,2),
+    cs_coupon_amt numeric(7,2),
+    cs_ext_ship_cost numeric(7,2),
+    cs_net_paid numeric(7,2),
+    cs_net_paid_inc_tax numeric(7,2),
+    cs_net_paid_inc_ship numeric(7,2),
+    cs_net_paid_inc_ship_tax numeric(7,2),
+    cs_net_profit numeric(7,2),
+    COLUMN cs_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_call_center_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_catalog_page_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_mode_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_warehouse_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_order_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_ship_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_ship ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_ship_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (cs_item_sk);
+--
+-- Name: customer; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.customer;
+CREATE TABLE cte_bug.customer (
+    c_customer_sk integer NOT NULL,
+    c_customer_id character varying(16) NOT NULL,
+    c_current_cdemo_sk integer,
+    c_current_hdemo_sk integer,
+    c_current_addr_sk integer,
+    c_first_shipto_date_sk integer,
+    c_first_sales_date_sk integer,
+    c_salutation character varying(10),
+    c_first_name character varying(20),
+    c_last_name character varying(30),
+    c_preferred_cust_flag character(1),
+    c_birth_day integer,
+    c_birth_month integer,
+    c_birth_year integer,
+    c_birth_country character varying(20),
+    c_login character varying(13),
+    c_email_address character varying(50),
+    c_last_review_date integer,
+    COLUMN c_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_customer_id ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_shipto_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_sales_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_salutation ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_last_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_preferred_cust_flag ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_day ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_month ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_country ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_login ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_email_address ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_last_review_date ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (c_customer_sk);
+--
+-- Name: date_dim; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.date_dim;
+CREATE TABLE cte_bug.date_dim (
+    d_date_sk integer NOT NULL,
+    d_date_id character varying(16) NOT NULL,
+    d_date date,
+    d_month_seq integer,
+    d_week_seq integer,
+    d_quarter_seq integer,
+    d_year integer,
+    d_dow integer,
+    d_moy integer,
+    d_dom integer,
+    d_qoy integer,
+    d_fy_year integer,
+    d_fy_quarter_seq integer,
+    d_fy_week_seq integer,
+    d_day_name character varying(9),
+    d_quarter_name character varying(6),
+    d_holiday character(1),
+    d_weekend character(1),
+    d_following_holiday character(1),
+    d_first_dom integer,
+    d_last_dom integer,
+    d_same_day_ly integer,
+    d_same_day_lq integer,
+    d_current_day character(1),
+    d_current_week character(1),
+    d_current_month character(1),
+    d_current_quarter character(1),
+    d_current_year character(1),
+    COLUMN d_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_date_id ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_date ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_month_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_week_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_quarter_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_dow ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_moy ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_qoy ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_quarter_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_week_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_day_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_quarter_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_holiday ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_weekend ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_following_holiday ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_first_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_last_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_same_day_ly ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_same_day_lq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_day ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_week ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_month ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_quarter ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (d_date_sk);
+--
+-- Name: store_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.store_sales;
+CREATE TABLE cte_bug.store_sales (
+    ss_sold_date_sk integer,
+    ss_sold_time_sk integer,
+    ss_item_sk integer NOT NULL,
+    ss_customer_sk integer,
+    ss_cdemo_sk integer,
+    ss_hdemo_sk integer,
+    ss_addr_sk integer,
+    ss_store_sk integer,
+    ss_promo_sk integer,
+    ss_ticket_number bigint NOT NULL,
+    ss_quantity integer,
+    ss_wholesale_cost numeric(7,2),
+    ss_list_price numeric(7,2),
+    ss_sales_price numeric(7,2),
+    ss_ext_discount_amt numeric(7,2),
+    ss_ext_sales_price numeric(7,2),
+    ss_ext_wholesale_cost numeric(7,2),
+    ss_ext_list_price numeric(7,2),
+    ss_ext_tax numeric(7,2),
+    ss_coupon_amt numeric(7,2),
+    ss_net_paid numeric(7,2),
+    ss_net_paid_inc_tax numeric(7,2),
+    ss_net_profit numeric(7,2),
+    COLUMN ss_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_store_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ticket_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (ss_item_sk);
+--
+-- Name: web_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.web_sales;
+CREATE TABLE cte_bug.web_sales (
+    ws_sold_date_sk integer,
+    ws_sold_time_sk integer,
+    ws_ship_date_sk integer,
+    ws_item_sk integer NOT NULL,
+    ws_bill_customer_sk integer,
+    ws_bill_cdemo_sk integer,
+    ws_bill_hdemo_sk integer,
+    ws_bill_addr_sk integer,
+    ws_ship_customer_sk integer,
+    ws_ship_cdemo_sk integer,
+    ws_ship_hdemo_sk integer,
+    ws_ship_addr_sk integer,
+    ws_web_page_sk integer,
+    ws_web_site_sk integer,
+    ws_ship_mode_sk integer,
+    ws_warehouse_sk integer,
+    ws_promo_sk integer,
+    ws_order_number bigint NOT NULL,
+    ws_quantity integer,
+    ws_wholesale_cost numeric(7,2),
+    ws_list_price numeric(7,2),
+    ws_sales_price numeric(7,2),
+    ws_ext_discount_amt numeric(7,2),
+    ws_ext_sales_price numeric(7,2),
+    ws_ext_wholesale_cost numeric(7,2),
+    ws_ext_list_price numeric(7,2),
+    ws_ext_tax numeric(7,2),
+    ws_coupon_amt numeric(7,2),
+    ws_ext_ship_cost numeric(7,2),
+    ws_net_paid numeric(7,2),
+    ws_net_paid_inc_tax numeric(7,2),
+    ws_net_paid_inc_ship numeric(7,2),
+    ws_net_paid_inc_ship_tax numeric(7,2),
+    ws_net_profit numeric(7,2),
+    COLUMN ws_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_web_page_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_web_site_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_mode_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_warehouse_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_order_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_ship_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_ship ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_ship_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (ws_item_sk);
+--
+-- Apache Cloudberry database dump complete
+--
+-- 
+-- Allow system table modifications
+-- 
+set allow_system_table_mods=true;
+-- Table: catalog_sales
+UPDATE pg_class
+SET
+	relpages = 1497467::int,
+	reltuples = 720015040.0::real,
+	relallvisible = 0::int
+WHERE relname = 'catalog_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: date_dim
+UPDATE pg_class
+SET
+	relpages = 40::int,
+	reltuples = 73049.0::real,
+	relallvisible = 0::int
+WHERE relname = 'date_dim' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: customer
+UPDATE pg_class
+SET
+	relpages = 2870::int,
+	reltuples = 2100000.0::real,
+	relallvisible = 0::int
+WHERE relname = 'customer' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: store_sales
+UPDATE pg_class
+SET
+	relpages = 1930653::int,
+	reltuples = 1439977500.0::real,
+	relallvisible = 0::int
+WHERE relname = 'store_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: web_sales
+UPDATE pg_class
+SET
+	relpages = 736204::int,
+	reltuples = 360014100.0::real,
+	relallvisible = 0::int
+WHERE relname = 'web_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+--
+-- Table: catalog_sales, Attribute: cs_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0046333335::real,
+	4::integer,
+	1836.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0017666667, 0.0015666666, 0.0015666666, 0.0015, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014333334, 0.0014333334, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666}'::real[],
+	NULL::real[],
+	'{0.054781195}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2452618","2451872","2451875","2451537","2451130","2451869","2451873","2451891","2451908","2452223","2452613","2451169","2451486","2451513","2451904","2451163","2451173","2451541","2451885","2451177","2451504","2451876","2451884","2452249","2452264","2452587","2452606","2451138","2451146","2451158","2451491","2451523","2451536","2451540","2451544","2451883","2451899","2452217","2452222","2452248","2452593","2451535","2451864","2451874","2451894","2451896","2452230","2452588","2452597","2451156","2451505","2451514","2452247","2452259","2452269","2452585","2452627","2451150","2451157","2451166","2451171","2451512","2451515","2451519","2451526","2451881","2451886","2451893","2452232","2452254","2452265","2452576","2452583","2452609","2452612","2452616","2452630","2451132","2451136","2451522","2451529","2451887","2452220","2452235","2452498","2452594","2452595","2452601","2452620","2452624","2451029","2451131","2451133","2451139","2451147","2451170","2451525","2451532","2451856","2451858"}'::int4[],
+	E'{"2450815","2450843","2450872","2450902","2450927","2450954","2450982","2451010","2451032","2451043","2451055","2451066","2451078","2451090","2451102","2451116","2451125","2451142","2451153","2451165","2451181","2451211","2451241","2451266","2451295","2451323","2451348","2451375","2451397","2451409","2451421","2451434","2451446","2451458","2451471","2451483","2451494","2451506","2451520","2451539","2451563","2451589","2451616","2451645","2451670","2451696","2451724","2451754","2451768","2451782","2451795","2451807","2451818","2451831","2451842","2451853","2451865","2451879","2451898","2451910","2451933","2451960","2451990","2452016","2452042","2452069","2452097","2452122","2452135","2452147","2452158","2452169","2452182","2452195","2452207","2452218","2452231","2452242","2452255","2452267","2452278","2452309","2452340","2452369","2452396","2452424","2452450","2452480","2452497","2452509","2452521","2452533","2452544","2452556","2452568","2452582","2452599","2452610","2452625","2452636","2452654"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.005::real,
+	4::integer,
+	72297.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0002}'::real[],
+	NULL::real[],
+	'{0.0112536065}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"44417"}'::int4[],
+	E'{"19","3608","5437","7239","9103","10773","12524","14298","15582","16852","17926","19155","20275","21514","22764","24007","25186","26042","26962","27910","28794","29659","30546","31449","32213","32885","33617","34346","35082","35807","36509","37180","37892","38557","39244","39936","40721","41398","42183","42868","43569","44109","44624","45170","45703","46274","46759","47492","48133","48850","49628","50310","51472","52776","53993","54839","55874","56759","57696","58416","59123","59800","60516","61221","61836","62429","62989","63592","64155","64738","65238","65703","66205","66700","67247","67791","68275","68782","69195","69611","70077","70485","70923","71369","71847","72304","72827","73342","73877","74404","74966","75510","76220","76902","77680","78437","79149","80343","81522","82791","86392"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0052::real,
+	4::integer,
+	1914.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0014, 0.0013666666, 0.0013666666, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001}'::real[],
+	NULL::real[],
+	'{0.0545705}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451918","2451182","2451209","2452278","2451544","2451907","2452252","2452639","2452648","2452659","2451207","2452590","2451205","2451541","2451559","2451183","2451549","2451909","2451910","2451911","2451933","2452260","2452262","2452624","2452634","2452637","2451906","2451914","2452233","2452242","2452265","2452270","2451121","2451180","2451192","2451526","2451565","2451575","2451896","2451897","2451899","2451912","2451936","2452245","2452618","2452626","2452653","2451161","2451173","2451174","2451191","2451478","2451528","2451555","2451915","2451927","2452261","2452269","2452281","2452290","2452629","2452633","2452643","2451162","2451164","2451185","2451548","2451550","2451584","2451929","2451940","2452236","2452283","2452608","2452654","2451165","2451168","2451481","2451511","2451517","2451553","2451582","2451889","2451917","2452294","2452632","2452641","2452642","2452647","2452660","2451123","2451178","2451184","2451204","2451491","2451512","2451513","2451516","2451520","2451538"}'::int4[],
+	E'{"2450821","2450886","2450917","2450945","2450976","2451006","2451032","2451056","2451073","2451088","2451101","2451114","2451128","2451140","2451151","2451166","2451186","2451199","2451214","2451227","2451241","2451259","2451286","2451317","2451344","2451370","2451397","2451421","2451439","2451456","2451470","2451484","2451497","2451510","2451529","2451542","2451561","2451573","2451588","2451603","2451620","2451643","2451671","2451698","2451724","2451752","2451777","2451799","2451817","2451830","2451844","2451858","2451870","2451880","2451892","2451908","2451926","2451941","2451953","2451966","2451982","2452002","2452032","2452056","2452083","2452113","2452139","2452159","2452176","2452190","2452204","2452217","2452229","2452244","2452257","2452274","2452287","2452301","2452312","2452325","2452341","2452360","2452392","2452421","2452448","2452475","2452504","2452523","2452541","2452555","2452569","2452581","2452594","2452606","2452617","2452631","2452651","2452666","2452678","2452695","2452742"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0047333334::real,
+	4::integer,
+	2076691.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.009644499}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"83","19255","38469","57334","77660","100353","121648","142864","164380","186732","206072","225376","246600","266629","288115","310326","332043","353860","375080","398568","418154","439646","461654","482840","506162","528559","549467","568302","588542","608968","630692","650223","671210","692175","713622","734326","754624","775800","798038","818056","841239","862315","882803","902700","923351","943590","963503","984723","1007978","1026125","1047160","1067477","1087789","1107171","1127082","1149889","1169435","1192194","1212249","1233291","1254464","1277232","1298034","1319408","1340687","1361652","1382794","1402582","1423476","1446047","1468226","1490417","1512333","1534704","1553629","1572989","1592634","1611613","1630695","1653622","1674063","1694178","1714594","1736071","1758421","1781336","1801193","1823164","1844186","1864368","1883410","1905171","1926138","1948282","1969988","1992903","2014079","2034696","2056865","2078611","2099787"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.005133333::real,
+	4::integer,
+	2250439.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0031504256}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"302","18541","37466","54463","73740","92424","112008","130967","151053","169555","190110","209507","228068","249282","268918","288605","307024","325774","343640","360630","381214","401158","419575","438762","458312","478977","498196","516757","537388","556845","575435","593167","612925","631535","649867","668933","688696","708123","729225","748554","766895","786505","806811","825215","844584","864169","883774","902048","921519","939325","959048","977470","995552","1013270","1032128","1049619","1069099","1089358","1107492","1124109","1143285","1161705","1180858","1201502","1221860","1240948","1262383","1281164","1299986","1317873","1338886","1358783","1378683","1398812","1417832","1435737","1456539","1476597","1496447","1515429","1535261","1554963","1573327","1591123","1612033","1630239","1650833","1669983","1688937","1707342","1727798","1746079","1764329","1783178","1803869","1823803","1842989","1862762","1881322","1901969","1920750"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0045666667::real,
+	4::integer,
+	7211.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.000111478614}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"952","3639","822","1878","3522","3566","4915","5053","5336"}'::int4[],
+	E'{"1","69","138","207","278","358","430","510","587","655","728","798","869","942","1011","1079","1148","1221","1293","1363","1436","1515","1590","1658","1727","1796","1869","1943","2011","2089","2164","2238","2309","2383","2458","2534","2607","2674","2744","2820","2896","2971","3050","3121","3192","3259","3330","3406","3478","3554","3622","3693","3766","3837","3910","3986","4059","4136","4203","4276","4352","4423","4495","4568","4638","4711","4786","4851","4924","4995","5071","5139","5209","5275","5348","5419","5491","5562","5630","5702","5783","5855","5928","6005","6074","6145","6221","6287","6362","6437","6509","6581","6652","6718","6791","6859","6925","6992","7067","7135","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0049666665::real,
+	4::integer,
+	1046873.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.010069353}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"4","11125","22235","33070","44034","54814","66903","76551","86436","96499","107386","117375","127737","138201","149160","158550","169352","179553","191448","202662","213153","223343","232616","242533","253489","263641","274314","284608","294503","305542","316693","327046","337213","348029","358708","369038","379092","389216","399404","411658","421481","431880","442318","452462","463687","473855","484589","494142","504812","515093","525984","536447","546801","557909","568809","579887","590134","600989","611895","621827","631620","641611","653140","664172","674648","685363","696406","706802","717628","727362","737815","748416","758649","768984","779629","790315","800549","811382","821988","832542","842239","852925","861542","872217","882338","893425","903652","914043","925124","935145","946703","957135","966844","978263","987914","998584","1009037","1019530","1030620","1041099","1049900"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	1988803.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.012593937}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"112","19457","38552","56966","77106","98752","120684","141455","163448","185974","205916","225714","246798","267145","288778","309669","331415","352688","373910","396777","417012","437984","458412","480601","503081","525455","546630","566430","585396","605761","627797","647297","667174","689078","710793","730789","751531","771586","793233","812933","836114","858314","878748","899241","919733","940900","960199","982017","1005759","1024900","1046467","1067416","1087759","1107005","1127271","1149614","1169010","1191761","1212083","1233029","1254014","1275851","1297280","1318761","1339872","1360476","1383115","1402788","1422877","1446083","1468587","1490686","1513016","1535950","1556692","1575347","1593894","1613402","1634582","1657027","1677173","1698221","1719408","1739440","1762772","1784881","1805037","1826722","1847883","1868042","1887771","1909652","1929728","1951115","1972152","1994703","2015691","2036799","2059398","2079650","2099910"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0047::real,
+	4::integer,
+	2111792.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0029372792}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"302","18991","38051","55457","73906","92142","111203","130054","150524","168838","188615","208305","226780","247275","267002","286332","305964","323539","341623","359088","378908","398275","417006","435648","456039","475587","494530","514681","534729","554637","572188","589663","608849","627139","645797","665116","684344","704227","724342","743953","761704","781964","800445","819537","838906","859432","878743","896384","916344","935630","954106","974012","992877","1010876","1030092","1047512","1067272","1087763","1106244","1123512","1143152","1162252","1181423","1201399","1221079","1241127","1262335","1281211","1300282","1317917","1338913","1359409","1379678","1399509","1419706","1437833","1458212","1478319","1498253","1517308","1537216","1555785","1574809","1593715","1614555","1632477","1652767","1671255","1689246","1707832","1727015","1745671","1764329","1783647","1803713","1823176","1843528","1863426","1881885","1901131","1920750"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0045::real,
+	4::integer,
+	7216.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00046666668, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{-0.0024474491}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3639","952","4257","822","1910","4081","4594","4618","4915"}'::int4[],
+	E'{"1","73","142","207","280","358","430","508","582","649","721","795","869","944","1014","1083","1154","1229","1300","1373","1444","1523","1596","1662","1734","1808","1878","1946","2015","2092","2166","2242","2314","2390","2466","2538","2613","2681","2754","2829","2904","2980","3057","3130","3199","3265","3336","3409","3484","3555","3618","3692","3763","3836","3911","3985","4055","4135","4203","4280","4359","4429","4500","4572","4647","4723","4793","4861","4928","5004","5075","5142","5214","5279","5349","5422","5492","5565","5633","5704","5780","5856","5929","6005","6075","6144","6216","6286","6361","6433","6507","6577","6650","6717","6786","6857","6924","6990","7066","7134","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	1106888.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0052251625}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"4","10372","21281","32604","43275","54281","66191","75977","85966","96475","106785","117107","127166","137473","148549","158449","169288","179404","191400","202566","212568","223050","231983","242203","252330","262987","273206","284036","293651","303573","314592","325696","336019","346020","357411","367567","377578","387371","397564","409384","419885","430219","441268","451283","462534","472729","482897","493068","503727","514241","524681","535657","546641","557534","568161","579186","589218","600063","610499","620727","630611","640167","650891","661771","672763","683715","694487","704971","715589","725727","735602","745905","755951","765867","776755","787045","798005","808059","818665","829654","840229","849950","859637","870300","880895","892234","902478","912694","923652","933902","945183","955649","965499","976354","986841","997088","1007946","1018197","1029945","1040884","1049912"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_call_center_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0049::real,
+	4::integer,
+	6.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.32786667, 0.1994, 0.13533333, 0.13273333, 0.1306, 0.06916667}'::real[],
+	'{0.21526349}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","2","3","5","4","6"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_catalog_page_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0049333335::real,
+	4::integer,
+	5614.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0012666667, 0.0012666667, 0.0012333334, 0.0012, 0.0012, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009}'::real[],
+	NULL::real[],
+	'{0.050873112}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"164","5975","2104","135","4000","7906","2144","5962","5966","7944","7992","2111","2149","5954","6016","6032","6043","7900","7908","2053","2075","4051","7954","150","151","160","183","186","2062","2090","2114","4010","4052","4084","5959","6025","7929","7941","116","117","194","2060","2119","4076","4094","5964","5999","6011","6019","7917","7973","118","120","129","163","190","212","2077","2078","2091","2093","2148","2156","4047","4050","4068","4097","5979","6003","6007","6021","6034","7890","7909","7919","7921","7932","7938","7953","7960","141","157","176","182","214","2118","4016","4028","4053","4065","4073","4086","5961","6010","7911","7914","7922","7923","7936","7956"}'::int4[],
+	E'{"1","29","53","79","106","124","139","154","172","189","205","230","290","340","380","413","614","843","1009","1150","1945","1972","1996","2020","2047","2067","2083","2099","2115","2131","2145","2168","2227","2279","2318","2361","2605","2813","2989","3129","3896","3920","3945","3968","3994","4009","4024","4038","4056","4070","4085","4101","4153","4215","4252","4289","4400","4718","4887","5022","5155","5852","5878","5903","5927","5946","5963","5980","5992","6006","6026","6040","6078","6144","6189","6232","6381","6650","6829","6974","7101","7800","7825","7851","7879","7895","7913","7935","7955","7971","7986","8023","8080","8130","8168","8207","8515","8701","8861","8977","9827"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_mode_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.004766667::real,
+	4::integer,
+	20.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0517, 0.051333334, 0.0507, 0.050466668, 0.0504, 0.050166667, 0.050166667, 0.050066665, 0.049966667, 0.0499, 0.0499, 0.049733333, 0.049333334, 0.0493, 0.049133334, 0.049066667, 0.049066667, 0.04853333, 0.0485, 0.0478}'::real[],
+	'{0.05016106}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"10","4","5","15","7","14","20","12","9","3","6","2","1","18","8","17","19","16","13","11"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_warehouse_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.0047::real,
+	4::integer,
+	5.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.2037, 0.20163333, 0.19836667, 0.19753334, 0.19406667}'::real[],
+	'{0.20946348}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"5","4","2","3","1"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	24934.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.00087319454}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2149","4123","7117","12451","15001","19603","20557","21523","22867","27235","55","841","2348","2545","4105","4159","4441","4843","5509","7513","7747","8827","9289","12031","13417","15541","15709","16730","18115","18805","18997","19495","20083","21073","23167","24679","26641"}'::int4[],
+	E'{"1","320","583","835","1138","1406","1673","1962","2264","2558","2845","3127","3446","3749","4031","4330","4573","4877","5173","5433","5703","5947","6237","6506","6775","7040","7307","7579","7873","8136","8404","8707","8984","9250","9532","9833","10123","10420","10678","10969","11250","11553","11826","12095","12364","12667","12956","13219","13486","13741","14042","14309","14602","14871","15161","15410","15665","15939","16212","16498","16763","17059","17351","17654","17945","18229","18514","18782","19059","19348","19609","19913","20198","20471","20743","21035","21331","21597","21883","22148","22442","22712","22966","23269","23567","23848","24106","24394","24668","24951","25221","25508","25796","26095","26365","26646","26927","27195","27461","27722","28000"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0049333335::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0039333333, 0.0036666666, 0.0036333334, 0.0035666667, 0.0035, 0.0035, 0.0035, 0.0035, 0.0034666667}'::real[],
+	NULL::real[],
+	'{0.012315235}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"305","89","51","343","11","49","195","258","355"}'::int4[],
+	E'{"1","4","8","12","16","19","23","26","30","33","37","40","44","47","53","56","60","63","67","70","74","78","81","85","88","92","96","99","102","106","109","113","116","120","123","127","130","134","137","141","144","148","151","155","158","162","165","168","172","175","179","182","186","189","193","197","201","204","208","211","215","218","221","225","228","232","235","239","242","246","249","253","256","261","264","268","271","275","278","282","285","289","293","296","299","303","307","311","314","318","321","325","328","331","335","339","342","346","350","353","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_order_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	-0.23808314::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.05413773}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1093","796094","1645931","2488328","3262945","4034487","4856771","5589623","6321306","7127852","7844455","8614283","9422592","10337715","11178214","11967077","12806598","13604549","14347663","15135994","15897089","16779779","17630658","18360193","19209296","19976804","20750598","21564225","22330137","23141252","23995273","24745890","25625704","26406125","27188856","28177645","29033724","29834605","30623466","31397341","32181036","32930216","33726353","34526912","35320855","36048980","36922780","37717474","38626712","39479583","40217298","41019974","41831233","42654275","43505081","44324401","44976357","45709232","46482483","47262545","48002145","48800151","49567190","50315617","51133372","51910262","52699539","53463422","54279944","55035406","55746486","56570321","57449909","58231103","58998945","59766115","60653209","61448393","62271704","63090076","63926111","64814052","65684644","66478632","67319176","68037038","68897841","69676370","70424558","71249378","72010418","72811451","73574543","74362921","75127096","75960745","76739924","77534318","78299599","79159205","79998254"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+--
+-- Table: catalog_sales, Attribute: cs_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0111, 0.0111, 0.011, 0.011, 0.0109, 0.010833333, 0.010833333, 0.010833333, 0.0108, 0.010666667, 0.010666667, 0.0106, 0.010566667, 0.010566667, 0.010533334, 0.010533334, 0.010533334, 0.0105, 0.010466667, 0.010433333, 0.010433333, 0.010366667, 0.010366667, 0.010366667, 0.010366667, 0.010366667, 0.010333333, 0.0103, 0.0103, 0.010266666, 0.010266666, 0.010266666, 0.0102, 0.0102, 0.0102, 0.0102, 0.0101666665, 0.0101666665, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101, 0.0101, 0.010066667, 0.010033334, 0.010033334, 0.010033334, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.009933333, 0.009933333, 0.009933333, 0.009933333, 0.0099, 0.0099, 0.009866667, 0.009866667, 0.009833333, 0.009833333, 0.009833333, 0.009833333, 0.0098, 0.0098, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.0097, 0.009666666, 0.009666666, 0.009666666, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.0095, 0.009466667, 0.009333333, 0.009266667, 0.009266667, 0.009233333, 0.009233333, 0.0092, 0.009133333, 0.009133333, 0.0091, 0.008933334, 0.008866667, 0.008833333, 0.0088, 0.0087, 0.0084, 0.0084}'::real[],
+	'{0.009663152}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"41","52","9","44","27","58","86","89","77","36","80","17","16","42","45","46","83","15","91","12","14","57","67","68","74","96","84","25","64","28","71","82","11","56","60","98","1","6","23","7","95","61","94","47","5","69","72","3","48","70","92","34","54","76","79","81","32","38","62","78","2","13","18","55","37","40","75","100","22","97","4","33","51","8","35","73","88","24","49","87","21","26","53","66","99","39","65","20","93","30","43","90","29","63","85","59","19","50","10","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0042333333::real,
+	6::integer,
+	9853.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.00037631093}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"72.49","24.31","33.82","41.38","61.68","64.83","90.44","10.81","27.94","34.69","63.73","87.62","93.76","94.23"}'::numeric[],
+	E'{"1.00","1.97","2.96","3.92","4.94","5.97","7.01","7.93","8.86","9.79","10.76","11.74","12.69","13.67","14.71","15.61","16.55","17.55","18.59","19.64","20.69","21.72","22.70","23.70","24.74","25.76","26.74","27.83","28.84","29.88","30.96","31.96","32.90","33.95","34.88","35.82","36.86","37.79","38.78","39.75","40.65","41.59","42.57","43.46","44.53","45.59","46.66","47.73","48.74","49.72","50.69","51.60","52.56","53.41","54.44","55.38","56.44","57.38","58.32","59.33","60.46","61.51","62.59","63.51","64.50","65.52","66.49","67.40","68.34","69.30","70.25","71.22","72.19","73.17","74.18","75.21","76.17","77.18","78.10","79.08","80.07","81.02","81.93","82.86","83.87","84.82","85.83","86.83","87.81","88.79","89.69","90.75","91.71","92.69","93.69","94.73","95.80","96.89","97.92","99.02","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.0047333334::real,
+	6::integer,
+	23623.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667}'::real[],
+	NULL::real[],
+	'{0.0011046942}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"11.59","52.87","62.87","64.43","87.47","95.88","96.45","99.51"}'::numeric[],
+	E'{"1.00","3.51","5.35","7.23","9.15","10.91","12.55","14.37","16.10","17.87","19.59","21.31","23.22","24.95","26.59","28.36","30.12","31.92","33.70","35.45","37.37","39.21","40.96","42.63","44.39","46.23","48.04","49.97","52.04","53.81","55.47","57.35","59.13","60.99","62.98","64.76","66.54","68.45","70.35","72.20","74.06","75.90","77.63","79.47","81.31","83.10","84.84","86.86","88.69","90.45","92.15","94.08","95.99","97.69","99.41","101.23","103.18","104.97","107.17","108.94","110.89","112.85","114.87","116.76","119.10","121.18","123.40","125.73","128.23","130.50","132.97","135.31","138.15","140.60","143.29","145.79","148.51","151.34","154.23","157.06","160.08","163.23","166.75","170.63","174.29","177.79","181.55","185.86","189.57","193.79","198.05","202.87","207.95","213.14","219.21","225.93","233.84","241.92","252.53","265.43","299.64"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.0046666665::real,
+	6::integer,
+	14418.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.009733333, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{0.00090382085}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","4.11","1.12","1.14","1.19","1.41","2.07","3.47","0.45","0.86","0.99","1.11","1.66","1.79","2.22","2.36","4.79","5.00","5.07","19.14","0.34","0.77","0.98","1.17","1.38","1.39","1.53","1.60","2.13","2.14","2.41","2.70","2.91","3.55","5.02","0.32","0.61","0.81","1.02","1.20","1.63","1.78","1.83","1.98","2.16","2.57","2.58","2.63","2.71","2.82","3.02","3.07","3.31","3.49","4.09","4.70","5.83","6.20","6.42","6.65","6.71","6.81","7.47","7.73","8.32","8.90","11.94","13.00","23.92","25.86","0.52","0.60","0.68","0.83","0.85","0.90","0.92","1.00","1.03","1.22","1.40","1.42","1.52","1.62","1.70","1.89","1.90","1.92","1.95","1.99","2.08","2.45","2.48","2.80","2.85","2.86","3.05","3.57","3.58","4.26"}'::numeric[],
+	E'{"0.01","0.65","1.28","1.88","2.49","3.12","3.69","4.24","4.73","5.29","5.72","6.26","6.84","7.36","7.90","8.49","9.12","9.69","10.29","10.91","11.52","12.20","12.88","13.55","14.26","15.04","15.79","16.49","17.27","18.12","18.88","19.69","20.47","21.31","22.14","23.04","23.89","24.71","25.66","26.63","27.57","28.59","29.53","30.53","31.55","32.67","33.80","34.83","35.95","37.16","38.26","39.31","40.43","41.57","42.77","43.90","45.13","46.36","47.81","49.19","50.47","52.07","53.50","55.01","56.52","58.13","59.74","61.42","63.22","65.02","66.74","68.61","70.40","72.18","74.20","76.33","79.00","81.18","83.67","85.79","88.11","90.68","93.43","96.30","99.26","102.27","105.67","109.56","113.32","117.45","121.86","127.22","132.40","138.99","144.98","152.44","160.57","173.02","186.46","208.92","291.96"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.0044::real,
+	6::integer,
+	142728.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0095}'::real[],
+	NULL::real[],
+	'{-0.004464352}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.17","11.20","20.91","30.80","40.84","51.00","63.78","75.00","87.44","99.94","114.70","128.10","142.35","157.32","174.42","192.54","210.80","230.40","248.40","268.05","290.88","314.16","335.72","359.45","382.80","407.16","434.34","460.80","487.56","514.71","543.62","576.10","607.10","638.58","674.96","708.51","744.12","781.44","816.90","854.24","892.67","937.72","978.12","1024.92","1066.60","1115.40","1163.76","1213.44","1265.92","1319.64","1377.33","1435.50","1492.72","1553.06","1615.12","1676.76","1740.50","1811.01","1879.47","1944.96","2021.00","2099.24","2180.82","2254.08","2338.24","2431.94","2518.37","2613.97","2705.79","2811.90","2915.52","3030.87","3147.78","3268.80","3398.64","3537.80","3693.20","3853.00","4025.84","4178.16","4342.57","4533.75","4713.69","4897.32","5111.40","5372.25","5621.20","5899.18","6182.22","6506.64","6877.80","7259.75","7668.62","8199.00","8717.40","9363.69","10163.70","11203.92","12513.40","14893.36","26922.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	24::smallint,
+	False::boolean,
+	0.0043666665::real,
+	6::integer,
+	142257.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.009733333, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.003978702}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","46.08","221.76","229.32","324.00"}'::numeric[],
+	E'{"0.12","10.50","20.06","29.43","40.50","50.88","62.55","73.71","86.88","99.80","112.70","127.52","143.62","159.84","176.54","195.30","213.76","232.57","250.81","273.00","293.44","314.88","338.10","359.04","380.19","405.00","429.60","451.68","477.47","502.86","527.96","553.70","584.44","614.88","648.96","678.59","714.00","752.49","789.24","832.00","873.60","918.00","961.62","1002.87","1045.32","1088.01","1138.32","1187.80","1240.32","1290.56","1343.52","1398.63","1453.80","1514.52","1579.89","1641.03","1707.15","1777.62","1850.16","1929.60","2006.40","2085.16","2172.12","2258.24","2346.43","2432.08","2522.40","2612.40","2716.00","2822.00","2941.68","3047.40","3167.66","3290.34","3408.50","3542.00","3672.90","3827.25","3964.16","4119.20","4284.36","4443.82","4620.28","4815.00","5049.41","5287.50","5540.15","5817.90","6091.80","6419.70","6763.11","7107.12","7533.20","7984.68","8549.10","9239.68","10028.92","11141.40","12375.32","14442.82","25866.02"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	25::smallint,
+	False::boolean,
+	0.004466667::real,
+	6::integer,
+	199389.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0034636194}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.06","33.44","56.88","76.70","95.46","117.98","141.00","166.72","189.80","211.64","240.48","270.13","296.05","322.14","351.56","382.20","408.80","443.17","471.27","503.04","536.48","569.53","605.88","642.30","676.20","713.25","748.00","784.08","822.58","862.92","904.12","944.00","988.12","1033.94","1078.22","1125.57","1174.44","1219.20","1271.47","1321.32","1373.73","1424.13","1473.56","1523.06","1577.80","1632.80","1692.33","1751.88","1804.98","1865.64","1925.04","1986.64","2048.64","2112.36","2177.07","2241.60","2304.72","2377.20","2443.50","2515.50","2594.70","2670.36","2747.52","2824.00","2907.76","2981.60","3064.35","3151.04","3236.05","3335.04","3423.42","3510.24","3609.13","3694.74","3790.59","3900.42","3997.84","4093.60","4201.20","4315.14","4440.32","4580.68","4717.80","4850.32","4981.08","5120.57","5295.40","5446.35","5591.49","5754.84","5939.64","6145.90","6353.16","6573.59","6818.15","7085.50","7369.09","7709.87","8107.01","8627.71","9908.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	26::smallint,
+	False::boolean,
+	0.0046::real,
+	7::integer,
+	360309.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0035410712}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.31","59.20","97.76","139.16","175.10","215.86","258.20","301.76","346.30","395.71","441.67","491.37","543.03","588.96","647.90","704.77","761.60","820.05","876.37","931.44","988.52","1051.24","1114.54","1179.42","1241.24","1315.60","1390.35","1465.83","1545.12","1616.40","1698.12","1773.90","1846.20","1925.82","1999.80","2079.66","2167.27","2254.16","2349.06","2439.60","2538.36","2639.88","2745.00","2842.88","2945.84","3061.35","3159.96","3268.20","3385.82","3497.60","3619.28","3731.16","3844.31","3972.32","4086.60","4223.18","4350.00","4491.60","4633.60","4772.85","4900.80","5039.44","5187.14","5331.15","5491.76","5659.20","5821.20","5993.74","6151.74","6324.80","6490.96","6680.54","6873.60","7073.04","7286.40","7516.05","7726.84","7955.22","8181.76","8428.98","8698.56","8945.39","9241.96","9521.28","9816.00","10132.22","10488.06","10859.64","11241.16","11644.83","12054.38","12542.40","13138.72","13710.72","14384.79","15172.80","16106.68","17329.62","18721.00","21017.28","28889.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	27::smallint,
+	False::boolean,
+	0.004766667::real,
+	6::integer,
+	21954.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10706667, 0.00063333334, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333}'::real[],
+	NULL::real[],
+	'{0.004360509}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.04","0.17","0.02","0.28","0.84","1.06","1.14","0.13","0.14","0.25","0.36","0.79","0.03","0.33","0.34","0.39","0.48","0.90","0.91","1.10","0.08","0.09","0.18","0.42","0.45","0.54","1.25","1.40","1.41","0.07","0.30","0.32","0.50","0.63","0.78","0.93","1.56","1.58","2.01","2.83","4.17","4.23","5.38","0.01","0.05","0.06","0.23","0.35","0.37","0.44","0.51","0.65","0.66","0.69","0.72","0.92","1.07","1.20","1.91","2.25","2.35","2.39","2.49","2.59","2.61","2.84","3.46","5.14","0.11","0.12","0.29","0.31","0.55","0.64","0.86","0.94","0.97","1.04","1.11","1.27","1.34","1.72","1.74","1.82","2.07","2.41","2.63","3.16","3.22","3.31","4.24","4.37","4.50","4.67","6.56","7.04","7.48","9.72","0.20"}'::numeric[],
+	E'{"0.10","0.76","1.28","1.69","2.10","2.54","3.00","3.45","3.87","4.42","4.93","5.42","5.92","6.50","7.06","7.75","8.39","9.02","9.63","10.39","11.20","12.02","12.86","13.70","14.51","15.26","16.17","17.18","18.15","19.08","20.18","21.20","22.36","23.50","24.63","25.72","26.96","28.39","29.87","31.24","32.78","34.20","35.67","37.38","39.11","41.00","42.83","44.65","46.61","48.72","50.66","53.20","55.29","57.88","60.49","63.18","66.04","69.09","72.25","75.29","78.51","82.02","85.29","89.36","92.98","96.95","101.40","105.70","110.69","116.16","120.93","126.18","131.91","137.88","143.80","151.06","157.08","164.57","172.99","181.14","190.17","200.65","210.92","221.02","232.90","244.78","259.12","273.65","291.32","310.11","330.23","353.23","380.19","411.93","449.37","493.85","546.42","616.37","721.39","893.95","2142.09"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	28::smallint,
+	False::boolean,
+	0.0052333334::real,
+	3::integer,
+	6889.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.80296665}'::real[],
+	NULL::real[],
+	'{0.6553299}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.01","2.20","4.55","7.28","10.58","14.36","17.92","22.46","25.33","29.09","32.44","36.89","41.40","45.19","49.75","55.22","62.09","68.46","74.86","81.76","91.57","99.10","106.96","114.24","121.21","127.94","137.96","148.71","157.54","170.28","181.68","193.93","204.76","214.01","227.90","241.64","255.16","269.95","283.85","297.98","314.58","330.18","348.86","367.79","387.60","402.79","419.99","435.31","461.47","484.00","509.09","533.90","558.08","588.06","619.44","645.35","672.88","700.29","729.03","760.23","796.67","836.28","873.12","909.36","951.28","1008.91","1061.09","1112.98","1155.96","1201.35","1259.28","1324.66","1399.44","1477.63","1548.31","1632.65","1703.81","1774.10","1847.07","1944.10","2036.97","2136.30","2215.42","2317.48","2479.32","2652.32","2791.40","2968.30","3152.68","3345.17","3578.36","3851.51","4127.20","4451.55","4914.34","5421.31","6009.40","6794.45","7819.40","9995.94","21255.41"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_ship_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=29;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	29::smallint,
+	False::boolean,
+	0.0045::real,
+	6::integer,
+	81417.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0188, 0.0003, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0046927556}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","124.80","123.20","39.60","54.00","79.80","138.60","216.72","14.00","23.40","45.60","48.30","73.44","82.80","83.52","128.64","148.50","201.60","369.60"}'::numeric[],
+	E'{"0.01","5.94","11.44","16.77","22.24","28.70","34.72","40.68","46.76","54.04","61.00","68.16","76.50","85.26","94.55","103.02","111.44","121.44","132.24","143.40","153.90","165.76","177.65","188.67","201.11","212.38","224.93","238.72","252.96","266.76","282.10","299.12","315.56","331.39","347.22","363.12","379.85","399.00","416.25","434.16","453.96","475.60","497.55","521.70","543.90","568.03","592.20","618.64","644.00","669.06","697.92","724.13","755.70","784.09","816.31","849.52","882.75","915.75","950.25","987.00","1022.35","1059.10","1097.07","1144.50","1187.60","1237.04","1284.01","1339.45","1388.34","1443.94","1496.00","1543.70","1598.74","1656.20","1727.70","1794.60","1866.41","1936.12","2007.84","2091.57","2178.28","2270.17","2367.40","2465.85","2573.55","2691.00","2809.66","2948.40","3100.80","3253.56","3417.26","3620.70","3826.12","4070.04","4341.72","4685.14","5057.36","5597.70","6345.93","7552.84","14029.29"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=30;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	30::smallint,
+	False::boolean,
+	0.0045666667::real,
+	6::integer,
+	155617.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.011266666, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0071978415}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","221.76","267.30"}'::numeric[],
+	E'{"0.04","6.30","13.46","20.10","27.38","36.00","45.37","54.42","64.17","74.16","84.95","95.83","107.47","120.56","133.68","147.52","161.55","176.09","192.62","209.85","225.68","242.40","260.64","280.40","299.63","319.88","342.68","361.62","383.67","407.20","430.95","452.40","478.20","502.86","526.93","551.28","580.65","609.84","645.84","672.01","705.60","742.28","777.65","819.77","859.65","905.32","946.21","988.00","1030.29","1072.29","1120.20","1169.28","1222.48","1277.88","1335.95","1393.40","1452.30","1510.88","1577.52","1643.88","1712.18","1783.60","1864.20","1941.02","2021.80","2110.48","2194.50","2288.80","2382.00","2480.31","2575.77","2686.53","2796.40","2918.30","3030.33","3153.62","3270.28","3405.85","3555.37","3689.67","3856.30","4006.50","4182.84","4362.48","4551.55","4780.32","5045.92","5298.28","5580.25","5880.00","6219.92","6583.20","6993.36","7441.75","7943.75","8616.00","9434.75","10515.84","11757.96","14014.08","25785.76"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=31;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	31::smallint,
+	False::boolean,
+	0.004766667::real,
+	6::integer,
+	266415.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.011266666}'::real[],
+	NULL::real[],
+	'{-0.007137176}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","6.57","13.94","21.03","28.62","37.23","47.06","56.65","66.91","77.14","88.19","99.88","111.66","125.70","139.15","153.96","167.98","183.70","200.51","218.37","234.41","252.12","271.21","292.28","311.64","332.88","354.70","376.40","397.68","423.75","447.30","472.27","496.81","520.51","546.40","573.95","604.97","637.86","669.29","702.85","736.56","771.82","808.78","850.00","894.59","941.49","983.86","1030.60","1072.51","1120.44","1164.50","1218.82","1276.89","1328.94","1392.76","1450.62","1515.35","1577.79","1642.09","1715.87","1785.64","1867.43","1945.94","2025.64","2113.90","2200.02","2292.15","2386.61","2484.22","2590.13","2687.89","2800.02","2917.72","3043.84","3167.64","3291.60","3406.12","3562.87","3712.26","3872.48","4020.94","4187.61","4364.95","4559.15","4755.57","4989.93","5272.48","5532.24","5829.06","6143.38","6489.24","6878.77","7303.39","7746.09","8295.79","9014.30","9837.86","11001.37","12381.74","14679.09","26662.34"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_ship
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=32;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	32::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	280640.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0071525415}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","23.85","47.34","67.95","89.80","110.58","132.44","153.00","179.04","202.51","229.06","255.64","281.80","311.22","340.96","371.09","403.00","434.83","466.69","497.15","530.10","562.00","593.67","628.20","664.69","704.00","739.88","780.85","825.34","866.72","907.27","949.41","994.16","1044.45","1096.50","1144.92","1195.21","1250.15","1305.36","1361.76","1416.36","1475.91","1536.25","1598.70","1665.83","1732.92","1800.90","1873.10","1941.75","2016.72","2092.86","2175.34","2253.86","2345.76","2434.51","2518.72","2608.45","2696.29","2793.56","2894.40","2985.12","3079.88","3181.62","3294.00","3407.10","3528.30","3649.14","3775.68","3899.28","4033.51","4169.60","4307.38","4456.66","4620.28","4793.89","4963.42","5138.76","5318.80","5502.90","5715.60","5907.94","6131.28","6356.80","6629.70","6889.46","7169.33","7478.59","7780.37","8131.05","8498.52","8903.58","9369.99","9838.92","10426.64","11123.84","11986.61","13051.50","14332.97","16169.95","19117.60","36471.09"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_ship_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=33;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	33::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	613201.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00728921}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","24.55","48.62","69.15","91.91","112.84","135.45","157.97","183.66","207.27","233.71","261.95","289.12","318.33","350.11","381.22","413.11","444.48","477.58","508.92","542.83","576.18","609.45","644.62","682.66","719.94","759.00","801.51","845.42","887.38","930.05","971.99","1022.12","1070.40","1121.18","1175.11","1228.42","1282.74","1334.77","1397.05","1456.76","1508.61","1575.93","1641.47","1709.47","1778.38","1844.93","1917.32","1990.71","2063.03","2147.81","2231.80","2316.78","2402.40","2493.91","2591.15","2678.00","2770.78","2865.32","2974.50","3066.56","3162.22","3269.67","3378.18","3496.07","3622.04","3743.00","3878.25","4003.40","4149.54","4287.78","4434.50","4591.26","4750.74","4944.45","5105.41","5289.66","5467.44","5660.87","5871.93","6090.64","6310.11","6551.52","6808.71","7096.07","7374.30","7678.33","8022.91","8355.36","8765.02","9187.25","9660.31","10158.98","10789.68","11521.51","12322.88","13498.43","14789.11","16663.22","19689.06","37177.23"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=34;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	34::smallint,
+	False::boolean,
+	0.0::real,
+	6::integer,
+	206524.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0003, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0019606797}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","-47.52"}'::numeric[],
+	E'{"-9478.75","-6317.17","-5427.84","-4811.17","-4310.01","-3964.66","-3670.14","-3411.00","-3196.27","-2980.12","-2792.84","-2624.60","-2471.95","-2325.60","-2192.15","-2061.36","-1940.00","-1830.51","-1735.50","-1637.76","-1537.14","-1452.35","-1375.59","-1298.36","-1224.32","-1155.27","-1092.42","-1022.40","-963.48","-909.46","-846.45","-791.42","-741.60","-693.68","-651.75","-611.00","-571.48","-529.55","-492.82","-458.06","-424.16","-393.25","-361.82","-332.56","-302.38","-277.25","-248.65","-223.78","-199.01","-180.17","-158.72","-138.32","-121.68","-105.41","-89.61","-74.48","-59.72","-46.63","-35.01","-23.56","-13.29","-4.92","3.90","16.20","29.60","44.02","63.55","84.33","106.65","130.83","159.30","193.63","231.83","274.32","317.52","364.48","414.57","470.10","538.53","608.95","685.44","768.20","856.98","953.40","1053.60","1164.76","1294.00","1444.00","1596.00","1771.35","1966.12","2176.68","2427.26","2738.40","3132.80","3548.87","4041.96","4805.58","5798.10","7455.03","16965.90"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: customer, Attribute: c_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.09763528}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"9","21261","42021","62080","82255","103369","125043","144232","165965","190286","211001","230315","251065","272203","292790","312482","334187","353856","373058","396690","415673","436316","456746","480529","502046","524523","546632","568546","589481","610972","631185","654707","675842","698400","718405","739653","760815","781559","803530","825502","846209","866622","888173","908015","929893","950771","971557","991734","1015944","1037799","1059421","1080667","1101711","1122753","1142324","1163272","1183361","1204818","1225216","1247329","1269800","1290928","1313000","1333417","1354039","1374731","1393758","1413066","1434044","1455682","1476112","1499430","1518599","1539394","1559012","1578764","1600604","1620632","1642082","1661234","1681629","1701960","1723759","1745015","1765218","1786153","1808002","1827671","1848579","1869421","1889087","1911370","1931677","1953626","1974278","1994274","2014813","2037922","2058859","2079452","2099872"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_customer_id
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0::real,
+	17::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.008318781}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"AAAAAAAAAAABNBAA","AAAAAAAAACGBGAAA","AAAAAAAAAELNKBAA","AAAAAAAAAHEPIBAA","AAAAAAAAAJKFCAAA","AAAAAAAAAMDPPBAA","AAAAAAAAAOPLIAAA","AAAAAAAABBKGGAAA","AAAAAAAABEDPKBAA","AAAAAAAABGMDNAAA","AAAAAAAABJECAAAA","AAAAAAAABMDEJBAA","AAAAAAAABONCCAAA","AAAAAAAACBEIBBAA","AAAAAAAACDPKGBAA","AAAAAAAACGLFEAAA","AAAAAAAACJEIMAAA","AAAAAAAACMCDAAAA","AAAAAAAACOLBDBAA","AAAAAAAADBIDOAAA","AAAAAAAADEGFPBAA","AAAAAAAADGPJIAAA","AAAAAAAADJHBOAAA","AAAAAAAADMAFGAAA","AAAAAAAADOHCCAAA","AAAAAAAAEAOAEBAA","AAAAAAAAEDNGDBAA","AAAAAAAAEGIFIAAA","AAAAAAAAEJAMPBAA","AAAAAAAAELLKDAAA","AAAAAAAAEOCLPAAA","AAAAAAAAFAINOAAA","AAAAAAAAFDBIJBAA","AAAAAAAAFFHIMBAA","AAAAAAAAFHPMHAAA","AAAAAAAAFKIAPBAA","AAAAAAAAFNCOBAAA","AAAAAAAAFPKHLAAA","AAAAAAAAGCDNHAAA","AAAAAAAAGEJHIBAA","AAAAAAAAGHBCCAAA","AAAAAAAAGJJENBAA","AAAAAAAAGMCKCAAA","AAAAAAAAGOMBABAA","AAAAAAAAHBIPLBAA","AAAAAAAAHDPAKAAA","AAAAAAAAHGJCKBAA","AAAAAAAAHJALPAAA","AAAAAAAAHLOFPAAA","AAAAAAAAHOHAAAAA","AAAAAAAAIAOACBAA","AAAAAAAAIDGNKAAA","AAAAAAAAIGCCNBAA","AAAAAAAAIIMJAAAA","AAAAAAAAILNBOBAA","AAAAAAAAIOCOJBAA","AAAAAAAAJAIBNBAA","AAAAAAAAJDBAABAA","AAAAAAAAJFFOFBAA","AAAAAAAAJICEDBAA","AAAAAAAAJKILJBAA","AAAAAAAAJMOJNBAA","AAAAAAAAJPEMKBAA","AAAAAAAAKBMKDBAA","AAAAAAAAKEDLDAAA","AAAAAAAAKGMFDBAA","AAAAAAAAKJJJCBAA","AAAAAAAAKMAFLBAA","AAAAAAAAKOGELBAA","AAAAAAAALAOCABAA","AAAAAAAALDGGLAAA","AAAAAAAALGAJJBAA","AAAAAAAALIJMEAAA","AAAAAAAALKOLOBAA","AAAAAAAALNFAKBAA","AAAAAAAALPKMDBAA","AAAAAAAAMCDMMBAA","AAAAAAAAMELNCBAA","AAAAAAAAMHFNBBAA","AAAAAAAAMJMFPBAA","AAAAAAAAMMGBFAAA","AAAAAAAAMPBPFAAA","AAAAAAAANBJMLAAA","AAAAAAAANECPPBAA","AAAAAAAANHBEAAAA","AAAAAAAANJIOCBAA","AAAAAAAANMDCBAAA","AAAAAAAANPAGFBAA","AAAAAAAAOBIDJBAA","AAAAAAAAODNGFAAA","AAAAAAAAOGECJBAA","AAAAAAAAOINLGAAA","AAAAAAAAOLGCEBAA","AAAAAAAAONPNAAAA","AAAAAAAAPAKLGAAA","AAAAAAAAPDDNKAAA","AAAAAAAAPFNALBAA","AAAAAAAAPIFFFAAA","AAAAAAAAPLABOAAA","AAAAAAAAPNGKCBAA","AAAAAAAAPPPOAAAA"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_current_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	3::smallint,
+	False::boolean,
+	0.036333334::real,
+	4::integer,
+	-0.50137764::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0013170508}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"83","18955","39087","58094","75845","95317","115100","134187","152171","172644","193010","211552","231710","251817","270655","288181","306995","323507","344088","362797","382712","404200","423621","442226","460401","479260","497142","517339","536731","556732","574796","592497","612826","632068","650345","670861","690813","710439","729562","747865","768032","784796","804004","823342","840808","862022","880748","899717","920319","938794","957931","976962","994731","1014023","1033686","1051262","1072185","1092147","1113436","1132849","1151543","1170064","1188829","1208390","1228056","1247895","1268450","1286523","1306787","1325642","1344821","1361249","1380841","1399617","1418271","1436735","1456195","1476598","1496520","1514478","1535680","1554729","1573897","1593768","1614360","1634204","1654338","1672759","1691901","1711514","1731470","1749749","1767712","1787017","1807176","1824761","1843120","1863530","1883265","1901706","1920535"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_current_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0347::real,
+	4::integer,
+	7192.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.00030779035}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"882","1308","3965","367","666","1327","6987"}'::int4[],
+	E'{"1","72","141","218","292","372","440","506","579","647","728","799","868","940","1006","1081","1151","1224","1294","1368","1432","1502","1576","1650","1728","1803","1873","1941","2024","2095","2168","2245","2318","2395","2472","2542","2617","2682","2751","2823","2897","2969","3041","3110","3179","3248","3319","3390","3457","3520","3590","3657","3725","3801","3881","3954","4024","4098","4179","4251","4312","4383","4451","4522","4604","4674","4745","4814","4885","4954","5024","5095","5171","5245","5317","5386","5452","5523","5591","5664","5732","5805","5883","5956","6025","6099","6170","6241","6316","6392","6464","6534","6610","6685","6756","6829","6900","6980","7059","7129","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_current_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.32888332::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0058509638}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"52","10026","21386","32663","42941","53021","65083","75763","86063","96263","107445","117990","127743","138145","147534","158592","168713","178593","188864","199238","210017","220563","231187","241437","252281","263159","273251","284057","295058","305713","315928","326018","336613","346947","357443","368266","378995","388655","399147","410310","419835","429767","442179","452745","463314","473270","483327","494816","505073","515313","525490","536085","546403","556179","567315","577096","587145","597369","608015","619292","629700","640103","651254","661172","671946","681745","691688","702105","712203","721654","733295","743331","753425","764850","774949","785116","795978","806368","817723","827531","838047","849099","859705","870677","881136","891818","902438","912558","922958","933355","943287","953511","964298","974663","985836","996922","1007782","1017952","1029639","1040067","1049984"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_first_shipto_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	6::smallint,
+	False::boolean,
+	0.035633333::real,
+	4::integer,
+	3649.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665}'::real[],
+	NULL::real[],
+	'{-0.0058256034}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2450039","2451757","2449267","2449566","2449608","2450648","2450973","2451697","2452197"}'::int4[],
+	E'{"2449028","2449061","2449097","2449131","2449163","2449198","2449239","2449274","2449311","2449346","2449381","2449417","2449457","2449492","2449530","2449568","2449601","2449635","2449669","2449706","2449746","2449780","2449818","2449857","2449893","2449930","2449972","2450009","2450045","2450081","2450118","2450155","2450194","2450228","2450265","2450301","2450337","2450372","2450407","2450444","2450483","2450523","2450560","2450594","2450633","2450672","2450708","2450743","2450779","2450812","2450853","2450890","2450930","2450969","2451005","2451044","2451078","2451114","2451147","2451184","2451221","2451261","2451295","2451334","2451370","2451411","2451449","2451486","2451523","2451560","2451594","2451627","2451664","2451702","2451740","2451774","2451810","2451846","2451879","2451918","2451954","2451991","2452028","2452063","2452099","2452135","2452172","2452207","2452242","2452277","2452312","2452352","2452389","2452429","2452461","2452495","2452530","2452566","2452602","2452640","2452678"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_first_sales_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	7::smallint,
+	False::boolean,
+	0.034733333::real,
+	4::integer,
+	3650.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665}'::real[],
+	NULL::real[],
+	'{-0.008479864}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2450009","2451727","2449237","2449536","2450618","2450943","2451260","2451667","2452039","2452167"}'::int4[],
+	E'{"2448998","2449032","2449067","2449101","2449135","2449170","2449209","2449245","2449281","2449317","2449352","2449389","2449428","2449463","2449500","2449537","2449571","2449603","2449637","2449673","2449713","2449747","2449785","2449823","2449859","2449897","2449940","2449977","2450013","2450049","2450084","2450121","2450161","2450196","2450234","2450270","2450306","2450341","2450375","2450412","2450450","2450489","2450526","2450562","2450599","2450638","2450674","2450708","2450743","2450778","2450819","2450854","2450894","2450934","2450971","2451008","2451044","2451079","2451114","2451151","2451188","2451226","2451263","2451301","2451338","2451379","2451417","2451453","2451492","2451528","2451561","2451594","2451629","2451669","2451706","2451741","2451776","2451811","2451845","2451884","2451921","2451957","2451993","2452029","2452067","2452104","2452140","2452175","2452211","2452245","2452281","2452322","2452358","2452398","2452431","2452465","2452501","2452536","2452573","2452610","2452648"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_salutation
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	8::smallint,
+	False::boolean,
+	0.035633333::real,
+	4::integer,
+	6.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.2827, 0.16666667, 0.166, 0.117466666, 0.11726667, 0.114266664}'::real[],
+	'{0.19105348}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Dr.","Mr.","Sir","Miss","Mrs.","Ms."}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_first_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0351::real,
+	6::integer,
+	2938.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.019733334, 0.0178, 0.0177, 0.014733333, 0.013333334, 0.012866667, 0.011166667, 0.0086, 0.008466667, 0.0082, 0.006, 0.0059666666, 0.0059666666, 0.0055, 0.0055, 0.0053666667, 0.0053, 0.0053, 0.0051, 0.0049666665, 0.0049, 0.0049, 0.0047, 0.0045, 0.0042, 0.004166667, 0.0041333335, 0.0040666666, 0.0039666668, 0.0039333333, 0.0039333333, 0.0038666667, 0.0038666667, 0.0038333333, 0.0038333333, 0.0038, 0.0038, 0.0037333334, 0.0036666666, 0.0035, 0.0035, 0.0034666667, 0.0034333332, 0.0034333332, 0.0033666666, 0.0033666666, 0.0033333334, 0.0031666667, 0.0031, 0.0031, 0.0030666667, 0.003, 0.0029666666, 0.0029666666, 0.0028666668, 0.0028333333, 0.0028333333, 0.0028, 0.0027666667, 0.0027, 0.0027, 0.0026666666, 0.0026333334, 0.0026333334, 0.0026, 0.0026, 0.0025666666, 0.0025666666, 0.0025, 0.0024666667, 0.0024666667, 0.0024333333, 0.0024, 0.0024, 0.0023666667, 0.0023333333, 0.0023333333, 0.0023333333, 0.0022666666, 0.0022333334, 0.0022333334, 0.0022, 0.0022, 0.0022, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021333334, 0.0020666667, 0.0020666667, 0.0020666667, 0.0020333333, 0.002, 0.0019666667, 0.0019666667, 0.0019333333, 0.0019, 0.0018666667}'::real[],
+	NULL::real[],
+	'{0.0041609285}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"John","James","Robert","Michael","David","William","Richard","Joseph","Charles","Thomas","Christopher","Linda","Mark","Daniel","Donald","Jennifer","Elizabeth","George","Barbara","Kenneth","Margaret","Paul","Dorothy","Edward","Susan","Brian","Jason","Lisa","Steven","Gary","Ronald","Anthony","Larry","Karen","Sandra","Helen","Matthew","Nancy","Kevin","Andrew","Eric","Sharon","Donna","Jeffrey","Betty","Timothy","Raymond","Jose","Frank","Jessica","Angela","Ruth","Melissa","Rebecca","Anna","Gloria","Laura","Stephen","Amy","Brenda","Cynthia","Deborah","Pamela","Patrick","Martha","Virginia","Michelle","Sarah","Diane","Joshua","Kimberly","Ann","Arthur","Scott","Douglas","Christine","Gregory","Harold","Katherine","Dennis","Joyce","Alice","Janet","Stephanie","Jerry","Kathleen","Marie","Peter","Theresa","Walter","Albert","Amanda","Teresa","Debra","Jonathan","Fred","Keith","Willie","Gerald","Lori"}'::varchar[],
+	E'{"Aaron","Adrienne","Alexander","Allyson","Andrea","Anne","April","Audrey","Benjamin","Bessie","Billy","Bradley","Brigitte","Caitlyn","Carlos","Carrie","Cecelia","Charlotte","Christian","Clara","Clifton","Cornelius","Cyrus","Danny","Dawn","Delta","Diana","Dora","Earl","Edna","Elena","Elsie","Erika","Ethel","Evelyn","Fleta","Freddie","Georgia","Glen","Gregorio","Hattie","Henriette","Homer","Ingrid","Jack","Jaleesa","Janis","Jed","Jerome","Jimmie","Joe","Jon","Juan","Julia","Justin","Kathy","Kerry","Kurt","Lavon","Leo","Letitia","Lois","Louis","Luis","Mae","Marco","Marilynn","Martin","Maurice","Melvin","Mike","Mitchell","Naomi","Nicholas","Norma","Oscar","Pauline","Phillip","Rachel","Randy","Renee","Robbie","Roger","Rose","Roy","Sabrina","Sara","Sharlene","Sherry","Stanley","Suzi","Tanya","Terry","Tina","Tonya","Tyrone","Veronica","Viola","Warren","Willian","Zulma"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_last_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	10::smallint,
+	False::boolean,
+	0.033933334::real,
+	7::integer,
+	4529.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.015133333, 0.011733334, 0.011033333, 0.009233333, 0.008533333, 0.008166667, 0.0059666666, 0.0048666666, 0.0048, 0.0047, 0.0046333335, 0.0046333335, 0.0043666665, 0.0043, 0.0041333335, 0.004, 0.0039666668, 0.0039, 0.0039, 0.0037333334, 0.0036333334, 0.0032666668, 0.0031666667, 0.0031333333, 0.0030666667, 0.003, 0.003, 0.0029, 0.0029, 0.0027666667, 0.0027333333, 0.0027333333, 0.0027, 0.0026333334, 0.0026333334, 0.0026333334, 0.0026, 0.0026, 0.0026, 0.0025666666, 0.0025, 0.0024666667, 0.0024333333, 0.0023666667, 0.0023666667, 0.0023333333, 0.0022, 0.0022, 0.0021333334, 0.0021333334, 0.0021333334, 0.0020666667, 0.0020333333, 0.0019, 0.0019, 0.0018666667, 0.0018666667, 0.0018333333, 0.0018, 0.0017666667, 0.0017666667, 0.0017666667, 0.0017333333, 0.0017333333, 0.0017333333, 0.0017333333, 0.0017, 0.0016666667, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016, 0.0016, 0.0016, 0.0015666666, 0.0015666666, 0.0015333333, 0.0015333333, 0.0015333333, 0.0015333333, 0.0015, 0.0015, 0.0015, 0.0015, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333}'::real[],
+	NULL::real[],
+	'{0.0012389864}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Smith","Johnson","Williams","Jones","Brown","Davis","Miller","Taylor","Thomas","Jackson","Moore","Wilson","Garcia","Anderson","Martin","Walker","Harris","Martinez","Robinson","Thompson","White","Young","Wright","Lee","Lewis","Hall","King","Rodriguez","Turner","Nelson","Allen","Hill","Roberts","Carter","Clark","Gonzalez","Adams","Hernandez","Scott","Campbell","Lopez","Baker","Green","Bell","Evans","Bailey","Rogers","Torres","Mitchell","Morgan","Stewart","Perez","Edwards","Collins","Sanchez","Morris","Phillips","Gray","Parker","Cox","Reed","Rivera","Brooks","Diaz","Richardson","Watson","Washington","Perry","Murphy","Patterson","Ross","Bryant","Cooper","Kelly","Henderson","Howard","Cook","James","Peterson","Simmons","Long","Mason","Russell","Wood","Gonzales","Murray","Price","Ramirez","Ward","Hughes","Myers","Barnes","Daniels","Harrison","Alexander","Bennett","Ford","Graham","Burns","Powell"}'::varchar[],
+	E'{"Aaron","Allison","Armstrong","Ayala","Barlow","Baxter","Benson","Black","Bonilla","Boyer","Bright","Burdick","Butler","Cano","Carroll","Chambers","Chinn","Coats","Comer","Correa","Creech","Cupp","Davies","Dent","Donovan","Duffy","Eaton","Enriquez","Farrington","Fink","Flynn","Frank","Fuller","Garrett","Gibson","Golding","Graves","Gross","Hale","Hardaway","Harvey","Heard","Herrera","Hobbs","Holt","Howe","Hunter","Jacobs","Johnston","Keller","Kirby","Kurtz","Larkin","Ledoux","Lindsey","Lowe","Mack","Markley","May","Mccormick","Mcgrath","Mcneil","Mercier","Moffitt","Morrison","Nagel","Nichols","Ocampo","Orozco","Padilla","Patton","Perkins","Pinto","Pratt","Raines","Reece","Rhodes","Ritter","Roman","Ruby","Salinas","Saylor","Seiler","Shepherd","Simpson","Snyder","Sperry","Stephens","Strickland","Sweeney","Thornton","Trejo","Valencia","Vernon","Walls","Weaver","West","Wiley","Winters","Worsham","Zuniga"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_preferred_cust_flag
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	11::smallint,
+	False::boolean,
+	0.03533333::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.49123332, 0.47343335}'::real[],
+	'{0.4982882}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: customer, Attribute: c_birth_day
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0334::real,
+	4::integer,
+	31.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0341, 0.0336, 0.0335, 0.033166666, 0.0326, 0.032266665, 0.032233335, 0.0321, 0.031933334, 0.0319, 0.0319, 0.0319, 0.031866666, 0.031833332, 0.031833332, 0.0317, 0.031533334, 0.031533334, 0.0315, 0.031466667, 0.031166667, 0.0311, 0.030966667, 0.030733334, 0.0307, 0.030533334, 0.030066667, 0.029833334, 0.029666666, 0.028233333, 0.019133333}'::real[],
+	'{0.03440461}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"27","15","26","5","10","23","21","19","14","6","7","18","12","13","24","17","16","22","1","25","8","11","9","3","28","4","29","2","20","30","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_birth_month
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0355::real,
+	4::integer,
+	12.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.08296666, 0.0828, 0.0826, 0.082166664, 0.08143333, 0.08093333, 0.079966664, 0.079733334, 0.079166666, 0.0789, 0.07836667, 0.07546667}'::real[],
+	'{0.08591734}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","1","8","7","9","10","5","6","12","4","11","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_birth_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	14::smallint,
+	False::boolean,
+	0.036066666::real,
+	4::integer,
+	69.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0158, 0.015133333, 0.0151, 0.0150666665, 0.014966667, 0.014966667, 0.014966667, 0.014966667, 0.0148, 0.014766667, 0.014733333, 0.0147, 0.0146, 0.0146, 0.014566666, 0.014366667, 0.014366667, 0.014366667, 0.014333333, 0.014333333, 0.0143, 0.014266667, 0.014266667, 0.014266667, 0.014233333, 0.0142, 0.014166667, 0.014166667, 0.014066666, 0.014066666, 0.014033333, 0.014033333, 0.014, 0.013966667, 0.013966667, 0.013966667, 0.013933334, 0.013933334, 0.013933334, 0.013866667, 0.013866667, 0.0138, 0.0138, 0.013733333, 0.013733333, 0.013666667, 0.0136, 0.0135, 0.0135, 0.013466666, 0.0134333335, 0.0134333335, 0.0134, 0.013366667, 0.013366667, 0.013266667, 0.013266667, 0.013266667, 0.013266667, 0.0132, 0.0131, 0.0131, 0.013066667, 0.013066667, 0.013033333, 0.013033333, 0.012933333, 0.012833334, 0.0127}'::real[],
+	'{0.023301385}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1940","1978","1935","1970","1955","1957","1959","1990","1988","1925","1956","1987","1972","1985","1946","1926","1932","1933","1929","1979","1968","1930","1951","1961","1975","1966","1953","1971","1939","1977","1941","1991","1960","1937","1948","1952","1927","1938","1962","1964","1976","1958","1986","1924","1928","1965","1983","1942","1963","1931","1944","1945","1984","1934","1954","1947","1980","1981","1989","1982","1950","1969","1973","1974","1936","1949","1943","1967","1992"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_birth_country
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	15::smallint,
+	False::boolean,
+	0.035633333::real,
+	9::integer,
+	211.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.0056666667, 0.0055333334}'::real[],
+	NULL::real[],
+	'{0.013934988}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"GEORGIA","GREENLAND"}'::varchar[],
+	E'{"AFGHANISTAN","ALBANIA","AMERICAN SAMOA","ANGOLA","ANGUILLA","ARGENTINA","ARUBA","AUSTRIA","BAHAMAS","BANGLADESH","BELARUS","BELIZE","BERMUDA","BOLIVIA","BOUVET ISLAND","BRUNEI DARUSSALAM","BURUNDI","CAMBODIA","CANADA","CAYMAN ISLANDS","CHRISTMAS ISLAND","COSTA RICA","CROATIA","CYPRUS","DENMARK","DOMINICA","EGYPT","EQUATORIAL GUINEA","ETHIOPIA","FIJI","FRANCE","FRENCH POLYNESIA","GAMBIA","GHANA","GREECE","GUADELOUPE","GUATEMALA","GUINEA","HAITI","HONDURAS","ICELAND","INDONESIA","IRELAND","ISRAEL","JAMAICA","JERSEY","KAZAKHSTAN","KIRIBATI","KUWAIT","LEBANON","LIBERIA","LITHUANIA","LUXEMBOURG","MALAWI","MALDIVES","MALTA","MARTINIQUE","MAURITIUS","MEXICO","MONACO","MONTENEGRO","MOROCCO","NAMIBIA","NEPAL","NETHERLANDS ANTILLES","NEW ZEALAND","NIGER","NIUE","NORWAY","PALAU","PAPUA NEW GUINEA","PERU","PITCAIRN","PORTUGAL","QATAR","ROMANIA","RWANDA","SAMOA","SAUDI ARABIA","SERBIA","SIERRA LEONE","SLOVAKIA","SOLOMON ISLANDS","SOUTH AFRICA","SRI LANKA","SURINAME","SWEDEN","SYRIAN ARAB REPUBLIC","THAILAND","TOGO","TONGA","TUNISIA","TUVALU","UKRAINE","UNITED KINGDOM","URUGUAY","VANUATU","VIET NAM","WALLIS AND FUTUNA","YEMEN","ZIMBABWE"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_login
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	16::smallint,
+	False::boolean,
+	1.0::real,
+	0::integer,
+	0.0::real,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_email_address
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	17::smallint,
+	False::boolean,
+	0.03596667::real,
+	28::integer,
+	-0.9640333::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00065877277}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Aaron.Allen@QVp8KYxoqS.edu","Albert.Mcnabb@JqFg1Vfr.edu","Allen.Blackmon@rDQezy0Iy.org","Amy.Moore@lIXLGiGxl.com","Angela.Perez@9CODy4qpPeA8HCLX.com","Annie.Anderson@D1dOEV8V7YH.edu","April.Sanchez@MlJE7Jyr1KnbMizt8.com","Barbara.Bird@Bsz4Y8vF.edu","Bennie.Mcdonald@8a.com","Beverly.Armstrong@QKMtgEU.edu","Brady.Pacheco@V3G7zDs.org","Brian.Otto@5Ue35SXHl043P.org","Candy.Cox@BmsyXv426e.edu","Casey.Steele@TkMmIusn.com","Charles.Brito@qPU9PAt6xF.com","Chelsey.Gil@U7R6AeIVeQNbM.org","Christopher.Caraway@baXEFsAXkiXc4H.com","Clarence.Martinez@Tjom5JSSLsiqH.edu","Corinne.Blount@gG8DjsIs77.edu","Dale.Peterson@UP1FQ.com","Danny.Rudd@Qj.edu","David.Hernandez@XvDstf8oVspNVEq9N2ek.edu","Dawn.Washington@UZL4A2cTelj.org","Delorse.Mann@p1.edu","Diane.Ruiz@tq8V3.edu","Dona.Rucker@U5tPkxBoh3Nvvr.edu","Dorothy.Ledoux@6UXxuie.org","Ebony.Straub@O0ny7G.edu","Edwin.Brown@jifz5d3.com","Elizabeth.Rowe@x7a.com","Erica.Stewart@MjVPLVkiTTx1k9xvn.com","Ethel.Bowers@BchSkuO.edu","Felisha.White@4KHiD3EfpI.org","Fred.Burns@YAxMo0quQt02.org","Gaynell.Duran@PP5khP2OBXNnz.edu","Gerald.Olivas@Hs63PKrg.org","Goldie.Costello@74uH9.com","Harold.Mckinney@0Ymy5L.edu","Helene.Lockhart@4guNOhMAJ.org","Howard.Clarkson@KEs7Z6hdVT5d.edu","Jack.Davis@D7dTycb6ort.org","James.Cockrell@5lqoIx4paJn9P.org","James.Richter@7JahtLhEvS.org","Janice.Choate@ItXxi6VjtefUmkF.org","Jeanette.Mathews@mXCyZTs8MaGK9.org","Jennifer.Emerson@LADJl.com","Jerry.Willoughby@4h6L6um1aOm0JTk.edu","Joanna.French@Dn.com","John.Byrd@xAeLnuIQqDO4V.edu","John.Nail@vdm7UXfYYeeR5.org","Jonathan.Cochran@a1YLy7.com","Josephine.Barton@jbuycDaa1Dih2f6TbHs.org","Joshua.Trent@P5VKT8eLAEqph7.org","Julia.Mcneil@UXUiYMm4Rf1r1ysly2.com","Karen.Salmon@hVtuyn2.org","Kathy.Roush@f1.com","Kenneth.Nolen@fXIxCA8ecA7kUe.edu","Kimberly.Ward@UjmN1i5S0HqjOSB6P.org","Larry.Mccollum@KM3A2VsKR51LR7aSC2.edu","Leann.Lindsay@CYHO5.org","Lillian.Gibbons@ex2.edu","Lisa.Kaiser@2.edu","Lorraine.Wasson@fxUN1RDnuPC.com","Lyn.Green@ab9AnRe6OP.edu","Margaret.Childers@I2BJusIOR.org","Marilyn.Cochran@fXUsGKiG2pQn5p.org","Mark.Townsend@QRk6f4vPmjzGsd.edu","Matthew.Brown@BbgxEpsOa2.edu","Melissa.Brown@tU.org","Michael.Evans@na3Fzya.edu","Michael.Vickery@tGpS.edu","Millie.Wood@CYrA5ZCpBUxN.com","Nancy.Hubbard@1Dij5VOarSDD.com","Nicole.Cartwright@XVpmQfap67h39R.edu","Otha.Mathews@Q.edu","Paul.Bernard@l8hNZT.com","Peter.Bean@1hcfjEMbL.com","Rafael.Walker@DdbVsZ48tXFR.org","Raymond.Willis@FuCYxX.org","Richard.Blue@hk6sJl.org","Richard.Walker@QkOyOiijkoT6tALu.org","Robert.Feliciano@zrxHvBIUT1.org","Robert.Schrader@84hFFO.edu","Ronald.Barajas@SmV.edu","Rose.Rivera@nI5i3amDP9e.com","Ruth.Noble@nsRPMH7imQms.edu","Sandra.Ngo@NpRHjOrv.org","Sean.Young@cSmSeTb.edu","Shelly.Prentice@fOdVDfc3l.org","Stephanie.Maupin@1aO67HVBb4t.org","Stuart.Mintz@sCH9lO.com","Tamika.Walker@LypSN7cml.com","Terry.Pence@9V95I2n.edu","Thomas.Logan@62ZLdPqs6.edu","Tina.Fry@ggnu7.com","Troy.Hunt@HEIC1huvlV2.com","Vicky.Smith@7NTjUV1y.com","Walter.Guinn@q0V9yqO.com","William.Biddle@X3bGbi3YEGk.edu","William.Silva@OsUh7.edu","Zulma.Williams@NNUybLiKUcP.com"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_last_review_date
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	18::smallint,
+	False::boolean,
+	0.03643333::real,
+	4::integer,
+	366.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0033333334, 0.0033333334}'::real[],
+	NULL::real[],
+	'{-0.010210618}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2452342","2452574"}'::int4[],
+	E'{"2452283","2452286","2452290","2452293","2452297","2452301","2452304","2452308","2452312","2452315","2452318","2452322","2452326","2452329","2452333","2452337","2452341","2452345","2452349","2452352","2452356","2452360","2452363","2452367","2452371","2452374","2452378","2452382","2452386","2452389","2452393","2452397","2452400","2452404","2452408","2452411","2452414","2452418","2452422","2452425","2452429","2452433","2452437","2452440","2452444","2452447","2452451","2452455","2452458","2452462","2452465","2452469","2452473","2452476","2452480","2452483","2452487","2452491","2452494","2452498","2452501","2452505","2452508","2452512","2452515","2452519","2452523","2452527","2452531","2452535","2452538","2452542","2452545","2452549","2452553","2452556","2452560","2452563","2452568","2452571","2452576","2452579","2452583","2452587","2452591","2452594","2452598","2452601","2452605","2452608","2452612","2452616","2452619","2452623","2452626","2452630","2452634","2452638","2452641","2452645","2452648"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2415027","2415771","2416520","2417211","2417903","2418630","2419355","2420088","2420908","2421635","2422337","2423125","2423817","2424576","2425331","2426034","2426734","2427456","2428161","2428886","2429586","2430281","2431030","2431747","2432487","2433188","2433919","2434660","2435416","2436096","2436816","2437551","2438254","2438932","2439677","2440414","2441121","2441884","2442643","2443351","2444066","2444821","2445520","2446305","2447089","2447791","2448548","2449230","2449930","2450652","2451408","2452175","2452928","2453663","2454412","2455152","2455942","2456650","2457349","2458087","2458835","2459531","2460255","2460995","2461677","2462381","2463126","2463880","2464613","2465432","2466146","2466884","2467605","2468353","2469108","2469764","2470509","2471242","2471960","2472732","2473465","2474220","2474963","2475782","2476553","2477254","2477964","2478666","2479406","2480132","2480928","2481630","2482367","2483101","2483817","2484513","2485191","2485905","2486655","2487351","2488066"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_date_id
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0::real,
+	17::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.004197001}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"AAAAAAAAAAABFCAA","AAAAAAAAACLOFCAA","AAAAAAAAAFFCFCAA","AAAAAAAAAHNPECAA","AAAAAAAAAKHDFCAA","AAAAAAAAAMPOECAA","AAAAAAAAAPIBFCAA","AAAAAAAABBPBFCAA","AAAAAAAABEFFFCAA","AAAAAAAABGOIFCAA","AAAAAAAABJKKFCAA","AAAAAAAABMDCFCAA","AAAAAAAABONBFCAA","AAAAAAAACBFDFCAA","AAAAAAAACDNAFCAA","AAAAAAAACGHOFCAA","AAAAAAAACJCMFCAA","AAAAAAAACLLAFCAA","AAAAAAAACOBLFCAA","AAAAAAAADAMDFCAA","AAAAAAAADDFPECAA","AAAAAAAADGAOFCAA","AAAAAAAADIKLFCAA","AAAAAAAADLDCFCAA","AAAAAAAADOCDFCAA","AAAAAAAAEAKPECAA","AAAAAAAAEDEAFCAA","AAAAAAAAEFPHFCAA","AAAAAAAAEILJFCAA","AAAAAAAAELGOECAA","AAAAAAAAENOOFCAA","AAAAAAAAFAFPECAA","AAAAAAAAFCPJFCAA","AAAAAAAAFFGHFCAA","AAAAAAAAFHMOECAA","AAAAAAAAFKEKFCAA","AAAAAAAAFMMJFCAA","AAAAAAAAFPCKFCAA","AAAAAAAAGBKJFCAA","AAAAAAAAGEDOECAA","AAAAAAAAGGOAFCAA","AAAAAAAAGJKHFCAA","AAAAAAAAGMEBFCAA","AAAAAAAAGONOFCAA","AAAAAAAAHBJHFCAA","AAAAAAAAHECHFCAA","AAAAAAAAHGLOECAA","AAAAAAAAHJFDFCAA","AAAAAAAAHLOBFCAA","AAAAAAAAHOFIFCAA","AAAAAAAAIANCFCAA","AAAAAAAAIDFPECAA","AAAAAAAAIFMFFCAA","AAAAAAAAIIGHFCAA","AAAAAAAAILABFCAA","AAAAAAAAINJEFCAA","AAAAAAAAJADHFCAA","AAAAAAAAJCLBFCAA","AAAAAAAAJFDCFCAA","AAAAAAAAJHLMFCAA","AAAAAAAAJKDBFCAA","AAAAAAAAJMKOFCAA","AAAAAAAAJPCHFCAA","AAAAAAAAKBMIFCAA","AAAAAAAAKEEPECAA","AAAAAAAAKGODFCAA","AAAAAAAAKJGPECAA","AAAAAAAAKLMAFCAA","AAAAAAAAKOFCFCAA","AAAAAAAALBAAFCAA","AAAAAAAALDKOECAA","AAAAAAAALGBIFCAA","AAAAAAAALIGMFCAA","AAAAAAAALKMOECAA","AAAAAAAALNENFCAA","AAAAAAAALPMOFCAA","AAAAAAAAMCFFFCAA","AAAAAAAAMELFFCAA","AAAAAAAAMHFJFCAA","AAAAAAAAMJOIFCAA","AAAAAAAAMMHDFCAA","AAAAAAAAMPBJFCAA","AAAAAAAANBKMFCAA","AAAAAAAANEHIFCAA","AAAAAAAANGMPECAA","AAAAAAAANJIAFCAA","AAAAAAAANMDDFCAA","AAAAAAAANOPGFCAA","AAAAAAAAOBHNFCAA","AAAAAAAAOEAPFCAA","AAAAAAAAOGKIFCAA","AAAAAAAAOJBGFCAA","AAAAAAAAOLIJFCAA","AAAAAAAAOOALFCAA","AAAAAAAAPAJMFCAA","AAAAAAAAPDCOECAA","AAAAAAAAPFLAFCAA","AAAAAAAAPIECFCAA","AAAAAAAAPKNIFCAA","AAAAAAAAPNFPFCAA","AAAAAAAAPPPOFCAA"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: date_dim, Attribute: d_date
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1095::oid,
+	1095::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1900-01-07","1902-01-21","1904-02-09","1905-12-31","1907-11-23","1909-11-19","1911-11-14","1913-11-16","1916-02-14","1918-02-10","1920-01-13","1922-03-11","1924-02-01","1926-03-01","1928-03-25","1930-02-26","1932-01-27","1934-01-18","1935-12-24","1937-12-18","1939-11-18","1941-10-13","1943-11-01","1945-10-18","1947-10-28","1949-09-28","1951-09-29","1953-10-09","1955-11-04","1957-09-14","1959-09-04","1961-09-08","1963-08-12","1965-06-20","1967-07-05","1969-07-11","1971-06-18","1973-07-20","1975-08-18","1977-07-26","1979-07-11","1981-08-04","1983-07-04","1985-08-27","1987-10-20","1989-09-21","1991-10-18","1993-08-30","1995-07-31","1997-07-22","1999-08-17","2001-09-22","2003-10-15","2005-10-19","2007-11-07","2009-11-16","2012-01-15","2013-12-23","2015-11-22","2017-11-29","2019-12-17","2021-11-12","2023-11-06","2025-11-15","2027-09-28","2029-09-01","2031-09-16","2033-10-09","2035-10-12","2038-01-08","2039-12-23","2041-12-30","2043-12-21","2046-01-07","2048-02-01","2049-11-18","2051-12-03","2053-12-05","2055-11-23","2058-01-03","2060-01-06","2062-01-30","2064-02-12","2066-05-11","2068-06-20","2070-05-22","2072-05-01","2074-04-03","2076-04-12","2078-04-08","2080-06-12","2082-05-15","2084-05-21","2086-05-25","2088-05-10","2090-04-06","2092-02-13","2094-01-27","2096-02-16","2098-01-12","2099-12-28"}'::date[],
+	NULL::date[],
+	NULL::date[],
+	NULL::date[],
+	NULL::date[]);
+--
+-- Table: date_dim, Attribute: d_month_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"979","1761","198","288","356","445","552","594","751","941","1154","1251"}'::int4[],
+	E'{"0","24","48","71","94","117","141","164","191","217","239","265","289","314","339","363","386","409","432","458","480","503","528","551","577","601","625","649","675","695","719","743","768","790","814","838","861","885","911","934","959","985","1009","1034","1059","1083","1106","1130","1152","1176","1201","1226","1252","1277","1301","1326","1351","1373","1396","1421","1444","1467","1491","1515","1537","1560","1585","1609","1633","1661","1684","1707","1731","1755","1781","1803","1827","1851","1874","1900","1923","1948","1973","1999","2024","2048","2070","2094","2117","2141","2167","2190","2213","2238","2261","2283","2306","2329","2354","2376","2399"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_week_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.14316417::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","108","215","313","412","516","620","724","841","945","1046","1158","1257","1365","1473","1574","1674","1777","1878","1981","2081","2180","2287","2390","2496","2596","2700","2806","2914","3011","3114","3219","3319","3416","3523","3628","3729","3838","3946","4048","4150","4258","4357","4470","4582","4682","4790","4887","4987","5091","5199","5308","5416","5521","5628","5733","5846","5947","6047","6153","6260","6359","6462","6568","6666","6766","6873","6980","7085","7202","7304","7409","7512","7619","7727","7821","7927","8032","8135","8245","8350","8457","8564","8681","8791","8891","8992","9093","9198","9302","9416","9516","9621","9726","9828","9928","10025","10127","10234","10333","10435"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_quarter_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	801.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0018, 0.0018, 0.0017333333}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"141","754","588"}'::int4[],
+	E'{"1","9","17","25","32","40","48","56","65","73","81","89","97","105","113","121","128","136","145","153","161","169","177","184","192","200","208","216","225","232","240","248","255","263","271","279","287","295","303","311","319","327","335","343","352","359","367","375","383","390","399","407","415","423","431","439","448","456","463","471","480","487","495","503","511","518","526","534","543","551","559","567","575","583","593","600","608","616","624","632","640","648","657","665","674","682","689","697","705","713","721","729","737","745","753","762","769","777","786","793","801"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0060666665, 0.006, 0.0058333334, 0.0057666665, 0.0056666667}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1957","2088","1929","1907","2027"}'::int4[],
+	E'{"1900","1902","1904","1905","1908","1910","1912","1914","1916","1918","1920","1922","1924","1926","1928","1931","1933","1935","1937","1939","1940","1942","1944","1946","1948","1950","1952","1954","1956","1959","1961","1963","1965","1967","1969","1970","1972","1974","1976","1978","1980","1982","1984","1986","1988","1990","1992","1994","1996","1998","2000","2002","2004","2006","2008","2010","2012","2014","2016","2017","2019","2021","2023","2025","2028","2030","2032","2034","2036","2038","2040","2042","2044","2046","2048","2050","2052","2054","2055","2058","2059","2061","2064","2066","2068","2070","2072","2073","2075","2077","2079","2081","2083","2085","2087","2090","2092","2094","2096","2098","2099"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_dow
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	8::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	7.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.14473334, 0.14406666, 0.14326666, 0.14316666, 0.14263333, 0.14153333, 0.1406}'::real[],
+	'{0.13635832}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2","3","1","4","0","6","5"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_moy
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	12.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.085533336, 0.085433334, 0.0849, 0.0846, 0.084366664, 0.08426667, 0.08393333, 0.08316667, 0.0829, 0.082, 0.08183333, 0.07706667}'::real[],
+	'{0.088353634}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","5","10","12","1","7","6","8","9","11","4","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	31.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0351, 0.0338, 0.03376667, 0.033733334, 0.033733334, 0.033633333, 0.033466667, 0.033466667, 0.03313333, 0.0331, 0.032966666, 0.032966666, 0.032966666, 0.0329, 0.032866668, 0.032766666, 0.0327, 0.0326, 0.0325, 0.0325, 0.0324, 0.032366667, 0.032333333, 0.032266665, 0.032133333, 0.032, 0.031533334, 0.030833334, 0.0305, 0.0304, 0.018566666}'::real[],
+	'{0.03590256}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"13","23","22","1","24","5","7","16","26","21","14","17","28","20","6","2","9","10","12","19","18","8","15","27","4","25","11","30","29","3","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_qoy
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	11::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	4.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.25106665, 0.25043333, 0.2494, 0.2491}'::real[],
+	'{0.25712454}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2","3","4","1"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_fy_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0060666665, 0.006, 0.0058333334, 0.0057666665, 0.0056666667}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1957","2088","1929","1907","2027"}'::int4[],
+	E'{"1900","1902","1904","1905","1908","1910","1912","1914","1916","1918","1920","1922","1924","1926","1928","1931","1933","1935","1937","1939","1940","1942","1944","1946","1948","1950","1952","1954","1956","1959","1961","1963","1965","1967","1969","1970","1972","1974","1976","1978","1980","1982","1984","1986","1988","1990","1992","1994","1996","1998","2000","2002","2004","2006","2008","2010","2012","2014","2016","2017","2019","2021","2023","2025","2028","2030","2032","2034","2036","2038","2040","2042","2044","2046","2048","2050","2052","2054","2055","2058","2059","2061","2064","2066","2068","2070","2072","2073","2075","2077","2079","2081","2083","2085","2087","2090","2092","2094","2096","2098","2099"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_fy_quarter_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	801.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0018, 0.0018, 0.0017333333}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"141","754","588"}'::int4[],
+	E'{"1","9","17","25","32","40","48","56","65","73","81","89","97","105","113","121","128","136","145","153","161","169","177","184","192","200","208","216","225","232","240","248","255","263","271","279","287","295","303","311","319","327","335","343","352","359","367","375","383","390","399","407","415","423","431","439","448","456","463","471","480","487","495","503","511","518","526","534","543","551","559","567","575","583","593","600","608","616","624","632","640","648","657","665","674","682","689","697","705","713","721","729","737","745","753","762","769","777","786","793","801"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_fy_week_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	14::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.14316417::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","108","215","313","412","516","620","724","841","945","1046","1158","1257","1365","1473","1574","1674","1777","1878","1981","2081","2180","2287","2390","2496","2596","2700","2806","2914","3011","3114","3219","3319","3416","3523","3628","3729","3838","3946","4048","4150","4258","4357","4470","4582","4682","4790","4887","4987","5091","5199","5308","5416","5521","5628","5733","5846","5947","6047","6153","6260","6359","6462","6568","6666","6766","6873","6980","7085","7202","7304","7409","7512","7619","7727","7821","7927","8032","8135","8245","8350","8457","8564","8681","8791","8891","8992","9093","9198","9302","9416","9516","9621","9726","9828","9928","10025","10127","10234","10333","10435"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_day_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	15::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	7.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.14473334, 0.14406666, 0.14326666, 0.14316666, 0.14263333, 0.14153333, 0.1406}'::real[],
+	'{0.14524722}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Tuesday","Wednesday","Monday","Thursday","Sunday","Saturday","Friday"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: date_dim, Attribute: d_quarter_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	16::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	800.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.0017666667, 0.0016666667, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2088Q2","1957Q2","1907Q3","1937Q1","2049Q2","2051Q2","2055Q2","2096Q4"}'::varchar[],
+	E'{"1900Q1","1902Q1","1904Q1","1905Q4","1908Q1","1910Q1","1912Q1","1913Q4","1916Q1","1918Q1","1920Q1","1922Q1","1924Q1","1926Q1","1928Q1","1930Q1","1931Q4","1933Q4","1935Q4","1938Q1","1940Q1","1941Q4","1943Q4","1945Q4","1947Q4","1949Q3","1951Q3","1953Q3","1955Q4","1957Q4","1959Q4","1961Q4","1963Q4","1965Q3","1967Q3","1969Q3","1971Q3","1973Q3","1975Q3","1977Q3","1979Q2","1981Q2","1983Q2","1985Q2","1987Q3","1989Q3","1991Q3","1993Q2","1995Q2","1997Q1","1999Q2","2001Q2","2003Q2","2005Q2","2007Q2","2009Q2","2011Q3","2013Q2","2015Q2","2017Q2","2019Q2","2021Q1","2023Q1","2025Q1","2027Q1","2028Q4","2030Q4","2032Q4","2034Q4","2037Q1","2039Q1","2041Q1","2043Q1","2045Q1","2046Q4","2049Q1","2051Q1","2053Q3","2055Q4","2057Q4","2059Q4","2061Q4","2063Q4","2065Q4","2068Q1","2070Q1","2072Q1","2073Q4","2075Q4","2077Q4","2079Q4","2081Q4","2083Q4","2085Q4","2087Q4","2090Q1","2091Q4","2093Q4","2095Q4","2098Q1","2099Q4"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: date_dim, Attribute: d_holiday
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9912, 0.0088}'::real[],
+	'{0.9816509}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_weekend
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.71786666, 0.28213334}'::real[],
+	'{0.59107685}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_following_holiday
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9918333, 0.008166667}'::real[],
+	'{0.98435473}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_first_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2444818","2468620","2421046","2423786","2425856","2428566","2431822","2433099","2437878","2443661","2450144","2453097"}'::int4[],
+	E'{"2415021","2415751","2416481","2417181","2417881","2418581","2419311","2420012","2420833","2421626","2422294","2423087","2423817","2424576","2425338","2426068","2426768","2427470","2428169","2428959","2429630","2430330","2431091","2431791","2432583","2433314","2434044","2434775","2435565","2436174","2436904","2437635","2438396","2439066","2439796","2440527","2441226","2441957","2442748","2443449","2444209","2445002","2445732","2446491","2447253","2447983","2448683","2449413","2450084","2450815","2451576","2452335","2453127","2453888","2454619","2455379","2456141","2456810","2457510","2458271","2458971","2459671","2460402","2461132","2461803","2462503","2463264","2463995","2464725","2465576","2466276","2466976","2467707","2468437","2469229","2469898","2470629","2471359","2472059","2472850","2473551","2474311","2475073","2475864","2476626","2477356","2478025","2478755","2479456","2480186","2480978","2481677","2482378","2483138","2483839","2484508","2485208","2485910","2486669","2487340","2488039"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_last_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	21::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{0.99998605}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2445029","2468892","2421227","2423785","2426098","2428596","2431821","2433279","2438089","2443811","2450203","2453187"}'::int4[],
+	E'{"2415020","2415930","2416661","2417332","2418061","2418734","2419522","2420195","2420984","2421834","2422505","2423236","2424027","2424756","2425489","2426279","2426889","2427619","2428350","2429139","2429810","2430481","2431271","2432002","2432732","2433463","2434194","2434983","2435715","2436385","2437055","2437786","2438576","2439244","2439977","2440705","2441437","2442166","2442899","2443627","2444360","2445151","2445881","2446671","2447404","2448132","2448864","2449534","2450265","2450995","2451786","2452518","2453308","2454039","2454770","2455559","2456293","2456961","2457691","2458422","2459152","2459882","2460553","2461284","2461953","2462683","2463414","2464203","2464935","2465727","2466457","2467128","2467858","2468648","2469380","2470050","2470780","2471511","2472240","2473031","2473702","2474492","2475224","2476016","2476807","2477477","2478206","2478935","2479607","2480337","2481130","2481857","2482529","2483318","2483990","2484660","2485389","2486059","2486790","2487519","2488372"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_same_day_ly
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	22::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.9988364::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2414662","2415406","2416155","2416846","2417538","2418265","2418990","2419723","2420543","2421270","2421972","2422760","2423452","2424211","2424965","2425669","2426369","2427091","2427796","2428521","2429221","2429916","2430665","2431382","2432122","2432823","2433554","2434295","2435051","2435731","2436451","2437186","2437889","2438567","2439312","2440049","2440756","2441519","2442278","2442986","2443701","2444456","2445155","2445940","2446724","2447426","2448183","2448865","2449565","2450287","2451043","2451810","2452563","2453298","2454047","2454787","2455577","2456285","2456984","2457722","2458470","2459166","2459890","2460630","2461312","2462016","2462761","2463515","2464248","2465067","2465781","2466519","2467240","2467988","2468743","2469399","2470144","2470877","2471595","2472367","2473100","2473855","2474598","2475417","2476187","2476889","2477598","2478301","2479040","2479767","2480562","2481265","2482001","2482736","2483451","2484148","2484826","2485540","2486290","2486986","2487701"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_same_day_lq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	23::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.99268985::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2414935","2415679","2416428","2417119","2417811","2418538","2419263","2419996","2420816","2421543","2422245","2423033","2423725","2424484","2425239","2425942","2426642","2427364","2428069","2428794","2429494","2430189","2430938","2431655","2432395","2433097","2433828","2434568","2435324","2436005","2436725","2437460","2438163","2438842","2439586","2440323","2441031","2441793","2442552","2443260","2443975","2444730","2445429","2446214","2446997","2447700","2448456","2449139","2449839","2450561","2451317","2452084","2452836","2453571","2454320","2455060","2455850","2456558","2457257","2457995","2458743","2459439","2460163","2460903","2461586","2462290","2463035","2463788","2464521","2465340","2466054","2466792","2467513","2468261","2469016","2469672","2470417","2471150","2471868","2472640","2473373","2474128","2474871","2475692","2476462","2477164","2477873","2478576","2479315","2480042","2480837","2481540","2482276","2483011","2483726","2484423","2485099","2485813","2486563","2487259","2487974"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_current_day
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	24::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	1.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{1.0}'::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_week
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	25::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	1.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{1.0}'::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_month
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	26::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9996, 0.0004}'::real[],
+	'{0.9994385}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_quarter
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	27::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.99873334, 0.0012666667}'::real[],
+	'{0.9982279}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	28::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.99543333, 0.0045666667}'::real[],
+	'{0.99365747}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: store_sales, Attribute: ss_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.044::real,
+	4::integer,
+	1823.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0015, 0.0014666667, 0.0014666667, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011}'::real[],
+	NULL::real[],
+	'{-0.0022345192}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451534","2452228","2451129","2452240","2451139","2451161","2451546","2452258","2452621","2452589","2452600","2452625","2451137","2451148","2451181","2451896","2452251","2452260","2451178","2451528","2451904","2451909","2452242","2452250","2452628","2452642","2451121","2451134","2451174","2451496","2451864","2451872","2451879","2451910","2452257","2452271","2452592","2451112","2451149","2451525","2451865","2452232","2452277","2452598","2452640","2451127","2451136","2451153","2451177","2451505","2451541","2451851","2451862","2452230","2452238","2452266","2452607","2452609","2452627","2452641","2451142","2451158","2451160","2451491","2451868","2451885","2451887","2452248","2452601","2452606","2452634","2451123","2451125","2451133","2451138","2451144","2451506","2451509","2451529","2451884","2451898","2452219","2452221","2452225","2452246","2452256","2452274","2452597","2452602","2452614","2452623","2451126","2451141","2451154","2451493","2451494","2451497","2451513","2451516","2451526"}'::int4[],
+	E'{"2450816","2450843","2450874","2450900","2450926","2450953","2450982","2451010","2451033","2451045","2451057","2451070","2451082","2451095","2451107","2451119","2451143","2451157","2451169","2451184","2451213","2451241","2451267","2451294","2451322","2451349","2451372","2451398","2451410","2451423","2451435","2451448","2451460","2451472","2451485","2451499","2451511","2451522","2451536","2451545","2451572","2451600","2451626","2451650","2451679","2451703","2451734","2451760","2451772","2451783","2451795","2451806","2451818","2451830","2451843","2451855","2451867","2451877","2451890","2451901","2451916","2451945","2451974","2451999","2452025","2452053","2452081","2452109","2452129","2452140","2452151","2452163","2452173","2452185","2452195","2452207","2452218","2452233","2452245","2452262","2452275","2452301","2452329","2452358","2452385","2452413","2452437","2452464","2452492","2452504","2452516","2452528","2452540","2452553","2452566","2452578","2452587","2452604","2452617","2452630","2452639"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.04476667::real,
+	4::integer,
+	42441.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00023333334}'::real[],
+	NULL::real[],
+	'{-0.0029273503}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"53826"}'::int4[],
+	E'{"28802","29544","30512","31386","32305","32816","33250","33722","34146","34599","35052","35511","35964","36268","36566","36863","37172","37485","37828","38121","38401","38684","38983","39275","39560","40075","40557","41068","41530","42041","42524","43017","43474","43957","44423","44910","45389","45848","46343","46755","47169","47614","48001","48403","48805","49181","49610","50080","50477","50759","51068","51365","51655","51931","52218","52524","52799","53101","53418","53732","54105","54884","55780","56713","57597","58420","59372","60285","61221","61506","61795","62076","62374","62681","62967","63254","63580","63859","64159","64441","64733","65144","65590","66065","66523","66923","67434","67869","68271","68722","69211","69656","70119","70604","71096","71498","71944","72815","73678","74590","75597"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	25013.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0003, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.000308136}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"18140","1183","1921","10183","13837","16333","22268","26593","27325","2035","3793","4081","4525","5833","8575","9103","9211","9703","10507","11761","12685","13513","14792","15871","15907","15998","17095","17455","19111","20875","21085","21457","22741","24703","24817","26851","26971","27337","27709","27919"}'::int4[],
+	E'{"1","260","575","888","1162","1441","1707","1975","2264","2523","2847","3115","3368","3650","3951","4214","4523","4827","5071","5329","5587","5894","6181","6496","6776","7024","7312","7591","7855","8113","8398","8682","8957","9245","9530","9823","10114","10405","10699","10959","11247","11525","11781","12061","12360","12613","12889","13190","13453","13731","14017","14294","14575","14877","15152","15457","15733","16015","16291","16579","16861","17155","17437","17702","17984","18247","18519","18783","19092","19380","19642","19943","20221","20467","20723","20995","21311","21596","21870","22136","22427","22700","22970","23261","23533","23805","24082","24344","24628","24932","25220","25519","25800","26063","26331","26591","26879","27151","27422","27705","27999"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.043866668::real,
+	4::integer,
+	1787614.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.002228295}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"17","21786","42607","63355","81931","104851","124188","143682","164679","186368","206598","227797","248026","266122","287862","306345","328795","349339","369849","390012","413705","437205","457764","479231","501632","523614","545267","564653","584588","603322","628035","648054","668479","689551","709515","730333","751340","771680","793540","814237","835667","857070","877179","899789","920597","942338","962762","984964","1006607","1027347","1048659","1070611","1092247","1111106","1131352","1152543","1173197","1192658","1215327","1237528","1259725","1279865","1300200","1324729","1344982","1367029","1388243","1408781","1430858","1451533","1472783","1491853","1512116","1533678","1554248","1577279","1600025","1621228","1641577","1663202","1683219","1704339","1723327","1742744","1763526","1783848","1805196","1826090","1845634","1865356","1885579","1905861","1925869","1946542","1969323","1991449","2012218","2035047","2058343","2079610","2099931"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.044433333::real,
+	4::integer,
+	1889709.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00950842}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"30","17849","37904","56865","76186","96917","115542","134186","152099","172680","192783","211817","229921","248171","269276","287913","306855","326795","345207","365388","382970","404387","425118","443738","463882","483064","501977","520761","538035","556646","576673","595274","615470","633068","652437","671351","689763","709263","728426","748174","767474","786428","805372","823760","843936","863306","880648","898664","917543","936304","956226","976161","994176","1014253","1033333","1051646","1070542","1089363","1107670","1128460","1147427","1166875","1187090","1205515","1224744","1244031","1263305","1283771","1301649","1319446","1337051","1356966","1373991","1393391","1412686","1433469","1453024","1470147","1488228","1507316","1525606","1543945","1563428","1582932","1601688","1622584","1644497","1663783","1684160","1704534","1724056","1744635","1764898","1783571","1802036","1823303","1844256","1864851","1883445","1902230","1920718"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0444::real,
+	4::integer,
+	7203.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.0004}'::real[],
+	NULL::real[],
+	'{0.0009649638}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3964","3629"}'::int4[],
+	E'{"1","77","150","224","302","367","433","498","566","636","710","784","865","941","1013","1088","1170","1244","1323","1388","1461","1536","1606","1672","1735","1809","1876","1952","2024","2098","2172","2244","2307","2379","2456","2534","2602","2673","2742","2818","2892","2971","3037","3111","3186","3257","3327","3396","3472","3543","3613","3687","3768","3845","3910","3981","4050","4116","4188","4251","4325","4393","4463","4541","4613","4685","4755","4830","4903","4980","5052","5126","5195","5262","5335","5402","5469","5534","5604","5673","5747","5823","5891","5960","6032","6112","6185","6259","6335","6407","6479","6552","6629","6696","6762","6836","6906","6982","7054","7128","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0441::real,
+	4::integer,
+	1054173.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.009495346}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"24","10492","20174","30656","40366","50491","61387","71217","82320","93176","103530","113999","124922","135328","145700","156238","168283","179107","189968","200308","210858","220931","230791","240825","252093","261999","273446","284421","294475","304990","315199","325963","336804","346964","358483","369478","379508","390126","400826","411839","423548","433723","444375","455042","465928","476227","487109","496816","507138","516971","528312","538979","549252","559578","569918","580340","590219","600402","612301","623316","633219","642905","653631","665000","674723","685655","695157","706546","716090","726191","735744","745583","756508","767077","776705","787088","798590","810484","820976","832448","843248","854009","864628","873989","883994","894860","905009","916085","924744","935185","945700","956390","965553","975624","987328","997741","1008137","1018620","1029054","1039248","1049982"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_store_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.045766667::real,
+	4::integer,
+	35.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.029033333, 0.0287, 0.028266666, 0.0282, 0.028066667, 0.028, 0.027966667, 0.027833333, 0.027766667, 0.027666667, 0.027666667, 0.0276, 0.0276, 0.0275, 0.027466666, 0.027433334, 0.027433334, 0.027366666, 0.027366666, 0.0273, 0.027233334, 0.027133333, 0.027066667, 0.027033333, 0.0269, 0.0269, 0.026833333, 0.026733333, 0.0267, 0.026633333, 0.026333334, 0.026066666, 0.026066666, 0.025666667, 0.0247}'::real[],
+	'{0.025343372}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"19","34","2","61","62","7","32","13","52","4","38","55","56","28","49","1","37","16","67","50","31","64","22","68","20","58","26","46","14","10","25","8","43","40","44"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.04413333::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0036666666, 0.0036666666, 0.0036333334, 0.0036333334, 0.0035333333, 0.0035, 0.0033666666, 0.0033666666}'::real[],
+	NULL::real[],
+	'{0.009066247}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"37","139","81","228","350","223","293","304"}'::int4[],
+	E'{"1","4","7","11","14","18","21","25","28","32","35","40","43","47","50","54","57","61","64","68","71","75","78","83","86","89","93","96","100","103","107","110","114","118","121","124","128","132","136","140","143","147","150","153","157","160","163","166","170","174","177","180","183","187","190","194","197","201","204","208","211","214","218","221","226","230","234","237","241","245","249","252","256","259","262","266","270","274","277","280","284","288","291","296","300","303","308","311","315","319","322","326","329","332","336","339","343","346","351","354","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_ticket_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	135837840.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.06078869}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"813","1375913","2727072","3857212","5016369","6156850","7386542","8690070","9789582","11044399","12265523","13510184","14717978","15785339","16975428","18197314","19442297","20772509","21903183","23100195","24331207","25452464","26678265","27922018","29143270","30353305","31671176","32953618","34109365","35253703","36385377","37447554","38717221","39999948","41154706","42417922","43652601","44968753","46342094","47459202","48642561","49683656","50998261","52288399","53487733","54680281","55833024","57017267","58237604","59472084","60696465","61996614","63179509","64401202","65651723","66926244","68011538","69269328","70341852","71528693","72651930","73713093","74849544","75928064","77033905","78162650","79324991","80585670","81761102","82828934","84032244","85334532","86494728","87598137","88860063","89922519","91069374","92276218","93495454","94722691","95959052","97146341","98399034","99566170","100766327","101898400","103223735","104414548","105602699","106825065","108029779","109174799","110420663","111591894","112817588","113975952","115181211","116399324","117672963","118888721","119999864"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+--
+-- Table: store_sales, Attribute: ss_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.045466665::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010833333, 0.010766666, 0.010766666, 0.010766666, 0.010633334, 0.0106, 0.010566667, 0.0104, 0.0104, 0.0104, 0.0104, 0.010366667, 0.010366667, 0.010366667, 0.0103, 0.010266666, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.0099, 0.009866667, 0.009833333, 0.0098, 0.009766666, 0.009766666, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.009666666, 0.009666666, 0.009666666, 0.009633333, 0.0096, 0.0096, 0.0096, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.009466667, 0.009433334, 0.0094, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009333333, 0.009266667, 0.0092, 0.0092, 0.0092, 0.009133333, 0.009133333, 0.009133333, 0.009133333, 0.0091, 0.0091, 0.0091, 0.0091, 0.0090666665, 0.0090666665, 0.0090333335, 0.009, 0.008966667, 0.008933334, 0.0089, 0.0089, 0.008833333, 0.008666666, 0.008633333, 0.0086, 0.008566666, 0.0084, 0.0084, 0.008366667, 0.008366667, 0.008233333, 0.008233333, 0.0081, 0.0079333335}'::real[],
+	'{0.0045824465}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"29","7","10","21","27","92","86","5","55","71","81","33","79","93","6","99","40","39","57","32","53","73","84","97","85","90","38","91","12","69","76","41","23","22","37","45","63","44","61","88","100","20","98","26","49","67","14","18","78","87","95","3","31","46","15","36","58","42","64","11","13","50","59","60","68","70","19","54","25","35","66","24","52","56","83","4","16","47","74","80","96","34","51","75","82","30","77","65","28","1","48","9","2","72","43","94","17","89","62","8"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0435::real,
+	6::integer,
+	9909.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.004772207}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"32.94","43.22","71.68","76.26","91.35","96.72"}'::numeric[],
+	E'{"1.00","1.97","3.01","4.10","5.06","6.04","7.00","8.01","9.01","9.96","10.88","11.91","12.82","13.84","14.95","15.91","16.85","17.91","18.92","19.94","20.89","22.01","23.08","24.06","25.02","26.03","26.96","27.89","28.91","29.93","30.90","31.93","32.96","33.91","34.98","35.96","36.94","37.90","38.81","39.70","40.61","41.67","42.74","43.73","44.66","45.63","46.59","47.53","48.55","49.54","50.48","51.56","52.62","53.42","54.39","55.28","56.33","57.36","58.37","59.23","60.15","61.15","62.19","63.21","64.16","65.22","66.31","67.27","68.29","69.31","70.23","71.24","72.24","73.25","74.22","75.12","76.09","77.07","78.06","79.07","80.05","81.10","82.08","83.09","84.06","85.12","86.17","87.18","88.23","89.18","90.13","91.20","92.19","93.19","94.14","95.07","95.98","96.91","97.92","98.92","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0447::real,
+	6::integer,
+	16808.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.0003, 0.0003, 0.0003, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667}'::real[],
+	NULL::real[],
+	'{-0.00067186705}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"27.24","7.02","96.36","105.63","17.20","33.52","39.04","40.68","48.96","59.81","68.69","76.24","87.92","99.16"}'::numeric[],
+	E'{"1.00","2.89","4.28","5.87","7.42","8.80","10.10","11.63","12.99","14.42","15.98","17.40","18.87","20.21","21.63","23.04","24.51","25.90","27.36","28.81","30.36","31.81","33.34","34.72","36.09","37.52","38.95","40.43","41.88","43.30","44.81","46.40","47.73","49.18","50.55","52.07","53.40","54.73","56.17","57.55","58.87","60.19","61.77","63.07","64.57","66.02","67.39","68.92","70.40","72.03","73.45","74.87","76.26","77.73","79.03","80.35","81.92","83.32","84.72","86.21","87.59","88.96","90.45","91.78","93.16","94.66","96.19","97.64","98.92","100.52","101.88","103.28","104.72","106.11","107.69","109.21","110.85","112.64","114.53","116.30","118.00","119.87","121.88","123.90","126.04","128.34","130.66","133.07","135.58","137.97","140.53","143.39","146.70","149.95","153.65","157.50","161.61","166.70","172.67","180.23","199.18"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.043866668::real,
+	6::integer,
+	11406.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.008633333, 0.00063333334, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667}'::real[],
+	NULL::real[],
+	'{0.00037045707}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","5.56","1.37","1.33","1.74","3.53","1.67","3.48","0.51","5.54","6.41","0.82","1.50","1.72","1.83","1.99","2.02","2.25","3.32","3.84","5.66","12.86","0.97","0.98","1.28","1.62","1.65","1.90","2.00","3.08","4.40","5.92","8.40","8.74","11.16","15.51","0.44","0.57","0.65","0.68","0.75","0.94","1.17","1.20","1.22","1.29","1.32","1.35","1.36","2.08","2.14","2.50","2.78","2.82","2.83","3.09","3.64","3.73","3.82","4.51","4.55","5.22","5.43","6.63","6.69","6.90","7.61","7.63","8.09","9.03","9.09","9.44","9.63","11.42","15.16","0.11","0.21","0.60","0.63","0.66","0.93","1.06","1.10","1.16","1.18","1.25","1.42","1.47","1.76","2.09","2.16","2.18","2.60","2.68","2.74","3.11","3.18","3.26","3.27","3.31"}'::numeric[],
+	E'{"0.01","0.50","1.00","1.49","2.01","2.44","2.89","3.38","3.80","4.27","4.73","5.13","5.65","6.12","6.56","7.05","7.48","8.02","8.51","9.01","9.57","10.13","10.69","11.20","11.77","12.34","12.88","13.44","14.06","14.61","15.26","15.88","16.54","17.11","17.71","18.35","19.04","19.73","20.46","21.14","21.86","22.67","23.36","24.08","24.87","25.77","26.56","27.30","28.12","28.99","29.85","30.74","31.71","32.63","33.58","34.48","35.42","36.45","37.56","38.53","39.65","40.76","41.86","43.05","44.18","45.37","46.57","47.77","49.08","50.38","51.70","53.17","54.47","55.96","57.34","58.84","60.52","62.13","63.82","65.63","67.20","69.11","71.20","73.12","75.38","77.56","79.86","82.27","85.02","87.88","90.64","93.54","97.22","101.21","105.84","110.61","116.50","123.46","132.30","145.64","193.12"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.045333333::real,
+	3::integer,
+	6760.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.7661}'::real[],
+	NULL::real[],
+	'{0.6438912}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","1.34","3.72","6.09","8.37","10.99","14.04","16.95","19.44","22.34","24.81","28.43","32.34","35.35","39.39","44.25","49.00","54.54","59.98","65.63","71.63","78.32","84.28","90.37","96.62","104.19","111.32","118.10","126.42","136.18","143.96","153.17","162.16","171.42","182.95","192.33","201.85","211.36","222.74","236.09","252.09","266.81","278.33","292.76","310.46","324.68","340.74","359.05","380.26","398.53","416.30","434.21","455.13","474.14","491.53","516.67","538.59","556.85","586.81","610.95","636.53","667.62","692.38","723.55","756.71","796.95","834.72","868.00","906.95","948.96","993.70","1033.87","1089.17","1132.81","1184.95","1228.29","1281.16","1347.98","1408.84","1480.92","1572.04","1643.21","1731.83","1830.90","1925.89","2022.22","2130.03","2281.99","2428.33","2573.26","2717.71","2913.34","3146.60","3438.96","3740.97","4126.94","4666.03","5274.03","6096.32","7082.14","12922.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.045333333::real,
+	6::integer,
+	119811.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0087, 0.00026666667, 0.00023333334, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.00332316}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","25.20","10.92","36.96","469.20"}'::numeric[],
+	E'{"0.27","8.61","16.80","24.36","33.50","42.56","50.49","61.05","71.40","82.38","93.84","106.14","118.17","131.32","144.00","157.78","172.64","188.16","203.84","220.80","236.84","255.08","271.45","288.48","308.34","327.28","345.73","367.84","387.02","408.00","432.63","453.75","480.22","504.24","530.66","558.80","588.24","616.30","644.76","674.50","704.16","734.58","766.92","802.75","838.24","871.04","910.52","945.76","983.29","1024.86","1063.30","1102.08","1147.38","1190.70","1237.47","1284.12","1331.00","1387.50","1440.24","1503.28","1554.80","1610.95","1676.49","1742.20","1808.00","1867.45","1933.08","2001.48","2087.67","2170.21","2251.53","2342.40","2428.20","2526.36","2617.12","2724.48","2827.24","2944.32","3046.35","3173.12","3294.25","3442.56","3588.09","3734.64","3902.60","4072.80","4240.57","4428.00","4642.32","4906.57","5147.50","5431.50","5743.00","6100.32","6469.35","6901.32","7510.60","8168.50","9050.41","10628.04","17738.88"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.044966668::real,
+	6::integer,
+	207111.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0051949597}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.08","33.20","56.42","79.36","97.98","121.59","144.80","167.70","191.00","218.46","244.03","270.55","299.76","327.80","355.32","384.30","414.52","442.20","475.83","508.95","544.25","578.25","612.36","650.43","688.35","727.92","765.38","803.60","837.20","874.56","916.09","960.94","1003.45","1044.66","1092.25","1140.48","1185.60","1238.61","1289.29","1337.70","1390.55","1444.40","1496.49","1548.16","1605.87","1662.12","1713.60","1764.63","1817.76","1875.30","1937.05","1999.50","2060.11","2128.60","2196.21","2259.76","2326.32","2396.25","2465.40","2539.24","2614.56","2685.00","2761.38","2840.04","2925.35","3015.87","3097.05","3179.52","3263.77","3343.96","3431.34","3528.32","3624.37","3716.85","3814.10","3920.27","4022.88","4127.23","4243.63","4356.48","4476.15","4597.05","4738.23","4865.40","5000.80","5143.91","5291.12","5444.00","5603.10","5773.32","5947.83","6145.55","6364.80","6594.77","6830.75","7087.20","7404.30","7745.95","8124.04","8664.15","9992.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.044166666::real,
+	7::integer,
+	281020.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.005409235}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.37","48.18","81.41","111.00","143.56","176.12","208.48","244.00","277.10","312.00","354.24","397.50","432.81","473.83","514.15","559.74","605.17","653.04","703.08","749.70","793.80","843.72","897.00","950.04","1005.84","1059.20","1111.86","1168.53","1220.78","1273.14","1335.78","1395.80","1464.48","1525.11","1588.62","1662.60","1733.62","1808.00","1876.80","1943.17","2017.47","2095.83","2176.23","2255.84","2332.80","2416.80","2500.54","2583.36","2660.40","2751.20","2841.54","2936.19","3028.06","3126.61","3219.72","3316.14","3407.04","3508.20","3613.50","3714.04","3820.32","3927.70","4045.88","4164.11","4286.55","4404.60","4526.64","4639.62","4772.80","4907.30","5047.20","5174.40","5313.60","5456.64","5608.32","5770.80","5925.96","6098.88","6277.32","6458.50","6637.23","6822.90","7017.40","7216.44","7423.52","7672.96","7894.12","8146.60","8427.82","8709.95","8969.40","9303.91","9642.60","10018.92","10424.34","10892.97","11484.75","12242.88","13182.40","14456.88","19415.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0449::real,
+	6::integer,
+	18471.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10456666, 0.0009, 0.00073333335, 0.00073333335, 0.0007, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00063333334, 0.00063333334, 0.00063333334, 0.00063333334, 0.00063333334, 0.0006, 0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.014879999}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.01","0.17","0.65","0.13","0.29","0.05","0.08","0.36","0.10","0.27","0.28","0.40","0.45","0.19","0.30","2.24","0.15","0.18","0.21","0.41","3.94","0.14","0.46","0.47","0.52","0.88","1.04","1.51","1.66","0.02","0.12","0.16","0.20","0.25","0.34","0.77","0.96","0.98","1.29","1.92","3.80","0.11","0.32","0.42","0.43","0.51","0.68","0.99","1.05","1.22","1.31","1.36","1.54","1.80","1.90","2.04","2.10","3.32","0.09","0.22","0.44","0.50","0.58","0.66","0.94","1.13","1.15","1.68","2.74","3.78","4.08","8.96","0.04","0.07","0.23","0.33","0.37","0.59","0.69","0.78","0.81","0.82","0.85","0.91","1.08","1.12","1.18","1.26","1.32","1.35","1.50","1.59","1.64","1.76","1.79","2.26","2.83","3.35","3.43"}'::numeric[],
+	E'{"0.03","0.74","1.20","1.60","2.01","2.39","2.72","3.10","3.50","3.90","4.30","4.72","5.16","5.57","6.04","6.50","7.03","7.58","8.18","8.74","9.36","9.98","10.62","11.27","12.01","12.69","13.39","14.17","14.94","15.73","16.52","17.47","18.36","19.22","20.18","21.05","22.15","23.17","24.17","25.34","26.50","27.68","28.91","30.07","31.25","32.68","34.20","35.59","37.26","38.92","40.45","42.33","44.13","45.79","47.82","49.94","51.93","54.20","56.44","58.78","61.05","63.96","66.70","69.47","72.63","75.56","78.68","82.11","85.62","89.37","92.68","96.79","100.78","105.67","110.09","114.97","120.82","125.97","132.10","138.64","145.86","152.49","159.87","168.58","177.12","186.59","196.23","208.25","220.55","235.45","251.96","267.62","288.25","309.58","335.43","364.88","405.05","457.89","534.84","648.41","1390.48"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.045333333::real,
+	3::integer,
+	6760.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.7661}'::real[],
+	NULL::real[],
+	'{0.6438912}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","1.34","3.72","6.09","8.37","10.99","14.04","16.95","19.44","22.34","24.81","28.43","32.34","35.35","39.39","44.25","49.00","54.54","59.98","65.63","71.63","78.32","84.28","90.37","96.62","104.19","111.32","118.10","126.42","136.18","143.96","153.17","162.16","171.42","182.95","192.33","201.85","211.36","222.74","236.09","252.09","266.81","278.33","292.76","310.46","324.68","340.74","359.05","380.26","398.53","416.30","434.21","455.13","474.14","491.53","516.67","538.59","556.85","586.81","610.95","636.53","667.62","692.38","723.55","756.71","796.95","834.72","868.00","906.95","948.96","993.70","1033.87","1089.17","1132.81","1184.95","1228.29","1281.16","1347.98","1408.84","1480.92","1572.04","1643.21","1731.83","1830.90","1925.89","2022.22","2130.03","2281.99","2428.33","2573.26","2717.71","2913.34","3146.60","3438.96","3740.97","4126.94","4666.03","5274.03","6096.32","7082.14","12922.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.045033332::real,
+	6::integer,
+	130231.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010733333}'::real[],
+	NULL::real[],
+	'{-0.003218649}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","5.14","10.18","16.30","21.88","28.60","36.24","44.10","51.49","60.06","68.70","77.69","87.72","97.58","108.51","119.68","131.13","142.74","154.70","167.30","180.87","194.66","210.49","225.68","242.00","258.44","273.14","288.96","307.68","325.44","342.37","363.00","380.16","400.43","423.00","444.15","468.72","492.00","519.68","544.00","572.40","600.96","629.30","656.70","686.28","718.06","749.00","782.88","817.80","854.72","893.10","930.83","967.59","1008.80","1050.42","1093.00","1135.33","1181.62","1229.40","1280.52","1326.28","1383.48","1439.88","1500.29","1556.02","1618.37","1682.20","1751.04","1818.15","1884.06","1955.88","2033.45","2126.88","2215.62","2305.35","2400.96","2495.65","2607.80","2725.97","2838.84","2961.00","3081.25","3215.94","3363.36","3525.20","3685.50","3870.99","4065.12","4264.36","4472.25","4715.82","5020.00","5297.49","5657.44","6056.08","6494.87","7012.56","7766.28","8648.46","10058.40","17738.88"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.04476667::real,
+	6::integer,
+	216373.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010666667, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0055286656}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","32.50"}'::numeric[],
+	E'{"0.04","5.34","10.64","16.84","22.78","29.76","37.54","45.88","53.55","63.01","71.53","81.22","91.04","101.48","113.40","124.84","136.79","148.47","160.74","174.09","189.27","202.53","219.10","235.75","252.63","270.30","284.97","302.27","321.39","339.01","359.73","379.11","399.51","420.01","443.22","467.14","491.68","517.50","543.21","569.64","598.99","628.01","657.79","689.15","718.44","753.62","785.05","818.47","856.64","895.72","934.06","972.23","1014.07","1056.37","1098.32","1143.65","1191.49","1240.73","1292.04","1341.11","1393.32","1450.62","1510.08","1566.98","1629.98","1689.68","1763.67","1840.23","1903.93","1975.54","2049.22","2126.92","2226.03","2316.79","2410.56","2506.52","2616.49","2727.26","2849.57","2970.38","3085.20","3217.68","3363.97","3517.49","3689.45","3858.39","4052.56","4254.30","4465.59","4690.92","4962.17","5234.70","5542.48","5925.61","6319.65","6827.42","7372.02","8128.19","9079.02","10544.85","18803.21"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.043933332::real,
+	6::integer,
+	164410.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00036666667, 0.0002}'::real[],
+	NULL::real[],
+	'{0.0071685645}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","-86.40"}'::numeric[],
+	E'{"-9756.88","-6515.41","-5668.87","-5123.34","-4724.97","-4368.00","-4064.06","-3808.62","-3576.47","-3373.46","-3174.31","-3012.09","-2859.44","-2725.70","-2593.63","-2458.24","-2337.30","-2214.00","-2107.00","-2001.96","-1904.70","-1816.40","-1727.86","-1642.55","-1561.33","-1494.48","-1420.30","-1356.48","-1294.21","-1224.96","-1162.20","-1101.58","-1048.46","-992.62","-942.72","-898.95","-853.76","-806.47","-765.12","-727.68","-693.00","-655.50","-623.42","-589.44","-557.05","-526.40","-495.72","-462.77","-435.73","-406.64","-378.40","-353.30","-328.97","-301.50","-278.13","-255.75","-233.87","-214.09","-195.96","-178.34","-162.31","-147.92","-132.24","-117.78","-104.00","-89.56","-76.54","-65.12","-54.20","-43.00","-32.46","-23.28","-14.28","-7.00","0.39","9.24","20.91","35.88","53.56","74.70","99.36","127.98","158.51","193.25","233.24","281.96","341.00","404.32","478.86","563.93","661.20","773.80","891.78","1050.06","1209.00","1410.30","1700.48","2034.00","2537.48","3429.36","8262.72"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1823.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0016, 0.0016, 0.0015333333, 0.0015, 0.0015, 0.0015, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666}'::real[],
+	NULL::real[],
+	'{-0.0030525422}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451524","2452255","2452593","2451546","2452243","2452632","2451179","2451491","2451545","2451176","2451487","2451860","2451866","2452271","2452626","2451154","2451534","2451536","2452228","2452236","2452592","2452603","2451135","2451495","2451871","2451887","2451901","2451910","2452267","2452605","2451053","2451121","2451177","2451537","2451539","2452220","2452229","2452241","2452261","2452617","2452621","2452630","2451122","2451142","2451143","2451144","2451169","2451174","2451490","2452225","2452234","2452245","2452582","2451150","2451156","2451410","2451505","2451510","2451527","2451543","2451867","2451873","2451881","2452219","2452227","2452248","2452262","2452265","2452272","2452624","2451124","2451129","2451145","2451159","2451161","2451165","2451512","2451532","2451544","2451858","2452247","2452249","2452252","2452266","2452277","2452585","2452589","2452591","2452610","2452612","2451094","2451134","2451139","2451155","2451157","2451166","2451171","2451181","2451521","2451522"}'::int4[],
+	E'{"2450816","2450841","2450870","2450898","2450927","2450953","2450978","2451005","2451030","2451041","2451052","2451067","2451078","2451090","2451104","2451115","2451127","2451140","2451158","2451173","2451198","2451225","2451253","2451279","2451305","2451336","2451363","2451388","2451405","2451418","2451431","2451444","2451456","2451468","2451480","2451494","2451504","2451516","2451529","2451542","2451574","2451599","2451625","2451654","2451681","2451709","2451736","2451761","2451773","2451785","2451798","2451811","2451824","2451835","2451849","2451857","2451872","2451883","2451893","2451902","2451912","2451938","2451969","2451995","2452023","2452052","2452082","2452108","2452130","2452142","2452153","2452165","2452176","2452188","2452200","2452213","2452226","2452240","2452256","2452270","2452289","2452315","2452345","2452373","2452401","2452429","2452455","2452480","2452497","2452509","2452522","2452534","2452547","2452559","2452571","2452584","2452597","2452607","2452619","2452633","2452642"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	72739.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0002}'::real[],
+	NULL::real[],
+	'{-0.004440563}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"61224"}'::int4[],
+	E'{"0","3453","5358","7271","8890","10655","12362","14210","15455","16483","17601","18731","20003","21248","22548","23694","24821","25793","26731","27644","28537","29469","30431","31334","32383","33161","33815","34512","35196","35909","36662","37414","38129","38856","39594","40332","41139","41826","42634","43309","43883","44435","44958","45430","45979","46461","47039","47768","48454","49168","49903","50684","51931","53162","54270","55196","56147","57080","57913","58603","59313","60034","60759","61432","62068","62610","63196","63765","64286","64834","65399","65944","66456","66942","67447","67990","68472","68929","69389","69801","70217","70674","71131","71595","72062","72552","73092","73643","74121","74642","75146","75708","76439","77167","77837","78531","79155","80293","81570","82687","86389"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.00033333333::real,
+	4::integer,
+	1933.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0014666667, 0.0013333333, 0.0013, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667}'::real[],
+	NULL::real[],
+	'{-0.0028389376}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451902","2451188","2451164","2451549","2452285","2451156","2451195","2451918","2451956","2452264","2452636","2452641","2451197","2451870","2452241","2451538","2451539","2452279","2452292","2452608","2452626","2452633","2451146","2451167","2451178","2451537","2451547","2451905","2451923","2452250","2452263","2451133","2451201","2451557","2451563","2451607","2451612","2451975","2451986","2452226","2452273","2452281","2452358","2452657","2451171","2451181","2451489","2451518","2451550","2451569","2451935","2451964","2451965","2451966","2451974","2452219","2452251","2452259","2452260","2452261","2452271","2452280","2452300","2452301","2452302","2452317","2452604","2452652","2452665","2451147","2451161","2451177","2451183","2451187","2451189","2451196","2451229","2451545","2451565","2451573","2451575","2451601","2451904","2451951","2451952","2452265","2452288","2452342","2452629","2452635","2452637","2452639","2452696","2451173","2451174","2451184","2451192","2451202","2451212","2451242"}'::int4[],
+	E'{"2450823","2450897","2450934","2450961","2450989","2451015","2451043","2451061","2451080","2451098","2451114","2451127","2451140","2451154","2451169","2451191","2451209","2451222","2451235","2451248","2451263","2451281","2451306","2451332","2451361","2451390","2451416","2451438","2451454","2451470","2451485","2451500","2451513","2451526","2451540","2451555","2451568","2451582","2451595","2451611","2451627","2451646","2451668","2451693","2451722","2451751","2451778","2451800","2451819","2451836","2451850","2451863","2451876","2451888","2451900","2451914","2451927","2451940","2451953","2451971","2451990","2452009","2452037","2452064","2452091","2452121","2452146","2452167","2452186","2452203","2452218","2452232","2452246","2452262","2452278","2452295","2452310","2452322","2452335","2452350","2452367","2452385","2452412","2452441","2452470","2452495","2452518","2452538","2452555","2452572","2452587","2452600","2452614","2452625","2452644","2452658","2452670","2452682","2452699","2452719","2452762"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	25062.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.0007646001}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1309","3001","4099","5413","8575","10591","14557","17821","19507","20473","22969","24061","25279","25891","27685"}'::int4[],
+	E'{"3","292","595","880","1169","1423","1683","1956","2282","2539","2800","3062","3343","3608","3865","4153","4415","4682","4951","5245","5505","5762","6071","6367","6655","6949","7232","7535","7831","8117","8386","8665","8928","9193","9470","9724","10001","10264","10546","10828","11122","11402","11708","11998","12271","12547","12823","13105","13399","13675","13977","14251","14527","14821","15112","15404","15715","16020","16304","16561","16846","17098","17353","17617","17892","18163","18434","18732","19039","19317","19609","19870","20149","20450","20749","21043","21305","21579","21881","22171","22460","22750","23029","23276","23536","23794","24084","24373","24664","24932","25236","25519","25793","26068","26349","26599","26899","27169","27447","27703","28000"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0005::real,
+	4::integer,
+	2118340.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0010770214}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"116","19276","39962","61407","85373","106315","126227","147006","167677","187188","207807","226047","246827","269215","286863","307913","329088","349611","369725","390185","410503","432212","454393","475658","496403","519145","539722","559383","580534","601568","623450","645203","665659","686268","708568","730472","751325","772013","790899","811688","835234","859298","877602","896824","916526","937382","958518","980789","1000789","1022926","1044299","1064876","1087128","1107756","1128946","1150087","1170021","1189394","1210544","1229439","1250913","1270764","1292927","1312446","1334616","1355684","1377519","1397078","1417253","1439187","1460077","1482246","1504744","1525557","1548534","1571550","1593101","1612385","1632941","1652821","1671352","1691730","1714302","1736611","1757116","1778569","1799839","1820986","1843004","1862949","1886606","1909295","1929403","1952006","1972435","1993425","2015871","2037659","2058030","2078476","2099961"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1963935.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.008824349}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"40","19928","41222","60907","80036","96922","115963","135857","155159","175803","193832","214446","233794","253659","271138","289757","310150","329469","349317","369098","389298","407426","427564","448714","467530","487468","506816","526861","546227","565019","583873","602430","621270","641783","661497","681303","700310","718758","737636","756383","774238","793788","810674","829641","848804","867427","886648","906085","926348","946633","965764","984667","1004930","1025614","1045598","1064240","1084145","1103410","1122730","1141053","1162951","1181651","1200809","1219112","1239681","1256860","1276450","1295516","1315122","1334158","1352740","1370260","1387732","1406685","1424904","1445396","1462767","1481762","1502206","1522443","1540631","1559362","1578315","1599220","1619332","1635595","1652747","1672436","1691569","1710869","1731393","1750861","1769679","1790304","1809446","1827792","1845980","1861792","1881771","1900390","1920682"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	7218.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.0033058901}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3781","4004","5987","61","843","1723","3981","4638","5516","6255"}'::int4[],
+	E'{"1","74","151","220","297","366","438","505","572","641","716","798","874","948","1023","1092","1157","1226","1295","1359","1442","1517","1582","1651","1718","1792","1861","1935","2012","2083","2154","2230","2301","2372","2434","2504","2576","2652","2724","2792","2863","2944","3013","3076","3151","3224","3294","3362","3441","3513","3581","3647","3726","3800","3878","3953","4022","4092","4172","4242","4311","4397","4466","4540","4612","4679","4750","4824","4901","4972","5042","5119","5194","5265","5338","5410","5486","5560","5636","5707","5777","5842","5916","5982","6054","6128","6200","6267","6337","6411","6487","6563","6634","6700","6776","6846","6915","6987","7054","7128","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.00043333333::real,
+	4::integer,
+	1052357.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0035874592}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"85","9940","19201","29062","39466","49793","60322","70621","81217","91226","101312","111021","121563","131884","142160","151553","162420","173225","183462","193550","204825","215954","226612","236859","247641","257974","268112","278524","289530","301367","312534","323713","334146","344753","354965","366093","376805","387572","399555","409543","419685","430267","441452","451787","461680","472204","482625","492470","503572","513596","523426","533872","543655","554311","565216","576083","586017","596802","607700","617077","626774","637067","646810","658305","668298","678578","689888","699650","709454","719802","731419","742750","753186","764659","775390","785925","795925","806880","817378","827664","838917","850289","860509","871551","882170","892610","902269","911835","922478","933542","944712","955041","966086","976281","986032","996335","1007079","1017272","1027779","1039161","1049977"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.00046666668::real,
+	4::integer,
+	2017265.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0043712403}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"132","20637","42180","65350","82849","103817","124318","145423","166944","187687","208737","230590","251949","273686","293387","311515","330800","353486","374240","393971","413452","433019","454488","476432","498011","518833","539886","561032","582486","602670","621844","644001","664886","685045","704748","725254","746493","768247","789025","809330","830506","851780","873145","893841","916134","939717","961138","980901","1000505","1021471","1041002","1061792","1082164","1105084","1127234","1147741","1168328","1188890","1211298","1233312","1255587","1277390","1297125","1318745","1339393","1359133","1378504","1398143","1419107","1441128","1464282","1484205","1506371","1531184","1554208","1572948","1594637","1616564","1637230","1658766","1679115","1701388","1723406","1741784","1760843","1783047","1803735","1827219","1849463","1870419","1891620","1911234","1930891","1951173","1973089","1994829","2016556","2037533","2057883","2079450","2099912"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	1696478.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.002879893}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"58","18440","37296","56770","75852","94757","113452","130704","151005","170386","188845","208340","228843","248582","267435","285987","306015","323298","341709","360888","379541","400412","418373","438856","457414","475601","496722","517639","535895","554469","574493","594102","613853","632766","651384","668989","687375","706348","726205","744691","763517","783257","803277","822267","842706","862226","882815","901593","921645","941476","960097","979312","997703","1019580","1040057","1057255","1076091","1095006","1112147","1132100","1151343","1170491","1188950","1206650","1225084","1243585","1261069","1279776","1298943","1318050","1338726","1357162","1375169","1394096","1413110","1433576","1450829","1470097","1488671","1509355","1530203","1549360","1567854","1587699","1610090","1629275","1648075","1668590","1688396","1707068","1725533","1743917","1762980","1780125","1799583","1819263","1838350","1859271","1880426","1901289","1920663"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.00033333333::real,
+	4::integer,
+	7200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.007957798}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1687","262","626","3196","3456","3820","5684","5796","5891","5987","6436","6562"}'::int4[],
+	E'{"1","76","145","212","285","352","423","496","571","640","719","798","867","940","1016","1091","1163","1231","1304","1381","1455","1523","1597","1669","1746","1814","1887","1962","2035","2099","2168","2246","2310","2377","2455","2530","2597","2668","2741","2817","2892","2966","3033","3103","3170","3247","3325","3396","3465","3541","3609","3678","3755","3821","3889","3959","4025","4088","4162","4242","4318","4386","4454","4527","4593","4658","4728","4800","4870","4940","5010","5077","5153","5225","5302","5373","5446","5510","5580","5652","5726","5799","5877","5947","6019","6099","6174","6247","6329","6399","6475","6552","6625","6697","6761","6831","6904","6984","7057","7129","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1114224.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.001420308}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"26","11309","20636","30995","41857","51685","61820","71405","82282","92581","103069","114250","123704","133498","144567","155732","164935","175559","186082","196700","207930","217367","227511","237781","248348","259679","269692","279097","289318","300619","311485","321268","331270","341882","352231","361830","372945","383382","393987","405239","415555","427032","438461","448473","459112","470359","481524","492717","502982","513710","524165","534333","544663","554875","565192","576567","586168","598386","608959","620175","629750","639772","650199","660474","671797","681920","692252","703223","713224","723069","733136","744467","754388","765063","775010","786658","796244","807059","817848","828650","839270","851099","861790","871850","883229","894821","905183","915481","925975","936732","947814","958254","967993","977342","988420","998860","1009253","1019245","1029913","1039907","1049935"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_web_page_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.00026666667::real,
+	4::integer,
+	172.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.012433333, 0.012266667, 0.012233334, 0.0122, 0.012133333, 0.012133333, 0.0121, 0.011833333, 0.0117, 0.011633334, 0.0116, 0.0114, 0.0114, 0.011366666, 0.011366666, 0.011166667, 0.0111, 0.0111, 0.0111, 0.011066667, 0.011, 0.011, 0.010966667, 0.010866666, 0.010866666, 0.0108, 0.010733333, 0.010666667, 0.010366667, 0.0101333335, 0.008866667, 0.0079, 0.0078, 0.0075333333, 0.0075, 0.0074333334, 0.0074, 0.0072333333, 0.0071666664, 0.0071333335, 0.0071333335, 0.0071, 0.0070666666, 0.0070666666, 0.007033333, 0.007033333, 0.007, 0.0069, 0.0069, 0.0068333335, 0.0068, 0.0067, 0.0067, 0.006666667, 0.0066333334, 0.0064666667, 0.0063, 0.0061666667, 0.0061, 0.0056666667, 0.005433333, 0.0054, 0.0052, 0.0052, 0.0051666666, 0.005133333, 0.0051, 0.0051, 0.0050666668, 0.0050666668, 0.0050333333, 0.0050333333, 0.0049666665, 0.0049666665, 0.0049333335, 0.0049333335, 0.0049333335, 0.0049333335, 0.0049, 0.004833333, 0.004833333, 0.004833333, 0.0048, 0.0048, 0.004766667, 0.0047, 0.0047, 0.0047, 0.0046666665, 0.0046666665, 0.0046666665, 0.0046333335, 0.0046333335, 0.0046333335, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667}'::real[],
+	NULL::real[],
+	'{0.0037705055}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"31","25","103","145","7","163","109","49","151","115","157","55","97","73","169","37","61","79","127","172","91","121","139","1","85","13","67","43","19","133","122","44","116","152","74","68","128","80","26","38","164","2","98","170","62","86","134","32","146","50","92","56","104","20","158","8","140","110","14","130","129","57","89","136","29","87","113","135","112","142","75","99","17","106","35","64","69","125","33","15","46","82","88","155","141","11","39","154","45","83","117","9","77","160","27","59","63","81","94","118"}'::int4[],
+	E'{"3","3","4","5","6","10","12","16","18","21","22","23","24","28","30","34","40","40","41","47","47","51","52","52","53","54","58","65","65","70","71","71","76","76","84","93","93","95","100","100","101","105","107","107","111","114","119","120","123","124","126","131","132","137","138","143","144","147","148","149","150","153","156","159","161","162","165","166","167","167","171","171"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_web_site_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	32.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.060833335, 0.059366666, 0.058766667, 0.0585, 0.0584, 0.0576, 0.0549, 0.036, 0.0357, 0.034733333, 0.034666665, 0.034433335, 0.025, 0.0247, 0.024433333, 0.0242, 0.0242, 0.024066666, 0.024033334, 0.023866666, 0.023566667, 0.023533333, 0.023266668, 0.023166666, 0.0231, 0.022766666, 0.022666667, 0.013133333, 0.012033333, 0.011566667, 0.011566667, 0.010933333}'::real[],
+	'{0.04239957}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"31","7","32","19","1","25","13","2","14","8","26","20","28","22","4","21","23","27","3","9","16","10","17","15","11","5","29","6","24","12","30","18"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_mode_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	20.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0519, 0.05183333, 0.050966665, 0.050866667, 0.050633334, 0.050566666, 0.050533332, 0.050333332, 0.049933333, 0.049933333, 0.049933333, 0.049833335, 0.049833335, 0.0496, 0.049433332, 0.049233332, 0.0488, 0.0488, 0.048466668, 0.0482}'::real[],
+	'{0.056176268}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"11","4","17","19","16","5","8","12","6","7","18","2","10","15","9","20","1","3","13","14"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_warehouse_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	5.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.20156667, 0.20043333, 0.19946666, 0.19943333, 0.19873333}'::real[],
+	'{0.19803289}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","4","1","5","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0037666666, 0.0037, 0.0035333333, 0.0035333333, 0.0035}'::real[],
+	NULL::real[],
+	'{0.005415437}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"169","252","72","118","335"}'::int4[],
+	E'{"1","4","7","11","15","19","22","26","29","33","36","39","43","47","51","54","58","61","65","68","71","76","79","83","86","89","93","96","100","103","107","110","114","117","122","125","129","132","136","139","143","146","150","153","157","161","164","168","173","176","180","183","187","190","193","197","200","204","208","211","215","218","222","225","229","233","236","240","244","247","251","255","259","262","266","269","273","276","279","283","287","290","294","297","300","304","308","311","315","318","322","325","329","332","337","340","344","347","351","354","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_order_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	31567772.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.06999581}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"121","317641","648578","945597","1288393","1573610","1860492","2157681","2459791","2761260","3028976","3321440","3616466","3914756","4237831","4544558","4833953","5074651","5373885","5669291","6007647","6291071","6582751","6873797","7171514","7488211","7794326","8082653","8395928","8704266","9030833","9316184","9652205","9924686","10207036","10507877","10826653","11124316","11413852","11700753","11996463","12275214","12553434","12843505","13133657","13432219","13722004","14024091","14320895","14620641","14953137","15244476","15539965","15844103","16163890","16449629","16748023","17025956","17343876","17630387","17939341","18239124","18538613","18878347","19178480","19467260","19779045","20065269","20381326","20712670","20992673","21280690","21613312","21911183","22191172","22482391","22796790","23114702","23395001","23716661","24042960","24340548","24628420","24894268","25221472","25528346","25827723","26138822","26441040","26745092","27033424","27319988","27614893","27924604","28205457","28532777","28829016","29120974","29422245","29678171","29997708"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+--
+-- Table: web_sales, Attribute: ws_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0117, 0.011633334, 0.0113, 0.0111, 0.011066667, 0.010933333, 0.010933333, 0.0109, 0.0109, 0.0109, 0.010833333, 0.0108, 0.010766666, 0.0107, 0.010666667, 0.010566667, 0.010466667, 0.010466667, 0.0104, 0.010366667, 0.010366667, 0.010333333, 0.0103, 0.010266666, 0.010266666, 0.010266666, 0.010233333, 0.010233333, 0.010233333, 0.0102, 0.0101666665, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101333335, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.01, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.0099, 0.0099, 0.009866667, 0.009866667, 0.009866667, 0.009833333, 0.0098, 0.0098, 0.009766666, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.0097, 0.0097, 0.009666666, 0.009633333, 0.0096, 0.0096, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.009466667, 0.009466667, 0.0094, 0.0094, 0.0094, 0.009366667, 0.009366667, 0.009366667, 0.009333333, 0.009266667, 0.009233333, 0.0092, 0.009133333, 0.009133333, 0.009, 0.008933334, 0.008666666}'::real[],
+	'{0.014699079}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"55","56","49","74","6","69","80","42","53","76","82","93","23","10","41","7","26","61","70","73","90","68","40","58","72","78","39","59","71","2","21","34","17","54","84","8","22","24","38","60","75","77","29","33","47","95","96","98","18","52","66","3","64","15","31","83","5","57","87","13","36","67","9","37","79","4","46","1","45","91","92","11","97","30","50","81","43","16","44","48","85","25","100","12","63","20","32","86","19","27","99","35","89","62","65","28","51","14","88","94"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0004::real,
+	6::integer,
+	9928.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.007165513}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"25.53","30.19","51.31","53.30","55.63","60.00","60.37","72.31","83.48","87.79"}'::numeric[],
+	E'{"1.00","2.00","3.01","3.99","5.01","5.98","6.90","7.81","8.78","9.77","10.82","11.75","12.73","13.64","14.64","15.70","16.68","17.70","18.55","19.52","20.51","21.47","22.49","23.60","24.61","25.59","26.60","27.68","28.73","29.69","30.74","31.63","32.62","33.59","34.69","35.74","36.73","37.59","38.60","39.62","40.68","41.65","42.59","43.49","44.44","45.41","46.35","47.34","48.33","49.28","50.23","51.18","52.17","53.17","54.21","55.20","56.12","57.20","58.17","59.12","60.16","61.11","62.13","63.13","64.04","65.08","66.03","66.99","67.92","69.02","69.96","71.00","71.88","72.93","73.95","74.98","76.06","77.09","78.09","79.05","79.99","81.05","82.06","83.02","84.06","85.19","86.28","87.20","88.17","89.18","90.18","91.03","92.00","92.96","94.05","94.97","95.97","96.93","97.94","98.99","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.00026666667::real,
+	6::integer,
+	23431.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.0003, 0.00026666667}'::real[],
+	NULL::real[],
+	'{-0.011709301}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"12.66","82.70","21.34"}'::numeric[],
+	E'{"1.11","3.63","5.56","7.34","9.01","10.72","12.60","14.50","16.23","17.89","19.83","21.55","23.30","25.17","26.92","28.63","30.25","31.84","33.78","35.57","37.56","39.36","41.23","42.89","44.61","46.36","48.07","50.03","51.95","53.80","55.48","57.36","59.16","60.92","62.83","64.68","66.48","68.14","69.79","71.63","73.63","75.51","77.07","78.85","80.80","82.62","84.47","86.12","88.00","89.88","91.57","93.44","95.26","97.24","99.03","100.89","102.79","104.74","106.47","108.50","110.28","112.13","114.15","116.34","118.35","120.77","122.81","124.89","127.28","129.50","131.92","134.57","136.88","139.32","142.07","144.61","147.18","150.06","152.87","155.83","158.87","161.99","165.25","168.54","172.12","175.74","179.09","183.39","187.67","192.09","197.29","201.65","207.10","212.73","218.60","225.49","232.53","240.48","251.38","266.95","296.85"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.00036666667::real,
+	6::integer,
+	14531.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0104, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.0046185157}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","2.06","2.70","3.03","3.83","3.87","0.80","0.94","3.04","4.70","5.59","11.09","0.70","0.89","1.17","1.28","1.33","1.55","1.81","2.13","2.80","3.51","3.68","3.75","3.77","4.11","4.41","6.03","15.17","0.41","0.72","0.86","1.12","1.21","1.44","1.66","2.24","2.46","2.92","3.38","3.40","3.43","4.23","4.64","4.98","5.48","5.60","5.68","6.12","6.37","6.49","7.58","8.47","11.40","15.80","0.30","0.66","0.71","1.14","1.18","1.32","1.49","1.53","1.70","1.89","2.03","2.05","2.22","2.37","2.43","2.52","2.53","2.78","2.82","2.87","2.88","3.25","3.61","3.67","3.71","3.94","3.95","4.17","4.22","4.59","4.82","4.91","5.07","5.19","5.24","5.64","5.70","6.11","6.53","6.57","6.95","7.00","7.73","7.84","7.99"}'::numeric[],
+	E'{"0.01","0.60","1.11","1.64","2.20","2.74","3.31","3.91","4.48","5.09","5.63","6.17","6.81","7.45","8.09","8.66","9.30","9.96","10.52","11.12","11.75","12.44","13.09","13.82","14.54","15.25","15.99","16.72","17.50","18.22","19.04","19.87","20.70","21.43","22.29","23.23","24.09","25.02","25.92","26.85","27.82","28.75","29.71","30.71","31.75","32.78","33.78","34.80","35.93","37.02","38.14","39.29","40.43","41.60","42.81","44.07","45.33","46.59","47.86","49.28","50.73","52.22","53.69","55.11","56.86","58.38","60.03","61.68","63.22","65.10","66.78","68.62","70.35","72.19","74.30","76.43","78.67","81.00","83.19","85.26","87.83","90.51","93.08","95.96","98.78","102.09","105.42","109.06","112.87","116.26","120.47","125.09","130.89","136.72","143.90","151.28","160.21","170.24","184.92","205.80","292.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.00023333334::real,
+	6::integer,
+	143461.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.008966667, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0031384944}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","47.60","333.00"}'::numeric[],
+	E'{"0.11","11.18","20.44","31.11","41.86","52.90","64.50","75.24","88.16","100.08","113.88","127.60","141.90","158.13","176.97","194.72","211.91","230.04","247.80","270.20","292.80","314.96","336.26","358.72","384.84","412.08","437.64","462.84","489.06","516.88","547.36","574.47","607.20","636.57","669.28","702.30","740.88","777.49","815.40","855.00","891.48","929.25","969.54","1014.26","1058.88","1106.04","1154.78","1202.30","1251.81","1305.20","1355.86","1412.46","1469.43","1528.56","1594.50","1659.35","1728.00","1792.70","1862.70","1933.38","2005.02","2079.36","2157.40","2242.56","2326.52","2413.80","2503.90","2604.75","2707.31","2815.80","2923.56","3023.16","3143.36","3267.04","3403.08","3542.86","3676.34","3816.00","3975.42","4122.84","4289.29","4480.63","4684.35","4859.40","5062.32","5306.40","5536.80","5796.00","6095.70","6444.80","6772.48","7170.48","7599.34","8105.58","8650.46","9275.07","10054.69","11049.02","12248.28","14374.90","25989.60"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	24::smallint,
+	False::boolean,
+	0.00033333333::real,
+	6::integer,
+	145118.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0104, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-3.1174983e-05}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","42.12","43.56"}'::numeric[],
+	E'{"0.15","11.55","21.09","31.38","41.40","52.47","63.68","75.30","87.36","102.00","115.28","130.23","143.98","161.58","177.08","195.03","212.64","231.77","250.56","270.60","291.64","313.31","336.44","359.92","382.11","408.00","433.65","460.80","487.06","515.16","541.38","569.88","600.62","631.67","663.75","696.96","733.08","770.99","809.00","848.70","887.04","930.69","971.28","1008.54","1054.04","1100.44","1151.97","1201.56","1252.10","1308.53","1366.40","1428.45","1484.64","1537.62","1599.40","1660.56","1730.20","1807.20","1873.92","1944.84","2025.30","2097.54","2180.70","2264.22","2351.00","2447.28","2539.20","2636.70","2733.72","2834.16","2948.78","3067.62","3174.24","3287.79","3403.35","3526.74","3663.90","3815.55","3966.90","4120.92","4294.76","4473.13","4690.56","4881.66","5088.60","5302.54","5533.92","5818.56","6094.50","6392.75","6752.16","7092.90","7519.73","7968.00","8494.71","9116.10","9877.56","10865.55","12247.37","14678.04","25048.32"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	25::smallint,
+	False::boolean,
+	6.666667e-05::real,
+	6::integer,
+	196312.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0027050157}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.93","35.43","56.70","76.82","96.60","119.36","142.52","164.70","188.88","216.20","242.60","269.10","293.82","318.16","349.23","379.35","408.51","439.04","467.04","497.98","532.65","566.68","603.20","640.29","677.73","713.32","749.62","785.46","825.12","866.00","906.84","950.49","991.20","1035.40","1086.15","1131.19","1176.84","1221.96","1272.15","1321.00","1365.67","1417.72","1474.75","1528.74","1580.92","1635.13","1688.70","1744.40","1798.35","1854.56","1916.24","1981.60","2043.72","2105.60","2172.12","2249.94","2313.36","2380.16","2454.80","2530.80","2606.81","2680.56","2757.50","2832.83","2910.27","2989.11","3068.24","3147.96","3230.25","3327.77","3416.49","3506.28","3596.71","3686.50","3790.16","3884.76","3987.72","4089.55","4193.84","4304.25","4429.44","4544.01","4671.15","4795.30","4936.88","5074.40","5225.22","5382.29","5548.20","5722.02","5905.20","6111.16","6317.28","6532.92","6787.56","7078.66","7384.50","7726.50","8117.00","8641.90","9964.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	26::smallint,
+	False::boolean,
+	0.00046666668::real,
+	7::integer,
+	373627.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0056457715}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3.82","64.44","101.53","139.08","181.44","220.10","260.15","300.40","347.16","399.06","442.80","490.98","543.49","592.36","645.05","702.61","756.24","813.24","866.12","923.12","986.70","1051.75","1114.12","1180.48","1241.10","1306.88","1373.56","1443.48","1522.30","1594.02","1668.20","1759.04","1834.80","1908.80","1995.12","2087.00","2170.48","2274.40","2365.65","2454.60","2553.48","2645.06","2748.90","2856.00","2958.12","3067.00","3175.68","3276.80","3382.95","3504.28","3617.46","3732.75","3852.12","3975.75","4098.27","4220.40","4355.04","4483.16","4613.12","4751.70","4888.73","5040.00","5184.62","5346.00","5487.69","5630.85","5786.64","5954.61","6113.82","6291.90","6477.02","6674.57","6870.24","7079.40","7274.74","7502.88","7699.20","7915.05","8155.70","8392.50","8646.08","8912.73","9191.07","9444.42","9740.49","10052.91","10348.48","10732.50","11116.80","11510.34","11983.48","12501.83","13062.54","13645.80","14316.72","15042.00","15921.12","16966.66","18501.25","20712.09","29685.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	27::smallint,
+	False::boolean,
+	0.00033333333::real,
+	6::integer,
+	21995.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10896666, 0.00066666666, 0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667}'::real[],
+	NULL::real[],
+	'{0.004573461}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.35","0.50","2.16","0.22","0.26","0.34","1.08","1.53","0.37","0.46","0.52","0.57","0.92","2.29","0.03","0.09","0.12","0.21","0.42","0.43","0.60","0.75","0.04","0.07","0.28","0.32","0.36","0.78","0.87","1.16","1.94","2.24","2.35","3.04","3.72","5.24","0.11","0.27","0.39","0.48","0.53","0.56","0.58","0.69","0.90","1.02","1.07","1.18","1.44","1.72","2.20","2.67","4.41","0.06","0.16","0.25","0.38","0.47","0.77","0.79","0.85","1.01","1.04","1.19","1.23","1.78","1.90","1.91","1.92","2.21","2.60","2.94","4.33","5.60","0.02","0.08","0.18","0.19","0.23","0.24","0.30","0.31","0.49","0.51","0.54","0.55","0.66","0.67","0.81","0.93","1.00","1.14","1.42","1.45","1.56","1.80","1.88","2.26","2.50"}'::numeric[],
+	E'{"0.01","0.83","1.34","1.75","2.23","2.69","3.10","3.49","3.97","4.43","4.88","5.35","5.90","6.43","7.00","7.69","8.38","8.95","9.70","10.49","11.20","11.89","12.64","13.48","14.34","15.18","16.14","16.99","18.05","19.01","19.99","21.08","22.13","23.33","24.48","25.75","26.99","28.33","29.92","31.37","32.94","34.59","36.09","37.92","39.69","41.47","43.32","45.30","47.20","48.97","50.94","53.17","55.40","57.80","60.19","62.89","65.72","68.28","71.23","74.17","77.49","81.04","84.54","88.21","91.73","95.71","100.03","104.60","109.56","114.83","119.85","125.13","131.38","137.60","144.21","150.45","157.35","164.05","171.91","179.70","189.75","199.15","211.02","222.05","234.00","246.12","259.74","274.59","291.64","309.69","330.12","352.06","377.91","410.73","445.30","487.66","545.67","620.87","718.11","874.66","2139.82"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	28::smallint,
+	False::boolean,
+	0.00043333333::real,
+	3::integer,
+	6981.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.8047}'::real[],
+	NULL::real[],
+	'{0.6524823}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.07","2.81","5.16","8.29","11.57","14.98","18.25","22.17","25.74","29.25","33.46","38.75","43.09","47.74","52.23","58.18","63.93","69.06","75.54","81.43","90.24","97.41","105.00","112.34","119.93","128.94","139.96","150.39","161.12","170.13","179.08","190.02","204.24","216.80","230.79","242.88","256.72","269.70","285.28","299.98","321.93","337.96","359.92","379.16","398.56","411.26","434.53","456.18","480.99","503.11","534.41","559.69","587.89","615.55","642.62","675.15","706.02","738.29","769.44","805.37","834.44","867.90","910.13","947.74","994.63","1042.05","1081.01","1133.06","1191.03","1244.46","1291.32","1335.46","1389.96","1451.73","1524.48","1590.31","1679.40","1745.45","1825.78","1907.96","2007.12","2097.34","2207.59","2313.09","2431.84","2586.43","2750.05","2882.04","3053.86","3220.08","3468.52","3726.47","4048.99","4401.10","4748.00","5156.34","5788.23","6391.13","7477.72","9404.42","23044.45"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_ship_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=29;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	29::smallint,
+	False::boolean,
+	0.00026666667::real,
+	6::integer,
+	83043.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.020966666, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.006589469}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","450.80","10.92","48.40","68.40","79.20","93.60","113.40","142.80","6.72","9.18","15.84","16.80","23.10","32.40","37.80","38.22","52.80","84.00","105.30","106.26","111.60","126.00","131.04","143.04","184.80","198.00","216.72","305.76","333.00","369.60"}'::numeric[],
+	E'{"0.12","6.44","12.04","17.91","23.85","29.60","36.11","42.78","49.62","56.16","63.60","71.04","78.89","87.72","96.00","104.00","113.54","123.20","133.92","145.52","155.25","165.02","176.80","189.20","201.63","213.48","226.80","240.50","253.76","267.85","282.72","298.89","316.10","330.25","346.00","363.00","380.52","400.32","419.76","438.40","457.56","477.96","499.20","523.27","545.37","568.70","592.32","616.00","643.86","672.10","699.48","723.24","752.40","785.46","813.93","846.30","879.06","914.50","948.00","983.84","1020.80","1057.50","1097.25","1140.48","1180.20","1229.80","1277.46","1323.70","1377.74","1434.40","1494.96","1555.07","1608.18","1672.32","1736.04","1799.16","1871.10","1948.48","2020.46","2099.31","2180.40","2270.40","2362.56","2458.14","2562.12","2692.80","2810.50","2931.74","3077.75","3238.31","3432.00","3613.44","3833.20","4076.73","4350.06","4641.78","5042.73","5561.25","6238.65","7336.85","12822.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=30;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	30::smallint,
+	False::boolean,
+	0.00043333333::real,
+	6::integer,
+	155462.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0125, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0023643773}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","43.56"}'::numeric[],
+	E'{"0.06","6.90","13.40","20.67","28.47","35.91","44.46","53.53","63.00","73.44","83.29","95.48","107.88","119.93","132.34","144.75","160.46","175.10","190.14","206.83","222.10","239.84","258.46","275.49","294.81","315.96","336.50","358.36","379.82","403.62","429.78","456.00","481.00","507.99","534.40","561.61","589.38","619.65","651.00","683.82","717.57","755.54","794.30","830.96","872.19","911.09","954.18","992.44","1035.44","1083.95","1133.73","1186.24","1242.02","1296.12","1352.96","1411.83","1470.70","1528.24","1597.05","1662.45","1734.44","1814.25","1880.05","1954.56","2034.12","2110.08","2198.27","2289.76","2377.50","2475.02","2583.69","2686.32","2791.36","2899.80","3029.56","3156.05","3271.45","3395.25","3526.10","3668.35","3836.05","4007.85","4182.57","4382.49","4602.96","4828.07","5062.08","5308.86","5595.68","5910.43","6219.45","6596.00","7000.70","7489.02","8014.44","8603.82","9384.00","10412.72","11672.78","14217.46","24307.65"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=31;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	31::smallint,
+	False::boolean,
+	0.0003::real,
+	6::integer,
+	246002.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.012466666, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0024806631}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","57.28"}'::numeric[],
+	E'{"0.06","7.24","14.07","21.63","29.77","37.41","46.45","56.03","66.38","76.71","87.19","99.41","112.52","125.57","138.96","151.61","167.50","182.92","198.36","216.24","231.78","251.32","269.52","288.70","306.76","329.56","350.90","374.93","397.02","422.18","449.02","474.60","501.75","531.09","559.18","587.44","616.28","646.64","680.44","714.49","750.33","786.11","828.41","870.48","912.34","955.22","997.24","1039.57","1083.93","1132.88","1186.06","1237.31","1299.09","1355.29","1409.04","1474.72","1532.54","1592.67","1668.97","1738.60","1815.18","1890.75","1969.95","2046.13","2120.47","2201.72","2290.88","2394.32","2487.04","2585.21","2701.06","2805.79","2915.24","3036.02","3164.89","3298.38","3422.94","3549.84","3672.00","3832.97","4016.75","4182.78","4379.44","4577.43","4811.80","5061.31","5307.67","5555.95","5845.41","6173.76","6521.98","6885.89","7318.05","7810.46","8377.41","8999.04","9828.90","10854.91","12167.98","14819.83","25915.60"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_ship
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=32;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	32::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	301791.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004}'::real[],
+	NULL::real[],
+	'{-0.0042563225}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.15","26.90","47.27","66.00","87.66","110.70","130.90","153.36","177.10","200.26","226.76","251.37","278.08","304.01","330.99","360.93","391.74","422.88","454.10","486.85","518.42","554.54","589.68","627.00","662.74","700.56","740.52","781.44","822.39","863.04","903.00","950.37","1000.58","1042.83","1092.42","1141.32","1193.41","1249.05","1308.51","1363.96","1424.64","1479.06","1542.09","1608.99","1672.64","1734.00","1802.29","1875.28","1951.50","2031.12","2099.65","2168.25","2252.68","2350.87","2431.91","2518.02","2615.34","2697.47","2798.23","2897.37","3002.40","3098.34","3202.68","3308.00","3423.75","3542.37","3654.66","3775.98","3909.42","4028.66","4167.30","4309.90","4464.88","4615.84","4766.58","4937.48","5114.56","5268.48","5449.86","5643.55","5859.42","6093.48","6323.40","6589.80","6865.04","7151.04","7471.75","7798.48","8167.15","8545.18","8940.05","9403.24","9923.00","10538.58","11210.00","12020.74","12946.34","14134.36","15809.06","18879.36","36064.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_ship_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=33;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	33::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	580101.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004}'::real[],
+	NULL::real[],
+	'{-0.0042436747}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.15","27.32","48.14","67.61","90.21","112.88","134.60","157.01","181.53","205.08","232.37","257.90","285.99","310.90","338.12","369.71","401.62","432.71","466.15","498.29","532.67","568.73","606.20","644.59","677.83","716.94","756.42","802.49","841.36","885.36","929.11","973.55","1022.68","1069.26","1124.40","1170.12","1225.33","1284.57","1342.88","1398.12","1459.13","1514.68","1583.89","1648.82","1714.40","1780.42","1851.90","1924.20","2000.32","2078.12","2156.48","2230.86","2317.75","2412.28","2495.80","2582.42","2677.84","2771.12","2874.03","2977.91","3073.79","3182.59","3288.45","3403.98","3512.75","3630.83","3761.65","3884.79","4011.93","4143.91","4277.61","4436.91","4583.20","4733.60","4884.95","5069.66","5251.05","5427.69","5605.76","5797.65","6025.63","6250.68","6502.49","6751.35","7071.69","7353.10","7674.41","8024.66","8431.89","8815.18","9204.22","9715.49","10211.19","10847.31","11539.04","12347.17","13354.05","14622.68","16369.05","19567.99","38203.82"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=34;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	34::smallint,
+	False::boolean,
+	0.0::real,
+	6::integer,
+	206397.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.009154078}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"-9828.00","-6282.88","-5353.36","-4759.04","-4327.14","-3980.40","-3689.38","-3415.01","-3200.70","-2979.08","-2776.62","-2608.96","-2449.44","-2301.84","-2164.10","-2041.05","-1931.67","-1824.00","-1713.27","-1605.45","-1519.20","-1432.56","-1351.42","-1271.98","-1193.64","-1123.08","-1053.59","-994.98","-939.75","-874.80","-825.28","-773.60","-726.24","-683.34","-636.68","-597.28","-559.37","-523.79","-486.00","-449.68","-416.64","-383.24","-353.70","-325.01","-296.56","-271.44","-246.81","-222.48","-199.76","-177.30","-156.21","-138.71","-119.47","-102.79","-85.56","-72.32","-58.00","-46.02","-34.44","-22.62","-11.88","-1.54","7.80","20.24","33.81","49.02","66.06","87.48","111.15","138.51","166.66","197.05","235.56","273.56","316.31","364.32","415.57","472.36","537.60","604.77","677.15","764.42","854.28","951.99","1064.31","1176.00","1306.32","1449.60","1614.67","1788.28","1984.00","2213.82","2467.72","2782.77","3119.84","3508.34","4027.92","4724.10","5672.52","7345.81","15055.16"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+-- 
+-- Query text
+-- 
+ set search_path=cte_bug,public;
+ set gp_cte_sharing = on;
+ explain(costs off)
+ with year_total as (
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum(((ss_ext_list_price-ss_ext_wholesale_cost-ss_ext_discount_amt)+ss_ext_sales_price)/2)
+ year_total
+        ,'s' sale_type
+  from cte_bug.customer
+      ,cte_bug.store_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = ss_customer_sk
+    and ss_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+  union all
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum((((cs_ext_list_price-cs_ext_wholesale_cost-cs_ext_discount_amt)+cs_ext_sales_price)/2)
+ ) year_total
+        ,'c' sale_type
+  from cte_bug.customer
+      ,cte_bug.catalog_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = cs_bill_customer_sk
+    and cs_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+ union all
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum((((ws_ext_list_price-ws_ext_wholesale_cost-ws_ext_discount_amt)+ws_ext_sales_price)/2)
+ ) year_total
+        ,'w' sale_type
+  from cte_bug.customer
+      ,cte_bug.web_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = ws_bill_customer_sk
+    and ws_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+          )
+   select  
+                   t_s_secyear.customer_id
+                  ,t_s_secyear.customer_first_name
+                  ,t_s_secyear.customer_last_name
+                  ,t_s_secyear.customer_login
+  from year_total t_s_firstyear
+      ,year_total t_s_secyear
+      ,year_total t_c_firstyear
+      ,year_total t_c_secyear
+      ,year_total t_w_firstyear
+      ,year_total t_w_secyear
+  where t_s_secyear.customer_id = t_s_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_c_secyear.customer_id
+    and t_s_firstyear.customer_id = t_c_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_w_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_w_secyear.customer_id
+    and t_s_firstyear.sale_type = 's'
+    and t_c_firstyear.sale_type = 'c'
+    and t_w_firstyear.sale_type = 'w'
+    and t_s_secyear.sale_type = 's'
+    and t_c_secyear.sale_type = 'c'
+    and t_w_secyear.sale_type = 'w'
+    and t_s_firstyear.dyear =  2001
+    and t_s_secyear.dyear = 2001+1
+    and t_c_firstyear.dyear =  2001
+    and t_c_secyear.dyear =  2001+1
+    and t_w_firstyear.dyear = 2001
+    and t_w_secyear.dyear = 2001+1
+    and t_s_firstyear.year_total > 0
+    and t_c_firstyear.year_total > 0
+    and t_w_firstyear.year_total > 0
+    and case when t_c_firstyear.year_total > 0 then
+ t_c_secyear.year_total / t_c_firstyear.year_total else null end > case
+ when t_s_firstyear.year_total > 0 then t_s_secyear.year_total /
+ t_s_firstyear.year_total else null end
+    and case when t_c_firstyear.year_total > 0 then
+ t_c_secyear.year_total / t_c_firstyear.year_total else null end > case
+ when t_w_firstyear.year_total > 0 then t_w_secyear.year_total /
+ t_w_firstyear.year_total else null end
+  order by t_s_secyear.customer_id
+          ,t_s_secyear.customer_first_name
+          ,t_s_secyear.customer_last_name
+          ,t_s_secyear.customer_login
+ limit 100;
+                                                                                                                                                        QUERY PLAN                                                                                                                                                        
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Limit
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Merge Key: t_s_secyear.customer_id, t_s_secyear.customer_first_name, t_s_secyear.customer_last_name, t_s_secyear.customer_login
+         ->  Limit
+               ->  Sort
+                     Sort Key: t_s_secyear.customer_id, t_s_secyear.customer_first_name, t_s_secyear.customer_last_name, t_s_secyear.customer_login
+                     ->  Hash Join
+                           Hash Cond: ((t_c_secyear.customer_id)::text = (t_s_secyear.customer_id)::text)
+                           Join Filter: (CASE WHEN (t_c_firstyear.year_total > '0'::numeric) THEN (t_c_secyear.year_total / t_c_firstyear.year_total) ELSE NULL::numeric END > CASE WHEN (t_s_firstyear.year_total > '0'::numeric) THEN (t_s_secyear.year_total / t_s_firstyear.year_total) ELSE NULL::numeric END)
+                           ->  Hash Join
+                                 Hash Cond: ((t_c_secyear.customer_id)::text = (t_w_firstyear.customer_id)::text)
+                                 Join Filter: (CASE WHEN (t_c_firstyear.year_total > '0'::numeric) THEN (t_c_secyear.year_total / t_c_firstyear.year_total) ELSE NULL::numeric END > CASE WHEN (t_w_firstyear.year_total > '0'::numeric) THEN (t_w_secyear.year_total / t_w_firstyear.year_total) ELSE NULL::numeric END)
+                                 ->  Hash Join
+                                       Hash Cond: ((t_c_firstyear.customer_id)::text = (t_c_secyear.customer_id)::text)
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                             Hash Key: t_c_firstyear.customer_id
+                                             ->  Subquery Scan on t_c_firstyear
+                                                   Filter: ((t_c_firstyear.year_total > '0'::numeric) AND (t_c_firstyear.sale_type = 'c'::text) AND (t_c_firstyear.dyear = 2001))
+                                                   ->  Shared Scan (share slice:id 2:0)
+                                       ->  Hash
+                                             ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                                                   Hash Key: t_c_secyear.customer_id
+                                                   ->  Subquery Scan on t_c_secyear
+                                                         Filter: ((t_c_secyear.sale_type = 'c'::text) AND (t_c_secyear.dyear = 2002))
+                                                         ->  Shared Scan (share slice:id 3:0)
+                                 ->  Hash
+                                       ->  Hash Join
+                                             Hash Cond: ((t_w_firstyear.customer_id)::text = (t_w_secyear.customer_id)::text)
+                                             ->  Redistribute Motion 3:3  (slice4; segments: 3)
+                                                   Hash Key: t_w_firstyear.customer_id
+                                                   ->  Subquery Scan on t_w_firstyear
+                                                         Filter: ((t_w_firstyear.year_total > '0'::numeric) AND (t_w_firstyear.sale_type = 'w'::text) AND (t_w_firstyear.dyear = 2001))
+                                                         ->  Shared Scan (share slice:id 4:0)
+                                             ->  Hash
+                                                   ->  Redistribute Motion 3:3  (slice5; segments: 3)
+                                                         Hash Key: t_w_secyear.customer_id
+                                                         ->  Subquery Scan on t_w_secyear
+                                                               Filter: ((t_w_secyear.sale_type = 'w'::text) AND (t_w_secyear.dyear = 2002))
+                                                               ->  Shared Scan (share slice:id 5:0)
+                           ->  Hash
+                                 ->  Redistribute Motion 3:3  (slice6; segments: 3)
+                                       Hash Key: t_s_secyear.customer_id
+                                       ->  Hash Join
+                                             Hash Cond: ((t_s_firstyear.customer_id)::text = (t_s_secyear.customer_id)::text)
+                                             ->  Broadcast Motion 3:3  (slice7; segments: 3)
+                                                   ->  Subquery Scan on t_s_firstyear
+                                                         Filter: ((t_s_firstyear.year_total > '0'::numeric) AND (t_s_firstyear.sale_type = 's'::text) AND (t_s_firstyear.dyear = 2001))
+                                                         ->  Shared Scan (share slice:id 7:0)
+                                             ->  Hash
+                                                   ->  Subquery Scan on t_s_secyear
+                                                         Filter: ((t_s_secyear.sale_type = 's'::text) AND (t_s_secyear.dyear = 2002))
+                                                         ->  Shared Scan (share slice:id 6:0)
+                                                               ->  Append
+                                                                     ->  HashAggregate
+                                                                           Group Key: customer.c_customer_id, customer.c_first_name, customer.c_last_name, customer.c_preferred_cust_flag, customer.c_birth_country, customer.c_login, customer.c_email_address, date_dim.d_year
+                                                                           ->  Redistribute Motion 3:3  (slice8; segments: 3)
+                                                                                 Hash Key: customer.c_customer_id, customer.c_first_name, customer.c_last_name, customer.c_preferred_cust_flag, customer.c_birth_country, customer.c_login, customer.c_email_address, date_dim.d_year
+                                                                                 ->  Hash Join
+                                                                                       Hash Cond: (store_sales.ss_customer_sk = customer.c_customer_sk)
+                                                                                       ->  Hash Join
+                                                                                             Hash Cond: (store_sales.ss_sold_date_sk = date_dim.d_date_sk)
+                                                                                             ->  Seq Scan on store_sales
+                                                                                             ->  Hash
+                                                                                                   ->  Broadcast Motion 3:3  (slice9; segments: 3)
+                                                                                                         ->  Seq Scan on date_dim
+                                                                                       ->  Hash
+                                                                                             ->  Broadcast Motion 3:3  (slice10; segments: 3)
+                                                                                                   ->  Seq Scan on customer
+                                                                     ->  HashAggregate
+                                                                           Group Key: customer_1.c_customer_id, customer_1.c_first_name, customer_1.c_last_name, customer_1.c_preferred_cust_flag, customer_1.c_birth_country, customer_1.c_login, customer_1.c_email_address, date_dim_1.d_year
+                                                                           ->  Redistribute Motion 3:3  (slice11; segments: 3)
+                                                                                 Hash Key: customer_1.c_customer_id, customer_1.c_first_name, customer_1.c_last_name, customer_1.c_preferred_cust_flag, customer_1.c_birth_country, customer_1.c_login, customer_1.c_email_address, date_dim_1.d_year
+                                                                                 ->  Hash Join
+                                                                                       Hash Cond: (catalog_sales.cs_bill_customer_sk = customer_1.c_customer_sk)
+                                                                                       ->  Hash Join
+                                                                                             Hash Cond: (catalog_sales.cs_sold_date_sk = date_dim_1.d_date_sk)
+                                                                                             ->  Seq Scan on catalog_sales
+                                                                                             ->  Hash
+                                                                                                   ->  Broadcast Motion 3:3  (slice12; segments: 3)
+                                                                                                         ->  Seq Scan on date_dim date_dim_1
+                                                                                       ->  Hash
+                                                                                             ->  Broadcast Motion 3:3  (slice13; segments: 3)
+                                                                                                   ->  Seq Scan on customer customer_1
+                                                                     ->  HashAggregate
+                                                                           Group Key: customer_2.c_customer_id, customer_2.c_first_name, customer_2.c_last_name, customer_2.c_preferred_cust_flag, customer_2.c_birth_country, customer_2.c_login, customer_2.c_email_address, date_dim_2.d_year
+                                                                           ->  Redistribute Motion 3:3  (slice14; segments: 3)
+                                                                                 Hash Key: customer_2.c_customer_id, customer_2.c_first_name, customer_2.c_last_name, customer_2.c_preferred_cust_flag, customer_2.c_birth_country, customer_2.c_login, customer_2.c_email_address, date_dim_2.d_year
+                                                                                 ->  Hash Join
+                                                                                       Hash Cond: (web_sales.ws_sold_date_sk = date_dim_2.d_date_sk)
+                                                                                       ->  Hash Join
+                                                                                             Hash Cond: (web_sales.ws_bill_customer_sk = customer_2.c_customer_sk)
+                                                                                             ->  Seq Scan on web_sales
+                                                                                             ->  Hash
+                                                                                                   ->  Broadcast Motion 3:3  (slice15; segments: 3)
+                                                                                                         ->  Seq Scan on customer customer_2
+                                                                                       ->  Hash
+                                                                                             ->  Broadcast Motion 3:3  (slice16; segments: 3)
+                                                                                                   ->  Seq Scan on date_dim date_dim_2
+ Optimizer: Postgres query optimizer
+(99 rows)
+
diff --git a/src/test/regress/expected/tpcds_q04_optimizer.out b/src/test/regress/expected/tpcds_q04_optimizer.out
new file mode 100644
index 00000000000..15208a03b56
--- /dev/null
+++ b/src/test/regress/expected/tpcds_q04_optimizer.out
@@ -0,0 +1,5557 @@
+CREATE SCHEMA cte_bug;
+SET gp_default_storage_options = '';
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+ set_config 
+------------
+ 
+(1 row)
+
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+SET default_tablespace = '';
+SET default_table_access_method = ao_column;
+--
+-- Name: catalog_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.catalog_sales;
+CREATE TABLE cte_bug.catalog_sales (
+    cs_sold_date_sk integer,
+    cs_sold_time_sk integer,
+    cs_ship_date_sk integer,
+    cs_bill_customer_sk integer,
+    cs_bill_cdemo_sk integer,
+    cs_bill_hdemo_sk integer,
+    cs_bill_addr_sk integer,
+    cs_ship_customer_sk integer,
+    cs_ship_cdemo_sk integer,
+    cs_ship_hdemo_sk integer,
+    cs_ship_addr_sk integer,
+    cs_call_center_sk integer,
+    cs_catalog_page_sk integer,
+    cs_ship_mode_sk integer,
+    cs_warehouse_sk integer,
+    cs_item_sk integer NOT NULL,
+    cs_promo_sk integer,
+    cs_order_number bigint NOT NULL,
+    cs_quantity integer,
+    cs_wholesale_cost numeric(7,2),
+    cs_list_price numeric(7,2),
+    cs_sales_price numeric(7,2),
+    cs_ext_discount_amt numeric(7,2),
+    cs_ext_sales_price numeric(7,2),
+    cs_ext_wholesale_cost numeric(7,2),
+    cs_ext_list_price numeric(7,2),
+    cs_ext_tax numeric(7,2),
+    cs_coupon_amt numeric(7,2),
+    cs_ext_ship_cost numeric(7,2),
+    cs_net_paid numeric(7,2),
+    cs_net_paid_inc_tax numeric(7,2),
+    cs_net_paid_inc_ship numeric(7,2),
+    cs_net_paid_inc_ship_tax numeric(7,2),
+    cs_net_profit numeric(7,2),
+    COLUMN cs_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_call_center_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_catalog_page_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_mode_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_warehouse_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_order_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_ship_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_ship ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_ship_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (cs_item_sk);
+--
+-- Name: customer; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.customer;
+CREATE TABLE cte_bug.customer (
+    c_customer_sk integer NOT NULL,
+    c_customer_id character varying(16) NOT NULL,
+    c_current_cdemo_sk integer,
+    c_current_hdemo_sk integer,
+    c_current_addr_sk integer,
+    c_first_shipto_date_sk integer,
+    c_first_sales_date_sk integer,
+    c_salutation character varying(10),
+    c_first_name character varying(20),
+    c_last_name character varying(30),
+    c_preferred_cust_flag character(1),
+    c_birth_day integer,
+    c_birth_month integer,
+    c_birth_year integer,
+    c_birth_country character varying(20),
+    c_login character varying(13),
+    c_email_address character varying(50),
+    c_last_review_date integer,
+    COLUMN c_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_customer_id ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_shipto_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_sales_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_salutation ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_last_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_preferred_cust_flag ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_day ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_month ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_country ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_login ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_email_address ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_last_review_date ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (c_customer_sk);
+--
+-- Name: date_dim; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.date_dim;
+CREATE TABLE cte_bug.date_dim (
+    d_date_sk integer NOT NULL,
+    d_date_id character varying(16) NOT NULL,
+    d_date date,
+    d_month_seq integer,
+    d_week_seq integer,
+    d_quarter_seq integer,
+    d_year integer,
+    d_dow integer,
+    d_moy integer,
+    d_dom integer,
+    d_qoy integer,
+    d_fy_year integer,
+    d_fy_quarter_seq integer,
+    d_fy_week_seq integer,
+    d_day_name character varying(9),
+    d_quarter_name character varying(6),
+    d_holiday character(1),
+    d_weekend character(1),
+    d_following_holiday character(1),
+    d_first_dom integer,
+    d_last_dom integer,
+    d_same_day_ly integer,
+    d_same_day_lq integer,
+    d_current_day character(1),
+    d_current_week character(1),
+    d_current_month character(1),
+    d_current_quarter character(1),
+    d_current_year character(1),
+    COLUMN d_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_date_id ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_date ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_month_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_week_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_quarter_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_dow ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_moy ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_qoy ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_quarter_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_week_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_day_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_quarter_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_holiday ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_weekend ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_following_holiday ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_first_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_last_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_same_day_ly ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_same_day_lq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_day ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_week ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_month ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_quarter ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (d_date_sk);
+--
+-- Name: store_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.store_sales;
+CREATE TABLE cte_bug.store_sales (
+    ss_sold_date_sk integer,
+    ss_sold_time_sk integer,
+    ss_item_sk integer NOT NULL,
+    ss_customer_sk integer,
+    ss_cdemo_sk integer,
+    ss_hdemo_sk integer,
+    ss_addr_sk integer,
+    ss_store_sk integer,
+    ss_promo_sk integer,
+    ss_ticket_number bigint NOT NULL,
+    ss_quantity integer,
+    ss_wholesale_cost numeric(7,2),
+    ss_list_price numeric(7,2),
+    ss_sales_price numeric(7,2),
+    ss_ext_discount_amt numeric(7,2),
+    ss_ext_sales_price numeric(7,2),
+    ss_ext_wholesale_cost numeric(7,2),
+    ss_ext_list_price numeric(7,2),
+    ss_ext_tax numeric(7,2),
+    ss_coupon_amt numeric(7,2),
+    ss_net_paid numeric(7,2),
+    ss_net_paid_inc_tax numeric(7,2),
+    ss_net_profit numeric(7,2),
+    COLUMN ss_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_store_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ticket_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (ss_item_sk);
+--
+-- Name: web_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.web_sales;
+CREATE TABLE cte_bug.web_sales (
+    ws_sold_date_sk integer,
+    ws_sold_time_sk integer,
+    ws_ship_date_sk integer,
+    ws_item_sk integer NOT NULL,
+    ws_bill_customer_sk integer,
+    ws_bill_cdemo_sk integer,
+    ws_bill_hdemo_sk integer,
+    ws_bill_addr_sk integer,
+    ws_ship_customer_sk integer,
+    ws_ship_cdemo_sk integer,
+    ws_ship_hdemo_sk integer,
+    ws_ship_addr_sk integer,
+    ws_web_page_sk integer,
+    ws_web_site_sk integer,
+    ws_ship_mode_sk integer,
+    ws_warehouse_sk integer,
+    ws_promo_sk integer,
+    ws_order_number bigint NOT NULL,
+    ws_quantity integer,
+    ws_wholesale_cost numeric(7,2),
+    ws_list_price numeric(7,2),
+    ws_sales_price numeric(7,2),
+    ws_ext_discount_amt numeric(7,2),
+    ws_ext_sales_price numeric(7,2),
+    ws_ext_wholesale_cost numeric(7,2),
+    ws_ext_list_price numeric(7,2),
+    ws_ext_tax numeric(7,2),
+    ws_coupon_amt numeric(7,2),
+    ws_ext_ship_cost numeric(7,2),
+    ws_net_paid numeric(7,2),
+    ws_net_paid_inc_tax numeric(7,2),
+    ws_net_paid_inc_ship numeric(7,2),
+    ws_net_paid_inc_ship_tax numeric(7,2),
+    ws_net_profit numeric(7,2),
+    COLUMN ws_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_web_page_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_web_site_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_mode_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_warehouse_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_order_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_ship_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_ship ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_ship_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (ws_item_sk);
+--
+-- Apache Cloudberry database dump complete
+--
+-- 
+-- Allow system table modifications
+-- 
+set allow_system_table_mods=true;
+-- Table: catalog_sales
+UPDATE pg_class
+SET
+	relpages = 1497467::int,
+	reltuples = 720015040.0::real,
+	relallvisible = 0::int
+WHERE relname = 'catalog_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: date_dim
+UPDATE pg_class
+SET
+	relpages = 40::int,
+	reltuples = 73049.0::real,
+	relallvisible = 0::int
+WHERE relname = 'date_dim' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: customer
+UPDATE pg_class
+SET
+	relpages = 2870::int,
+	reltuples = 2100000.0::real,
+	relallvisible = 0::int
+WHERE relname = 'customer' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: store_sales
+UPDATE pg_class
+SET
+	relpages = 1930653::int,
+	reltuples = 1439977500.0::real,
+	relallvisible = 0::int
+WHERE relname = 'store_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+-- Table: web_sales
+UPDATE pg_class
+SET
+	relpages = 736204::int,
+	reltuples = 360014100.0::real,
+	relallvisible = 0::int
+WHERE relname = 'web_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+--
+-- Table: catalog_sales, Attribute: cs_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0046333335::real,
+	4::integer,
+	1836.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0017666667, 0.0015666666, 0.0015666666, 0.0015, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014333334, 0.0014333334, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666}'::real[],
+	NULL::real[],
+	'{0.054781195}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2452618","2451872","2451875","2451537","2451130","2451869","2451873","2451891","2451908","2452223","2452613","2451169","2451486","2451513","2451904","2451163","2451173","2451541","2451885","2451177","2451504","2451876","2451884","2452249","2452264","2452587","2452606","2451138","2451146","2451158","2451491","2451523","2451536","2451540","2451544","2451883","2451899","2452217","2452222","2452248","2452593","2451535","2451864","2451874","2451894","2451896","2452230","2452588","2452597","2451156","2451505","2451514","2452247","2452259","2452269","2452585","2452627","2451150","2451157","2451166","2451171","2451512","2451515","2451519","2451526","2451881","2451886","2451893","2452232","2452254","2452265","2452576","2452583","2452609","2452612","2452616","2452630","2451132","2451136","2451522","2451529","2451887","2452220","2452235","2452498","2452594","2452595","2452601","2452620","2452624","2451029","2451131","2451133","2451139","2451147","2451170","2451525","2451532","2451856","2451858"}'::int4[],
+	E'{"2450815","2450843","2450872","2450902","2450927","2450954","2450982","2451010","2451032","2451043","2451055","2451066","2451078","2451090","2451102","2451116","2451125","2451142","2451153","2451165","2451181","2451211","2451241","2451266","2451295","2451323","2451348","2451375","2451397","2451409","2451421","2451434","2451446","2451458","2451471","2451483","2451494","2451506","2451520","2451539","2451563","2451589","2451616","2451645","2451670","2451696","2451724","2451754","2451768","2451782","2451795","2451807","2451818","2451831","2451842","2451853","2451865","2451879","2451898","2451910","2451933","2451960","2451990","2452016","2452042","2452069","2452097","2452122","2452135","2452147","2452158","2452169","2452182","2452195","2452207","2452218","2452231","2452242","2452255","2452267","2452278","2452309","2452340","2452369","2452396","2452424","2452450","2452480","2452497","2452509","2452521","2452533","2452544","2452556","2452568","2452582","2452599","2452610","2452625","2452636","2452654"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.005::real,
+	4::integer,
+	72297.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0002}'::real[],
+	NULL::real[],
+	'{0.0112536065}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"44417"}'::int4[],
+	E'{"19","3608","5437","7239","9103","10773","12524","14298","15582","16852","17926","19155","20275","21514","22764","24007","25186","26042","26962","27910","28794","29659","30546","31449","32213","32885","33617","34346","35082","35807","36509","37180","37892","38557","39244","39936","40721","41398","42183","42868","43569","44109","44624","45170","45703","46274","46759","47492","48133","48850","49628","50310","51472","52776","53993","54839","55874","56759","57696","58416","59123","59800","60516","61221","61836","62429","62989","63592","64155","64738","65238","65703","66205","66700","67247","67791","68275","68782","69195","69611","70077","70485","70923","71369","71847","72304","72827","73342","73877","74404","74966","75510","76220","76902","77680","78437","79149","80343","81522","82791","86392"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0052::real,
+	4::integer,
+	1914.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0014, 0.0013666666, 0.0013666666, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001}'::real[],
+	NULL::real[],
+	'{0.0545705}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451918","2451182","2451209","2452278","2451544","2451907","2452252","2452639","2452648","2452659","2451207","2452590","2451205","2451541","2451559","2451183","2451549","2451909","2451910","2451911","2451933","2452260","2452262","2452624","2452634","2452637","2451906","2451914","2452233","2452242","2452265","2452270","2451121","2451180","2451192","2451526","2451565","2451575","2451896","2451897","2451899","2451912","2451936","2452245","2452618","2452626","2452653","2451161","2451173","2451174","2451191","2451478","2451528","2451555","2451915","2451927","2452261","2452269","2452281","2452290","2452629","2452633","2452643","2451162","2451164","2451185","2451548","2451550","2451584","2451929","2451940","2452236","2452283","2452608","2452654","2451165","2451168","2451481","2451511","2451517","2451553","2451582","2451889","2451917","2452294","2452632","2452641","2452642","2452647","2452660","2451123","2451178","2451184","2451204","2451491","2451512","2451513","2451516","2451520","2451538"}'::int4[],
+	E'{"2450821","2450886","2450917","2450945","2450976","2451006","2451032","2451056","2451073","2451088","2451101","2451114","2451128","2451140","2451151","2451166","2451186","2451199","2451214","2451227","2451241","2451259","2451286","2451317","2451344","2451370","2451397","2451421","2451439","2451456","2451470","2451484","2451497","2451510","2451529","2451542","2451561","2451573","2451588","2451603","2451620","2451643","2451671","2451698","2451724","2451752","2451777","2451799","2451817","2451830","2451844","2451858","2451870","2451880","2451892","2451908","2451926","2451941","2451953","2451966","2451982","2452002","2452032","2452056","2452083","2452113","2452139","2452159","2452176","2452190","2452204","2452217","2452229","2452244","2452257","2452274","2452287","2452301","2452312","2452325","2452341","2452360","2452392","2452421","2452448","2452475","2452504","2452523","2452541","2452555","2452569","2452581","2452594","2452606","2452617","2452631","2452651","2452666","2452678","2452695","2452742"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0047333334::real,
+	4::integer,
+	2076691.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.009644499}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"83","19255","38469","57334","77660","100353","121648","142864","164380","186732","206072","225376","246600","266629","288115","310326","332043","353860","375080","398568","418154","439646","461654","482840","506162","528559","549467","568302","588542","608968","630692","650223","671210","692175","713622","734326","754624","775800","798038","818056","841239","862315","882803","902700","923351","943590","963503","984723","1007978","1026125","1047160","1067477","1087789","1107171","1127082","1149889","1169435","1192194","1212249","1233291","1254464","1277232","1298034","1319408","1340687","1361652","1382794","1402582","1423476","1446047","1468226","1490417","1512333","1534704","1553629","1572989","1592634","1611613","1630695","1653622","1674063","1694178","1714594","1736071","1758421","1781336","1801193","1823164","1844186","1864368","1883410","1905171","1926138","1948282","1969988","1992903","2014079","2034696","2056865","2078611","2099787"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.005133333::real,
+	4::integer,
+	2250439.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0031504256}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"302","18541","37466","54463","73740","92424","112008","130967","151053","169555","190110","209507","228068","249282","268918","288605","307024","325774","343640","360630","381214","401158","419575","438762","458312","478977","498196","516757","537388","556845","575435","593167","612925","631535","649867","668933","688696","708123","729225","748554","766895","786505","806811","825215","844584","864169","883774","902048","921519","939325","959048","977470","995552","1013270","1032128","1049619","1069099","1089358","1107492","1124109","1143285","1161705","1180858","1201502","1221860","1240948","1262383","1281164","1299986","1317873","1338886","1358783","1378683","1398812","1417832","1435737","1456539","1476597","1496447","1515429","1535261","1554963","1573327","1591123","1612033","1630239","1650833","1669983","1688937","1707342","1727798","1746079","1764329","1783178","1803869","1823803","1842989","1862762","1881322","1901969","1920750"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0045666667::real,
+	4::integer,
+	7211.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.000111478614}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"952","3639","822","1878","3522","3566","4915","5053","5336"}'::int4[],
+	E'{"1","69","138","207","278","358","430","510","587","655","728","798","869","942","1011","1079","1148","1221","1293","1363","1436","1515","1590","1658","1727","1796","1869","1943","2011","2089","2164","2238","2309","2383","2458","2534","2607","2674","2744","2820","2896","2971","3050","3121","3192","3259","3330","3406","3478","3554","3622","3693","3766","3837","3910","3986","4059","4136","4203","4276","4352","4423","4495","4568","4638","4711","4786","4851","4924","4995","5071","5139","5209","5275","5348","5419","5491","5562","5630","5702","5783","5855","5928","6005","6074","6145","6221","6287","6362","6437","6509","6581","6652","6718","6791","6859","6925","6992","7067","7135","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_bill_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0049666665::real,
+	4::integer,
+	1046873.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.010069353}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"4","11125","22235","33070","44034","54814","66903","76551","86436","96499","107386","117375","127737","138201","149160","158550","169352","179553","191448","202662","213153","223343","232616","242533","253489","263641","274314","284608","294503","305542","316693","327046","337213","348029","358708","369038","379092","389216","399404","411658","421481","431880","442318","452462","463687","473855","484589","494142","504812","515093","525984","536447","546801","557909","568809","579887","590134","600989","611895","621827","631620","641611","653140","664172","674648","685363","696406","706802","717628","727362","737815","748416","758649","768984","779629","790315","800549","811382","821988","832542","842239","852925","861542","872217","882338","893425","903652","914043","925124","935145","946703","957135","966844","978263","987914","998584","1009037","1019530","1030620","1041099","1049900"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	1988803.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.012593937}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"112","19457","38552","56966","77106","98752","120684","141455","163448","185974","205916","225714","246798","267145","288778","309669","331415","352688","373910","396777","417012","437984","458412","480601","503081","525455","546630","566430","585396","605761","627797","647297","667174","689078","710793","730789","751531","771586","793233","812933","836114","858314","878748","899241","919733","940900","960199","982017","1005759","1024900","1046467","1067416","1087759","1107005","1127271","1149614","1169010","1191761","1212083","1233029","1254014","1275851","1297280","1318761","1339872","1360476","1383115","1402788","1422877","1446083","1468587","1490686","1513016","1535950","1556692","1575347","1593894","1613402","1634582","1657027","1677173","1698221","1719408","1739440","1762772","1784881","1805037","1826722","1847883","1868042","1887771","1909652","1929728","1951115","1972152","1994703","2015691","2036799","2059398","2079650","2099910"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0047::real,
+	4::integer,
+	2111792.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0029372792}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"302","18991","38051","55457","73906","92142","111203","130054","150524","168838","188615","208305","226780","247275","267002","286332","305964","323539","341623","359088","378908","398275","417006","435648","456039","475587","494530","514681","534729","554637","572188","589663","608849","627139","645797","665116","684344","704227","724342","743953","761704","781964","800445","819537","838906","859432","878743","896384","916344","935630","954106","974012","992877","1010876","1030092","1047512","1067272","1087763","1106244","1123512","1143152","1162252","1181423","1201399","1221079","1241127","1262335","1281211","1300282","1317917","1338913","1359409","1379678","1399509","1419706","1437833","1458212","1478319","1498253","1517308","1537216","1555785","1574809","1593715","1614555","1632477","1652767","1671255","1689246","1707832","1727015","1745671","1764329","1783647","1803713","1823176","1843528","1863426","1881885","1901131","1920750"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0045::real,
+	4::integer,
+	7216.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00046666668, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{-0.0024474491}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3639","952","4257","822","1910","4081","4594","4618","4915"}'::int4[],
+	E'{"1","73","142","207","280","358","430","508","582","649","721","795","869","944","1014","1083","1154","1229","1300","1373","1444","1523","1596","1662","1734","1808","1878","1946","2015","2092","2166","2242","2314","2390","2466","2538","2613","2681","2754","2829","2904","2980","3057","3130","3199","3265","3336","3409","3484","3555","3618","3692","3763","3836","3911","3985","4055","4135","4203","4280","4359","4429","4500","4572","4647","4723","4793","4861","4928","5004","5075","5142","5214","5279","5349","5422","5492","5565","5633","5704","5780","5856","5929","6005","6075","6144","6216","6286","6361","6433","6507","6577","6650","6717","6786","6857","6924","6990","7066","7134","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	1106888.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0052251625}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"4","10372","21281","32604","43275","54281","66191","75977","85966","96475","106785","117107","127166","137473","148549","158449","169288","179404","191400","202566","212568","223050","231983","242203","252330","262987","273206","284036","293651","303573","314592","325696","336019","346020","357411","367567","377578","387371","397564","409384","419885","430219","441268","451283","462534","472729","482897","493068","503727","514241","524681","535657","546641","557534","568161","579186","589218","600063","610499","620727","630611","640167","650891","661771","672763","683715","694487","704971","715589","725727","735602","745905","755951","765867","776755","787045","798005","808059","818665","829654","840229","849950","859637","870300","880895","892234","902478","912694","923652","933902","945183","955649","965499","976354","986841","997088","1007946","1018197","1029945","1040884","1049912"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_call_center_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0049::real,
+	4::integer,
+	6.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.32786667, 0.1994, 0.13533333, 0.13273333, 0.1306, 0.06916667}'::real[],
+	'{0.21526349}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","2","3","5","4","6"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_catalog_page_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0049333335::real,
+	4::integer,
+	5614.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0012666667, 0.0012666667, 0.0012333334, 0.0012, 0.0012, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009}'::real[],
+	NULL::real[],
+	'{0.050873112}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"164","5975","2104","135","4000","7906","2144","5962","5966","7944","7992","2111","2149","5954","6016","6032","6043","7900","7908","2053","2075","4051","7954","150","151","160","183","186","2062","2090","2114","4010","4052","4084","5959","6025","7929","7941","116","117","194","2060","2119","4076","4094","5964","5999","6011","6019","7917","7973","118","120","129","163","190","212","2077","2078","2091","2093","2148","2156","4047","4050","4068","4097","5979","6003","6007","6021","6034","7890","7909","7919","7921","7932","7938","7953","7960","141","157","176","182","214","2118","4016","4028","4053","4065","4073","4086","5961","6010","7911","7914","7922","7923","7936","7956"}'::int4[],
+	E'{"1","29","53","79","106","124","139","154","172","189","205","230","290","340","380","413","614","843","1009","1150","1945","1972","1996","2020","2047","2067","2083","2099","2115","2131","2145","2168","2227","2279","2318","2361","2605","2813","2989","3129","3896","3920","3945","3968","3994","4009","4024","4038","4056","4070","4085","4101","4153","4215","4252","4289","4400","4718","4887","5022","5155","5852","5878","5903","5927","5946","5963","5980","5992","6006","6026","6040","6078","6144","6189","6232","6381","6650","6829","6974","7101","7800","7825","7851","7879","7895","7913","7935","7955","7971","7986","8023","8080","8130","8168","8207","8515","8701","8861","8977","9827"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_ship_mode_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.004766667::real,
+	4::integer,
+	20.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0517, 0.051333334, 0.0507, 0.050466668, 0.0504, 0.050166667, 0.050166667, 0.050066665, 0.049966667, 0.0499, 0.0499, 0.049733333, 0.049333334, 0.0493, 0.049133334, 0.049066667, 0.049066667, 0.04853333, 0.0485, 0.0478}'::real[],
+	'{0.05016106}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"10","4","5","15","7","14","20","12","9","3","6","2","1","18","8","17","19","16","13","11"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_warehouse_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.0047::real,
+	4::integer,
+	5.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.2037, 0.20163333, 0.19836667, 0.19753334, 0.19406667}'::real[],
+	'{0.20946348}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"5","4","2","3","1"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	24934.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.00087319454}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2149","4123","7117","12451","15001","19603","20557","21523","22867","27235","55","841","2348","2545","4105","4159","4441","4843","5509","7513","7747","8827","9289","12031","13417","15541","15709","16730","18115","18805","18997","19495","20083","21073","23167","24679","26641"}'::int4[],
+	E'{"1","320","583","835","1138","1406","1673","1962","2264","2558","2845","3127","3446","3749","4031","4330","4573","4877","5173","5433","5703","5947","6237","6506","6775","7040","7307","7579","7873","8136","8404","8707","8984","9250","9532","9833","10123","10420","10678","10969","11250","11553","11826","12095","12364","12667","12956","13219","13486","13741","14042","14309","14602","14871","15161","15410","15665","15939","16212","16498","16763","17059","17351","17654","17945","18229","18514","18782","19059","19348","19609","19913","20198","20471","20743","21035","21331","21597","21883","22148","22442","22712","22966","23269","23567","23848","24106","24394","24668","24951","25221","25508","25796","26095","26365","26646","26927","27195","27461","27722","28000"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0049333335::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0039333333, 0.0036666666, 0.0036333334, 0.0035666667, 0.0035, 0.0035, 0.0035, 0.0035, 0.0034666667}'::real[],
+	NULL::real[],
+	'{0.012315235}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"305","89","51","343","11","49","195","258","355"}'::int4[],
+	E'{"1","4","8","12","16","19","23","26","30","33","37","40","44","47","53","56","60","63","67","70","74","78","81","85","88","92","96","99","102","106","109","113","116","120","123","127","130","134","137","141","144","148","151","155","158","162","165","168","172","175","179","182","186","189","193","197","201","204","208","211","215","218","221","225","228","232","235","239","242","246","249","253","256","261","264","268","271","275","278","282","285","289","293","296","299","303","307","311","314","318","321","325","328","331","335","339","342","346","350","353","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_order_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	-0.23808314::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.05413773}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1093","796094","1645931","2488328","3262945","4034487","4856771","5589623","6321306","7127852","7844455","8614283","9422592","10337715","11178214","11967077","12806598","13604549","14347663","15135994","15897089","16779779","17630658","18360193","19209296","19976804","20750598","21564225","22330137","23141252","23995273","24745890","25625704","26406125","27188856","28177645","29033724","29834605","30623466","31397341","32181036","32930216","33726353","34526912","35320855","36048980","36922780","37717474","38626712","39479583","40217298","41019974","41831233","42654275","43505081","44324401","44976357","45709232","46482483","47262545","48002145","48800151","49567190","50315617","51133372","51910262","52699539","53463422","54279944","55035406","55746486","56570321","57449909","58231103","58998945","59766115","60653209","61448393","62271704","63090076","63926111","64814052","65684644","66478632","67319176","68037038","68897841","69676370","70424558","71249378","72010418","72811451","73574543","74362921","75127096","75960745","76739924","77534318","78299599","79159205","79998254"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+--
+-- Table: catalog_sales, Attribute: cs_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0111, 0.0111, 0.011, 0.011, 0.0109, 0.010833333, 0.010833333, 0.010833333, 0.0108, 0.010666667, 0.010666667, 0.0106, 0.010566667, 0.010566667, 0.010533334, 0.010533334, 0.010533334, 0.0105, 0.010466667, 0.010433333, 0.010433333, 0.010366667, 0.010366667, 0.010366667, 0.010366667, 0.010366667, 0.010333333, 0.0103, 0.0103, 0.010266666, 0.010266666, 0.010266666, 0.0102, 0.0102, 0.0102, 0.0102, 0.0101666665, 0.0101666665, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101, 0.0101, 0.010066667, 0.010033334, 0.010033334, 0.010033334, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.009933333, 0.009933333, 0.009933333, 0.009933333, 0.0099, 0.0099, 0.009866667, 0.009866667, 0.009833333, 0.009833333, 0.009833333, 0.009833333, 0.0098, 0.0098, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.0097, 0.009666666, 0.009666666, 0.009666666, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.0095, 0.009466667, 0.009333333, 0.009266667, 0.009266667, 0.009233333, 0.009233333, 0.0092, 0.009133333, 0.009133333, 0.0091, 0.008933334, 0.008866667, 0.008833333, 0.0088, 0.0087, 0.0084, 0.0084}'::real[],
+	'{0.009663152}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"41","52","9","44","27","58","86","89","77","36","80","17","16","42","45","46","83","15","91","12","14","57","67","68","74","96","84","25","64","28","71","82","11","56","60","98","1","6","23","7","95","61","94","47","5","69","72","3","48","70","92","34","54","76","79","81","32","38","62","78","2","13","18","55","37","40","75","100","22","97","4","33","51","8","35","73","88","24","49","87","21","26","53","66","99","39","65","20","93","30","43","90","29","63","85","59","19","50","10","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: catalog_sales, Attribute: cs_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0042333333::real,
+	6::integer,
+	9853.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.00037631093}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"72.49","24.31","33.82","41.38","61.68","64.83","90.44","10.81","27.94","34.69","63.73","87.62","93.76","94.23"}'::numeric[],
+	E'{"1.00","1.97","2.96","3.92","4.94","5.97","7.01","7.93","8.86","9.79","10.76","11.74","12.69","13.67","14.71","15.61","16.55","17.55","18.59","19.64","20.69","21.72","22.70","23.70","24.74","25.76","26.74","27.83","28.84","29.88","30.96","31.96","32.90","33.95","34.88","35.82","36.86","37.79","38.78","39.75","40.65","41.59","42.57","43.46","44.53","45.59","46.66","47.73","48.74","49.72","50.69","51.60","52.56","53.41","54.44","55.38","56.44","57.38","58.32","59.33","60.46","61.51","62.59","63.51","64.50","65.52","66.49","67.40","68.34","69.30","70.25","71.22","72.19","73.17","74.18","75.21","76.17","77.18","78.10","79.08","80.07","81.02","81.93","82.86","83.87","84.82","85.83","86.83","87.81","88.79","89.69","90.75","91.71","92.69","93.69","94.73","95.80","96.89","97.92","99.02","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.0047333334::real,
+	6::integer,
+	23623.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667}'::real[],
+	NULL::real[],
+	'{0.0011046942}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"11.59","52.87","62.87","64.43","87.47","95.88","96.45","99.51"}'::numeric[],
+	E'{"1.00","3.51","5.35","7.23","9.15","10.91","12.55","14.37","16.10","17.87","19.59","21.31","23.22","24.95","26.59","28.36","30.12","31.92","33.70","35.45","37.37","39.21","40.96","42.63","44.39","46.23","48.04","49.97","52.04","53.81","55.47","57.35","59.13","60.99","62.98","64.76","66.54","68.45","70.35","72.20","74.06","75.90","77.63","79.47","81.31","83.10","84.84","86.86","88.69","90.45","92.15","94.08","95.99","97.69","99.41","101.23","103.18","104.97","107.17","108.94","110.89","112.85","114.87","116.76","119.10","121.18","123.40","125.73","128.23","130.50","132.97","135.31","138.15","140.60","143.29","145.79","148.51","151.34","154.23","157.06","160.08","163.23","166.75","170.63","174.29","177.79","181.55","185.86","189.57","193.79","198.05","202.87","207.95","213.14","219.21","225.93","233.84","241.92","252.53","265.43","299.64"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.0046666665::real,
+	6::integer,
+	14418.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.009733333, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{0.00090382085}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","4.11","1.12","1.14","1.19","1.41","2.07","3.47","0.45","0.86","0.99","1.11","1.66","1.79","2.22","2.36","4.79","5.00","5.07","19.14","0.34","0.77","0.98","1.17","1.38","1.39","1.53","1.60","2.13","2.14","2.41","2.70","2.91","3.55","5.02","0.32","0.61","0.81","1.02","1.20","1.63","1.78","1.83","1.98","2.16","2.57","2.58","2.63","2.71","2.82","3.02","3.07","3.31","3.49","4.09","4.70","5.83","6.20","6.42","6.65","6.71","6.81","7.47","7.73","8.32","8.90","11.94","13.00","23.92","25.86","0.52","0.60","0.68","0.83","0.85","0.90","0.92","1.00","1.03","1.22","1.40","1.42","1.52","1.62","1.70","1.89","1.90","1.92","1.95","1.99","2.08","2.45","2.48","2.80","2.85","2.86","3.05","3.57","3.58","4.26"}'::numeric[],
+	E'{"0.01","0.65","1.28","1.88","2.49","3.12","3.69","4.24","4.73","5.29","5.72","6.26","6.84","7.36","7.90","8.49","9.12","9.69","10.29","10.91","11.52","12.20","12.88","13.55","14.26","15.04","15.79","16.49","17.27","18.12","18.88","19.69","20.47","21.31","22.14","23.04","23.89","24.71","25.66","26.63","27.57","28.59","29.53","30.53","31.55","32.67","33.80","34.83","35.95","37.16","38.26","39.31","40.43","41.57","42.77","43.90","45.13","46.36","47.81","49.19","50.47","52.07","53.50","55.01","56.52","58.13","59.74","61.42","63.22","65.02","66.74","68.61","70.40","72.18","74.20","76.33","79.00","81.18","83.67","85.79","88.11","90.68","93.43","96.30","99.26","102.27","105.67","109.56","113.32","117.45","121.86","127.22","132.40","138.99","144.98","152.44","160.57","173.02","186.46","208.92","291.96"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.0044::real,
+	6::integer,
+	142728.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0095}'::real[],
+	NULL::real[],
+	'{-0.004464352}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.17","11.20","20.91","30.80","40.84","51.00","63.78","75.00","87.44","99.94","114.70","128.10","142.35","157.32","174.42","192.54","210.80","230.40","248.40","268.05","290.88","314.16","335.72","359.45","382.80","407.16","434.34","460.80","487.56","514.71","543.62","576.10","607.10","638.58","674.96","708.51","744.12","781.44","816.90","854.24","892.67","937.72","978.12","1024.92","1066.60","1115.40","1163.76","1213.44","1265.92","1319.64","1377.33","1435.50","1492.72","1553.06","1615.12","1676.76","1740.50","1811.01","1879.47","1944.96","2021.00","2099.24","2180.82","2254.08","2338.24","2431.94","2518.37","2613.97","2705.79","2811.90","2915.52","3030.87","3147.78","3268.80","3398.64","3537.80","3693.20","3853.00","4025.84","4178.16","4342.57","4533.75","4713.69","4897.32","5111.40","5372.25","5621.20","5899.18","6182.22","6506.64","6877.80","7259.75","7668.62","8199.00","8717.40","9363.69","10163.70","11203.92","12513.40","14893.36","26922.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	24::smallint,
+	False::boolean,
+	0.0043666665::real,
+	6::integer,
+	142257.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.009733333, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.003978702}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","46.08","221.76","229.32","324.00"}'::numeric[],
+	E'{"0.12","10.50","20.06","29.43","40.50","50.88","62.55","73.71","86.88","99.80","112.70","127.52","143.62","159.84","176.54","195.30","213.76","232.57","250.81","273.00","293.44","314.88","338.10","359.04","380.19","405.00","429.60","451.68","477.47","502.86","527.96","553.70","584.44","614.88","648.96","678.59","714.00","752.49","789.24","832.00","873.60","918.00","961.62","1002.87","1045.32","1088.01","1138.32","1187.80","1240.32","1290.56","1343.52","1398.63","1453.80","1514.52","1579.89","1641.03","1707.15","1777.62","1850.16","1929.60","2006.40","2085.16","2172.12","2258.24","2346.43","2432.08","2522.40","2612.40","2716.00","2822.00","2941.68","3047.40","3167.66","3290.34","3408.50","3542.00","3672.90","3827.25","3964.16","4119.20","4284.36","4443.82","4620.28","4815.00","5049.41","5287.50","5540.15","5817.90","6091.80","6419.70","6763.11","7107.12","7533.20","7984.68","8549.10","9239.68","10028.92","11141.40","12375.32","14442.82","25866.02"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	25::smallint,
+	False::boolean,
+	0.004466667::real,
+	6::integer,
+	199389.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0034636194}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.06","33.44","56.88","76.70","95.46","117.98","141.00","166.72","189.80","211.64","240.48","270.13","296.05","322.14","351.56","382.20","408.80","443.17","471.27","503.04","536.48","569.53","605.88","642.30","676.20","713.25","748.00","784.08","822.58","862.92","904.12","944.00","988.12","1033.94","1078.22","1125.57","1174.44","1219.20","1271.47","1321.32","1373.73","1424.13","1473.56","1523.06","1577.80","1632.80","1692.33","1751.88","1804.98","1865.64","1925.04","1986.64","2048.64","2112.36","2177.07","2241.60","2304.72","2377.20","2443.50","2515.50","2594.70","2670.36","2747.52","2824.00","2907.76","2981.60","3064.35","3151.04","3236.05","3335.04","3423.42","3510.24","3609.13","3694.74","3790.59","3900.42","3997.84","4093.60","4201.20","4315.14","4440.32","4580.68","4717.80","4850.32","4981.08","5120.57","5295.40","5446.35","5591.49","5754.84","5939.64","6145.90","6353.16","6573.59","6818.15","7085.50","7369.09","7709.87","8107.01","8627.71","9908.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	26::smallint,
+	False::boolean,
+	0.0046::real,
+	7::integer,
+	360309.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0035410712}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.31","59.20","97.76","139.16","175.10","215.86","258.20","301.76","346.30","395.71","441.67","491.37","543.03","588.96","647.90","704.77","761.60","820.05","876.37","931.44","988.52","1051.24","1114.54","1179.42","1241.24","1315.60","1390.35","1465.83","1545.12","1616.40","1698.12","1773.90","1846.20","1925.82","1999.80","2079.66","2167.27","2254.16","2349.06","2439.60","2538.36","2639.88","2745.00","2842.88","2945.84","3061.35","3159.96","3268.20","3385.82","3497.60","3619.28","3731.16","3844.31","3972.32","4086.60","4223.18","4350.00","4491.60","4633.60","4772.85","4900.80","5039.44","5187.14","5331.15","5491.76","5659.20","5821.20","5993.74","6151.74","6324.80","6490.96","6680.54","6873.60","7073.04","7286.40","7516.05","7726.84","7955.22","8181.76","8428.98","8698.56","8945.39","9241.96","9521.28","9816.00","10132.22","10488.06","10859.64","11241.16","11644.83","12054.38","12542.40","13138.72","13710.72","14384.79","15172.80","16106.68","17329.62","18721.00","21017.28","28889.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	27::smallint,
+	False::boolean,
+	0.004766667::real,
+	6::integer,
+	21954.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10706667, 0.00063333334, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333}'::real[],
+	NULL::real[],
+	'{0.004360509}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.04","0.17","0.02","0.28","0.84","1.06","1.14","0.13","0.14","0.25","0.36","0.79","0.03","0.33","0.34","0.39","0.48","0.90","0.91","1.10","0.08","0.09","0.18","0.42","0.45","0.54","1.25","1.40","1.41","0.07","0.30","0.32","0.50","0.63","0.78","0.93","1.56","1.58","2.01","2.83","4.17","4.23","5.38","0.01","0.05","0.06","0.23","0.35","0.37","0.44","0.51","0.65","0.66","0.69","0.72","0.92","1.07","1.20","1.91","2.25","2.35","2.39","2.49","2.59","2.61","2.84","3.46","5.14","0.11","0.12","0.29","0.31","0.55","0.64","0.86","0.94","0.97","1.04","1.11","1.27","1.34","1.72","1.74","1.82","2.07","2.41","2.63","3.16","3.22","3.31","4.24","4.37","4.50","4.67","6.56","7.04","7.48","9.72","0.20"}'::numeric[],
+	E'{"0.10","0.76","1.28","1.69","2.10","2.54","3.00","3.45","3.87","4.42","4.93","5.42","5.92","6.50","7.06","7.75","8.39","9.02","9.63","10.39","11.20","12.02","12.86","13.70","14.51","15.26","16.17","17.18","18.15","19.08","20.18","21.20","22.36","23.50","24.63","25.72","26.96","28.39","29.87","31.24","32.78","34.20","35.67","37.38","39.11","41.00","42.83","44.65","46.61","48.72","50.66","53.20","55.29","57.88","60.49","63.18","66.04","69.09","72.25","75.29","78.51","82.02","85.29","89.36","92.98","96.95","101.40","105.70","110.69","116.16","120.93","126.18","131.91","137.88","143.80","151.06","157.08","164.57","172.99","181.14","190.17","200.65","210.92","221.02","232.90","244.78","259.12","273.65","291.32","310.11","330.23","353.23","380.19","411.93","449.37","493.85","546.42","616.37","721.39","893.95","2142.09"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	28::smallint,
+	False::boolean,
+	0.0052333334::real,
+	3::integer,
+	6889.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.80296665}'::real[],
+	NULL::real[],
+	'{0.6553299}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.01","2.20","4.55","7.28","10.58","14.36","17.92","22.46","25.33","29.09","32.44","36.89","41.40","45.19","49.75","55.22","62.09","68.46","74.86","81.76","91.57","99.10","106.96","114.24","121.21","127.94","137.96","148.71","157.54","170.28","181.68","193.93","204.76","214.01","227.90","241.64","255.16","269.95","283.85","297.98","314.58","330.18","348.86","367.79","387.60","402.79","419.99","435.31","461.47","484.00","509.09","533.90","558.08","588.06","619.44","645.35","672.88","700.29","729.03","760.23","796.67","836.28","873.12","909.36","951.28","1008.91","1061.09","1112.98","1155.96","1201.35","1259.28","1324.66","1399.44","1477.63","1548.31","1632.65","1703.81","1774.10","1847.07","1944.10","2036.97","2136.30","2215.42","2317.48","2479.32","2652.32","2791.40","2968.30","3152.68","3345.17","3578.36","3851.51","4127.20","4451.55","4914.34","5421.31","6009.40","6794.45","7819.40","9995.94","21255.41"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_ext_ship_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=29;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	29::smallint,
+	False::boolean,
+	0.0045::real,
+	6::integer,
+	81417.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0188, 0.0003, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0046927556}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","124.80","123.20","39.60","54.00","79.80","138.60","216.72","14.00","23.40","45.60","48.30","73.44","82.80","83.52","128.64","148.50","201.60","369.60"}'::numeric[],
+	E'{"0.01","5.94","11.44","16.77","22.24","28.70","34.72","40.68","46.76","54.04","61.00","68.16","76.50","85.26","94.55","103.02","111.44","121.44","132.24","143.40","153.90","165.76","177.65","188.67","201.11","212.38","224.93","238.72","252.96","266.76","282.10","299.12","315.56","331.39","347.22","363.12","379.85","399.00","416.25","434.16","453.96","475.60","497.55","521.70","543.90","568.03","592.20","618.64","644.00","669.06","697.92","724.13","755.70","784.09","816.31","849.52","882.75","915.75","950.25","987.00","1022.35","1059.10","1097.07","1144.50","1187.60","1237.04","1284.01","1339.45","1388.34","1443.94","1496.00","1543.70","1598.74","1656.20","1727.70","1794.60","1866.41","1936.12","2007.84","2091.57","2178.28","2270.17","2367.40","2465.85","2573.55","2691.00","2809.66","2948.40","3100.80","3253.56","3417.26","3620.70","3826.12","4070.04","4341.72","4685.14","5057.36","5597.70","6345.93","7552.84","14029.29"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=30;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	30::smallint,
+	False::boolean,
+	0.0045666667::real,
+	6::integer,
+	155617.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.011266666, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0071978415}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","221.76","267.30"}'::numeric[],
+	E'{"0.04","6.30","13.46","20.10","27.38","36.00","45.37","54.42","64.17","74.16","84.95","95.83","107.47","120.56","133.68","147.52","161.55","176.09","192.62","209.85","225.68","242.40","260.64","280.40","299.63","319.88","342.68","361.62","383.67","407.20","430.95","452.40","478.20","502.86","526.93","551.28","580.65","609.84","645.84","672.01","705.60","742.28","777.65","819.77","859.65","905.32","946.21","988.00","1030.29","1072.29","1120.20","1169.28","1222.48","1277.88","1335.95","1393.40","1452.30","1510.88","1577.52","1643.88","1712.18","1783.60","1864.20","1941.02","2021.80","2110.48","2194.50","2288.80","2382.00","2480.31","2575.77","2686.53","2796.40","2918.30","3030.33","3153.62","3270.28","3405.85","3555.37","3689.67","3856.30","4006.50","4182.84","4362.48","4551.55","4780.32","5045.92","5298.28","5580.25","5880.00","6219.92","6583.20","6993.36","7441.75","7943.75","8616.00","9434.75","10515.84","11757.96","14014.08","25785.76"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=31;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	31::smallint,
+	False::boolean,
+	0.004766667::real,
+	6::integer,
+	266415.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.011266666}'::real[],
+	NULL::real[],
+	'{-0.007137176}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","6.57","13.94","21.03","28.62","37.23","47.06","56.65","66.91","77.14","88.19","99.88","111.66","125.70","139.15","153.96","167.98","183.70","200.51","218.37","234.41","252.12","271.21","292.28","311.64","332.88","354.70","376.40","397.68","423.75","447.30","472.27","496.81","520.51","546.40","573.95","604.97","637.86","669.29","702.85","736.56","771.82","808.78","850.00","894.59","941.49","983.86","1030.60","1072.51","1120.44","1164.50","1218.82","1276.89","1328.94","1392.76","1450.62","1515.35","1577.79","1642.09","1715.87","1785.64","1867.43","1945.94","2025.64","2113.90","2200.02","2292.15","2386.61","2484.22","2590.13","2687.89","2800.02","2917.72","3043.84","3167.64","3291.60","3406.12","3562.87","3712.26","3872.48","4020.94","4187.61","4364.95","4559.15","4755.57","4989.93","5272.48","5532.24","5829.06","6143.38","6489.24","6878.77","7303.39","7746.09","8295.79","9014.30","9837.86","11001.37","12381.74","14679.09","26662.34"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_ship
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=32;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	32::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	280640.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0071525415}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","23.85","47.34","67.95","89.80","110.58","132.44","153.00","179.04","202.51","229.06","255.64","281.80","311.22","340.96","371.09","403.00","434.83","466.69","497.15","530.10","562.00","593.67","628.20","664.69","704.00","739.88","780.85","825.34","866.72","907.27","949.41","994.16","1044.45","1096.50","1144.92","1195.21","1250.15","1305.36","1361.76","1416.36","1475.91","1536.25","1598.70","1665.83","1732.92","1800.90","1873.10","1941.75","2016.72","2092.86","2175.34","2253.86","2345.76","2434.51","2518.72","2608.45","2696.29","2793.56","2894.40","2985.12","3079.88","3181.62","3294.00","3407.10","3528.30","3649.14","3775.68","3899.28","4033.51","4169.60","4307.38","4456.66","4620.28","4793.89","4963.42","5138.76","5318.80","5502.90","5715.60","5907.94","6131.28","6356.80","6629.70","6889.46","7169.33","7478.59","7780.37","8131.05","8498.52","8903.58","9369.99","9838.92","10426.64","11123.84","11986.61","13051.50","14332.97","16169.95","19117.60","36471.09"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_ship_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=33;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	33::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	613201.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00728921}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","24.55","48.62","69.15","91.91","112.84","135.45","157.97","183.66","207.27","233.71","261.95","289.12","318.33","350.11","381.22","413.11","444.48","477.58","508.92","542.83","576.18","609.45","644.62","682.66","719.94","759.00","801.51","845.42","887.38","930.05","971.99","1022.12","1070.40","1121.18","1175.11","1228.42","1282.74","1334.77","1397.05","1456.76","1508.61","1575.93","1641.47","1709.47","1778.38","1844.93","1917.32","1990.71","2063.03","2147.81","2231.80","2316.78","2402.40","2493.91","2591.15","2678.00","2770.78","2865.32","2974.50","3066.56","3162.22","3269.67","3378.18","3496.07","3622.04","3743.00","3878.25","4003.40","4149.54","4287.78","4434.50","4591.26","4750.74","4944.45","5105.41","5289.66","5467.44","5660.87","5871.93","6090.64","6310.11","6551.52","6808.71","7096.07","7374.30","7678.33","8022.91","8355.36","8765.02","9187.25","9660.31","10158.98","10789.68","11521.51","12322.88","13498.43","14789.11","16663.22","19689.06","37177.23"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: catalog_sales, Attribute: cs_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=34;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	34::smallint,
+	False::boolean,
+	0.0::real,
+	6::integer,
+	206524.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0003, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0019606797}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","-47.52"}'::numeric[],
+	E'{"-9478.75","-6317.17","-5427.84","-4811.17","-4310.01","-3964.66","-3670.14","-3411.00","-3196.27","-2980.12","-2792.84","-2624.60","-2471.95","-2325.60","-2192.15","-2061.36","-1940.00","-1830.51","-1735.50","-1637.76","-1537.14","-1452.35","-1375.59","-1298.36","-1224.32","-1155.27","-1092.42","-1022.40","-963.48","-909.46","-846.45","-791.42","-741.60","-693.68","-651.75","-611.00","-571.48","-529.55","-492.82","-458.06","-424.16","-393.25","-361.82","-332.56","-302.38","-277.25","-248.65","-223.78","-199.01","-180.17","-158.72","-138.32","-121.68","-105.41","-89.61","-74.48","-59.72","-46.63","-35.01","-23.56","-13.29","-4.92","3.90","16.20","29.60","44.02","63.55","84.33","106.65","130.83","159.30","193.63","231.83","274.32","317.52","364.48","414.57","470.10","538.53","608.95","685.44","768.20","856.98","953.40","1053.60","1164.76","1294.00","1444.00","1596.00","1771.35","1966.12","2176.68","2427.26","2738.40","3132.80","3548.87","4041.96","4805.58","5798.10","7455.03","16965.90"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: customer, Attribute: c_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.09763528}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"9","21261","42021","62080","82255","103369","125043","144232","165965","190286","211001","230315","251065","272203","292790","312482","334187","353856","373058","396690","415673","436316","456746","480529","502046","524523","546632","568546","589481","610972","631185","654707","675842","698400","718405","739653","760815","781559","803530","825502","846209","866622","888173","908015","929893","950771","971557","991734","1015944","1037799","1059421","1080667","1101711","1122753","1142324","1163272","1183361","1204818","1225216","1247329","1269800","1290928","1313000","1333417","1354039","1374731","1393758","1413066","1434044","1455682","1476112","1499430","1518599","1539394","1559012","1578764","1600604","1620632","1642082","1661234","1681629","1701960","1723759","1745015","1765218","1786153","1808002","1827671","1848579","1869421","1889087","1911370","1931677","1953626","1974278","1994274","2014813","2037922","2058859","2079452","2099872"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_customer_id
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0::real,
+	17::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.008318781}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"AAAAAAAAAAABNBAA","AAAAAAAAACGBGAAA","AAAAAAAAAELNKBAA","AAAAAAAAAHEPIBAA","AAAAAAAAAJKFCAAA","AAAAAAAAAMDPPBAA","AAAAAAAAAOPLIAAA","AAAAAAAABBKGGAAA","AAAAAAAABEDPKBAA","AAAAAAAABGMDNAAA","AAAAAAAABJECAAAA","AAAAAAAABMDEJBAA","AAAAAAAABONCCAAA","AAAAAAAACBEIBBAA","AAAAAAAACDPKGBAA","AAAAAAAACGLFEAAA","AAAAAAAACJEIMAAA","AAAAAAAACMCDAAAA","AAAAAAAACOLBDBAA","AAAAAAAADBIDOAAA","AAAAAAAADEGFPBAA","AAAAAAAADGPJIAAA","AAAAAAAADJHBOAAA","AAAAAAAADMAFGAAA","AAAAAAAADOHCCAAA","AAAAAAAAEAOAEBAA","AAAAAAAAEDNGDBAA","AAAAAAAAEGIFIAAA","AAAAAAAAEJAMPBAA","AAAAAAAAELLKDAAA","AAAAAAAAEOCLPAAA","AAAAAAAAFAINOAAA","AAAAAAAAFDBIJBAA","AAAAAAAAFFHIMBAA","AAAAAAAAFHPMHAAA","AAAAAAAAFKIAPBAA","AAAAAAAAFNCOBAAA","AAAAAAAAFPKHLAAA","AAAAAAAAGCDNHAAA","AAAAAAAAGEJHIBAA","AAAAAAAAGHBCCAAA","AAAAAAAAGJJENBAA","AAAAAAAAGMCKCAAA","AAAAAAAAGOMBABAA","AAAAAAAAHBIPLBAA","AAAAAAAAHDPAKAAA","AAAAAAAAHGJCKBAA","AAAAAAAAHJALPAAA","AAAAAAAAHLOFPAAA","AAAAAAAAHOHAAAAA","AAAAAAAAIAOACBAA","AAAAAAAAIDGNKAAA","AAAAAAAAIGCCNBAA","AAAAAAAAIIMJAAAA","AAAAAAAAILNBOBAA","AAAAAAAAIOCOJBAA","AAAAAAAAJAIBNBAA","AAAAAAAAJDBAABAA","AAAAAAAAJFFOFBAA","AAAAAAAAJICEDBAA","AAAAAAAAJKILJBAA","AAAAAAAAJMOJNBAA","AAAAAAAAJPEMKBAA","AAAAAAAAKBMKDBAA","AAAAAAAAKEDLDAAA","AAAAAAAAKGMFDBAA","AAAAAAAAKJJJCBAA","AAAAAAAAKMAFLBAA","AAAAAAAAKOGELBAA","AAAAAAAALAOCABAA","AAAAAAAALDGGLAAA","AAAAAAAALGAJJBAA","AAAAAAAALIJMEAAA","AAAAAAAALKOLOBAA","AAAAAAAALNFAKBAA","AAAAAAAALPKMDBAA","AAAAAAAAMCDMMBAA","AAAAAAAAMELNCBAA","AAAAAAAAMHFNBBAA","AAAAAAAAMJMFPBAA","AAAAAAAAMMGBFAAA","AAAAAAAAMPBPFAAA","AAAAAAAANBJMLAAA","AAAAAAAANECPPBAA","AAAAAAAANHBEAAAA","AAAAAAAANJIOCBAA","AAAAAAAANMDCBAAA","AAAAAAAANPAGFBAA","AAAAAAAAOBIDJBAA","AAAAAAAAODNGFAAA","AAAAAAAAOGECJBAA","AAAAAAAAOINLGAAA","AAAAAAAAOLGCEBAA","AAAAAAAAONPNAAAA","AAAAAAAAPAKLGAAA","AAAAAAAAPDDNKAAA","AAAAAAAAPFNALBAA","AAAAAAAAPIFFFAAA","AAAAAAAAPLABOAAA","AAAAAAAAPNGKCBAA","AAAAAAAAPPPOAAAA"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_current_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	3::smallint,
+	False::boolean,
+	0.036333334::real,
+	4::integer,
+	-0.50137764::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0013170508}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"83","18955","39087","58094","75845","95317","115100","134187","152171","172644","193010","211552","231710","251817","270655","288181","306995","323507","344088","362797","382712","404200","423621","442226","460401","479260","497142","517339","536731","556732","574796","592497","612826","632068","650345","670861","690813","710439","729562","747865","768032","784796","804004","823342","840808","862022","880748","899717","920319","938794","957931","976962","994731","1014023","1033686","1051262","1072185","1092147","1113436","1132849","1151543","1170064","1188829","1208390","1228056","1247895","1268450","1286523","1306787","1325642","1344821","1361249","1380841","1399617","1418271","1436735","1456195","1476598","1496520","1514478","1535680","1554729","1573897","1593768","1614360","1634204","1654338","1672759","1691901","1711514","1731470","1749749","1767712","1787017","1807176","1824761","1843120","1863530","1883265","1901706","1920535"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_current_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0347::real,
+	4::integer,
+	7192.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.00030779035}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"882","1308","3965","367","666","1327","6987"}'::int4[],
+	E'{"1","72","141","218","292","372","440","506","579","647","728","799","868","940","1006","1081","1151","1224","1294","1368","1432","1502","1576","1650","1728","1803","1873","1941","2024","2095","2168","2245","2318","2395","2472","2542","2617","2682","2751","2823","2897","2969","3041","3110","3179","3248","3319","3390","3457","3520","3590","3657","3725","3801","3881","3954","4024","4098","4179","4251","4312","4383","4451","4522","4604","4674","4745","4814","4885","4954","5024","5095","5171","5245","5317","5386","5452","5523","5591","5664","5732","5805","5883","5956","6025","6099","6170","6241","6316","6392","6464","6534","6610","6685","6756","6829","6900","6980","7059","7129","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_current_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.32888332::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0058509638}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"52","10026","21386","32663","42941","53021","65083","75763","86063","96263","107445","117990","127743","138145","147534","158592","168713","178593","188864","199238","210017","220563","231187","241437","252281","263159","273251","284057","295058","305713","315928","326018","336613","346947","357443","368266","378995","388655","399147","410310","419835","429767","442179","452745","463314","473270","483327","494816","505073","515313","525490","536085","546403","556179","567315","577096","587145","597369","608015","619292","629700","640103","651254","661172","671946","681745","691688","702105","712203","721654","733295","743331","753425","764850","774949","785116","795978","806368","817723","827531","838047","849099","859705","870677","881136","891818","902438","912558","922958","933355","943287","953511","964298","974663","985836","996922","1007782","1017952","1029639","1040067","1049984"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_first_shipto_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	6::smallint,
+	False::boolean,
+	0.035633333::real,
+	4::integer,
+	3649.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665}'::real[],
+	NULL::real[],
+	'{-0.0058256034}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2450039","2451757","2449267","2449566","2449608","2450648","2450973","2451697","2452197"}'::int4[],
+	E'{"2449028","2449061","2449097","2449131","2449163","2449198","2449239","2449274","2449311","2449346","2449381","2449417","2449457","2449492","2449530","2449568","2449601","2449635","2449669","2449706","2449746","2449780","2449818","2449857","2449893","2449930","2449972","2450009","2450045","2450081","2450118","2450155","2450194","2450228","2450265","2450301","2450337","2450372","2450407","2450444","2450483","2450523","2450560","2450594","2450633","2450672","2450708","2450743","2450779","2450812","2450853","2450890","2450930","2450969","2451005","2451044","2451078","2451114","2451147","2451184","2451221","2451261","2451295","2451334","2451370","2451411","2451449","2451486","2451523","2451560","2451594","2451627","2451664","2451702","2451740","2451774","2451810","2451846","2451879","2451918","2451954","2451991","2452028","2452063","2452099","2452135","2452172","2452207","2452242","2452277","2452312","2452352","2452389","2452429","2452461","2452495","2452530","2452566","2452602","2452640","2452678"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_first_sales_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	7::smallint,
+	False::boolean,
+	0.034733333::real,
+	4::integer,
+	3650.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665}'::real[],
+	NULL::real[],
+	'{-0.008479864}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2450009","2451727","2449237","2449536","2450618","2450943","2451260","2451667","2452039","2452167"}'::int4[],
+	E'{"2448998","2449032","2449067","2449101","2449135","2449170","2449209","2449245","2449281","2449317","2449352","2449389","2449428","2449463","2449500","2449537","2449571","2449603","2449637","2449673","2449713","2449747","2449785","2449823","2449859","2449897","2449940","2449977","2450013","2450049","2450084","2450121","2450161","2450196","2450234","2450270","2450306","2450341","2450375","2450412","2450450","2450489","2450526","2450562","2450599","2450638","2450674","2450708","2450743","2450778","2450819","2450854","2450894","2450934","2450971","2451008","2451044","2451079","2451114","2451151","2451188","2451226","2451263","2451301","2451338","2451379","2451417","2451453","2451492","2451528","2451561","2451594","2451629","2451669","2451706","2451741","2451776","2451811","2451845","2451884","2451921","2451957","2451993","2452029","2452067","2452104","2452140","2452175","2452211","2452245","2452281","2452322","2452358","2452398","2452431","2452465","2452501","2452536","2452573","2452610","2452648"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_salutation
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	8::smallint,
+	False::boolean,
+	0.035633333::real,
+	4::integer,
+	6.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.2827, 0.16666667, 0.166, 0.117466666, 0.11726667, 0.114266664}'::real[],
+	'{0.19105348}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Dr.","Mr.","Sir","Miss","Mrs.","Ms."}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_first_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0351::real,
+	6::integer,
+	2938.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.019733334, 0.0178, 0.0177, 0.014733333, 0.013333334, 0.012866667, 0.011166667, 0.0086, 0.008466667, 0.0082, 0.006, 0.0059666666, 0.0059666666, 0.0055, 0.0055, 0.0053666667, 0.0053, 0.0053, 0.0051, 0.0049666665, 0.0049, 0.0049, 0.0047, 0.0045, 0.0042, 0.004166667, 0.0041333335, 0.0040666666, 0.0039666668, 0.0039333333, 0.0039333333, 0.0038666667, 0.0038666667, 0.0038333333, 0.0038333333, 0.0038, 0.0038, 0.0037333334, 0.0036666666, 0.0035, 0.0035, 0.0034666667, 0.0034333332, 0.0034333332, 0.0033666666, 0.0033666666, 0.0033333334, 0.0031666667, 0.0031, 0.0031, 0.0030666667, 0.003, 0.0029666666, 0.0029666666, 0.0028666668, 0.0028333333, 0.0028333333, 0.0028, 0.0027666667, 0.0027, 0.0027, 0.0026666666, 0.0026333334, 0.0026333334, 0.0026, 0.0026, 0.0025666666, 0.0025666666, 0.0025, 0.0024666667, 0.0024666667, 0.0024333333, 0.0024, 0.0024, 0.0023666667, 0.0023333333, 0.0023333333, 0.0023333333, 0.0022666666, 0.0022333334, 0.0022333334, 0.0022, 0.0022, 0.0022, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021333334, 0.0020666667, 0.0020666667, 0.0020666667, 0.0020333333, 0.002, 0.0019666667, 0.0019666667, 0.0019333333, 0.0019, 0.0018666667}'::real[],
+	NULL::real[],
+	'{0.0041609285}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"John","James","Robert","Michael","David","William","Richard","Joseph","Charles","Thomas","Christopher","Linda","Mark","Daniel","Donald","Jennifer","Elizabeth","George","Barbara","Kenneth","Margaret","Paul","Dorothy","Edward","Susan","Brian","Jason","Lisa","Steven","Gary","Ronald","Anthony","Larry","Karen","Sandra","Helen","Matthew","Nancy","Kevin","Andrew","Eric","Sharon","Donna","Jeffrey","Betty","Timothy","Raymond","Jose","Frank","Jessica","Angela","Ruth","Melissa","Rebecca","Anna","Gloria","Laura","Stephen","Amy","Brenda","Cynthia","Deborah","Pamela","Patrick","Martha","Virginia","Michelle","Sarah","Diane","Joshua","Kimberly","Ann","Arthur","Scott","Douglas","Christine","Gregory","Harold","Katherine","Dennis","Joyce","Alice","Janet","Stephanie","Jerry","Kathleen","Marie","Peter","Theresa","Walter","Albert","Amanda","Teresa","Debra","Jonathan","Fred","Keith","Willie","Gerald","Lori"}'::varchar[],
+	E'{"Aaron","Adrienne","Alexander","Allyson","Andrea","Anne","April","Audrey","Benjamin","Bessie","Billy","Bradley","Brigitte","Caitlyn","Carlos","Carrie","Cecelia","Charlotte","Christian","Clara","Clifton","Cornelius","Cyrus","Danny","Dawn","Delta","Diana","Dora","Earl","Edna","Elena","Elsie","Erika","Ethel","Evelyn","Fleta","Freddie","Georgia","Glen","Gregorio","Hattie","Henriette","Homer","Ingrid","Jack","Jaleesa","Janis","Jed","Jerome","Jimmie","Joe","Jon","Juan","Julia","Justin","Kathy","Kerry","Kurt","Lavon","Leo","Letitia","Lois","Louis","Luis","Mae","Marco","Marilynn","Martin","Maurice","Melvin","Mike","Mitchell","Naomi","Nicholas","Norma","Oscar","Pauline","Phillip","Rachel","Randy","Renee","Robbie","Roger","Rose","Roy","Sabrina","Sara","Sharlene","Sherry","Stanley","Suzi","Tanya","Terry","Tina","Tonya","Tyrone","Veronica","Viola","Warren","Willian","Zulma"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_last_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	10::smallint,
+	False::boolean,
+	0.033933334::real,
+	7::integer,
+	4529.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.015133333, 0.011733334, 0.011033333, 0.009233333, 0.008533333, 0.008166667, 0.0059666666, 0.0048666666, 0.0048, 0.0047, 0.0046333335, 0.0046333335, 0.0043666665, 0.0043, 0.0041333335, 0.004, 0.0039666668, 0.0039, 0.0039, 0.0037333334, 0.0036333334, 0.0032666668, 0.0031666667, 0.0031333333, 0.0030666667, 0.003, 0.003, 0.0029, 0.0029, 0.0027666667, 0.0027333333, 0.0027333333, 0.0027, 0.0026333334, 0.0026333334, 0.0026333334, 0.0026, 0.0026, 0.0026, 0.0025666666, 0.0025, 0.0024666667, 0.0024333333, 0.0023666667, 0.0023666667, 0.0023333333, 0.0022, 0.0022, 0.0021333334, 0.0021333334, 0.0021333334, 0.0020666667, 0.0020333333, 0.0019, 0.0019, 0.0018666667, 0.0018666667, 0.0018333333, 0.0018, 0.0017666667, 0.0017666667, 0.0017666667, 0.0017333333, 0.0017333333, 0.0017333333, 0.0017333333, 0.0017, 0.0016666667, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016, 0.0016, 0.0016, 0.0015666666, 0.0015666666, 0.0015333333, 0.0015333333, 0.0015333333, 0.0015333333, 0.0015, 0.0015, 0.0015, 0.0015, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333}'::real[],
+	NULL::real[],
+	'{0.0012389864}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Smith","Johnson","Williams","Jones","Brown","Davis","Miller","Taylor","Thomas","Jackson","Moore","Wilson","Garcia","Anderson","Martin","Walker","Harris","Martinez","Robinson","Thompson","White","Young","Wright","Lee","Lewis","Hall","King","Rodriguez","Turner","Nelson","Allen","Hill","Roberts","Carter","Clark","Gonzalez","Adams","Hernandez","Scott","Campbell","Lopez","Baker","Green","Bell","Evans","Bailey","Rogers","Torres","Mitchell","Morgan","Stewart","Perez","Edwards","Collins","Sanchez","Morris","Phillips","Gray","Parker","Cox","Reed","Rivera","Brooks","Diaz","Richardson","Watson","Washington","Perry","Murphy","Patterson","Ross","Bryant","Cooper","Kelly","Henderson","Howard","Cook","James","Peterson","Simmons","Long","Mason","Russell","Wood","Gonzales","Murray","Price","Ramirez","Ward","Hughes","Myers","Barnes","Daniels","Harrison","Alexander","Bennett","Ford","Graham","Burns","Powell"}'::varchar[],
+	E'{"Aaron","Allison","Armstrong","Ayala","Barlow","Baxter","Benson","Black","Bonilla","Boyer","Bright","Burdick","Butler","Cano","Carroll","Chambers","Chinn","Coats","Comer","Correa","Creech","Cupp","Davies","Dent","Donovan","Duffy","Eaton","Enriquez","Farrington","Fink","Flynn","Frank","Fuller","Garrett","Gibson","Golding","Graves","Gross","Hale","Hardaway","Harvey","Heard","Herrera","Hobbs","Holt","Howe","Hunter","Jacobs","Johnston","Keller","Kirby","Kurtz","Larkin","Ledoux","Lindsey","Lowe","Mack","Markley","May","Mccormick","Mcgrath","Mcneil","Mercier","Moffitt","Morrison","Nagel","Nichols","Ocampo","Orozco","Padilla","Patton","Perkins","Pinto","Pratt","Raines","Reece","Rhodes","Ritter","Roman","Ruby","Salinas","Saylor","Seiler","Shepherd","Simpson","Snyder","Sperry","Stephens","Strickland","Sweeney","Thornton","Trejo","Valencia","Vernon","Walls","Weaver","West","Wiley","Winters","Worsham","Zuniga"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_preferred_cust_flag
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	11::smallint,
+	False::boolean,
+	0.03533333::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.49123332, 0.47343335}'::real[],
+	'{0.4982882}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: customer, Attribute: c_birth_day
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0334::real,
+	4::integer,
+	31.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0341, 0.0336, 0.0335, 0.033166666, 0.0326, 0.032266665, 0.032233335, 0.0321, 0.031933334, 0.0319, 0.0319, 0.0319, 0.031866666, 0.031833332, 0.031833332, 0.0317, 0.031533334, 0.031533334, 0.0315, 0.031466667, 0.031166667, 0.0311, 0.030966667, 0.030733334, 0.0307, 0.030533334, 0.030066667, 0.029833334, 0.029666666, 0.028233333, 0.019133333}'::real[],
+	'{0.03440461}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"27","15","26","5","10","23","21","19","14","6","7","18","12","13","24","17","16","22","1","25","8","11","9","3","28","4","29","2","20","30","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_birth_month
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0355::real,
+	4::integer,
+	12.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.08296666, 0.0828, 0.0826, 0.082166664, 0.08143333, 0.08093333, 0.079966664, 0.079733334, 0.079166666, 0.0789, 0.07836667, 0.07546667}'::real[],
+	'{0.08591734}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","1","8","7","9","10","5","6","12","4","11","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_birth_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	14::smallint,
+	False::boolean,
+	0.036066666::real,
+	4::integer,
+	69.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0158, 0.015133333, 0.0151, 0.0150666665, 0.014966667, 0.014966667, 0.014966667, 0.014966667, 0.0148, 0.014766667, 0.014733333, 0.0147, 0.0146, 0.0146, 0.014566666, 0.014366667, 0.014366667, 0.014366667, 0.014333333, 0.014333333, 0.0143, 0.014266667, 0.014266667, 0.014266667, 0.014233333, 0.0142, 0.014166667, 0.014166667, 0.014066666, 0.014066666, 0.014033333, 0.014033333, 0.014, 0.013966667, 0.013966667, 0.013966667, 0.013933334, 0.013933334, 0.013933334, 0.013866667, 0.013866667, 0.0138, 0.0138, 0.013733333, 0.013733333, 0.013666667, 0.0136, 0.0135, 0.0135, 0.013466666, 0.0134333335, 0.0134333335, 0.0134, 0.013366667, 0.013366667, 0.013266667, 0.013266667, 0.013266667, 0.013266667, 0.0132, 0.0131, 0.0131, 0.013066667, 0.013066667, 0.013033333, 0.013033333, 0.012933333, 0.012833334, 0.0127}'::real[],
+	'{0.023301385}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1940","1978","1935","1970","1955","1957","1959","1990","1988","1925","1956","1987","1972","1985","1946","1926","1932","1933","1929","1979","1968","1930","1951","1961","1975","1966","1953","1971","1939","1977","1941","1991","1960","1937","1948","1952","1927","1938","1962","1964","1976","1958","1986","1924","1928","1965","1983","1942","1963","1931","1944","1945","1984","1934","1954","1947","1980","1981","1989","1982","1950","1969","1973","1974","1936","1949","1943","1967","1992"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: customer, Attribute: c_birth_country
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	15::smallint,
+	False::boolean,
+	0.035633333::real,
+	9::integer,
+	211.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.0056666667, 0.0055333334}'::real[],
+	NULL::real[],
+	'{0.013934988}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"GEORGIA","GREENLAND"}'::varchar[],
+	E'{"AFGHANISTAN","ALBANIA","AMERICAN SAMOA","ANGOLA","ANGUILLA","ARGENTINA","ARUBA","AUSTRIA","BAHAMAS","BANGLADESH","BELARUS","BELIZE","BERMUDA","BOLIVIA","BOUVET ISLAND","BRUNEI DARUSSALAM","BURUNDI","CAMBODIA","CANADA","CAYMAN ISLANDS","CHRISTMAS ISLAND","COSTA RICA","CROATIA","CYPRUS","DENMARK","DOMINICA","EGYPT","EQUATORIAL GUINEA","ETHIOPIA","FIJI","FRANCE","FRENCH POLYNESIA","GAMBIA","GHANA","GREECE","GUADELOUPE","GUATEMALA","GUINEA","HAITI","HONDURAS","ICELAND","INDONESIA","IRELAND","ISRAEL","JAMAICA","JERSEY","KAZAKHSTAN","KIRIBATI","KUWAIT","LEBANON","LIBERIA","LITHUANIA","LUXEMBOURG","MALAWI","MALDIVES","MALTA","MARTINIQUE","MAURITIUS","MEXICO","MONACO","MONTENEGRO","MOROCCO","NAMIBIA","NEPAL","NETHERLANDS ANTILLES","NEW ZEALAND","NIGER","NIUE","NORWAY","PALAU","PAPUA NEW GUINEA","PERU","PITCAIRN","PORTUGAL","QATAR","ROMANIA","RWANDA","SAMOA","SAUDI ARABIA","SERBIA","SIERRA LEONE","SLOVAKIA","SOLOMON ISLANDS","SOUTH AFRICA","SRI LANKA","SURINAME","SWEDEN","SYRIAN ARAB REPUBLIC","THAILAND","TOGO","TONGA","TUNISIA","TUVALU","UKRAINE","UNITED KINGDOM","URUGUAY","VANUATU","VIET NAM","WALLIS AND FUTUNA","YEMEN","ZIMBABWE"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_login
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	16::smallint,
+	False::boolean,
+	1.0::real,
+	0::integer,
+	0.0::real,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_email_address
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	17::smallint,
+	False::boolean,
+	0.03596667::real,
+	28::integer,
+	-0.9640333::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00065877277}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Aaron.Allen@QVp8KYxoqS.edu","Albert.Mcnabb@JqFg1Vfr.edu","Allen.Blackmon@rDQezy0Iy.org","Amy.Moore@lIXLGiGxl.com","Angela.Perez@9CODy4qpPeA8HCLX.com","Annie.Anderson@D1dOEV8V7YH.edu","April.Sanchez@MlJE7Jyr1KnbMizt8.com","Barbara.Bird@Bsz4Y8vF.edu","Bennie.Mcdonald@8a.com","Beverly.Armstrong@QKMtgEU.edu","Brady.Pacheco@V3G7zDs.org","Brian.Otto@5Ue35SXHl043P.org","Candy.Cox@BmsyXv426e.edu","Casey.Steele@TkMmIusn.com","Charles.Brito@qPU9PAt6xF.com","Chelsey.Gil@U7R6AeIVeQNbM.org","Christopher.Caraway@baXEFsAXkiXc4H.com","Clarence.Martinez@Tjom5JSSLsiqH.edu","Corinne.Blount@gG8DjsIs77.edu","Dale.Peterson@UP1FQ.com","Danny.Rudd@Qj.edu","David.Hernandez@XvDstf8oVspNVEq9N2ek.edu","Dawn.Washington@UZL4A2cTelj.org","Delorse.Mann@p1.edu","Diane.Ruiz@tq8V3.edu","Dona.Rucker@U5tPkxBoh3Nvvr.edu","Dorothy.Ledoux@6UXxuie.org","Ebony.Straub@O0ny7G.edu","Edwin.Brown@jifz5d3.com","Elizabeth.Rowe@x7a.com","Erica.Stewart@MjVPLVkiTTx1k9xvn.com","Ethel.Bowers@BchSkuO.edu","Felisha.White@4KHiD3EfpI.org","Fred.Burns@YAxMo0quQt02.org","Gaynell.Duran@PP5khP2OBXNnz.edu","Gerald.Olivas@Hs63PKrg.org","Goldie.Costello@74uH9.com","Harold.Mckinney@0Ymy5L.edu","Helene.Lockhart@4guNOhMAJ.org","Howard.Clarkson@KEs7Z6hdVT5d.edu","Jack.Davis@D7dTycb6ort.org","James.Cockrell@5lqoIx4paJn9P.org","James.Richter@7JahtLhEvS.org","Janice.Choate@ItXxi6VjtefUmkF.org","Jeanette.Mathews@mXCyZTs8MaGK9.org","Jennifer.Emerson@LADJl.com","Jerry.Willoughby@4h6L6um1aOm0JTk.edu","Joanna.French@Dn.com","John.Byrd@xAeLnuIQqDO4V.edu","John.Nail@vdm7UXfYYeeR5.org","Jonathan.Cochran@a1YLy7.com","Josephine.Barton@jbuycDaa1Dih2f6TbHs.org","Joshua.Trent@P5VKT8eLAEqph7.org","Julia.Mcneil@UXUiYMm4Rf1r1ysly2.com","Karen.Salmon@hVtuyn2.org","Kathy.Roush@f1.com","Kenneth.Nolen@fXIxCA8ecA7kUe.edu","Kimberly.Ward@UjmN1i5S0HqjOSB6P.org","Larry.Mccollum@KM3A2VsKR51LR7aSC2.edu","Leann.Lindsay@CYHO5.org","Lillian.Gibbons@ex2.edu","Lisa.Kaiser@2.edu","Lorraine.Wasson@fxUN1RDnuPC.com","Lyn.Green@ab9AnRe6OP.edu","Margaret.Childers@I2BJusIOR.org","Marilyn.Cochran@fXUsGKiG2pQn5p.org","Mark.Townsend@QRk6f4vPmjzGsd.edu","Matthew.Brown@BbgxEpsOa2.edu","Melissa.Brown@tU.org","Michael.Evans@na3Fzya.edu","Michael.Vickery@tGpS.edu","Millie.Wood@CYrA5ZCpBUxN.com","Nancy.Hubbard@1Dij5VOarSDD.com","Nicole.Cartwright@XVpmQfap67h39R.edu","Otha.Mathews@Q.edu","Paul.Bernard@l8hNZT.com","Peter.Bean@1hcfjEMbL.com","Rafael.Walker@DdbVsZ48tXFR.org","Raymond.Willis@FuCYxX.org","Richard.Blue@hk6sJl.org","Richard.Walker@QkOyOiijkoT6tALu.org","Robert.Feliciano@zrxHvBIUT1.org","Robert.Schrader@84hFFO.edu","Ronald.Barajas@SmV.edu","Rose.Rivera@nI5i3amDP9e.com","Ruth.Noble@nsRPMH7imQms.edu","Sandra.Ngo@NpRHjOrv.org","Sean.Young@cSmSeTb.edu","Shelly.Prentice@fOdVDfc3l.org","Stephanie.Maupin@1aO67HVBb4t.org","Stuart.Mintz@sCH9lO.com","Tamika.Walker@LypSN7cml.com","Terry.Pence@9V95I2n.edu","Thomas.Logan@62ZLdPqs6.edu","Tina.Fry@ggnu7.com","Troy.Hunt@HEIC1huvlV2.com","Vicky.Smith@7NTjUV1y.com","Walter.Guinn@q0V9yqO.com","William.Biddle@X3bGbi3YEGk.edu","William.Silva@OsUh7.edu","Zulma.Williams@NNUybLiKUcP.com"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: customer, Attribute: c_last_review_date
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	18::smallint,
+	False::boolean,
+	0.03643333::real,
+	4::integer,
+	366.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0033333334, 0.0033333334}'::real[],
+	NULL::real[],
+	'{-0.010210618}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2452342","2452574"}'::int4[],
+	E'{"2452283","2452286","2452290","2452293","2452297","2452301","2452304","2452308","2452312","2452315","2452318","2452322","2452326","2452329","2452333","2452337","2452341","2452345","2452349","2452352","2452356","2452360","2452363","2452367","2452371","2452374","2452378","2452382","2452386","2452389","2452393","2452397","2452400","2452404","2452408","2452411","2452414","2452418","2452422","2452425","2452429","2452433","2452437","2452440","2452444","2452447","2452451","2452455","2452458","2452462","2452465","2452469","2452473","2452476","2452480","2452483","2452487","2452491","2452494","2452498","2452501","2452505","2452508","2452512","2452515","2452519","2452523","2452527","2452531","2452535","2452538","2452542","2452545","2452549","2452553","2452556","2452560","2452563","2452568","2452571","2452576","2452579","2452583","2452587","2452591","2452594","2452598","2452601","2452605","2452608","2452612","2452616","2452619","2452623","2452626","2452630","2452634","2452638","2452641","2452645","2452648"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2415027","2415771","2416520","2417211","2417903","2418630","2419355","2420088","2420908","2421635","2422337","2423125","2423817","2424576","2425331","2426034","2426734","2427456","2428161","2428886","2429586","2430281","2431030","2431747","2432487","2433188","2433919","2434660","2435416","2436096","2436816","2437551","2438254","2438932","2439677","2440414","2441121","2441884","2442643","2443351","2444066","2444821","2445520","2446305","2447089","2447791","2448548","2449230","2449930","2450652","2451408","2452175","2452928","2453663","2454412","2455152","2455942","2456650","2457349","2458087","2458835","2459531","2460255","2460995","2461677","2462381","2463126","2463880","2464613","2465432","2466146","2466884","2467605","2468353","2469108","2469764","2470509","2471242","2471960","2472732","2473465","2474220","2474963","2475782","2476553","2477254","2477964","2478666","2479406","2480132","2480928","2481630","2482367","2483101","2483817","2484513","2485191","2485905","2486655","2487351","2488066"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_date_id
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0::real,
+	17::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.004197001}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"AAAAAAAAAAABFCAA","AAAAAAAAACLOFCAA","AAAAAAAAAFFCFCAA","AAAAAAAAAHNPECAA","AAAAAAAAAKHDFCAA","AAAAAAAAAMPOECAA","AAAAAAAAAPIBFCAA","AAAAAAAABBPBFCAA","AAAAAAAABEFFFCAA","AAAAAAAABGOIFCAA","AAAAAAAABJKKFCAA","AAAAAAAABMDCFCAA","AAAAAAAABONBFCAA","AAAAAAAACBFDFCAA","AAAAAAAACDNAFCAA","AAAAAAAACGHOFCAA","AAAAAAAACJCMFCAA","AAAAAAAACLLAFCAA","AAAAAAAACOBLFCAA","AAAAAAAADAMDFCAA","AAAAAAAADDFPECAA","AAAAAAAADGAOFCAA","AAAAAAAADIKLFCAA","AAAAAAAADLDCFCAA","AAAAAAAADOCDFCAA","AAAAAAAAEAKPECAA","AAAAAAAAEDEAFCAA","AAAAAAAAEFPHFCAA","AAAAAAAAEILJFCAA","AAAAAAAAELGOECAA","AAAAAAAAENOOFCAA","AAAAAAAAFAFPECAA","AAAAAAAAFCPJFCAA","AAAAAAAAFFGHFCAA","AAAAAAAAFHMOECAA","AAAAAAAAFKEKFCAA","AAAAAAAAFMMJFCAA","AAAAAAAAFPCKFCAA","AAAAAAAAGBKJFCAA","AAAAAAAAGEDOECAA","AAAAAAAAGGOAFCAA","AAAAAAAAGJKHFCAA","AAAAAAAAGMEBFCAA","AAAAAAAAGONOFCAA","AAAAAAAAHBJHFCAA","AAAAAAAAHECHFCAA","AAAAAAAAHGLOECAA","AAAAAAAAHJFDFCAA","AAAAAAAAHLOBFCAA","AAAAAAAAHOFIFCAA","AAAAAAAAIANCFCAA","AAAAAAAAIDFPECAA","AAAAAAAAIFMFFCAA","AAAAAAAAIIGHFCAA","AAAAAAAAILABFCAA","AAAAAAAAINJEFCAA","AAAAAAAAJADHFCAA","AAAAAAAAJCLBFCAA","AAAAAAAAJFDCFCAA","AAAAAAAAJHLMFCAA","AAAAAAAAJKDBFCAA","AAAAAAAAJMKOFCAA","AAAAAAAAJPCHFCAA","AAAAAAAAKBMIFCAA","AAAAAAAAKEEPECAA","AAAAAAAAKGODFCAA","AAAAAAAAKJGPECAA","AAAAAAAAKLMAFCAA","AAAAAAAAKOFCFCAA","AAAAAAAALBAAFCAA","AAAAAAAALDKOECAA","AAAAAAAALGBIFCAA","AAAAAAAALIGMFCAA","AAAAAAAALKMOECAA","AAAAAAAALNENFCAA","AAAAAAAALPMOFCAA","AAAAAAAAMCFFFCAA","AAAAAAAAMELFFCAA","AAAAAAAAMHFJFCAA","AAAAAAAAMJOIFCAA","AAAAAAAAMMHDFCAA","AAAAAAAAMPBJFCAA","AAAAAAAANBKMFCAA","AAAAAAAANEHIFCAA","AAAAAAAANGMPECAA","AAAAAAAANJIAFCAA","AAAAAAAANMDDFCAA","AAAAAAAANOPGFCAA","AAAAAAAAOBHNFCAA","AAAAAAAAOEAPFCAA","AAAAAAAAOGKIFCAA","AAAAAAAAOJBGFCAA","AAAAAAAAOLIJFCAA","AAAAAAAAOOALFCAA","AAAAAAAAPAJMFCAA","AAAAAAAAPDCOECAA","AAAAAAAAPFLAFCAA","AAAAAAAAPIECFCAA","AAAAAAAAPKNIFCAA","AAAAAAAAPNFPFCAA","AAAAAAAAPPPOFCAA"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: date_dim, Attribute: d_date
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1095::oid,
+	1095::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1900-01-07","1902-01-21","1904-02-09","1905-12-31","1907-11-23","1909-11-19","1911-11-14","1913-11-16","1916-02-14","1918-02-10","1920-01-13","1922-03-11","1924-02-01","1926-03-01","1928-03-25","1930-02-26","1932-01-27","1934-01-18","1935-12-24","1937-12-18","1939-11-18","1941-10-13","1943-11-01","1945-10-18","1947-10-28","1949-09-28","1951-09-29","1953-10-09","1955-11-04","1957-09-14","1959-09-04","1961-09-08","1963-08-12","1965-06-20","1967-07-05","1969-07-11","1971-06-18","1973-07-20","1975-08-18","1977-07-26","1979-07-11","1981-08-04","1983-07-04","1985-08-27","1987-10-20","1989-09-21","1991-10-18","1993-08-30","1995-07-31","1997-07-22","1999-08-17","2001-09-22","2003-10-15","2005-10-19","2007-11-07","2009-11-16","2012-01-15","2013-12-23","2015-11-22","2017-11-29","2019-12-17","2021-11-12","2023-11-06","2025-11-15","2027-09-28","2029-09-01","2031-09-16","2033-10-09","2035-10-12","2038-01-08","2039-12-23","2041-12-30","2043-12-21","2046-01-07","2048-02-01","2049-11-18","2051-12-03","2053-12-05","2055-11-23","2058-01-03","2060-01-06","2062-01-30","2064-02-12","2066-05-11","2068-06-20","2070-05-22","2072-05-01","2074-04-03","2076-04-12","2078-04-08","2080-06-12","2082-05-15","2084-05-21","2086-05-25","2088-05-10","2090-04-06","2092-02-13","2094-01-27","2096-02-16","2098-01-12","2099-12-28"}'::date[],
+	NULL::date[],
+	NULL::date[],
+	NULL::date[],
+	NULL::date[]);
+--
+-- Table: date_dim, Attribute: d_month_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"979","1761","198","288","356","445","552","594","751","941","1154","1251"}'::int4[],
+	E'{"0","24","48","71","94","117","141","164","191","217","239","265","289","314","339","363","386","409","432","458","480","503","528","551","577","601","625","649","675","695","719","743","768","790","814","838","861","885","911","934","959","985","1009","1034","1059","1083","1106","1130","1152","1176","1201","1226","1252","1277","1301","1326","1351","1373","1396","1421","1444","1467","1491","1515","1537","1560","1585","1609","1633","1661","1684","1707","1731","1755","1781","1803","1827","1851","1874","1900","1923","1948","1973","1999","2024","2048","2070","2094","2117","2141","2167","2190","2213","2238","2261","2283","2306","2329","2354","2376","2399"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_week_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.14316417::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","108","215","313","412","516","620","724","841","945","1046","1158","1257","1365","1473","1574","1674","1777","1878","1981","2081","2180","2287","2390","2496","2596","2700","2806","2914","3011","3114","3219","3319","3416","3523","3628","3729","3838","3946","4048","4150","4258","4357","4470","4582","4682","4790","4887","4987","5091","5199","5308","5416","5521","5628","5733","5846","5947","6047","6153","6260","6359","6462","6568","6666","6766","6873","6980","7085","7202","7304","7409","7512","7619","7727","7821","7927","8032","8135","8245","8350","8457","8564","8681","8791","8891","8992","9093","9198","9302","9416","9516","9621","9726","9828","9928","10025","10127","10234","10333","10435"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_quarter_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	801.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0018, 0.0018, 0.0017333333}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"141","754","588"}'::int4[],
+	E'{"1","9","17","25","32","40","48","56","65","73","81","89","97","105","113","121","128","136","145","153","161","169","177","184","192","200","208","216","225","232","240","248","255","263","271","279","287","295","303","311","319","327","335","343","352","359","367","375","383","390","399","407","415","423","431","439","448","456","463","471","480","487","495","503","511","518","526","534","543","551","559","567","575","583","593","600","608","616","624","632","640","648","657","665","674","682","689","697","705","713","721","729","737","745","753","762","769","777","786","793","801"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0060666665, 0.006, 0.0058333334, 0.0057666665, 0.0056666667}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1957","2088","1929","1907","2027"}'::int4[],
+	E'{"1900","1902","1904","1905","1908","1910","1912","1914","1916","1918","1920","1922","1924","1926","1928","1931","1933","1935","1937","1939","1940","1942","1944","1946","1948","1950","1952","1954","1956","1959","1961","1963","1965","1967","1969","1970","1972","1974","1976","1978","1980","1982","1984","1986","1988","1990","1992","1994","1996","1998","2000","2002","2004","2006","2008","2010","2012","2014","2016","2017","2019","2021","2023","2025","2028","2030","2032","2034","2036","2038","2040","2042","2044","2046","2048","2050","2052","2054","2055","2058","2059","2061","2064","2066","2068","2070","2072","2073","2075","2077","2079","2081","2083","2085","2087","2090","2092","2094","2096","2098","2099"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_dow
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	8::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	7.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.14473334, 0.14406666, 0.14326666, 0.14316666, 0.14263333, 0.14153333, 0.1406}'::real[],
+	'{0.13635832}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2","3","1","4","0","6","5"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_moy
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	12.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.085533336, 0.085433334, 0.0849, 0.0846, 0.084366664, 0.08426667, 0.08393333, 0.08316667, 0.0829, 0.082, 0.08183333, 0.07706667}'::real[],
+	'{0.088353634}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","5","10","12","1","7","6","8","9","11","4","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	31.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0351, 0.0338, 0.03376667, 0.033733334, 0.033733334, 0.033633333, 0.033466667, 0.033466667, 0.03313333, 0.0331, 0.032966666, 0.032966666, 0.032966666, 0.0329, 0.032866668, 0.032766666, 0.0327, 0.0326, 0.0325, 0.0325, 0.0324, 0.032366667, 0.032333333, 0.032266665, 0.032133333, 0.032, 0.031533334, 0.030833334, 0.0305, 0.0304, 0.018566666}'::real[],
+	'{0.03590256}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"13","23","22","1","24","5","7","16","26","21","14","17","28","20","6","2","9","10","12","19","18","8","15","27","4","25","11","30","29","3","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_qoy
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	11::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	4.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.25106665, 0.25043333, 0.2494, 0.2491}'::real[],
+	'{0.25712454}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2","3","4","1"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_fy_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0060666665, 0.006, 0.0058333334, 0.0057666665, 0.0056666667}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1957","2088","1929","1907","2027"}'::int4[],
+	E'{"1900","1902","1904","1905","1908","1910","1912","1914","1916","1918","1920","1922","1924","1926","1928","1931","1933","1935","1937","1939","1940","1942","1944","1946","1948","1950","1952","1954","1956","1959","1961","1963","1965","1967","1969","1970","1972","1974","1976","1978","1980","1982","1984","1986","1988","1990","1992","1994","1996","1998","2000","2002","2004","2006","2008","2010","2012","2014","2016","2017","2019","2021","2023","2025","2028","2030","2032","2034","2036","2038","2040","2042","2044","2046","2048","2050","2052","2054","2055","2058","2059","2061","2064","2066","2068","2070","2072","2073","2075","2077","2079","2081","2083","2085","2087","2090","2092","2094","2096","2098","2099"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_fy_quarter_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	801.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0018, 0.0018, 0.0017333333}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"141","754","588"}'::int4[],
+	E'{"1","9","17","25","32","40","48","56","65","73","81","89","97","105","113","121","128","136","145","153","161","169","177","184","192","200","208","216","225","232","240","248","255","263","271","279","287","295","303","311","319","327","335","343","352","359","367","375","383","390","399","407","415","423","431","439","448","456","463","471","480","487","495","503","511","518","526","534","543","551","559","567","575","583","593","600","608","616","624","632","640","648","657","665","674","682","689","697","705","713","721","729","737","745","753","762","769","777","786","793","801"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_fy_week_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	14::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.14316417::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","108","215","313","412","516","620","724","841","945","1046","1158","1257","1365","1473","1574","1674","1777","1878","1981","2081","2180","2287","2390","2496","2596","2700","2806","2914","3011","3114","3219","3319","3416","3523","3628","3729","3838","3946","4048","4150","4258","4357","4470","4582","4682","4790","4887","4987","5091","5199","5308","5416","5521","5628","5733","5846","5947","6047","6153","6260","6359","6462","6568","6666","6766","6873","6980","7085","7202","7304","7409","7512","7619","7727","7821","7927","8032","8135","8245","8350","8457","8564","8681","8791","8891","8992","9093","9198","9302","9416","9516","9621","9726","9828","9928","10025","10127","10234","10333","10435"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_day_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	15::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	7.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.14473334, 0.14406666, 0.14326666, 0.14316666, 0.14263333, 0.14153333, 0.1406}'::real[],
+	'{0.14524722}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Tuesday","Wednesday","Monday","Thursday","Sunday","Saturday","Friday"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: date_dim, Attribute: d_quarter_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	16::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	800.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.0017666667, 0.0016666667, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2088Q2","1957Q2","1907Q3","1937Q1","2049Q2","2051Q2","2055Q2","2096Q4"}'::varchar[],
+	E'{"1900Q1","1902Q1","1904Q1","1905Q4","1908Q1","1910Q1","1912Q1","1913Q4","1916Q1","1918Q1","1920Q1","1922Q1","1924Q1","1926Q1","1928Q1","1930Q1","1931Q4","1933Q4","1935Q4","1938Q1","1940Q1","1941Q4","1943Q4","1945Q4","1947Q4","1949Q3","1951Q3","1953Q3","1955Q4","1957Q4","1959Q4","1961Q4","1963Q4","1965Q3","1967Q3","1969Q3","1971Q3","1973Q3","1975Q3","1977Q3","1979Q2","1981Q2","1983Q2","1985Q2","1987Q3","1989Q3","1991Q3","1993Q2","1995Q2","1997Q1","1999Q2","2001Q2","2003Q2","2005Q2","2007Q2","2009Q2","2011Q3","2013Q2","2015Q2","2017Q2","2019Q2","2021Q1","2023Q1","2025Q1","2027Q1","2028Q4","2030Q4","2032Q4","2034Q4","2037Q1","2039Q1","2041Q1","2043Q1","2045Q1","2046Q4","2049Q1","2051Q1","2053Q3","2055Q4","2057Q4","2059Q4","2061Q4","2063Q4","2065Q4","2068Q1","2070Q1","2072Q1","2073Q4","2075Q4","2077Q4","2079Q4","2081Q4","2083Q4","2085Q4","2087Q4","2090Q1","2091Q4","2093Q4","2095Q4","2098Q1","2099Q4"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+--
+-- Table: date_dim, Attribute: d_holiday
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9912, 0.0088}'::real[],
+	'{0.9816509}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_weekend
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.71786666, 0.28213334}'::real[],
+	'{0.59107685}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_following_holiday
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9918333, 0.008166667}'::real[],
+	'{0.98435473}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_first_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2444818","2468620","2421046","2423786","2425856","2428566","2431822","2433099","2437878","2443661","2450144","2453097"}'::int4[],
+	E'{"2415021","2415751","2416481","2417181","2417881","2418581","2419311","2420012","2420833","2421626","2422294","2423087","2423817","2424576","2425338","2426068","2426768","2427470","2428169","2428959","2429630","2430330","2431091","2431791","2432583","2433314","2434044","2434775","2435565","2436174","2436904","2437635","2438396","2439066","2439796","2440527","2441226","2441957","2442748","2443449","2444209","2445002","2445732","2446491","2447253","2447983","2448683","2449413","2450084","2450815","2451576","2452335","2453127","2453888","2454619","2455379","2456141","2456810","2457510","2458271","2458971","2459671","2460402","2461132","2461803","2462503","2463264","2463995","2464725","2465576","2466276","2466976","2467707","2468437","2469229","2469898","2470629","2471359","2472059","2472850","2473551","2474311","2475073","2475864","2476626","2477356","2478025","2478755","2479456","2480186","2480978","2481677","2482378","2483138","2483839","2484508","2485208","2485910","2486669","2487340","2488039"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_last_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	21::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{0.99998605}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2445029","2468892","2421227","2423785","2426098","2428596","2431821","2433279","2438089","2443811","2450203","2453187"}'::int4[],
+	E'{"2415020","2415930","2416661","2417332","2418061","2418734","2419522","2420195","2420984","2421834","2422505","2423236","2424027","2424756","2425489","2426279","2426889","2427619","2428350","2429139","2429810","2430481","2431271","2432002","2432732","2433463","2434194","2434983","2435715","2436385","2437055","2437786","2438576","2439244","2439977","2440705","2441437","2442166","2442899","2443627","2444360","2445151","2445881","2446671","2447404","2448132","2448864","2449534","2450265","2450995","2451786","2452518","2453308","2454039","2454770","2455559","2456293","2456961","2457691","2458422","2459152","2459882","2460553","2461284","2461953","2462683","2463414","2464203","2464935","2465727","2466457","2467128","2467858","2468648","2469380","2470050","2470780","2471511","2472240","2473031","2473702","2474492","2475224","2476016","2476807","2477477","2478206","2478935","2479607","2480337","2481130","2481857","2482529","2483318","2483990","2484660","2485389","2486059","2486790","2487519","2488372"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_same_day_ly
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	22::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.9988364::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2414662","2415406","2416155","2416846","2417538","2418265","2418990","2419723","2420543","2421270","2421972","2422760","2423452","2424211","2424965","2425669","2426369","2427091","2427796","2428521","2429221","2429916","2430665","2431382","2432122","2432823","2433554","2434295","2435051","2435731","2436451","2437186","2437889","2438567","2439312","2440049","2440756","2441519","2442278","2442986","2443701","2444456","2445155","2445940","2446724","2447426","2448183","2448865","2449565","2450287","2451043","2451810","2452563","2453298","2454047","2454787","2455577","2456285","2456984","2457722","2458470","2459166","2459890","2460630","2461312","2462016","2462761","2463515","2464248","2465067","2465781","2466519","2467240","2467988","2468743","2469399","2470144","2470877","2471595","2472367","2473100","2473855","2474598","2475417","2476187","2476889","2477598","2478301","2479040","2479767","2480562","2481265","2482001","2482736","2483451","2484148","2484826","2485540","2486290","2486986","2487701"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_same_day_lq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	23::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.99268985::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2414935","2415679","2416428","2417119","2417811","2418538","2419263","2419996","2420816","2421543","2422245","2423033","2423725","2424484","2425239","2425942","2426642","2427364","2428069","2428794","2429494","2430189","2430938","2431655","2432395","2433097","2433828","2434568","2435324","2436005","2436725","2437460","2438163","2438842","2439586","2440323","2441031","2441793","2442552","2443260","2443975","2444730","2445429","2446214","2446997","2447700","2448456","2449139","2449839","2450561","2451317","2452084","2452836","2453571","2454320","2455060","2455850","2456558","2457257","2457995","2458743","2459439","2460163","2460903","2461586","2462290","2463035","2463788","2464521","2465340","2466054","2466792","2467513","2468261","2469016","2469672","2470417","2471150","2471868","2472640","2473373","2474128","2474871","2475692","2476462","2477164","2477873","2478576","2479315","2480042","2480837","2481540","2482276","2483011","2483726","2484423","2485099","2485813","2486563","2487259","2487974"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: date_dim, Attribute: d_current_day
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	24::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	1.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{1.0}'::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_week
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	25::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	1.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{1.0}'::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_month
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	26::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9996, 0.0004}'::real[],
+	'{0.9994385}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_quarter
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	27::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.99873334, 0.0012666667}'::real[],
+	'{0.9982279}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: date_dim, Attribute: d_current_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	28::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.99543333, 0.0045666667}'::real[],
+	'{0.99365747}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+--
+-- Table: store_sales, Attribute: ss_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.044::real,
+	4::integer,
+	1823.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0015, 0.0014666667, 0.0014666667, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011}'::real[],
+	NULL::real[],
+	'{-0.0022345192}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451534","2452228","2451129","2452240","2451139","2451161","2451546","2452258","2452621","2452589","2452600","2452625","2451137","2451148","2451181","2451896","2452251","2452260","2451178","2451528","2451904","2451909","2452242","2452250","2452628","2452642","2451121","2451134","2451174","2451496","2451864","2451872","2451879","2451910","2452257","2452271","2452592","2451112","2451149","2451525","2451865","2452232","2452277","2452598","2452640","2451127","2451136","2451153","2451177","2451505","2451541","2451851","2451862","2452230","2452238","2452266","2452607","2452609","2452627","2452641","2451142","2451158","2451160","2451491","2451868","2451885","2451887","2452248","2452601","2452606","2452634","2451123","2451125","2451133","2451138","2451144","2451506","2451509","2451529","2451884","2451898","2452219","2452221","2452225","2452246","2452256","2452274","2452597","2452602","2452614","2452623","2451126","2451141","2451154","2451493","2451494","2451497","2451513","2451516","2451526"}'::int4[],
+	E'{"2450816","2450843","2450874","2450900","2450926","2450953","2450982","2451010","2451033","2451045","2451057","2451070","2451082","2451095","2451107","2451119","2451143","2451157","2451169","2451184","2451213","2451241","2451267","2451294","2451322","2451349","2451372","2451398","2451410","2451423","2451435","2451448","2451460","2451472","2451485","2451499","2451511","2451522","2451536","2451545","2451572","2451600","2451626","2451650","2451679","2451703","2451734","2451760","2451772","2451783","2451795","2451806","2451818","2451830","2451843","2451855","2451867","2451877","2451890","2451901","2451916","2451945","2451974","2451999","2452025","2452053","2452081","2452109","2452129","2452140","2452151","2452163","2452173","2452185","2452195","2452207","2452218","2452233","2452245","2452262","2452275","2452301","2452329","2452358","2452385","2452413","2452437","2452464","2452492","2452504","2452516","2452528","2452540","2452553","2452566","2452578","2452587","2452604","2452617","2452630","2452639"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.04476667::real,
+	4::integer,
+	42441.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00023333334}'::real[],
+	NULL::real[],
+	'{-0.0029273503}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"53826"}'::int4[],
+	E'{"28802","29544","30512","31386","32305","32816","33250","33722","34146","34599","35052","35511","35964","36268","36566","36863","37172","37485","37828","38121","38401","38684","38983","39275","39560","40075","40557","41068","41530","42041","42524","43017","43474","43957","44423","44910","45389","45848","46343","46755","47169","47614","48001","48403","48805","49181","49610","50080","50477","50759","51068","51365","51655","51931","52218","52524","52799","53101","53418","53732","54105","54884","55780","56713","57597","58420","59372","60285","61221","61506","61795","62076","62374","62681","62967","63254","63580","63859","64159","64441","64733","65144","65590","66065","66523","66923","67434","67869","68271","68722","69211","69656","70119","70604","71096","71498","71944","72815","73678","74590","75597"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	25013.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0003, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.000308136}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"18140","1183","1921","10183","13837","16333","22268","26593","27325","2035","3793","4081","4525","5833","8575","9103","9211","9703","10507","11761","12685","13513","14792","15871","15907","15998","17095","17455","19111","20875","21085","21457","22741","24703","24817","26851","26971","27337","27709","27919"}'::int4[],
+	E'{"1","260","575","888","1162","1441","1707","1975","2264","2523","2847","3115","3368","3650","3951","4214","4523","4827","5071","5329","5587","5894","6181","6496","6776","7024","7312","7591","7855","8113","8398","8682","8957","9245","9530","9823","10114","10405","10699","10959","11247","11525","11781","12061","12360","12613","12889","13190","13453","13731","14017","14294","14575","14877","15152","15457","15733","16015","16291","16579","16861","17155","17437","17702","17984","18247","18519","18783","19092","19380","19642","19943","20221","20467","20723","20995","21311","21596","21870","22136","22427","22700","22970","23261","23533","23805","24082","24344","24628","24932","25220","25519","25800","26063","26331","26591","26879","27151","27422","27705","27999"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.043866668::real,
+	4::integer,
+	1787614.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.002228295}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"17","21786","42607","63355","81931","104851","124188","143682","164679","186368","206598","227797","248026","266122","287862","306345","328795","349339","369849","390012","413705","437205","457764","479231","501632","523614","545267","564653","584588","603322","628035","648054","668479","689551","709515","730333","751340","771680","793540","814237","835667","857070","877179","899789","920597","942338","962762","984964","1006607","1027347","1048659","1070611","1092247","1111106","1131352","1152543","1173197","1192658","1215327","1237528","1259725","1279865","1300200","1324729","1344982","1367029","1388243","1408781","1430858","1451533","1472783","1491853","1512116","1533678","1554248","1577279","1600025","1621228","1641577","1663202","1683219","1704339","1723327","1742744","1763526","1783848","1805196","1826090","1845634","1865356","1885579","1905861","1925869","1946542","1969323","1991449","2012218","2035047","2058343","2079610","2099931"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.044433333::real,
+	4::integer,
+	1889709.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00950842}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"30","17849","37904","56865","76186","96917","115542","134186","152099","172680","192783","211817","229921","248171","269276","287913","306855","326795","345207","365388","382970","404387","425118","443738","463882","483064","501977","520761","538035","556646","576673","595274","615470","633068","652437","671351","689763","709263","728426","748174","767474","786428","805372","823760","843936","863306","880648","898664","917543","936304","956226","976161","994176","1014253","1033333","1051646","1070542","1089363","1107670","1128460","1147427","1166875","1187090","1205515","1224744","1244031","1263305","1283771","1301649","1319446","1337051","1356966","1373991","1393391","1412686","1433469","1453024","1470147","1488228","1507316","1525606","1543945","1563428","1582932","1601688","1622584","1644497","1663783","1684160","1704534","1724056","1744635","1764898","1783571","1802036","1823303","1844256","1864851","1883445","1902230","1920718"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0444::real,
+	4::integer,
+	7203.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.0004}'::real[],
+	NULL::real[],
+	'{0.0009649638}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3964","3629"}'::int4[],
+	E'{"1","77","150","224","302","367","433","498","566","636","710","784","865","941","1013","1088","1170","1244","1323","1388","1461","1536","1606","1672","1735","1809","1876","1952","2024","2098","2172","2244","2307","2379","2456","2534","2602","2673","2742","2818","2892","2971","3037","3111","3186","3257","3327","3396","3472","3543","3613","3687","3768","3845","3910","3981","4050","4116","4188","4251","4325","4393","4463","4541","4613","4685","4755","4830","4903","4980","5052","5126","5195","5262","5335","5402","5469","5534","5604","5673","5747","5823","5891","5960","6032","6112","6185","6259","6335","6407","6479","6552","6629","6696","6762","6836","6906","6982","7054","7128","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0441::real,
+	4::integer,
+	1054173.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.009495346}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"24","10492","20174","30656","40366","50491","61387","71217","82320","93176","103530","113999","124922","135328","145700","156238","168283","179107","189968","200308","210858","220931","230791","240825","252093","261999","273446","284421","294475","304990","315199","325963","336804","346964","358483","369478","379508","390126","400826","411839","423548","433723","444375","455042","465928","476227","487109","496816","507138","516971","528312","538979","549252","559578","569918","580340","590219","600402","612301","623316","633219","642905","653631","665000","674723","685655","695157","706546","716090","726191","735744","745583","756508","767077","776705","787088","798590","810484","820976","832448","843248","854009","864628","873989","883994","894860","905009","916085","924744","935185","945700","956390","965553","975624","987328","997741","1008137","1018620","1029054","1039248","1049982"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_store_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.045766667::real,
+	4::integer,
+	35.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.029033333, 0.0287, 0.028266666, 0.0282, 0.028066667, 0.028, 0.027966667, 0.027833333, 0.027766667, 0.027666667, 0.027666667, 0.0276, 0.0276, 0.0275, 0.027466666, 0.027433334, 0.027433334, 0.027366666, 0.027366666, 0.0273, 0.027233334, 0.027133333, 0.027066667, 0.027033333, 0.0269, 0.0269, 0.026833333, 0.026733333, 0.0267, 0.026633333, 0.026333334, 0.026066666, 0.026066666, 0.025666667, 0.0247}'::real[],
+	'{0.025343372}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"19","34","2","61","62","7","32","13","52","4","38","55","56","28","49","1","37","16","67","50","31","64","22","68","20","58","26","46","14","10","25","8","43","40","44"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.04413333::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0036666666, 0.0036666666, 0.0036333334, 0.0036333334, 0.0035333333, 0.0035, 0.0033666666, 0.0033666666}'::real[],
+	NULL::real[],
+	'{0.009066247}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"37","139","81","228","350","223","293","304"}'::int4[],
+	E'{"1","4","7","11","14","18","21","25","28","32","35","40","43","47","50","54","57","61","64","68","71","75","78","83","86","89","93","96","100","103","107","110","114","118","121","124","128","132","136","140","143","147","150","153","157","160","163","166","170","174","177","180","183","187","190","194","197","201","204","208","211","214","218","221","226","230","234","237","241","245","249","252","256","259","262","266","270","274","277","280","284","288","291","296","300","303","308","311","315","319","322","326","329","332","336","339","343","346","351","354","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_ticket_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	135837840.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.06078869}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"813","1375913","2727072","3857212","5016369","6156850","7386542","8690070","9789582","11044399","12265523","13510184","14717978","15785339","16975428","18197314","19442297","20772509","21903183","23100195","24331207","25452464","26678265","27922018","29143270","30353305","31671176","32953618","34109365","35253703","36385377","37447554","38717221","39999948","41154706","42417922","43652601","44968753","46342094","47459202","48642561","49683656","50998261","52288399","53487733","54680281","55833024","57017267","58237604","59472084","60696465","61996614","63179509","64401202","65651723","66926244","68011538","69269328","70341852","71528693","72651930","73713093","74849544","75928064","77033905","78162650","79324991","80585670","81761102","82828934","84032244","85334532","86494728","87598137","88860063","89922519","91069374","92276218","93495454","94722691","95959052","97146341","98399034","99566170","100766327","101898400","103223735","104414548","105602699","106825065","108029779","109174799","110420663","111591894","112817588","113975952","115181211","116399324","117672963","118888721","119999864"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+--
+-- Table: store_sales, Attribute: ss_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.045466665::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010833333, 0.010766666, 0.010766666, 0.010766666, 0.010633334, 0.0106, 0.010566667, 0.0104, 0.0104, 0.0104, 0.0104, 0.010366667, 0.010366667, 0.010366667, 0.0103, 0.010266666, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.0099, 0.009866667, 0.009833333, 0.0098, 0.009766666, 0.009766666, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.009666666, 0.009666666, 0.009666666, 0.009633333, 0.0096, 0.0096, 0.0096, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.009466667, 0.009433334, 0.0094, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009333333, 0.009266667, 0.0092, 0.0092, 0.0092, 0.009133333, 0.009133333, 0.009133333, 0.009133333, 0.0091, 0.0091, 0.0091, 0.0091, 0.0090666665, 0.0090666665, 0.0090333335, 0.009, 0.008966667, 0.008933334, 0.0089, 0.0089, 0.008833333, 0.008666666, 0.008633333, 0.0086, 0.008566666, 0.0084, 0.0084, 0.008366667, 0.008366667, 0.008233333, 0.008233333, 0.0081, 0.0079333335}'::real[],
+	'{0.0045824465}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"29","7","10","21","27","92","86","5","55","71","81","33","79","93","6","99","40","39","57","32","53","73","84","97","85","90","38","91","12","69","76","41","23","22","37","45","63","44","61","88","100","20","98","26","49","67","14","18","78","87","95","3","31","46","15","36","58","42","64","11","13","50","59","60","68","70","19","54","25","35","66","24","52","56","83","4","16","47","74","80","96","34","51","75","82","30","77","65","28","1","48","9","2","72","43","94","17","89","62","8"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: store_sales, Attribute: ss_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0435::real,
+	6::integer,
+	9909.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.004772207}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"32.94","43.22","71.68","76.26","91.35","96.72"}'::numeric[],
+	E'{"1.00","1.97","3.01","4.10","5.06","6.04","7.00","8.01","9.01","9.96","10.88","11.91","12.82","13.84","14.95","15.91","16.85","17.91","18.92","19.94","20.89","22.01","23.08","24.06","25.02","26.03","26.96","27.89","28.91","29.93","30.90","31.93","32.96","33.91","34.98","35.96","36.94","37.90","38.81","39.70","40.61","41.67","42.74","43.73","44.66","45.63","46.59","47.53","48.55","49.54","50.48","51.56","52.62","53.42","54.39","55.28","56.33","57.36","58.37","59.23","60.15","61.15","62.19","63.21","64.16","65.22","66.31","67.27","68.29","69.31","70.23","71.24","72.24","73.25","74.22","75.12","76.09","77.07","78.06","79.07","80.05","81.10","82.08","83.09","84.06","85.12","86.17","87.18","88.23","89.18","90.13","91.20","92.19","93.19","94.14","95.07","95.98","96.91","97.92","98.92","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0447::real,
+	6::integer,
+	16808.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.0003, 0.0003, 0.0003, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667}'::real[],
+	NULL::real[],
+	'{-0.00067186705}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"27.24","7.02","96.36","105.63","17.20","33.52","39.04","40.68","48.96","59.81","68.69","76.24","87.92","99.16"}'::numeric[],
+	E'{"1.00","2.89","4.28","5.87","7.42","8.80","10.10","11.63","12.99","14.42","15.98","17.40","18.87","20.21","21.63","23.04","24.51","25.90","27.36","28.81","30.36","31.81","33.34","34.72","36.09","37.52","38.95","40.43","41.88","43.30","44.81","46.40","47.73","49.18","50.55","52.07","53.40","54.73","56.17","57.55","58.87","60.19","61.77","63.07","64.57","66.02","67.39","68.92","70.40","72.03","73.45","74.87","76.26","77.73","79.03","80.35","81.92","83.32","84.72","86.21","87.59","88.96","90.45","91.78","93.16","94.66","96.19","97.64","98.92","100.52","101.88","103.28","104.72","106.11","107.69","109.21","110.85","112.64","114.53","116.30","118.00","119.87","121.88","123.90","126.04","128.34","130.66","133.07","135.58","137.97","140.53","143.39","146.70","149.95","153.65","157.50","161.61","166.70","172.67","180.23","199.18"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.043866668::real,
+	6::integer,
+	11406.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.008633333, 0.00063333334, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667}'::real[],
+	NULL::real[],
+	'{0.00037045707}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","5.56","1.37","1.33","1.74","3.53","1.67","3.48","0.51","5.54","6.41","0.82","1.50","1.72","1.83","1.99","2.02","2.25","3.32","3.84","5.66","12.86","0.97","0.98","1.28","1.62","1.65","1.90","2.00","3.08","4.40","5.92","8.40","8.74","11.16","15.51","0.44","0.57","0.65","0.68","0.75","0.94","1.17","1.20","1.22","1.29","1.32","1.35","1.36","2.08","2.14","2.50","2.78","2.82","2.83","3.09","3.64","3.73","3.82","4.51","4.55","5.22","5.43","6.63","6.69","6.90","7.61","7.63","8.09","9.03","9.09","9.44","9.63","11.42","15.16","0.11","0.21","0.60","0.63","0.66","0.93","1.06","1.10","1.16","1.18","1.25","1.42","1.47","1.76","2.09","2.16","2.18","2.60","2.68","2.74","3.11","3.18","3.26","3.27","3.31"}'::numeric[],
+	E'{"0.01","0.50","1.00","1.49","2.01","2.44","2.89","3.38","3.80","4.27","4.73","5.13","5.65","6.12","6.56","7.05","7.48","8.02","8.51","9.01","9.57","10.13","10.69","11.20","11.77","12.34","12.88","13.44","14.06","14.61","15.26","15.88","16.54","17.11","17.71","18.35","19.04","19.73","20.46","21.14","21.86","22.67","23.36","24.08","24.87","25.77","26.56","27.30","28.12","28.99","29.85","30.74","31.71","32.63","33.58","34.48","35.42","36.45","37.56","38.53","39.65","40.76","41.86","43.05","44.18","45.37","46.57","47.77","49.08","50.38","51.70","53.17","54.47","55.96","57.34","58.84","60.52","62.13","63.82","65.63","67.20","69.11","71.20","73.12","75.38","77.56","79.86","82.27","85.02","87.88","90.64","93.54","97.22","101.21","105.84","110.61","116.50","123.46","132.30","145.64","193.12"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.045333333::real,
+	3::integer,
+	6760.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.7661}'::real[],
+	NULL::real[],
+	'{0.6438912}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","1.34","3.72","6.09","8.37","10.99","14.04","16.95","19.44","22.34","24.81","28.43","32.34","35.35","39.39","44.25","49.00","54.54","59.98","65.63","71.63","78.32","84.28","90.37","96.62","104.19","111.32","118.10","126.42","136.18","143.96","153.17","162.16","171.42","182.95","192.33","201.85","211.36","222.74","236.09","252.09","266.81","278.33","292.76","310.46","324.68","340.74","359.05","380.26","398.53","416.30","434.21","455.13","474.14","491.53","516.67","538.59","556.85","586.81","610.95","636.53","667.62","692.38","723.55","756.71","796.95","834.72","868.00","906.95","948.96","993.70","1033.87","1089.17","1132.81","1184.95","1228.29","1281.16","1347.98","1408.84","1480.92","1572.04","1643.21","1731.83","1830.90","1925.89","2022.22","2130.03","2281.99","2428.33","2573.26","2717.71","2913.34","3146.60","3438.96","3740.97","4126.94","4666.03","5274.03","6096.32","7082.14","12922.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.045333333::real,
+	6::integer,
+	119811.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0087, 0.00026666667, 0.00023333334, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.00332316}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","25.20","10.92","36.96","469.20"}'::numeric[],
+	E'{"0.27","8.61","16.80","24.36","33.50","42.56","50.49","61.05","71.40","82.38","93.84","106.14","118.17","131.32","144.00","157.78","172.64","188.16","203.84","220.80","236.84","255.08","271.45","288.48","308.34","327.28","345.73","367.84","387.02","408.00","432.63","453.75","480.22","504.24","530.66","558.80","588.24","616.30","644.76","674.50","704.16","734.58","766.92","802.75","838.24","871.04","910.52","945.76","983.29","1024.86","1063.30","1102.08","1147.38","1190.70","1237.47","1284.12","1331.00","1387.50","1440.24","1503.28","1554.80","1610.95","1676.49","1742.20","1808.00","1867.45","1933.08","2001.48","2087.67","2170.21","2251.53","2342.40","2428.20","2526.36","2617.12","2724.48","2827.24","2944.32","3046.35","3173.12","3294.25","3442.56","3588.09","3734.64","3902.60","4072.80","4240.57","4428.00","4642.32","4906.57","5147.50","5431.50","5743.00","6100.32","6469.35","6901.32","7510.60","8168.50","9050.41","10628.04","17738.88"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.044966668::real,
+	6::integer,
+	207111.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0051949597}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.08","33.20","56.42","79.36","97.98","121.59","144.80","167.70","191.00","218.46","244.03","270.55","299.76","327.80","355.32","384.30","414.52","442.20","475.83","508.95","544.25","578.25","612.36","650.43","688.35","727.92","765.38","803.60","837.20","874.56","916.09","960.94","1003.45","1044.66","1092.25","1140.48","1185.60","1238.61","1289.29","1337.70","1390.55","1444.40","1496.49","1548.16","1605.87","1662.12","1713.60","1764.63","1817.76","1875.30","1937.05","1999.50","2060.11","2128.60","2196.21","2259.76","2326.32","2396.25","2465.40","2539.24","2614.56","2685.00","2761.38","2840.04","2925.35","3015.87","3097.05","3179.52","3263.77","3343.96","3431.34","3528.32","3624.37","3716.85","3814.10","3920.27","4022.88","4127.23","4243.63","4356.48","4476.15","4597.05","4738.23","4865.40","5000.80","5143.91","5291.12","5444.00","5603.10","5773.32","5947.83","6145.55","6364.80","6594.77","6830.75","7087.20","7404.30","7745.95","8124.04","8664.15","9992.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.044166666::real,
+	7::integer,
+	281020.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.005409235}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.37","48.18","81.41","111.00","143.56","176.12","208.48","244.00","277.10","312.00","354.24","397.50","432.81","473.83","514.15","559.74","605.17","653.04","703.08","749.70","793.80","843.72","897.00","950.04","1005.84","1059.20","1111.86","1168.53","1220.78","1273.14","1335.78","1395.80","1464.48","1525.11","1588.62","1662.60","1733.62","1808.00","1876.80","1943.17","2017.47","2095.83","2176.23","2255.84","2332.80","2416.80","2500.54","2583.36","2660.40","2751.20","2841.54","2936.19","3028.06","3126.61","3219.72","3316.14","3407.04","3508.20","3613.50","3714.04","3820.32","3927.70","4045.88","4164.11","4286.55","4404.60","4526.64","4639.62","4772.80","4907.30","5047.20","5174.40","5313.60","5456.64","5608.32","5770.80","5925.96","6098.88","6277.32","6458.50","6637.23","6822.90","7017.40","7216.44","7423.52","7672.96","7894.12","8146.60","8427.82","8709.95","8969.40","9303.91","9642.60","10018.92","10424.34","10892.97","11484.75","12242.88","13182.40","14456.88","19415.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0449::real,
+	6::integer,
+	18471.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10456666, 0.0009, 0.00073333335, 0.00073333335, 0.0007, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00063333334, 0.00063333334, 0.00063333334, 0.00063333334, 0.00063333334, 0.0006, 0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.014879999}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.01","0.17","0.65","0.13","0.29","0.05","0.08","0.36","0.10","0.27","0.28","0.40","0.45","0.19","0.30","2.24","0.15","0.18","0.21","0.41","3.94","0.14","0.46","0.47","0.52","0.88","1.04","1.51","1.66","0.02","0.12","0.16","0.20","0.25","0.34","0.77","0.96","0.98","1.29","1.92","3.80","0.11","0.32","0.42","0.43","0.51","0.68","0.99","1.05","1.22","1.31","1.36","1.54","1.80","1.90","2.04","2.10","3.32","0.09","0.22","0.44","0.50","0.58","0.66","0.94","1.13","1.15","1.68","2.74","3.78","4.08","8.96","0.04","0.07","0.23","0.33","0.37","0.59","0.69","0.78","0.81","0.82","0.85","0.91","1.08","1.12","1.18","1.26","1.32","1.35","1.50","1.59","1.64","1.76","1.79","2.26","2.83","3.35","3.43"}'::numeric[],
+	E'{"0.03","0.74","1.20","1.60","2.01","2.39","2.72","3.10","3.50","3.90","4.30","4.72","5.16","5.57","6.04","6.50","7.03","7.58","8.18","8.74","9.36","9.98","10.62","11.27","12.01","12.69","13.39","14.17","14.94","15.73","16.52","17.47","18.36","19.22","20.18","21.05","22.15","23.17","24.17","25.34","26.50","27.68","28.91","30.07","31.25","32.68","34.20","35.59","37.26","38.92","40.45","42.33","44.13","45.79","47.82","49.94","51.93","54.20","56.44","58.78","61.05","63.96","66.70","69.47","72.63","75.56","78.68","82.11","85.62","89.37","92.68","96.79","100.78","105.67","110.09","114.97","120.82","125.97","132.10","138.64","145.86","152.49","159.87","168.58","177.12","186.59","196.23","208.25","220.55","235.45","251.96","267.62","288.25","309.58","335.43","364.88","405.05","457.89","534.84","648.41","1390.48"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.045333333::real,
+	3::integer,
+	6760.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.7661}'::real[],
+	NULL::real[],
+	'{0.6438912}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","1.34","3.72","6.09","8.37","10.99","14.04","16.95","19.44","22.34","24.81","28.43","32.34","35.35","39.39","44.25","49.00","54.54","59.98","65.63","71.63","78.32","84.28","90.37","96.62","104.19","111.32","118.10","126.42","136.18","143.96","153.17","162.16","171.42","182.95","192.33","201.85","211.36","222.74","236.09","252.09","266.81","278.33","292.76","310.46","324.68","340.74","359.05","380.26","398.53","416.30","434.21","455.13","474.14","491.53","516.67","538.59","556.85","586.81","610.95","636.53","667.62","692.38","723.55","756.71","796.95","834.72","868.00","906.95","948.96","993.70","1033.87","1089.17","1132.81","1184.95","1228.29","1281.16","1347.98","1408.84","1480.92","1572.04","1643.21","1731.83","1830.90","1925.89","2022.22","2130.03","2281.99","2428.33","2573.26","2717.71","2913.34","3146.60","3438.96","3740.97","4126.94","4666.03","5274.03","6096.32","7082.14","12922.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.045033332::real,
+	6::integer,
+	130231.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010733333}'::real[],
+	NULL::real[],
+	'{-0.003218649}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","5.14","10.18","16.30","21.88","28.60","36.24","44.10","51.49","60.06","68.70","77.69","87.72","97.58","108.51","119.68","131.13","142.74","154.70","167.30","180.87","194.66","210.49","225.68","242.00","258.44","273.14","288.96","307.68","325.44","342.37","363.00","380.16","400.43","423.00","444.15","468.72","492.00","519.68","544.00","572.40","600.96","629.30","656.70","686.28","718.06","749.00","782.88","817.80","854.72","893.10","930.83","967.59","1008.80","1050.42","1093.00","1135.33","1181.62","1229.40","1280.52","1326.28","1383.48","1439.88","1500.29","1556.02","1618.37","1682.20","1751.04","1818.15","1884.06","1955.88","2033.45","2126.88","2215.62","2305.35","2400.96","2495.65","2607.80","2725.97","2838.84","2961.00","3081.25","3215.94","3363.36","3525.20","3685.50","3870.99","4065.12","4264.36","4472.25","4715.82","5020.00","5297.49","5657.44","6056.08","6494.87","7012.56","7766.28","8648.46","10058.40","17738.88"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.04476667::real,
+	6::integer,
+	216373.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010666667, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0055286656}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","32.50"}'::numeric[],
+	E'{"0.04","5.34","10.64","16.84","22.78","29.76","37.54","45.88","53.55","63.01","71.53","81.22","91.04","101.48","113.40","124.84","136.79","148.47","160.74","174.09","189.27","202.53","219.10","235.75","252.63","270.30","284.97","302.27","321.39","339.01","359.73","379.11","399.51","420.01","443.22","467.14","491.68","517.50","543.21","569.64","598.99","628.01","657.79","689.15","718.44","753.62","785.05","818.47","856.64","895.72","934.06","972.23","1014.07","1056.37","1098.32","1143.65","1191.49","1240.73","1292.04","1341.11","1393.32","1450.62","1510.08","1566.98","1629.98","1689.68","1763.67","1840.23","1903.93","1975.54","2049.22","2126.92","2226.03","2316.79","2410.56","2506.52","2616.49","2727.26","2849.57","2970.38","3085.20","3217.68","3363.97","3517.49","3689.45","3858.39","4052.56","4254.30","4465.59","4690.92","4962.17","5234.70","5542.48","5925.61","6319.65","6827.42","7372.02","8128.19","9079.02","10544.85","18803.21"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: store_sales, Attribute: ss_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.043933332::real,
+	6::integer,
+	164410.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00036666667, 0.0002}'::real[],
+	NULL::real[],
+	'{0.0071685645}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","-86.40"}'::numeric[],
+	E'{"-9756.88","-6515.41","-5668.87","-5123.34","-4724.97","-4368.00","-4064.06","-3808.62","-3576.47","-3373.46","-3174.31","-3012.09","-2859.44","-2725.70","-2593.63","-2458.24","-2337.30","-2214.00","-2107.00","-2001.96","-1904.70","-1816.40","-1727.86","-1642.55","-1561.33","-1494.48","-1420.30","-1356.48","-1294.21","-1224.96","-1162.20","-1101.58","-1048.46","-992.62","-942.72","-898.95","-853.76","-806.47","-765.12","-727.68","-693.00","-655.50","-623.42","-589.44","-557.05","-526.40","-495.72","-462.77","-435.73","-406.64","-378.40","-353.30","-328.97","-301.50","-278.13","-255.75","-233.87","-214.09","-195.96","-178.34","-162.31","-147.92","-132.24","-117.78","-104.00","-89.56","-76.54","-65.12","-54.20","-43.00","-32.46","-23.28","-14.28","-7.00","0.39","9.24","20.91","35.88","53.56","74.70","99.36","127.98","158.51","193.25","233.24","281.96","341.00","404.32","478.86","563.93","661.20","773.80","891.78","1050.06","1209.00","1410.30","1700.48","2034.00","2537.48","3429.36","8262.72"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1823.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0016, 0.0016, 0.0015333333, 0.0015, 0.0015, 0.0015, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666}'::real[],
+	NULL::real[],
+	'{-0.0030525422}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451524","2452255","2452593","2451546","2452243","2452632","2451179","2451491","2451545","2451176","2451487","2451860","2451866","2452271","2452626","2451154","2451534","2451536","2452228","2452236","2452592","2452603","2451135","2451495","2451871","2451887","2451901","2451910","2452267","2452605","2451053","2451121","2451177","2451537","2451539","2452220","2452229","2452241","2452261","2452617","2452621","2452630","2451122","2451142","2451143","2451144","2451169","2451174","2451490","2452225","2452234","2452245","2452582","2451150","2451156","2451410","2451505","2451510","2451527","2451543","2451867","2451873","2451881","2452219","2452227","2452248","2452262","2452265","2452272","2452624","2451124","2451129","2451145","2451159","2451161","2451165","2451512","2451532","2451544","2451858","2452247","2452249","2452252","2452266","2452277","2452585","2452589","2452591","2452610","2452612","2451094","2451134","2451139","2451155","2451157","2451166","2451171","2451181","2451521","2451522"}'::int4[],
+	E'{"2450816","2450841","2450870","2450898","2450927","2450953","2450978","2451005","2451030","2451041","2451052","2451067","2451078","2451090","2451104","2451115","2451127","2451140","2451158","2451173","2451198","2451225","2451253","2451279","2451305","2451336","2451363","2451388","2451405","2451418","2451431","2451444","2451456","2451468","2451480","2451494","2451504","2451516","2451529","2451542","2451574","2451599","2451625","2451654","2451681","2451709","2451736","2451761","2451773","2451785","2451798","2451811","2451824","2451835","2451849","2451857","2451872","2451883","2451893","2451902","2451912","2451938","2451969","2451995","2452023","2452052","2452082","2452108","2452130","2452142","2452153","2452165","2452176","2452188","2452200","2452213","2452226","2452240","2452256","2452270","2452289","2452315","2452345","2452373","2452401","2452429","2452455","2452480","2452497","2452509","2452522","2452534","2452547","2452559","2452571","2452584","2452597","2452607","2452619","2452633","2452642"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	72739.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0002}'::real[],
+	NULL::real[],
+	'{-0.004440563}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"61224"}'::int4[],
+	E'{"0","3453","5358","7271","8890","10655","12362","14210","15455","16483","17601","18731","20003","21248","22548","23694","24821","25793","26731","27644","28537","29469","30431","31334","32383","33161","33815","34512","35196","35909","36662","37414","38129","38856","39594","40332","41139","41826","42634","43309","43883","44435","44958","45430","45979","46461","47039","47768","48454","49168","49903","50684","51931","53162","54270","55196","56147","57080","57913","58603","59313","60034","60759","61432","62068","62610","63196","63765","64286","64834","65399","65944","66456","66942","67447","67990","68472","68929","69389","69801","70217","70674","71131","71595","72062","72552","73092","73643","74121","74642","75146","75708","76439","77167","77837","78531","79155","80293","81570","82687","86389"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.00033333333::real,
+	4::integer,
+	1933.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0014666667, 0.0013333333, 0.0013, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667}'::real[],
+	NULL::real[],
+	'{-0.0028389376}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451902","2451188","2451164","2451549","2452285","2451156","2451195","2451918","2451956","2452264","2452636","2452641","2451197","2451870","2452241","2451538","2451539","2452279","2452292","2452608","2452626","2452633","2451146","2451167","2451178","2451537","2451547","2451905","2451923","2452250","2452263","2451133","2451201","2451557","2451563","2451607","2451612","2451975","2451986","2452226","2452273","2452281","2452358","2452657","2451171","2451181","2451489","2451518","2451550","2451569","2451935","2451964","2451965","2451966","2451974","2452219","2452251","2452259","2452260","2452261","2452271","2452280","2452300","2452301","2452302","2452317","2452604","2452652","2452665","2451147","2451161","2451177","2451183","2451187","2451189","2451196","2451229","2451545","2451565","2451573","2451575","2451601","2451904","2451951","2451952","2452265","2452288","2452342","2452629","2452635","2452637","2452639","2452696","2451173","2451174","2451184","2451192","2451202","2451212","2451242"}'::int4[],
+	E'{"2450823","2450897","2450934","2450961","2450989","2451015","2451043","2451061","2451080","2451098","2451114","2451127","2451140","2451154","2451169","2451191","2451209","2451222","2451235","2451248","2451263","2451281","2451306","2451332","2451361","2451390","2451416","2451438","2451454","2451470","2451485","2451500","2451513","2451526","2451540","2451555","2451568","2451582","2451595","2451611","2451627","2451646","2451668","2451693","2451722","2451751","2451778","2451800","2451819","2451836","2451850","2451863","2451876","2451888","2451900","2451914","2451927","2451940","2451953","2451971","2451990","2452009","2452037","2452064","2452091","2452121","2452146","2452167","2452186","2452203","2452218","2452232","2452246","2452262","2452278","2452295","2452310","2452322","2452335","2452350","2452367","2452385","2452412","2452441","2452470","2452495","2452518","2452538","2452555","2452572","2452587","2452600","2452614","2452625","2452644","2452658","2452670","2452682","2452699","2452719","2452762"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	25062.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.0007646001}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1309","3001","4099","5413","8575","10591","14557","17821","19507","20473","22969","24061","25279","25891","27685"}'::int4[],
+	E'{"3","292","595","880","1169","1423","1683","1956","2282","2539","2800","3062","3343","3608","3865","4153","4415","4682","4951","5245","5505","5762","6071","6367","6655","6949","7232","7535","7831","8117","8386","8665","8928","9193","9470","9724","10001","10264","10546","10828","11122","11402","11708","11998","12271","12547","12823","13105","13399","13675","13977","14251","14527","14821","15112","15404","15715","16020","16304","16561","16846","17098","17353","17617","17892","18163","18434","18732","19039","19317","19609","19870","20149","20450","20749","21043","21305","21579","21881","22171","22460","22750","23029","23276","23536","23794","24084","24373","24664","24932","25236","25519","25793","26068","26349","26599","26899","27169","27447","27703","28000"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0005::real,
+	4::integer,
+	2118340.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0010770214}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"116","19276","39962","61407","85373","106315","126227","147006","167677","187188","207807","226047","246827","269215","286863","307913","329088","349611","369725","390185","410503","432212","454393","475658","496403","519145","539722","559383","580534","601568","623450","645203","665659","686268","708568","730472","751325","772013","790899","811688","835234","859298","877602","896824","916526","937382","958518","980789","1000789","1022926","1044299","1064876","1087128","1107756","1128946","1150087","1170021","1189394","1210544","1229439","1250913","1270764","1292927","1312446","1334616","1355684","1377519","1397078","1417253","1439187","1460077","1482246","1504744","1525557","1548534","1571550","1593101","1612385","1632941","1652821","1671352","1691730","1714302","1736611","1757116","1778569","1799839","1820986","1843004","1862949","1886606","1909295","1929403","1952006","1972435","1993425","2015871","2037659","2058030","2078476","2099961"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1963935.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.008824349}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"40","19928","41222","60907","80036","96922","115963","135857","155159","175803","193832","214446","233794","253659","271138","289757","310150","329469","349317","369098","389298","407426","427564","448714","467530","487468","506816","526861","546227","565019","583873","602430","621270","641783","661497","681303","700310","718758","737636","756383","774238","793788","810674","829641","848804","867427","886648","906085","926348","946633","965764","984667","1004930","1025614","1045598","1064240","1084145","1103410","1122730","1141053","1162951","1181651","1200809","1219112","1239681","1256860","1276450","1295516","1315122","1334158","1352740","1370260","1387732","1406685","1424904","1445396","1462767","1481762","1502206","1522443","1540631","1559362","1578315","1599220","1619332","1635595","1652747","1672436","1691569","1710869","1731393","1750861","1769679","1790304","1809446","1827792","1845980","1861792","1881771","1900390","1920682"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	7218.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.0033058901}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3781","4004","5987","61","843","1723","3981","4638","5516","6255"}'::int4[],
+	E'{"1","74","151","220","297","366","438","505","572","641","716","798","874","948","1023","1092","1157","1226","1295","1359","1442","1517","1582","1651","1718","1792","1861","1935","2012","2083","2154","2230","2301","2372","2434","2504","2576","2652","2724","2792","2863","2944","3013","3076","3151","3224","3294","3362","3441","3513","3581","3647","3726","3800","3878","3953","4022","4092","4172","4242","4311","4397","4466","4540","4612","4679","4750","4824","4901","4972","5042","5119","5194","5265","5338","5410","5486","5560","5636","5707","5777","5842","5916","5982","6054","6128","6200","6267","6337","6411","6487","6563","6634","6700","6776","6846","6915","6987","7054","7128","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_bill_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.00043333333::real,
+	4::integer,
+	1052357.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0035874592}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"85","9940","19201","29062","39466","49793","60322","70621","81217","91226","101312","111021","121563","131884","142160","151553","162420","173225","183462","193550","204825","215954","226612","236859","247641","257974","268112","278524","289530","301367","312534","323713","334146","344753","354965","366093","376805","387572","399555","409543","419685","430267","441452","451787","461680","472204","482625","492470","503572","513596","523426","533872","543655","554311","565216","576083","586017","596802","607700","617077","626774","637067","646810","658305","668298","678578","689888","699650","709454","719802","731419","742750","753186","764659","775390","785925","795925","806880","817378","827664","838917","850289","860509","871551","882170","892610","902269","911835","922478","933542","944712","955041","966086","976281","986032","996335","1007079","1017272","1027779","1039161","1049977"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.00046666668::real,
+	4::integer,
+	2017265.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0043712403}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"132","20637","42180","65350","82849","103817","124318","145423","166944","187687","208737","230590","251949","273686","293387","311515","330800","353486","374240","393971","413452","433019","454488","476432","498011","518833","539886","561032","582486","602670","621844","644001","664886","685045","704748","725254","746493","768247","789025","809330","830506","851780","873145","893841","916134","939717","961138","980901","1000505","1021471","1041002","1061792","1082164","1105084","1127234","1147741","1168328","1188890","1211298","1233312","1255587","1277390","1297125","1318745","1339393","1359133","1378504","1398143","1419107","1441128","1464282","1484205","1506371","1531184","1554208","1572948","1594637","1616564","1637230","1658766","1679115","1701388","1723406","1741784","1760843","1783047","1803735","1827219","1849463","1870419","1891620","1911234","1930891","1951173","1973089","1994829","2016556","2037533","2057883","2079450","2099912"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	1696478.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.002879893}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"58","18440","37296","56770","75852","94757","113452","130704","151005","170386","188845","208340","228843","248582","267435","285987","306015","323298","341709","360888","379541","400412","418373","438856","457414","475601","496722","517639","535895","554469","574493","594102","613853","632766","651384","668989","687375","706348","726205","744691","763517","783257","803277","822267","842706","862226","882815","901593","921645","941476","960097","979312","997703","1019580","1040057","1057255","1076091","1095006","1112147","1132100","1151343","1170491","1188950","1206650","1225084","1243585","1261069","1279776","1298943","1318050","1338726","1357162","1375169","1394096","1413110","1433576","1450829","1470097","1488671","1509355","1530203","1549360","1567854","1587699","1610090","1629275","1648075","1668590","1688396","1707068","1725533","1743917","1762980","1780125","1799583","1819263","1838350","1859271","1880426","1901289","1920663"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.00033333333::real,
+	4::integer,
+	7200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.007957798}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1687","262","626","3196","3456","3820","5684","5796","5891","5987","6436","6562"}'::int4[],
+	E'{"1","76","145","212","285","352","423","496","571","640","719","798","867","940","1016","1091","1163","1231","1304","1381","1455","1523","1597","1669","1746","1814","1887","1962","2035","2099","2168","2246","2310","2377","2455","2530","2597","2668","2741","2817","2892","2966","3033","3103","3170","3247","3325","3396","3465","3541","3609","3678","3755","3821","3889","3959","4025","4088","4162","4242","4318","4386","4454","4527","4593","4658","4728","4800","4870","4940","5010","5077","5153","5225","5302","5373","5446","5510","5580","5652","5726","5799","5877","5947","6019","6099","6174","6247","6329","6399","6475","6552","6625","6697","6761","6831","6904","6984","7057","7129","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1114224.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.001420308}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"26","11309","20636","30995","41857","51685","61820","71405","82282","92581","103069","114250","123704","133498","144567","155732","164935","175559","186082","196700","207930","217367","227511","237781","248348","259679","269692","279097","289318","300619","311485","321268","331270","341882","352231","361830","372945","383382","393987","405239","415555","427032","438461","448473","459112","470359","481524","492717","502982","513710","524165","534333","544663","554875","565192","576567","586168","598386","608959","620175","629750","639772","650199","660474","671797","681920","692252","703223","713224","723069","733136","744467","754388","765063","775010","786658","796244","807059","817848","828650","839270","851099","861790","871850","883229","894821","905183","915481","925975","936732","947814","958254","967993","977342","988420","998860","1009253","1019245","1029913","1039907","1049935"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_web_page_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.00026666667::real,
+	4::integer,
+	172.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.012433333, 0.012266667, 0.012233334, 0.0122, 0.012133333, 0.012133333, 0.0121, 0.011833333, 0.0117, 0.011633334, 0.0116, 0.0114, 0.0114, 0.011366666, 0.011366666, 0.011166667, 0.0111, 0.0111, 0.0111, 0.011066667, 0.011, 0.011, 0.010966667, 0.010866666, 0.010866666, 0.0108, 0.010733333, 0.010666667, 0.010366667, 0.0101333335, 0.008866667, 0.0079, 0.0078, 0.0075333333, 0.0075, 0.0074333334, 0.0074, 0.0072333333, 0.0071666664, 0.0071333335, 0.0071333335, 0.0071, 0.0070666666, 0.0070666666, 0.007033333, 0.007033333, 0.007, 0.0069, 0.0069, 0.0068333335, 0.0068, 0.0067, 0.0067, 0.006666667, 0.0066333334, 0.0064666667, 0.0063, 0.0061666667, 0.0061, 0.0056666667, 0.005433333, 0.0054, 0.0052, 0.0052, 0.0051666666, 0.005133333, 0.0051, 0.0051, 0.0050666668, 0.0050666668, 0.0050333333, 0.0050333333, 0.0049666665, 0.0049666665, 0.0049333335, 0.0049333335, 0.0049333335, 0.0049333335, 0.0049, 0.004833333, 0.004833333, 0.004833333, 0.0048, 0.0048, 0.004766667, 0.0047, 0.0047, 0.0047, 0.0046666665, 0.0046666665, 0.0046666665, 0.0046333335, 0.0046333335, 0.0046333335, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667}'::real[],
+	NULL::real[],
+	'{0.0037705055}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"31","25","103","145","7","163","109","49","151","115","157","55","97","73","169","37","61","79","127","172","91","121","139","1","85","13","67","43","19","133","122","44","116","152","74","68","128","80","26","38","164","2","98","170","62","86","134","32","146","50","92","56","104","20","158","8","140","110","14","130","129","57","89","136","29","87","113","135","112","142","75","99","17","106","35","64","69","125","33","15","46","82","88","155","141","11","39","154","45","83","117","9","77","160","27","59","63","81","94","118"}'::int4[],
+	E'{"3","3","4","5","6","10","12","16","18","21","22","23","24","28","30","34","40","40","41","47","47","51","52","52","53","54","58","65","65","70","71","71","76","76","84","93","93","95","100","100","101","105","107","107","111","114","119","120","123","124","126","131","132","137","138","143","144","147","148","149","150","153","156","159","161","162","165","166","167","167","171","171"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_web_site_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	32.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.060833335, 0.059366666, 0.058766667, 0.0585, 0.0584, 0.0576, 0.0549, 0.036, 0.0357, 0.034733333, 0.034666665, 0.034433335, 0.025, 0.0247, 0.024433333, 0.0242, 0.0242, 0.024066666, 0.024033334, 0.023866666, 0.023566667, 0.023533333, 0.023266668, 0.023166666, 0.0231, 0.022766666, 0.022666667, 0.013133333, 0.012033333, 0.011566667, 0.011566667, 0.010933333}'::real[],
+	'{0.04239957}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"31","7","32","19","1","25","13","2","14","8","26","20","28","22","4","21","23","27","3","9","16","10","17","15","11","5","29","6","24","12","30","18"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_ship_mode_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	20.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0519, 0.05183333, 0.050966665, 0.050866667, 0.050633334, 0.050566666, 0.050533332, 0.050333332, 0.049933333, 0.049933333, 0.049933333, 0.049833335, 0.049833335, 0.0496, 0.049433332, 0.049233332, 0.0488, 0.0488, 0.048466668, 0.0482}'::real[],
+	'{0.056176268}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"11","4","17","19","16","5","8","12","6","7","18","2","10","15","9","20","1","3","13","14"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_warehouse_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	5.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.20156667, 0.20043333, 0.19946666, 0.19943333, 0.19873333}'::real[],
+	'{0.19803289}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","4","1","5","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0037666666, 0.0037, 0.0035333333, 0.0035333333, 0.0035}'::real[],
+	NULL::real[],
+	'{0.005415437}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"169","252","72","118","335"}'::int4[],
+	E'{"1","4","7","11","15","19","22","26","29","33","36","39","43","47","51","54","58","61","65","68","71","76","79","83","86","89","93","96","100","103","107","110","114","117","122","125","129","132","136","139","143","146","150","153","157","161","164","168","173","176","180","183","187","190","193","197","200","204","208","211","215","218","222","225","229","233","236","240","244","247","251","255","259","262","266","269","273","276","279","283","287","290","294","297","300","304","308","311","315","318","322","325","329","332","337","340","344","347","351","354","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_order_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	31567772.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.06999581}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"121","317641","648578","945597","1288393","1573610","1860492","2157681","2459791","2761260","3028976","3321440","3616466","3914756","4237831","4544558","4833953","5074651","5373885","5669291","6007647","6291071","6582751","6873797","7171514","7488211","7794326","8082653","8395928","8704266","9030833","9316184","9652205","9924686","10207036","10507877","10826653","11124316","11413852","11700753","11996463","12275214","12553434","12843505","13133657","13432219","13722004","14024091","14320895","14620641","14953137","15244476","15539965","15844103","16163890","16449629","16748023","17025956","17343876","17630387","17939341","18239124","18538613","18878347","19178480","19467260","19779045","20065269","20381326","20712670","20992673","21280690","21613312","21911183","22191172","22482391","22796790","23114702","23395001","23716661","24042960","24340548","24628420","24894268","25221472","25528346","25827723","26138822","26441040","26745092","27033424","27319988","27614893","27924604","28205457","28532777","28829016","29120974","29422245","29678171","29997708"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+--
+-- Table: web_sales, Attribute: ws_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0117, 0.011633334, 0.0113, 0.0111, 0.011066667, 0.010933333, 0.010933333, 0.0109, 0.0109, 0.0109, 0.010833333, 0.0108, 0.010766666, 0.0107, 0.010666667, 0.010566667, 0.010466667, 0.010466667, 0.0104, 0.010366667, 0.010366667, 0.010333333, 0.0103, 0.010266666, 0.010266666, 0.010266666, 0.010233333, 0.010233333, 0.010233333, 0.0102, 0.0101666665, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101333335, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.01, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.0099, 0.0099, 0.009866667, 0.009866667, 0.009866667, 0.009833333, 0.0098, 0.0098, 0.009766666, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.0097, 0.0097, 0.009666666, 0.009633333, 0.0096, 0.0096, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.009466667, 0.009466667, 0.0094, 0.0094, 0.0094, 0.009366667, 0.009366667, 0.009366667, 0.009333333, 0.009266667, 0.009233333, 0.0092, 0.009133333, 0.009133333, 0.009, 0.008933334, 0.008666666}'::real[],
+	'{0.014699079}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"55","56","49","74","6","69","80","42","53","76","82","93","23","10","41","7","26","61","70","73","90","68","40","58","72","78","39","59","71","2","21","34","17","54","84","8","22","24","38","60","75","77","29","33","47","95","96","98","18","52","66","3","64","15","31","83","5","57","87","13","36","67","9","37","79","4","46","1","45","91","92","11","97","30","50","81","43","16","44","48","85","25","100","12","63","20","32","86","19","27","99","35","89","62","65","28","51","14","88","94"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+--
+-- Table: web_sales, Attribute: ws_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0004::real,
+	6::integer,
+	9928.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.007165513}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"25.53","30.19","51.31","53.30","55.63","60.00","60.37","72.31","83.48","87.79"}'::numeric[],
+	E'{"1.00","2.00","3.01","3.99","5.01","5.98","6.90","7.81","8.78","9.77","10.82","11.75","12.73","13.64","14.64","15.70","16.68","17.70","18.55","19.52","20.51","21.47","22.49","23.60","24.61","25.59","26.60","27.68","28.73","29.69","30.74","31.63","32.62","33.59","34.69","35.74","36.73","37.59","38.60","39.62","40.68","41.65","42.59","43.49","44.44","45.41","46.35","47.34","48.33","49.28","50.23","51.18","52.17","53.17","54.21","55.20","56.12","57.20","58.17","59.12","60.16","61.11","62.13","63.13","64.04","65.08","66.03","66.99","67.92","69.02","69.96","71.00","71.88","72.93","73.95","74.98","76.06","77.09","78.09","79.05","79.99","81.05","82.06","83.02","84.06","85.19","86.28","87.20","88.17","89.18","90.18","91.03","92.00","92.96","94.05","94.97","95.97","96.93","97.94","98.99","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.00026666667::real,
+	6::integer,
+	23431.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.0003, 0.00026666667}'::real[],
+	NULL::real[],
+	'{-0.011709301}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"12.66","82.70","21.34"}'::numeric[],
+	E'{"1.11","3.63","5.56","7.34","9.01","10.72","12.60","14.50","16.23","17.89","19.83","21.55","23.30","25.17","26.92","28.63","30.25","31.84","33.78","35.57","37.56","39.36","41.23","42.89","44.61","46.36","48.07","50.03","51.95","53.80","55.48","57.36","59.16","60.92","62.83","64.68","66.48","68.14","69.79","71.63","73.63","75.51","77.07","78.85","80.80","82.62","84.47","86.12","88.00","89.88","91.57","93.44","95.26","97.24","99.03","100.89","102.79","104.74","106.47","108.50","110.28","112.13","114.15","116.34","118.35","120.77","122.81","124.89","127.28","129.50","131.92","134.57","136.88","139.32","142.07","144.61","147.18","150.06","152.87","155.83","158.87","161.99","165.25","168.54","172.12","175.74","179.09","183.39","187.67","192.09","197.29","201.65","207.10","212.73","218.60","225.49","232.53","240.48","251.38","266.95","296.85"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.00036666667::real,
+	6::integer,
+	14531.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0104, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.0046185157}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","2.06","2.70","3.03","3.83","3.87","0.80","0.94","3.04","4.70","5.59","11.09","0.70","0.89","1.17","1.28","1.33","1.55","1.81","2.13","2.80","3.51","3.68","3.75","3.77","4.11","4.41","6.03","15.17","0.41","0.72","0.86","1.12","1.21","1.44","1.66","2.24","2.46","2.92","3.38","3.40","3.43","4.23","4.64","4.98","5.48","5.60","5.68","6.12","6.37","6.49","7.58","8.47","11.40","15.80","0.30","0.66","0.71","1.14","1.18","1.32","1.49","1.53","1.70","1.89","2.03","2.05","2.22","2.37","2.43","2.52","2.53","2.78","2.82","2.87","2.88","3.25","3.61","3.67","3.71","3.94","3.95","4.17","4.22","4.59","4.82","4.91","5.07","5.19","5.24","5.64","5.70","6.11","6.53","6.57","6.95","7.00","7.73","7.84","7.99"}'::numeric[],
+	E'{"0.01","0.60","1.11","1.64","2.20","2.74","3.31","3.91","4.48","5.09","5.63","6.17","6.81","7.45","8.09","8.66","9.30","9.96","10.52","11.12","11.75","12.44","13.09","13.82","14.54","15.25","15.99","16.72","17.50","18.22","19.04","19.87","20.70","21.43","22.29","23.23","24.09","25.02","25.92","26.85","27.82","28.75","29.71","30.71","31.75","32.78","33.78","34.80","35.93","37.02","38.14","39.29","40.43","41.60","42.81","44.07","45.33","46.59","47.86","49.28","50.73","52.22","53.69","55.11","56.86","58.38","60.03","61.68","63.22","65.10","66.78","68.62","70.35","72.19","74.30","76.43","78.67","81.00","83.19","85.26","87.83","90.51","93.08","95.96","98.78","102.09","105.42","109.06","112.87","116.26","120.47","125.09","130.89","136.72","143.90","151.28","160.21","170.24","184.92","205.80","292.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.00023333334::real,
+	6::integer,
+	143461.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.008966667, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0031384944}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","47.60","333.00"}'::numeric[],
+	E'{"0.11","11.18","20.44","31.11","41.86","52.90","64.50","75.24","88.16","100.08","113.88","127.60","141.90","158.13","176.97","194.72","211.91","230.04","247.80","270.20","292.80","314.96","336.26","358.72","384.84","412.08","437.64","462.84","489.06","516.88","547.36","574.47","607.20","636.57","669.28","702.30","740.88","777.49","815.40","855.00","891.48","929.25","969.54","1014.26","1058.88","1106.04","1154.78","1202.30","1251.81","1305.20","1355.86","1412.46","1469.43","1528.56","1594.50","1659.35","1728.00","1792.70","1862.70","1933.38","2005.02","2079.36","2157.40","2242.56","2326.52","2413.80","2503.90","2604.75","2707.31","2815.80","2923.56","3023.16","3143.36","3267.04","3403.08","3542.86","3676.34","3816.00","3975.42","4122.84","4289.29","4480.63","4684.35","4859.40","5062.32","5306.40","5536.80","5796.00","6095.70","6444.80","6772.48","7170.48","7599.34","8105.58","8650.46","9275.07","10054.69","11049.02","12248.28","14374.90","25989.60"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	24::smallint,
+	False::boolean,
+	0.00033333333::real,
+	6::integer,
+	145118.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0104, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-3.1174983e-05}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","42.12","43.56"}'::numeric[],
+	E'{"0.15","11.55","21.09","31.38","41.40","52.47","63.68","75.30","87.36","102.00","115.28","130.23","143.98","161.58","177.08","195.03","212.64","231.77","250.56","270.60","291.64","313.31","336.44","359.92","382.11","408.00","433.65","460.80","487.06","515.16","541.38","569.88","600.62","631.67","663.75","696.96","733.08","770.99","809.00","848.70","887.04","930.69","971.28","1008.54","1054.04","1100.44","1151.97","1201.56","1252.10","1308.53","1366.40","1428.45","1484.64","1537.62","1599.40","1660.56","1730.20","1807.20","1873.92","1944.84","2025.30","2097.54","2180.70","2264.22","2351.00","2447.28","2539.20","2636.70","2733.72","2834.16","2948.78","3067.62","3174.24","3287.79","3403.35","3526.74","3663.90","3815.55","3966.90","4120.92","4294.76","4473.13","4690.56","4881.66","5088.60","5302.54","5533.92","5818.56","6094.50","6392.75","6752.16","7092.90","7519.73","7968.00","8494.71","9116.10","9877.56","10865.55","12247.37","14678.04","25048.32"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	25::smallint,
+	False::boolean,
+	6.666667e-05::real,
+	6::integer,
+	196312.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0027050157}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.93","35.43","56.70","76.82","96.60","119.36","142.52","164.70","188.88","216.20","242.60","269.10","293.82","318.16","349.23","379.35","408.51","439.04","467.04","497.98","532.65","566.68","603.20","640.29","677.73","713.32","749.62","785.46","825.12","866.00","906.84","950.49","991.20","1035.40","1086.15","1131.19","1176.84","1221.96","1272.15","1321.00","1365.67","1417.72","1474.75","1528.74","1580.92","1635.13","1688.70","1744.40","1798.35","1854.56","1916.24","1981.60","2043.72","2105.60","2172.12","2249.94","2313.36","2380.16","2454.80","2530.80","2606.81","2680.56","2757.50","2832.83","2910.27","2989.11","3068.24","3147.96","3230.25","3327.77","3416.49","3506.28","3596.71","3686.50","3790.16","3884.76","3987.72","4089.55","4193.84","4304.25","4429.44","4544.01","4671.15","4795.30","4936.88","5074.40","5225.22","5382.29","5548.20","5722.02","5905.20","6111.16","6317.28","6532.92","6787.56","7078.66","7384.50","7726.50","8117.00","8641.90","9964.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	26::smallint,
+	False::boolean,
+	0.00046666668::real,
+	7::integer,
+	373627.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0056457715}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3.82","64.44","101.53","139.08","181.44","220.10","260.15","300.40","347.16","399.06","442.80","490.98","543.49","592.36","645.05","702.61","756.24","813.24","866.12","923.12","986.70","1051.75","1114.12","1180.48","1241.10","1306.88","1373.56","1443.48","1522.30","1594.02","1668.20","1759.04","1834.80","1908.80","1995.12","2087.00","2170.48","2274.40","2365.65","2454.60","2553.48","2645.06","2748.90","2856.00","2958.12","3067.00","3175.68","3276.80","3382.95","3504.28","3617.46","3732.75","3852.12","3975.75","4098.27","4220.40","4355.04","4483.16","4613.12","4751.70","4888.73","5040.00","5184.62","5346.00","5487.69","5630.85","5786.64","5954.61","6113.82","6291.90","6477.02","6674.57","6870.24","7079.40","7274.74","7502.88","7699.20","7915.05","8155.70","8392.50","8646.08","8912.73","9191.07","9444.42","9740.49","10052.91","10348.48","10732.50","11116.80","11510.34","11983.48","12501.83","13062.54","13645.80","14316.72","15042.00","15921.12","16966.66","18501.25","20712.09","29685.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	27::smallint,
+	False::boolean,
+	0.00033333333::real,
+	6::integer,
+	21995.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10896666, 0.00066666666, 0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667}'::real[],
+	NULL::real[],
+	'{0.004573461}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.35","0.50","2.16","0.22","0.26","0.34","1.08","1.53","0.37","0.46","0.52","0.57","0.92","2.29","0.03","0.09","0.12","0.21","0.42","0.43","0.60","0.75","0.04","0.07","0.28","0.32","0.36","0.78","0.87","1.16","1.94","2.24","2.35","3.04","3.72","5.24","0.11","0.27","0.39","0.48","0.53","0.56","0.58","0.69","0.90","1.02","1.07","1.18","1.44","1.72","2.20","2.67","4.41","0.06","0.16","0.25","0.38","0.47","0.77","0.79","0.85","1.01","1.04","1.19","1.23","1.78","1.90","1.91","1.92","2.21","2.60","2.94","4.33","5.60","0.02","0.08","0.18","0.19","0.23","0.24","0.30","0.31","0.49","0.51","0.54","0.55","0.66","0.67","0.81","0.93","1.00","1.14","1.42","1.45","1.56","1.80","1.88","2.26","2.50"}'::numeric[],
+	E'{"0.01","0.83","1.34","1.75","2.23","2.69","3.10","3.49","3.97","4.43","4.88","5.35","5.90","6.43","7.00","7.69","8.38","8.95","9.70","10.49","11.20","11.89","12.64","13.48","14.34","15.18","16.14","16.99","18.05","19.01","19.99","21.08","22.13","23.33","24.48","25.75","26.99","28.33","29.92","31.37","32.94","34.59","36.09","37.92","39.69","41.47","43.32","45.30","47.20","48.97","50.94","53.17","55.40","57.80","60.19","62.89","65.72","68.28","71.23","74.17","77.49","81.04","84.54","88.21","91.73","95.71","100.03","104.60","109.56","114.83","119.85","125.13","131.38","137.60","144.21","150.45","157.35","164.05","171.91","179.70","189.75","199.15","211.02","222.05","234.00","246.12","259.74","274.59","291.64","309.69","330.12","352.06","377.91","410.73","445.30","487.66","545.67","620.87","718.11","874.66","2139.82"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	28::smallint,
+	False::boolean,
+	0.00043333333::real,
+	3::integer,
+	6981.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.8047}'::real[],
+	NULL::real[],
+	'{0.6524823}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.07","2.81","5.16","8.29","11.57","14.98","18.25","22.17","25.74","29.25","33.46","38.75","43.09","47.74","52.23","58.18","63.93","69.06","75.54","81.43","90.24","97.41","105.00","112.34","119.93","128.94","139.96","150.39","161.12","170.13","179.08","190.02","204.24","216.80","230.79","242.88","256.72","269.70","285.28","299.98","321.93","337.96","359.92","379.16","398.56","411.26","434.53","456.18","480.99","503.11","534.41","559.69","587.89","615.55","642.62","675.15","706.02","738.29","769.44","805.37","834.44","867.90","910.13","947.74","994.63","1042.05","1081.01","1133.06","1191.03","1244.46","1291.32","1335.46","1389.96","1451.73","1524.48","1590.31","1679.40","1745.45","1825.78","1907.96","2007.12","2097.34","2207.59","2313.09","2431.84","2586.43","2750.05","2882.04","3053.86","3220.08","3468.52","3726.47","4048.99","4401.10","4748.00","5156.34","5788.23","6391.13","7477.72","9404.42","23044.45"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_ext_ship_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=29;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	29::smallint,
+	False::boolean,
+	0.00026666667::real,
+	6::integer,
+	83043.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.020966666, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.006589469}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","450.80","10.92","48.40","68.40","79.20","93.60","113.40","142.80","6.72","9.18","15.84","16.80","23.10","32.40","37.80","38.22","52.80","84.00","105.30","106.26","111.60","126.00","131.04","143.04","184.80","198.00","216.72","305.76","333.00","369.60"}'::numeric[],
+	E'{"0.12","6.44","12.04","17.91","23.85","29.60","36.11","42.78","49.62","56.16","63.60","71.04","78.89","87.72","96.00","104.00","113.54","123.20","133.92","145.52","155.25","165.02","176.80","189.20","201.63","213.48","226.80","240.50","253.76","267.85","282.72","298.89","316.10","330.25","346.00","363.00","380.52","400.32","419.76","438.40","457.56","477.96","499.20","523.27","545.37","568.70","592.32","616.00","643.86","672.10","699.48","723.24","752.40","785.46","813.93","846.30","879.06","914.50","948.00","983.84","1020.80","1057.50","1097.25","1140.48","1180.20","1229.80","1277.46","1323.70","1377.74","1434.40","1494.96","1555.07","1608.18","1672.32","1736.04","1799.16","1871.10","1948.48","2020.46","2099.31","2180.40","2270.40","2362.56","2458.14","2562.12","2692.80","2810.50","2931.74","3077.75","3238.31","3432.00","3613.44","3833.20","4076.73","4350.06","4641.78","5042.73","5561.25","6238.65","7336.85","12822.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=30;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	30::smallint,
+	False::boolean,
+	0.00043333333::real,
+	6::integer,
+	155462.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0125, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0023643773}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","43.56"}'::numeric[],
+	E'{"0.06","6.90","13.40","20.67","28.47","35.91","44.46","53.53","63.00","73.44","83.29","95.48","107.88","119.93","132.34","144.75","160.46","175.10","190.14","206.83","222.10","239.84","258.46","275.49","294.81","315.96","336.50","358.36","379.82","403.62","429.78","456.00","481.00","507.99","534.40","561.61","589.38","619.65","651.00","683.82","717.57","755.54","794.30","830.96","872.19","911.09","954.18","992.44","1035.44","1083.95","1133.73","1186.24","1242.02","1296.12","1352.96","1411.83","1470.70","1528.24","1597.05","1662.45","1734.44","1814.25","1880.05","1954.56","2034.12","2110.08","2198.27","2289.76","2377.50","2475.02","2583.69","2686.32","2791.36","2899.80","3029.56","3156.05","3271.45","3395.25","3526.10","3668.35","3836.05","4007.85","4182.57","4382.49","4602.96","4828.07","5062.08","5308.86","5595.68","5910.43","6219.45","6596.00","7000.70","7489.02","8014.44","8603.82","9384.00","10412.72","11672.78","14217.46","24307.65"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=31;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	31::smallint,
+	False::boolean,
+	0.0003::real,
+	6::integer,
+	246002.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.012466666, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0024806631}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","57.28"}'::numeric[],
+	E'{"0.06","7.24","14.07","21.63","29.77","37.41","46.45","56.03","66.38","76.71","87.19","99.41","112.52","125.57","138.96","151.61","167.50","182.92","198.36","216.24","231.78","251.32","269.52","288.70","306.76","329.56","350.90","374.93","397.02","422.18","449.02","474.60","501.75","531.09","559.18","587.44","616.28","646.64","680.44","714.49","750.33","786.11","828.41","870.48","912.34","955.22","997.24","1039.57","1083.93","1132.88","1186.06","1237.31","1299.09","1355.29","1409.04","1474.72","1532.54","1592.67","1668.97","1738.60","1815.18","1890.75","1969.95","2046.13","2120.47","2201.72","2290.88","2394.32","2487.04","2585.21","2701.06","2805.79","2915.24","3036.02","3164.89","3298.38","3422.94","3549.84","3672.00","3832.97","4016.75","4182.78","4379.44","4577.43","4811.80","5061.31","5307.67","5555.95","5845.41","6173.76","6521.98","6885.89","7318.05","7810.46","8377.41","8999.04","9828.90","10854.91","12167.98","14819.83","25915.60"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_ship
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=32;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	32::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	301791.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004}'::real[],
+	NULL::real[],
+	'{-0.0042563225}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.15","26.90","47.27","66.00","87.66","110.70","130.90","153.36","177.10","200.26","226.76","251.37","278.08","304.01","330.99","360.93","391.74","422.88","454.10","486.85","518.42","554.54","589.68","627.00","662.74","700.56","740.52","781.44","822.39","863.04","903.00","950.37","1000.58","1042.83","1092.42","1141.32","1193.41","1249.05","1308.51","1363.96","1424.64","1479.06","1542.09","1608.99","1672.64","1734.00","1802.29","1875.28","1951.50","2031.12","2099.65","2168.25","2252.68","2350.87","2431.91","2518.02","2615.34","2697.47","2798.23","2897.37","3002.40","3098.34","3202.68","3308.00","3423.75","3542.37","3654.66","3775.98","3909.42","4028.66","4167.30","4309.90","4464.88","4615.84","4766.58","4937.48","5114.56","5268.48","5449.86","5643.55","5859.42","6093.48","6323.40","6589.80","6865.04","7151.04","7471.75","7798.48","8167.15","8545.18","8940.05","9403.24","9923.00","10538.58","11210.00","12020.74","12946.34","14134.36","15809.06","18879.36","36064.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_ship_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=33;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	33::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	580101.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004}'::real[],
+	NULL::real[],
+	'{-0.0042436747}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.15","27.32","48.14","67.61","90.21","112.88","134.60","157.01","181.53","205.08","232.37","257.90","285.99","310.90","338.12","369.71","401.62","432.71","466.15","498.29","532.67","568.73","606.20","644.59","677.83","716.94","756.42","802.49","841.36","885.36","929.11","973.55","1022.68","1069.26","1124.40","1170.12","1225.33","1284.57","1342.88","1398.12","1459.13","1514.68","1583.89","1648.82","1714.40","1780.42","1851.90","1924.20","2000.32","2078.12","2156.48","2230.86","2317.75","2412.28","2495.80","2582.42","2677.84","2771.12","2874.03","2977.91","3073.79","3182.59","3288.45","3403.98","3512.75","3630.83","3761.65","3884.79","4011.93","4143.91","4277.61","4436.91","4583.20","4733.60","4884.95","5069.66","5251.05","5427.69","5605.76","5797.65","6025.63","6250.68","6502.49","6751.35","7071.69","7353.10","7674.41","8024.66","8431.89","8815.18","9204.22","9715.49","10211.19","10847.31","11539.04","12347.17","13354.05","14622.68","16369.05","19567.99","38203.82"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+--
+-- Table: web_sales, Attribute: ws_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=34;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	34::smallint,
+	False::boolean,
+	0.0::real,
+	6::integer,
+	206397.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.009154078}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"-9828.00","-6282.88","-5353.36","-4759.04","-4327.14","-3980.40","-3689.38","-3415.01","-3200.70","-2979.08","-2776.62","-2608.96","-2449.44","-2301.84","-2164.10","-2041.05","-1931.67","-1824.00","-1713.27","-1605.45","-1519.20","-1432.56","-1351.42","-1271.98","-1193.64","-1123.08","-1053.59","-994.98","-939.75","-874.80","-825.28","-773.60","-726.24","-683.34","-636.68","-597.28","-559.37","-523.79","-486.00","-449.68","-416.64","-383.24","-353.70","-325.01","-296.56","-271.44","-246.81","-222.48","-199.76","-177.30","-156.21","-138.71","-119.47","-102.79","-85.56","-72.32","-58.00","-46.02","-34.44","-22.62","-11.88","-1.54","7.80","20.24","33.81","49.02","66.06","87.48","111.15","138.51","166.66","197.05","235.56","273.56","316.31","364.32","415.57","472.36","537.60","604.77","677.15","764.42","854.28","951.99","1064.31","1176.00","1306.32","1449.60","1614.67","1788.28","1984.00","2213.82","2467.72","2782.77","3119.84","3508.34","4027.92","4724.10","5672.52","7345.81","15055.16"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+-- 
+-- Query text
+-- 
+ set search_path=cte_bug,public;
+ set gp_cte_sharing = on;
+ explain(costs off)
+ with year_total as (
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum(((ss_ext_list_price-ss_ext_wholesale_cost-ss_ext_discount_amt)+ss_ext_sales_price)/2)
+ year_total
+        ,'s' sale_type
+  from cte_bug.customer
+      ,cte_bug.store_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = ss_customer_sk
+    and ss_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+  union all
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum((((cs_ext_list_price-cs_ext_wholesale_cost-cs_ext_discount_amt)+cs_ext_sales_price)/2)
+ ) year_total
+        ,'c' sale_type
+  from cte_bug.customer
+      ,cte_bug.catalog_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = cs_bill_customer_sk
+    and cs_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+ union all
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum((((ws_ext_list_price-ws_ext_wholesale_cost-ws_ext_discount_amt)+ws_ext_sales_price)/2)
+ ) year_total
+        ,'w' sale_type
+  from cte_bug.customer
+      ,cte_bug.web_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = ws_bill_customer_sk
+    and ws_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+          )
+   select  
+                   t_s_secyear.customer_id
+                  ,t_s_secyear.customer_first_name
+                  ,t_s_secyear.customer_last_name
+                  ,t_s_secyear.customer_login
+  from year_total t_s_firstyear
+      ,year_total t_s_secyear
+      ,year_total t_c_firstyear
+      ,year_total t_c_secyear
+      ,year_total t_w_firstyear
+      ,year_total t_w_secyear
+  where t_s_secyear.customer_id = t_s_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_c_secyear.customer_id
+    and t_s_firstyear.customer_id = t_c_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_w_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_w_secyear.customer_id
+    and t_s_firstyear.sale_type = 's'
+    and t_c_firstyear.sale_type = 'c'
+    and t_w_firstyear.sale_type = 'w'
+    and t_s_secyear.sale_type = 's'
+    and t_c_secyear.sale_type = 'c'
+    and t_w_secyear.sale_type = 'w'
+    and t_s_firstyear.dyear =  2001
+    and t_s_secyear.dyear = 2001+1
+    and t_c_firstyear.dyear =  2001
+    and t_c_secyear.dyear =  2001+1
+    and t_w_firstyear.dyear = 2001
+    and t_w_secyear.dyear = 2001+1
+    and t_s_firstyear.year_total > 0
+    and t_c_firstyear.year_total > 0
+    and t_w_firstyear.year_total > 0
+    and case when t_c_firstyear.year_total > 0 then
+ t_c_secyear.year_total / t_c_firstyear.year_total else null end > case
+ when t_s_firstyear.year_total > 0 then t_s_secyear.year_total /
+ t_s_firstyear.year_total else null end
+    and case when t_c_firstyear.year_total > 0 then
+ t_c_secyear.year_total / t_c_firstyear.year_total else null end > case
+ when t_w_firstyear.year_total > 0 then t_w_secyear.year_total /
+ t_w_firstyear.year_total else null end
+  order by t_s_secyear.customer_id
+          ,t_s_secyear.customer_first_name
+          ,t_s_secyear.customer_last_name
+          ,t_s_secyear.customer_login
+ limit 100;
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         QUERY PLAN                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Merge Key: share0_ref7.c_customer_id, share0_ref7.c_first_name, share0_ref7.c_last_name, share0_ref7.c_login
+   ->  Sort
+         Sort Key: share0_ref7.c_customer_id, share0_ref7.c_first_name, share0_ref7.c_last_name, share0_ref7.c_login
+         ->  Sequence
+               ->  Shared Scan (share slice:id 1:0)
+                     ->  Append
+                           ->  Result
+                                 Filter: (((('s'::text) = 's'::text) AND (date_dim.d_year = 2001) AND ((sum(((((store_sales.ss_ext_list_price - store_sales.ss_ext_wholesale_cost) - store_sales.ss_ext_discount_amt) + store_sales.ss_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('s'::text) = 's'::text) AND (date_dim.d_year = 2002)) OR ((('s'::text) = 'c'::text) AND (date_dim.d_year = 2001) AND ((sum(((((store_sales.ss_ext_list_price - store_sales.ss_ext_wholesale_cost) - store_sales.ss_ext_discount_amt) + store_sales.ss_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('s'::text) = 'c'::text) AND (date_dim.d_year = 2002)) OR ((('s'::text) = 'w'::text) AND (date_dim.d_year = 2001) AND ((sum(((((store_sales.ss_ext_list_price - store_sales.ss_ext_wholesale_cost) - store_sales.ss_ext_discount_amt) + store_sales.ss_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('s'::text) = 'w'::text) AND (date_dim.d_year = 2002)))
+                                 ->  Finalize HashAggregate
+                                       Group Key: customer.c_customer_id, customer.c_first_name, customer.c_last_name, customer.c_preferred_cust_flag, customer.c_birth_country, customer.c_login, customer.c_email_address, date_dim.d_year
+                                       ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                                             Hash Key: customer.c_customer_id, customer.c_first_name, customer.c_last_name, customer.c_preferred_cust_flag, customer.c_birth_country, customer.c_login, customer.c_email_address, date_dim.d_year
+                                             ->  Streaming Partial HashAggregate
+                                                   Group Key: customer.c_customer_id, customer.c_first_name, customer.c_last_name, customer.c_preferred_cust_flag, customer.c_birth_country, customer.c_login, customer.c_email_address, date_dim.d_year
+                                                   ->  Hash Join
+                                                         Hash Cond: (store_sales.ss_customer_sk = customer.c_customer_sk)
+                                                         ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                                                               Hash Key: store_sales.ss_customer_sk
+                                                               ->  Hash Join
+                                                                     Hash Cond: (store_sales.ss_sold_date_sk = date_dim.d_date_sk)
+                                                                     ->  Seq Scan on store_sales
+                                                                     ->  Hash
+                                                                           ->  Broadcast Motion 3:3  (slice4; segments: 3)
+                                                                                 ->  Seq Scan on date_dim
+                                                                                       Filter: ((d_year = 2001) OR (d_year = 2002))
+                                                         ->  Hash
+                                                               ->  Seq Scan on customer
+                           ->  Result
+                                 Filter: (((('c'::text) = 's'::text) AND (date_dim_1.d_year = 2001) AND ((sum(((((catalog_sales.cs_ext_list_price - catalog_sales.cs_ext_wholesale_cost) - catalog_sales.cs_ext_discount_amt) + catalog_sales.cs_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('c'::text) = 's'::text) AND (date_dim_1.d_year = 2002)) OR ((('c'::text) = 'c'::text) AND (date_dim_1.d_year = 2001) AND ((sum(((((catalog_sales.cs_ext_list_price - catalog_sales.cs_ext_wholesale_cost) - catalog_sales.cs_ext_discount_amt) + catalog_sales.cs_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('c'::text) = 'c'::text) AND (date_dim_1.d_year = 2002)) OR ((('c'::text) = 'w'::text) AND (date_dim_1.d_year = 2001) AND ((sum(((((catalog_sales.cs_ext_list_price - catalog_sales.cs_ext_wholesale_cost) - catalog_sales.cs_ext_discount_amt) + catalog_sales.cs_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('c'::text) = 'w'::text) AND (date_dim_1.d_year = 2002)))
+                                 ->  Finalize HashAggregate
+                                       Group Key: customer_1.c_customer_id, customer_1.c_first_name, customer_1.c_last_name, customer_1.c_preferred_cust_flag, customer_1.c_birth_country, customer_1.c_login, customer_1.c_email_address, date_dim_1.d_year
+                                       ->  Redistribute Motion 3:3  (slice5; segments: 3)
+                                             Hash Key: customer_1.c_customer_id, customer_1.c_first_name, customer_1.c_last_name, customer_1.c_preferred_cust_flag, customer_1.c_birth_country, customer_1.c_login, customer_1.c_email_address, date_dim_1.d_year
+                                             ->  Streaming Partial HashAggregate
+                                                   Group Key: customer_1.c_customer_id, customer_1.c_first_name, customer_1.c_last_name, customer_1.c_preferred_cust_flag, customer_1.c_birth_country, customer_1.c_login, customer_1.c_email_address, date_dim_1.d_year
+                                                   ->  Hash Join
+                                                         Hash Cond: (catalog_sales.cs_bill_customer_sk = customer_1.c_customer_sk)
+                                                         ->  Redistribute Motion 3:3  (slice6; segments: 3)
+                                                               Hash Key: catalog_sales.cs_bill_customer_sk
+                                                               ->  Hash Join
+                                                                     Hash Cond: (catalog_sales.cs_sold_date_sk = date_dim_1.d_date_sk)
+                                                                     ->  Seq Scan on catalog_sales
+                                                                     ->  Hash
+                                                                           ->  Broadcast Motion 3:3  (slice7; segments: 3)
+                                                                                 ->  Seq Scan on date_dim date_dim_1
+                                                                                       Filter: ((d_year = 2001) OR (d_year = 2002))
+                                                         ->  Hash
+                                                               ->  Seq Scan on customer customer_1
+                           ->  Result
+                                 Filter: (((('w'::text) = 's'::text) AND (date_dim_2.d_year = 2001) AND ((sum(((((web_sales.ws_ext_list_price - web_sales.ws_ext_wholesale_cost) - web_sales.ws_ext_discount_amt) + web_sales.ws_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('w'::text) = 's'::text) AND (date_dim_2.d_year = 2002)) OR ((('w'::text) = 'c'::text) AND (date_dim_2.d_year = 2001) AND ((sum(((((web_sales.ws_ext_list_price - web_sales.ws_ext_wholesale_cost) - web_sales.ws_ext_discount_amt) + web_sales.ws_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('w'::text) = 'c'::text) AND (date_dim_2.d_year = 2002)) OR ((('w'::text) = 'w'::text) AND (date_dim_2.d_year = 2001) AND ((sum(((((web_sales.ws_ext_list_price - web_sales.ws_ext_wholesale_cost) - web_sales.ws_ext_discount_amt) + web_sales.ws_ext_sales_price) / '2'::numeric))) > '0'::numeric)) OR ((('w'::text) = 'w'::text) AND (date_dim_2.d_year = 2002)))
+                                 ->  Finalize HashAggregate
+                                       Group Key: customer_2.c_customer_id, customer_2.c_first_name, customer_2.c_last_name, customer_2.c_preferred_cust_flag, customer_2.c_birth_country, customer_2.c_login, customer_2.c_email_address, date_dim_2.d_year
+                                       ->  Redistribute Motion 3:3  (slice8; segments: 3)
+                                             Hash Key: customer_2.c_customer_id, customer_2.c_first_name, customer_2.c_last_name, customer_2.c_preferred_cust_flag, customer_2.c_birth_country, customer_2.c_login, customer_2.c_email_address, date_dim_2.d_year
+                                             ->  Streaming Partial HashAggregate
+                                                   Group Key: customer_2.c_customer_id, customer_2.c_first_name, customer_2.c_last_name, customer_2.c_preferred_cust_flag, customer_2.c_birth_country, customer_2.c_login, customer_2.c_email_address, date_dim_2.d_year
+                                                   ->  Hash Join
+                                                         Hash Cond: (web_sales.ws_bill_customer_sk = customer_2.c_customer_sk)
+                                                         ->  Redistribute Motion 3:3  (slice9; segments: 3)
+                                                               Hash Key: web_sales.ws_bill_customer_sk
+                                                               ->  Hash Join
+                                                                     Hash Cond: (web_sales.ws_sold_date_sk = date_dim_2.d_date_sk)
+                                                                     ->  Seq Scan on web_sales
+                                                                     ->  Hash
+                                                                           ->  Broadcast Motion 3:3  (slice10; segments: 3)
+                                                                                 ->  Seq Scan on date_dim date_dim_2
+                                                                                       Filter: ((d_year = 2001) OR (d_year = 2002))
+                                                         ->  Hash
+                                                               ->  Seq Scan on customer customer_2
+               ->  Redistribute Motion 1:3  (slice11)
+                     ->  Limit
+                           ->  Gather Motion 3:1  (slice12; segments: 3)
+                                 Merge Key: share0_ref7.c_customer_id, share0_ref7.c_first_name, share0_ref7.c_last_name, share0_ref7.c_login
+                                 ->  Limit
+                                       ->  Sort
+                                             Sort Key: share0_ref7.c_customer_id, share0_ref7.c_first_name, share0_ref7.c_last_name, share0_ref7.c_login
+                                             ->  Hash Join
+                                                   Hash Cond: ((share0_ref7.c_customer_id)::text = (share0_ref2.c_customer_id)::text)
+                                                   Join Filter: (CASE WHEN (share0_ref5.sum > '0'::numeric) THEN (share0_ref6.sum / share0_ref5.sum) ELSE NULL::numeric END > CASE WHEN (share0_ref2.sum > '0'::numeric) THEN (share0_ref7.sum / share0_ref2.sum) ELSE NULL::numeric END)
+                                                   ->  Hash Join
+                                                         Hash Cond: ((share0_ref7.c_customer_id)::text = (share0_ref5.c_customer_id)::text)
+                                                         ->  Redistribute Motion 3:3  (slice13; segments: 3)
+                                                               Hash Key: share0_ref7.c_customer_id
+                                                               ->  Result
+                                                                     Filter: ((share0_ref7.sale_type = 's'::text) AND (share0_ref7.d_year = 2002))
+                                                                     ->  Shared Scan (share slice:id 13:0)
+                                                         ->  Hash
+                                                               ->  Hash Join
+                                                                     Hash Cond: ((share0_ref5.c_customer_id)::text = (share0_ref3.c_customer_id)::text)
+                                                                     Join Filter: (CASE WHEN (share0_ref5.sum > '0'::numeric) THEN (share0_ref6.sum / share0_ref5.sum) ELSE NULL::numeric END > CASE WHEN (share0_ref4.sum > '0'::numeric) THEN (share0_ref3.sum / share0_ref4.sum) ELSE NULL::numeric END)
+                                                                     ->  Hash Join
+                                                                           Hash Cond: ((share0_ref5.c_customer_id)::text = (share0_ref4.c_customer_id)::text)
+                                                                           ->  Hash Join
+                                                                                 Hash Cond: ((share0_ref6.c_customer_id)::text = (share0_ref5.c_customer_id)::text)
+                                                                                 ->  Redistribute Motion 3:3  (slice14; segments: 3)
+                                                                                       Hash Key: share0_ref6.c_customer_id
+                                                                                       ->  Result
+                                                                                             Filter: ((share0_ref6.sale_type = 'c'::text) AND (share0_ref6.d_year = 2002))
+                                                                                             ->  Shared Scan (share slice:id 14:0)
+                                                                                 ->  Hash
+                                                                                       ->  Redistribute Motion 3:3  (slice15; segments: 3)
+                                                                                             Hash Key: share0_ref5.c_customer_id
+                                                                                             ->  Result
+                                                                                                   Filter: ((share0_ref5.sale_type = 'c'::text) AND (share0_ref5.d_year = 2001) AND (share0_ref5.sum > '0'::numeric))
+                                                                                                   ->  Shared Scan (share slice:id 15:0)
+                                                                           ->  Hash
+                                                                                 ->  Redistribute Motion 3:3  (slice16; segments: 3)
+                                                                                       Hash Key: share0_ref4.c_customer_id
+                                                                                       ->  Result
+                                                                                             Filter: ((share0_ref4.sale_type = 'w'::text) AND (share0_ref4.d_year = 2001) AND (share0_ref4.sum > '0'::numeric))
+                                                                                             ->  Shared Scan (share slice:id 16:0)
+                                                                     ->  Hash
+                                                                           ->  Redistribute Motion 3:3  (slice17; segments: 3)
+                                                                                 Hash Key: share0_ref3.c_customer_id
+                                                                                 ->  Result
+                                                                                       Filter: ((share0_ref3.sale_type = 'w'::text) AND (share0_ref3.d_year = 2002))
+                                                                                       ->  Shared Scan (share slice:id 17:0)
+                                                   ->  Hash
+                                                         ->  Redistribute Motion 3:3  (slice18; segments: 3)
+                                                               Hash Key: share0_ref2.c_customer_id
+                                                               ->  Result
+                                                                     Filter: ((share0_ref2.sale_type = 's'::text) AND (share0_ref2.d_year = 2001) AND (share0_ref2.sum > '0'::numeric))
+                                                                     ->  Shared Scan (share slice:id 18:0)
+ Optimizer: GPORCA
+(125 rows)
+
diff --git a/src/test/regress/expected/union_gp.out b/src/test/regress/expected/union_gp.out
index 1cd6c47252c..5bdae3e887c 100644
--- a/src/test/regress/expected/union_gp.out
+++ b/src/test/regress/expected/union_gp.out
@@ -2310,6 +2310,38 @@ select json_data,id from my_table  where json_data->>'age' = '30' union all sele
 set optimizer_parallel_union to off;
 drop table if exists my_table;
 --
+-- test Github issue https://github.com/apache/cloudberry/issues/1240
+--
+create table r_1240(a int) distributed replicated;
+insert into r_1240 select generate_series(1,10);
+create table p1_1240(a int) distributed by (a);
+insert into p1_1240 select generate_series(1,3);
+explain(costs off) with result as (update r_1240 set a = a +1 where a < 5 returning *) select * from result except select * from p1_1240;
+                          QUERY PLAN                           
+---------------------------------------------------------------
+ HashSetOp Except
+   ->  Append
+         ->  Explicit Gather Motion 3:1  (slice1; segments: 3)
+               ->  Subquery Scan on "*SELECT* 1"
+                     ->  Update on r_1240
+                           ->  Seq Scan on r_1240
+                                 Filter: (a < 5)
+         ->  Gather Motion 3:1  (slice2; segments: 3)
+               ->  Subquery Scan on "*SELECT* 2"
+                     ->  Seq Scan on p1_1240
+ Optimizer: Postgres-based planner
+(11 rows)
+
+with result as (update r_1240 set a = a +1 where a < 5 returning *) select * from result except select * from p1_1240;
+ a 
+---
+ 5
+ 4
+(2 rows)
+
+drop table r_1240;
+drop table p1_1240;
+--
 -- Clean up
 --
 DROP TABLE IF EXISTS T_a1 CASCADE;
diff --git a/src/test/regress/expected/union_gp_optimizer.out b/src/test/regress/expected/union_gp_optimizer.out
index 8b6e66c9d0e..8ff8655591d 100644
--- a/src/test/regress/expected/union_gp_optimizer.out
+++ b/src/test/regress/expected/union_gp_optimizer.out
@@ -2439,6 +2439,42 @@ select json_data,id from my_table  where json_data->>'age' = '30' union all sele
 set optimizer_parallel_union to off;
 drop table if exists my_table;
 --
+-- test Github issue https://github.com/apache/cloudberry/issues/1240
+--
+create table r_1240(a int) distributed replicated;
+insert into r_1240 select generate_series(1,10);
+create table p1_1240(a int) distributed by (a);
+insert into p1_1240 select generate_series(1,3);
+explain(costs off) with result as (update r_1240 set a = a +1 where a < 5 returning *) select * from result except select * from p1_1240;
+INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner
+DETAIL:  Falling back to Postgres-based planner because GPORCA does not support the following feature: RETURNING clause
+                          QUERY PLAN                           
+---------------------------------------------------------------
+ HashSetOp Except
+   ->  Append
+         ->  Explicit Gather Motion 3:1  (slice1; segments: 3)
+               ->  Subquery Scan on "*SELECT* 1"
+                     ->  Update on r_1240
+                           ->  Seq Scan on r_1240
+                                 Filter: (a < 5)
+         ->  Gather Motion 3:1  (slice2; segments: 3)
+               ->  Subquery Scan on "*SELECT* 2"
+                     ->  Seq Scan on p1_1240
+ Optimizer: Postgres-based planner
+(11 rows)
+
+with result as (update r_1240 set a = a +1 where a < 5 returning *) select * from result except select * from p1_1240;
+INFO:  GPORCA failed to produce a plan, falling back to Postgres-based planner
+DETAIL:  Falling back to Postgres-based planner because GPORCA does not support the following feature: RETURNING clause
+ a 
+---
+ 5
+ 4
+(2 rows)
+
+drop table r_1240;
+drop table p1_1240;
+--
 -- Clean up
 --
 DROP TABLE IF EXISTS T_a1 CASCADE;
diff --git a/src/test/regress/expected/vacuum_gp.out b/src/test/regress/expected/vacuum_gp.out
index 35d1a1e4fed..daeb2504559 100644
--- a/src/test/regress/expected/vacuum_gp.out
+++ b/src/test/regress/expected/vacuum_gp.out
@@ -437,3 +437,31 @@ SELECT reltuples, relname FROM pg_class WHERE oid='vac_reltuple_distortion'::reg
      1e+06 | vac_reltuple_distortion
 (1 row)
 
+-- test wrong log relcache leak in pg_catalog.gp_acquire_sample_rows
+-- start_ignore
+drop table if exists relcache_leak_in_motion;
+NOTICE:  table "relcache_leak_in_motion" does not exist, skipping
+-- end_ignore
+create table relcache_leak_in_motion(v1 int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'v1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into relcache_leak_in_motion values(generate_series(0, 10000));
+SELECT gp_inject_fault('interconnect_stop_recv_chunk', 'interrupt', dbid)
+  FROM gp_segment_configuration WHERE content = -1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+analyze relcache_leak_in_motion;
+ERROR:  canceling statement due to user request
+SELECT gp_inject_fault('interconnect_stop_recv_chunk', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content = -1 and role='p';
+ gp_inject_fault 
+-----------------
+ Success:
+(1 row)
+
+-- start_ignore
+drop table if exists relcache_leak_in_motion;
+-- end_ignore
diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out
index 27b2a1aaf80..568a3feb0b0 100644
--- a/src/test/regress/expected/window.out
+++ b/src/test/regress/expected/window.out
@@ -1111,7 +1111,7 @@ select first_value(max(x)) over (), y
                Group Key: ((tenk1.ten + tenk1.four))
                ->  Redistribute Motion 3:3  (slice2; segments: 3)
                      Hash Key: ((tenk1.ten + tenk1.four))
-                     ->  Partial HashAggregate
+                     ->  Streaming Partial HashAggregate
                            Group Key: (tenk1.ten + tenk1.four)
                            ->  Seq Scan on tenk1
  Optimizer: Postgres query optimizer
@@ -1276,259 +1276,259 @@ FROM tenk1 WHERE unique1 < 10;
 (10 rows)
 
 set search_path=singleseg, public;
-SELECT sum(unique1) over (rows between current row and unbounded following),
+SELECT sum(unique1) over (order by unique1 rows between current row and unbounded following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  45 |       4 |    0
-  41 |       2 |    2
-  39 |       1 |    1
-  38 |       6 |    2
-  32 |       9 |    1
-  23 |       8 |    0
-  15 |       5 |    1
-  10 |       3 |    3
-   7 |       7 |    3
-   0 |       0 |    0
+  45 |       0 |    0
+  45 |       1 |    1
+  44 |       2 |    2
+  42 |       3 |    3
+  39 |       4 |    0
+  35 |       5 |    1
+  30 |       6 |    2
+  24 |       7 |    3
+  17 |       8 |    0
+   9 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   7 |       4 |    0
-  13 |       2 |    2
-  22 |       1 |    1
-  26 |       6 |    2
-  29 |       9 |    1
-  31 |       8 |    0
-  32 |       5 |    1
-  23 |       3 |    3
-  15 |       7 |    3
-  10 |       0 |    0
+   3 |       0 |    0
+   6 |       1 |    1
+  10 |       2 |    2
+  15 |       3 |    3
+  20 |       4 |    0
+  25 |       5 |    1
+  30 |       6 |    2
+  35 |       7 |    3
+  30 |       8 |    0
+  24 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude no others),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude no others),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   7 |       4 |    0
-  13 |       2 |    2
-  22 |       1 |    1
-  26 |       6 |    2
-  29 |       9 |    1
-  31 |       8 |    0
-  32 |       5 |    1
-  23 |       3 |    3
-  15 |       7 |    3
-  10 |       0 |    0
+   3 |       0 |    0
+   6 |       1 |    1
+  10 |       2 |    2
+  15 |       3 |    3
+  20 |       4 |    0
+  25 |       5 |    1
+  30 |       6 |    2
+  35 |       7 |    3
+  30 |       8 |    0
+  24 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude current row),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   3 |       4 |    0
-  11 |       2 |    2
-  21 |       1 |    1
-  20 |       6 |    2
-  20 |       9 |    1
-  23 |       8 |    0
-  27 |       5 |    1
-  20 |       3 |    3
-   8 |       7 |    3
-  10 |       0 |    0
+   3 |       0 |    0
+   5 |       1 |    1
+   8 |       2 |    2
+  12 |       3 |    3
+  16 |       4 |    0
+  20 |       5 |    1
+  24 |       6 |    2
+  28 |       7 |    3
+  22 |       8 |    0
+  15 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude group),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       4 |    0
-     |       2 |    2
-     |       1 |    1
-     |       6 |    2
-     |       9 |    1
-     |       8 |    0
-     |       5 |    1
-     |       3 |    3
-     |       7 |    3
-     |       0 |    0
+   3 |       0 |    0
+   5 |       1 |    1
+   8 |       2 |    2
+  12 |       3 |    3
+  16 |       4 |    0
+  20 |       5 |    1
+  24 |       6 |    2
+  28 |       7 |    3
+  22 |       8 |    0
+  15 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude ties),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   4 |       4 |    0
-   2 |       2 |    2
-   1 |       1 |    1
-   6 |       6 |    2
-   9 |       9 |    1
-   8 |       8 |    0
-   5 |       5 |    1
-   3 |       3 |    3
-   7 |       7 |    3
-   0 |       0 |    0
+   3 |       0 |    0
+   6 |       1 |    1
+  10 |       2 |    2
+  15 |       3 |    3
+  20 |       4 |    0
+  25 |       5 |    1
+  30 |       6 |    2
+  35 |       7 |    3
+  30 |       8 |    0
+  24 |       9 |    1
 (10 rows)
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  first_value | unique1 | four 
 -------------+---------+------
-           8 |       0 |    0
-           4 |       8 |    0
-           5 |       4 |    0
+           4 |       0 |    0
+           8 |       4 |    0
+           1 |       8 |    0
+           5 |       1 |    1
            9 |       5 |    1
-           1 |       9 |    1
-           6 |       1 |    1
-           2 |       6 |    2
-           3 |       2 |    2
+           2 |       9 |    1
+           6 |       2 |    2
+           3 |       6 |    2
            7 |       3 |    3
              |       7 |    3
 (10 rows)
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  first_value | unique1 | four 
 -------------+---------+------
-             |       0 |    0
-           5 |       8 |    0
-           5 |       4 |    0
-             |       5 |    1
-           6 |       9 |    1
-           6 |       1 |    1
+           4 |       0 |    0
+           8 |       4 |    0
+           1 |       8 |    0
+           5 |       1 |    1
+           9 |       5 |    1
+           2 |       9 |    1
+           6 |       2 |    2
            3 |       6 |    2
-           3 |       2 |    2
-             |       3 |    3
+           7 |       3 |    3
              |       7 |    3
 (10 rows)
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  first_value | unique1 | four 
 -------------+---------+------
            0 |       0 |    0
-           8 |       8 |    0
            4 |       4 |    0
+           8 |       8 |    0
+           1 |       1 |    1
            5 |       5 |    1
            9 |       9 |    1
-           1 |       1 |    1
-           6 |       6 |    2
            2 |       2 |    2
+           6 |       6 |    2
            3 |       3 |    3
            7 |       7 |    3
 (10 rows)
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  last_value | unique1 | four 
 ------------+---------+------
-          4 |       0 |    0
+          8 |       0 |    0
+          1 |       4 |    0
           5 |       8 |    0
-          9 |       4 |    0
-          1 |       5 |    1
+          9 |       1 |    1
+          2 |       5 |    1
           6 |       9 |    1
-          2 |       1 |    1
-          3 |       6 |    2
-          7 |       2 |    2
+          3 |       2 |    2
+          7 |       6 |    2
           7 |       3 |    3
             |       7 |    3
 (10 rows)
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  last_value | unique1 | four 
 ------------+---------+------
-            |       0 |    0
+          8 |       0 |    0
+          1 |       4 |    0
           5 |       8 |    0
-          9 |       4 |    0
-            |       5 |    1
+          9 |       1 |    1
+          2 |       5 |    1
           6 |       9 |    1
-          2 |       1 |    1
-          3 |       6 |    2
-          7 |       2 |    2
-            |       3 |    3
+          3 |       2 |    2
+          7 |       6 |    2
+          7 |       3 |    3
             |       7 |    3
 (10 rows)
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  last_value | unique1 | four 
 ------------+---------+------
-          0 |       0 |    0
+          8 |       0 |    0
+          1 |       4 |    0
           5 |       8 |    0
-          9 |       4 |    0
-          5 |       5 |    1
+          9 |       1 |    1
+          2 |       5 |    1
           6 |       9 |    1
-          2 |       1 |    1
-          3 |       6 |    2
-          7 |       2 |    2
-          3 |       3 |    3
+          3 |       2 |    2
+          7 |       6 |    2
+          7 |       3 |    3
           7 |       7 |    3
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 1 preceding),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 1 preceding),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       4 |    0
-   4 |       2 |    2
-   6 |       1 |    1
-   3 |       6 |    2
-   7 |       9 |    1
-  15 |       8 |    0
-  17 |       5 |    1
-  13 |       3 |    3
-   8 |       7 |    3
-  10 |       0 |    0
+     |       0 |    0
+   0 |       1 |    1
+   1 |       2 |    2
+   3 |       3 |    3
+   5 |       4 |    0
+   7 |       5 |    1
+   9 |       6 |    2
+  11 |       7 |    3
+  13 |       8 |    0
+  15 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 1 following and 3 following),
+SELECT sum(unique1) over (order by unique1 rows between 1 following and 3 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   9 |       4 |    0
-  16 |       2 |    2
-  23 |       1 |    1
-  22 |       6 |    2
-  16 |       9 |    1
-  15 |       8 |    0
-  10 |       5 |    1
-   7 |       3 |    3
-   0 |       7 |    3
-     |       0 |    0
+   6 |       0 |    0
+   9 |       1 |    1
+  12 |       2 |    2
+  15 |       3 |    3
+  18 |       4 |    0
+  21 |       5 |    1
+  24 |       6 |    2
+  17 |       7 |    3
+   9 |       8 |    0
+     |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between unbounded preceding and 1 following),
+SELECT sum(unique1) over (order by unique1 rows between unbounded preceding and 1 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   6 |       4 |    0
-   7 |       2 |    2
-  13 |       1 |    1
-  22 |       6 |    2
-  30 |       9 |    1
-  35 |       8 |    0
-  38 |       5 |    1
-  45 |       3 |    3
-  45 |       7 |    3
-  45 |       0 |    0
+   1 |       0 |    0
+   3 |       1 |    1
+   6 |       2 |    2
+  10 |       3 |    3
+  15 |       4 |    0
+  21 |       5 |    1
+  28 |       6 |    2
+  36 |       7 |    3
+  45 |       8 |    0
+  45 |       9 |    1
 (10 rows)
 
 SELECT sum(unique1) over (w range between current row and unbounded following),
@@ -1603,19 +1603,19 @@ SELECT first_value(unique1) over w,
 	nth_value(unique1, 2) over w AS nth_2,
 	last_value(unique1) over w, unique1, four
 FROM tenk1 WHERE unique1 < 10
-WINDOW w AS (order by four range between current row and unbounded following);
+WINDOW w AS (order by unique1, four range between current row and unbounded following);
  first_value | nth_2 | last_value | unique1 | four 
 -------------+-------+------------+---------+------
-           0 |     8 |          7 |       0 |    0
-           0 |     8 |          7 |       8 |    0
-           0 |     8 |          7 |       4 |    0
-           5 |     9 |          7 |       5 |    1
-           5 |     9 |          7 |       9 |    1
-           5 |     9 |          7 |       1 |    1
-           6 |     2 |          7 |       6 |    2
-           6 |     2 |          7 |       2 |    2
-           3 |     7 |          7 |       3 |    3
-           3 |     7 |          7 |       7 |    3
+           0 |     1 |          9 |       0 |    0
+           1 |     2 |          9 |       1 |    1
+           2 |     3 |          9 |       2 |    2
+           3 |     4 |          9 |       3 |    3
+           4 |     5 |          9 |       4 |    0
+           5 |     6 |          9 |       5 |    1
+           6 |     7 |          9 |       6 |    2
+           7 |     8 |          9 |       7 |    3
+           8 |     9 |          9 |       8 |    0
+           9 |       |          9 |       9 |    1
 (10 rows)
 
 SELECT sum(unique1) over
diff --git a/src/test/regress/expected/window_optimizer.out b/src/test/regress/expected/window_optimizer.out
index f6bdcc3b6c7..8576209f725 100644
--- a/src/test/regress/expected/window_optimizer.out
+++ b/src/test/regress/expected/window_optimizer.out
@@ -16,6 +16,8 @@ CREATE TEMPORARY TABLE empsalary (
     salary int,
     enroll_date date
 );
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'depname' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 INSERT INTO empsalary VALUES
 ('develop', 10, 5200, '2007-08-01'),
 ('sales', 1, 5000, '2006-10-01'),
@@ -87,30 +89,30 @@ GROUP BY four, ten ORDER BY four, ten;
 SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
   depname  | empno | salary |  sum  
 -----------+-------+--------+-------
+ develop   |    11 |   5200 | 25100
+ develop   |     7 |   4200 | 25100
+ develop   |     9 |   4500 | 25100
+ develop   |     8 |   6000 | 25100
+ develop   |    10 |   5200 | 25100
  personnel |     5 |   3500 |  7400
  personnel |     2 |   3900 |  7400
+ sales     |     3 |   4800 | 14600
  sales     |     1 |   5000 | 14600
  sales     |     4 |   4800 | 14600
- sales     |     3 |   4800 | 14600
- develop   |    10 |   5200 | 25100
- develop   |     7 |   4200 | 25100
- develop   |     9 |   4500 | 25100
- develop   |     8 |   6000 | 25100
- develop   |    11 |   5200 | 25100
 (10 rows)
 
 SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
   depname  | empno | salary | rank 
 -----------+-------+--------+------
  develop   |     7 |   4200 |    1
- sales     |     4 |   4800 |    1
- sales     |     3 |   4800 |    1
  personnel |     5 |   3500 |    1
+ sales     |     3 |   4800 |    1
+ sales     |     4 |   4800 |    1
  personnel |     2 |   3900 |    2
  develop   |     9 |   4500 |    2
- develop   |    10 |   5200 |    3
- develop   |    11 |   5200 |    3
  sales     |     1 |   5000 |    3
+ develop   |    11 |   5200 |    3
+ develop   |    10 |   5200 |    3
  develop   |     8 |   6000 |    5
 (10 rows)
 
@@ -155,16 +157,16 @@ SELECT four FROM tenk1 WHERE FALSE WINDOW w AS (PARTITION BY ten);
 SELECT sum(four) OVER (PARTITION BY ten ORDER BY unique2) AS sum_1, ten, four FROM tenk1 WHERE unique2 < 10;
  sum_1 | ten | four 
 -------+-----+------
-     1 |   9 |    1
+     3 |   3 |    3
+     0 |   4 |    0
+     1 |   7 |    1
      0 |   0 |    0
      0 |   0 |    0
      2 |   0 |    2
      3 |   1 |    3
      4 |   1 |    1
      5 |   1 |    1
-     3 |   3 |    3
-     0 |   4 |    0
-     1 |   7 |    1
+     1 |   9 |    1
 (10 rows)
 
 SELECT row_number() OVER (ORDER BY unique2) FROM tenk1 WHERE unique2 < 10;
@@ -185,6 +187,9 @@ SELECT row_number() OVER (ORDER BY unique2) FROM tenk1 WHERE unique2 < 10;
 SELECT rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10;
  rank_1 | ten | four 
 --------+-----+------
+      1 |   0 |    2
+      1 |   1 |    3
+      2 |   3 |    3
       1 |   0 |    0
       1 |   0 |    0
       3 |   4 |    0
@@ -192,14 +197,12 @@ SELECT rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM te
       1 |   1 |    1
       3 |   7 |    1
       4 |   9 |    1
-      1 |   0 |    2
-      1 |   1 |    3
-      2 |   3 |    3
 (10 rows)
 
 SELECT dense_rank() OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  dense_rank | ten | four 
 ------------+-----+------
+          1 |   0 |    2
           1 |   1 |    3
           2 |   3 |    3
           1 |   0 |    0
@@ -209,7 +212,6 @@ SELECT dense_rank() OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1
           1 |   1 |    1
           2 |   7 |    1
           3 |   9 |    1
-          1 |   0 |    2
 (10 rows)
 
 SELECT percent_rank() OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
@@ -267,6 +269,7 @@ SELECT ntile(NULL) OVER (ORDER BY ten, four), ten, four FROM tenk1 LIMIT 2;
 SELECT lag(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  lag | ten | four 
 -----+-----+------
+     |   0 |    2
      |   1 |    3
    1 |   3 |    3
      |   0 |    0
@@ -276,12 +279,12 @@ SELECT lag(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHER
    1 |   1 |    1
    1 |   7 |    1
    7 |   9 |    1
-     |   0 |    2
 (10 rows)
 
 SELECT lag(ten, four) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  lag | ten | four 
 -----+-----+------
+     |   0 |    2
      |   1 |    3
      |   3 |    3
    0 |   0 |    0
@@ -291,12 +294,14 @@ SELECT lag(ten, four) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk
    1 |   1 |    1
    1 |   7 |    1
    7 |   9 |    1
-     |   0 |    2
 (10 rows)
 
 SELECT lag(ten, four, 0) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  lag | ten | four 
 -----+-----+------
+   0 |   0 |    2
+   0 |   1 |    3
+   0 |   3 |    3
    0 |   0 |    0
    0 |   0 |    0
    4 |   4 |    0
@@ -304,9 +309,6 @@ SELECT lag(ten, four, 0) OVER (PARTITION BY four ORDER BY ten), ten, four FROM t
    1 |   1 |    1
    1 |   7 |    1
    7 |   9 |    1
-   0 |   0 |    2
-   0 |   1 |    3
-   0 |   3 |    3
 (10 rows)
 
 SELECT lag(ten, four, 0.7) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten;
@@ -327,6 +329,7 @@ SELECT lag(ten, four, 0.7) OVER (PARTITION BY four ORDER BY ten), ten, four FROM
 SELECT lead(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  lead | ten | four 
 ------+-----+------
+      |   0 |    2
     3 |   1 |    3
       |   3 |    3
     0 |   0 |    0
@@ -336,12 +339,12 @@ SELECT lead(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHE
     7 |   1 |    1
     9 |   7 |    1
       |   9 |    1
-      |   0 |    2
 (10 rows)
 
 SELECT lead(ten * 2, 1) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  lead | ten | four 
 ------+-----+------
+      |   0 |    2
     6 |   1 |    3
       |   3 |    3
     0 |   0 |    0
@@ -351,12 +354,12 @@ SELECT lead(ten * 2, 1) OVER (PARTITION BY four ORDER BY ten), ten, four FROM te
    14 |   1 |    1
    18 |   7 |    1
       |   9 |    1
-      |   0 |    2
 (10 rows)
 
 SELECT lead(ten * 2, 1, -1) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  lead | ten | four 
 ------+-----+------
+   -1 |   0 |    2
     6 |   1 |    3
    -1 |   3 |    3
     0 |   0 |    0
@@ -366,7 +369,6 @@ SELECT lead(ten * 2, 1, -1) OVER (PARTITION BY four ORDER BY ten), ten, four FRO
    14 |   1 |    1
    18 |   7 |    1
    -1 |   9 |    1
-   -1 |   0 |    2
 (10 rows)
 
 SELECT lead(ten * 2, 1, -1.4) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten;
@@ -387,6 +389,7 @@ SELECT lead(ten * 2, 1, -1.4) OVER (PARTITION BY four ORDER BY ten), ten, four F
 SELECT first_value(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  first_value | ten | four 
 -------------+-----+------
+           0 |   0 |    2
            1 |   1 |    3
            1 |   3 |    3
            0 |   0 |    0
@@ -396,7 +399,6 @@ SELECT first_value(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM te
            1 |   1 |    1
            1 |   7 |    1
            1 |   9 |    1
-           0 |   0 |    2
 (10 rows)
 
 -- test split window func
@@ -732,41 +734,41 @@ SELECT * FROM (SELECT rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, te
 SELECT * FROM (SELECT row_number() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10) t WHERE rank_1 < 3;
  rank_1 | ten | four 
 --------+-----+------
-      1 |   0 |    2
-      1 |   1 |    3
-      2 |   3 |    3
       1 |   0 |    0
       2 |   0 |    0
       1 |   1 |    1
       2 |   1 |    1
+      1 |   0 |    2
+      1 |   1 |    3
+      2 |   3 |    3
 (7 rows)
 
 SELECT * FROM (SELECT dense_rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10) t WHERE rank_1 < 3;
  rank_1 | ten | four 
 --------+-----+------
-      1 |   0 |    2
-      1 |   1 |    3
-      2 |   3 |    3
       1 |   0 |    0
       1 |   0 |    0
       2 |   4 |    0
       1 |   1 |    1
       1 |   1 |    1
       2 |   7 |    1
+      1 |   0 |    2
+      1 |   1 |    3
+      2 |   3 |    3
 (9 rows)
 
 SELECT * FROM (SELECT rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10) t WHERE rank_1 <= 3;
  rank_1 | ten | four 
 --------+-----+------
+      1 |   0 |    2
+      1 |   1 |    3
+      2 |   3 |    3
       1 |   0 |    0
       1 |   0 |    0
       3 |   4 |    0
       1 |   1 |    1
       1 |   1 |    1
       3 |   7 |    1
-      1 |   0 |    2
-      1 |   1 |    3
-      2 |   3 |    3
 (9 rows)
 
 SELECT * FROM (SELECT row_number() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10) t WHERE rank_1 <= 3;
@@ -814,27 +816,27 @@ SELECT * FROM (SELECT rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, te
 SELECT * FROM (SELECT row_number() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10) t WHERE rank_1 < 3;
  rank_1 | ten | four 
 --------+-----+------
-      1 |   0 |    2
-      1 |   1 |    3
-      2 |   3 |    3
       1 |   0 |    0
       2 |   0 |    0
       1 |   1 |    1
       2 |   1 |    1
+      1 |   0 |    2
+      1 |   1 |    3
+      2 |   3 |    3
 (7 rows)
 
 SELECT * FROM (SELECT dense_rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10) t WHERE rank_1 < 3;
  rank_1 | ten | four 
 --------+-----+------
-      1 |   0 |    2
-      1 |   1 |    3
-      2 |   3 |    3
       1 |   0 |    0
       1 |   0 |    0
       2 |   4 |    0
       1 |   1 |    1
       1 |   1 |    1
       2 |   7 |    1
+      1 |   0 |    2
+      1 |   1 |    3
+      2 |   3 |    3
 (9 rows)
 
 SELECT * FROM (SELECT rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10) t WHERE rank_1 <= 3;
@@ -888,9 +890,9 @@ reset optimizer_force_split_window_function;
 SELECT last_value(ten) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10;
  last_value | ten | four 
 ------------+-----+------
-          0 |   0 |    2
           0 |   0 |    0
           0 |   0 |    0
+          0 |   0 |    2
           1 |   1 |    1
           1 |   1 |    3
           1 |   1 |    1
@@ -967,6 +969,7 @@ SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) +
   FROM tenk1 WHERE unique2 < 10;
  cntsum 
 --------
+ 51
  92
  136
  22
@@ -976,7 +979,6 @@ SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) +
  24
  82
  92
- 51
 (10 rows)
 
 -- opexpr with different windows evaluation.
@@ -995,6 +997,9 @@ WHERE total <> fourcount + twosum;
 SELECT avg(four) OVER (PARTITION BY four ORDER BY thousand / 100) FROM tenk1 WHERE unique2 < 10;
           avg           
 ------------------------
+     2.0000000000000000
+     3.0000000000000000
+     3.0000000000000000
  0.00000000000000000000
  0.00000000000000000000
  0.00000000000000000000
@@ -1002,9 +1007,6 @@ SELECT avg(four) OVER (PARTITION BY four ORDER BY thousand / 100) FROM tenk1 WHE
  1.00000000000000000000
  1.00000000000000000000
  1.00000000000000000000
-     3.0000000000000000
-     3.0000000000000000
-     2.0000000000000000
 (10 rows)
 
 SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum
@@ -1030,9 +1032,9 @@ SELECT sum(salary),
 FROM empsalary GROUP BY depname;
   sum  | row_number |  sum  
 -------+------------+-------
- 25100 |          1 | 47100
-  7400 |          2 | 22000
  14600 |          3 | 14600
+  7400 |          2 | 22000
+ 25100 |          1 | 47100
 (3 rows)
 
 -- identical windows with different names
@@ -1057,8 +1059,6 @@ SELECT lead(ten, (SELECT two FROM tenk1 WHERE s.unique2 = unique2)) OVER (PARTIT
 FROM tenk1 s WHERE unique2 < 10;
  lead 
 ------
-    3
-     
     0
     0
     4
@@ -1067,6 +1067,8 @@ FROM tenk1 s WHERE unique2 < 10;
     9
      
     0
+    3
+     
 (10 rows)
 
 -- empty table
@@ -1156,7 +1158,7 @@ select first_value(max(x)) over (), y
                      ->  Streaming Partial HashAggregate
                            Group Key: (ten + four)
                            ->  Seq Scan on tenk1
- Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
+ Optimizer: GPORCA
 (10 rows)
 
 -- test non-default frame specifications
@@ -1166,6 +1168,11 @@ SELECT four, ten,
 FROM (select distinct ten, four from tenk1) ss;
  four | ten | sum | last_value 
 ------+-----+-----+------------
+    2 |   0 |   0 |          0
+    2 |   2 |   2 |          2
+    2 |   4 |   6 |          4
+    2 |   6 |  12 |          6
+    2 |   8 |  20 |          8
     3 |   1 |   1 |          1
     3 |   3 |   4 |          3
     3 |   5 |   9 |          5
@@ -1181,11 +1188,6 @@ FROM (select distinct ten, four from tenk1) ss;
     1 |   5 |   9 |          5
     1 |   7 |  16 |          7
     1 |   9 |  25 |          9
-    2 |   0 |   0 |          0
-    2 |   2 |   2 |          2
-    2 |   4 |   6 |          4
-    2 |   6 |  12 |          6
-    2 |   8 |  20 |          8
 (20 rows)
 
 SELECT four, ten,
@@ -1194,16 +1196,6 @@ SELECT four, ten,
 FROM (select distinct ten, four from tenk1) ss;
  four | ten | sum | last_value 
 ------+-----+-----+------------
-    0 |   0 |   0 |          0
-    0 |   2 |   2 |          2
-    0 |   4 |   6 |          4
-    0 |   6 |  12 |          6
-    0 |   8 |  20 |          8
-    1 |   1 |   1 |          1
-    1 |   3 |   4 |          3
-    1 |   5 |   9 |          5
-    1 |   7 |  16 |          7
-    1 |   9 |  25 |          9
     2 |   0 |   0 |          0
     2 |   2 |   2 |          2
     2 |   4 |   6 |          4
@@ -1214,6 +1206,16 @@ FROM (select distinct ten, four from tenk1) ss;
     3 |   5 |   9 |          5
     3 |   7 |  16 |          7
     3 |   9 |  25 |          9
+    0 |   0 |   0 |          0
+    0 |   2 |   2 |          2
+    0 |   4 |   6 |          4
+    0 |   6 |  12 |          6
+    0 |   8 |  20 |          8
+    1 |   1 |   1 |          1
+    1 |   3 |   4 |          3
+    1 |   5 |   9 |          5
+    1 |   7 |  16 |          7
+    1 |   9 |  25 |          9
 (20 rows)
 
 SELECT four, ten,
@@ -1222,6 +1224,11 @@ SELECT four, ten,
 FROM (select distinct ten, four from tenk1) ss;
  four | ten | sum | last_value 
 ------+-----+-----+------------
+    2 |   0 |  20 |          8
+    2 |   2 |  20 |          8
+    2 |   4 |  20 |          8
+    2 |   6 |  20 |          8
+    2 |   8 |  20 |          8
     3 |   1 |  25 |          9
     3 |   3 |  25 |          9
     3 |   5 |  25 |          9
@@ -1237,11 +1244,6 @@ FROM (select distinct ten, four from tenk1) ss;
     1 |   5 |  25 |          9
     1 |   7 |  25 |          9
     1 |   9 |  25 |          9
-    2 |   0 |  20 |          8
-    2 |   2 |  20 |          8
-    2 |   4 |  20 |          8
-    2 |   6 |  20 |          8
-    2 |   8 |  20 |          8
 (20 rows)
 
 SELECT four, ten/4 as two,
@@ -1250,6 +1252,11 @@ SELECT four, ten/4 as two,
 FROM (select distinct ten, four from tenk1) ss;
  four | two | sum | last_value 
 ------+-----+-----+------------
+    2 |   0 |   0 |          0
+    2 |   0 |   0 |          0
+    2 |   1 |   2 |          1
+    2 |   1 |   2 |          1
+    2 |   2 |   4 |          2
     3 |   0 |   0 |          0
     3 |   0 |   0 |          0
     3 |   1 |   2 |          1
@@ -1265,11 +1272,6 @@ FROM (select distinct ten, four from tenk1) ss;
     1 |   1 |   2 |          1
     1 |   1 |   2 |          1
     1 |   2 |   4 |          2
-    2 |   0 |   0 |          0
-    2 |   0 |   0 |          0
-    2 |   1 |   2 |          1
-    2 |   1 |   2 |          1
-    2 |   2 |   4 |          2
 (20 rows)
 
 SELECT four, ten/4 as two,
@@ -1278,6 +1280,11 @@ SELECT four, ten/4 as two,
 FROM (select distinct ten, four from tenk1) ss;
  four | two | sum | last_value 
 ------+-----+-----+------------
+    2 |   0 |   0 |          0
+    2 |   0 |   0 |          0
+    2 |   1 |   1 |          1
+    2 |   1 |   2 |          1
+    2 |   2 |   4 |          2
     3 |   0 |   0 |          0
     3 |   0 |   0 |          0
     3 |   1 |   1 |          1
@@ -1293,11 +1300,6 @@ FROM (select distinct ten, four from tenk1) ss;
     1 |   1 |   1 |          1
     1 |   1 |   2 |          1
     1 |   2 |   4 |          2
-    2 |   0 |   0 |          0
-    2 |   0 |   0 |          0
-    2 |   1 |   1 |          1
-    2 |   1 |   2 |          1
-    2 |   2 |   4 |          2
 (20 rows)
 
 SELECT sum(unique1) over (order by four range between current row and unbounded following),
@@ -1305,272 +1307,272 @@ SELECT sum(unique1) over (order by four range between current row and unbounded
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  45 |       0 |    0
-  45 |       8 |    0
   45 |       4 |    0
-  33 |       5 |    1
+  45 |       8 |    0
+  45 |       0 |    0
   33 |       1 |    1
+  33 |       5 |    1
   33 |       9 |    1
-  18 |       2 |    2
   18 |       6 |    2
-  10 |       7 |    3
+  18 |       2 |    2
   10 |       3 |    3
+  10 |       7 |    3
 (10 rows)
 
 set search_path=singleseg, public;
-SELECT sum(unique1) over (rows between current row and unbounded following),
+SELECT sum(unique1) over (order by unique1 rows between current row and unbounded following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  45 |       4 |    0
-  41 |       2 |    2
-  39 |       1 |    1
-  38 |       6 |    2
-  32 |       9 |    1
-  23 |       8 |    0
-  15 |       5 |    1
-  10 |       3 |    3
-   7 |       7 |    3
-   0 |       0 |    0
+  45 |       0 |    0
+  45 |       1 |    1
+  44 |       2 |    2
+  42 |       3 |    3
+  39 |       4 |    0
+  35 |       5 |    1
+  30 |       6 |    2
+  24 |       7 |    3
+  17 |       8 |    0
+   9 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   7 |       4 |    0
-  13 |       2 |    2
-  22 |       1 |    1
-  26 |       6 |    2
-  29 |       9 |    1
-  31 |       8 |    0
-  32 |       5 |    1
-  23 |       3 |    3
-  15 |       7 |    3
-  10 |       0 |    0
+   3 |       0 |    0
+   6 |       1 |    1
+  10 |       2 |    2
+  15 |       3 |    3
+  20 |       4 |    0
+  25 |       5 |    1
+  30 |       6 |    2
+  35 |       7 |    3
+  30 |       8 |    0
+  24 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude no others),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude no others),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   7 |       4 |    0
-  13 |       2 |    2
-  22 |       1 |    1
-  26 |       6 |    2
-  29 |       9 |    1
-  31 |       8 |    0
-  32 |       5 |    1
-  23 |       3 |    3
-  15 |       7 |    3
-  10 |       0 |    0
+   3 |       0 |    0
+   6 |       1 |    1
+  10 |       2 |    2
+  15 |       3 |    3
+  20 |       4 |    0
+  25 |       5 |    1
+  30 |       6 |    2
+  35 |       7 |    3
+  30 |       8 |    0
+  24 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude current row),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   3 |       4 |    0
-  11 |       2 |    2
-  21 |       1 |    1
-  20 |       6 |    2
-  20 |       9 |    1
-  23 |       8 |    0
-  27 |       5 |    1
-  20 |       3 |    3
-   8 |       7 |    3
-  10 |       0 |    0
+   3 |       0 |    0
+   5 |       1 |    1
+   8 |       2 |    2
+  12 |       3 |    3
+  16 |       4 |    0
+  20 |       5 |    1
+  24 |       6 |    2
+  28 |       7 |    3
+  22 |       8 |    0
+  15 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude group),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       4 |    0
-     |       2 |    2
-     |       1 |    1
-     |       6 |    2
-     |       9 |    1
-     |       8 |    0
-     |       5 |    1
-     |       3 |    3
-     |       7 |    3
-     |       0 |    0
+   3 |       0 |    0
+   5 |       1 |    1
+   8 |       2 |    2
+  12 |       3 |    3
+  16 |       4 |    0
+  20 |       5 |    1
+  24 |       6 |    2
+  28 |       7 |    3
+  22 |       8 |    0
+  15 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude ties),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   4 |       4 |    0
-   2 |       2 |    2
-   1 |       1 |    1
-   6 |       6 |    2
-   9 |       9 |    1
-   8 |       8 |    0
-   5 |       5 |    1
-   3 |       3 |    3
-   7 |       7 |    3
-   0 |       0 |    0
+   3 |       0 |    0
+   6 |       1 |    1
+  10 |       2 |    2
+  15 |       3 |    3
+  20 |       4 |    0
+  25 |       5 |    1
+  30 |       6 |    2
+  35 |       7 |    3
+  30 |       8 |    0
+  24 |       9 |    1
 (10 rows)
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  first_value | unique1 | four 
 -------------+---------+------
-           8 |       0 |    0
-           4 |       8 |    0
-           5 |       4 |    0
+           4 |       0 |    0
+           8 |       4 |    0
+           1 |       8 |    0
+           5 |       1 |    1
            9 |       5 |    1
-           1 |       9 |    1
-           6 |       1 |    1
-           2 |       6 |    2
-           3 |       2 |    2
+           2 |       9 |    1
+           6 |       2 |    2
+           3 |       6 |    2
            7 |       3 |    3
              |       7 |    3
 (10 rows)
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  first_value | unique1 | four 
 -------------+---------+------
-             |       0 |    0
-           5 |       8 |    0
-           5 |       4 |    0
-             |       5 |    1
-           6 |       9 |    1
-           6 |       1 |    1
+           4 |       0 |    0
+           8 |       4 |    0
+           1 |       8 |    0
+           5 |       1 |    1
+           9 |       5 |    1
+           2 |       9 |    1
+           6 |       2 |    2
            3 |       6 |    2
-           3 |       2 |    2
-             |       3 |    3
+           7 |       3 |    3
              |       7 |    3
 (10 rows)
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  first_value | unique1 | four 
 -------------+---------+------
            0 |       0 |    0
-           8 |       8 |    0
            4 |       4 |    0
+           8 |       8 |    0
+           1 |       1 |    1
            5 |       5 |    1
            9 |       9 |    1
-           1 |       1 |    1
-           6 |       6 |    2
            2 |       2 |    2
+           6 |       6 |    2
            3 |       3 |    3
            7 |       7 |    3
 (10 rows)
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  last_value | unique1 | four 
 ------------+---------+------
-          4 |       0 |    0
+          8 |       0 |    0
+          1 |       4 |    0
           5 |       8 |    0
-          9 |       4 |    0
-          1 |       5 |    1
+          9 |       1 |    1
+          2 |       5 |    1
           6 |       9 |    1
-          2 |       1 |    1
-          3 |       6 |    2
-          7 |       2 |    2
+          3 |       2 |    2
+          7 |       6 |    2
           7 |       3 |    3
             |       7 |    3
 (10 rows)
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  last_value | unique1 | four 
 ------------+---------+------
-            |       0 |    0
+          8 |       0 |    0
+          1 |       4 |    0
           5 |       8 |    0
-          9 |       4 |    0
-            |       5 |    1
+          9 |       1 |    1
+          2 |       5 |    1
           6 |       9 |    1
-          2 |       1 |    1
-          3 |       6 |    2
-          7 |       2 |    2
-            |       3 |    3
+          3 |       2 |    2
+          7 |       6 |    2
+          7 |       3 |    3
             |       7 |    3
 (10 rows)
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  last_value | unique1 | four 
 ------------+---------+------
-          0 |       0 |    0
+          8 |       0 |    0
+          1 |       4 |    0
           5 |       8 |    0
-          9 |       4 |    0
-          5 |       5 |    1
+          9 |       1 |    1
+          2 |       5 |    1
           6 |       9 |    1
-          2 |       1 |    1
-          3 |       6 |    2
-          7 |       2 |    2
-          3 |       3 |    3
+          3 |       2 |    2
+          7 |       6 |    2
+          7 |       3 |    3
           7 |       7 |    3
 (10 rows)
 
-SELECT sum(unique1) over (rows between 2 preceding and 1 preceding),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 1 preceding),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       4 |    0
-   4 |       2 |    2
-   6 |       1 |    1
-   3 |       6 |    2
-   7 |       9 |    1
-  15 |       8 |    0
-  17 |       5 |    1
-  13 |       3 |    3
-   8 |       7 |    3
-  10 |       0 |    0
+     |       0 |    0
+   0 |       1 |    1
+   1 |       2 |    2
+   3 |       3 |    3
+   5 |       4 |    0
+   7 |       5 |    1
+   9 |       6 |    2
+  11 |       7 |    3
+  13 |       8 |    0
+  15 |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between 1 following and 3 following),
+SELECT sum(unique1) over (order by unique1 rows between 1 following and 3 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   9 |       4 |    0
-  16 |       2 |    2
-  23 |       1 |    1
-  22 |       6 |    2
-  16 |       9 |    1
-  15 |       8 |    0
-  10 |       5 |    1
-   7 |       3 |    3
-   0 |       7 |    3
-     |       0 |    0
+   6 |       0 |    0
+   9 |       1 |    1
+  12 |       2 |    2
+  15 |       3 |    3
+  18 |       4 |    0
+  21 |       5 |    1
+  24 |       6 |    2
+  17 |       7 |    3
+   9 |       8 |    0
+     |       9 |    1
 (10 rows)
 
-SELECT sum(unique1) over (rows between unbounded preceding and 1 following),
+SELECT sum(unique1) over (order by unique1 rows between unbounded preceding and 1 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-   6 |       4 |    0
-   7 |       2 |    2
-  13 |       1 |    1
-  22 |       6 |    2
-  30 |       9 |    1
-  35 |       8 |    0
-  38 |       5 |    1
-  45 |       3 |    3
-  45 |       7 |    3
-  45 |       0 |    0
+   1 |       0 |    0
+   3 |       1 |    1
+   6 |       2 |    2
+  10 |       3 |    3
+  15 |       4 |    0
+  21 |       5 |    1
+  28 |       6 |    2
+  36 |       7 |    3
+  45 |       8 |    0
+  45 |       9 |    1
 (10 rows)
 
 SELECT sum(unique1) over (w range between current row and unbounded following),
@@ -1584,10 +1586,10 @@ FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
   33 |       5 |    1
   33 |       9 |    1
   33 |       1 |    1
-  18 |       2 |    2
   18 |       6 |    2
-  10 |       7 |    3
+  18 |       2 |    2
   10 |       3 |    3
+  10 |       7 |    3
 (10 rows)
 
 SELECT sum(unique1) over (w range between unbounded preceding and current row exclude current row),
@@ -1645,19 +1647,19 @@ SELECT first_value(unique1) over w,
 	nth_value(unique1, 2) over w AS nth_2,
 	last_value(unique1) over w, unique1, four
 FROM tenk1 WHERE unique1 < 10
-WINDOW w AS (order by four range between current row and unbounded following);
+WINDOW w AS (order by unique1, four range between current row and unbounded following);
  first_value | nth_2 | last_value | unique1 | four 
 -------------+-------+------------+---------+------
-           0 |     8 |          7 |       0 |    0
-           0 |     8 |          7 |       8 |    0
-           0 |     8 |          7 |       4 |    0
-           5 |     9 |          7 |       5 |    1
-           5 |     9 |          7 |       9 |    1
-           5 |     9 |          7 |       1 |    1
-           6 |     2 |          7 |       6 |    2
-           6 |     2 |          7 |       2 |    2
-           3 |     7 |          7 |       3 |    3
-           3 |     7 |          7 |       7 |    3
+           0 |     1 |          9 |       0 |    0
+           1 |     2 |          9 |       1 |    1
+           2 |     3 |          9 |       2 |    2
+           3 |     4 |          9 |       3 |    3
+           4 |     5 |          9 |       4 |    0
+           5 |     6 |          9 |       5 |    1
+           6 |     7 |          9 |       6 |    2
+           7 |     8 |          9 |       7 |    3
+           8 |     9 |          9 |       8 |    0
+           9 |       |          9 |       9 |    1
 (10 rows)
 
 SELECT sum(unique1) over
@@ -1865,12 +1867,12 @@ SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::i
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       0 |    0
-     |       8 |    0
      |       4 |    0
+     |       8 |    0
+     |       0 |    0
+  12 |       1 |    1
   12 |       5 |    1
   12 |       9 |    1
-  12 |       1 |    1
   27 |       6 |    2
   27 |       2 |    2
   23 |       3 |    3
@@ -1884,14 +1886,14 @@ FROM tenk1 WHERE unique1 < 10;
 -----+---------+------
      |       3 |    3
      |       7 |    3
-  10 |       6 |    2
   10 |       2 |    2
-  18 |       9 |    1
+  10 |       6 |    2
   18 |       5 |    1
+  18 |       9 |    1
   18 |       1 |    1
   23 |       0 |    0
-  23 |       8 |    0
   23 |       4 |    0
+  23 |       8 |    0
 (10 rows)
 
 SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude no others),
@@ -1899,12 +1901,12 @@ SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::i
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       0 |    0
-     |       8 |    0
      |       4 |    0
+     |       8 |    0
+     |       0 |    0
+  12 |       1 |    1
   12 |       5 |    1
   12 |       9 |    1
-  12 |       1 |    1
   27 |       6 |    2
   27 |       2 |    2
   23 |       3 |    3
@@ -1916,12 +1918,12 @@ SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::i
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       0 |    0
-     |       8 |    0
      |       4 |    0
+     |       8 |    0
+     |       0 |    0
+  12 |       1 |    1
   12 |       5 |    1
   12 |       9 |    1
-  12 |       1 |    1
   27 |       6 |    2
   27 |       2 |    2
   23 |       3 |    3
@@ -1933,12 +1935,12 @@ SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::i
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       0 |    0
-     |       8 |    0
      |       4 |    0
+     |       8 |    0
+     |       0 |    0
+  12 |       1 |    1
   12 |       5 |    1
   12 |       9 |    1
-  12 |       1 |    1
   27 |       6 |    2
   27 |       2 |    2
   23 |       3 |    3
@@ -1950,12 +1952,12 @@ SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::i
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       0 |    0
-     |       8 |    0
      |       4 |    0
+     |       8 |    0
+     |       0 |    0
+  12 |       1 |    1
   12 |       5 |    1
   12 |       9 |    1
-  12 |       1 |    1
   27 |       6 |    2
   27 |       2 |    2
   23 |       3 |    3
@@ -1967,12 +1969,12 @@ SELECT sum(unique1) over (order by four range between 2::int8 preceding and 6::i
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  33 |       0 |    0
-  41 |       8 |    0
   37 |       4 |    0
+  41 |       8 |    0
+  33 |       0 |    0
+  31 |       1 |    1
   35 |       5 |    1
   39 |       9 |    1
-  31 |       1 |    1
   43 |       6 |    2
   39 |       2 |    2
   26 |       3 |    3
@@ -1984,12 +1986,12 @@ SELECT sum(unique1) over (order by four range between 2::int8 preceding and 6::i
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  33 |       0 |    0
-  33 |       8 |    0
   33 |       4 |    0
+  33 |       8 |    0
+  33 |       0 |    0
+  30 |       1 |    1
   30 |       5 |    1
   30 |       9 |    1
-  30 |       1 |    1
   37 |       6 |    2
   37 |       2 |    2
   23 |       3 |    3
@@ -2001,16 +2003,16 @@ SELECT sum(unique1) over (partition by four order by unique1 range between 5::in
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
+   8 |       2 |    2
+   8 |       6 |    2
+  10 |       3 |    3
+  10 |       7 |    3
    4 |       0 |    0
   12 |       4 |    0
   12 |       8 |    0
    6 |       1 |    1
   15 |       5 |    1
   14 |       9 |    1
-   8 |       2 |    2
-   8 |       6 |    2
-  10 |       3 |    3
-  10 |       7 |    3
 (10 rows)
 
 SELECT sum(unique1) over (partition by four order by unique1 range between 5::int8 preceding and 6::int2 following
@@ -2018,16 +2020,16 @@ SELECT sum(unique1) over (partition by four order by unique1 range between 5::in
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
+   6 |       2 |    2
+   2 |       6 |    2
+   7 |       3 |    3
+   3 |       7 |    3
    4 |       0 |    0
    8 |       4 |    0
    4 |       8 |    0
    5 |       1 |    1
   10 |       5 |    1
    5 |       9 |    1
-   6 |       2 |    2
-   2 |       6 |    2
-   7 |       3 |    3
-   3 |       7 |    3
 (10 rows)
 
 select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
@@ -2417,6 +2419,8 @@ create temp table numerics(
     f_float8 float8,
     f_numeric numeric
 );
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into numerics values
 (0, '-infinity', '-infinity', '-infinity'),
 (1, -3, -3, -3),
@@ -2730,6 +2734,8 @@ create temp table datetimes(
     f_timestamptz timestamptz,
     f_timestamp timestamp
 );
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'id' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into datetimes values
 (1, '11:00', '11:00 BST', '1 year', '2000-10-19 10:23:54+01', '2000-10-19 10:23:54'),
 (2, '12:00', '12:00 BST', '2 years', '2001-10-19 10:23:54+01', '2001-10-19 10:23:54'),
@@ -2805,8 +2811,8 @@ window w as (order by f_timetz desc range between
   9 | 19:00:00+01 |          10 |          7
   8 | 18:00:00+01 |           9 |          7
   7 | 17:00:00+01 |           8 |          6
-  6 | 15:00:00+01 |           5 |          3
   5 | 15:00:00+01 |           5 |          3
+  6 | 15:00:00+01 |           5 |          3
   4 | 14:00:00+01 |           5 |          2
   3 | 13:00:00+01 |           4 |          1
   2 | 12:00:00+01 |           3 |          1
@@ -2841,8 +2847,8 @@ window w as (order by f_interval desc range between
   9 | @ 9 years  |          10 |          8
   8 | @ 8 years  |           9 |          7
   7 | @ 7 years  |           8 |          7
-  6 | @ 5 years  |           5 |          4
   5 | @ 5 years  |           5 |          4
+  6 | @ 5 years  |           5 |          4
   4 | @ 4 years  |           5 |          3
   3 | @ 3 years  |           4 |          2
   2 | @ 2 years  |           3 |          1
@@ -2880,8 +2886,8 @@ window w as (order by f_timestamptz desc range between
   6 | Tue Oct 19 02:23:54 2004 PDT |           7 |          5
   5 | Sun Oct 19 02:23:54 2003 PDT |           6 |          4
   4 | Sat Oct 19 02:23:54 2002 PDT |           5 |          3
-  3 | Fri Oct 19 02:23:54 2001 PDT |           4 |          1
   2 | Fri Oct 19 02:23:54 2001 PDT |           4 |          1
+  3 | Fri Oct 19 02:23:54 2001 PDT |           4 |          1
   1 | Thu Oct 19 02:23:54 2000 PDT |           2 |          1
 (10 rows)
 
@@ -2916,8 +2922,8 @@ window w as (order by f_timestamp desc range between
   6 | Tue Oct 19 10:23:54 2004 |           7 |          5
   5 | Sun Oct 19 10:23:54 2003 |           6 |          4
   4 | Sat Oct 19 10:23:54 2002 |           5 |          3
-  3 | Fri Oct 19 10:23:54 2001 |           4 |          1
   2 | Fri Oct 19 10:23:54 2001 |           4 |          1
+  3 | Fri Oct 19 10:23:54 2001 |           4 |          1
   1 | Thu Oct 19 10:23:54 2000 |           2 |          1
 (10 rows)
 
@@ -2964,12 +2970,12 @@ SELECT sum(unique1) over (order by four groups between unbounded preceding and c
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  12 |       0 |    0
-  12 |       8 |    0
   12 |       4 |    0
+  12 |       8 |    0
+  12 |       0 |    0
+  27 |       1 |    1
   27 |       5 |    1
   27 |       9 |    1
-  27 |       1 |    1
   35 |       6 |    2
   35 |       2 |    2
   45 |       3 |    3
@@ -2981,12 +2987,12 @@ SELECT sum(unique1) over (order by four groups between unbounded preceding and u
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  45 |       0 |    0
-  45 |       8 |    0
   45 |       4 |    0
+  45 |       8 |    0
+  45 |       0 |    0
+  45 |       1 |    1
   45 |       5 |    1
   45 |       9 |    1
-  45 |       1 |    1
   45 |       6 |    2
   45 |       2 |    2
   45 |       3 |    3
@@ -2998,12 +3004,12 @@ SELECT sum(unique1) over (order by four groups between current row and unbounded
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  45 |       0 |    0
-  45 |       8 |    0
   45 |       4 |    0
+  45 |       8 |    0
+  45 |       0 |    0
+  33 |       1 |    1
   33 |       5 |    1
   33 |       9 |    1
-  33 |       1 |    1
   18 |       6 |    2
   18 |       2 |    2
   10 |       3 |    3
@@ -3015,12 +3021,12 @@ SELECT sum(unique1) over (order by four groups between 1 preceding and unbounded
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  45 |       0 |    0
-  45 |       8 |    0
   45 |       4 |    0
+  45 |       8 |    0
+  45 |       0 |    0
+  45 |       1 |    1
   45 |       5 |    1
   45 |       9 |    1
-  45 |       1 |    1
   33 |       6 |    2
   33 |       2 |    2
   18 |       3 |    3
@@ -3032,12 +3038,12 @@ SELECT sum(unique1) over (order by four groups between 1 following and unbounded
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  33 |       0 |    0
-  33 |       8 |    0
   33 |       4 |    0
+  33 |       8 |    0
+  33 |       0 |    0
+  18 |       1 |    1
   18 |       5 |    1
   18 |       9 |    1
-  18 |       1 |    1
   10 |       6 |    2
   10 |       2 |    2
      |       3 |    3
@@ -3049,12 +3055,12 @@ SELECT sum(unique1) over (order by four groups between unbounded preceding and 2
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  35 |       0 |    0
-  35 |       8 |    0
   35 |       4 |    0
+  35 |       8 |    0
+  35 |       0 |    0
+  45 |       1 |    1
   45 |       5 |    1
   45 |       9 |    1
-  45 |       1 |    1
   45 |       6 |    2
   45 |       2 |    2
   45 |       3 |    3
@@ -3066,12 +3072,12 @@ SELECT sum(unique1) over (order by four groups between 2 preceding and 1 precedi
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-     |       0 |    0
-     |       8 |    0
      |       4 |    0
+     |       8 |    0
+     |       0 |    0
+  12 |       1 |    1
   12 |       5 |    1
   12 |       9 |    1
-  12 |       1 |    1
   27 |       6 |    2
   27 |       2 |    2
   23 |       3 |    3
@@ -3083,12 +3089,12 @@ SELECT sum(unique1) over (order by four groups between 2 preceding and 1 followi
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  27 |       0 |    0
-  27 |       8 |    0
   27 |       4 |    0
+  27 |       8 |    0
+  27 |       0 |    0
+  35 |       1 |    1
   35 |       5 |    1
   35 |       9 |    1
-  35 |       1 |    1
   45 |       6 |    2
   45 |       2 |    2
   33 |       3 |    3
@@ -3100,12 +3106,12 @@ SELECT sum(unique1) over (order by four groups between 0 preceding and 0 followi
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  12 |       0 |    0
-  12 |       8 |    0
   12 |       4 |    0
+  12 |       8 |    0
+  12 |       0 |    0
+  15 |       1 |    1
   15 |       5 |    1
   15 |       9 |    1
-  15 |       1 |    1
    8 |       6 |    2
    8 |       2 |    2
   10 |       3 |    3
@@ -3117,12 +3123,12 @@ SELECT sum(unique1) over (order by four groups between 2 preceding and 1 followi
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  27 |       0 |    0
-  19 |       8 |    0
   23 |       4 |    0
+  19 |       8 |    0
+  27 |       0 |    0
+  34 |       1 |    1
   30 |       5 |    1
   26 |       9 |    1
-  34 |       1 |    1
   39 |       6 |    2
   43 |       2 |    2
   30 |       3 |    3
@@ -3134,12 +3140,12 @@ SELECT sum(unique1) over (order by four groups between 2 preceding and 1 followi
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  15 |       0 |    0
-  15 |       8 |    0
   15 |       4 |    0
+  15 |       8 |    0
+  15 |       0 |    0
+  20 |       1 |    1
   20 |       5 |    1
   20 |       9 |    1
-  20 |       1 |    1
   37 |       6 |    2
   37 |       2 |    2
   23 |       3 |    3
@@ -3151,12 +3157,12 @@ SELECT sum(unique1) over (order by four groups between 2 preceding and 1 followi
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four 
 -----+---------+------
-  15 |       0 |    0
-  23 |       8 |    0
   19 |       4 |    0
+  23 |       8 |    0
+  15 |       0 |    0
+  21 |       1 |    1
   25 |       5 |    1
   29 |       9 |    1
-  21 |       1 |    1
   43 |       6 |    2
   39 |       2 |    2
   26 |       3 |    3
@@ -3168,15 +3174,15 @@ SELECT sum(unique1) over (partition by ten
 FROM tenk1 WHERE unique1 < 10;
  sum | unique1 | four | ten 
 -----+---------+------+-----
-   0 |       0 |    0 |   0
-   1 |       1 |    1 |   1
    2 |       2 |    2 |   2
    3 |       3 |    3 |   3
    4 |       4 |    0 |   4
-   5 |       5 |    1 |   5
-   6 |       6 |    2 |   6
    7 |       7 |    3 |   7
    8 |       8 |    0 |   8
+   0 |       0 |    0 |   0
+   1 |       1 |    1 |   1
+   5 |       5 |    1 |   5
+   6 |       6 |    2 |   6
    9 |       9 |    1 |   9
 (10 rows)
 
@@ -3190,10 +3196,10 @@ FROM tenk1 WHERE unique1 < 10;
      |       2 |    2 |   2
      |       3 |    3 |   3
      |       4 |    0 |   4
-     |       5 |    1 |   5
-     |       6 |    2 |   6
      |       7 |    3 |   7
      |       8 |    0 |   8
+     |       5 |    1 |   5
+     |       6 |    2 |   6
      |       9 |    1 |   9
 (10 rows)
 
@@ -3204,14 +3210,14 @@ FROM tenk1 WHERE unique1 < 10;
 -----+---------+------+-----
      |       0 |    0 |   0
      |       1 |    1 |   1
+     |       5 |    1 |   5
+     |       6 |    2 |   6
+     |       9 |    1 |   9
      |       2 |    2 |   2
      |       3 |    3 |   3
      |       4 |    0 |   4
-     |       5 |    1 |   5
-     |       6 |    2 |   6
      |       7 |    3 |   7
      |       8 |    0 |   8
-     |       9 |    1 |   9
 (10 rows)
 
 SELECT sum(unique1) over (partition by ten
@@ -3221,14 +3227,14 @@ FROM tenk1 WHERE unique1 < 10;
 -----+---------+------+-----
    0 |       0 |    0 |   0
    1 |       1 |    1 |   1
+   5 |       5 |    1 |   5
+   6 |       6 |    2 |   6
+   9 |       9 |    1 |   9
    2 |       2 |    2 |   2
    3 |       3 |    3 |   3
    4 |       4 |    0 |   4
-   5 |       5 |    1 |   5
-   6 |       6 |    2 |   6
    7 |       7 |    3 |   7
    8 |       8 |    0 |   8
-   9 |       9 |    1 |   9
 (10 rows)
 
 select first_value(salary) over(order by enroll_date groups between 1 preceding and 1 following),
@@ -3510,6 +3516,8 @@ DETAIL:  Falling back to Postgres-based planner because GPORCA does not support
 
 -- check some degenerate cases
 create temp table t1 (f1 int, f2 int8);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 insert into t1 values (1,1),(1,2),(2,2);
 select f1, sum(f1) over (partition by f1
                          range between 1 preceding and 1 following)
@@ -3531,7 +3539,7 @@ from t1 where f1 = f2;
                Sort Key: f1, f2
                ->  Seq Scan on t1
                      Filter: (f1 = f2)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (9 rows)
 
 select f1, sum(f1) over (partition by f1 order by f2
@@ -3548,8 +3556,8 @@ select f1, sum(f1) over (partition by f1, f1 order by f2
 from t1 where f1 = f2;
  f1 | sum 
 ----+-----
-  1 |    
   2 |    
+  1 |    
 (2 rows)
 
 select f1, sum(f1) over (partition by f1, f2 order by f2
@@ -3581,7 +3589,7 @@ from t1 where f1 = f2;
                Sort Key: f1, f2
                ->  Seq Scan on t1
                      Filter: (f1 = f2)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (9 rows)
 
 select f1, sum(f1) over (partition by f1 order by f2
@@ -3589,8 +3597,8 @@ select f1, sum(f1) over (partition by f1 order by f2
 from t1 where f1 = f2;
  f1 | sum 
 ----+-----
-  1 |   1
   2 |   2
+  1 |   1
 (2 rows)
 
 select f1, sum(f1) over (partition by f1, f1 order by f2
@@ -3598,8 +3606,8 @@ select f1, sum(f1) over (partition by f1, f1 order by f2
 from t1 where f1 = f2;
  f1 | sum 
 ----+-----
-  1 |    
   2 |    
+  1 |    
 (2 rows)
 
 select f1, sum(f1) over (partition by f1, f2 order by f2
@@ -3607,8 +3615,8 @@ select f1, sum(f1) over (partition by f1, f2 order by f2
 from t1 where f1 = f2;
  f1 | sum 
 ----+-----
-  1 |    
   2 |    
+  1 |    
 (2 rows)
 
 -- ordering by a non-integer constant is allowed
@@ -3714,7 +3722,7 @@ WHERE depname = 'sales';
                                  Sort Key: depname
                                  ->  Seq Scan on empsalary
                                        Filter: ((depname)::text = 'sales'::text)
- Optimizer: Pivotal Optimizer (GPORCA) version 3.83.0
+ Optimizer: GPORCA
 (13 rows)
 
 -- pushdown is unsafe because there's a PARTITION BY clause without depname:
@@ -3743,7 +3751,7 @@ WHERE depname = 'sales';
                                        ->  Redistribute Motion 3:3  (slice3; segments: 3)
                                              Hash Key: enroll_date
                                              ->  Seq Scan on empsalary
- Optimizer: Pivotal Optimizer (GPORCA) version 3.23.0
+ Optimizer: GPORCA
 (17 rows)
 
 -- pushdown is unsafe because the subquery contains window functions and the qual is volatile:
@@ -3768,7 +3776,7 @@ WHERE depname = 'sales' OR RANDOM() > 0.5;
                                  Sort Key: depname
                                  ->  Seq Scan on empsalary
                                        Filter: (((depname)::text = 'sales'::text) OR (random() > '0.5'::double precision))
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (13 rows)
 
 -- Test Sort node collapsing
@@ -3794,7 +3802,7 @@ WHERE depname = 'sales';
                            Sort Key: depname, empno
                            ->  Seq Scan on empsalary
                                  Filter: ((depname)::text = 'sales'::text)
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (14 rows)
 
 -- Test Sort node reordering
@@ -3817,7 +3825,7 @@ FROM empsalary;
                      ->  Sort
                            Sort Key: depname, salary, enroll_date
                            ->  Seq Scan on empsalary
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (13 rows)
 
 -- Test incremental sorting
@@ -3831,9 +3839,7 @@ SELECT * FROM
           row_number() OVER (PARTITION BY depname ORDER BY enroll_date DESC) AS last_emp
    FROM empsalary) emp
 WHERE first_emp = 1 OR last_emp = 1;
-NOTICE:  One or more columns in the following table(s) do not have statistics: empsalary
-HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
-                                    QUERY PLAN
+                                    QUERY PLAN                                    
 ----------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    ->  Result
@@ -3849,7 +3855,7 @@ HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For
                            ->  Sort
                                  Sort Key: depname, enroll_date
                                  ->  Seq Scan on empsalary
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (15 rows)
 
 SELECT * FROM
@@ -3861,8 +3867,6 @@ SELECT * FROM
           row_number() OVER (PARTITION BY depname ORDER BY enroll_date DESC) AS last_emp
    FROM empsalary) emp
 WHERE first_emp = 1 OR last_emp = 1;
-NOTICE:  One or more columns in the following table(s) do not have statistics: empsalary
-HINT:  For non-partitioned tables, run analyze <table_name>(<column_list>). For partitioned tables, run analyze rootpartition <table_name>(<column_list>). See log for columns missing statistics.
   depname  | empno | salary | enroll_date | first_emp | last_emp 
 -----------+-------+--------+-------------+-----------+----------
  develop   |     9 |   4500 | 01-01-2008  |         4 |        1
@@ -4760,10 +4764,10 @@ AS $$
     WINDOW w AS (ORDER BY s ROWS BETWEEN CURRENT ROW AND GROUP_SIZE FOLLOWING)
 $$ LANGUAGE SQL STABLE;
 EXPLAIN (costs off) SELECT * FROM pg_temp.f(2);
-              QUERY PLAN               
----------------------------------------
+     QUERY PLAN     
+--------------------
  Function Scan on f
- Optimizer: Pivotal Optimizer (GPORCA)
+ Optimizer: GPORCA
 (2 rows)
 
 SELECT * FROM pg_temp.f(2);
diff --git a/src/test/regress/expected/window_parallel.out b/src/test/regress/expected/window_parallel.out
new file mode 100644
index 00000000000..55fd0e820e0
--- /dev/null
+++ b/src/test/regress/expected/window_parallel.out
@@ -0,0 +1,1046 @@
+set force_parallel_mode = 0;
+set optimizer = off;
+create schema window_parallel;
+set search_path to window_parallel;
+set gp_appendonly_insert_files = 4;
+set min_parallel_table_scan_size = 0;
+--
+-- Test of Parallel process of Window Functions.
+--
+CREATE TABLE empsalary (
+    depname varchar,
+    empno bigint,
+    salary int,
+    enroll_date date
+);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'depname' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO empsalary VALUES
+('develop', 10, 5200, '2007-08-01'),
+('sales', 1, 5000, '2006-10-01'),
+('personnel', 5, 3500, '2007-12-10'),
+('sales', 4, 4800, '2007-08-08'),
+('personnel', 2, 3900, '2006-12-23'),
+('develop', 7, 4200, '2008-01-01'),
+('develop', 9, 4500, '2008-01-01'),
+('sales', 3, 4800, '2007-08-01'),
+('develop', 8, 6000, '2006-10-01'),
+('develop', 11, 5200, '2007-08-15');
+-- w1
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Merge Key: depname, salary
+   ->  Sort
+         Sort Key: depname, salary
+         ->  WindowAgg
+               Partition By: depname
+               ->  Sort
+                     Sort Key: depname
+                     ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+  depname  | empno | salary |  sum  
+-----------+-------+--------+-------
+ develop   |     7 |   4200 | 25100
+ develop   |     9 |   4500 | 25100
+ develop   |    11 |   5200 | 25100
+ develop   |    10 |   5200 | 25100
+ develop   |     8 |   6000 | 25100
+ personnel |     5 |   3500 |  7400
+ personnel |     2 |   3900 |  7400
+ sales     |     3 |   4800 | 14600
+ sales     |     4 |   4800 | 14600
+ sales     |     1 |   5000 | 14600
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   Merge Key: depname, salary
+   ->  Sort
+         Sort Key: depname, salary
+         ->  WindowAgg
+               Partition By: depname
+               ->  Sort
+                     Sort Key: depname
+                     ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                           Hash Key: depname
+                           Hash Module: 3
+                           ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(13 rows)
+
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+  depname  | empno | salary |  sum  
+-----------+-------+--------+-------
+ develop   |     7 |   4200 | 25100
+ develop   |     9 |   4500 | 25100
+ develop   |    10 |   5200 | 25100
+ develop   |    11 |   5200 | 25100
+ develop   |     8 |   6000 | 25100
+ personnel |     5 |   3500 |  7400
+ personnel |     2 |   3900 |  7400
+ sales     |     4 |   4800 | 14600
+ sales     |     3 |   4800 | 14600
+ sales     |     1 |   5000 | 14600
+(10 rows)
+
+-- w2
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  WindowAgg
+         Partition By: depname
+         Order By: salary
+         ->  Sort
+               Sort Key: depname, salary
+               ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+  depname  | empno | salary | rank 
+-----------+-------+--------+------
+ develop   |     7 |   4200 |    1
+ develop   |     9 |   4500 |    2
+ develop   |    11 |   5200 |    3
+ develop   |    10 |   5200 |    3
+ develop   |     8 |   6000 |    5
+ personnel |     5 |   3500 |    1
+ personnel |     2 |   3900 |    2
+ sales     |     3 |   4800 |    1
+ sales     |     4 |   4800 |    1
+ sales     |     1 |   5000 |    3
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  WindowAgg
+         Partition By: depname
+         Order By: salary
+         ->  Sort
+               Sort Key: depname, salary
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Hash Key: depname
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+  depname  | empno | salary | rank 
+-----------+-------+--------+------
+ personnel |     5 |   3500 |    1
+ personnel |     2 |   3900 |    2
+ sales     |     4 |   4800 |    1
+ sales     |     3 |   4800 |    1
+ sales     |     1 |   5000 |    3
+ develop   |     7 |   4200 |    1
+ develop   |     9 |   4500 |    2
+ develop   |    10 |   5200 |    3
+ develop   |    11 |   5200 |    3
+ develop   |     8 |   6000 |    5
+(10 rows)
+
+-- w3
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+                QUERY PLAN                
+------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  WindowAgg
+         Partition By: depname
+         ->  Sort
+               Sort Key: depname
+               ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(7 rows)
+
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+  depname  | empno | salary |  sum  
+-----------+-------+--------+-------
+ develop   |    11 |   5200 | 25100
+ develop   |     7 |   4200 | 25100
+ develop   |     9 |   4500 | 25100
+ develop   |     8 |   6000 | 25100
+ develop   |    10 |   5200 | 25100
+ personnel |     5 |   3500 |  7400
+ personnel |     2 |   3900 |  7400
+ sales     |     3 |   4800 | 14600
+ sales     |     1 |   5000 | 14600
+ sales     |     4 |   4800 | 14600
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  WindowAgg
+         Partition By: depname
+         ->  Sort
+               Sort Key: depname
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Hash Key: depname
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+  depname  | empno | salary |  sum  
+-----------+-------+--------+-------
+ develop   |    10 |   5200 | 25100
+ develop   |     7 |   4200 | 25100
+ develop   |     9 |   4500 | 25100
+ develop   |     8 |   6000 | 25100
+ develop   |    11 |   5200 | 25100
+ personnel |     5 |   3500 |  7400
+ personnel |     2 |   3900 |  7400
+ sales     |     1 |   5000 | 14600
+ sales     |     4 |   4800 | 14600
+ sales     |     3 |   4800 | 14600
+(10 rows)
+
+-- w4
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Merge Key: (rank() OVER (?))
+   ->  Sort
+         Sort Key: (rank() OVER (?))
+         ->  WindowAgg
+               Partition By: depname
+               Order By: salary
+               ->  Sort
+                     Sort Key: depname, salary
+                     ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+  depname  | empno | salary | rank 
+-----------+-------+--------+------
+ develop   |     7 |   4200 |    1
+ personnel |     5 |   3500 |    1
+ sales     |     3 |   4800 |    1
+ sales     |     4 |   4800 |    1
+ personnel |     2 |   3900 |    2
+ develop   |     9 |   4500 |    2
+ sales     |     1 |   5000 |    3
+ develop   |    11 |   5200 |    3
+ develop   |    10 |   5200 |    3
+ develop   |     8 |   6000 |    5
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+                               QUERY PLAN                               
+------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   Merge Key: (rank() OVER (?))
+   ->  Sort
+         Sort Key: (rank() OVER (?))
+         ->  WindowAgg
+               Partition By: depname
+               Order By: salary
+               ->  Sort
+                     Sort Key: depname, salary
+                     ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                           Hash Key: depname
+                           Hash Module: 3
+                           ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(14 rows)
+
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+  depname  | empno | salary | rank 
+-----------+-------+--------+------
+ personnel |     5 |   3500 |    1
+ sales     |     4 |   4800 |    1
+ sales     |     3 |   4800 |    1
+ develop   |     7 |   4200 |    1
+ develop   |     9 |   4500 |    2
+ personnel |     2 |   3900 |    2
+ sales     |     1 |   5000 |    3
+ develop   |    10 |   5200 |    3
+ develop   |    11 |   5200 |    3
+ develop   |     8 |   6000 |    5
+(10 rows)
+
+-- w5
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ WindowAgg
+   Order By: depname
+   ->  Sort
+         Sort Key: depname
+         ->  WindowAgg
+               Order By: depname
+               ->  Gather Motion 3:1  (slice1; segments: 3)
+                     Merge Key: depname
+                     ->  Sort
+                           Sort Key: depname DESC
+                           ->  HashAggregate
+                                 Group Key: depname
+                                 ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(14 rows)
+
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+  sum  | row_number |  sum  
+-------+------------+-------
+ 25100 |          1 | 47100
+  7400 |          2 | 22000
+ 14600 |          3 | 14600
+(3 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ WindowAgg
+   Order By: depname
+   ->  Sort
+         Sort Key: depname
+         ->  WindowAgg
+               Order By: depname
+               ->  Gather Motion 3:1  (slice1; segments: 3)
+                     Merge Key: depname
+                     ->  Sort
+                           Sort Key: depname DESC
+                           ->  HashAggregate
+                                 Group Key: depname
+                                 ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(14 rows)
+
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+  sum  | row_number |  sum  
+-------+------------+-------
+ 25100 |          1 | 47100
+  7400 |          2 | 22000
+ 14600 |          3 | 14600
+(3 rows)
+
+-- w6
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+-- identical windows with different names
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+                      QUERY PLAN                      
+------------------------------------------------------
+ WindowAgg
+   Order By: salary
+   ->  WindowAgg
+         Order By: salary
+         ->  Gather Motion 3:1  (slice1; segments: 3)
+               Merge Key: salary
+               ->  Sort
+                     Sort Key: salary
+                     ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+  sum  | count 
+-------+-------
+  3500 |     1
+  7400 |     2
+ 11600 |     3
+ 16100 |     4
+ 25700 |     6
+ 25700 |     6
+ 30700 |     7
+ 41100 |     9
+ 41100 |     9
+ 47100 |    10
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+-- identical windows with different names
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+                       QUERY PLAN                       
+--------------------------------------------------------
+ WindowAgg
+   Order By: salary
+   ->  WindowAgg
+         Order By: salary
+         ->  Gather Motion 6:1  (slice1; segments: 6)
+               Merge Key: salary
+               ->  Sort
+                     Sort Key: salary
+                     ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(10 rows)
+
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+  sum  | count 
+-------+-------
+  3500 |     1
+  7400 |     2
+ 11600 |     3
+ 16100 |     4
+ 25700 |     6
+ 25700 |     6
+ 30700 |     7
+ 41100 |     9
+ 41100 |     9
+ 47100 |    10
+(10 rows)
+
+-- w7
+-- mixture of agg/wfunc in the same window
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+                  QUERY PLAN                  
+----------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   ->  WindowAgg
+         Partition By: depname
+         Order By: salary
+         ->  Sort
+               Sort Key: depname, salary DESC
+               ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+  sum  | rank 
+-------+------
+  6000 |    1
+ 16400 |    2
+ 16400 |    2
+ 20900 |    4
+ 25100 |    5
+  3900 |    1
+  7400 |    2
+  5000 |    1
+ 14600 |    2
+ 14600 |    2
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   ->  WindowAgg
+         Partition By: depname
+         Order By: salary
+         ->  Sort
+               Sort Key: depname, salary DESC
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Hash Key: depname
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(11 rows)
+
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+  sum  | rank 
+-------+------
+  3900 |    1
+  7400 |    2
+  5000 |    1
+ 14600 |    2
+ 14600 |    2
+  6000 |    1
+ 16400 |    2
+ 16400 |    2
+ 20900 |    4
+ 25100 |    5
+(10 rows)
+
+-- w8
+-- window agg in CASE WHEN clause
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ WindowAgg
+   ->  WindowAgg
+         Order By: s.empno
+         ->  Gather Motion 3:1  (slice1; segments: 3)
+               Merge Key: s.empno
+               ->  Sort
+                     Sort Key: s.empno
+                     ->  Subquery Scan on s
+                           ->  WindowAgg
+                                 Partition By: empsalary.depname
+                                 ->  Sort
+                                       Sort Key: empsalary.depname
+                                       ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(14 rows)
+
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+ empno |  depname  | salary | bonus | depadj | min  | max 
+-------+-----------+--------+-------+--------+------+-----
+     1 | sales     |   5000 |  1000 |    200 | 1000 | 200
+     2 | personnel |   3900 |  1000 |    200 | 1000 | 200
+     3 | sales     |   4800 |   500 |        |  500 | 200
+     4 | sales     |   4800 |   500 |        |  500 | 200
+     5 | personnel |   3500 |   500 |        |  500 | 200
+     7 | develop   |   4200 |       |        |  500 | 200
+     8 | develop   |   6000 |  1000 |    200 |  500 | 200
+     9 | develop   |   4500 |       |        |  500 | 200
+    10 | develop   |   5200 |   500 |    200 |  500 | 200
+    11 | develop   |   5200 |   500 |    200 |  500 | 200
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ WindowAgg
+   ->  WindowAgg
+         Order By: s.empno
+         ->  Gather Motion 6:1  (slice1; segments: 6)
+               Merge Key: s.empno
+               ->  Sort
+                     Sort Key: s.empno
+                     ->  Subquery Scan on s
+                           ->  WindowAgg
+                                 Partition By: empsalary.depname
+                                 ->  Sort
+                                       Sort Key: empsalary.depname
+                                       ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                                             Hash Key: empsalary.depname
+                                             Hash Module: 3
+                                             ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(17 rows)
+
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+ empno |  depname  | salary | bonus | depadj | min  | max 
+-------+-----------+--------+-------+--------+------+-----
+     1 | sales     |   5000 |  1000 |    200 | 1000 | 200
+     2 | personnel |   3900 |  1000 |    200 | 1000 | 200
+     3 | sales     |   4800 |   500 |        |  500 | 200
+     4 | sales     |   4800 |   500 |        |  500 | 200
+     5 | personnel |   3500 |   500 |        |  500 | 200
+     7 | develop   |   4200 |       |        |  500 | 200
+     8 | develop   |   6000 |  1000 |    200 |  500 | 200
+     9 | develop   |   4500 |       |        |  500 | 200
+    10 | develop   |   5200 |   500 |    200 |  500 | 200
+    11 | develop   |   5200 |   500 |    200 |  500 | 200
+(10 rows)
+
+-- w9
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+                   QUERY PLAN                   
+------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date
+               ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 34900 |   5000 | 10-01-2006
+ 34900 |   6000 | 10-01-2006
+ 38400 |   3900 | 12-23-2006
+ 47100 |   4800 | 08-01-2007
+ 47100 |   5200 | 08-01-2007
+ 47100 |   4800 | 08-08-2007
+ 47100 |   5200 | 08-15-2007
+ 36100 |   3500 | 12-10-2007
+ 32200 |   4500 | 01-01-2008
+ 32200 |   4200 | 01-01-2008
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+                    QUERY PLAN                    
+--------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 6:1  (slice1; segments: 6)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date
+               ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 34900 |   5000 | 10-01-2006
+ 34900 |   6000 | 10-01-2006
+ 38400 |   3900 | 12-23-2006
+ 47100 |   4800 | 08-01-2007
+ 47100 |   5200 | 08-01-2007
+ 47100 |   4800 | 08-08-2007
+ 47100 |   5200 | 08-15-2007
+ 36100 |   3500 | 12-10-2007
+ 32200 |   4500 | 01-01-2008
+ 32200 |   4200 | 01-01-2008
+(10 rows)
+
+-- w10 
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+                   QUERY PLAN                   
+------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date DESC
+               ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 32200 |   4200 | 01-01-2008
+ 32200 |   4500 | 01-01-2008
+ 36100 |   3500 | 12-10-2007
+ 47100 |   5200 | 08-15-2007
+ 47100 |   4800 | 08-08-2007
+ 47100 |   4800 | 08-01-2007
+ 47100 |   5200 | 08-01-2007
+ 38400 |   3900 | 12-23-2006
+ 34900 |   5000 | 10-01-2006
+ 34900 |   6000 | 10-01-2006
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+                    QUERY PLAN                    
+--------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 6:1  (slice1; segments: 6)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date DESC
+               ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 32200 |   4200 | 01-01-2008
+ 32200 |   4500 | 01-01-2008
+ 36100 |   3500 | 12-10-2007
+ 47100 |   5200 | 08-15-2007
+ 47100 |   4800 | 08-08-2007
+ 47100 |   4800 | 08-01-2007
+ 47100 |   5200 | 08-01-2007
+ 38400 |   3900 | 12-23-2006
+ 34900 |   5000 | 10-01-2006
+ 34900 |   6000 | 10-01-2006
+(10 rows)
+
+-- w11
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+                   QUERY PLAN                   
+------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date DESC
+               ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+ sum | salary | enroll_date 
+-----+--------+-------------
+     |   4200 | 01-01-2008
+     |   4500 | 01-01-2008
+     |   3500 | 12-10-2007
+     |   5200 | 08-15-2007
+     |   4800 | 08-08-2007
+     |   4800 | 08-01-2007
+     |   5200 | 08-01-2007
+     |   3900 | 12-23-2006
+     |   5000 | 10-01-2006
+     |   6000 | 10-01-2006
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+                    QUERY PLAN                    
+--------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 6:1  (slice1; segments: 6)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date DESC
+               ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+ sum | salary | enroll_date 
+-----+--------+-------------
+     |   4200 | 01-01-2008
+     |   4500 | 01-01-2008
+     |   3500 | 12-10-2007
+     |   5200 | 08-15-2007
+     |   4800 | 08-08-2007
+     |   4800 | 08-01-2007
+     |   5200 | 08-01-2007
+     |   3900 | 12-23-2006
+     |   5000 | 10-01-2006
+     |   6000 | 10-01-2006
+(10 rows)
+
+-- w12
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+                   QUERY PLAN                   
+------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 3:1  (slice1; segments: 3)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date
+               ->  Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 29900 |   5000 | 10-01-2006
+ 28900 |   6000 | 10-01-2006
+ 34500 |   3900 | 12-23-2006
+ 42300 |   4800 | 08-01-2007
+ 41900 |   5200 | 08-01-2007
+ 42300 |   4800 | 08-08-2007
+ 41900 |   5200 | 08-15-2007
+ 32600 |   3500 | 12-10-2007
+ 27700 |   4500 | 01-01-2008
+ 28000 |   4200 | 01-01-2008
+(10 rows)
+
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+                    QUERY PLAN                    
+--------------------------------------------------
+ WindowAgg
+   Order By: enroll_date
+   ->  Gather Motion 6:1  (slice1; segments: 6)
+         Merge Key: enroll_date
+         ->  Sort
+               Sort Key: enroll_date
+               ->  Parallel Seq Scan on empsalary
+ Optimizer: Postgres query optimizer
+(8 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 29900 |   5000 | 10-01-2006
+ 28900 |   6000 | 10-01-2006
+ 34500 |   3900 | 12-23-2006
+ 42300 |   4800 | 08-01-2007
+ 41900 |   5200 | 08-01-2007
+ 42300 |   4800 | 08-08-2007
+ 41900 |   5200 | 08-15-2007
+ 32600 |   3500 | 12-10-2007
+ 27700 |   4500 | 01-01-2008
+ 28000 |   4200 | 01-01-2008
+(10 rows)
+
+--
+-- End of test of Parallel process of Window Functions.
+--
+--
+-- Test Parallel UNION ALL
+--
+create table t1(a int, b int) with(parallel_workers=2);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+create table t2(a int, b int) with(parallel_workers=2);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+insert into t1 select i, i from generate_series(1, 10000) i;
+insert into t1 select i, i from generate_series(1, 10000) i;
+analyze t1;
+analyze t2;
+begin;
+set local enable_parallel = on;
+set local enable_parallel_append = on;
+set local min_parallel_table_scan_size = 0;
+-- If parallel-aware append encounters a motion hazard, fall back to parallel-oblivious append.
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+                                                       QUERY PLAN                                                       
+------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   Output: t1.b, (count(*))
+   ->  Append
+         ->  HashAggregate
+               Output: t1.b, count(*)
+               Group Key: t1.b
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Output: t1.b
+                     Hash Key: t1.b
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on window_parallel.t1
+                           Output: t1.b
+         ->  HashAggregate
+               Output: t2.b, count(*)
+               Group Key: t2.b
+               ->  Redistribute Motion 6:6  (slice3; segments: 6)
+                     Output: t2.b
+                     Hash Key: t2.b
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on window_parallel.t2
+                           Output: t2.b
+ Settings: enable_parallel = 'on', enable_parallel_append = 'on', min_parallel_table_scan_size = '0', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+set local enable_parallel_append = off;
+-- Naturally, use parallel-oblivious append directly when parallel-aware mode is disabled.
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 6:1  (slice1; segments: 6)
+   Output: t1.b, (count(*))
+   ->  Append
+         ->  HashAggregate
+               Output: t1.b, count(*)
+               Group Key: t1.b
+               ->  Redistribute Motion 6:6  (slice2; segments: 6)
+                     Output: t1.b
+                     Hash Key: t1.b
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on window_parallel.t1
+                           Output: t1.b
+         ->  HashAggregate
+               Output: t2.b, count(*)
+               Group Key: t2.b
+               ->  Redistribute Motion 6:6  (slice3; segments: 6)
+                     Output: t2.b
+                     Hash Key: t2.b
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on window_parallel.t2
+                           Output: t2.b
+ Settings: enable_parallel = 'on', enable_parallel_append = 'off', min_parallel_table_scan_size = '0', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+-- Ensure compatibility between different paths when using parallel workers
+set local enable_parallel_append = on;
+set max_parallel_workers_per_gather = 3;
+alter table t2 set(parallel_workers=3);
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+                                                       QUERY PLAN                                                       
+------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 9:1  (slice1; segments: 9)
+   Output: t1.b, (count(*))
+   ->  Append
+         ->  HashAggregate
+               Output: t1.b, count(*)
+               Group Key: t1.b
+               ->  Redistribute Motion 6:9  (slice2; segments: 6)
+                     Output: t1.b
+                     Hash Key: t1.b
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on window_parallel.t1
+                           Output: t1.b
+         ->  HashAggregate
+               Output: t2.b, count(*)
+               Group Key: t2.b
+               ->  Redistribute Motion 9:9  (slice3; segments: 9)
+                     Output: t2.b
+                     Hash Key: t2.b
+                     Hash Module: 3
+                     ->  Parallel Seq Scan on window_parallel.t2
+                           Output: t2.b
+ Settings: enable_parallel = 'on', enable_parallel_append = 'on', min_parallel_table_scan_size = '0', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(23 rows)
+
+-- Could not drive a parallel plan if no partial paths are avaliable
+alter table t2 set(parallel_workers=0);
+-- parallel-aware
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+                                                       QUERY PLAN                                                       
+------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.b, (count(*))
+   ->  Append
+         ->  HashAggregate
+               Output: t1.b, count(*)
+               Group Key: t1.b
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: t1.b
+                     Hash Key: t1.b
+                     ->  Seq Scan on window_parallel.t1
+                           Output: t1.b
+         ->  HashAggregate
+               Output: t2.b, count(*)
+               Group Key: t2.b
+               ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                     Output: t2.b
+                     Hash Key: t2.b
+                     ->  Seq Scan on window_parallel.t2
+                           Output: t2.b
+ Settings: enable_parallel = 'on', enable_parallel_append = 'on', min_parallel_table_scan_size = '0', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+set local enable_parallel_append = off;
+-- Also applies to parallel-oblivious
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+                                                       QUERY PLAN                                                        
+-------------------------------------------------------------------------------------------------------------------------
+ Gather Motion 3:1  (slice1; segments: 3)
+   Output: t1.b, (count(*))
+   ->  Append
+         ->  HashAggregate
+               Output: t1.b, count(*)
+               Group Key: t1.b
+               ->  Redistribute Motion 3:3  (slice2; segments: 3)
+                     Output: t1.b
+                     Hash Key: t1.b
+                     ->  Seq Scan on window_parallel.t1
+                           Output: t1.b
+         ->  HashAggregate
+               Output: t2.b, count(*)
+               Group Key: t2.b
+               ->  Redistribute Motion 3:3  (slice3; segments: 3)
+                     Output: t2.b
+                     Hash Key: t2.b
+                     ->  Seq Scan on window_parallel.t2
+                           Output: t2.b
+ Settings: enable_parallel = 'on', enable_parallel_append = 'off', min_parallel_table_scan_size = '0', optimizer = 'off'
+ Optimizer: Postgres query optimizer
+(21 rows)
+
+abort;
+--
+-- End of test Parallel UNION ALL
+--
+-- start_ignore
+drop schema window_parallel cascade;
+NOTICE:  drop cascades to table empsalary
+-- end_ignore
+reset min_parallel_table_scan_size;
+reset enable_parallel;
+reset gp_appendonly_insert_files;
+reset force_parallel_mode;
+reset optimizer;
diff --git a/src/test/regress/expected/with.out b/src/test/regress/expected/with.out
index 90ed303b7de..6c643fec8d4 100644
--- a/src/test/regress/expected/with.out
+++ b/src/test/regress/expected/with.out
@@ -3239,3 +3239,101 @@ select * from with_test;
 (1 row)
 
 drop table with_test;
+--
+-- writable CTE with SELECT INTO clause.
+--
+CREATE TABLE t_w_cte(a integer);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+EXPLAIN(COSTS OFF, VERBOSE) WITH ins AS (
+  INSERT INTO t_w_cte(a) VALUES (1), (2), (3)
+  RETURNING a
+)
+SELECT sum(a) INTO t_w_cte_1 FROM ins;
+ERROR:  writable CTE queries cannot be used with writable queries
+DETAIL:  Apache Cloudberry currently only support CTEs with one writable clause, called in a non-writable context.
+HINT:  Rewrite the query to only include one writable clause.
+DROP TABLE t_w_cte;
+CREATE TABLE t_w_cte_relp(a integer) distributed replicated;
+EXPLAIN(COSTS OFF, VERBOSE) WITH ins AS (
+  INSERT INTO t_w_cte_relp(a) VALUES (1), (2), (3)
+  RETURNING a
+)
+SELECT sum(a) INTO t_w_cte_relp_1 FROM ins;
+ERROR:  writable CTE queries cannot be used with writable queries
+DETAIL:  Apache Cloudberry currently only support CTEs with one writable clause, called in a non-writable context.
+HINT:  Rewrite the query to only include one writable clause.
+DROP TABLE t_w_cte_relp;
+--
+-- readable CTE with SELECT INTO clause.
+--
+WITH sel AS (
+  SELECT 1 as a
+)
+SELECT a INTO t_r_cte FROM sel;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_r_cte;
+ a 
+---
+ 1
+(1 row)
+
+DROP TABLE t_r_cte;
+--
+-- Multiple readable CTEs with SELECT INTO
+--
+WITH cte1 AS (SELECT 1 as a),
+     cte2 AS (SELECT 2 as b)
+SELECT a, b INTO t_multi_r_cte FROM cte1, cte2;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_multi_r_cte;
+ a | b 
+---+---
+ 1 | 2
+(1 row)
+
+DROP TABLE t_multi_r_cte;
+--
+-- Nested SELECT in CTE with SELECT INTO
+--
+WITH nested_cte AS (
+  SELECT * FROM (SELECT 100 as val, 'test'::text as name) subq
+)
+SELECT val, name INTO t_nested_r_cte FROM nested_cte;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_nested_r_cte;
+ val | name 
+-----+------
+ 100 | test
+(1 row)
+
+DROP TABLE t_nested_r_cte;
+--
+-- CTE with JOIN and SELECT INTO
+--
+WITH cte1 AS (SELECT 1 as id, 'foo' as val),
+     cte2 AS (SELECT 1 as id, 'bar' as val)
+SELECT cte1.id, cte1.val as val1, cte2.val as val2
+INTO t_join_r_cte
+FROM cte1 JOIN cte2 ON cte1.id = cte2.id;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_join_r_cte;
+ id | val1 | val2 
+----+------+------
+  1 | foo  | bar
+(1 row)
+
+DROP TABLE t_join_r_cte;
+--
+-- Verify mixed readable and writable CTEs blocked (negative test)
+--
+CREATE TABLE t_mixed_test (a int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+WITH read_cte AS (SELECT 1 as x),
+     write_cte AS (INSERT INTO t_mixed_test VALUES (1) RETURNING *)
+SELECT x INTO t_should_fail2 FROM read_cte;  -- should fail
+ERROR:  writable CTE queries cannot be used with writable queries
+DETAIL:  Apache Cloudberry currently only support CTEs with one writable clause, called in a non-writable context.
+HINT:  Rewrite the query to only include one writable clause.
+DROP TABLE t_mixed_test;
diff --git a/src/test/regress/expected/with_clause.out b/src/test/regress/expected/with_clause.out
index 2e574f1a146..2c3aff9951f 100644
--- a/src/test/regress/expected/with_clause.out
+++ b/src/test/regress/expected/with_clause.out
@@ -2355,3 +2355,53 @@ UNION ALL
  c      | 1
 (7 rows)
 
+-- Test issue from PR#1204
+-- Executor used to fail to execute this query
+CREATE TABLE foo_issue_1204_test (a INT, b INT, c INT, d INT, e INT, f INT);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO foo_issue_1204_test SELECT generate_series(1,10000);
+ANALYZE foo_issue_1204_test;
+-- Assert than plan uses Merge Append strategy, and has Share Input Scan node.
+-- Also we are not actaully interested in output so discard it using SELECT EXISTS() hack
+EXPLAIN (COSTS OFF, TIMING OFF, BUFFERS OFF)
+SELECT EXISTS(
+	with inp as MATERIALIZED (select * from  foo_issue_1204_test ) select a,b,c, count(distinct d), count(distinct e), count(distinct f) from inp group by 1,2,3
+	UNION ALL
+	select a,b,c, count(distinct d), count(distinct e), count(distinct f) from foo_issue_1204_test group by 1,2,3
+	ORDER BY 1
+);
+                                                   QUERY PLAN                                                    
+-----------------------------------------------------------------------------------------------------------------
+ Result
+   InitPlan 1 (returns $0)  (slice1)
+     ->  Gather Motion 3:1  (slice2; segments: 3)
+           ->  Merge Append
+                 Sort Key: share0_ref1.a
+                 ->  GroupAggregate
+                       Group Key: share0_ref1.a, share0_ref1.b, share0_ref1.c
+                       ->  Sort
+                             Sort Key: share0_ref1.a, share0_ref1.b, share0_ref1.c
+                             ->  Shared Scan (share slice:id 2:0)
+                                   ->  Seq Scan on foo_issue_1204_test
+                 ->  GroupAggregate
+                       Group Key: foo_issue_1204_test_1.a, foo_issue_1204_test_1.b, foo_issue_1204_test_1.c
+                       ->  Sort
+                             Sort Key: foo_issue_1204_test_1.a, foo_issue_1204_test_1.b, foo_issue_1204_test_1.c
+                             ->  Seq Scan on foo_issue_1204_test foo_issue_1204_test_1
+ Optimizer: Postgres query optimizer
+(17 rows)
+
+-- Check execution is ok
+SELECT EXISTS(
+	with inp as MATERIALIZED (select * from  foo_issue_1204_test ) select a,b,c, count(distinct d), count(distinct e), count(distinct f) from inp group by 1,2,3
+	UNION ALL
+	select a,b,c, count(distinct d), count(distinct e), count(distinct f) from foo_issue_1204_test group by 1,2,3
+	ORDER BY 1
+);
+ exists 
+--------
+ t
+(1 row)
+
+DROP TABLE foo_issue_1204_test;
diff --git a/src/test/regress/expected/with_clause_optimizer.out b/src/test/regress/expected/with_clause_optimizer.out
index 3fbea887ef7..b95ef3ac3a6 100644
--- a/src/test/regress/expected/with_clause_optimizer.out
+++ b/src/test/regress/expected/with_clause_optimizer.out
@@ -2364,3 +2364,53 @@ UNION ALL
  c      | 1
 (7 rows)
 
+-- Test issue from PR#1204
+-- Executor used to fail to execute this query
+CREATE TABLE foo_issue_1204_test (a INT, b INT, c INT, d INT, e INT, f INT);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+INSERT INTO foo_issue_1204_test SELECT generate_series(1,10000);
+ANALYZE foo_issue_1204_test;
+-- Assert than plan uses Merge Append strategy, and has Share Input Scan node.
+-- Also we are not actaully interested in output so discard it using SELECT EXISTS() hack
+EXPLAIN (COSTS OFF, TIMING OFF, BUFFERS OFF)
+SELECT EXISTS(
+	with inp as MATERIALIZED (select * from  foo_issue_1204_test ) select a,b,c, count(distinct d), count(distinct e), count(distinct f) from inp group by 1,2,3
+	UNION ALL
+	select a,b,c, count(distinct d), count(distinct e), count(distinct f) from foo_issue_1204_test group by 1,2,3
+	ORDER BY 1
+);
+                                                   QUERY PLAN                                                    
+-----------------------------------------------------------------------------------------------------------------
+ Result
+   InitPlan 1 (returns $0)  (slice1)
+     ->  Gather Motion 3:1  (slice2; segments: 3)
+           ->  Merge Append
+                 Sort Key: share0_ref1.a
+                 ->  GroupAggregate
+                       Group Key: share0_ref1.a, share0_ref1.b, share0_ref1.c
+                       ->  Sort
+                             Sort Key: share0_ref1.a, share0_ref1.b, share0_ref1.c
+                             ->  Shared Scan (share slice:id 2:0)
+                                   ->  Seq Scan on foo_issue_1204_test
+                 ->  GroupAggregate
+                       Group Key: foo_issue_1204_test_1.a, foo_issue_1204_test_1.b, foo_issue_1204_test_1.c
+                       ->  Sort
+                             Sort Key: foo_issue_1204_test_1.a, foo_issue_1204_test_1.b, foo_issue_1204_test_1.c
+                             ->  Seq Scan on foo_issue_1204_test foo_issue_1204_test_1
+ Optimizer: Postgres query optimizer
+(17 rows)
+
+-- Check execution is ok
+SELECT EXISTS(
+	with inp as MATERIALIZED (select * from  foo_issue_1204_test ) select a,b,c, count(distinct d), count(distinct e), count(distinct f) from inp group by 1,2,3
+	UNION ALL
+	select a,b,c, count(distinct d), count(distinct e), count(distinct f) from foo_issue_1204_test group by 1,2,3
+	ORDER BY 1
+);
+ exists 
+--------
+ t
+(1 row)
+
+DROP TABLE foo_issue_1204_test;
diff --git a/src/test/regress/expected/with_optimizer.out b/src/test/regress/expected/with_optimizer.out
index acd06e1f4ba..76404cfde44 100644
--- a/src/test/regress/expected/with_optimizer.out
+++ b/src/test/regress/expected/with_optimizer.out
@@ -3259,3 +3259,101 @@ select * from with_test;
 (1 row)
 
 drop table with_test;
+--
+-- writable CTE with SELECT INTO clause.
+--
+CREATE TABLE t_w_cte(a integer);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+EXPLAIN(COSTS OFF, VERBOSE) WITH ins AS (
+  INSERT INTO t_w_cte(a) VALUES (1), (2), (3)
+  RETURNING a
+)
+SELECT sum(a) INTO t_w_cte_1 FROM ins;
+ERROR:  writable CTE queries cannot be used with writable queries
+DETAIL:  Apache Cloudberry currently only support CTEs with one writable clause, called in a non-writable context.
+HINT:  Rewrite the query to only include one writable clause.
+DROP TABLE t_w_cte;
+CREATE TABLE t_w_cte_relp(a integer) distributed replicated;
+EXPLAIN(COSTS OFF, VERBOSE) WITH ins AS (
+  INSERT INTO t_w_cte_relp(a) VALUES (1), (2), (3)
+  RETURNING a
+)
+SELECT sum(a) INTO t_w_cte_relp_1 FROM ins;
+ERROR:  writable CTE queries cannot be used with writable queries
+DETAIL:  Apache Cloudberry currently only support CTEs with one writable clause, called in a non-writable context.
+HINT:  Rewrite the query to only include one writable clause.
+DROP TABLE t_w_cte_relp;
+--
+-- readable CTE with SELECT INTO clause.
+--
+WITH sel AS (
+  SELECT 1 as a
+)
+SELECT a INTO t_r_cte FROM sel;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_r_cte;
+ a 
+---
+ 1
+(1 row)
+
+DROP TABLE t_r_cte;
+--
+-- Multiple readable CTEs with SELECT INTO
+--
+WITH cte1 AS (SELECT 1 as a),
+     cte2 AS (SELECT 2 as b)
+SELECT a, b INTO t_multi_r_cte FROM cte1, cte2;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_multi_r_cte;
+ a | b 
+---+---
+ 1 | 2
+(1 row)
+
+DROP TABLE t_multi_r_cte;
+--
+-- Nested SELECT in CTE with SELECT INTO
+--
+WITH nested_cte AS (
+  SELECT * FROM (SELECT 100 as val, 'test'::text as name) subq
+)
+SELECT val, name INTO t_nested_r_cte FROM nested_cte;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_nested_r_cte;
+ val | name 
+-----+------
+ 100 | test
+(1 row)
+
+DROP TABLE t_nested_r_cte;
+--
+-- CTE with JOIN and SELECT INTO
+--
+WITH cte1 AS (SELECT 1 as id, 'foo' as val),
+     cte2 AS (SELECT 1 as id, 'bar' as val)
+SELECT cte1.id, cte1.val as val1, cte2.val as val2
+INTO t_join_r_cte
+FROM cte1 JOIN cte2 ON cte1.id = cte2.id;
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause. Creating a NULL policy entry.
+SELECT * FROM t_join_r_cte;
+ id | val1 | val2 
+----+------+------
+  1 | foo  | bar
+(1 row)
+
+DROP TABLE t_join_r_cte;
+--
+-- Verify mixed readable and writable CTEs blocked (negative test)
+--
+CREATE TABLE t_mixed_test (a int);
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table.
+HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
+WITH read_cte AS (SELECT 1 as x),
+     write_cte AS (INSERT INTO t_mixed_test VALUES (1) RETURNING *)
+SELECT x INTO t_should_fail2 FROM read_cte;  -- should fail
+ERROR:  writable CTE queries cannot be used with writable queries
+DETAIL:  Apache Cloudberry currently only support CTEs with one writable clause, called in a non-writable context.
+HINT:  Rewrite the query to only include one writable clause.
+DROP TABLE t_mixed_test;
diff --git a/src/test/regress/expected/write_parallel.out b/src/test/regress/expected/write_parallel.out
index 55c03f7eb3e..c204b514ecf 100644
--- a/src/test/regress/expected/write_parallel.out
+++ b/src/test/regress/expected/write_parallel.out
@@ -21,7 +21,7 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
    Group Key: (length((stringu1)::text))
    ->  Redistribute Motion 3:3  (slice1; segments: 3)
          Hash Key: (length((stringu1)::text))
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Group Key: length((stringu1)::text)
                ->  Seq Scan on tenk1
  Optimizer: Postgres query optimizer
@@ -42,7 +42,7 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
    Group Key: (length((stringu1)::text))
    ->  Redistribute Motion 3:3  (slice1; segments: 3)
          Hash Key: (length((stringu1)::text))
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Group Key: length((stringu1)::text)
                ->  Seq Scan on tenk1
  Optimizer: Postgres query optimizer
@@ -63,7 +63,7 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
    Group Key: (length((stringu1)::text))
    ->  Redistribute Motion 3:3  (slice1; segments: 3)
          Hash Key: (length((stringu1)::text))
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Group Key: length((stringu1)::text)
                ->  Seq Scan on tenk1
  Optimizer: Postgres query optimizer
@@ -89,7 +89,7 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
    Group Key: (length((stringu1)::text))
    ->  Redistribute Motion 3:3  (slice1; segments: 3)
          Hash Key: (length((stringu1)::text))
-         ->  HashAggregate
+         ->  Streaming HashAggregate
                Group Key: length((stringu1)::text)
                ->  Seq Scan on tenk1
  Optimizer: Postgres query optimizer
diff --git a/src/test/regress/greenplum_schedule b/src/test/regress/greenplum_schedule
index 09331d8d4a8..039e8d7e9c4 100755
--- a/src/test/regress/greenplum_schedule
+++ b/src/test/regress/greenplum_schedule
@@ -15,6 +15,16 @@
 #   hitting max_connections limit on segments.
 #
 
+# Run disk-intensive tests early when maximum disk space is available.
+# These tests consume significant disk space through WAL generation, XID consumption,
+# and autovacuum operations. Running them early helps avoid disk exhaustion issues.
+test: autovacuum
+test: autovacuum-segment
+test: autovacuum-template0-segment
+
+# check profile feature
+test: profile
+
 # test for builtin namespace pg_ext_aux
 test: pg_ext_aux
 
@@ -26,6 +36,8 @@ test: gp_dispatch_keepalives
 # copy form a file with different EOL
 test: copy_eol
 
+test: dedupset
+
 test: disable_autovacuum
 test: python_processed64bit
 test: enable_autovacuum
@@ -73,7 +85,7 @@ test: gp_dump_query_oids analyze gp_owner_permission incremental_analyze truncat
 test: indexjoin as_alias regex_gp gpparams with_clause transient_types gp_rules dispatch_encoding motion_gp gp_pullup_expr
 
 # interconnect tests
-test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity
+test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity icudp/queue_depth_combination_loss_advance
 
 # event triggers cannot run concurrently with any test that runs DDL
 test: event_trigger_gp
@@ -200,6 +212,9 @@ test: rpt rpt_joins rpt_tpch rpt_returning
 test: bfv_cte
 test: bfv_joins bfv_subquery bfv_planner bfv_legacy bfv_temp bfv_dml
 
+# test tpcds query 04
+test: tpcds_q04
+
 test: qp_olap_mdqa qp_misc gp_recursive_cte qp_dml_joins qp_skew qp_select partition_prune_opfamily gp_tsrf qp_join_union_all qp_join_universal qp_rowsecurity qp_query_params qp_full_join
 
 test: qp_misc_jiras qp_with_clause qp_executor qp_olap_windowerr qp_olap_window qp_derived_table qp_bitmapscan qp_dropped_cols
@@ -279,6 +294,9 @@ test: freeze_aux_tables
 # cbdb parallel test
 test: cbdb_parallel
 
+# window function parallel test
+test: window_parallel
+
 # These cannot run in parallel, because they check that VACUUM FULL shrinks table size.
 # A concurrent session could hold back the xid horizon and prevent old tuples from being
 # removed.
@@ -313,9 +331,6 @@ test: oid_wraparound
 # hence it should be run in isolation.
 test: fts_recovery_in_progress
 ignore: mirror_replay
-test: autovacuum
-test: autovacuum-segment
-test: autovacuum-template0-segment
 
 # gpexpand introduce the partial tables, check them if they can run correctly
 test: gangsize gang_reuse
@@ -326,9 +341,6 @@ test: run_utility_gpexpand_phase1
 # check correct error message when create extension error on segment
 test: create_extension_fail
 
-# check profile feature
-test: profile
-
 # check offload entry root slice to QE feature
 test: offload_entry_to_qe
 
@@ -372,8 +384,6 @@ test: dynamic_table
 # DML tests for AO/CO unique indexes.
 test: uao_dml/uao_dml_unique_index_delete_row uao_dml/uao_dml_unique_index_delete_column uao_dml/uao_dml_unique_index_update_row uao_dml/uao_dml_unique_index_update_column
 
-# test that distributing or hash partitioning by an enum field or expression is blocked
-test: enum_dist_part_ban
 
 # run pg_hba raleted testing
 test: hba_conf
diff --git a/src/test/regress/hooktest/hook_test.c b/src/test/regress/hooktest/hook_test.c
index bf0e6d5f5f0..d06d0fe1c44 100644
--- a/src/test/regress/hooktest/hook_test.c
+++ b/src/test/regress/hooktest/hook_test.c
@@ -15,7 +15,7 @@ PG_MODULE_MAGIC;
 
 static planner_hook_type prev_planner_hook = NULL;
 
-static PlannedStmt *test_planner_hook(Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams);
+static PlannedStmt *test_planner_hook(Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams, OptimizerOptions *optimizer_options);
 
 void		_PG_init(void);
 void		_PG_fini(void);
@@ -34,16 +34,16 @@ _PG_fini(void)
 }
 
 static PlannedStmt *
-test_planner_hook(Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams)
+test_planner_hook(Query *parse, const char *query_string, int cursorOptions, ParamListInfo boundParams, OptimizerOptions *optimizer_options)
 {
 	PlannedStmt *stmt;
 
 	elog(LOG, "In test_planner_hook");
 
 	if (prev_planner_hook)
-		stmt = (*prev_planner_hook) (parse, query_string, cursorOptions, boundParams);
+		stmt = (*prev_planner_hook) (parse, query_string, cursorOptions, boundParams, optimizer_options);
 	else
-		stmt = standard_planner(parse, query_string, cursorOptions, boundParams);
+		stmt = standard_planner(parse, query_string, cursorOptions, boundParams, optimizer_options);
 
 	return stmt;
 }
diff --git a/src/test/regress/icudp_schedule b/src/test/regress/icudp_schedule
index 6a2e3d44a3f..f0332edb7d3 100644
--- a/src/test/regress/icudp_schedule
+++ b/src/test/regress/icudp_schedule
@@ -4,7 +4,7 @@
 
 # Below cases are also in greenplum_schedule, but as they are fast enough
 # we duplicate them here to make this pipeline cover more on icudp.
-test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity icudp/icudp_regression
+test: icudp/gp_interconnect_queue_depth icudp/gp_interconnect_queue_depth_longtime icudp/gp_interconnect_snd_queue_depth icudp/gp_interconnect_snd_queue_depth_longtime icudp/gp_interconnect_min_retries_before_timeout icudp/gp_interconnect_transmit_timeout icudp/gp_interconnect_cache_future_packets icudp/gp_interconnect_default_rtt icudp/gp_interconnect_fc_method icudp/gp_interconnect_min_rto icudp/gp_interconnect_timer_checking_period icudp/gp_interconnect_timer_period icudp/queue_depth_combination_loss icudp/queue_depth_combination_capacity icudp/icudp_regression icudp/queue_depth_combination_loss_advance
 
 # Below case is very slow, do not add it in greenplum_schedule.
 test: icudp/icudp_full
diff --git a/src/test/regress/input/external_table.source b/src/test/regress/input/external_table.source
index 048da739097..5efa68919ac 100644
--- a/src/test/regress/input/external_table.source
+++ b/src/test/regress/input/external_table.source
@@ -1402,10 +1402,22 @@ SELECT COUNT(*) FROM gp_read_error_log('exttab_heap_join_1');
 \! rm @abs_srcdir@/data/tableless.csv
 
 -- start_ignore
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 -- end_ignore
 
--- Create external table with on clause
+-- Create external table on coordinator
+-- good, should fetch data from coordinator
+CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY  INTEGER ,
+                            N_NAME       CHAR(25) ,
+                            N_REGIONKEY  INTEGER ,
+                            N_COMMENT    VARCHAR(152))
+location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
+FORMAT 'text' (delimiter '|');
+SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+
+-- bad, should error
 CREATE EXTERNAL TABLE exttab_with_on_coordinator( i int, j text )
 LOCATION ('file://@hostname@@abs_srcdir@/data/exttab_few_errors.data') ON COORDINATOR FORMAT 'TEXT' (DELIMITER '|');
 
@@ -3688,3 +3700,6 @@ SELECT logerrors, options from pg_exttable a, pg_class b where a.reloid = b.oid
 DROP EXTERNAL TABLE ext_false;
 DROP EXTERNAL TABLE ext_true;
 DROP EXTERNAL TABLE ext_persistently;
+
+CREATE EXTERNAL WEB TEMP TABLE test_program_not_exist(content text) EXECUTE '/bin/bash /xx/seq 1 5' ON MASTER FORMAT 'TEXT';
+SELECT * FROM test_program_not_exist;
diff --git a/src/test/regress/input/temp_tablespaces.source b/src/test/regress/input/temp_tablespaces.source
index 1130658f9da..9fb0644ee9c 100644
--- a/src/test/regress/input/temp_tablespaces.source
+++ b/src/test/regress/input/temp_tablespaces.source
@@ -41,7 +41,7 @@ CREATE TABLE tts_foo (i int, j int) distributed by(i);
 insert into tts_foo select i, i from generate_series(1,80000)i;
 ANALYZE tts_foo;
 set gp_cte_sharing=on;
--- CBDB_PARALLEL_FIXME: since we disabled shared input scan in parallel mode, sisc_xslice_temp_files
+-- CBDB_PARALLEL_FIXME: since we disabled Share Input Scan in parallel mode, sisc_xslice_temp_files
 -- will never be triggered. We need set max_parallel_workers_per_gather to 0 in this case.
 set max_parallel_workers_per_gather = 0;
 
diff --git a/src/test/regress/mem_quota_util.py b/src/test/regress/mem_quota_util.py
index 6e38a380029..7d830530c24 100755
--- a/src/test/regress/mem_quota_util.py
+++ b/src/test/regress/mem_quota_util.py
@@ -17,7 +17,7 @@
     from multiprocessing import Process
     from gppylib.commands import unix
 except Exception as e:
-    sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e))
+    sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e))
 
 def parseargs( help=False ):
     parser = OptionParser()
diff --git a/src/test/regress/output/external_table.source b/src/test/regress/output/external_table.source
index c7c628e5c6b..c736f114737 100644
--- a/src/test/regress/output/external_table.source
+++ b/src/test/regress/output/external_table.source
@@ -2657,14 +2657,36 @@ SELECT COUNT(*) FROM gp_read_error_log('exttab_heap_join_1');
 
 \! rm @abs_srcdir@/data/tableless.csv
 -- start_ignore
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+NOTICE:  table "ext_nation_on_coordinator" does not exist, skipping
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 NOTICE:  table "exttab_with_on_coordinator" does not exist, skipping
 -- end_ignore
--- Create external table with on clause
+-- Create external table on coordinator
+-- good, should fetch data from coordinator
+CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY  INTEGER ,
+                            N_NAME       CHAR(25) ,
+                            N_REGIONKEY  INTEGER ,
+                            N_COMMENT    VARCHAR(152))
+location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
+FORMAT 'text' (delimiter '|');
+SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
+ gp_segment_id | n_nationkey |          n_name           | n_regionkey |                                                   n_comment                                                    
+---------------+-------------+---------------------------+-------------+----------------------------------------------------------------------------------------------------------------
+            -1 |          24 | UNITED STATES             |           1 | y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
+            -1 |          23 | UNITED KINGDOM            |           3 | eans boost carefully special requests. accounts are. carefull
+            -1 |          22 | RUSSIA                    |           3 |  requests against the platelets use never according to the quickly regular pint
+            -1 |          21 | VIETNAM                   |           2 | hely enticingly express accounts. even, final 
+            -1 |          20 | SAUDI ARABIA              |           4 | ts. silent requests haggle. closely express packages sleep across the blithely
+(5 rows)
+
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+-- bad, should error
 CREATE EXTERNAL TABLE exttab_with_on_coordinator( i int, j text )
 LOCATION ('file://@hostname@@abs_srcdir@/data/exttab_few_errors.data') ON COORDINATOR FORMAT 'TEXT' (DELIMITER '|');
 SELECT * FROM exttab_with_on_coordinator;
-ERROR:  'ON COORDINATOR' is not supported by this protocol yet
+ERROR:  invalid input syntax for type integer: "error_0"
+CONTEXT:  External table exttab_with_on_coordinator, line 3 of file://@hostname@@abs_srcdir@/data/exttab_few_errors.data, column i
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 -- start_ignore
 DROP EXTERNAL TABLE IF EXISTS exttab_with_option_empty;
@@ -5030,3 +5052,7 @@ SELECT logerrors, options from pg_exttable a, pg_class b where a.reloid = b.oid
 DROP EXTERNAL TABLE ext_false;
 DROP EXTERNAL TABLE ext_true;
 DROP EXTERNAL TABLE ext_persistently;
+CREATE EXTERNAL WEB TEMP TABLE test_program_not_exist(content text) EXECUTE '/bin/bash /xx/seq 1 5' ON MASTER FORMAT 'TEXT';
+SELECT * FROM test_program_not_exist;
+DETAIL:  Command: execute:/bin/bash /xx/seq 1 5
+ERROR:  external table test_program_not_exist command ended with error. /bin/bash: /xx/seq: No such file or directory
diff --git a/src/test/regress/output/external_table_optimizer.source b/src/test/regress/output/external_table_optimizer.source
index b5af22445d1..ad887b53d5c 100644
--- a/src/test/regress/output/external_table_optimizer.source
+++ b/src/test/regress/output/external_table_optimizer.source
@@ -2657,14 +2657,36 @@ SELECT COUNT(*) FROM gp_read_error_log('exttab_heap_join_1');
 
 \! rm @abs_srcdir@/data/tableless.csv
 -- start_ignore
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+NOTICE:  table "ext_nation_on_coordinator" does not exist, skipping
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 NOTICE:  table "exttab_with_on_coordinator" does not exist, skipping
 -- end_ignore
--- Create external table with on clause
+-- Create external table on coordinator
+-- good, should fetch data from coordinator
+CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY  INTEGER ,
+                            N_NAME       CHAR(25) ,
+                            N_REGIONKEY  INTEGER ,
+                            N_COMMENT    VARCHAR(152))
+location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
+FORMAT 'text' (delimiter '|');
+SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
+ gp_segment_id | n_nationkey |          n_name           | n_regionkey |                                                   n_comment                                                    
+---------------+-------------+---------------------------+-------------+----------------------------------------------------------------------------------------------------------------
+            -1 |          24 | UNITED STATES             |           1 | y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
+            -1 |          23 | UNITED KINGDOM            |           3 | eans boost carefully special requests. accounts are. carefull
+            -1 |          22 | RUSSIA                    |           3 |  requests against the platelets use never according to the quickly regular pint
+            -1 |          21 | VIETNAM                   |           2 | hely enticingly express accounts. even, final 
+            -1 |          20 | SAUDI ARABIA              |           4 | ts. silent requests haggle. closely express packages sleep across the blithely
+(5 rows)
+
+DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;
+-- bad, should error
 CREATE EXTERNAL TABLE exttab_with_on_coordinator( i int, j text )
 LOCATION ('file://@hostname@@abs_srcdir@/data/exttab_few_errors.data') ON COORDINATOR FORMAT 'TEXT' (DELIMITER '|');
 SELECT * FROM exttab_with_on_coordinator;
-ERROR:  'ON COORDINATOR' is not supported by this protocol yet
+ERROR:  invalid input syntax for type integer: "error_0"
+CONTEXT:  External table exttab_with_on_coordinator, line 3 of file://@hostname@@abs_srcdir@/data/exttab_few_errors.data, column i
 DROP EXTERNAL TABLE IF EXISTS exttab_with_on_coordinator;
 -- start_ignore
 DROP EXTERNAL TABLE IF EXISTS exttab_with_option_empty;
@@ -5032,3 +5054,7 @@ SELECT logerrors, options from pg_exttable a, pg_class b where a.reloid = b.oid
 DROP EXTERNAL TABLE ext_false;
 DROP EXTERNAL TABLE ext_true;
 DROP EXTERNAL TABLE ext_persistently;
+CREATE EXTERNAL WEB TEMP TABLE test_program_not_exist(content text) EXECUTE '/bin/bash /xx/seq 1 5' ON MASTER FORMAT 'TEXT';
+SELECT * FROM test_program_not_exist;
+DETAIL:  Command: execute:/bin/bash /xx/seq 1 5
+ERROR:  external table test_program_not_exist command ended with error. /bin/bash: /xx/seq: No such file or directory
diff --git a/src/test/regress/output/temp_tablespaces.source b/src/test/regress/output/temp_tablespaces.source
index 8fe01bff02a..45ae696b58c 100644
--- a/src/test/regress/output/temp_tablespaces.source
+++ b/src/test/regress/output/temp_tablespaces.source
@@ -52,7 +52,7 @@ CREATE TABLE tts_foo (i int, j int) distributed by(i);
 insert into tts_foo select i, i from generate_series(1,80000)i;
 ANALYZE tts_foo;
 set gp_cte_sharing=on;
--- CBDB_PARALLEL_FIXME: since we disabled shared input scan in parallel mode, sisc_xslice_temp_files
+-- CBDB_PARALLEL_FIXME: since we disabled Share Input Scan in parallel mode, sisc_xslice_temp_files
 -- will never be triggered. We need set max_parallel_workers_per_gather to 0 in this case.
 set max_parallel_workers_per_gather = 0;
 -- CASE 1: when temp_tablespaces is set, hashagg and share-input-scan
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index 97274fdf8ba..e2df0208627 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -158,7 +158,7 @@ test: json jsonb json_encoding jsonpath jsonpath_encoding jsonb_jsonpath
 # NB: temp.sql does a reconnect which transiently uses 2 connections,
 # so keep this parallel group to at most 19 tests
 # ----------
-test: plancache limit plpgsql copy2 temp domain rangefuncs prepare conversion truncate alter_table sequence polymorphism rowtypes returning with xml
+test: plancache limit plpgsql copy2 temp domain rangefuncs prepare conversion truncate alter_table sequence polymorphism rowtypes returning with xml cte_prune
 # large objects are not supported by GPDB
 # test: largeobject
 
@@ -169,6 +169,11 @@ test: gp_foreign_data
 # ----------
 test: partition_join partition_prune reloptions hash_part indexing partition_aggregate partition_info tuplesort explain compression memoize
 
+# tese the partition table with append
+test: partition_append_setup
+test: partition_append partition_prune_append partition_prune_opfamily_append partition_pruning_append
+test: partition_append_teardown
+
 # event triggers cannot run concurrently with any test that runs DDL
 # oidjoins is read-only, though, and should run late for best coverage
 test: event_trigger oidjoins
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3b9e91136d4..9320cf0aeec 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -3615,9 +3615,20 @@ cluster_healthy(void)
 		return false;
 	}
 
+	char *p;
+	/* skip if the instance is hot standby */
+	psql_command_output("postgres", line, sizeof(line),
+			"SELECT pg_is_in_recovery();");
+	p = &line[0];
+	while (*p == ' ')
+		p++;
+	if (*p == 't')
+	{
+		return !halt_work;
+	}
+
 	i = 120;
 	do {
-		char *p;
 		/* check for the health for standby coordinator */
 		psql_command_output("postgres", line, sizeof(line),
 							"SELECT sync_state FROM pg_stat_get_wal_senders();");
diff --git a/src/test/regress/sql/AOCO_Compression.sql b/src/test/regress/sql/AOCO_Compression.sql
index fe7ac125103..9bc25350de0 100644
--- a/src/test/regress/sql/AOCO_Compression.sql
+++ b/src/test/regress/sql/AOCO_Compression.sql
@@ -381,7 +381,7 @@ CREATE TABLE co_cr_sub_partzlib8192_1
  COLUMN a1 encoding (compresstype = zlib),
  COLUMN a5 ENCODING (compresstype=zlib,compresslevel=1, blocksize=8192),
  DEFAULT COLUMN ENCODING (compresstype=zlib,compresslevel=1,blocksize=8192)) (start(1) end(5000) every(1000));
-
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_cr_sub_partzlib8192_1'::regclass;
 -- 
 -- Create Indexes
 --
@@ -400,6 +400,7 @@ ANALYZE co_cr_sub_partzlib8192_1;
 --Create Uncompressed table of same schema definition
 
 CREATE TABLE co_cr_sub_partzlib8192_1_uncompr(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int) WITH (appendonly=true, orientation=column) distributed randomly Partition by range(a1) Subpartition by list(a2) subpartition template ( subpartition sp1 values('M') , subpartition sp2 values('F') ) (start(1)  end(5000) every(1000)) ;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_cr_sub_partzlib8192_1_uncompr'::regclass;
 
 --
 -- Insert to uncompressed table
@@ -531,6 +532,7 @@ CREATE TABLE co_cr_sub_partzlib8192_1_2
  COLUMN a1 encoding (compresstype = zlib),
  COLUMN a5 ENCODING (compresstype=zlib,compresslevel=1, blocksize=8192),
  DEFAULT COLUMN ENCODING (compresstype=zlib,compresslevel=1,blocksize=8192)) (partition p1 values('F'), partition p2 values ('M'));
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_cr_sub_partzlib8192_1_2'::regclass;
 
 -- 
 -- Create Indexes
@@ -681,6 +683,7 @@ CREATE TABLE co_wt_sub_partrle_type8192_1
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=column) distributed randomly  Partition by range(a1) Subpartition by list(a2) subpartition template ( default subpartition df_sp, subpartition sp1 values('M') , subpartition sp2 values('F')  
  WITH (appendonly=true, orientation=column,compresstype=rle_type,compresslevel=1,blocksize=8192)) (start(1)  end(5000) every(1000) );
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_wt_sub_partrle_type8192_1'::regclass;
 
 -- 
 -- Create Indexes
@@ -702,6 +705,7 @@ ANALYZE co_wt_sub_partrle_type8192_1;
 --Create Uncompressed table of same schema definition
 
 CREATE TABLE co_wt_sub_partrle_type8192_1_uncompr(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int) WITH (appendonly=true, orientation=column) distributed randomly Partition by range(a1) Subpartition by list(a2) subpartition template ( subpartition sp1 values('M') , subpartition sp2 values('F') ) (start(1)  end(5000) every(1000)) ;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_wt_sub_partrle_type8192_1_uncompr'::regclass;
 
 --
 -- Insert to uncompressed table
@@ -829,6 +833,7 @@ CREATE TABLE co_wt_sub_partrle_type8192_1_2
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=column) distributed randomly  Partition by list(a2) Subpartition by range(a1) subpartition template (default subpartition df_sp, start(1)  end(5000) every(1000) 
  WITH (appendonly=true, orientation=column,compresstype=rle_type,compresslevel=1,blocksize=8192)) (partition p1 values ('M'), partition p2 values ('F'));
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'co_wt_sub_partrle_type8192_1_2'::regclass;
 
 -- 
 -- Create Indexes
@@ -981,6 +986,7 @@ CREATE TABLE ao_wt_sub_partzlib8192_5
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=row) distributed randomly  Partition by range(a1) Subpartition by list(a2) subpartition template ( default subpartition df_sp, subpartition sp1 values('M') , subpartition sp2 values('F')  
  WITH (appendonly=true, orientation=row,compresstype=zlib,compresslevel=5,blocksize=8192)) (start(1)  end(5000) every(1000) );
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ao_wt_sub_partzlib8192_5'::regclass;
 
 -- 
 -- Create Indexes
@@ -1128,6 +1134,7 @@ CREATE TABLE ao_wt_sub_partzlib8192_5_2
 	(id SERIAL,a1 int,a2 char(5),a3 numeric,a4 boolean DEFAULT false ,a5 char DEFAULT 'd',a6 text,a7 timestamp,a8 character varying(705),a9 bigint,a10 date,a11 varchar(600),a12 text,a13 decimal,a14 real,a15 bigint,a16 int4 ,a17 bytea,a18 timestamp with time zone,a19 timetz,a20 path,a21 box,a22 macaddr,a23 interval,a24 character varying(800),a25 lseg,a26 point,a27 double precision,a28 circle,a29 int4,a30 numeric(8),a31 polygon,a32 date,a33 real,a34 money,a35 cidr,a36 inet,a37 time,a38 text,a39 bit,a40 bit varying(5),a41 smallint,a42 int )
  WITH (appendonly=true, orientation=row) distributed randomly  Partition by list(a2) Subpartition by range(a1) subpartition template (default subpartition df_sp, start(1)  end(5000) every(1000) 
  WITH (appendonly=true, orientation=row,compresstype=zlib,compresslevel=5,blocksize=8192)) (partition p1 values ('M'), partition p2 values ('F'));
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ao_wt_sub_partzlib8192_5_2'::regclass;
 
 -- 
 -- Create Indexes
diff --git a/src/test/regress/sql/agg_pushdown.sql b/src/test/regress/sql/agg_pushdown.sql
index 3378f8b64e6..3bdf1bd7571 100644
--- a/src/test/regress/sql/agg_pushdown.sql
+++ b/src/test/regress/sql/agg_pushdown.sql
@@ -1,28 +1,24 @@
--- disable ORCA
-SET optimizer TO off;
-
 -- Test case group 1: basic functions
 CREATE TABLE agg_pushdown_parent (
-	i int primary key,
-	x int);
+    i int,
+    x int);
 
 CREATE TABLE agg_pushdown_child1 (
-	j int,
-	parent int,
-	v double precision,
-	PRIMARY KEY (j, parent));
-
-CREATE INDEX ON agg_pushdown_child1(parent);
+    j int,
+    parent int,
+    v double precision
+    )
+    DISTRIBUTED BY (j, parent);
 
 CREATE TABLE agg_pushdown_child2 (
-	k int,
-	parent int,
-	v double precision,
-	PRIMARY KEY (k, parent));;
+    k int,
+    parent int,
+    v double precision)
+    DISTRIBUTED BY (k, parent);
 
 INSERT INTO agg_pushdown_parent(i, x)
 SELECT n, n
-FROM generate_series(0, 7) AS s(n);
+FROM generate_series(0, 10) AS s(n);
 
 INSERT INTO agg_pushdown_child1(j, parent, v)
 SELECT 128 * i + n, i, random()
@@ -36,29 +32,12 @@ ANALYZE agg_pushdown_parent;
 ANALYZE agg_pushdown_child1;
 ANALYZE agg_pushdown_child2;
 
-SET enable_nestloop TO on;
-SET enable_hashjoin TO off;
-SET enable_mergejoin TO off;
-
 -- Perform scan of a table, aggregate the result, join it to the other table
 -- and finalize the aggregation.
---
--- In addition, check that functionally dependent column "p.x" can be
--- referenced by SELECT although GROUP BY references "p.i".
-SET gp_enable_agg_pushdown TO off;
-EXPLAIN (VERBOSE on, COSTS off)
-SELECT p.x, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
-AS c1 ON c1.parent = p.i GROUP BY p.i;
-
-SET gp_enable_agg_pushdown TO on;
-EXPLAIN (VERBOSE on, COSTS off)
-SELECT p.x, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
-AS c1 ON c1.parent = p.i GROUP BY p.i;
-
--- The same for hash join.
+SET enable_mergejoin TO off;
 SET enable_nestloop TO off;
 SET enable_hashjoin TO on;
-
+SET gp_enable_agg_pushdown TO on;
 EXPLAIN (VERBOSE on, COSTS off)
 SELECT p.i, avg(c1.v) FROM agg_pushdown_parent AS p JOIN agg_pushdown_child1
 AS c1 ON c1.parent = p.i GROUP BY p.i;
@@ -160,6 +139,7 @@ SET enable_hashjoin TO on;
 SET enable_mergejoin TO off;
 
 SET gp_enable_agg_pushdown TO ON;
+SET optimizer_force_multistage_agg to ON;
 
 -- Join key and group key are the same.
 EXPLAIN (VERBOSE on, COSTS off)
@@ -235,7 +215,7 @@ DROP TABLE part, lineitem;
 -- Test case group 4: construct grouped join rel from 2 plain rels
 DROP TABLE IF EXISTS vendor_pd, customer_pd, nation_pd;
 CREATE TABLE vendor_pd (v_id int, v_name VARCHAR(20)) WITH (APPENDONLY=true, ORIENTATION=column);
-CREATE TABLE customer_pd (c_id int primary key, c_v_id int, c_n_id int, c_type int, c_consumption int);
+CREATE TABLE customer_pd (c_id int, c_v_id int, c_n_id int, c_type int, c_consumption int);
 CREATE TABLE nation_pd (n_id int, n_name VARCHAR(20), n_type int, n_population int) WITH (APPENDONLY=true, ORIENTATION=column);
 
 INSERT INTO nation_pd SELECT i, 'abc', 1, 1 from generate_series(1, 100) s(i);
@@ -316,11 +296,9 @@ SELECT t1.c, sum(t1.a)
 DROP TABLE pagg_pd;
 
 CREATE TABLE pagg_pd_p (a int, b int);
-CREATE TABLE pagg_pd (c text, d int) inherits (pagg_pd_p) PARTITION BY LIST(c);
 
 DROP TABLE IF EXISTS pagg_pd, pagg_pd_p;
 CREATE TABLE pagg_pd_p (a int, b int, c text) PARTITION BY LIST(c);
-CREATE TABLE pagg_pd (d int) inherits (pagg_pd_p);
 
 DROP TABLE IF EXISTS pagg_pd, pagg_pd_p;
 CREATE TABLE pagg_pd_p (a int, b int);
@@ -343,8 +321,7 @@ DROP TABLE pagg_pd, pagg_pd_p;
 RESET enable_incremental_sort;
 
 -- Clear settings
-SET optimizer TO default;
-
+RESET optimizer_force_multistage_agg;
 SET gp_enable_agg_pushdown TO off;
 
 SET enable_seqscan TO on;
diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index e376c0681d9..a96b976fdcd 100644
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -1446,4 +1446,108 @@ drop table agg_hash_4;
 
 -- GitHub issue https://github.com/greenplum-db/gpdb/issues/12061
 -- numsegments of the general locus should be -1 on create_minmaxagg_path
+set enable_indexscan = off;
+set enable_indexonlyscan = off;
 explain analyze select count(*) from pg_class, (select count(*) > 0 from (select count(*) from pg_class where relnatts > 8) x) y;
+reset enable_indexscan;
+reset enable_indexonlyscan;
+
+-- test aggno
+create table tgb1(v1 int, v2 int, v3 int);
+create table tgb2(v1 int, v2 int, v3 int);
+
+insert into tgb1 values(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3);
+insert into tgb2 values(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3),(1,2,3);
+
+set debug_print_aggref_in_explain to on;
+
+explain select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+
+select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+
+set optimizer_force_multistage_agg to on;
+explain select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+
+select
+  sum(tgb1.v3 * tgb2.v3) 
+from 
+  tgb1,tgb2 
+where 
+  tgb1.v1 = tgb2.v1 group by tgb2.v2 
+having sum(tgb1.v3 * tgb2.v3) > 100 and
+  sum(tgb1.v3 * tgb2.v3) > 101 and 
+  sum(tgb1.v3 * tgb2.v3) < 1020 and
+  sum(tgb1.v3 * tgb2.v3) != 103 and
+  sum(tgb1.v3 * tgb2.v3) >= 104 and
+  avg(tgb1.v3 * tgb2.v3) != 11 and
+  avg(tgb1.v3 * tgb2.v3) != 12 and
+  avg(tgb2.v1 * tgb1.v1) != 13 and
+  sum(tgb1.v3) > 200;
+
+reset debug_print_aggref_in_explain;
+reset optimizer_force_multistage_agg;
+
+-- test the optimizer_agg_pds_strategy
+DROP TABLE IF EXISTS pds_t1;
+create table pds_t1(v1 int, v2 text, v3 int, v4 text, v5 int, v6 text) DISTRIBUTED BY (v1);
+
+set optimizer_agg_pds_strategy to 0;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+set optimizer_agg_pds_strategy to 1;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+set optimizer_agg_pds_strategy to 2;
+explain (costs off) select v2,v3 from pds_t1 group by v2,v3;
+set optimizer_agg_pds_strategy to 3;
+explain (costs off) select v2,v3,v4,v5,v6 from pds_t1 group by v2,v3,v4,v5,v6;
+
+-- We can't dedup the "Redistribute Motion", cause in this step we can't know the 
+-- distribution of output column which from the underlying operators.
+-- So you need to be cautious when opening this guc.
+set optimizer_agg_pds_strategy to 1;
+explain (costs off) select v1,v2,v3 from pds_t1 group by v3,v2,v1;
+set optimizer_agg_pds_strategy to 0;
+explain (costs off) select v1,v2,v3 from pds_t1 group by v3,v2,v1;
+
+reset optimizer_agg_pds_strategy;
\ No newline at end of file
diff --git a/src/test/regress/sql/aqumv.sql b/src/test/regress/sql/aqumv.sql
index 87fe401c2ab..35690d220e8 100644
--- a/src/test/regress/sql/aqumv.sql
+++ b/src/test/regress/sql/aqumv.sql
@@ -874,6 +874,106 @@ insert into t_insert select count(a) from t_select;
 select * from t_insert;
 abort;
 
+-- Test view has Group By
+begin;
+create table t0 as select i as a, i+1 as b , i+2 as c, i+3 as d from generate_series(1, 5) i;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+insert into t0 select * from t0;
+analyze t0;
+create materialized view mv_group_0 as select c, b, sum(a), count(b) from t0 group by b, c;
+create materialized view mv_group_1 as select c, b, count(b) from t0 where a > 3 group by c, b;
+analyze mv_group_0;
+analyze mv_group_1;
+
+-- no qual, exactly match
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select c, b, sum(a), count(b) from t0 group by b, c;
+select c, b, sum(a), count(b) from t0 group by b, c;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select c, b, sum(a), count(b) from t0 group by b, c;
+select c, b, sum(a), count(b) from t0 group by b, c;
+
+-- no qual, different order
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select b, sum(a), c, count(b) from t0 group by c, b;
+select b, sum(a), c, count(b) from t0 group by c, b;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select b, sum(a), c, count(b) from t0 group by c, b;
+select b, sum(a), c, count(b) from t0 group by c, b;
+
+-- no qual, different expr
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+select b + c + 1, sum(a) + count(b) from t0 group by c, b;
+
+-- no qual, should not match 
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select c, count(b) from t0 group by c ;
+select c, count(b) from t0 group by c ;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select c, count(b) from t0 group by c ;
+select c, count(b) from t0 group by c ;
+
+-- with qual, exactly match
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select c, b, count(b) from t0 where a > 3 group by c, b;
+select c, b, count(b) from t0 where a > 3 group by c, b;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select c, b, count(b) from t0 where a > 3 group by c, b;
+select c, b, count(b) from t0 where a > 3 group by c, b;
+
+-- with qual, different order
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select count(b), b, c from t0 where a > 3 group by b, c;
+select count(b), b, c from t0 where a > 3 group by b, c;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select count(b), b, c from t0 where a > 3 group by b, c;
+select count(b), b, c from t0 where a > 3 group by b, c;
+
+-- with qual, different expr
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+select count(b) + 1, b + 1, c from t0 where a > 3 group by b, c;
+
+-- with qual, should not match
+set local enable_answer_query_using_materialized_views = off;
+explain(costs off, verbose)
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+set local enable_answer_query_using_materialized_views = on;
+explain(costs off, verbose)
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+select b, c, count(b) from t0 where a > 3 and b > 1 group by b, c;
+
+abort;
+
 reset optimizer;
 reset enable_answer_query_using_materialized_views;
 -- start_ignore
diff --git a/src/test/regress/sql/bfv_joins.sql b/src/test/regress/sql/bfv_joins.sql
index edc39f58a7d..59208087808 100644
--- a/src/test/regress/sql/bfv_joins.sql
+++ b/src/test/regress/sql/bfv_joins.sql
@@ -604,6 +604,45 @@ ANALYZE ext_stats_tbl;
 
 explain SELECT 1 FROM ext_stats_tbl t11 FULL JOIN ext_stats_tbl t12 ON t12.c2;
 
+-- Check that Postgres Planner can build a plan with 20 joins in reasonable time
+do $$
+begin 
+  for i in 1..20 loop
+    execute 'create table tj' ||  i ||  '(id int)';
+  end loop; 
+end
+$$;
+
+set optimizer to off;
+
+select trunc(extract(epoch from now())) unix_time1 \gset
+
+select *
+from tj1 
+  join tj2 on tj1.id = tj2.id
+  join tj3 on tj2.id = tj3.id
+  join tj4 on tj3.id = tj4.id
+  join tj5 on tj4.id = tj5.id
+  join tj6 on tj5.id = tj6.id
+  join tj7 on tj6.id = tj7.id
+  join tj8 on tj7.id = tj8.id
+  join tj9 on tj8.id = tj9.id
+  join tj10 on tj9.id = tj10.id
+  join tj11 on tj10.id = tj11.id
+  join tj12 on tj11.id = tj12.id
+  join tj13 on tj12.id = tj13.id
+  join tj14 on tj13.id = tj14.id
+  join tj15 on tj14.id = tj15.id
+  join tj16 on tj15.id = tj16.id
+  join tj17 on tj16.id = tj17.id
+  join tj18 on tj17.id = tj18.id
+  join tj19 on tj18.id = tj19.id
+  join tj20 on tj19.id = tj20.id;
+
+select (trunc(extract(epoch from now())) - :unix_time1) < 100 is_ok;
+
+reset optimizer;
+
 -- Clean up. None of the objects we create are very interesting to keep around.
 reset search_path;
 set client_min_messages='warning';
diff --git a/src/test/regress/sql/bfv_partition.sql b/src/test/regress/sql/bfv_partition.sql
index bf705af1285..cc2b8989f43 100644
--- a/src/test/regress/sql/bfv_partition.sql
+++ b/src/test/regress/sql/bfv_partition.sql
@@ -1207,13 +1207,13 @@ ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE (|);
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE (~);
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE (`);
 
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 
 set client_min_messages='warning';
 drop schema qa147 cascade;
 reset client_min_messages;
 
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
 
 -- Mix-Match for Alter subpartition template
 CREATE TABLE qa147sales (trans_id int, date date, amount 
@@ -1231,29 +1231,29 @@ SUBPARTITION TEMPLATE
 
 -- Clear TEMPLATE
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- Invalid subpartition
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2008-02-01') EXCLUSIVE );
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2009-01-01') EXCLUSIVE EVERY (INTERVAL '1 month') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( 
 SUBPARTITION usa1 VALUES('usa'),
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE);
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( 
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE,
 SUBPARTITION usa1 VALUES('usa'));
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 
 drop table qa147sales;
 
@@ -1273,33 +1273,33 @@ SUBPARTITION TEMPLATE
 
 -- Clear TEMPLATE
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2008-02-01') EXCLUSIVE );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2009-01-01') EXCLUSIVE EVERY (INTERVAL '1 month') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- Invalid subpartition template
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 (
 SUBPARTITION usa1 VALUES('usa'),
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE);
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147sales SET SUBPARTITION TEMPLATE
 ( 
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE,
 SUBPARTITION usa1 VALUES('usa'));
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147sales'::regclass;
 
 drop table qa147sales;
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
 
 -- Now with Schema
 -- Mix-Match for Alter subpartition template in a schema
@@ -1319,32 +1319,32 @@ SUBPARTITION TEMPLATE
 
 -- Clear TEMPLATE
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- Invalid subpartition
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2008-02-01') EXCLUSIVE );
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2009-01-01') EXCLUSIVE EVERY (INTERVAL '1 month') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 (
 SUBPARTITION usa1 VALUES('usa'),
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE);
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 (
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE,
 SUBPARTITION usa1 VALUES('usa'));
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 
 DROP SCHEMA qa147 cascade;
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
 
 CREATE SCHEMA qa147;
 CREATE TABLE qa147.sales (trans_id int, date date, amount
@@ -1363,33 +1363,33 @@ SUBPARTITION TEMPLATE
 
 -- Clear TEMPLATE
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE ();
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- This will overwrite previous subpartition template
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2008-02-01') EXCLUSIVE );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usam1 start (date '2008-01-01') INCLUSIVE END (date '2009-01-01') EXCLUSIVE EVERY (INTERVAL '1 month') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- Invalid subpartition template
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 ( SUBPARTITION usa VALUES ('usa'), SUBPARTITION asia VALUES ('asia') );
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 (
 SUBPARTITION usa1 VALUES('usa'),
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE);
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 -- Mix and Match RANGE/LIST . Expect to Error
 ALTER TABLE qa147.sales SET SUBPARTITION TEMPLATE
 (
 SUBPARTITION usadate start (date '2008-01-01') INCLUSIVE END(date '2009-01-01') EXCLUSIVE,
 SUBPARTITION usa1 VALUES('usa'));
-select relid::regclass, level, template from gp_partition_template where relid = 'qa147.sales'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'qa147.sales'::regclass;
 
 drop schema qa147 cascade;
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
 set gp_autostats_mode=on_change;
 set gp_autostats_on_change_threshold=100;
 
@@ -1474,7 +1474,7 @@ alter table partsupp_def set subpartition template( subpartition aaa start(400)
 -- Note 2: We do not support this function yet, but if we are able to split default partition with default subpartition, would we
 -- be using the subpartition template to definte the "new" partition or the existing one.
 
-select relid::regclass, level, template from gp_partition_template where relid = 'partsupp_def'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'partsupp_def'::regclass;
 
 alter table partsup_def add partition f1 start(0) end (300) every(100);
 
@@ -1494,7 +1494,7 @@ subpartition template
 alter table partsupp_def2 set subpartition template();
 alter table partsupp_def2 set subpartition template( subpartition aaa start(400) end (600) every(100) );
 
-select relid::regclass, level, template from gp_partition_template where relid = 'partsupp_def2'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'partsupp_def2'::regclass;
 
 drop table partsupp_def;
 drop table partsupp_def2;
@@ -1618,7 +1618,7 @@ drop table partition_cleanup1;
 drop schema partition_999 cascade;
 
 -- These should be empty
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
 
 
 --
diff --git a/src/test/regress/sql/bfv_planner.sql b/src/test/regress/sql/bfv_planner.sql
index 114813641d1..c68c73ab5f6 100644
--- a/src/test/regress/sql/bfv_planner.sql
+++ b/src/test/regress/sql/bfv_planner.sql
@@ -345,6 +345,9 @@ select count(*) from gp_dist_random('t_rep4');
 select count(distinct nextval) from gp_dist_random('t_rep4');
 drop table rep_tbl, t_rep4;
 
+create table t_issue_1218_random(id int) distributed randomly;
+create table t_issue_1218_replicated as select random() from t_issue_1218_random distributed replicated;
+
 --
 -- Test append different numsegments tables work well
 -- See Github issue: https://github.com/greenplum-db/gpdb/issues/12146
diff --git a/src/test/regress/sql/cbdb_parallel.sql b/src/test/regress/sql/cbdb_parallel.sql
index b3fab79dd09..f9d01dd8a00 100644
--- a/src/test/regress/sql/cbdb_parallel.sql
+++ b/src/test/regress/sql/cbdb_parallel.sql
@@ -619,7 +619,7 @@ explain (locus, costs off) select * from rt1 union all select * from rt2;
 explain (locus, costs off) select * from rt1 union all select * from t1;
 -- SegmentGeneralWorkers (Converted to Strewn, Limited on One Segment) + Hashed = Strewn
 explain (locus, costs off) select * from rt1 union all select * from t2;
--- SingleQE as subquery seems cannot produce partial_pathlist and don't have chance to parallel append.
+-- partial subpath under UNION ALL
 explain (locus, costs off) select a from rt1 union all select count(*) as a from sq1;
 -- SegmentGeneralWorkers + General = SegmentGeneralWorkers
 explain (locus, costs off) select a from rt1 union all select a from generate_series(1, 1000) a;
@@ -986,6 +986,169 @@ select t1_anti.a, t1_anti.b from t1_anti left join t2_anti on t1_anti.a = t2_ant
 select t1_anti.a, t1_anti.b from t1_anti left join t2_anti on t1_anti.a = t2_anti.a where t2_anti.a is null;
 abort;
 
+--
+-- Test Parallel DISTINCT
+--
+drop table if exists t_distinct_0;
+create table t_distinct_0(a int, b int) using ao_column distributed randomly;
+insert into t_distinct_0 select i, i+1 from generate_series(1, 1000) i;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+insert into t_distinct_0 select * from t_distinct_0;
+analyze t_distinct_0;
+explain(costs off)
+select distinct a from t_distinct_0;
+set enable_parallel = on;
+-- first stage HashAgg, second stage GroupAgg
+explain(costs off)
+select distinct a from t_distinct_0;
+set parallel_query_use_streaming_hashagg = off;
+explain(costs off)
+select distinct a from t_distinct_0;
+-- GroupAgg
+set enable_hashagg = off;
+explain(costs off)
+select distinct a from t_distinct_0;
+-- HashAgg
+set enable_hashagg = on;
+set enable_groupagg = off;
+explain(costs off)
+select distinct a from t_distinct_0;
+set parallel_query_use_streaming_hashagg = on;
+explain(costs off)
+select distinct a from t_distinct_0;
+-- multi DISTINCT tlist
+explain(costs off)
+select distinct a, b from t_distinct_0;
+
+-- DISTINCT on distribution key 
+drop table if exists t_distinct_1;
+create table t_distinct_1(a int, b int) using ao_column;
+insert into t_distinct_1 select * from t_distinct_0;
+analyze t_distinct_1;
+set enable_parallel = off;
+explain(costs off)
+select distinct a from t_distinct_1;
+set enable_parallel = on;
+explain(costs off)
+select distinct a from t_distinct_1;
+
+--
+-- End of test Parallel DISTINCT
+--
+
+--
+-- Test Parallel UNION
+--
+set enable_parallel = off;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+set enable_parallel = on;
+set enable_groupagg = off;
+set enable_hashagg = on;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+reset enable_groupagg;
+set enable_hashagg = off;
+set enable_groupagg = on;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+reset enable_groupagg;
+reset enable_hashagg;
+explain(costs off)
+select distinct a from t_distinct_0 union select distinct b from t_distinct_0;
+reset enable_parallel;
+--
+-- End of test Parallel UNION
+--
+
+--
+-- Test Parallel Subquery.
+--
+CREATE TABLE departments (
+    department_id INT PRIMARY KEY,
+    department_name VARCHAR(100)
+);
+
+CREATE TABLE employees (
+    employee_id INT PRIMARY KEY,
+    name VARCHAR(100),
+    salary NUMERIC,
+    department_id INT
+);
+
+INSERT INTO departments VALUES 
+(1, 'Sales'),
+(2, 'IT'),
+(3, 'HR');
+
+INSERT INTO employees VALUES
+(1, 'Alice', 5000, 1),
+(2, 'Bob', 6000, 1),
+(3, 'Charlie', 7000, 2),
+(4, 'David', 8000, 2),
+(5, 'Eve', 9000, 3);
+
+set enable_parallel = off;
+explain SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+
+SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+
+set enable_parallel = on;
+set min_parallel_table_scan_size = 0;
+
+explain SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+
+SELECT e.name
+FROM employees e
+WHERE e.salary > (
+    SELECT AVG(salary)
+    FROM employees
+    WHERE department_id = e.department_id);
+
+--
+-- Test https://github.com/apache/cloudberry/issues/1376
+--
+create table t1(a int, b int);
+create table t2 (like t1);
+set gp_cte_sharing = on;
+
+explain(locus, costs off) with x as
+  (select a, count(*) as b from t1 group by a union all
+    select a, count(*) as b from t2 group by a)
+  select count(*) from x a join x b on a.a = b.b;
+
+reset gp_cte_sharing;
+reset enable_parallel;
+reset min_parallel_table_scan_size;
+
 -- start_ignore
 drop schema test_parallel cascade;
 -- end_ignore
diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql
index 5eb71740fd2..61cf6a4e6cf 100644
--- a/src/test/regress/sql/cluster.sql
+++ b/src/test/regress/sql/cluster.sql
@@ -226,9 +226,9 @@ set enable_indexscan = off;
 set maintenance_work_mem = '1MB';
 cluster clstr_4 using cluster_sort;
 select * from
-(select hundred, lag(hundred) over () as lhundred,
-        thousand, lag(thousand) over () as lthousand,
-        tenthous, lag(tenthous) over () as ltenthous from clstr_4) ss
+(select hundred, lag(hundred) over (order by hundred) as lhundred,
+        thousand, lag(thousand) over (order by hundred) as lthousand,
+        tenthous, lag(tenthous) over (order by hundred) as ltenthous from clstr_4) ss
 where row(hundred, thousand, tenthous) <= row(lhundred, lthousand, ltenthous);
 
 reset enable_indexscan;
diff --git a/src/test/regress/sql/column_compression.sql b/src/test/regress/sql/column_compression.sql
index 5849a935d3a..4f70667fedd 100644
--- a/src/test/regress/sql/column_compression.sql
+++ b/src/test/regress/sql/column_compression.sql
@@ -287,6 +287,7 @@ partition by range(j)
 );
 
 execute ccddlcheck;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
 
 insert into ccddl select 1, (i % 19) + 1, ((i+3) % 5) + 1, i+3 from generate_series(1, 100) i;
 
@@ -367,6 +368,7 @@ subpartition template (subpartition sp1 start(1) end(20),
 (partition p1 start(1) end(20));
 
 execute ccddlcheck;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
 
 alter table ccddl alter partition p1 split partition sp1 at (10) into (partition sp2, partition sp3);
 execute ccddlcheck;
@@ -400,6 +402,7 @@ CREATE TABLE ccddl (id int, year int, month int, day int, region text)
 		)
 	( START (2008) END (2010) );
 execute ccddlcheck;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
 
 -- Ensure we can read and write
 insert into ccddl select 1, 2008, 1, 2, 'usa' from generate_series(1, 100);
@@ -512,6 +515,8 @@ alter table ccddl add partition newp
 	with (appendonly=true, orientation=column);
 
 execute ccddlcheck;
+SELECT level, pg_get_expr(template, relid) from gp_partition_template t WHERE t.relid = 'ccddl'::regclass;
+
 drop table ccddl;
 
 -----------------------------------------------------------------------
@@ -527,8 +532,9 @@ create table gg (i int, k int) with (appendonly=true, orientation=column)
 partition by range(k) (partition p1 start(1) end(2), column i
 encoding(compresstype=sdf2sdf));
 
--- We don't support partition element specific encoding clauses in subpartition
--- templates as we have no place to store them.
+-- Historically we don't support partition element specific encoding clauses in
+-- subpartition templates as we didn't have place to store them. We now have
+-- place to store them if we want to, but for now we keep this door closed
 create table a (i int, j int) with (appendonly=true, orientation=column)
       partition by range(i) subpartition by range(j)
       subpartition template(start(1) end(10) default column encoding (compresstype=zlib),
diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
index 1b598d13b27..ac5526ea9b1 100644
--- a/src/test/regress/sql/create_index.sql
+++ b/src/test/regress/sql/create_index.sql
@@ -1109,7 +1109,6 @@ COMMIT;
 -- we keep the `CONCURRENTLY` to make the following commands fail,
 -- so these commands will not cause deadlock with test create_view,
 -- like `drop schema xxx cascade;`.
--- See more details at https://code.hashdata.xyz/cloudberry/cbdb/-/issues/54
 REINDEX TABLE CONCURRENTLY pg_class; -- no catalog relation
 REINDEX INDEX CONCURRENTLY pg_class_oid_index; -- no catalog index
 -- These are the toast table and index of pg_authid.
diff --git a/src/test/regress/sql/cte_prune.sql b/src/test/regress/sql/cte_prune.sql
new file mode 100644
index 00000000000..2083a4b7e10
--- /dev/null
+++ b/src/test/regress/sql/cte_prune.sql
@@ -0,0 +1,468 @@
+-- start_ignore
+create schema cte_prune;
+set search_path = cte_prune;
+SET optimizer_trace_fallback = on;
+-- end_ignore
+
+create table t1(v1 int, v2 int, v3 int);
+insert into t1 values(generate_series(1, 10), generate_series(11, 20), generate_series(21, 30));
+analyze t1;
+
+create table t2(v1 int, v2 int, v3 int);
+insert into t2 values(generate_series(0, 100), generate_series(100, 200), generate_series(200, 300));
+analyze t2;
+
+-- should pruned both seq scan and shared scan
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+
+-- * also should be pruned
+explain verbose with c1 as (select * from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+with c1 as (select * from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 where c11.v1 < 5;
+
+-- no push filter
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v1=c22.v2;
+
+-- distribution col can be pruned which is better than do redistribute in CTE consumer
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v2=c22.v2;
+with c1 as (select v1, v2, v3 from t1) select c11.v2 from c1 as c11 left join c1 as c22 on c11.v2=c22.v2;
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v3=c22.v3;
+with c1 as (select v1, v2, v3 from t1) select c11.v3 from c1 as c11 left join c1 as c22 on c11.v3=c22.v3;
+
+-- groupby/order by/window function/grouping set should be contains in CTE output
+
+-- group by 
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v1;
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v1;
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by c11.v2;
+
+-- order by 
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v1;
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v1;
+
+explain verbose with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v3;
+with c1 as (select v1, v2, v3 from t1) select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 order by c22.v3;
+
+-- window function
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) OVER (ORDER BY c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v1) OVER (ORDER BY c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+
+-- grouping set 
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v1,c11.v2);
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v1,c11.v2);
+explain verbose with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1 group by ROLLUP(c11.v2,c11.v3);
+with c1 as (select v1, v2, v3 from t1) select sum(c11.v2) OVER (ORDER BY c11.v3) from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+
+
+-- CTE producer should have right output
+
+explain verbose with c1 as (select t1.v1 as v1, t2.v1 as t21, t2.v2 as t22, t2.v3 as t23 from t1 join t2 on t1.v1 = t2.v1) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+
+with c1 as (select t1.v1 as v1, t2.v1 as t21, t2.v2 as t22, t2.v3 as t23 from t1 join t2 on t1.v1 = t2.v1) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+
+explain verbose with c1 as (select sum(v1) as v1, sum(v2) as v2, v3 from t1 group by v3) 
+select c11.v1 from c1 as c11 left join c1 as c22 on c11.v1=c22.v1;
+
+with c1 as (select lt1.v3 as v3, lt1.v1 as lo1, rt1.v1 as ro1 from t1 lt1, t1 rt1 where lt1.v2 = rt1.v2 and lt1.v1 = rt1.v1)  
+select * from t1 where  t1.v1 in (select v3 from c1) and t1.v1 in (select v3 from c1 where v3 > 0);
+
+-- TPCDS case
+
+create table tpcds_store_sales
+(
+    ss_sold_date_sk           integer                       ,
+    ss_sold_time_sk           integer                       ,
+    ss_item_sk                integer               not null,
+    ss_customer_sk            integer                       ,
+    ss_cdemo_sk               integer                       ,
+    ss_hdemo_sk               integer                       ,
+    ss_addr_sk                integer                       ,
+    ss_store_sk               integer                       ,
+    ss_promo_sk               integer                       ,
+    ss_ticket_number          integer               not null,
+    ss_quantity               integer                       ,
+    ss_wholesale_cost         decimal(7,2)                  ,
+    ss_list_price             decimal(7,2)                  ,
+    ss_sales_price            decimal(7,2)                  ,
+    ss_ext_discount_amt       decimal(7,2)                  ,
+    ss_ext_sales_price        decimal(7,2)                  ,
+    ss_ext_wholesale_cost     decimal(7,2)                  ,
+    ss_ext_list_price         decimal(7,2)                  ,
+    ss_ext_tax                decimal(7,2)                  ,
+    ss_coupon_amt             decimal(7,2)                  ,
+    ss_net_paid               decimal(7,2)                  ,
+    ss_net_paid_inc_tax       decimal(7,2)                  ,
+    ss_net_profit             decimal(7,2)                  ,
+    primary key (ss_item_sk, ss_ticket_number)
+);
+
+create table tpcds_date_dim
+(
+    d_date_sk                 integer               not null,
+    d_date_id                 char(16)              not null,
+    d_date                    date                          ,
+    d_month_seq               integer                       ,
+    d_week_seq                integer                       ,
+    d_quarter_seq             integer                       ,
+    d_year                    integer                       ,
+    d_dow                     integer                       ,
+    d_moy                     integer                       ,
+    d_dom                     integer                       ,
+    d_qoy                     integer                       ,
+    d_fy_year                 integer                       ,
+    d_fy_quarter_seq          integer                       ,
+    d_fy_week_seq             integer                       ,
+    d_day_name                char(9)                       ,
+    d_quarter_name            char(6)                       ,
+    d_holiday                 char(1)                       ,
+    d_weekend                 char(1)                       ,
+    d_following_holiday       char(1)                       ,
+    d_first_dom               integer                       ,
+    d_last_dom                integer                       ,
+    d_same_day_ly             integer                       ,
+    d_same_day_lq             integer                       ,
+    d_current_day             char(1)                       ,
+    d_current_week            char(1)                       ,
+    d_current_month           char(1)                       ,
+    d_current_quarter         char(1)                       ,
+    d_current_year            char(1)                       ,
+    primary key (d_date_sk)
+);
+
+create table tpcds_item
+(
+    i_item_sk                 integer               not null,
+    i_item_id                 char(16)              not null,
+    i_rec_start_date          date                          ,
+    i_rec_end_date            date                          ,
+    i_item_desc               varchar(200)                  ,
+    i_current_price           decimal(7,2)                  ,
+    i_wholesale_cost          decimal(7,2)                  ,
+    i_brand_id                integer                       ,
+    i_brand                   char(50)                      ,
+    i_class_id                integer                       ,
+    i_class                   char(50)                      ,
+    i_category_id             integer                       ,
+    i_category                char(50)                      ,
+    i_manufact_id             integer                       ,
+    i_manufact                char(50)                      ,
+    i_size                    char(20)                      ,
+    i_formulation             char(20)                      ,
+    i_color                   char(20)                      ,
+    i_units                   char(10)                      ,
+    i_container               char(10)                      ,
+    i_manager_id              integer                       ,
+    i_product_name            char(50)                      ,
+    primary key (i_item_sk)
+);
+
+create table tpcds_web_sales
+(
+    ws_sold_date_sk           integer                       ,
+    ws_sold_time_sk           integer                       ,
+    ws_ship_date_sk           integer                       ,
+    ws_item_sk                integer               not null,
+    ws_bill_customer_sk       integer                       ,
+    ws_bill_cdemo_sk          integer                       ,
+    ws_bill_hdemo_sk          integer                       ,
+    ws_bill_addr_sk           integer                       ,
+    ws_ship_customer_sk       integer                       ,
+    ws_ship_cdemo_sk          integer                       ,
+    ws_ship_hdemo_sk          integer                       ,
+    ws_ship_addr_sk           integer                       ,
+    ws_web_page_sk            integer                       ,
+    ws_web_site_sk            integer                       ,
+    ws_ship_mode_sk           integer                       ,
+    ws_warehouse_sk           integer                       ,
+    ws_promo_sk               integer                       ,
+    ws_order_number           integer               not null,
+    ws_quantity               integer                       ,
+    ws_wholesale_cost         decimal(7,2)                  ,
+    ws_list_price             decimal(7,2)                  ,
+    ws_sales_price            decimal(7,2)                  ,
+    ws_ext_discount_amt       decimal(7,2)                  ,
+    ws_ext_sales_price        decimal(7,2)                  ,
+    ws_ext_wholesale_cost     decimal(7,2)                  ,
+    ws_ext_list_price         decimal(7,2)                  ,
+    ws_ext_tax                decimal(7,2)                  ,
+    ws_coupon_amt             decimal(7,2)                  ,
+    ws_ext_ship_cost          decimal(7,2)                  ,
+    ws_net_paid               decimal(7,2)                  ,
+    ws_net_paid_inc_tax       decimal(7,2)                  ,
+    ws_net_paid_inc_ship      decimal(7,2)                  ,
+    ws_net_paid_inc_ship_tax  decimal(7,2)                  ,
+    ws_net_profit             decimal(7,2)                  ,
+primary key (ws_item_sk, ws_order_number)
+);
+
+-- sql 23
+explain verbose with frequent_ss_items as 
+ (select substr(i_item_desc,1,30) itemdesc,i_item_sk item_sk,d_date solddate,count(*) cnt
+  from tpcds_store_sales
+      ,tpcds_date_dim 
+      ,tpcds_item
+  where ss_sold_date_sk = d_date_sk
+    and ss_item_sk = i_item_sk 
+    and d_year in (1999,1999+1,1999+2,1999+3)
+  group by substr(i_item_desc,1,30),i_item_sk,d_date
+  having count(*) >4)
+select t1.v1 from t1 where t1.v1 in (select item_sk from frequent_ss_items where true)
+    and t1.v1 in (select item_sk from frequent_ss_items where item_sk > 0);
+
+-- sql 95
+explain verbose with ws_wh as
+(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
+ from tpcds_web_sales ws1,tpcds_web_sales ws2
+ where ws1.ws_order_number = ws2.ws_order_number
+   and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+select * from t1 where t1.v1 in (select ws_order_number from ws_wh where true) and t1.v1 in (select ws_order_number from ws_wh where ws_order_number > 0);
+
+explain verbose with ws_wh as
+(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
+ from tpcds_web_sales ws1,tpcds_web_sales ws2
+ where ws1.ws_order_number = ws2.ws_order_number
+   and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
+select * from t1 where t1.v1 in (select wh1 from ws_wh where true) and t1.v1 in (select wh1 from ws_wh where ws_order_number > 0);
+
+-- start_ignore
+drop table tpcds_store_sales;
+drop table tpcds_date_dim;
+drop table tpcds_item;
+drop table tpcds_web_sales;
+
+drop table t1;
+drop table t2;
+-- end_ignore
+
+
+-- comm cases
+
+CREATE TABLE t3 AS SELECT i as a, i+1 as b from generate_series(1,10)i;
+CREATE TABLE t4 AS SELECT i as c, i+1 as d from generate_series(1,10)i;
+analyze t3;
+analyze t4;
+
+-- Additional filtering conditions are added to the consumer.
+-- This is caused by `PexprInferPredicates` in the ORCA preprocessor.
+explain verbose WITH t(a,b,d) AS
+(
+  SELECT t3.a,t3.b,t4.d FROM t3,t4 WHERE t3.a = t4.d
+)
+SELECT cup.*, SUM(t.d) OVER(PARTITION BY t.b) FROM
+  (
+    SELECT t4.*, AVG(t.b) OVER(PARTITION BY t.a ORDER BY t.b desc) AS e FROM t,t4
+  ) AS cup,
+t WHERE cup.e < 10
+GROUP BY cup.c,cup.d, cup.e ,t.d, t.b
+ORDER BY 1,2,3,4
+LIMIT 10;
+
+WITH t(a,b,d) AS
+(
+  SELECT t3.a,t3.b,t4.d FROM t3,t4 WHERE t3.a = t4.d
+)
+SELECT cup.*, SUM(t.d) OVER(PARTITION BY t.b) FROM
+  (
+    SELECT t4.*, AVG(t.b) OVER(PARTITION BY t.a ORDER BY t.b desc) AS e FROM t,t4
+  ) AS cup,
+t WHERE cup.e < 10
+GROUP BY cup.c,cup.d, cup.e ,t.d, t.b
+ORDER BY 1,2,3,4
+LIMIT 10;
+
+-- grouping set will generate the internal CTE.
+
+CREATE TABLE cte_prune_tenk1 (unique1 int4, unique2 int4, two int4, four int4, ten int4, twenty int4, hundred int4, thousand int4, twothousand int4, fivethous int4, tenthous int4, odd int4, even int4, stringu1 name, stringu2 name, string4 name);
+INSERT INTO cte_prune_tenk1
+SELECT
+  i AS unique1,
+  (i + 10000) AS unique2,
+  i % 2 AS two,
+  i % 4 AS four,
+  i % 10 AS ten,
+  i % 20 AS twenty,
+  i % 100 AS hundred,
+  i % 1000 AS thousand,
+  i % 2000 AS twothousand,
+  i % 5000 AS fivethous,
+  i % 10000 AS tenthous,
+  (2 * i + 1) AS odd,
+  (2 * i) AS even,
+  ('A' || lpad(i::text, 4, '0'))::name AS stringu1,
+  ('B' || lpad(i::text, 4, '0'))::name AS stringu2,
+  (CASE (i % 4)
+    WHEN 0 THEN 'AAAA'::name
+    WHEN 1 THEN 'BBBB'::name
+    WHEN 2 THEN 'CCCC'::name
+    ELSE 'DDDD'::name
+  END) AS string4
+FROM generate_series(0, 99) AS i;
+
+explain verbose select four, x
+  from (select four, ten, 'foo'::text as x from cte_prune_tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+
+select four, x
+  from (select four, ten, 'foo'::text as x from cte_prune_tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+
+-- nest CTE cases
+
+-- start_ignore
+drop table city;
+drop table country;
+drop table countrylanguage;
+-- end_ignore
+
+CREATE TABLE city (
+    id integer NOT NULL,
+    name text NOT NULL,
+    countrycode character(3) NOT NULL,
+    district text NOT NULL,
+    population integer NOT NULL
+) distributed by(id);
+
+CREATE TABLE country (
+    code character(3) NOT NULL,
+    name text NOT NULL,
+    continent text NOT NULL,
+    region text NOT NULL,
+    surfacearea numeric(10,2) NOT NULL,
+    indepyear smallint,
+    population integer NOT NULL,
+    lifeexpectancy real,
+    gnp numeric(10,2),
+    gnpold numeric(10,2),
+    localname text NOT NULL,
+    governmentform text NOT NULL,
+    headofstate text,
+    capital integer,
+    code2 character(2) NOT NULL
+) distributed by (code);
+
+CREATE TABLE countrylanguage (
+    countrycode character(3) NOT NULL,
+    "language" text NOT NULL,
+    isofficial boolean NOT NULL,
+    percentage real NOT NULL
+)distributed by (countrycode,language);
+
+ALTER TABLE ONLY city
+    ADD CONSTRAINT city_pkey PRIMARY KEY (id);
+
+ALTER TABLE ONLY country
+    ADD CONSTRAINT country_pkey PRIMARY KEY (code);
+
+ALTER TABLE ONLY countrylanguage
+    ADD CONSTRAINT countrylanguage_pkey PRIMARY KEY (countrycode, "language");
+
+-- CTE1(inlined) in CTE2(no-inlined) case
+explain verbose with country as
+(select country.code,country.name COUNTRY, city.name CAPITAL, language, isofficial, percentage
+ FROM country,city,countrylanguage
+ WHERE country.code = countrylanguage.countrycode
+ and country.capital = city.id
+ and country.continent = 'Europe'),
+countrylanguage as
+(select country.code,country.COUNTRY,country.language,country.isofficial,country.percentage
+ FROM country,countrylanguage
+ WHERE country.code = countrylanguage.countrycode
+)
+select * from
+(select * from country where isofficial='True') country,
+(select * from countrylanguage where percentage > 50) countrylanguage
+where country.percentage = countrylanguage.percentage order by countrylanguage.COUNTRY,country.language LIMIT 40;
+
+-- CTE in the main query and subqueries within the main query
+explain verbose with bad_headofstates as 
+(
+ select country.code,country.name,country.headofstate,countrylanguage.language
+ from
+ country,countrylanguage
+ where country.code = countrylanguage.countrycode and countrylanguage.isofficial=true
+ and (country.gnp < country.gnpold or country.gnp < 3000)
+)
+select OUTERMOST_FOO.*,bad_headofstates.headofstate from (
+select avg(population),region from
+(
+select FOO.*,bad_headofstates.headofstate,city.name
+from
+(select bad_headofstates.code,country.capital,country.region,country.population from
+bad_headofstates,country where bad_headofstates.code = country.code) FOO, bad_headofstates,city
+where FOO.code = bad_headofstates.code and FOO.capital = city.id) OUTER_FOO
+group by region ) OUTERMOST_FOO,bad_headofstates,country 
+where country.code = bad_headofstates.code and country.region = OUTERMOST_FOO.region
+order by OUTERMOST_FOO.region,bad_headofstates.headofstate LIMIT 40;
+
+-- start_ignore
+drop table city;
+drop table country;
+drop table countrylanguage;
+-- end_ignore
+
+-- inlined CTEs
+CREATE TABLE t5 AS SELECT i as c, i+1 as d from generate_series(1,10)i;
+CREATE TABLE t6 AS SELECT i as a, i+1 as b from generate_series(1,10)i;
+
+-- inlined CTEs should have not unused columns(ex. t5.*, t6.* in output)
+explain verbose WITH w AS (SELECT a, b from t6 where b < 5)
+SELECT *
+FROM t6,
+     (WITH v AS (SELECT c, d FROM t5, w WHERE c = w.a AND c < 2)
+      SELECT v1.c, v1.d FROM v v1, v v2 WHERE v1.c = v2.c AND v1.d > 1
+     ) x
+WHERE t6.a = x.c ORDER BY 1;
+
+WITH w AS (SELECT a, b from t6 where b < 5)
+SELECT *
+FROM t6,
+     (WITH v AS (SELECT c, d FROM t5, w WHERE c = w.a AND c < 2)
+      SELECT v1.c, v1.d FROM v v1, v v2 WHERE v1.c = v2.c AND v1.d > 1
+     ) x
+WHERE t6.a = x.c ORDER BY 1;
+
+CREATE TABLE t7 (f1 integer, f2 integer, f3 float);
+
+INSERT INTO t7 VALUES (1, 2, 3);
+INSERT INTO t7 VALUES (2, 3, 4);
+INSERT INTO t7 VALUES (3, 4, 5);
+INSERT INTO t7 VALUES (1, 1, 1);
+INSERT INTO t7 VALUES (2, 2, 2);
+INSERT INTO t7 VALUES (3, 3, 3);
+INSERT INTO t7 VALUES (6, 7, 8);
+INSERT INTO t7 VALUES (8, 9, NULL);
+
+-- inlined CTEs should used the origin cexpression with recreated
+explain (verbose, costs off)
+with x as (select * from (select f1 from t7) ss)
+select * from x where f1 = 1;
+
+with x as (select * from (select f1 from t7) ss)
+select * from x where f1 = 1;
+
+-- start_ignore
+drop table t5;
+drop table t6;
+drop table t7;
+
+drop schema cte_prune cascade;
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/sql/dedupset.sql b/src/test/regress/sql/dedupset.sql
new file mode 100644
index 00000000000..72ecd97ce2e
--- /dev/null
+++ b/src/test/regress/sql/dedupset.sql
@@ -0,0 +1,174 @@
+
+SET optimizer_trace_fallback = on;
+-- start_ignore
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+drop table if exists pt1;
+drop table if exists pt2;
+-- end_ignore
+
+create table t1(v1 int, v2 int);
+create table t2(v3 int, v4 int);
+create table t3(v5 int, v6 int);
+
+insert into t1 values(generate_series(1, 100), generate_series(1, 100));
+insert into t2 values(generate_series(1, 100), generate_series(1, 100));
+insert into t3 values(generate_series(1, 100), generate_series(1, 100));
+
+CREATE TABLE pt1 (
+    v1 INT,
+    v2 INT
+) PARTITION BY RANGE (v1);
+
+CREATE TABLE pt1_p1 PARTITION OF pt1 FOR VALUES FROM (0) TO (20);
+CREATE TABLE pt1_p2 PARTITION OF pt1 FOR VALUES FROM (20) TO (40);
+CREATE TABLE pt1_p3 PARTITION OF pt1 FOR VALUES FROM (40) TO (60);
+CREATE TABLE pt1_p4 PARTITION OF pt1 FOR VALUES FROM (60) TO (400);
+
+CREATE TABLE pt2 (
+    v3 INT,
+    v4 INT
+) PARTITION BY RANGE (v3);
+
+CREATE TABLE pt2_p1 PARTITION OF pt2 FOR VALUES FROM (0) TO (20);
+CREATE TABLE pt2_p2 PARTITION OF pt2 FOR VALUES FROM (20) TO (40);
+CREATE TABLE pt2_p3 PARTITION OF pt2 FOR VALUES FROM (40) TO (60);
+CREATE TABLE pt2_p4 PARTITION OF pt2 FOR VALUES FROM (60) TO (400);
+
+insert into pt1 values(generate_series(1, 100), generate_series(1, 100));
+insert into pt2 values(generate_series(1, 100), generate_series(1, 100));
+
+analyze t1;
+analyze t2;
+analyze t3;
+analyze pt1;
+analyze pt2;
+
+-- dedup the subquery with projection
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10) and v1 in (select v3 from t2); -- change the order 
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10);
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+select * from t1 where v1 in (select v3 from t2 where v3 < 10);
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2 where v3 < 10);
+explain verbose select * from pt1 where v1 in (select v3 from pt2 where v3 < 10);
+select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2 where v3 < 10);
+select * from pt1 where v1 in (select v3 from pt2 where v3 < 10);
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1 where v3 < 10);
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1 where v3 < 10);
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1 where v3 < 10);
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10);
+select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10);
+select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10);
+
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) order by v1;
+explain verbose select * from t1 where v1 in (select v3 from t2 where v3 < 10) order by v1;
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) order by v1;
+select * from t1 where v1 in (select v3 from t2 where v3 < 10) order by v1;
+
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) group by v2;
+explain verbose select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10) group by v2;
+select sum(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where v3 < 10) group by v2;
+select sum(v1) from t1 where v1 in (select v3 from t2 where v3 < 10) group by v2;
+
+-- dedup the same subqueryany
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2);
+explain verbose select * from t1 where v1 in (select v3 from t2);
+select count(*) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2);
+select count(*) from t1 where v1 in (select v3 from t2);
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2);
+explain verbose select * from pt1 where v1 in (select v3 from pt2);
+
+select count(*) from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2);
+select count(*) from pt1 where v1 in (select v3 from pt2);
+
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1);
+
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1);
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+with cte1 as (select v3 from t2) select count(*) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1);
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+
+-- dedup the subquery with inner join
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6);
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t3,t2 where v4=v6); -- change the join order,different index in inner join
+explain verbose select * from t1 where v1 in (select v3 from t2,t3 where v4=v6);
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+
+select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+select * from t1 where v1 in (select v3 from t2,t3 where v4=v6 and v4 < 10);
+
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6);
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from t3,pt2 where v4=v6);
+explain verbose select * from pt1 where v1 in (select v3 from pt2,t3 where v4=v6);
+explain verbose select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+
+select * from pt1 where v1 in (select v3 from pt2) and v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+select * from pt1 where v1 in (select v3 from pt2,t3 where v4=v6 and v4 < 10);
+
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6);
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from t3,cte1 where v4=v6);
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+
+set optimizer_cte_inlining to on;
+set optimizer_cte_inlining_bound to 2;
+explain verbose with cte1 as (select v3 from t2) select * from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+with cte1 as (select v3 from t2) select sum(v1) from t1,t2 where t1.v1 in (select v3 from cte1) and t1.v1 in (select v3 from cte1,t3 where v4=v6 and v4 < 10);
+reset optimizer_cte_inlining;
+reset optimizer_cte_inlining_bound;
+
+-- dedup the subquery with semi join(still be a scalar in the pre-process)
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+explain verbose select * from t1 where v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+
+select count(*) from t1 where v1 in (select v3 from t2) and v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+select count(*) from t1 where v1 in (select v3 from t2 where exists (SELECT 1 FROM t3 WHERE v5 = v3));
+
+-- inner join different key
+explain verbose select v1 from t1 where v1 in (select v3 from t2) and v1 in (select v5 from t2,t3 where v5 = v3);
+explain verbose select v1 from t1 where v1 in (select v5 from t2,t3 where v5 = v3);
+explain verbose select v1 from t1 where v1 in (select v3 from t2) and v1 in (select v6 from t2,t3 where v5 = v3); -- no dedup, because v6 is not the join key
+
+select count(v1) from t1 where v1 in (select v3 from t2) and v1 in (select v5 from t2,t3 where v5 = v3);
+select count(v1) from t1 where v1 in (select v5 from t2,t3 where v5 = v3);
+
+-- can't dedup
+explain verbose select * from t1 where v1 in (select v3 from t2) and v1 in (select v4 from t2 where v3 < 10); -- different outpt
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 where v3 < 10); -- different scalar ident
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 group by v3); -- group by 
+explain verbose select * from t1 where v1 in (select v3 from t2) and v2 in (select v3 from t2 order by v3); -- order by/limit, actully this case can be the subset
+
+reset optimizer_trace_fallback;
+
+-- start_ignore
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+drop table if exists pt1;
+drop table if exists pt2;
+-- end_ignore
diff --git a/src/test/regress/sql/enum.sql b/src/test/regress/sql/enum.sql
index 495e3a8034e..fef8f994f40 100644
--- a/src/test/regress/sql/enum.sql
+++ b/src/test/regress/sql/enum.sql
@@ -120,11 +120,11 @@ ORDER BY enumsortorder;
 --
 -- Basic table creation, row selection
 --
-CREATE TABLE enumtest (i int, col rainbow);
-INSERT INTO enumtest values (1, 'red'), (2, 'orange'), (3, 'yellow'), (4, 'green');
-COPY enumtest (i, col) FROM stdin;
-5	blue
-6	purple
+CREATE TABLE enumtest (col rainbow);
+INSERT INTO enumtest values ('red'), ('orange'), ('yellow'), ('green');
+COPY enumtest FROM stdin;
+blue
+purple
 \.
 SELECT * FROM enumtest;
 
@@ -244,17 +244,17 @@ DROP FUNCTION echo_me(rainbow);
 --
 -- RI triggers on enum types
 --
-CREATE TABLE enumtest_parent (i int PRIMARY KEY, id rainbow);
-CREATE TABLE enumtest_child (i int REFERENCES enumtest_parent, parent rainbow);
-INSERT INTO enumtest_parent VALUES (1, 'red');
-INSERT INTO enumtest_child VALUES (1, 'red');
-INSERT INTO enumtest_child VALUES (2, 'blue');  -- fail
+CREATE TABLE enumtest_parent (id rainbow PRIMARY KEY);
+CREATE TABLE enumtest_child (parent rainbow REFERENCES enumtest_parent);
+INSERT INTO enumtest_parent VALUES ('red');
+INSERT INTO enumtest_child VALUES ('red');
+INSERT INTO enumtest_child VALUES ('blue');  -- fail
 DELETE FROM enumtest_parent;  -- fail
 --
 -- cross-type RI should fail
 --
 CREATE TYPE bogus AS ENUM('good', 'bad', 'ugly');
-CREATE TABLE enumtest_bogus_child(i int, parent bogus REFERENCES enumtest_parent);
+CREATE TABLE enumtest_bogus_child(parent bogus REFERENCES enumtest_parent);
 DROP TYPE bogus;
 
 -- check renaming a value
diff --git a/src/test/regress/sql/enum_dist_part_ban.sql b/src/test/regress/sql/enum_dist_part_ban.sql
deleted file mode 100644
index 23ff33fc589..00000000000
--- a/src/test/regress/sql/enum_dist_part_ban.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- test that distributing or hash partitioning by an enum field or expression is blocked
-
-CREATE DATABASE ban_enum;
-\c ban_enum
-
--- create a test enum
-create type colorEnum as enum ('r', 'g', 'b');
-
--- hash partition by enum column name
-create table part (a int, b colorEnum) partition by hash(b);
-
--- hash partition by enum column expression
-create table part (a int, b colorEnum) partition by hash((b));
-
--- distribute by enum column
-create table distr (a colorEnum, b int);
-
-
--- clean up database
-drop type colorEnum;
-\c regression
-DROP DATABASE ban_enum;
diff --git a/src/test/regress/sql/explain_format.sql b/src/test/regress/sql/explain_format.sql
index 602891698fd..229fcdfe6fe 100644
--- a/src/test/regress/sql/explain_format.sql
+++ b/src/test/regress/sql/explain_format.sql
@@ -17,6 +17,8 @@
 -- s/Memory used:  \d+\w?B/Memory used: ###B/
 -- m/Memory Usage: \d+\w?B/
 -- s/Memory Usage: \d+\w?B/Memory Usage: ###B/
+-- m/Memory wanted:  \d+\w?kB/
+-- s/Memory wanted:  \d+\w?kB/Memory wanted: ###kB/
 -- m/Peak Memory Usage: \d+/
 -- s/Peak Memory Usage: \d+/Peak Memory Usage: ###/
 -- m/Buckets: \d+/
@@ -110,10 +112,43 @@ EXPLAIN (FORMAT XML, COSTS OFF) SELECT * FROM generate_series(1, 10);
 CREATE TABLE jsonexplaintest (i int4) PARTITION BY RANGE (i) (START(1) END(3) EVERY(1));
 EXPLAIN (FORMAT JSON, COSTS OFF) SELECT * FROM jsonexplaintest WHERE i = 2;
 
--- explain_processing_on
+-- start_matchsubs
+-- m/Extra Text: \(seg\d+\)   hash table\(s\): \d+; \d+ groups total in \d+ batches, \d+ spill partitions; disk usage: \d+KB; chain length \d+.\d+ avg, \d+ max; using \d+ of \d+ buckets; total \d+ expansions./
+-- s/Extra Text: \(seg\d+\)   hash table\(s\): \d+; \d+ groups total in \d+ batches, \d+ spill partitions; disk usage: \d+KB; chain length \d+.\d+ avg, \d+ max; using \d+ of \d+ buckets; total \d+ expansions./Extra Text: (seg0)   hash table(s): ###; ### groups total in ### batches, ### spill partitions; disk usage: ###KB; chain length ###.## avg, ### max; using ## of ### buckets; total ### expansions./
+-- m/Work_mem: \d+K bytes max, \d+K bytes wanted/
+-- s/Work_mem: \d+K bytes max, \d+K bytes wanted/Work_mem: ###K bytes max, ###K bytes wanted/
+-- end_matchsubs
+-- Greenplum hash table extra message
+CREATE TABLE test_src_tbl AS
+SELECT i % 10000 AS a, i % 10000 + 1 AS b FROM generate_series(1, 50000) i DISTRIBUTED BY (a);
+ANALYZE test_src_tbl;
+
+-- Enable optimizer_enable_hashagg, and set statement_mem to a small value to force spilling
+set optimizer_enable_hashagg = on;
+SET statement_mem = '1000kB';
+
+-- Hashagg with spilling
+set hash_mem_multiplier = 1;
+CREATE TABLE test_hashagg_spill AS
+SELECT a, COUNT(DISTINCT b) AS b FROM test_src_tbl GROUP BY a;
+EXPLAIN (analyze, costs off) SELECT a, COUNT(DISTINCT b) AS b FROM test_src_tbl GROUP BY a;
+
+-- Hashagg with grouping sets
+CREATE TABLE test_hashagg_groupingsets AS
+SELECT a, avg(b) AS b FROM test_src_tbl GROUP BY grouping sets ((a), (b));
+-- The planner generates multiple hash tables but ORCA uses Shared Scan.
+-- flaky test
+-- EXPLAIN (analyze, costs off) SELECT a, avg(b) AS b FROM test_src_tbl GROUP BY grouping sets ((a), (b));
+
+reset hash_mem_multiplier;
+RESET optimizer_enable_hashagg;
+RESET statement_mem;
 
 -- Cleanup
 DROP TABLE boxes;
 DROP TABLE apples;
 DROP TABLE box_locations;
 DROP TABLE jsonexplaintest;
+DROP TABLE test_src_tbl;
+DROP TABLE test_hashagg_spill;
+DROP TABLE test_hashagg_groupingsets;
diff --git a/src/test/regress/sql/gin.sql b/src/test/regress/sql/gin.sql
index db702e12adf..d52f19e2d36 100644
--- a/src/test/regress/sql/gin.sql
+++ b/src/test/regress/sql/gin.sql
@@ -172,3 +172,13 @@ reset enable_seqscan;
 reset enable_bitmapscan;
 
 drop table t_gin_test_tbl;
+
+--
+-- Github issue: https://github.com/apache/cloudberry/issues/1222
+--
+begin;
+create table t_issue_1222(i int4[]) with (appendonly=true);
+create index t_issue_1222_idx on t_issue_1222 using gin (i)
+  with (fastupdate = on, gin_pending_list_limit = 4096);
+insert into t_issue_1222 select array[1, 2, g] from generate_series(1, 400000) g;
+abort;
diff --git a/src/test/regress/sql/gp_create_table.sql b/src/test/regress/sql/gp_create_table.sql
index 503ccfa43e1..5b39b216d34 100644
--- a/src/test/regress/sql/gp_create_table.sql
+++ b/src/test/regress/sql/gp_create_table.sql
@@ -129,3 +129,7 @@ c1 int,c2 int,c3 int,c4 int,c5 int,c6 int,c7 int,c8 int,c9 int,c10 int,c11 int,c
 (
 c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16,c17,c18,c19,c20,c21,c22,c23,c24,c25,c26,c27,c28,c29,c30,c31,c32,c33,c34,c35,c36,c37,c38,c39,c40,c41,c42,c43,c44,c45,c46,c47,c48,c49,c50,c51,c52,c53,c54,c55,c56,c57,c58,c59,c60,c61,c62,c63,c64,c65,c66,c67,c68,c69,c70,c71,c72,c73,c74,c75,c76,c77,c78,c79,c80,c81,c82,c83,c84,c85,c86,c87,c88,c89,c90,c91,c92,c93,c94,c95,c96,c97,c98,c99,c100,c101,c102,c103,c104,c105,c106,c107,c108,c109,c110,c111,c112,c113,c114,c115,c116,c117,c118,c119,c120,c121,c122,c123,c124,c125,c126,c127,c128,c129,c130,c131,c132,c133,c134,c135,c136,c137,c138,c139,c140,c141,c142,c143,c144,c145,c146,c147,c148,c149,c150,c151,c152,c153,c154,c155,c156,c157,c158,c159,c160,c161,c162,c163,c164,c165,c166,c167,c168,c169,c170,c171,c172,c173,c174,c175,c176,c177,c178,c179,c180,c181,c182,c183,c184,c185,c186,c187,c188,c189,c190,c191,c192,c193,c194,c195,c196,c197,c198,c199,c200,c201,c202,c203,c204,c205,c206,c207,c208,c209,c210,c211,c212,c213,c214,c215,c216,c217,c218,c219,c220,c221,c222,c223,c224,c225,c226,c227,c228,c229,c230,c231,c232,c233,c234,c235,c236,c237,c238,c239,c240,c241,c242,c243,c244,c245,c246,c247,c248,c249,c250,c251,c252,c253,c254,c255,c256,c257,c258,c259,c260,c261,c262,c263,c264,c265,c266,c267,c268,c269,c270,c271,c272,c273,c274,c275,c276,c277,c278,c279,c280,c281,c282,c283,c284,c285,c286,c287,c288,c289,c290,c291,c292,c293,c294,c295,c296,c297,c298,c299,c300,c301,c302,c303,c304,c305,c306,c307,c308,c309,c310,c311,c312,c313,c314,c315,c316,c317,c318,c319,c320,c321,c322,c323,c324,c325,c326,c327,c328,c329,c330,c331,c332,c333,c334,c335,c336,c337,c338,c339,c340,c341,c342,c343,c344,c345,c346,c347,c348,c349,c350,c351,c352,c353,c354,c355,c356,c357,c358,c359,c360,c361,c362,c363,c364,c365,c366,c367,c368,c369,c370,c371,c372,c373,c374,c375,c376,c377,c378,c379,c380,c381,c382,c383,c384,c385,c386,c387,c388,c389,c390,c391,c392,c393,c394,c395,c396,c397,c398,c399,c400,c401,c402,c403,c404,c405,c406,c407,c408,c409,c410,c411,c412,c413,c414,c415,c416,c417,c418,c419,c420,c421,c422,c423,c424,c425,c426,c427,c428,c429,c430,c431,c432,c433,c434,c435,c436,c437,c438,c439,c440,c441,c442,c443,c444,c445,c446,c447,c448,c449,c450,c451,c452,c453,c454,c455,c456,c457,c458,c459,c460,c461,c462,c463,c464,c465,c466,c467,c468,c469,c470,c471,c472,c473,c474,c475,c476,c477,c478,c479,c480,c481,c482,c483,c484,c485,c486,c487,c488,c489,c490,c491,c492,c493,c494,c495,c496,c497,c498,c499,c500,c501,c502,c503,c504,c505,c506,c507,c508,c509,c510,c511,c512,c513,c514,c515,c516,c517,c518,c519,c520,c521,c522,c523,c524,c525,c526,c527,c528,c529,c530,c531,c532,c533,c534,c535,c536,c537,c538,c539,c540,c541,c542,c543,c544,c545,c546,c547,c548,c549,c550,c551,c552,c553,c554,c555,c556,c557,c558,c559,c560,c561,c562,c563,c564,c565,c566,c567,c568,c569,c570,c571,c572,c573,c574,c575,c576,c577,c578,c579,c580,c581,c582,c583,c584,c585,c586,c587,c588,c589,c590,c591,c592,c593,c594,c595,c596,c597,c598,c599,c600,c601,c602,c603,c604,c605,c606,c607,c608,c609,c610,c611,c612,c613,c614,c615,c616,c617,c618,c619,c620,c621,c622,c623,c624,c625,c626,c627,c628,c629,c630,c631,c632,c633,c634,c635,c636,c637,c638,c639,c640,c641,c642,c643,c644,c645,c646,c647,c648,c649,c650,c651,c652,c653,c654,c655,c656,c657,c658,c659,c660,c661,c662,c663,c664,c665,c666,c667,c668,c669,c670,c671,c672,c673,c674,c675,c676,c677,c678,c679,c680,c681,c682,c683,c684,c685,c686,c687,c688,c689,c690,c691,c692,c693,c694,c695,c696,c697,c698,c699,c700,c701,c702,c703,c704,c705,c706,c707,c708,c709,c710,c711,c712,c713,c714,c715,c716,c717,c718,c719,c720,c721,c722,c723,c724,c725,c726,c727,c728,c729,c730,c731,c732,c733,c734,c735,c736,c737,c738,c739,c740,c741,c742,c743,c744,c745,c746,c747,c748,c749,c750,c751,c752,c753,c754,c755,c756,c757,c758,c759,c760,c761,c762,c763,c764,c765,c766,c767,c768,c769,c770,c771,c772,c773,c774,c775,c776,c777,c778,c779,c780,c781,c782,c783,c784,c785,c786,c787,c788,c789,c790,c791,c792,c793,c794,c795,c796,c797,c798,c799,c800,c801,c802,c803,c804,c805,c806,c807,c808,c809,c810,c811,c812,c813,c814,c815,c816,c817,c818,c819,c820,c821,c822,c823,c824,c825,c826,c827,c828,c829,c830,c831,c832,c833,c834,c835,c836,c837,c838,c839,c840,c841,c842,c843,c844,c845,c846,c847,c848,c849,c850,c851,c852,c853,c854,c855,c856,c857,c858,c859,c860,c861,c862,c863,c864,c865,c866,c867,c868,c869,c870,c871,c872,c873,c874,c875,c876,c877,c878,c879,c880,c881,c882,c883,c884,c885,c886,c887,c888,c889,c890,c891,c892,c893,c894,c895,c896,c897,c898,c899,c900,c901,c902,c903,c904,c905,c906,c907,c908,c909,c910,c911,c912,c913,c914,c915,c916,c917,c918,c919,c920,c921,c922,c923,c924,c925,c926,c927,c928,c929,c930,c931,c932,c933,c934,c935,c936,c937,c938,c939,c940,c941,c942,c943,c944,c945,c946,c947,c948,c949,c950,c951,c952,c953,c954,c955,c956,c957,c958,c959,c960,c961,c962,c963,c964,c965,c966,c967,c968,c969,c970,c971,c972,c973,c974,c975,c976,c977,c978,c979,c980,c981,c982,c983,c984,c985,c986,c987,c988,c989,c990,c991,c992,c993,c994,c995,c996,c997,c998,c999,c1000,c1001,c1002,c1003,c1004,c1005,c1006,c1007,c1008,c1009,c1010,c1011,c1012,c1013,c1014,c1015,c1016,c1017,c1018,c1019,c1020,c1021,c1022,c1023,c1024,c1025,c1026,c1027,c1028,c1029,c1030,c1031,c1032,c1033,c1034,c1035,c1036,c1037,c1038,c1039,c1040,c1041,c1042,c1043,c1044,c1045,c1046,c1047,c1048,c1049,c1050,c1051,c1052,c1053,c1054,c1055,c1056,c1057,c1058,c1059,c1060,c1061,c1062,c1063,c1064,c1065,c1066,c1067,c1068,c1069,c1070,c1071,c1072,c1073,c1074,c1075,c1076,c1077,c1078,c1079,c1080,c1081,c1082,c1083,c1084,c1085,c1086,c1087,c1088,c1089,c1090,c1091,c1092,c1093,c1094,c1095,c1096,c1097,c1098,c1099,c1100,c1101,c1102,c1103,c1104,c1105,c1106,c1107,c1108,c1109,c1110,c1111,c1112,c1113,c1114,c1115,c1116,c1117,c1118,c1119,c1120,c1121,c1122,c1123,c1124,c1125,c1126,c1127,c1128,c1129,c1130,c1131,c1132,c1133,c1134,c1135,c1136,c1137,c1138,c1139,c1140,c1141,c1142,c1143,c1144,c1145,c1146,c1147,c1148,c1149,c1150,c1151,c1152,c1153,c1154,c1155,c1156,c1157,c1158,c1159,c1160,c1161,c1162,c1163,c1164,c1165,c1166,c1167,c1168,c1169,c1170,c1171,c1172,c1173,c1174,c1175,c1176,c1177,c1178,c1179,c1180,c1181,c1182,c1183,c1184,c1185,c1186,c1187,c1188,c1189,c1190,c1191,c1192,c1193,c1194,c1195,c1196,c1197,c1198,c1199,c1200,c1201,c1202,c1203,c1204,c1205,c1206,c1207,c1208,c1209,c1210,c1211,c1212,c1213,c1214,c1215,c1216,c1217,c1218,c1219,c1220,c1221,c1222,c1223,c1224,c1225,c1226,c1227,c1228,c1229,c1230,c1231,c1232,c1233,c1234,c1235,c1236,c1237,c1238,c1239,c1240,c1241,c1242,c1243,c1244,c1245,c1246,c1247,c1248,c1249,c1250,c1251,c1252,c1253,c1254,c1255,c1256,c1257,c1258,c1259,c1260,c1261,c1262,c1263,c1264,c1265,c1266,c1267,c1268,c1269,c1270,c1271,c1272,c1273,c1274,c1275,c1276,c1277,c1278,c1279,c1280,c1281,c1282,c1283,c1284,c1285,c1286,c1287,c1288,c1289,c1290,c1291,c1292,c1293,c1294,c1295,c1296,c1297,c1298,c1299,c1300,c1301,c1302,c1303,c1304,c1305,c1306,c1307,c1308,c1309,c1310,c1311,c1312,c1313,c1314,c1315,c1316,c1317,c1318,c1319,c1320,c1321,c1322,c1323,c1324,c1325,c1326,c1327,c1328,c1329,c1330,c1331,c1332,c1333,c1334,c1335,c1336,c1337,c1338,c1339,c1340,c1341,c1342,c1343,c1344,c1345,c1346,c1347,c1348,c1349,c1350,c1351,c1352,c1353,c1354,c1355,c1356,c1357,c1358,c1359,c1360,c1361,c1362,c1363,c1364,c1365,c1366,c1367,c1368,c1369,c1370,c1371,c1372,c1373,c1374,c1375,c1376,c1377,c1378,c1379,c1380,c1381,c1382,c1383,c1384,c1385,c1386,c1387,c1388,c1389,c1390,c1391,c1392,c1393,c1394,c1395,c1396,c1397,c1398,c1399,c1400,c1401,c1402,c1403,c1404,c1405,c1406,c1407,c1408,c1409,c1410,c1411,c1412,c1413,c1414,c1415,c1416,c1417,c1418,c1419,c1420,c1421,c1422,c1423,c1424,c1425,c1426,c1427,c1428,c1429,c1430,c1431,c1432,c1433,c1434,c1435,c1436,c1437,c1438,c1439,c1440,c1441,c1442,c1443,c1444,c1445,c1446,c1447,c1448,c1449,c1450,c1451,c1452,c1453,c1454,c1455,c1456,c1457,c1458,c1459,c1460,c1461,c1462,c1463,c1464,c1465,c1466,c1467,c1468,c1469,c1470,c1471,c1472,c1473,c1474,c1475,c1476,c1477,c1478,c1479,c1480,c1481,c1482,c1483,c1484,c1485,c1486,c1487,c1488,c1489,c1490,c1491,c1492,c1493,c1494,c1495,c1496,c1497,c1498,c1499,c1500,c1501,c1502,c1503,c1504,c1505,c1506,c1507,c1508,c1509,c1510,c1511,c1512,c1513,c1514,c1515,c1516,c1517,c1518,c1519,c1520,c1521,c1522,c1523,c1524,c1525,c1526,c1527,c1528,c1529,c1530,c1531,c1532,c1533,c1534,c1535,c1536,c1537,c1538,c1539,c1540,c1541,c1542,c1543,c1544,c1545,c1546,c1547,c1548,c1549,c1550,c1551,c1552,c1553,c1554,c1555,c1556,c1557,c1558,c1559,c1560,c1561,c1562,c1563,c1564,c1565,c1566,c1567,c1568,c1569,c1570,c1571,c1572,c1573,c1574,c1575,c1576,c1577,c1578,c1579,c1580,c1581,c1582,c1583,c1584,c1585,c1586,c1587,c1588,c1589,c1590,c1591,c1592,c1593,c1594,c1595,c1596,c1597,c1598,c1599,c1600,c1601
 );
+
+create table dup_key_t(a int, b int, c int) distributed randomly;
+create temp table ctas_dump_key_t as select rn, a, b from
+ (select a, b, row_number() over (partition by a, b order by c) rn from dup_key_t where dup_key_t.a = dup_key_t.b) x;
diff --git a/src/test/regress/sql/gp_dqa.sql b/src/test/regress/sql/gp_dqa.sql
index 8e1c80c60a4..fc243d74e5e 100644
--- a/src/test/regress/sql/gp_dqa.sql
+++ b/src/test/regress/sql/gp_dqa.sql
@@ -604,6 +604,15 @@ select count(distinct a), count(distinct b) from dqa_f4 group by c;
 set optimizer_enable_multiple_distinct_aggs=on;
 explain (verbose on, costs off) select count(distinct a), count(distinct b) from dqa_f4 group by c;
 select count(distinct a), count(distinct b) from dqa_f4 group by c;
-reset optimizer_enable_multiple_distinct_aggs;
 
+-- Test AO table dqa with multiple distinct aggs
+create table dqa_f5(a int, b int, c int) using ao_column;
+insert into dqa_f5 values(null, null, null);
+insert into dqa_f5 values(1, 1, 1);
+insert into dqa_f5 values(2, 2, 2);
+explain (verbose on, costs off) select count(distinct a), count(distinct b) from dqa_f5 group by c;
+select count(distinct a), count(distinct b) from dqa_f5 group by c;
+
+reset optimizer_enable_multiple_distinct_aggs;
 drop table dqa_f4;
+drop table dqa_f5;
diff --git a/src/test/regress/sql/gp_hashagg.sql b/src/test/regress/sql/gp_hashagg.sql
index 36000de8af8..c9b05c1936a 100644
--- a/src/test/regress/sql/gp_hashagg.sql
+++ b/src/test/regress/sql/gp_hashagg.sql
@@ -140,3 +140,141 @@ HAVING max(c) = '31'
 $$ AS qry \gset
 EXPLAIN (COSTS OFF, VERBOSE) :qry;
 :qry;
+
+drop schema if exists tinc_base_types cascade;
+
+create schema tinc_base_types;
+set search_path=tinc_base_types;
+
+
+CREATE FUNCTION int42_in(cstring)
+   RETURNS int42
+   AS 'int4in'
+   LANGUAGE internal IMMUTABLE STRICT;
+CREATE FUNCTION int42_out(int42)
+   RETURNS cstring
+   AS 'int4out'
+   LANGUAGE internal IMMUTABLE STRICT;
+CREATE TYPE int42 (
+   internallength = 4,
+   input = int42_in,
+   output = int42_out,
+   alignment = int4,
+   default = 42,
+   passedbyvalue
+);
+
+CREATE TABLE aTABLE(k int, a int42);
+INSERT INTO aTABLE VALUES(1, '21');
+INSERT INTO aTABLE VALUES(2, '22');
+INSERT INTO aTABLE VALUES(3, '23');
+INSERT INTO aTABLE VALUES(4, '24');
+SELECT * FROM aTABLE;
+
+CREATE OR REPLACE FUNCTION my_lt(int42, int42)
+RETURNS boolean AS
+'int4lt'
+language internal;
+
+CREATE OR REPLACE FUNCTION my_lteq(int42, int42)
+RETURNS boolean AS
+'int4le'
+language internal;
+
+CREATE OR REPLACE FUNCTION my_gt(int42, int42)
+RETURNS boolean AS
+'int4gt'
+language internal;
+
+CREATE OR REPLACE FUNCTION my_gteq(int42, int42)
+RETURNS boolean AS
+'int4ge'
+language internal;
+
+CREATE OR REPLACE FUNCTION my_eq(int42, int42)
+RETURNS boolean AS
+'int4eq'
+language internal;
+
+CREATE OPERATOR < (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_lt,
+  hashes
+);
+
+CREATE OPERATOR <= (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_lteq,
+  hashes
+);
+
+CREATE OPERATOR = (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_eq,
+  hashes
+);
+
+CREATE OPERATOR > (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_gt,
+  hashes
+);
+
+CREATE OPERATOR >= (
+  leftarg = int42,
+  rightarg = int42,
+  procedure = my_gteq,
+  hashes
+);
+
+CREATE OR REPLACE FUNCTION my_comp_func(int42, int42)
+RETURNS int AS
+$$
+BEGIN
+IF $1 < $2 THEN
+  return -1;
+ELSIF $1 = $2 THEN
+  return 0;
+ELSE
+  return 1;
+END IF;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE OPERATOR CLASS my_operator_class_comp_type
+DEFAULT
+FOR TYPE int42 USING btree
+AS
+OPERATOR 1 <,
+OPERATOR 2 <=,
+OPERATOR 3 =,
+OPERATOR 4 >=,
+OPERATOR 5 >,
+FUNCTION 1 my_comp_func(int42, int42);
+
+CREATE OPERATOR CLASS my_operator_class_comp_type_hash_lt
+DEFAULT
+FOR TYPE int42 USING hash
+AS
+OPERATOR 1 <,
+FUNCTION 1 my_comp_func(int42, int42);
+
+CREATE OPERATOR CLASS my_operator_class_comp_type_hash_eq
+FOR TYPE int42 USING hash
+AS
+OPERATOR 1 =,
+FUNCTION 1 my_comp_func(int42, int42);
+
+select * from atable group by a,k;
+-- Before fix: This would fail at runtime with:
+--   ERROR: could not find hash function for hash operator XXXXX (execGrouping.c:118)
+-- After fix: ORCA should detect missing hash function at planning time
+--   and either use GroupAgg or report a clear planning error
+SET optimizer_enable_groupagg=off;
+select * from atable group by a,k;
+
+drop schema if exists tinc_base_types cascade;
diff --git a/src/test/regress/sql/gp_runtime_filter.sql b/src/test/regress/sql/gp_runtime_filter.sql
index fc1fe487745..d221c04958e 100644
--- a/src/test/regress/sql/gp_runtime_filter.sql
+++ b/src/test/regress/sql/gp_runtime_filter.sql
@@ -227,6 +227,35 @@ DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
 
+-- case 7: scan partition table with dynamic scan
+CREATE TABLE t1 (c1 INT, c2 INT) DISTRIBUTED BY (c1) PARTITION BY RANGE (c2) (START (1) END (100) EVERY (50));
+CREATE TABLE t2 (c1 INT, c2 INT) DISTRIBUTED REPLICATED;
+INSERT INTO t1 SELECT generate_series(1, 99), generate_series(1, 99);
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t2 SELECT generate_series(1, 5), generate_series(1, 5);
+INSERT INTO t2 SELECT generate_series(51, 51), generate_series(51, 51);
+ANALYZE;
+
+SET optimizer TO on;
+
+EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
+SELECT t1.c2 FROM t1, t2 WHERE t1.c2 = t2.c2;
+
+SET gp_enable_runtime_filter_pushdown TO on;
+
+EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
+SELECT t1.c2 FROM t1, t2 WHERE t1.c2 = t2.c2;
+
+RESET gp_enable_runtime_filter_pushdown;
+
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+
+SET optimizer TO off;
+
 RESET enable_parallel;
 
 -- Clean up: reset guc
diff --git a/src/test/regress/sql/gpdist_legacy_opclasses.sql b/src/test/regress/sql/gpdist_legacy_opclasses.sql
index 394cca51d47..2170e93c64f 100644
--- a/src/test/regress/sql/gpdist_legacy_opclasses.sql
+++ b/src/test/regress/sql/gpdist_legacy_opclasses.sql
@@ -168,13 +168,9 @@ explain (costs off) select * from legacy_domain_over_int a inner join legacy_dom
 explain (costs off) select * from legacy_int a inner join legacy_domain_over_int b on a.id = b.id;
 explain (costs off) select * from modern_int a inner join legacy_domain_over_int b on a.id = b.id;
 
-
--- Distributing by enum has been banned, so this test is updated to instead distribute by a dummy int column
--- Banned because in backup/restore scenarios the data will be in the "wrong" segment as oids for each enum
--- entry are re-generated and hashing them will result in arbitrary segment assignment.
 create type colors as enum ('red', 'green', 'blue');
-create table legacy_enum(col1 int, color colors) distributed by(col1);
-insert into legacy_enum values (1, 'red'), (2, 'green'), (3, 'blue');
+create table legacy_enum(color colors) distributed by(color cdbhash_enum_ops);
+insert into legacy_enum values ('red'), ('green'), ('blue');
 
 explain (costs off) select * from legacy_enum a inner join legacy_enum b on a.color = b.color;
 select * from legacy_enum a inner join legacy_enum b on a.color = b.color;
diff --git a/src/test/regress/sql/gporca.sql b/src/test/regress/sql/gporca.sql
index 2305773ecf0..29481d859dc 100644
--- a/src/test/regress/sql/gporca.sql
+++ b/src/test/regress/sql/gporca.sql
@@ -3743,6 +3743,25 @@ drop table foo;
 drop table bar;
 reset optimizer_enable_eageragg;
 
+--
+-- Test CTE with nested joins to verify fix for infinite recursion during statistic derivation
+-- This test case exercises ORCA's ability to handle CTEs with complex join patterns
+-- and redistribution motions without falling into infinite recursion
+--
+create table cte_test1 (a int, b int, c int) distributed randomly;
+create table cte_test2 (a int, b int, c int) distributed randomly;
+create table cte_test3 (a int, b int, c int) distributed randomly;
+
+explain (costs off) with cte1 as (
+  select cte_test1.a, cte_test2.b, cte_test1.c from cte_test1 inner join cte_test2 on cte_test1.a = cte_test2.b
+),
+cte2 as (select * from cte1)
+select * from cte2 inner join cte_test3 on cte2.c = cte_test3.a;
+
+drop table cte_test1;
+drop table cte_test2;
+drop table cte_test3;
+
 -- start_ignore
 DROP SCHEMA orca CASCADE;
 -- end_ignore
diff --git a/src/test/regress/sql/gporca_faults.sql b/src/test/regress/sql/gporca_faults.sql
index c9d1634d724..a1d324ad1da 100644
--- a/src/test/regress/sql/gporca_faults.sql
+++ b/src/test/regress/sql/gporca_faults.sql
@@ -30,3 +30,15 @@ SELECT * FROM func1_nosql_vol(5), foo;
 
 -- The fault should *not* be hit above when optimizer = off, to reset it now.
 SELECT gp_inject_fault('opt_relcache_translator_catalog_access', 'reset', 1);
+
+-- Test to check that GPOPTOptimizedPlan() does not cause std::terminate() by throwing an uncaught exception.
+CREATE TABLE test_orca_uncaught_exc(a int, b int) DISTRIBUTED RANDOMLY;
+-- Since ORCA cannot optimize this query, an exception is generated. We then inject a second exception when the
+-- first is caught and verify that it is not propagated further (no std::terminate() is called and backend is alive).
+SELECT gp_inject_fault('opt_clone_error_msg', 'skip', 1);
+SELECT sum(distinct a), count(distinct b) FROM test_orca_uncaught_exc;
+SELECT gp_inject_fault('opt_clone_error_msg', 'reset', 1);
+
+-- start_ignore
+DROP TABLE test_orca_uncaught_exc;
+-- end_ignore
diff --git a/src/test/regress/sql/groupingsets.sql b/src/test/regress/sql/groupingsets.sql
index 054a299b56f..6907b5f1f55 100644
--- a/src/test/regress/sql/groupingsets.sql
+++ b/src/test/regress/sql/groupingsets.sql
@@ -544,6 +544,7 @@ select array(select row(v.a,s1.*) from (select two,four, count(*) from onek grou
 
 -- test the knapsack
 
+set hash_mem_multiplier = 1;
 set enable_indexscan = false;
 set work_mem = '64kB';
 explain (costs off)
@@ -567,6 +568,7 @@ explain (costs off)
          count(*)
     from tenk1 group by grouping sets (unique1,twothousand,thousand,hundred,ten,four,two);
 
+reset hash_mem_multiplier;
 -- check collation-sensitive matching between grouping expressions
 -- (similar to a check for aggregates, but there are additional code
 -- paths for GROUPING, so check again here)
diff --git a/src/test/regress/sql/hs_primary_setup.sql b/src/test/regress/sql/hs_primary_setup.sql
index eeb4421307f..83403299fd5 100644
--- a/src/test/regress/sql/hs_primary_setup.sql
+++ b/src/test/regress/sql/hs_primary_setup.sql
@@ -22,4 +22,11 @@ insert into hs3 values (115);
 DROP sequence if exists hsseq;
 create sequence hsseq;
 
+-- start_ignore
 SELECT pg_switch_wal();
+
+-- GPDB: enable hot_standby for this cluster
+\! gpconfig -c hot_standby -v on;
+\! gpstop -ari;
+
+-- end_ignore
diff --git a/src/test/regress/sql/hs_standby_allowed.sql b/src/test/regress/sql/hs_standby_allowed.sql
index 6debddc5e99..873f3ef8643 100644
--- a/src/test/regress/sql/hs_standby_allowed.sql
+++ b/src/test/regress/sql/hs_standby_allowed.sql
@@ -82,11 +82,12 @@ discard all;
 
 BEGIN;
 
-DECLARE hsc CURSOR FOR select * from hs3;
+DECLARE hsc CURSOR FOR select * from hs3 order by col1 asc;
 
 FETCH next from hsc;
-fetch first from hsc;
-fetch last from hsc;
+-- GPDB: backward fetch isn't allowed, moved to hs_standby_disallowed
+-- fetch first from hsc;
+-- fetch last from hsc;
 fetch 1 from hsc;
 
 CLOSE hsc;
diff --git a/src/test/regress/sql/hs_standby_disallowed.sql b/src/test/regress/sql/hs_standby_disallowed.sql
index a470600eec8..72066e2d40b 100644
--- a/src/test/regress/sql/hs_standby_disallowed.sql
+++ b/src/test/regress/sql/hs_standby_disallowed.sql
@@ -101,3 +101,11 @@ REINDEX TABLE hs2;
 
 REVOKE SELECT ON hs1 FROM PUBLIC;
 GRANT SELECT ON hs1 TO PUBLIC;
+
+-- GPDB: backward fetch is not supported, moved from hs_standby_allowed.
+BEGIN;
+DECLARE hsc CURSOR FOR select * from hs3 order by col1 asc;
+fetch next from hsc;
+fetch first from hsc;
+COMMIT;
+
diff --git a/src/test/regress/sql/hs_standby_functions.sql b/src/test/regress/sql/hs_standby_functions.sql
index b57f67ff8b5..903c8f96037 100644
--- a/src/test/regress/sql/hs_standby_functions.sql
+++ b/src/test/regress/sql/hs_standby_functions.sql
@@ -16,8 +16,8 @@ select pg_stop_backup();
 -- should return no rows
 select * from pg_prepared_xacts;
 
--- just the startup process
-select locktype, virtualxid, virtualtransaction, mode, granted
+-- just the startup processes of all standby coordinator and segments, since pg_locks show cluster-wide view
+select gp_segment_id, locktype, virtualxid, virtualtransaction, mode, granted
 from pg_locks where virtualxid = '1/1';
 
 -- suicide is painless
diff --git a/src/test/regress/sql/icudp/gp_interconnect_fc_method.sql b/src/test/regress/sql/icudp/gp_interconnect_fc_method.sql
index 52af4a220a1..929cd9c5d42 100644
--- a/src/test/regress/sql/icudp/gp_interconnect_fc_method.sql
+++ b/src/test/regress/sql/icudp/gp_interconnect_fc_method.sql
@@ -27,3 +27,11 @@ SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(len
     JOIN small_table USING(jkey)
   GROUP BY rval2
   ORDER BY rval2;
+
+SET gp_interconnect_fc_method = "loss_advance";
+SHOW gp_interconnect_fc_method;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
diff --git a/src/test/regress/sql/icudp/queue_depth_combination_capacity.sql b/src/test/regress/sql/icudp/queue_depth_combination_capacity.sql
index 7e7348d09ca..43aed3fd59e 100644
--- a/src/test/regress/sql/icudp/queue_depth_combination_capacity.sql
+++ b/src/test/regress/sql/icudp/queue_depth_combination_capacity.sql
@@ -66,3 +66,58 @@ SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(len
     JOIN small_table USING(jkey)
   GROUP BY rval2
   ORDER BY rval2;
+
+-- Skew with gather+redistribute
+SET gp_interconnect_fc_method = "loss_advance";
+SHOW gp_interconnect_fc_method;
+
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1024;
+SET gp_interconnect_queue_depth = 1024;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
diff --git a/src/test/regress/sql/icudp/queue_depth_combination_loss_advance.sql b/src/test/regress/sql/icudp/queue_depth_combination_loss_advance.sql
new file mode 100644
index 00000000000..a214e2a48ba
--- /dev/null
+++ b/src/test/regress/sql/icudp/queue_depth_combination_loss_advance.sql
@@ -0,0 +1,65 @@
+-- 
+-- @description Interconncet flow control test case: combination guc value
+-- @created 2025-09-12
+
+-- Set mode
+SET gp_interconnect_fc_method = "loss_advance";
+
+-- Create a table
+CREATE TEMP TABLE small_table(dkey INT, jkey INT, rval REAL, tval TEXT default 'abcdefghijklmnopqrstuvwxyz') DISTRIBUTED BY (dkey);
+
+-- Generate some data
+INSERT INTO small_table VALUES(generate_series(1, 5000), generate_series(5001, 10000), sqrt(generate_series(5001, 10000)));
+
+-- Functional tests
+-- Skew with gather+redistribute
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1;
+SET gp_interconnect_queue_depth = 4096;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 4096;
+SET gp_interconnect_queue_depth = 1;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
+
+-- Set GUC values
+SET gp_interconnect_snd_queue_depth = 1024;
+SET gp_interconnect_queue_depth = 1024;
+SELECT ROUND(foo.rval * foo.rval)::INT % 30 AS rval2, COUNT(*) AS count, SUM(length(foo.tval)) AS sum_len_tval
+  FROM (SELECT 5001 AS jkey, rval, tval FROM small_table ORDER BY dkey LIMIT 3000) foo
+    JOIN small_table USING(jkey)
+  GROUP BY rval2
+  ORDER BY rval2;
diff --git a/src/test/regress/sql/incremental_sort.sql b/src/test/regress/sql/incremental_sort.sql
index eb7a1082f2b..afd1dab2045 100644
--- a/src/test/regress/sql/incremental_sort.sql
+++ b/src/test/regress/sql/incremental_sort.sql
@@ -147,8 +147,8 @@ select * from (select * from t order by a) s order by a, b limit 55;
 -- Test EXPLAIN ANALYZE with only a fullsort group.
 set max_parallel_workers_per_gather = 0;
 select explain_analyze_without_memory('select * from (select * from t order by a) s order by a, b limit 55');
-reset max_parallel_workers_per_gather;
 select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from (select * from t order by a) s order by a, b limit 55'));
+reset max_parallel_workers_per_gather;
 select explain_analyze_inc_sort_nodes_verify_invariants('select * from (select * from t order by a) s order by a, b limit 55');
 delete from t;
 
@@ -181,8 +181,8 @@ rollback;
 -- Test EXPLAIN ANALYZE with both fullsort and presorted groups.
 set max_parallel_workers_per_gather = 0;
 select explain_analyze_without_memory('select * from (select * from t order by a) s order by a, b limit 70');
-reset max_parallel_workers_per_gather;
 select jsonb_pretty(explain_analyze_inc_sort_nodes_without_memory('select * from (select * from t order by a) s order by a, b limit 70'));
+reset max_parallel_workers_per_gather;
 select explain_analyze_inc_sort_nodes_verify_invariants('select * from (select * from t order by a) s order by a, b limit 70');
 delete from t;
 
diff --git a/src/test/regress/sql/jsonb.sql b/src/test/regress/sql/jsonb.sql
index 40cb055c11e..b1ce452a822 100644
--- a/src/test/regress/sql/jsonb.sql
+++ b/src/test/regress/sql/jsonb.sql
@@ -397,6 +397,9 @@ SELECT jsonb_object_agg(name, type) FROM foo;
 INSERT INTO foo VALUES (999999, NULL, 'bar');
 SELECT jsonb_object_agg(name, type) FROM foo;
 
+-- edge case for parser
+SELECT jsonb_object_agg(DISTINCT 'a', 'abc');
+
 -- jsonb_object
 
 -- empty object, one dimension
diff --git a/src/test/regress/sql/matview_data.sql b/src/test/regress/sql/matview_data.sql
index 7c4e85ee582..d1d7af4c7fc 100644
--- a/src/test/regress/sql/matview_data.sql
+++ b/src/test/regress/sql/matview_data.sql
@@ -344,6 +344,20 @@ select count(*) from gp_matview_aux where mvname = 'mv_name1';
 select count(*) from gp_matview_aux where mvname = 'mv_name2';
 abort;
 
+-- start_ignore
+CREATE EXTENSION IF NOT EXISTS gp_inject_fault;
+-- end_ignore
+create table par_normal_oid(a int, b int) partition by range(a) using ao_row distributed randomly;
+select gp_inject_fault('bump_oid', 'skip', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+create table sub_par1_large_oid partition of par_normal_oid for values from (1) to (2) using ao_row;
+select 'sub_par1_large_oid'::regclass::oid > x'7FFFFFFF'::bigint;
+select gp_inject_fault('bump_oid', 'reset', dbid) from gp_segment_configuration where role = 'p' and content = -1;
+create materialized view mv_par_normal_oid as
+    select count(*) from par_normal_oid;
+select mvname, datastatus from gp_matview_aux where mvname = 'mv_par_normal_oid';
+insert into par_normal_oid values(1, 2);
+select mvname, datastatus from gp_matview_aux where mvname = 'mv_par_normal_oid';
+
 --start_ignore
 drop schema matview_data_schema cascade;
 --end_ignore
diff --git a/src/test/regress/sql/misc_jiras.sql b/src/test/regress/sql/misc_jiras.sql
index 651b26344d5..760f2325d3e 100644
--- a/src/test/regress/sql/misc_jiras.sql
+++ b/src/test/regress/sql/misc_jiras.sql
@@ -21,6 +21,7 @@ set statement_mem to '1024kB';
 
 set extra_float_digits=0; -- the last decimal digits are somewhat random
 
+set enable_parallel = off;
 -- Inject fault at 'winagg_after_spool_tuples' to show that the tuplestore spills
 -- to disk.
 SELECT gp_inject_fault('winagg_after_spool_tuples', 'skip', dbid)
@@ -42,6 +43,7 @@ SELECT gp_inject_fault('winagg_after_spool_tuples', 'reset', dbid)
   FROM gp_segment_configuration WHERE role='p' AND content>=0;
 
 reset statement_mem;
+reset enable_parallel;
 
 -- non-ASCII multibyte character should show up correctly in error messages.
 select '溋' || (B'1');
diff --git a/src/test/regress/sql/partition.sql b/src/test/regress/sql/partition.sql
index f3d9c8f0acf..445b1cda74b 100644
--- a/src/test/regress/sql/partition.sql
+++ b/src/test/regress/sql/partition.sql
@@ -1549,7 +1549,7 @@ insert into bar_p values(5, 5);
 drop table bar_p;
 -- Drop should not leave anything lingering for bar_p or its
 -- subpartitions in pg_partition* catalog tables.
-select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+select relid, level, pg_get_expr(template, relid) from gp_partition_template where not exists (select oid from pg_class where oid = relid);
 
 -- MPP-4172
 -- should fail
@@ -1664,11 +1664,11 @@ select relid::regclass, level from gp_partition_template where relid = 'rank_set
 alter table rank_settemp set subpartition template (default subpartition def2);
 
 -- def2 is there
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
 
 alter table rank_settemp set subpartition template (default subpartition def2);
 -- Should still be there
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
 
 
 alter table rank_settemp set subpartition template (start (date '2006-01-01') with (appendonly=true));
@@ -1676,7 +1676,7 @@ alter table rank_settemp add partition f1 values ('N');
 alter table rank_settemp set subpartition template (start (date '2007-01-01') with (appendonly=true, compresslevel=5));
 alter table rank_settemp add partition f2 values ('C');
 
-select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'rank_settemp'::regclass;
 
 drop table rank_settemp;
 
@@ -2381,7 +2381,7 @@ subpartition l2 values (6,7,8,9,10) );
 alter table mpp5992 
 set subpartition template (subpartition l1 values (1,2,3), 
 subpartition l2 values (4,5,6), subpartition l3 values (7,8,9,10));
-select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'mpp5992'::regclass;
 
 -- Now we can add a new partition
 alter table mpp5992 
@@ -2400,7 +2400,7 @@ start (date '2013-01-01') end (date '2014-01-01') WITH (appendonly=true);
 
 select * from pg_partition_tree('mpp5992');
 select relname, relam, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp5992%';
-select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'mpp5992'::regclass;
 
 -- MPP-10223: split subpartitions
 CREATE TABLE MPP10223pk
@@ -2544,7 +2544,7 @@ subpartition by range(d)
 subpartition template (start (1) end (10) every (1))
 (start (20) end (30) every (1));
 
-select relid::regclass, level, template from gp_partition_template where relid = 'MPP10480'::regclass;
+select relid::regclass, level, pg_get_expr(template, relid) from gp_partition_template where relid = 'MPP10480'::regclass;
 
 -- MPP-10421: fix SPLIT of partitions with PRIMARY KEY constraint/indexes
 CREATE TABLE mpp10321a
diff --git a/src/test/regress/sql/partition_append.sql b/src/test/regress/sql/partition_append.sql
new file mode 100644
index 00000000000..7cb3a3ba062
--- /dev/null
+++ b/src/test/regress/sql/partition_append.sql
@@ -0,0 +1,4332 @@
+
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+drop table if exists d;
+drop table if exists c;
+drop table if exists b;
+drop table if exists a;
+-- Check multi level partition COPY
+create table region
+(
+	r_regionkey integer not null,
+	r_name char(25),
+	r_comment varchar(152)
+)
+distributed by (r_regionkey)
+partition by range (r_regionkey)
+subpartition by list (r_name) subpartition template
+(
+	subpartition africa values ('AFRICA'),
+	subpartition america values ('AMERICA'),
+	subpartition asia values ('ASIA'),
+	subpartition europe values ('EUROPE'),
+	subpartition mideast values ('MIDDLE EAST'),
+	subpartition australia values ('AUSTRALIA'),
+	subpartition antarctica values ('ANTARCTICA')
+)
+(
+	partition region1 start (0),
+	partition region2 start (3),
+	partition region3 start (5) end (8)
+);
+
+-- root and internal parent partitions should have relfrozenxid as 0
+select relname, relkind from pg_class where relkind in ('r', 'p') and relname like 'region%' and relfrozenxid=0;
+select gp_segment_id, relname, relkind from gp_dist_random('pg_class') where relkind in ('r', 'p') and relname like 'region%' and relfrozenxid=0;
+
+create unique index region_pkey on region(r_regionkey, r_name);
+
+copy region from stdin with delimiter '|';
+0|AFRICA|lar deposits. blithely final packages cajole. regular waters are 
+1|AMERICA|hs use ironic, even requests. s
+2|ASIA|ges. thinly even pinto beans ca
+3|EUROPE|ly final courts cajole furiously final excuse
+4|MIDDLE EAST|uickly special accounts cajole carefully blithely close 
+5|AUSTRALIA|sdf
+6|ANTARCTICA|dsfdfg
+\.
+
+-- Test indexes
+set enable_seqscan to off;
+select * from region where r_regionkey = 1;
+select * from region where r_regionkey = 2;
+select * from region where r_regionkey = 3;
+select * from region where r_regionkey = 4;
+select * from region where r_regionkey = 5;
+select * from region where r_regionkey = 6;
+
+-- Test indexes with insert
+
+insert into region values(7, 'AUSTRALIA', 'def');
+select * from region where r_regionkey = '7';
+-- test duplicate key. We shouldn't really allow primary keys on partitioned
+-- tables since we cannot enforce them. But since this insert maps to a
+-- single definitive partition, we can detect it.
+insert into region values(7, 'AUSTRALIA', 'def');
+
+drop table region;
+
+-- exchange
+-- 1) test all sanity checking
+
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+
+-- policies are different
+create table bar_p_diff_pol (i int, j int) distributed by (j);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_pol;
+
+-- random policy vs. hash policy
+create table bar_p_rand_pol (i int, j int) distributed randomly;
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_rand_pol;
+
+-- different number of columns
+create table bar_p_diff_col (i int, j int, k int) distributed by (i);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_col;
+
+-- different types
+create table bar_p_diff_typ (i int, j int8) distributed by (i);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_typ;
+
+-- different column names
+create table bar_p_diff_colnam (i int, m int) distributed by (i);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p_diff_colnam;
+
+-- still different schema, but more than one level partitioning
+CREATE TABLE two_level_pt(a int, b int, c int)
+DISTRIBUTED BY (a)
+PARTITION BY RANGE (b)
+      SUBPARTITION BY RANGE (c)
+      SUBPARTITION TEMPLATE (
+      START (11) END (12) EVERY (1))
+      ( START (1) END (2) EVERY (1));
+
+CREATE TABLE candidate_for_leaf(a int, c int);
+
+-- should fail
+ALTER TABLE two_level_pt ALTER PARTITION FOR (1)
+      EXCHANGE PARTITION FOR (11) WITH TABLE candidate_for_leaf;
+
+
+-- different owner 
+create role part_role_append;
+create table bar_p (i int, j int) distributed by (i);
+set session authorization part_role_append;
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+
+-- back to superuser
+\c -
+alter table bar_p owner to part_role_append;
+set session authorization part_role_append;
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+\c -
+
+-- owners should be the same, error out 
+alter table foo_p exchange partition for(6) with table bar_p;
+drop table foo_p;
+drop table bar_p;
+
+-- should work, and new partition should inherit ownership (mpp-6538)
+set role part_role_append;
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(6) every(3));
+reset role;
+alter table foo_p split partition for (1) at (2) into (partition prt_11, partition prt_12);
+\dt foo_*
+drop table foo_p;
+
+drop role part_role_append;
+
+-- WITH OIDS is no longer supported. Check that it't rejected with the GPDB
+-- partitioning syntax, too.
+create table foo_p (i int, j int) with (oids = true) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+
+-- non-partition table involved in inheritance
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+
+create table barparent(i int, j int) distributed by (i);
+create table bar_p () inherits(barparent);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+drop table bar_p;
+drop table barparent;
+
+-- non-partition table involved in inheritance
+create table bar_p(i int, j int) distributed by (i);
+create table barchild () inherits(bar_p);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+drop table barchild;
+drop table bar_p;
+
+-- rules on non-partition table
+create table bar_p(i int, j int) distributed by (i);
+create table baz_p(i int, j int) distributed by (i);
+create rule bar_baz as on insert to bar_p do instead insert into baz_p
+  values(NEW.i, NEW.j);
+
+alter table foo_p exchange partition for(2) with table bar_p;
+drop table foo_p, bar_p, baz_p;
+
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(5) every(1));
+
+-- Shouldn't fail: check constraint matches partition rule.
+-- Note this test is slightly different from prior versions to get
+-- in line with constraint consistency requirement.
+create table bar_d(i int, j int check (j >= 2 and j < 3 ))
+distributed by (i);
+insert into bar_d values(100000, 2);
+alter table foo_p exchange partition for(2) with table bar_d;
+insert into bar_d values(200000, 2);
+select * from bar_d;
+
+drop table foo_p, bar_d;
+
+-- permissions
+create role part_role_append;
+create table foo_p (i int) partition by range(i) (start(1) end(10) every(1));
+create table bar_p (i int);
+
+grant select on foo_p to part_role_append;
+revoke all on bar_p from part_role_append;
+select has_table_privilege('part_role_append', 'foo_p_1_prt_6'::regclass, 'select');
+select has_table_privilege('part_role_append', 'bar_p'::regclass, 'select');
+alter table foo_p exchange partition for(6) with table bar_p;
+
+select has_table_privilege('part_role_append', 'foo_p_1_prt_6'::regclass, 'select');
+select has_table_privilege('part_role_append', 'bar_p'::regclass, 'select');
+
+-- the ONLY keyword will affect just the partition root for both grant/revoke
+create role part_role_append2;
+grant select on only foo_p to part_role_append2;
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+
+grant select on foo_p to part_role_append2;
+revoke select on only foo_p from part_role_append2;
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+revoke select on foo_p from part_role_append2;
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+
+create table foo_p2 (a int, b int) partition by range(a) (start(1) end(10) every(1));
+grant select on foo_p, only foo_p2 to part_role_append2; -- multiple tables in same statement
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+select has_table_privilege('part_role_append2', 'foo_p2'::regclass, 'select');
+select has_table_privilege('part_role_append2', 'foo_p2_1_prt_6'::regclass, 'select');
+
+-- more cases
+revoke all on foo_p from part_role_append2;
+revoke all on foo_p2 from part_role_append2;
+grant select on only public.foo_p to part_role_append2; -- with schema
+select has_table_privilege('part_role_append2', 'foo_p'::regclass, 'select');
+select has_table_privilege('part_role_append2', 'foo_p_1_prt_6'::regclass, 'select');
+grant update(b) on only foo_p2 to part_role_append2; -- column level priviledge
+select relname, has_column_privilege('part_role_append2', oid, 'b', 'update') from pg_class
+where relname = 'foo_p2' or relname = 'foo_p2_1_prt_6';
+
+drop table foo_p;
+drop table foo_p2;
+drop table bar_p;
+drop role part_role_append;
+drop role part_role_append2;
+
+-- validation
+create table foo_p (i int) partition by range(i)
+(start(1) end(10) every(1));
+create table bar_p (i int);
+
+insert into bar_p values(6);
+insert into bar_p values(100);
+-- should fail
+alter table foo_p exchange partition for(6) with table bar_p;
+alter table foo_p exchange partition for(6) with table bar_p without
+validation;
+analyze foo_p;
+select * from foo_p;
+drop table foo_p, bar_p;
+
+-- basic test
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+
+insert into bar_p values(0,6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+select * from bar_p;
+-- test that we got the dependencies right
+drop table bar_p;
+select * from foo_p;
+drop table foo_p;
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+insert into bar_p values(10, 10);
+drop table foo_p;
+select * from bar_p;
+insert into bar_p values(6, 6);
+select * from bar_p;
+drop table bar_p;
+
+-- AO exchange with heap
+create table foo_p (i int, j int) with(appendonly = true) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+
+insert into foo_p values(1, 1), (2, 1), (3, 1);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+drop table bar_p;
+drop table foo_p;
+
+-- other way around
+create table foo_p (i int, j int) with(appendonly = false) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) with(appendonly = true) distributed by (i);
+
+insert into foo_p values(1, 1), (2, 1), (3, 2);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+drop table bar_p;
+drop table foo_p;
+
+-- exchange AO with AO
+create table foo_p (i int, j int) with(appendonly = true) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) with(appendonly = true) distributed by (i);
+
+insert into foo_p values(1, 2), (2, 3), (3, 4);
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+drop table bar_p;
+drop table foo_p;
+
+-- exchange same table more than once
+create table foo_p (i int, j int) distributed by (i)
+partition by range(j)
+(start(1) end(10) every(1));
+create table bar_p(i int, j int) distributed by (i);
+
+insert into bar_p values(6, 6);
+alter table foo_p exchange partition for(6) with table bar_p;
+analyze foo_p;
+select * from foo_p;
+select * from bar_p;
+
+alter table foo_p exchange partition for(6) with table bar_p;
+select * from foo_p;
+select * from bar_p;
+
+alter table foo_p exchange partition for(6) with table bar_p;
+select * from foo_p;
+select * from bar_p;
+drop table foo_p;
+drop table bar_p;
+
+-- exchange default partition is not allowed (single level)
+drop table if exists dex;
+drop table if exists exh_abc;
+create table dex (i int,  j int) partition by range(j)
+(partition a start (1) end(10), partition b start(11) end(20),
+default partition abc);
+
+create table exh_abc (like dex);
+alter table dex exchange default partition with table exh_abc;
+
+drop table dex;
+drop table exh_abc;
+
+-- exchange default partition is not allowed (multi level)
+Drop table if exists sto_ao_ao;
+drop table if exists exh_ao_ao;
+
+Create table sto_ao_ao
+ (
+ col1 bigint, col2 date, col3 text, col4 int) with(appendonly=true)
+ distributed randomly  partition by range(col2)
+ subpartition by list (col3)
+ subpartition template ( default subpartition subothers, subpartition sub1 values ('one'), subpartition sub2 values ('two'))
+ (default partition others, start(date '2008-01-01') end(date '2008-04-30') every(interval '1 month'));
+
+create table exh_ao_ao (like sto_ao_ao) with (appendonly=true);
+alter table sto_ao_ao alter partition for ('2008-03-01') exchange default partition with table exh_ao_ao;
+
+-- Exchange a non-default sub-partition of a default partition, should fail
+alter table sto_ao_ao alter default partition exchange partition for ('one') with table exh_ao_ao;
+
+-- Exchange a partition that has sub partitions, should fail.
+alter table sto_ao_ao exchange partition for ('2008-01-01') with table exh_ao_ao;
+
+-- XXX: not yet: VALIDATE parameter
+
+-- Exchange a partition with an external table;
+create table foo_p (i int, j int) distributed by (i) partition by range(j) (start(1) end(10) every(2));
+create readable external table bar_p(i int, j int) location ('gpfdist://host.invalid:8000/file') format 'text';
+alter table foo_p exchange partition for(3) with table bar_p;
+truncate foo_p;
+drop table foo_p;
+drop table bar_p;
+
+-- Check for overflow of circular data types like time
+-- Should fail
+CREATE TABLE TIME_TBL_HOUR_2 (f1 time(2)) distributed by (f1)
+partition by range (f1)
+(
+  start (time '00:00') end (time '24:00') EVERY (INTERVAL '1 hour')
+);
+-- Should fail
+CREATE TABLE TIME_TBL_HOUR_2 (f1 time(2)) distributed by (f1)
+partition by range (f1)
+(
+  start (time '00:00') end (time '23:59') EVERY (INTERVAL '1 hour')
+);
+-- Should work
+CREATE TABLE TIME_TBL_HOUR_2 (f1 time(2)) distributed by (f1)
+partition by range (f1)
+(
+  start (time '00:00') end (time '23:00') EVERY (INTERVAL '1 hour')
+);
+drop table TIME_TBL_HOUR_2;
+-- Check for every parameters that just don't make sense
+create table hhh_r2 (a char(1), b date, d char(3))
+distributed by (a) partition by range (b)
+(                                                              
+partition aa start (date '2007-01-01') end (date '2008-01-01') 
+      every (interval '0 days')
+);
+
+create table foo_p (i int) distributed by(i)
+partition by range(i)
+(start (1) end (20) every(0));
+
+-- Check for ambiguous EVERY parameters
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (3) every (0.6));
+\d+ foo_p
+drop table foo_p;
+-- should fail
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (3) every (0.3));
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (3) every (1.3));
+\d+ foo_p
+drop table foo_p;
+
+create table foo_p (i int) distributed by (i)
+partition by range(i)
+(start (1) end (20) every (10.9));
+\d+ foo_p
+drop table foo_p;
+
+-- should fail
+create table foo_p (i int, j date) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2008-01-01') every (interval '0.5 days'));
+
+-- should fail
+create table foo_p (i int, j date) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2008-01-01') every (interval '12 hours'));
+
+create table foo_p (i int, j date) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2007-01-05') every (interval '1.2 days'));
+\d+ foo_p
+drop table foo_p;
+
+-- should work
+create table foo_p (i int, j timestamp) distributed by (i)
+partition by range(j)
+(start ('2007-01-01') end ('2007-01-05') every (interval '1.2 days'));
+\d+ foo_p
+drop table foo_p;
+
+-- test inclusive/exclusive
+CREATE TABLE supplier2(
+                S_SUPPKEY INTEGER,
+                S_NAME CHAR(25),
+                S_ADDRESS VARCHAR(40),
+                S_NATIONKEY INTEGER,
+                S_PHONECHAR char(15),
+                S_ACCTBAL decimal,
+				S_COMMENT VARCHAR(100)
+)
+partition by range (s_nationkey)
+(
+partition p1 start(0) , 
+partition p2 start(12) end(13), 
+partition p3 end(20) inclusive, 
+partition p4 start(20) exclusive , 
+partition p5 start(22) end(25)
+);
+
+\d+ supplier2
+
+insert into supplier2 (s_suppkey, s_nationkey) select i, i 
+from generate_series(1, 24) i;
+select * from supplier2_1_prt_p1 order by S_NATIONKEY;
+select * from supplier2_1_prt_p2 order by S_NATIONKEY;
+select * from supplier2_1_prt_p3 order by S_NATIONKEY;
+select * from supplier2_1_prt_p4 order by S_NATIONKEY;
+select * from supplier2_1_prt_p5 order by S_NATIONKEY;
+drop table supplier2;
+
+-- mpp3238
+create table foo_p (i int) partition by range (i)
+(
+ partition p1 start('1') ,
+ partition p2 start('2639161') ,
+ partition p3 start('5957166') ,
+ partition p4 start('5981976') end('5994376') inclusive,
+ partition p5 end('6000001')
+);
+\d+ foo_p
+
+insert into foo_p values(5994400);
+insert into foo_p values(1);
+insert into foo_p values(6000002);
+insert into foo_p values(5994376);
+drop table foo_p;
+
+create table foo_p (i int) 
+partition by range(i)
+(partition p1 start(1) end(5),
+ partition p2 start(10),
+ partition p3 end(10) exclusive);
+\d+ foo_p
+
+drop table foo_p;
+create table foo_p (i int) 
+partition by range(i)
+(partition p1 start(1) end(5),
+ partition p2 start(10) exclusive,
+ partition p3 end(10) inclusive);
+\d+ foo_p
+
+insert into foo_p values(1), (5), (10);
+drop table foo_p;
+
+-- MPP-3264
+-- mix AO with master HEAP and see if copy works
+create table foo_p (i int)
+partition by list(i)
+(partition p1 values(1, 2, 3) with (appendonly = true),
+ partition p2 values(4)
+);
+
+copy foo_p from stdin;
+1
+2
+3
+4
+\.
+select * from foo_p;
+select * from foo_p_1_prt_p1;
+select * from foo_p_1_prt_p2;
+drop table foo_p;
+-- other way around
+create table foo_p (i int) with(appendonly = true)
+partition by list(i)
+(partition p1 values(1, 2, 3) with (appendonly = false),
+ partition p2 values(4)
+);
+
+copy foo_p from stdin;
+1
+2
+3
+4
+\.
+select * from foo_p;
+select * from foo_p_1_prt_p1;
+select * from foo_p_1_prt_p2;
+drop table foo_p;
+
+-- Same as above, but the input is ordered so that the inserts to the heap
+-- partition happen first. Had a bug related flushing the multi-insert
+-- buffers in that scenario at one point.
+-- (https://github.com/greenplum-db/gpdb/issues/6678
+create table mixed_ao_part(distkey int, partkey int)
+with (appendonly=true) distributed by(distkey)
+partition by range(partkey) (
+  partition p1 start(0) end(100) with (appendonly = false),
+   partition p2 start(100) end(199)
+);
+copy mixed_ao_part from stdin;
+1	95
+2	96
+3	97
+4	98
+5	99
+1	100
+2	101
+3	102
+4	103
+5	104
+\.
+select * from mixed_ao_part;
+
+-- Don't drop the table, so that we leave behind a mixed table in the
+-- regression database for pg_dump/restore testing.
+
+-- MPP-3283
+CREATE TABLE PARTSUPP (
+PS_PARTKEY INTEGER,
+PS_SUPPKEY INTEGER,
+PS_AVAILQTY integer,
+PS_SUPPLYCOST decimal,
+PS_COMMENT VARCHAR(199)
+)
+partition by range (ps_suppkey)
+subpartition by range (ps_partkey)
+subpartition by range (ps_supplycost) subpartition template (start('1')
+end('1001') every(500))
+(
+partition p1 start('1') end('10001') every(5000)
+(subpartition sp1 start('1') end('200001') every(66666)
+)
+);
+insert into partsupp values(1,2,3325,771.64,', even theodolites. regular, final
+theodolites eat after the carefully pending foxes. furiously regular deposits
+sleep slyly. carefully bold realms above the ironic dependencies haggle
+careful');
+copy partsupp from stdin with delimiter '|';
+1|2|3325|771.64|, even theodolites. regular, final theodolites eat after the
+\.
+drop table partsupp;
+--MPP-3285
+CREATE TABLE PARTLINEITEM (
+                L_ORDERKEY INT8,
+                L_PARTKEY INTEGER,
+                L_SUPPKEY INTEGER,
+                L_LINENUMBER integer,
+                L_QUANTITY decimal,
+                L_EXTENDEDPRICE decimal,
+                L_DISCOUNT decimal,
+                L_TAX decimal,
+                L_RETURNFLAG CHAR(1),
+                L_LINESTATUS CHAR(1),
+                L_SHIPDATE date,
+                L_COMMITDATE date,
+                L_RECEIPTDATE date,
+                L_SHIPINSTRUCT CHAR(25),
+                L_SHIPMODE CHAR(10),
+                L_COMMENT VARCHAR(44)
+                )
+partition by range (l_commitdate)
+(
+partition p1 start('1992-01-31') end('1998-11-01') every(interval '20 months')
+
+);
+copy partlineitem from stdin with delimiter '|';
+18182|5794|3295|4|9|15298.11|0.04|0.01|N|O|1995-07-04|1995-05-30|1995-08-03|DELIVER IN PERSON|RAIL|y special platelets
+\.
+
+\d+ partlineitem
+
+drop table partlineitem;
+
+-- Make sure ADD creates dependencies
+create table i (i int) partition by range(i) (start (1) end(3) every(1));
+alter table i add partition foo2 start(40) end (50);
+drop table i;
+
+create table i (i int) partition by range(i) (start (1) end(3) every(1));
+alter table i add partition foo2 start(40) end (50);
+alter table i drop partition foo2;
+
+-- when using the partition name to find target partition table,
+-- we shoud check whether the matched table belong to the partitioned table.
+-- raise error instead of executing on the irrelevant table.
+create table i_1_prt_3 (like i);
+
+-- create another partitioned table which contains a partition table that
+-- could be matched by partition name when targeted on an irrelevant table.
+create table i2 (i int) partition by range(i) (start (1) end(3) every(1));
+create table i_1_prt_4 partition of i2 for values from (4) to (5);
+
+-- the matechd table name is i_1_prt_3, but it's a normal table, raise error.
+alter table i drop partition "3";
+-- the matched table name is i_1_prt_4, but it belongs to i2, raise error
+alter table i drop partition "4";
+
+-- should raise error since we always make sure the partitioned table at least have one partition;
+alter table i drop partition "1", drop partition "2";
+
+drop table i;
+drop table i2;
+drop table i_1_prt_3;
+
+create table i (i int) partition by range(i) (start(1) end(3) every(1), default partition extra);
+-- should raise error since we always make sure the partitioned table at least have one partition;
+alter table i drop partition "2", drop partition "3", drop default partition;
+drop table i;
+
+create table i (i int, c text) partition by range(i) subpartition by list(c)
+subpartition template (subpartition a values ('a'), subpartition b values ('b'))
+(start (1) end(3) every(1));
+-- should raise error since we always make sure the partitioned table at least have one partition;
+alter table i alter partition "1" drop partition a, alter partition "1" drop partition b;
+drop table i;
+
+CREATE TABLE PARTSUPP (
+PS_PARTKEY INTEGER,
+PS_SUPPKEY INTEGER,
+PS_AVAILQTY integer,
+PS_SUPPLYCOST decimal,
+PS_COMMENT VARCHAR(199)
+)
+partition by range (ps_suppkey)
+subpartition by range (ps_partkey)
+subpartition by range (ps_supplycost) subpartition template (start('1')
+end('1001') every(500))
+(
+partition p1 start('1') end('10001') every(5000)
+(subpartition sp1 start('1') end('200001') every(66666)
+)
+);
+
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'partsupp%';
+drop table partsupp;
+
+-- ALTER TABLE ALTER PARTITION tests
+
+CREATE TABLE ataprank (id int, rank int,
+year date, gender char(1),
+usstate char(2))
+DISTRIBUTED BY (id, gender, year, usstate)
+partition by list (gender)
+subpartition by range (year)
+subpartition template (
+subpartition jan01 start (date '2001-01-01'),
+subpartition jan02 start (date '2002-01-01'),
+subpartition jan03 start (date '2003-01-01'),
+subpartition jan04 start (date '2004-01-01'),
+subpartition jan05 start (date '2005-01-01')
+)
+subpartition by list (usstate)
+subpartition template (
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+)
+(
+  partition boys values ('M'),
+  partition girls values ('F')
+);
+
+-- and without subpartition templates...
+CREATE TABLE ataprank2 (id int, rank int,
+year date, gender char(1),
+usstate char(2))
+DISTRIBUTED BY (id, gender, year, usstate)
+partition by list (gender)
+subpartition by range (year)
+subpartition by list (usstate)
+(
+  partition boys values ('M') 
+(
+subpartition jan01 start (date '2001-01-01') 
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan02 start (date '2002-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan03 start (date '2003-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan04 start (date '2004-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan05 start (date '2005-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+)
+),
+
+  partition girls values ('F')
+(
+subpartition jan01 start (date '2001-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan02 start (date '2002-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan03 start (date '2003-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan04 start (date '2004-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+),
+subpartition jan05 start (date '2005-01-01')
+(
+subpartition mass values ('MA'),
+subpartition cali values ('CA'),
+subpartition ohio values ('OH')
+)
+)
+);
+
+-- ok
+alter table ataprank truncate partition girls;
+alter table ataprank alter partition girls truncate partition for ('2001-01-01');
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') truncate partition mass;
+
+-- addressing partitions by RANK is no longer supported
+alter table ataprank truncate partition for (rank (1));
+
+
+-- don't NOTIFY of children if cascade
+alter table ataprank truncate partition girls cascade;
+
+-- fail - no partition for '1999-01-01'
+alter table ataprank alter partition girls truncate partition for ('1999-01-01');
+
+-- fail - no funky
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') truncate partition "funky";
+
+-- fail - no funky (drop)
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') drop partition "funky";
+
+-- fail - missing name
+alter table ataprank alter partition girls alter partition 
+for ('2001-01-01') drop partition ;
+
+-- ok
+alter table ataprank alter partition girls drop partition 
+for ('2001-01-01') ;
+
+-- ok , skipping
+alter table ataprank alter partition girls drop partition if exists jan01;
+
+-- ok
+alter table ataprank alter partition girls drop partition for ('2002-01-01');
+alter table ataprank alter partition girls drop partition for ('2003-01-01');
+alter table ataprank alter partition girls drop partition for ('2004-01-01');
+
+-- ok, skipping
+alter table ataprank alter partition girls drop partition if exists for ('2004-01-01');
+
+-- ok
+alter table ataprank alter partition girls rename partition jan05 
+to "funky fresh";
+alter table ataprank alter partition girls rename partition "funky fresh"
+to jan05;
+
+-- fail , not exist
+alter table ataprank alter partition girls alter partition jan05 rename
+partition jan01 to foo;
+
+-- fail not exist
+alter table ataprank alter partition girls alter partition jan05 alter
+partition cali rename partition foo to bar;
+
+-- fail not partitioned
+alter table ataprank alter partition girls alter partition jan05 alter
+partition cali alter partition foo drop partition bar;
+
+-- ADD PARTITION, with and without templates
+
+-- fails for ataprank (due to template), works for ataprank2
+alter table ataprank
+add partition neuter values ('N')
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition bar values ('AZ')));
+alter table ataprank2
+add partition neuter values ('N')
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition bar values ('AZ')));
+
+-- fail , no subpartition spec for ataprank2, works for ataprank
+alter table ataprank alter partition boys
+add partition jan00 start ('2000-01-01') end ('2001-01-01');
+alter table ataprank2 alter partition boys
+add partition jan00 start ('2000-01-01') end ('2001-01-01');
+
+-- work - create subpartition for ataprank2, fail for ataprank
+alter table ataprank alter partition boys
+add partition jan99 start ('1999-01-01') end ('2000-01-01')
+  (subpartition ariz values ('AZ'));
+alter table ataprank2 alter partition boys
+add partition jan00 start ('2000-01-01') end ('2001-01-01')
+  (subpartition ariz values ('AZ'));
+
+-- works for both -- adding leaf partition doesn't conflict with template
+alter table ataprank alter partition boys
+alter partition jan00 
+add partition haw values ('HI');
+alter table ataprank2 alter partition boys
+alter partition jan00 
+add partition haw values ('HI');
+
+alter table ataprank drop partition neuter;
+alter table ataprank2 drop partition neuter;
+
+-- fail , no subpartition spec for ataprank2, work for ataprank
+alter table ataprank
+add default partition neuter ;
+alter table ataprank2
+add default partition neuter ;
+
+alter table ataprank
+add default partition neuter 
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition ariz values ('AZ')));
+alter table ataprank2
+add default partition neuter 
+    (subpartition foo
+         start ('2001-01-01') end ('2002-01-01')
+         every (interval '1 month')
+            (subpartition ariz values ('AZ')));
+
+-- fail
+alter table ataprank
+alter default partition add default partition def1 
+(subpartition haw values ('HI'));
+-- fail
+alter table ataprank
+alter default partition alter default partition 
+add default partition def2;
+-- work
+alter table ataprank
+alter default partition add default partition def1;
+alter table ataprank
+alter default partition alter default partition 
+add default partition def2;
+
+
+
+alter table ataprank2
+alter default partition add default partition def1 
+(subpartition haw values ('HI'));
+alter table ataprank2
+alter default partition alter default partition 
+add default partition def2;
+
+
+drop table ataprank ;
+drop table ataprank2 ;
+
+-- **END** ALTER TABLE ALTER PARTITION tests
+
+-- Test casting
+create table f (i int) partition by range (i) (start(1::int) end(10::int));
+drop table f;
+create table f (i bigint) partition by range (i) (start(1::int8)
+end(1152921504606846976::int8) every(576460752303423488));
+drop table f;
+create table f (n numeric(20, 2)) partition by range(n) (start(1::bigint)
+end(10000::bigint));
+drop table f;
+--should fail, there's no assignment cast from text to numeric
+create table f (n numeric(20, 2)) partition by range(n) (start(1::bigint)
+end(10000::text));
+--should fail. there's no assignment cast from bool to numeric
+create table f (n numeric(20, 2)) partition by range(n) (start(1::bigint)
+end('f'::bool));
+
+-- see that grant and revoke cascade to children
+create role part_role_append;
+create table granttest (i int, j int) partition by range(i) 
+subpartition by list(j) subpartition template (values(1, 2, 3))
+(start(1) end(4) every(1));
+
+select relname, has_table_privilege('part_role_append', oid,'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+
+grant select (i) on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid,'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+
+grant select on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid,'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+
+grant insert on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+
+revoke insert on granttest from part_role_append;
+grant insert (j) on granttest to part_role_append;
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+
+-- Check that when a new partition is created, it inherits the permissions
+-- from the parent.
+alter table granttest add partition newpart start(100) end (101);
+
+-- same with the new upstream syntax.
+create table granttest_newpartsyntax partition of granttest for values from (110) to (120);
+
+select relname, has_table_privilege('part_role_append', oid, 'select') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'select') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'select') as j_priv
+from pg_class where relname like 'granttest%';
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+
+revoke all on granttest from part_role_append;
+select relname, has_table_privilege('part_role_append', oid, 'insert') as tabpriv,
+       has_column_privilege('part_role_append', oid, 'i', 'insert') as i_priv,
+       has_column_privilege('part_role_append', oid, 'j', 'insert') as j_priv
+from pg_class where relname like 'granttest%';
+
+drop table granttest;
+drop role part_role_append;
+
+-- deep inline + optional subpartition comma:
+CREATE TABLE partsupp_1 (
+    ps_partkey integer,
+    ps_suppkey integer,
+    ps_availqty integer,
+    ps_supplycost numeric,
+    ps_comment character varying(199)
+) distributed by (ps_partkey) PARTITION BY RANGE(ps_suppkey)
+          SUBPARTITION BY RANGE(ps_partkey)
+                  SUBPARTITION BY RANGE(ps_supplycost) 
+          (
+          PARTITION p1_1 START (1) END (1666667) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  ), 
+          PARTITION p1_2 START (1666667) END (3333333) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  ), 
+          PARTITION p1_3 START (3333333) END (4999999) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  ), 
+          PARTITION p1_4 START (4999999) END (5000001) EVERY (1666666) 
+                  (
+                  START (1) END (19304783) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          ), 
+                  START (19304783) END (100000001) 
+                          (
+                          START (1::numeric) END (501::numeric) EVERY (500), 
+                          START (501::numeric) END (1001::numeric) EVERY (500)
+                          )
+                  )
+          );
+
+-- Accept negative values trivially:
+create table partition_g (i int) partition by range(i) (start((-1)) end(10));
+drop table partition_g;
+create table partition_g (i int) partition by range(i) (start(-1) end(10));
+drop table partition_g;
+
+CREATE TABLE orders (
+    o_orderkey bigint,
+    o_custkey integer,
+    o_orderstatus character(1),
+    o_totalprice numeric,
+    o_orderdate date,
+    o_orderpriority character(15),
+    o_clerk character(15),
+    o_shippriority integer,
+    o_comment character varying(79)
+)
+WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) PARTITION BY RANGE(o_orderdate)
+          SUBPARTITION BY RANGE(o_custkey)
+                  SUBPARTITION BY RANGE(o_orderkey) 
+          (
+          PARTITION p1_1 START ('1992-01-01'::date) END ('1993-06-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_2 START ('1993-06-01'::date) END ('1994-11-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_3 START ('1994-11-01'::date) END ('1996-04-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_4 START ('1996-04-01'::date) END ('1997-09-01'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  ), 
+          PARTITION p1_5 START ('1997-09-01'::date) END ('1998-08-03'::date) EVERY ('1 year 5 mons'::interval) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                  (
+                  SUBPARTITION sp1 START (1) END (46570) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          ), 
+                  SUBPARTITION sp2 START (46570) END (150001) INCLUSIVE WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9) 
+                          (
+                          START (1::bigint) END (1500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (1500001::bigint) END (3000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (3000001::bigint) END (4500001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9), 
+                          START (4500001::bigint) END (6000001::bigint) EVERY (1500000) WITH (appendonly=true, checksum=true, blocksize=368640, compresslevel=9)
+                          )
+                  )
+          );
+
+-- grammar bug: MPP-3361
+create table i2 (i int) partition by range(i) (start(-2::int) end(20));
+drop table i2;
+create table i2 (i int) partition by range(i) (start((-2)::int) end(20));
+drop table i2;
+create table i2 (i int) partition by range(i) (start(cast ((-2)::bigint as int))
+end(20));
+drop table i2;
+CREATE TABLE partsupp (
+    ps_partkey integer,
+    ps_suppkey integer,
+    ps_availqty integer,
+    ps_supplycost numeric,
+    ps_comment character varying(199)
+) PARTITION BY RANGE(ps_supplycost)
+          (
+          PARTITION newpart START ((-10000)::numeric) EXCLUSIVE END (1::numeric)
+,
+          PARTITION p1 START (1::numeric) END (1001::numeric)
+          );
+drop table partsupp;
+
+-- Deletion tests
+CREATE TABLE tmp_nation_region (n_regionkey integer);
+drop table if exists tmp_nation;
+CREATE TABLE tmp_nation (N_NATIONKEY INTEGER, N_NAME CHAR(25), N_REGIONKEY INTEGER, N_COMMENT VARCHAR(152))  
+partition by range (n_nationkey) 
+ (
+partition p1 start('0')  WITH (appendonly=true,checksum=true,blocksize=1998848,compresslevel=4),  
+partition p2 start('11') end('15') inclusive WITH (checksum=false,appendonly=true,blocksize=655360,compresslevel=4),
+partition p3 start('15') exclusive end('19'), partition p4 start('19')  WITH (compresslevel=8,appendonly=true,checksum=false,blocksize=884736), 
+partition p5 start('20')
+);
+delete from tmp_nation where n_regionkey in (select n_regionkey from tmp_nation_region) and n_nationkey between 1 and 5;
+drop table tmp_nation;
+
+-- SPLIT tests
+-- basic sanity tests. All should pass.
+create table k (i int) partition by range(i) (start(1) end(10) every(2), 
+default partition mydef);
+insert into k select i from generate_series(1, 100) i;
+alter table k split partition mydef at (20) into (partition mydef, 
+partition foo);
+drop table k;
+
+create table j (i int) partition by list(i) (partition a values(1, 2, 3, 4),
+partition b values(5, 6, 7, 8));
+insert into j select i from generate_series(1, 8) i;
+alter table j split partition for(1) at (2, 3) into (partition fa, partition
+fb);
+select * from j_1_prt_fa;
+select * from j_1_prt_fb;
+alter table j split partition for(5) at (6);
+select * from j;
+-- should fail
+alter table j split partition for (1) at (100);
+drop table j;
+create table k (i int) partition by range(i) (start(1) end(10) every(2), 
+default partition mydef);
+-- should fail
+alter table k split default partition start(30) end (300) into (partition mydef, partition mydef);
+alter table k split partition for(3) at (20);
+drop table k;
+-- should work
+create table k (i int) partition by range(i) (start(1) end(10) every(2), 
+default partition mydef);
+insert into k select i from generate_series(1, 30) i;
+alter table k split default partition start(15) end(20) into
+(partition mydef, partition foo);
+select * from k_1_prt_foo;
+alter table k split default partition start(22) exclusive end(25) inclusive
+into (partition bar, partition mydef);
+select * from k_1_prt_bar;
+
+-- This fails, because it would create a partition with an empty range. Before
+-- GPDB 7, this passed, because a partition like "start (22) exclusive end (23)
+-- exclusive" was considered valid.
+alter table k split partition bar at (23) into (partition baz, partition foz);
+\d+ k
+drop table k;
+-- Add CO partition and split, reported in MPP-17761
+create table k (i int) with (appendonly = true, orientation = column) distributed by (i) partition by range(i) (start(1) end(10) every(5));
+alter table k add partition co start(11) end (17) with (appendonly = true, orientation = column);
+alter table k split partition co at (14) into (partition co1, partition co2);
+drop table k;
+create table k (a int, b int) with (appendonly = true) distributed by (a) partition by list(b)
+(
+	partition a values (1, 2, 3, 4) with (appendonly = true, orientation = column),
+	partition b values (5, 6, 7 ,8) with (appendonly = true, orientation = column)
+);
+alter table k split partition for(2) at(2) into (partition one, partition two);
+drop table k;
+-- Test errors for default handling
+create table k (i int) partition by range(i) (start(1) end(2), 
+default partition mydef);
+alter table k split partition mydef at (25) into (partition foo, partition
+mydef);
+drop table k;
+create table k (i int) partition by list(i) (values(1), values(2),
+default partition mydef);
+alter table k split default partition start(10) end(20);
+drop table k;
+
+-- Check that we support int2
+CREATE TABLE myINT2_TBL(q1 int2)
+ partition by range (q1)
+ (start (1) end (3) every (1));
+insert into myint2_tbl values(1), (2);
+drop table myint2_tbl;
+
+-- try SREH on a partitioned table.
+create table ao_p (i int) with (appendonly = true)
+ partition by range(i)
+ (start(1) end(5) every(1));
+
+copy ao_p from stdin log errors segment reject limit 100;
+2
+3
+10000
+f
+\.
+select * from ao_p;
+drop table ao_p;
+
+-- MPP-3591: make sure we get inclusive/exclusive right with every().
+create table k (i int) partition by range(i)
+(start(0) exclusive end(100) inclusive every(25));
+\d+ k
+insert into k select i from generate_series(1, 100) i;
+drop table k;
+
+-- ADD and SPLIT must get inherit permissions of the partition they're
+-- modifying
+create role part_role_append;
+create table a (a int, b int, c int) partition by range(a) subpartition by
+range(b) subpartition template (subpartition h start(1) end(10)) 
+subpartition by range(c)
+subpartition template(subpartition i start(1) end(10)) 
+(partition g start(1) end(2));
+revoke all on a from public;
+grant insert on a to part_role_append;
+-- revoke it from one existing partition, to make sure we don't screw up
+-- existing permissions
+revoke all on a_1_prt_g_2_prt_h_3_prt_i from part_role_append;
+alter table a add partition b start(40) end(50);
+set session authorization part_role_append;
+select has_table_privilege('part_role_append', 'a'::regclass,'insert');
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h'::regclass,'insert');
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h_3_prt_i'::regclass,'insert');
+select has_table_privilege('part_role_append', 'a_1_prt_g_2_prt_h_3_prt_i'::regclass,
+'insert');
+insert into a values(45, 5, 5);
+-- didn't grant select
+select has_table_privilege('part_role_append', 'a'::regclass,'select');
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h'::regclass,'select');
+select has_table_privilege('part_role_append', 'a_1_prt_b_2_prt_h_3_prt_i'::regclass,'select');
+\c -
+drop table a;
+create table a (i date) partition by range(i) 
+(partition f start(date '2005-01-01') end (date '2009-01-01')
+	every(interval '2 years'));
+revoke all on a from public;
+grant insert on a to part_role_append;
+alter table a split partition for ('2005-01-01') at (date '2006-01-01')
+  into (partition f, partition g);
+alter table a add default partition mydef;
+alter table a split default partition start(date '2010-01-01') end(date
+'2011-01-01') into(partition mydef, partition other);
+set session authorization part_role_append;
+select has_table_privilege('part_role_append', 'a'::regclass,'insert');
+select has_table_privilege('part_role_append', 'a_1_prt_f'::regclass,'insert');
+select has_table_privilege('part_role_append', 'a_1_prt_mydef'::regclass,'insert');
+select has_table_privilege('part_role_append', 'a_1_prt_other'::regclass,'insert');
+insert into a values('2005-05-05');
+insert into a values('2006-05-05');
+insert into a values('2010-10-10');
+\c -
+drop table a;
+drop role part_role_append;
+-- Check that when we split a default, the INTO clause must named the default
+create table k (i date) partition by range(i) (start('2008-01-01')
+end('2009-01-01') every(interval '1 month'), default partition default_part);
+alter table k split default partition start ('2009-01-01') end ('2009-02-01')
+into (partition aa, partition nodate);
+alter table k split default partition start ('2009-01-01') end ('2009-02-01')
+into (partition aa, partition default_part);
+-- check that it works without INTO
+alter table k split default partition start ('2009-02-01') end ('2009-03-01');
+drop table k;
+-- List too
+create table k (i int) partition by list(i) (partition a values(1, 2),
+partition b values(3, 4), default partition mydef);
+alter table k split partition mydef at (5) into (partition foo, partition bar);
+alter table k split partition mydef at (5) into (partition foo, partition mydef);
+alter table k split partition mydef at (10);
+drop table k;
+
+-- For LIST, make sure that we reject AT() clauses which match all parameters
+create table j (i int) partition by list(i) (partition a values(1, 2, 3, 4),
+ partition b values(5, 6, 7, 8));
+alter table j split partition for(1) at (1,2) into (partition fa, partition fb);
+alter table j split partition for(1) at (1,2) 
+into (partition f1a, partition f1b); -- This has partition rules that overlaps
+drop table j;
+
+-- Check that we can split LIST partitions that have a default partition
+create table j (i int) partition by list(i) (partition a values(1, 2, 3, 4),
+partition b values(5, 6, 7, 8), default partition default_part);
+alter table j split partition for(1) at (1,2) into (partition f1a, partition
+f1b);
+drop table j;
+-- Make sure range can too
+create table j (i int) partition by range(i) (partition a start(1) end(10),
+default partition default_part);
+alter table j split partition for(1) at (5) into (partition f1a, partition f1b);
+drop table j;
+
+-- MPP-3667 ADD PARTITION overlaps
+create table mpp3621 (aa date, bb date) partition by range (bb)
+(partition foo start('2008-01-01'));
+
+-- these are ok
+alter table mpp3621 add partition a1 start ('2007-01-01') end ('2007-02-01');
+alter table mpp3621 add partition a2 start ('2007-02-01') end ('2007-03-01');
+alter table mpp3621 add partition a3 start ('2007-03-01') end ('2007-04-01');
+alter table mpp3621 add partition a4 start ('2007-09-01') end ('2007-10-01');
+alter table mpp3621 add partition a5 start ('2007-08-01') end ('2007-09-01');
+alter table mpp3621 add partition a6 start ('2007-04-01') end ('2007-05-01');
+alter table mpp3621 add partition a7 start ('2007-05-01') end ('2007-06-01');
+
+ -- was error due to startSearchpoint != endSearchpoint
+alter table mpp3621 add partition a8 start ('2007-07-01') end ('2007-08-01');
+
+-- ok
+alter table mpp3621 add partition a9 start ('2007-06-01') end ('2007-07-01');
+
+drop table mpp3621;
+
+-- Check for MPP-3679 and MPP-3692
+create table list_test (a text, b text) partition by list (a) (
+  partition foo values ('foo'),
+  partition bar values ('bar'),
+  default partition baz);
+insert into list_test values ('foo', 'blah');
+insert into list_test values ('bar', 'blah');
+insert into list_test values ('baz', 'blah');
+alter table list_test split default partition at ('baz')
+  into (partition bing, default partition);
+drop table list_test;
+
+-- MPP-3816: cannot drop column  which is the subject of partition config
+create table list_test(a int, b int, c int) distributed by (a)
+  partition by list(b) 
+  subpartition by list(c) subpartition template(subpartition c values(2))
+  (partition b values(1));
+-- should fail
+alter table list_test drop column b;
+alter table list_test drop column c;
+drop table list_test;
+
+-- MPP-3678: allow exchange and split on tables with subpartitioning
+CREATE TABLE rank_exc (
+id int,
+rank int,
+year int,
+gender char(1),
+count int ) 
+
+DISTRIBUTED BY (id)
+PARTITION BY LIST (gender)
+SUBPARTITION BY RANGE (year)
+SUBPARTITION TEMPLATE (
+SUBPARTITION year1 START (2001),
+SUBPARTITION year2 START (2002),
+SUBPARTITION year3 START (2003),
+SUBPARTITION year4 START (2004),
+SUBPARTITION year5 START (2005),
+SUBPARTITION year6 START (2006) END (2007) )
+(PARTITION girls VALUES ('F'),
+PARTITION boys VALUES ('M')
+);
+alter table rank_exc alter partition girls add default partition gfuture;
+alter table rank_exc alter partition boys add default partition bfuture;
+insert into rank_exc values(1, 1, 2007, 'M', 1);
+insert into rank_exc values(2, 2, 2008, 'M', 3);
+select * from rank_exc;
+alter table rank_exc alter partition boys split default partition start ('2007')
+end ('2008') into (partition bfuture, partition year7);
+select * from rank_exc_1_prt_boys_2_prt_bfuture;
+select * from rank_exc_1_prt_boys_2_prt_year7;
+select * from rank_exc;
+
+--exchange test
+create table r (like rank_exc);
+insert into rank_exc values(3, 3, 2004, 'F', 100);
+insert into r values(3, 3, 2004, 'F', 100000);
+alter table rank_exc alter partition girls exchange partition year4 with table r;
+select * from rank_exc_1_prt_girls_2_prt_year4;
+select * from r;
+alter table rank_exc alter partition girls exchange partition year4 with table r;
+select * from rank_exc_1_prt_girls_2_prt_year4;
+select * from r;
+
+-- Split test
+alter table rank_exc alter partition girls split default partition start('2008')
+  end('2020') into (partition years, partition gfuture);
+insert into rank_exc values(4, 4, 2009, 'F', 100);
+drop table rank_exc;
+drop table r;
+
+-- MPP-4245: remove virtual subpartition templates when we drop the partitioned
+-- table
+create table bar_p (i int, j int) partition by range(i) subpartition by range(j)
+subpartition template(start(1) end(10) every(1)) subpartition by range(i)
+subpartition template(start(1) end(10) every(5)) (start(1) end(10));
+alter table bar_p alter partition for ('5') alter partition for ('5')
+  drop partition for ('5');
+insert into bar_p values(1, 1);
+insert into bar_p values(5, 5);
+drop table bar_p;
+-- Drop should not leave anything lingering for bar_p or its
+-- subpartitions in pg_partition* catalog tables.
+select relid, level, template from gp_partition_template where not exists (select oid from pg_class where oid = relid);
+
+-- MPP-4172
+-- should fail
+create table ggg (a char(1), b int)
+distributed by (b)
+partition by range(a)
+(
+partition aa start ('2006') end ('2009'), partition bb start ('2007') end ('2008')
+);
+
+
+-- MPP-4892 SET SUBPARTITION TEMPLATE
+create table mpp4892 (a char, b int, d char)
+partition by range (b)
+subpartition by list (d)
+subpartition template (
+ subpartition sp1 values ('a'),
+ subpartition sp2 values ('b'))
+(
+start (1) end (10) every (1)
+);
+
+-- works
+alter table mpp4892 add partition p1 end (11);
+
+-- complain about existing template
+alter table mpp4892 add partition p3 end (13) (subpartition sp3 values ('c'));
+
+-- remove template
+alter table mpp4892 set	subpartition template ();
+
+-- should work (because the template is gone)
+alter table mpp4892 add partition p3 end (13) (subpartition sp3 values ('c'));
+
+-- complain because the template is already gone
+alter table mpp4892 set	subpartition template ();
+
+-- should work
+alter table mpp4892 set subpartition template (subpartition sp3 values ('c'));
+
+-- should work
+alter table mpp4892 add partition p4 end (15);
+
+drop table mpp4892;
+
+
+-- make sure we do not allow overlapping range intervals
+-- should fail
+-- unordered elems
+create table ttt (t int) partition by range(t) (
+partition a start (1) end(10) inclusive,
+partition c start(11) end(14),
+partition b start(5) end(15)
+);
+
+-- should fail, this time it's ordered
+create table ttt (t int) partition by range(t) (
+partition a start (1) end(10) inclusive,
+partition b start(5) end(15),
+partition c start(11) end(14)
+);
+
+-- should fail
+create table ttt (t date) partition by range(t) (
+partition a start ('2005-01-01') end('2006-01-01') inclusive,
+partition b start('2005-05-01') end('2005-06-11'),
+partition c start('2006-01-01') exclusive end('2006-01-10')
+);
+
+-- should fail
+create table ttt (t char) partition by range(t) (
+partition a start('a') end('f'),
+partition b start('e') end('g')
+);
+
+-- MPP-5159 MPP-26829
+-- Should fail -- missing partition spec and subpartition template follows the
+-- partition declaration.
+CREATE TABLE list_sales (trans_id int, date date, amount
+decimal(9,2), region text)
+DISTRIBUTED BY (trans_id)
+PARTITION BY LIST (region)
+SUBPARTITION TEMPLATE
+( SUBPARTITION usa VALUES ('usa'),
+  SUBPARTITION asia VALUES ('asia'),
+  SUBPARTITION europe VALUES ('europe')
+);
+
+-- MPP-5185 MPP-26829
+-- Should work
+CREATE TABLE rank_settemp (id int, rank int, year date, gender
+char(1)) DISTRIBUTED BY (id, gender, year)
+partition by list (gender)
+subpartition by range (year)
+subpartition template (
+start (date '2001-01-01'),
+start (date '2002-01-01'),
+start (date '2003-01-01'),
+start (date '2004-01-01'),
+start (date '2005-01-01')
+)
+(
+partition boys values ('M'),
+partition girls values ('F')
+);
+
+alter table rank_settemp set subpartition template ();
+
+-- nothing there
+select relid::regclass, level from gp_partition_template where relid = 'rank_settemp'::regclass;
+
+alter table rank_settemp set subpartition template (default subpartition def2);
+
+-- def2 is there
+select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+
+alter table rank_settemp set subpartition template (default subpartition def2);
+-- Should still be there
+select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+
+
+alter table rank_settemp set subpartition template (start (date '2006-01-01') with (appendonly=true));
+alter table rank_settemp add partition f1 values ('N');
+alter table rank_settemp set subpartition template (start (date '2007-01-01') with (appendonly=true, compresslevel=5));
+alter table rank_settemp add partition f2 values ('C');
+
+select relid::regclass, level, template from gp_partition_template where relid = 'rank_settemp'::regclass;
+
+drop table rank_settemp;
+
+-- MPP-5397 and MPP-7002
+-- should be able to add/split/exchange partition after dropped a col
+
+create table mpp_5397 (a int, b int, c int, d int)
+  distributed by (a) 
+  partition by range (b)  
+  (partition a1 start (0) end (5), 
+   partition a2 end (10),  
+   partition a3 end(15));
+
+alter table mpp_5397 drop column c;
+
+-- should work now
+alter table mpp_5397 add partition z end (20);
+
+-- ensure splitting default partition also works
+alter table mpp_5397 add default partition adefault;
+alter table mpp_5397 drop column d;
+alter table mpp_5397 split default partition start (21) inclusive end (25) inclusive;
+
+drop table mpp_5397;
+
+-- MPP-4987 -- make sure we can't damage a partitioning configuration
+-- this works
+create table rank_damage (i int, j int)
+partition by range(j) (start(1) end(5) every(1));
+-- should all fail
+alter table rank_damage_1_prt_1 no inherit rank_damage;
+create table rank2_damage(like rank_damage);
+alter table rank_damage_1_prt_1 inherit rank2_damage;
+alter table rank_damage_1_prt_1 alter column i type bigint;
+alter table rank_damage_1_prt_1 set without oids; -- no-op
+alter table rank_damage add partition ppo end (22) with (oids = true);
+drop table rank_damage, rank2_damage;
+
+-- MPP-5831, type cast in SPLIT
+CREATE TABLE sg_cal_event_silvertail_hour (
+caldt date NOT NULL,
+calhr smallint NOT NULL,
+ip character varying(128),
+transactionid character varying(32),
+transactiontime timestamp(2) without time zone
+)
+WITH (appendonly=true, compresslevel=5)
+distributed by (ip) PARTITION BY RANGE(transactiontime)
+(
+
+PARTITION "P2009041607"
+START ('2009-04-16 07:00:00'::timestamp without time zone)
+END ('2009-04-16 08:00:00'::timestamp without time zone),
+PARTITION "P2009041608"
+START ('2009-04-16 08:00:00'::timestamp without time zone)
+END ('2009-04-16 09:00:00'::timestamp without time zone),
+DEFAULT PARTITION st_default
+
+);
+
+ALTER TABLE SG_CAL_EVENT_SILVERTAIL_HOUR SPLIT DEFAULT PARTITION
+START ('2009-04-29 07:00:00'::timestamp) INCLUSIVE END ('2009-04-29
+08:00:00'::timestamp) EXCLUSIVE INTO ( PARTITION P2009042907 ,
+PARTITION st_default );
+
+\d+ sg_cal_event_silvertail_hour
+\d+ sg_cal_event_silvertail_hour_1_prt_P2009042907
+
+drop table sg_cal_event_silvertail_hour;
+
+-- Make sure we inherit master's storage settings
+create table foo_p (i int, j int, k text)
+with (appendonly = true, compresslevel = 5)
+partition by range(j) (start(1) end(10) every(1), default partition def);
+insert into foo_p select i, i+1, repeat('fooo', 9000) from generate_series(1, 100) i;
+alter table foo_p split default partition start (10) end(20) 
+into (partition p10_20, default partition);
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid = 'foo_p_1_prt_p10_20'::regclass;
+select count(distinct k) from foo_p;
+drop table foo_p;
+
+create table foo_p (i int, j int, k text)
+partition by range(j) (start(1) end(10) every(1), default partition def
+with(appendonly = true));
+insert into foo_p select i, i+1, repeat('fooo', 9000) from generate_series(1, 100) i;
+alter table foo_p split default partition start (10) end(20) 
+into (partition p10_20, default partition);
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid in ('foo_p_1_prt_p10_20'::regclass, 'foo_p_1_prt_def'::regclass);
+select count(distinct k) from foo_p;
+drop table foo_p;
+
+-- MPP-5941: work with many levels of templates
+
+CREATE TABLE mpp5941 (a int, b date, c char, 
+	   		 		 d char(4), e varchar(20), f timestamp)
+partition by range (b)
+subpartition by list (a) 
+subpartition template ( 
+subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) )
+subpartition by list (e) 
+subpartition template ( 
+subpartition ll1 values ('Engineering'), 
+subpartition ll2 values ('QA') )
+subpartition by list (c) 
+subpartition template ( 
+subpartition lll1 values ('M'), 
+subpartition lll2 values ('F') )
+(
+  start (date '2007-01-01')
+  end (date '2010-01-01') every (interval '1 year')
+);
+
+-- just truncate for fun to see that everything is there
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) alter partition for ('QA')
+truncate partition for ('M');
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) truncate partition for ('QA');
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+truncate partition for (1);
+
+alter table mpp5941 truncate partition for ('2008-01-01') ;
+
+truncate table mpp5941;
+
+-- now look at the templates that we have
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- clear level 1
+
+alter table mpp5941 set subpartition template ();
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- clear level 2
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+set subpartition template ();
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- clear level 3
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1)
+set subpartition template ();
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- no level 4 (error)
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) alter partition for ('QA')
+set subpartition template ();
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- no level 5 (error)
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1) alter partition for ('QA')
+alter partition for ('M')
+set subpartition template ();
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- set level 1 (error, because no templates for level 2, 3)
+
+alter table mpp5941 set subpartition template (
+subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) );
+
+-- MPP-5992 - add deep templates correctly
+
+-- Note: need to re-add the templates from deepest to shallowest,
+-- because adding a template has a dependency on the existence of the
+-- deeper template.
+
+-- set level 3
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+alter partition for (1)
+set subpartition template (
+subpartition lll1 values ('M'), 
+subpartition lll2 values ('F') );
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- set level 2
+
+alter table mpp5941 alter partition for ('2008-01-01') 
+set subpartition template (
+subpartition ll1 values ('Engineering'), 
+subpartition ll2 values ('QA') );
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+-- set level 1
+
+alter table mpp5941 set subpartition template (
+subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) );
+
+select relid::regclass, level from gp_partition_template where relid = 'mpp5941'::regclass;
+
+
+drop table mpp5941;
+
+-- MPP-5984 - NULL is not allowed in RANGE partition
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (NULL) end (300)
+);
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (300) end (NULL)
+);
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (300) end (NULL::int)
+);
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition p1 start(1) end(10),
+partition p2 start(10) end(20),
+default partition def
+);
+alter table partsupp split partition p2 at (NULL);
+alter table partsupp split default partition start(null) end(200);
+drop table partsupp;
+CREATE TABLE partsupp ( ps_partkey integer,
+ps_suppkey integer, ps_availqty integer,
+ps_supplycost numeric, ps_comment character varying(199) )
+PARTITION BY RANGE(ps_partkey)
+(
+partition nnull start (300) end (400)
+);
+alter table partsupp add partition foo start(500) end(NULL);
+drop table partsupp;
+
+-- Test for an old bug, where we used to crash on NULLs, because the code
+-- to order the partitions by their start/end boundaries did not anticipate
+-- NULLs. NULLs in boundaries are not accepted, but because we check for
+-- them only after ordering the partitions, the sorting code needs to
+-- handle them. (This test needs at least two partitions, so that there
+-- is something to sort.)
+create table partnulltest (
+  col1 int,
+  col2 numeric
+)
+distributed by (col1)
+partition by range(col2)
+(
+  partition part2 start(1) end(10) ,
+  partition part1 start (NULL)
+);
+
+-- Test pg_dump on a somewhat complicated partitioned table. (MPP-6240)
+-- We actually just create the table here, and leave it behind, so that
+-- it gets dumped by pg_dump at end of the regression test suite.
+CREATE TABLE supplier_hybrid_part(
+                S_SUPPKEY INTEGER,
+                S_NAME CHAR(25),
+                S_ADDRESS VARCHAR(40),
+                S_NATIONKEY INTEGER,                S_PHONE CHAR(15),
+                S_ACCTBAL decimal,
+                S_COMMENT VARCHAR(101)
+                )
+partition by range (s_suppkey) 
+subpartition by list (s_nationkey) subpartition template (
+    values('22','21','17'),
+    values('6','11','1','7','16','2') WITH (checksum=false,appendonly=true,blocksize=1171456,         compresslevel=3),
+    values('18','20'),
+    values('9','23','13') WITH (checksum=true,appendonly=true,blocksize=1335296,compresslevel=7),
+    values('0','3','12','15','14','8','4','24','19','10','5')
+)               
+(               
+partition p1 start('1') end('10001') every(10000)
+);
+
+-- MPP-3544
+-- Domain
+create domain domainvarchar varchar(5);
+create domain domainnumeric numeric(8,2);
+create domain domainint4 int4;
+create domain domaintext text;
+
+-- Test tables using domains
+-- list
+create table basictest1
+           ( testint4 domainint4
+           , testtext domaintext
+           , testvarchar domainvarchar
+           , testnumeric domainnumeric
+           )
+partition by LIST(testvarchar)
+(
+partition aa values ('aaaaa'),
+partition bb values ('bbbbb'),
+partition cc values ('ccccc')
+);
+
+alter table basictest1 add partition dd values('ddddd');
+insert into basictest1 values(1, 1, 'ddddd', 1);
+insert into basictest1 values(1, 1, 'ccccc', 1);
+insert into basictest1 values(1, 1, 'bbbbb', 1);
+insert into basictest1 values(1, 1, 'aaaaa', 1);
+drop table basictest1;
+--range
+create table basictest1 (testnumeric domainint4)
+partition by range(testnumeric)
+ (start(1) end(10) every(5));
+insert into basictest1 values(1);
+insert into basictest1 values(2);
+alter table basictest1 add partition ff start(10) end(20);
+insert into basictest1 values(10);
+drop table basictest1;
+drop domain domainvarchar, domainnumeric, domainint4, domaintext;
+
+-- Test index inheritance with partitions
+create table ti (i int not null, j int)
+distributed by (i)
+partition by range (j) 
+(start(1) end(3) every(1));
+create unique index ti_pkey on ti(i,j);
+
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+create index ti_j_idx on ti using bitmap(j);
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+alter table ti add partition p3 start(3) end(10);
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+-- Should not be able to drop child indexes added implicitly via ADD PARTITION
+drop index ti_1_prt_p3_i_j_idx;
+drop index ti_1_prt_p3_j_idx;
+alter table ti split partition p3 at (7) into (partition pnew1, partition pnew2);
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+-- Should not be able to drop child indexes added implicitly via SPLIT PARTITION
+drop index ti_1_prt_pnew1_i_j_idx;
+drop index ti_1_prt_pnew1_j_idx;
+drop index ti_1_prt_pnew2_i_j_idx;
+drop index ti_1_prt_pnew2_j_idx;
+-- Index drop should cascade to all partitions- including those later added via
+-- ADD PARTITION or SPLIT PARTITION
+drop index ti_pkey;
+drop index ti_j_idx;
+select * from pg_indexes where schemaname = 'public' and tablename like 'ti%';
+drop table ti;
+
+-- Partitioned table with btree index and hash aggregate should use a correct
+-- memory context for its tuples` descriptor
+drop table if exists dis_tupdesc;
+create table dis_tupdesc (a int, b int, c int)
+distributed by (a)
+partition by list (b)
+(
+    partition p1 values (1),
+    partition p2 values (2),
+    default partition junk_data
+);
+create index dis_tupdesc_idx on dis_tupdesc using btree (c);
+insert into dis_tupdesc select i, i % 3, i % 4 from generate_series (1, 240) as i;
+analyze dis_tupdesc;
+set gp_segments_for_planner = 2;
+set optimizer_segments = 2;
+select distinct b from dis_tupdesc where c >= 2;
+reset gp_segments_for_planner;
+reset optimizer_segments;
+
+-- MPP-6611, make sure rename works with default partitions
+create table it (i int, j int) partition by range(i) 
+subpartition by range(j) subpartition template(start(1) end(10) every(5))
+(start(1) end(3) every(1));
+alter table it rename to newit;
+select schemaname, tablename from pg_tables where schemaname = 'public' and tablename like 'newit%';
+alter table newit add default partition def;
+select schemaname, tablename from pg_tables where schemaname = 'public' and tablename like 'newit%';
+alter table newit rename to anotherit;
+select schemaname, tablename from pg_tables where schemaname = 'public' and tablename like
+'anotherit%';
+drop table anotherit;
+
+--
+-- Test table constraint inheritance
+--
+-- with a named UNIQUE constraint
+create table it (i int) distributed by (i) partition by range(i) (start(1) end(3) every(1));
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+alter table it add constraint it_unique_i unique (i);
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+alter table it drop constraint it_unique_i;
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+drop table it;
+
+-- with a PRIMARY KEY constraint, without giving it a name explicitly.
+create table it (i int) distributed by (i) partition by range(i) (start(1) end(3) every(1));
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+alter table it add primary key(i);
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+-- FIXME: dropping a primary key doesn't currently work correctly. It doesn't
+-- drop the key on the partitions, only the parent. See
+-- https://github.com/greenplum-db/gpdb/issues/3750
+--
+-- alter table it add primary key(i);
+-- select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+drop table it;
+
+
+create table it (i int) distributed by (i) partition by range(i) (start(1) end(3) every(1));
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+alter table it add primary key(i);
+select schemaname, tablename, indexname from pg_indexes where schemaname = 'public' and tablename like 'it%';
+drop table it;
+
+--
+-- Exclusion constraints are currently not supported on partitioned tables.
+--
+create table parttab_with_excl_constraint (
+  i int,
+  j int,
+  CONSTRAINT part_excl EXCLUDE (i WITH =) )
+distributed by (i) partition by list (i) (
+  partition a values (1),
+  partition b values (2),
+  partition c values (3)
+);
+
+create table parttab_with_excl_constraint (
+  i int,
+  j int)
+distributed by (i) partition by list (i) (
+  partition a values (1),
+  partition b values (2),
+  partition c values (3)
+);
+alter table parttab_with_excl_constraint ADD CONSTRAINT part_excl EXCLUDE (i WITH =);
+
+drop table parttab_with_excl_constraint;
+
+
+-- MPP-6297: test special WITH(tablename=...) syntax for dump/restore
+
+-- original table was:
+-- PARTITION BY RANGE(l_commitdate) 
+-- (
+--     PARTITION p1 
+--       START ('1992-01-31'::date) END ('1995-04-30'::date) 
+--       EVERY ('1 year 1 mon'::interval)
+-- )
+
+-- dump used to give a definition like this:
+
+-- without the WITH(tablename=...), the vagaries of EVERY arithmetic
+-- create >3 partitions
+CREATE TABLE mpp6297 ( l_orderkey bigint,
+l_commitdate date
+)
+distributed BY (l_orderkey) PARTITION BY RANGE(l_commitdate)
+(
+PARTITION p1_1 START ('1992-01-31'::date) END ('1993-02-28'::date)
+EVERY ('1 year 1 mon'::interval)
+,
+PARTITION p1_2 START ('1993-02-28'::date) END ('1994-03-31'::date)
+EVERY ('1 year 1 mon'::interval)
+,
+PARTITION p1_3 START ('1994-03-31'::date) END ('1995-04-30'::date)
+EVERY ('1 year 1 mon'::interval)
+);
+
+\d+ mpp6297
+drop table mpp6297;
+
+
+-- when WITH(tablename=...) is specified, the EVERY is stored as an
+-- attribute, but not expanded into additional partitions
+CREATE TABLE mpp6297 ( l_orderkey bigint,
+l_commitdate date
+)
+distributed BY (l_orderkey) PARTITION BY RANGE(l_commitdate)
+(
+PARTITION p1_1 START ('1992-01-31'::date) END ('1993-02-28'::date)
+EVERY ('1 year 1 mon'::interval)
+WITH (tablename='mpp6297_1_prt_p1_1'),
+PARTITION p1_2 START ('1993-02-28'::date) END ('1994-03-31'::date)
+EVERY ('1 year 1 mon'::interval)
+WITH (tablename='mpp6297_1_prt_p1_2'),
+PARTITION p1_3 START ('1994-03-31'::date) END ('1995-04-30'::date)
+EVERY ('1 year 1 mon'::interval)
+WITH (tablename='mpp6297_1_prt_p1_3')
+);
+
+\d+ mpp6297
+drop table mpp6297;
+
+-- more with basic cases
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (10) every (1),
+end (11)		
+);
+
+\d+ mpp6297
+
+alter table mpp6297 drop partition for (3);
+\d+ mpp6297
+
+-- this isn't legal (but it would be nice)
+alter table mpp6297 add partition start (3) end (4) every (1);
+
+-- this is legal but it doesn't fix the EVERY clause
+alter table mpp6297 add partition start (3) end (4) ;
+
+\d+ mpp6297
+drop table mpp6297;
+
+-- similarly, we can merge adjacent EVERY clauses if they match
+
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (5) every (1),
+start (5) end (10) every (1)
+);
+
+\d+ mpp6297
+drop table mpp6297;
+
+-- we cannot merge adjacent EVERY clauses if inclusivity/exclusivity is wrong
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (5) every (1),
+start (5) exclusive end (10) every (1)
+);
+
+\d+ mpp6297
+drop table mpp6297;
+
+-- more fun with inclusivity/exclusivity (normal case)
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) inclusive end (10) exclusive every (1)
+);
+
+\d+ mpp6297
+drop table mpp6297;
+
+-- more fun with inclusivity/exclusivity (abnormal case)
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) exclusive end (10) inclusive every (1)
+);
+
+\d+ mpp6297
+
+alter table mpp6297 drop partition for (3);
+
+\d+ mpp6297
+drop table mpp6297;
+
+-- we cannot merge adjacent EVERY clauses, even though the
+-- inclusivity/exclusivity matches, because it is different from the
+-- normal start inclusive/end exclusive
+create table mpp6297 
+(a int, 
+b int) 
+partition by range (b)
+(
+start (1) end (5) inclusive every (1),
+start (5) exclusive end (10) every (1)
+);
+
+\d+ mpp6297
+drop table mpp6297;
+
+-- MPP-6589: SPLITting an "open" ended partition (ie, no start or end)
+
+CREATE TABLE mpp6589a
+(
+  id bigint,
+  day_dt date
+)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE(day_dt)
+          (
+          PARTITION p20090312  END ('2009-03-12'::date)
+          );
+
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589a%';
+
+-- should work
+ALTER TABLE mpp6589a 
+SPLIT PARTITION p20090312 AT( '20090310' ) 
+INTO( PARTITION p20090309, PARTITION p20090312_tmp);
+
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589a%';
+
+CREATE TABLE mpp6589i(a int, b int) 
+partition by range (b) (start (1) end (3));
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589i%';
+
+-- should fail (overlap)
+ALTER TABLE mpp6589i ADD PARTITION start (2);
+-- should work (there's a "point" hole at value 2)
+ALTER TABLE mpp6589i ADD PARTITION start (3) exclusive;
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589i%';
+
+-- test open-ended SPLIT
+CREATE TABLE mpp6589b
+(
+  id bigint,
+  day_dt date
+)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE(day_dt)
+          (
+          PARTITION p20090312  START ('2008-03-12'::date)
+          );
+
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589b%';
+
+-- should work
+ALTER TABLE mpp6589b 
+SPLIT PARTITION p20090312 AT( '20090310' ) 
+INTO( PARTITION p20090309, PARTITION p20090312_tmp);
+
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'mpp6589b%';
+
+-- MPP-7191, MPP-7193: partitioned tables - fully-qualify storage type
+-- if not specified (and not a template)
+CREATE TABLE mpp5992 (a int, b date, c char,
+                     d char(4), e varchar(20), f timestamp)
+WITH (orientation=column,appendonly=true)
+partition by range (b)
+subpartition by list (a)
+subpartition template (
+subpartition l1 values (1,2,3,4,5),
+subpartition l2 values (6,7,8,9,10) )
+subpartition by list (e)
+subpartition template (
+subpartition ll1 values ('Engineering'),
+subpartition ll2 values ('QA') )
+subpartition by list (c)
+subpartition template (
+subpartition lll1 values ('M'),
+subpartition lll2 values ('F') )
+(
+  start (date '2007-01-01')
+  end (date '2010-01-01') every (interval '1 year')
+);
+
+-- Delete subpartition template
+alter table mpp5992 alter partition for ('2008-01-01')
+set subpartition template ();
+alter table mpp5992 alter partition for ('2008-01-01')
+alter partition for (1)
+set subpartition template ();
+alter table mpp5992 set subpartition template ();
+
+-- Add subpartition template
+alter table mpp5992 alter partition for ('2008-01-01')
+alter partition for (1)
+set subpartition template ( subpartition lll1 values ('M'),
+subpartition lll2 values ('F'));
+
+alter table mpp5992 alter partition for ('2008-01-01')
+set subpartition template (
+subpartition ll1 values ('Engineering'),
+subpartition ll2 values ('QA')
+);
+alter table mpp5992 
+set subpartition template (subpartition l1 values (1,2,3,4,5), 
+subpartition l2 values (6,7,8,9,10) );
+alter table mpp5992 
+set subpartition template (subpartition l1 values (1,2,3), 
+subpartition l2 values (4,5,6), subpartition l3 values (7,8,9,10));
+select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
+
+-- Now we can add a new partition
+alter table mpp5992 
+add partition foo1 
+start (date '2011-01-01') 
+end (date '2012-01-01'); -- should inherit from parent storage option
+
+alter table mpp5992 
+add partition foo2 
+start (date '2012-01-01') 
+end (date '2013-01-01') WITH (orientation=column,appendonly=true);
+
+alter table mpp5992 
+add partition foo3 
+start (date '2013-01-01') end (date '2014-01-01') WITH (appendonly=true);
+
+select * from pg_partition_tree('mpp5992');
+select relname, relam, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp5992%';
+select relid::regclass, level, template from gp_partition_template where relid = 'mpp5992'::regclass;
+
+-- MPP-10223: split subpartitions
+CREATE TABLE MPP10223pk
+(
+rnc VARCHAR(100),
+wbts VARCHAR(100),
+axc VARCHAR(100),
+vptt VARCHAR(100),
+vcct VARCHAR(100),
+agg_level CHAR(5),
+period_start_time TIMESTAMP WITH TIME ZONE,
+load_time TIMESTAMP WITH TIME ZONE DEFAULT now(),
+interval INTEGER,
+totcellsegress double precision,
+totcellsingress double precision,
+ 
+  CONSTRAINT "axc_vcct1_atmvcct_pk_test2" 
+PRIMARY KEY (rnc,wbts,axc,vptt,vcct,agg_level,period_start_time)
+)
+ 
+DISTRIBUTED BY (rnc,wbts,axc,vptt,vcct)
+ 
+PARTITION BY LIST (AGG_LEVEL)
+  SUBPARTITION BY RANGE (PERIOD_START_TIME)
+(
+  PARTITION min15part  VALUES ('15min')
+    (
+       SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+       SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                              END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION hourpart   VALUES ('hour')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION daypart    VALUES ('day')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    )
+);
+
+-- MPP-10421: works -- can re-use name for non-DEFAULT partitions, and
+-- primary key problems fixed
+ALTER TABLE MPP10223pk
+ ALTER PARTITION min15part 
+SPLIT PARTITION  P_FUTURE AT ('2010-06-25') 
+INTO (PARTITION P20010101, PARTITION P_FUTURE);
+drop table mpp10223pk;
+-- rebuild the table without a primary key
+CREATE TABLE MPP10223
+(
+rnc VARCHAR(100),
+wbts VARCHAR(100),
+axc VARCHAR(100),
+vptt VARCHAR(100),
+vcct VARCHAR(100),
+agg_level CHAR(5),
+period_start_time TIMESTAMP WITH TIME ZONE,
+load_time TIMESTAMP WITH TIME ZONE DEFAULT now(),
+interval INTEGER,
+totcellsegress double precision,
+totcellsingress double precision
+)
+ 
+DISTRIBUTED BY (rnc,wbts,axc,vptt,vcct)
+ 
+PARTITION BY LIST (AGG_LEVEL)
+  SUBPARTITION BY RANGE (PERIOD_START_TIME)
+(
+  PARTITION min15part  VALUES ('15min')
+    (
+       SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+       SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                              END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION hourpart   VALUES ('hour')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION daypart    VALUES ('day')
+    (
+               SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+               SUBPARTITION P20100623 START (date '2010-06-23') INCLUSIVE,
+               SUBPARTITION P20100624 START (date '2010-06-24') INCLUSIVE,
+               SUBPARTITION P20100625 START (date '2010-06-25') INCLUSIVE,
+               SUBPARTITION P20100626 START (date '2010-06-26') INCLUSIVE,
+               SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+               SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                      END (date '2999-12-31') EXCLUSIVE
+    )
+);
+
+-- this works
+ALTER TABLE MPP10223
+ ALTER PARTITION min15part 
+SPLIT PARTITION  P_FUTURE AT ('2010-06-25') 
+INTO (PARTITION P20010101, PARTITION P_FUTURE2);
+
+select * from pg_partition_tree('mpp10223');
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp10223%';
+
+-- simpler version
+create table mpp10223b (a int, b int , d int)
+partition by range (b)
+subpartition by range (d)
+(partition p1 start (1) end (10)
+(subpartition sp2 start (20) end (30)));
+
+-- MPP-10421: allow re-use sp2 for non-DEFAULT partition
+alter table mpp10223b alter partition p1 
+split partition for (20) at (25)
+into (partition sp2, partition sp3);
+
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp10223b%';
+
+-- MPP-10480: dump templates (but don't use "foo")
+create table MPP10480 (a int, b int, d int)
+partition by range (b)
+subpartition by range(d)
+subpartition template (start (1) end (10) every (1))
+(start (20) end (30) every (1));
+
+select relid::regclass, level, template from gp_partition_template where relid = 'MPP10480'::regclass;
+
+-- MPP-10421: fix SPLIT of partitions with PRIMARY KEY constraint/indexes
+CREATE TABLE mpp10321a
+(
+        rnc VARCHAR(100),
+        wbts VARCHAR(100),
+        axc VARCHAR(100),
+        vptt VARCHAR(100),
+        vcct VARCHAR(100),
+        agg_level CHAR(5),
+        period_start_time TIMESTAMP WITH TIME ZONE,
+        load_time TIMESTAMP WITH TIME ZONE DEFAULT now(),
+        interval INTEGER,
+        totcellsegress double precision,
+        totcellsingress double precision,
+
+  CONSTRAINT "mpp10321a_pk"
+PRIMARY KEY (rnc,wbts,axc,vptt,vcct,agg_level,period_start_time)
+)
+
+DISTRIBUTED BY (rnc,wbts,axc,vptt,vcct)
+
+PARTITION BY LIST (AGG_LEVEL)
+  SUBPARTITION BY RANGE (PERIOD_START_TIME)
+(
+  PARTITION min15part  VALUES ('15min')
+    (
+         SUBPARTITION P_FUTURE  START (date '2001-01-01') INCLUSIVE,
+         SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                END (date '2999-12-31') EXCLUSIVE
+    ),
+  PARTITION hourpart   VALUES ('hour')
+    (
+          SUBPARTITION P20100622 START (date '2010-06-22') INCLUSIVE,
+          SUBPARTITION P_ENDPART START (date '2999-12-30') INCLUSIVE
+                                 END (date '2999-12-31') EXCLUSIVE
+    )
+);
+
+ALTER TABLE mpp10321a
+ALTER PARTITION min15part
+SPLIT PARTITION  P_FUTURE AT ('2010-06-25')
+INTO (PARTITION P20010101, PARTITION P_FUTURE);
+
+DROP TABLE mpp10321a;
+
+-- test for default partition with boundary spec
+create table bhagp_range (a int, b int) 
+distributed by (a) 
+partition by range (b) 
+( 
+  default partition x 
+  start (0) inclusive 
+  end (2) exclusive 
+  every (1) 
+);
+
+create table bhagp_list (a int, b int) 
+distributed by (a) 
+partition by list (b) 
+( 
+  default partition x 
+  values (1,2)
+);
+
+-- more coverage tests
+
+-- bad partition by type
+create table cov1 (a int, b int)
+distributed by (a)
+partition by (b)
+(
+start (1) end (10) every (1)
+);
+
+-- bad partition by type
+create table cov1 (a int, b int)
+distributed by (a)
+partition by funky (b)
+(
+start (1) end (10) every (1)
+);
+
+drop table cov1;
+
+create table cov1 (a int, b int)
+distributed by (a)
+partition by range (b)
+(
+start (1) end (10) every (1)
+);
+
+-- syntax error
+alter table cov1 drop partition for (funky(1));
+
+-- no rank for default
+alter table cov1 drop default partition for (1);
+
+-- no default
+alter table cov1 split default partition at (9);
+alter table cov1 drop default partition;
+
+-- cannot add except by name
+alter table cov1 add partition for (1);
+
+-- bad template
+alter table cov1 set subpartition template (values (1,2) (values (2,3)));
+
+-- create and drop default partition in one statement!
+alter table cov1 add default partition def1, drop default partition;
+
+drop table cov1;
+
+-- every 5 (1) now disallowed...
+create table cov1 (a int, b int)
+distributed by (a)
+partition by range (b)
+(
+start (1) end(20) every 5 (1)
+);
+
+drop table if exists cov1;
+
+create table cov1 (a int, b int)
+distributed by (a)
+partition by list (b)
+(
+partition p1 values (1,2,3,4,5,6,7,8)
+);
+
+-- bad split
+alter table cov1 split partition p1 at (5,50);
+
+-- good split
+alter table cov1 split partition p1 at (5,6,7) 
+into (partition p1, partition p2);
+
+select relname, pg_get_expr(relpartbound, oid, false) from pg_class where relname like 'cov1%';
+
+drop table cov1;
+
+-- MPP-11120
+--  ADD PARTITION didn't explicitly specify the distribution policy in the
+-- CreateStmt distributedBy field and as such we followed the behaviour encoded
+-- in transformDistributedBy(). Unfortunately, it chooses to set the
+-- distribution policy to that of the primary key if the distribution policy
+-- is not explicitly set.
+create table tbl11120 (
+	a	int,
+	b	int,
+	c	int,
+	primary key (a,b,c)
+)
+distributed by (a)
+partition by range (b)
+(
+	default partition default_partition,
+	partition p1 start (1) end (2)
+);
+
+insert into tbl11120 values(1,2,3);
+
+select * from tbl11120; -- expected: (1,2,3)
+
+delete from tbl11120 where a=1 and b=2 and c=3; -- this should delete the row in tbl11120
+
+select * from tbl11120; -- expected, no rows
+
+insert into tbl11120 values(1,2,3); -- reinsert data
+
+-- all partitions should have same distribution policy
+select relname, distkey as distribution_attributes from
+gp_distribution_policy p, pg_class c
+where p.localoid = c.oid and relname like 'tbl11120%' order by p.localoid;
+
+alter table tbl11120 split default partition
+        start (3)
+	end (4)
+	into (partition p2, default partition);
+
+
+select relname, distkey as distribution_attributes from
+gp_distribution_policy p, pg_class c where p.localoid = c.oid and 
+relname like 'tbl11120%' order by p.localoid;
+
+delete from tbl11120 where a=1 and b=2 and c=3; -- this should delete the row in tbl11120
+
+select * from tbl11120; -- expected, no rows! But we see the row. Wrong results!
+
+alter table tbl11120 drop partition default_partition;
+
+alter table tbl11120 add partition foo start(10) end(20);
+
+select relname, distkey as distribution_attributes from
+gp_distribution_policy p, pg_class c where p.localoid = c.oid and
+relname like 'tbl11120%' order by p.localoid;
+
+drop table tbl11120;
+
+-- MPP-6979: EXCHANGE partitions - fix namespaces if they differ
+
+-- new schema
+create schema mpp6979dummy;
+
+create table mpp6979part(a int, b int) 
+partition by range(b) 
+(
+start (1) end (10) every (1)
+);
+
+-- append-only table in new schema 
+create table mpp6979dummy.mpp6979tab(like mpp6979part) with (appendonly=true);
+
+-- check that table and all parts in public schema
+select relname, nspname, relispartition from pg_class c, pg_namespace n
+where c.relnamespace = n.oid and relname like ('mpp6979%');
+
+-- note that we have heap partitions in public, and ao table in mpp6979dummy
+select nspname, relname, amname
+from pg_class pc
+inner join pg_namespace ns on pc.relnamespace=ns.oid
+left join pg_am am on am.oid = pc.relam
+where relname like ('mpp6979%');
+
+-- exchange the partition with the ao table.  
+-- Now we have an ao partition and mpp6979tab is heap!
+alter table mpp6979part exchange partition for (1) 
+with table mpp6979dummy.mpp6979tab;
+
+-- after the exchange, all partitions are still in public
+select relname, nspname, relispartition from pg_class c, pg_namespace n
+where c.relnamespace = n.oid and relname like ('mpp6979%');
+
+-- the rank 1 partition is ao, but still in public, and 
+-- table mpp6979tab is now heap, but still in mpp6979dummy
+select relname, nspname, relispartition, amname
+from pg_class c inner join pg_namespace n on c.relnamespace = n.oid
+left join pg_am am on am.oid = c.relam
+where relname like ('mpp6979%');
+
+drop table mpp6979part;
+drop table mpp6979dummy.mpp6979tab;
+
+drop schema mpp6979dummy;
+
+-- MPP-7898:
+
+create table parent_s
+    (a int, b text) 
+    distributed by (a);
+    
+insert into parent_s values
+    (1, 'one');
+
+-- Try to create a table that mixes inheritance and partitioning.
+-- Correct behavior: ERROR
+
+create table child_r
+    ( c int, d int) 
+    inherits (parent_s)
+    partition by range(d) 
+    (
+        start (0) 
+        end (2) 
+        every (1)
+    );
+
+ -- If (incorrectly) the previous statement works, the next one is 
+ -- likely to fail with in unexpected internal error.  This is residual 
+ -- issue MPP-7898.
+insert into child_r values
+    (0, 'from r', 0, 0);
+
+drop table if exists parent_s cascade; --ignore
+drop table if exists child_r cascade; --ignore
+
+create table parent_r
+    ( a int, b text, c int, d int ) 
+    distributed by (a)
+    partition by range(d) 
+    (
+        start (0) 
+        end (2) 
+        every (1)
+    );
+ 
+insert into parent_r values
+    (0, 'from r', 0, 0);
+
+create table parent_s
+    ( a int, b text, c int, d int ) 
+    distributed by (a);
+    
+insert into parent_s values
+    (1, 'from s', 555, 555);
+
+create table child_t
+    ( )
+    inherits (parent_s)
+    distributed by (a);
+
+insert into child_t values
+    (0, 'from t', 666, 666);
+
+-- Try to exchange in the child and parent.  
+-- Correct behavior: ERROR in both cases.
+
+alter table parent_r exchange partition for (1) with table child_t;
+alter table parent_r exchange partition for (1) with table parent_s;
+
+drop table child_t cascade; --ignore
+drop table parent_s cascade; --ignore
+drop table parent_r cascade; --ignore
+
+-- MPP-7898 end.
+
+-- ( MPP-13750 
+
+CREATE TABLE s (id int, date date, amt decimal(10,2), units int) 
+DISTRIBUTED BY (id) 
+PARTITION BY RANGE (date) 
+( START (date '2008-01-01') INCLUSIVE 
+   END (date '2008-01-02') EXCLUSIVE 
+   EVERY (INTERVAL '1 day') );
+
+create index s_i on s(amt) 
+  where (id > 1)
+  ;
+
+create index s_j on s(units)
+  where (id <= 1)
+  ;
+
+create index s_i_expr on s(log(units));
+
+alter table s add partition s_test 
+    start(date '2008-01-03') end (date '2008-01-05');
+
+alter table s split partition for (date '2008-01-03') at (date '2008-01-04')
+  into (partition s_test, partition s_test2);
+
+select 
+    relname, 
+    (select count(distinct content) - 1 
+     from gp_segment_configuration) - count(*) as missing, 
+    count(distinct relid) oid_count 
+from (
+    select gp_execution_segment(), oid, relname 
+    from gp_dist_random('pg_class') 
+    ) seg_class(segid, relid, relname) 
+where relname ~ '^s_' 
+group by relname; 
+
+drop table s cascade;
+
+--   MPP-13750 )
+
+-- MPP-14471 start
+-- No unenforceable PK/UK constraints!  (UNIQUE INDEXes still allowed; tested above)
+drop table if exists tc cascade;
+drop table if exists cc cascade;
+drop table if exists at cascade;
+
+create table tc
+    (a int, b int, c int, primary key(a) )
+    distributed by (a)
+    partition by range (b)
+    ( 
+        default partition d,
+        start (0) inclusive end(100) inclusive every (50)
+    );
+
+create table cc
+    (a int primary key, b int, c int)
+    distributed by (a)
+    partition by range (b)
+    ( 
+        default partition d,
+        start (0) inclusive end(100) inclusive every (50)
+    );
+
+create table at
+    (a int, b int, c int)
+    distributed by (a)
+    partition by range (b)
+    ( 
+        default partition d,
+        start (0) inclusive end(100) inclusive every (50)
+    );
+
+alter table at
+    add primary key (a);
+
+-- MPP-14471 end
+-- MPP-17606 (using table "at" from above)
+
+alter table at
+    alter column b
+	type numeric;
+	
+-- MPP-17606 end
+-- MPP-17707 start
+create table mpp17707
+( d int, p int ,x text)
+with (appendonly = true)
+distributed by (d)
+partition by range (p)
+(start (0) end (3) every (2));
+
+-- Create a expression index on the partitioned table
+
+create index idx_abc on mpp17707(upper(x));
+
+-- split partition 1 of table
+
+alter table mpp17707 split partition for (0) at (1)
+	into (partition x1, partition x2);
+-- MPP-17707 end
+-- MPP-17814 start
+drop table if exists plst2 cascade;
+-- positive; bug was that it failed whereas it should succeed
+create type plst2_partkey as (a integer, c integer);
+create table plst2
+    (            
+        b integer not null,
+	d plst2_partkey
+    )                                                                                                                   
+    distributed by (b) 
+    partition by list (d)
+    (
+        partition p1 values ( CAST('(1,2)' as plst2_partkey), CAST('(3,4)' as plst2_partkey) ),
+        partition p2 values ( CAST('(5,6)' as plst2_partkey) ),
+        partition p3 values ( CAST('(2,1)' as plst2_partkey) )
+    );
+\d+ plst2
+drop table if exists plst2 cascade;
+--negative; test legitimate failure
+create table plst2
+    (            
+        b integer not null,
+	d plst2_partkey
+    )                                                                                                                   
+    distributed by (b) 
+    partition by list (d)
+    (
+        partition p1 values ( CAST('(1,2)' as plst2_partkey), CAST('(3,4)' as plst2_partkey) ),
+        partition p2 values ( CAST('(5,6)' as plst2_partkey) ),
+        partition p3 values ( CAST('(1,2)' as plst2_partkey) )
+    );
+
+-- postive; make sure inner part duplicates are accepted and quietly removed.
+drop table if exists plst2;
+drop type plst2_partkey;
+create type plst2_partkey as (a int, b int);
+create table plst2
+    ( d int, c plst2_partkey)
+    distributed by (d)
+    partition by list (c) 
+        (
+        partition p0 values ( CAST('(1,2)' as plst2_partkey), CAST('(3,4)' as plst2_partkey) ),
+        partition p1 values ( CAST('(4,3)' as plst2_partkey), CAST('(2,1)' as plst2_partkey) ),
+        partition p2 values ( CAST('(4,4)' as plst2_partkey), CAST('(5,5)' as plst2_partkey), CAST('(4,4)' as plst2_partkey), CAST('(5,5)' as plst2_partkey), CAST('(4,4)' as plst2_partkey), CAST('(5,5)' as plst2_partkey)),
+	partition p3 values (CAST('(4,5)' as plst2_partkey), CAST('(5,6)' as plst2_partkey))
+        );
+
+-- positive; make sure legitimate alters work.
+alter table plst2 add partition p4 values (CAST('(5,4)' as plst2_partkey), CAST('(6,5)' as plst2_partkey));
+alter table plst2 add partition p5 values (CAST('(7,8)' as plst2_partkey), CAST('(7,8)' as plst2_partkey));
+\d+ plst2
+
+-- negative; make sure conflicting alters fail.
+alter table plst2 add partition p6 values (CAST('(7,8)' as plst2_partkey), CAST('(2,1)' as plst2_partkey));
+
+drop table if exists plst2;
+
+
+-- MPP-17814 end
+
+-- MPP-18441
+create table s_heap (i1 int, t1 text, t2 text, i2 int, i3 int, n1 numeric, b1 bool)
+partition by list (t1)
+     (partition abc values('abc0', 'abc1', 'abc2'));
+insert into s_heap (t1, i1, i2, i3, n1, b1) select 'abc0', 1, 1, 1, 2.3, true
+    from generate_series(1, 5);
+alter table s_heap drop column t2;
+alter table s_heap drop column i3;
+-- create co table for exchange
+create table s_heap_ex_abc (i1 int, t1 text, f1 float, i2 int, n1 numeric, b1 bool)
+    WITH (appendonly=true, orientation=column, compresstype=zlib);
+alter table s_heap_ex_abc drop column f1;
+insert into s_heap_ex_abc select 1, 'abc1', 2, 2, true from generate_series(1, 5);
+-- exchange partition
+alter table s_heap exchange partition abc with table s_heap_ex_abc;
+alter table s_heap exchange partition abc with table s_heap_ex_abc;
+drop table s_heap, s_heap_ex_abc;
+-- MPP-18441 end
+
+-- MPP-18443
+create table s_heap (i1 int, t1 text, i2 int , i3 int, n1 numeric,b1 bool)
+partition by list (t1)
+    (partition def values('def0', 'def1', 'def2', 'def3', 'def4', 'def5', 'def6', 'def7', 'def8', 'def9'));
+insert into s_heap(t1, i1, i2, i3, n1, b1)
+    select 'def0', 1, 1, 1, 2.3 , true from generate_series(1, 5);
+alter table s_heap drop column i3;
+create index s_heap_index on s_heap (i2);
+alter table s_heap split partition def
+    at ('def0', 'def1', 'def2', 'def3', 'def4') into (partition def5, partition def0);
+select * from s_heap_1_prt_def0;
+drop table s_heap;
+-- MPP-18443 end
+
+-- MPP-18445
+create table s_heap_ao ( i1 int, t1 text, i2 int , i3 int, n1 numeric,b1 bool)
+partition by list (t1)
+    (partition def values('def0', 'def1', 'def2', 'def3', 'def4', 'def5', 'def6', 'def7', 'def8', 'def9')
+        with (appendonly=true, orientation=row));
+insert into s_heap_ao(t1, i1, i2, i3, n1, b1)
+    select 'def4', 1, 1, 1, 2.3, true from generate_series(1, 2);
+insert into s_heap_ao(t1, i1, i2, i3, n1, b1)
+    select 'def5', 1, 1, 1, 2.3, true from generate_series(1, 2);
+alter table s_heap_ao drop column i3;
+create index s_heap_ao_index on s_heap_ao (i2);
+alter table s_heap_ao split partition def
+    at ('def0', 'def1', 'def2', 'def3', 'def4') into (partition def5, partition def0);
+select * from s_heap_ao_1_prt_def0;
+drop table s_heap_ao;
+-- MPP-18445 end
+
+-- MPP-18456
+create table s_heap_co (i1 int, t1 text, i2 int, i3 int, n1 numeric, b1 bool)
+partition by list (t1)
+    (partition def values('def0', 'def1', 'def2', 'def3', 'def4', 'def5', 'def6', 'def7', 'def8', 'def9')
+        with (appendonly=true, orientation=column));
+insert into s_heap_co(t1, i1, i2, i3, n1, b1)
+    select 'def4', 1,1, 1, 2.3, true from generate_series(1, 2);
+insert into s_heap_co(t1, i1, i2, i3, n1, b1)
+    select 'def5', 1,1, 1, 2.3, true from generate_series(1, 2);
+alter table s_heap_co drop column i3;
+create index s_heap_co_index on s_heap_co (i2);
+alter table s_heap_co split partition def
+    at ('def0', 'def1', 'def2', 'def3', 'def4') into (partition def5, partition def0);
+select * from s_heap_co_1_prt_def0;
+drop table s_heap_co;
+-- MPP-18456 end
+
+-- MPP-18457, MPP-18415
+CREATE TABLE non_ws_phone_leads (
+    lead_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    source_system_lead_id character varying(60) NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_event_type_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_site_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_date_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_time_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_number_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    duration_second smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_program_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_call_status_key integer NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_department_set_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_channel_set_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_provider_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768),
+    dim_phone_ad_set_key smallint NOT NULL ENCODING (compresstype=zlib,compresslevel=1,blocksize=32768)
+)
+WITH (appendonly=true, compresstype=zlib, orientation=column) DISTRIBUTED BY (dim_site_key ,dim_date_key) PARTITION BY RANGE(dim_date_key) 
+          (
+          PARTITION p_max START (2451545) END (9999999) WITH (tablename='non_ws_phone_leads_1_prt_p_max', orientation=column, appendonly=true ) 
+                    COLUMN lead_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN source_system_lead_id ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_event_type_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_site_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_date_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_time_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_number_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN duration_second ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_program_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_call_status_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_department_set_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_channel_set_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_provider_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768) 
+                    COLUMN dim_phone_ad_set_key ENCODING (compresstype=zlib, compresslevel=1, blocksize=32768)
+          );
+
+INSERT INTO non_ws_phone_leads VALUES (63962490, 'CA6qOEyxOmNJUQC7', 5058, 999901, 2455441, 40435, 999904, 207, 79, 2, 9901, 9901, 1, 9901);
+
+CREATE TABLE dim_phone_numbers (
+    dim_phone_number_key integer NOT NULL,
+    media_tracker_description character varying(40) NOT NULL,
+    formatted_phone_number character varying(20) NOT NULL,
+    source_system_phone_number_id character varying(100) NOT NULL,
+    last_modified_date timestamp without time zone NOT NULL
+) DISTRIBUTED BY (dim_phone_number_key);
+
+ALTER TABLE ONLY dim_phone_numbers
+    ADD CONSTRAINT dim_phone_numbers_pk1 PRIMARY KEY (dim_phone_number_key);
+
+INSERT INTO dim_phone_numbers VALUES (999902, 'test', '800-123-4568', '8001234568', '2012-09-25 13:34:35.037637');
+INSERT INTO dim_phone_numbers VALUES (999904, 'test', '(800) 123-4570', '8001234570', '2012-09-25 13:34:35.148104');
+INSERT INTO dim_phone_numbers VALUES (999903, 'test', '(800) 123-4569', '8001234569', '2012-09-25 13:34:35.093523');
+INSERT INTO dim_phone_numbers VALUES (999901, 'test', '(800)123-4567', '8001234567', '2012-09-25 13:34:34.781042');
+
+INSERT INTO dim_phone_numbers SELECT gs.*, dim_phone_numbers.media_tracker_description, dim_phone_numbers.formatted_phone_number, dim_phone_numbers.source_system_phone_number_id, dim_phone_numbers.last_modified_date FROM dim_phone_numbers, generate_series(1,100000) gs WHERE dim_phone_numbers.dim_phone_number_key = 999901;
+
+ANALYZE dim_phone_numbers;  
+
+-- Table NON_WS_PHONE_LEADS has two distribution keys
+-- Equality condition with constant on one distribution key
+-- Redistribute over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+LEFT outer JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441;
+
+-- Table NON_WS_PHONE_LEADS has two distribution keys
+-- Equality conditions with constants on all distribution keys
+-- Redistribute over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+LEFT outer JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441
+AND PL.dim_site_key = 999901;
+
+-- Table NON_WS_PHONE_LEADS has two distribution keys
+-- Broadcast over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441
+AND PL.dim_site_key = 999901;
+
+-- Join condition uses functions
+-- Broadcast over Append
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY
+FROM NON_WS_PHONE_LEADS PL
+JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY + 1 = DPN.DIM_PHONE_NUMBER_KEY + 1
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441
+AND PL.dim_site_key = 999901;
+
+-- Equality condition with constant on one distribution key
+-- Redistribute over Append
+-- Accessing a varchar in the SELECT clause should cause a SIGSEGV
+SELECT pl.duration_Second , pl.dim_program_Key, PL.DIM_SITE_KEY, PL.DIM_DATE_KEY, source_system_lead_id
+FROM NON_WS_PHONE_LEADS PL
+LEFT outer JOIN DIM_PHONE_NUMBERS DPN
+ON PL.DIM_PHONE_NUMBER_KEY = DPN.DIM_PHONE_NUMBER_KEY
+WHERE pl.SOURCE_SYSTEM_LEAD_ID = 'CA6qOEyxOmNJUQC7'
+AND PL.DIM_DATE_KEY = 2455441;
+
+DROP TABLE non_ws_phone_leads;
+DROP TABLE dim_phone_numbers;
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+-- Equality condition with a constant expression on one distribution key
+drop table if exists foo_p;
+drop table if exists bar;
+create table foo_p( a int, b int, k int, t text, p int) distributed by (a,b) partition by range(p) ( start(0) end(10) every (2), default partition other);
+create table bar( a int, b int, k int, t text, p int) distributed by (a);
+
+insert into foo_p select i, i % 10, i , i || 'SOME NUMBER SOME NUMBER', i % 10 from generate_series(1, 1000) i;
+
+insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 100) i;
+insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 10000) i;
+insert into bar select i % 7, i % 6, i % 9, i || 'SOME NUMBER', i % 4 from generate_series(1, 10000) i;
+
+analyze foo_p;
+analyze bar;
+set optimizer_segments = 3;
+set optimizer_nestloop_factor = 1.0;
+explain select foo_p.b, foo_p.t from foo_p left outer join bar on foo_p.a = bar.k  where foo_p.t is not null and foo_p.a = (array[1])[1];
+reset optimizer_segments;
+drop table if exists foo_p;
+drop table if exists bar;
+-- MPP-18457, MPP-18415 end
+
+drop table if exists pnx;
+
+create table pnx 
+    (x int , y text)
+    distributed randomly
+    partition by list (y)
+        ( 
+            partition a values ('x1', 'x2'),
+            partition c values ('x3', 'x4')
+        );
+
+insert into pnx values
+    (1,'x1'),
+    (2,'x2'),
+    (3,'x3'), 
+    (4,'x4');
+
+select tableoid::regclass, * 
+from pnx;
+
+alter table pnx
+    split partition a at ('x1')
+    into (partition b, partition c);
+
+select tableoid::regclass, * 
+from pnx;
+
+select tableoid::regclass, *
+from pnx
+where y = 'x1';
+
+select tableoid::regclass, *
+from pnx
+where x = 1;
+
+
+drop table if exists pxn;
+
+create table pxn 
+    (x int , y text)
+    distributed randomly
+    partition by list (y)
+        ( 
+            partition a values ('x1', 'x2'),
+            partition c values ('x3', 'x4')
+        );
+
+insert into pxn values
+    (1,'x1'),
+    (2,'x2'),
+    (3,'x3'), 
+    (4,'x4');
+
+select tableoid::regclass, * 
+from pxn;
+
+alter table pxn
+    split partition a at ('x1')
+    into (partition c, partition b);
+
+select tableoid::regclass, * 
+from pxn;
+
+select tableoid::regclass, *
+from pxn
+where y = 'x2';
+
+select tableoid::regclass, *
+from pxn
+where x = 2;
+
+drop table if exists pxn;
+
+create table pxn 
+    (x int , y int)
+    distributed randomly
+    partition by range (y)
+        ( 
+            partition a start (0) end (10),
+            partition c start (11) end (20)
+        );
+
+insert into pxn values
+    (4,4),
+    (9,9),
+    (14,14), 
+    (19,19);
+
+select tableoid::regclass, * 
+from pxn;
+
+alter table pxn
+    split partition a at (5)
+    into (partition b, partition c);
+
+select tableoid::regclass, * 
+from pxn;
+
+select tableoid::regclass, *
+from pxn
+where y = 4;
+
+select tableoid::regclass, *
+from pxn
+where x = 4;
+
+drop table if exists pxn;
+
+create table pxn 
+    (x int , y int)
+    distributed randomly
+    partition by range (y)
+        ( 
+            partition a start (0) end (10),
+            partition c start (11) end (20)
+        );
+
+insert into pxn values
+    (4,4),
+    (9,9),
+    (14,14), 
+    (19,19);
+
+select tableoid::regclass, * 
+from pxn;
+
+alter table pxn
+    split partition a at (5)
+    into (partition c, partition b);
+
+select tableoid::regclass, * 
+from pxn;
+
+select tableoid::regclass, *
+from pxn
+where y = 9;
+
+select tableoid::regclass, *
+from pxn
+where x = 9;
+
+-- MPP-18359 end
+
+-- MPP-19105
+-- Base partitions with trailing dropped columns
+create table parttest_t (
+	a int,
+	b int,
+	c char,
+	d varchar(50)
+) distributed by (c) 
+partition by range (a) 
+( 
+	partition p1 start(1) end(5),
+	partition p2 start(5)
+);
+
+-- Drop column
+alter table parttest_t drop column d;
+
+-- Alter table split partition
+alter table parttest_t split partition for(1) at (2) into (partition p11, partition p22);
+
+insert into  parttest_t values(1,2,'a');
+select * from parttest_t;
+-- END MPP-19105
+reset optimizer_nestloop_factor;
+
+-- Sub-partition insertion with checking if the user provided correct leaf part
+create table part_tab ( i int, j int) distributed by (i) partition by range(j) (start(0) end(10) every(2));
+-- Wrong part
+insert into part_tab_1_prt_1 values(5,5);
+select * from part_tab;
+select * from part_tab_1_prt_1;
+
+insert into part_tab_1_prt_2 values(5,5);
+select * from part_tab;
+select * from part_tab_1_prt_2;
+
+-- Right part
+insert into part_tab_1_prt_3 values(5,5);
+analyze part_tab;
+select * from part_tab;
+select * from part_tab_1_prt_3;
+
+-- Root part
+insert into part_tab values(5,5);
+select * from part_tab;
+
+drop table if exists input1;
+create table input1 (x int, y int);
+insert into input1 select i, i from (select generate_series(1,10) as i) as t;
+drop table if exists input2;
+create table input2 (x int, y int);
+insert into input2 select i, i from (select generate_series(1,10) as i) as t;
+
+-- Multiple range table entries in the plan
+insert into part_tab_1_prt_1 select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i2.y = 5;
+analyze part_tab;
+select * from part_tab;
+select * from part_tab_1_prt_1;
+
+insert into part_tab_1_prt_2 select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i2.y = 5;
+select * from part_tab;
+select * from part_tab_1_prt_2;
+
+-- Right part
+insert into part_tab_1_prt_3 select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i1.x between 4 and 5;
+select * from part_tab;
+select * from part_tab_1_prt_3;
+
+-- Root part but no matching part for i2.y == 10
+insert into part_tab select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x;
+select * from part_tab;
+
+-- Root part
+insert into part_tab select i1.x, i2.y from input1 as i1 join input2 as i2 on i1.x = i2.x where i2.y < 10;
+select * from part_tab;
+
+-- Multi-level partitioning
+create table deep_part ( i int, j int, k int, s char(5)) 
+distributed by (i) 
+partition by list(s)
+subpartition by range (j) subpartition template (start(1)  end(10) every(2))
+subpartition by range (k) subpartition template (start(1)  end(10) every(2))
+(partition female values('F'), partition male values('M'))
+;
+
+-- Intermediate partition insert is allowed
+insert into deep_part_1_prt_male_2_prt_2 values(1,3,1,'M');
+-- but only if it's the right partition.
+insert into deep_part_1_prt_male_2_prt_2 values(1,1,1,'M');
+
+-- Wrong sub-partition (inserting a female value in male partition)
+insert into deep_part_1_prt_male_2_prt_2_3_prt_2 values (1, 1, 1, 'F');
+select * from deep_part;
+
+-- Correct leaf part
+insert into deep_part_1_prt_male_2_prt_1_3_prt_1 values (1, 1, 1, 'M');
+analyze deep_part;
+select * from deep_part;
+select * from deep_part_1_prt_male_2_prt_1_3_prt_1;
+
+-- Root part of a multi-level partitioned table
+insert into deep_part values (1, 1, 1, 'M');
+select * from deep_part;
+select * from deep_part_1_prt_male_2_prt_1_3_prt_1;
+
+insert into deep_part values (1, 1, 1, 'F');
+select * from deep_part;
+select * from deep_part_1_prt_female_2_prt_1_3_prt_1;
+
+insert into deep_part values (5, 5, 5, 'M');
+select * from deep_part;
+select * from deep_part_1_prt_male_2_prt_3_3_prt_3;
+
+insert into deep_part values (9, 9, 9, 'F');
+select * from deep_part;
+select * from deep_part_1_prt_female_2_prt_5_3_prt_5;
+
+-- Out of range partition
+insert into deep_part values (9, 9, 10, 'F');
+select * from deep_part;
+
+drop table input2;
+drop table input1;
+
+-- Avoid TupleDesc leak when COPY partition table from files
+-- This also covers the bug reported in MPP-9548 where insertion
+-- into a dropped/added column yielded incorrect results
+drop table if exists pt_td_leak;
+CREATE TABLE pt_td_leak
+(
+col1 int,
+col2 int,
+col3 int
+)
+distributed by (col1)
+partition by range(col2)
+(
+    partition part1 start(1) end(5),
+    partition part2 start(5) end(10)
+);
+
+insert into pt_td_leak select i,i,i from generate_series(1,9) i;
+copy pt_td_leak to '/tmp/pt_td_leak.out' csv;
+
+alter table pt_td_leak drop column col3;
+alter table pt_td_leak add column col3 int default 7;
+
+drop table if exists pt_td_leak_exchange;
+CREATE TABLE pt_td_leak_exchange ( col1 int, col2 int, col3 int) distributed by (col1);
+alter table pt_td_leak exchange partition part2 with table pt_td_leak_exchange;
+
+insert into pt_td_leak values(1,8,1);
+copy pt_td_leak from '/tmp/pt_td_leak.out' with delimiter ',';
+
+select * from pt_td_leak where col1 = 5;
+-- Check that data inserted into dropped/added column is correct
+select * from pt_td_leak where col3 = 1;
+
+drop table pt_td_leak;
+drop table pt_td_leak_exchange;
+
+
+--
+-- Test COPY, when distribution keys have different attribute numbers,
+-- because of dropped columns
+--
+CREATE TABLE pt_dropped_col_distkey (i int, to_be_dropped text, t text)
+DISTRIBUTED BY (t) PARTITION BY RANGE (i) (START (1) END(10) EVERY (5));
+INSERT INTO pt_dropped_col_distkey SELECT g, 'dropped' || g, 'before drop ' || g FROM generate_series(1, 7) g;
+
+ALTER TABLE pt_dropped_col_distkey DROP COLUMN to_be_dropped;
+
+-- This new partition won't have the dropped column. Because the distribution
+-- key was after the dropped column, the attribute number of the distribution
+-- key column will be different in this partition and the parent.
+ALTER TABLE pt_dropped_col_distkey ADD PARTITION pt_dropped_col_distkey_new_part START (10) END (100);
+
+INSERT INTO pt_dropped_col_distkey SELECT g, 'after drop ' || g FROM generate_series(8, 15) g;
+SELECT * FROM pt_dropped_col_distkey ORDER BY i;
+COPY pt_dropped_col_distkey TO '/tmp/pt_dropped_col_distkey.out';
+
+DELETE FROM pt_dropped_col_distkey;
+
+COPY pt_dropped_col_distkey FROM '/tmp/pt_dropped_col_distkey.out';
+
+SELECT * FROM pt_dropped_col_distkey ORDER BY i;
+
+-- don't drop the table, so that we have a partitioned table like this still
+-- in the database, when we test pg_upgrade later.
+
+
+--
+-- Test split default partition while per tuple memory context is reset
+--
+drop table if exists test_split_part cascade;
+
+CREATE TABLE test_split_part ( log_id int NOT NULL, f_array int[] NOT NULL)
+DISTRIBUTED BY (log_id)
+PARTITION BY RANGE(log_id)
+(
+    START (1::int) END (100::int) EVERY (5) WITH (appendonly=false),
+    PARTITION "Old" START (101::int) END (201::int) WITH (appendonly=false),
+    DEFAULT PARTITION other_log_ids  WITH (appendonly=false)
+);
+
+insert into test_split_part (log_id , f_array) select id, '{10}' from generate_series(1,1000) id;
+
+ALTER TABLE test_split_part SPLIT DEFAULT PARTITION START (201) INCLUSIVE END (301) EXCLUSIVE INTO (PARTITION "New", DEFAULT PARTITION);
+
+-- In GPDB 6 and below, an automatic array type was only created for the root
+-- partition. Nowadays we rely on upstream partitioning code, which creates
+-- an array type for all partition.
+select typname, typtype, typcategory from pg_type where typname like '%test_split_part%' and typcategory = 'A';
+select array_agg(test_split_part) from test_split_part where log_id = 500;
+select array_agg(test_split_part_1_prt_other_log_ids) from test_split_part_1_prt_other_log_ids where log_id = 500;
+
+-- Originally reported in MPP-7232
+create table mpp7232a (a int, b int) distributed by (a) partition by range (b) (start (1) end (3) every (1));
+\d+ mpp7232a
+alter table mpp7232a rename partition for (1) to alpha;
+alter table mpp7232a rename partition for (2) to bravo;
+\d+ mpp7232a
+
+create table mpp7232b (a int, b int) distributed by (a) partition by range (b) (partition alpha start (1) end (3) every (1));
+alter table mpp7232b rename partition for (1) to foo;
+\d+ mpp7232b
+
+-- Test .. WITH (tablename = <foo> ..) syntax.
+create table mpp17740 (a integer, b integer, e date) with (appendonly = true, orientation = column)
+distributed by (a)
+partition by range(e)
+(
+    partition mpp17740_20120523 start ('2012-05-23'::date) inclusive end ('2012-05-24'::date) exclusive with (tablename = 'mpp17740_20120523', appendonly = true),
+    partition mpp17740_20120524 start ('2012-05-24'::date) inclusive end ('2012-05-25'::date) exclusive with (tablename = 'mpp17740_20120524', appendonly = true)
+);
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp17740%';
+
+alter table mpp17740 add partition mpp17740_20120520 start ('2012-05-20'::date) inclusive end ('2012-05-21'::date) exclusive with (tablename = 'mpp17740_20120520', appendonly=true);
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'mpp17740%';
+
+-- Test mix of add and drop various column before split, and exchange partition at the end
+create table sales (pkid serial, option1 int, option2 int, option3 int, constraint partable_pkey primary key(pkid, option3))
+distributed by (pkid) partition by range (option3)
+(
+	partition aa start(1) end(100),
+	partition bb start(101) end(200),
+	partition cc start(201) end (300)
+);
+
+-- should error out since no subpartition in sales.
+alter table sales add partition dd start(301) end(300)
+	( subpartition opt1_1 VALUES (1),
+	  subpartition opt1_2 VALUES (2) );
+
+-- root partition (and only root) should have relfrozenxid as 0
+select relname, relkind from pg_class where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+select gp_segment_id, relname, relkind from gp_dist_random('pg_class') where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+
+alter table sales add column tax float;
+-- root partition (and only root) continues to have relfrozenxid as 0
+select relname, relkind from pg_class where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+select gp_segment_id, relname, relkind from gp_dist_random('pg_class') where relkind in ('r', 'p') and relname like 'sales%' and relfrozenxid=0;
+
+alter table sales drop column tax;
+
+create table newpart(like sales);
+alter table newpart add constraint newpart_pkey primary key(pkid, option3);
+alter table sales split partition for(1) at (50) into (partition aa1, partition aa2);
+
+select table_schema, table_name, constraint_name, constraint_type
+	from information_schema.table_constraints
+	where table_name in ('sales', 'newpart')
+	and constraint_name in ('partable_pkey', 'newpart_pkey')
+	order by table_name desc;
+
+alter table sales exchange partition for (101) with table newpart;
+
+select * from sales order by pkid;
+
+-- Create exchange table before drop column, make sure the consistency check still exist
+create table newpart2(like sales);
+alter table sales drop column option2;
+
+alter table sales exchange partition for (101) with table newpart2;
+
+select * from sales order by pkid;
+drop table sales cascade;
+
+-- Exchage partition table with a table having dropped column
+create table exchange_part(a int, b int) partition by range(b) (start (0) end (10) every (5));
+create table exchange1(a int, c int, b int);
+alter table exchange1 drop column c;
+alter table exchange_part exchange partition for (1) with table exchange1;
+copy exchange_part from STDIN DELIMITER as '|';
+9794 | 1
+9795 | 2
+9797 | 3
+9799 | 4
+9801 | 5
+9802 | 6
+9803 | 7
+9806 | 8
+9807 | 9
+9808 | 1
+9810 | 2
+9814 | 3
+9815 | 4
+9817 | 5
+9818 | 6
+9822 | 7
+9824 | 8
+9825 | 9
+9827 | 1
+9828 | 2
+9831 | 3
+9832 | 4
+9836 | 5
+9840 | 6
+9843 | 7
+9844 | 8
+\.
+select * from exchange_part;
+drop table exchange_part;
+drop table exchange1;
+-- Ensure that new partitions get the correct attributes (MPP17110)
+CREATE TABLE pt_tab_encode (a int, b text)
+with (appendonly=true, orientation=column, compresstype=zlib, compresslevel=1)
+distributed by (a)
+partition by list(b) (partition s_abc values ('abc') with (appendonly=true, orientation=column, compresstype=zlib, compresslevel=1));
+
+alter table pt_tab_encode add partition "s_xyz" values ('xyz') WITH (appendonly=true, orientation=column, compresstype=zlib, compresslevel=1);
+
+select relname, pg_get_expr(relpartbound, oid) from pg_class where relname like 'pt_tab_encode%';
+
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from pg_attribute_encoding where attrelid = 'pt_tab_encode_1_prt_s_abc'::regclass;
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from gp_dist_random('pg_attribute_encoding') where attrelid = 'pt_tab_encode_1_prt_s_abc'::regclass order by 1,3 limit 5;
+
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from pg_attribute_encoding where attrelid = 'pt_tab_encode_1_prt_s_xyz'::regclass;
+select gp_segment_id, attrelid::regclass, attnum, filenum, attoptions from gp_dist_random('pg_attribute_encoding') where attrelid = 'pt_tab_encode_1_prt_s_xyz'::regclass order by 1,3 limit 5;
+
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid = 'pt_tab_encode_1_prt_s_abc'::regclass;
+select c.oid::regclass, relkind, amname, reloptions from pg_class c left join pg_am am on am.oid = relam where c.oid = 'pt_tab_encode_1_prt_s_xyz'::regclass;
+
+-- Ensure that only the correct type of partitions can be added
+create table at_range (a int) partition by range (a) (start(1) end(5));
+create table at_list (i int) partition by list(i) (partition p1 values(1));
+
+alter table at_list add partition foo2 start(6) end (10);
+alter table at_range add partition test values(5);
+
+-- Ensure array type for the non-partition table is there after partition exchange.
+CREATE TABLE pt_xchg(a int) PARTITION BY RANGE(a) (START(1) END(4) EVERY (2));
+create table xchg_tab1(a int);
+CREATE SCHEMA xchg_schema;
+create table xchg_schema.xchg_tab2(a int);
+alter table pt_xchg exchange partition for (1) with table xchg_tab1;
+alter table pt_xchg exchange partition for (3) with table xchg_schema.xchg_tab2;
+
+select a.typowner=b.typowner from pg_type a join pg_type b on true where a.typname = 'xchg_tab1' and b.typname = '_xchg_tab1';
+
+select nspname from pg_namespace join pg_type on pg_namespace.oid = pg_type.typnamespace where pg_type.typname = 'xchg_tab1' or pg_type.typname = '_xchg_tab1';
+select nspname from pg_namespace join pg_type on pg_namespace.oid = pg_type.typnamespace where pg_type.typname = 'xchg_tab2' or pg_type.typname = '_xchg_tab2';
+
+select typname from pg_type where typelem = 'xchg_tab1'::regtype;
+select typname from pg_type where typelem = 'xchg_schema.xchg_tab2'::regtype;
+
+select typname from pg_type where typarray = '_xchg_tab1'::regtype;
+select typname from pg_type where typarray = 'xchg_schema._xchg_tab2'::regtype;
+
+alter table pt_xchg exchange partition for (1) with table xchg_tab1;
+select a.typowner=b.typowner from pg_type a join pg_type b on true where a.typname = 'xchg_tab1' and b.typname = '_xchg_tab1';
+select nspname from pg_namespace join pg_type on pg_namespace.oid = pg_type.typnamespace where pg_type.typname = 'xchg_tab1' or pg_type.typname = '_xchg_tab1';
+select typname from pg_type where typelem = 'xchg_tab1'::regtype;
+select typname from pg_type where typarray = '_xchg_tab1'::regtype;
+
+DROP SCHEMA xchg_schema CASCADE;
+-- Test with an incomplete operator class. Create a custom operator class and
+-- only define equality on it. You can't do much with that.
+--
+-- Before GPDB 7, Cloudberry used to allow creating the table, but you got an
+-- error when inserting to it. Nowadays we rely on PostgreSQL partitioning
+-- code, which rejects it at CREATE TABLE already.
+create type employee_type as (empid int, empname text);
+create function emp_equal(employee_type, employee_type) returns boolean
+  as 'select $1.empid = $2.empid;'
+  language sql
+  immutable
+  returns null on null input;
+create operator = (
+        leftarg = employee_type,
+        rightarg = employee_type,
+        procedure = emp_equal
+);
+create operator class employee_incomplete_op_class default for type employee_type
+  using btree as
+  operator 3 =;
+create table employee_table(timest date, user_id numeric(16,0) not null, tag1 char(5), emp employee_type)
+  distributed by (user_id)
+  partition by list(emp)
+  (partition part1 values('(1, ''foo'')'::employee_type), partition part2 values('(2, ''foo'')'::employee_type));
+
+
+-- Test partition table with ACL.
+-- We grant default SELECT permission to a new user, this new user should be
+-- able to SELECT from any partition table we create later.
+-- (https://github.com/greenplum-db/gpdb/issues/9524)
+DROP TABLE IF EXISTS user_prt_acl_append.t_part_acl;
+DROP SCHEMA IF EXISTS user_prt_acl_append;
+DROP ROLE IF EXISTS user_prt_acl_append;
+
+CREATE ROLE user_prt_acl_append;
+CREATE SCHEMA schema_part_acl_append;
+GRANT USAGE ON SCHEMA schema_part_acl_append TO user_prt_acl_append;
+ALTER DEFAULT PRIVILEGES IN SCHEMA schema_part_acl_append GRANT SELECT ON TABLES TO user_prt_acl_append;
+
+CREATE TABLE schema_part_acl_append.t_part_acl (dt date)
+PARTITION BY RANGE (dt)
+(
+    START (date '2019-12-01') INCLUSIVE
+    END (date '2020-02-01') EXCLUSIVE
+    EVERY (INTERVAL '1 month')
+);
+INSERT INTO schema_part_acl_append.t_part_acl VALUES (date '2019-12-01'), (date '2020-01-31');
+
+-- check if parent and child table have same relacl
+SELECT relname FROM pg_class
+WHERE relname LIKE 't_part_acl%'
+  AND relacl = (SELECT relacl FROM pg_class WHERE relname = 't_part_acl');
+
+-- check if new user can SELECT all data
+SET ROLE user_prt_acl_append;
+SELECT * FROM schema_part_acl_append.t_part_acl;
+
+RESET ROLE;
+-- we don't drop the table, schema and role here in order to test upgrade
+
+--
+-- Github issue: https://github.com/apache/cloudberry/issues/547
+-- Test COPY FROM on partitions tables.
+--
+create table t_issue_547_aoco(a int, b int) partition by range(b) (start(1) end(34) every(1)) using ao_column distributed by (a);
+\copy t_issue_547_aoco from 'data/partition_copy.csv' (format csv);
+analyze t_issue_547_aoco;
+select count(*) from t_issue_547_aoco;
+
+create table t_issue_547_ao(a int, b int) partition by range(b) (start(1) end(34) every(1)) using ao_row distributed by (a);
+\copy t_issue_547_ao from 'data/partition_copy.csv' (format csv);
+analyze t_issue_547_ao;
+select count(*) from t_issue_547_ao;
+
+drop table t_issue_547_aoco;
+drop table t_issue_547_ao;
+
+-- test on commit behavior used on partition table
+
+-- test on commit delete rows
+begin;
+create temp table temp_parent (a int) partition by range(a) (start(1) end(10) every(10)) on commit delete rows;
+insert into temp_parent select i from generate_series(1, 5) i;
+select count(*) from temp_parent;
+commit;
+-- DELETE ROWS will not cascaded to its partitions when we use DELETE ROWS behavior
+select count(*) from temp_parent;
+drop table temp_parent;
+
+-- test on commit drop
+begin;
+create temp table temp_parent (a int) partition by range(a) (start(1) end(10) every(1)) on commit drop;
+insert into temp_parent select i from generate_series(1, 5) i;
+select count(*) from pg_class where relname like 'temp_parent_%';
+commit;
+-- no relations remain in this case.
+select count(*) from pg_class where relname like 'temp_parent_%';
+
+-- check ATTACH PARTITION on parent table with different distribution policy
+CREATE EXTENSION IF NOT EXISTS gp_debug_numsegments;
+SELECT gp_debug_set_create_table_default_numsegments(1);
+
+CREATE TABLE expanded_parent(a int, b int) PARTITION BY RANGE(b) (START (0) END (6) EVERY (3));
+CREATE TABLE expanded_parent2(a int, b int) PARTITION BY RANGE(b) (START (0) END (6) EVERY (3));
+CREATE TABLE unexpanded_parent(a int, b int) PARTITION BY RANGE(b) (START (0) END (6) EVERY (3));
+CREATE TABLE unexpanded_attach(a int, b int);
+CREATE TABLE unexpanded_attach2(a int, b int);
+CREATE TABLE expanded_attach(a int, b int);
+CREATE TABLE expanded_attach2(a int, b int);
+
+SELECT gp_debug_reset_create_table_default_numsegments();
+
+-- attaching unexpanded partition to expanded table should fail
+ALTER TABLE expanded_parent EXPAND TABLE;
+ALTER TABLE expanded_parent ATTACH PARTITION unexpanded_attach FOR VALUES FROM (6) TO (9);
+
+-- attaching unexpanded partition to expanded table with partition prepare should fail
+ALTER TABLE expanded_parent2 EXPAND PARTITION PREPARE;
+ALTER TABLE expanded_parent2 ATTACH PARTITION unexpanded_attach2 FOR VALUES FROM (6) TO (9);
+
+-- attaching expanded partition to unexpanded table should fail
+ALTER TABLE expanded_attach EXPAND TABLE;
+ALTER TABLE unexpanded_parent ATTACH PARTITION expanded_attach FOR VALUES FROM (6) TO (9);
+
+-- attaching expanded partition to expanded table should succeed
+ALTER TABLE expanded_attach2 EXPAND TABLE;
+ALTER TABLE expanded_parent2 ATTACH PARTITION expanded_attach2 FOR VALUES FROM (6) TO (9);
+ALTER TABLE expanded_parent ATTACH PARTITION expanded_attach FOR VALUES FROM (6) TO (9);
+
+-- cleanup
+DROP TABLE expanded_parent;
+DROP TABLE expanded_parent2;
+DROP TABLE unexpanded_parent;
+DROP TABLE unexpanded_attach;
+DROP TABLE unexpanded_attach2;
+
+--
+-- Verify inheritance behavior of new partition child using various syntax
+--
+-- set owner for partition root (should be inherited except for ATTACH, EXCHANGE)
+CREATE ROLE part_inherit_role CREATEROLE;
+CREATE ROLE part_inherit_other_role IN ROLE part_inherit_role;
+CREATE ROLE part_inherit_priv_role;
+CREATE ROLE part_inherit_attach_priv_role;
+CREATE ROLE part_inherit_exchange_out_priv_role;
+SET ROLE part_inherit_role;
+
+CREATE TABLE part_inherit (
+    a int,
+    b int,
+-- non-partition constraint should be inherited except for ATTACH, EXCHANGE
+    CONSTRAINT con1 CHECK (a >= 0)
+)
+PARTITION BY RANGE (a)
+SUBPARTITION BY RANGE (b)
+SUBPARTITION TEMPLATE
+(SUBPARTITION l2_child START(10100) END(10200))
+(DEFAULT PARTITION l1_default,
+       PARTITION l1_child1 START (0) END (100),
+       PARTITION l1_to_split START (100) END (200),
+       PARTITION l1_to_exchange START (200) END (300))
+--AM and reloption should be inherited except for ATTACH, EXCHANGE
+WITH (appendonly = TRUE, compresslevel = 7);
+
+-- Set more properties for the root.
+-- index are inherited 
+CREATE INDEX part_inherit_i on part_inherit(a);
+-- privileges are inherited except for ATTACH, EXCHANGE
+GRANT UPDATE ON part_inherit TO part_inherit_priv_role;
+-- triggers are inherited except for subpartitions 
+-- FIXME: In 6X we used to not inherit triggers at all, in 7X we start to inherit
+-- trigger like the upstream, but the subpartitions created from the subpartition 
+-- template still don't inherit the triggers. We should fix that.
+CREATE FUNCTION part_inherit_trig() RETURNS TRIGGER LANGUAGE plpgsql
+  AS $$ BEGIN RETURN NULL; END $$;
+CREATE TRIGGER part_inherit_tg AFTER INSERT ON part_inherit
+  FOR EACH ROW EXECUTE FUNCTION part_inherit_trig();
+-- rules are not inherited
+CREATE RULE part_inherit_rule AS ON UPDATE TO part_inherit DO INSERT INTO part_inherit values(1);
+-- row-level security policies are not inherited
+ALTER TABLE part_inherit ENABLE ROW LEVEL SECURITY;
+
+-- Check the current status 
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit%' AND 
+        c.relkind NOT IN ('i', 'I');
+
+-- Now create child partitions in various forms 
+
+-- set an alternative role
+SET ROLE part_inherit_other_role;
+
+-- CREATE TABLE PARTITION OF
+CREATE TABLE part_inherit_partof PARTITION OF part_inherit FOR VALUES FROM (300) TO (400);
+
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname = 'part_inherit_partof';
+
+-- Now create child partitions in various forms 
+-- ATTACH PARTITION
+-- error if the partition-to-be doesn't have the same constraint as the parent.
+CREATE TABLE part_inherit_attach(a int, b int);
+ALTER TABLE part_inherit ATTACH PARTITION part_inherit_attach FOR VALUES FROM (400) TO (500);
+DROP TABLE part_inherit_attach;
+-- good case: have the same constraint as parent. Can have other constraint too.
+CREATE TABLE part_inherit_attach(a int, b int, CONSTRAINT con1 CHECK (a>=0), CONSTRAINT con2 CHECK (b>=0));
+-- reloptions and AM ('heap' which is different than the future parent) will be kept
+ALTER TABLE part_inherit_attach SET (fillfactor=30);
+-- privilege will be kept
+GRANT UPDATE ON part_inherit_attach TO part_inherit_attach_priv_role;
+-- do the attach
+ALTER TABLE part_inherit ATTACH PARTITION part_inherit_attach FOR VALUES FROM (400) TO (500);
+
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname = 'part_inherit_attach';
+
+
+-- ADD PARTITION
+ALTER TABLE part_inherit ADD PARTITION added START(500) END(600);
+
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit_1_prt_added%' AND 
+        c.relkind NOT IN ('i', 'I');
+
+-- EXCHANGE PARTITION - same behavior as ATTACH PARTITION
+-- error if the partition-to-be doesn't have the same constraint as the parent.
+CREATE TABLE part_inherit_exchange_out(a int, b int);
+ALTER TABLE part_inherit_1_prt_l1_to_exchange EXCHANGE PARTITION l2_child WITH TABLE part_inherit_exchange_out;
+DROP TABLE part_inherit_exchange_out;
+-- good case: have the same constraint as parent. Can have other constraint too.
+CREATE TABLE part_inherit_exchange_out(a int, b int, CONSTRAINT con1 CHECK (a>=0), CONSTRAINT con2 CHECK (b>=0));
+-- reloptions and AM ('heap' which is different than the future parent) will be kept
+ALTER TABLE part_inherit_exchange_out SET (fillfactor=30);
+-- privilege will be kept
+GRANT UPDATE ON part_inherit_exchange_out TO part_inherit_exchange_out_priv_role;
+-- do the exchange
+ALTER TABLE part_inherit_1_prt_l1_to_exchange EXCHANGE PARTITION l2_child WITH TABLE part_inherit_exchange_out;
+
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE (c.relname LIKE 'part_inherit_1_prt_l1_to_exchange%' OR c.relname = 'part_inherit_exchange_out')
+	AND c.relkind NOT IN ('i', 'I');
+
+-- SPLIT PARTITION
+ALTER TABLE part_inherit_1_prt_l1_to_split SPLIT PARTITION l2_child AT (10150) INTO (PARTITION split1, PARTITION split2);
+
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit_1_prt_l1_to_split%' AND 
+        c.relkind NOT IN ('i', 'I');
+
+-- Now print everything for comparison
+SELECT c.relname,
+        c.reloptions,
+        c.relkind,
+        a.amname as am,
+        c.relhasindex as hasindex,
+        r.rolname as owner,
+        c.relacl as acl,
+        c.relchecks as numchecks,
+        c.relhasrules as hasrules,
+        c.relhastriggers as hastriggers,
+        c.relrowsecurity as rowsecurity
+FROM pg_class c join pg_roles r on c.relowner = r.oid
+        join pg_am a on c.relam = a.oid
+WHERE c.relname LIKE 'part_inherit%' AND 
+        c.relkind NOT IN ('i', 'I');
+
+RESET ROLE;
+
+DROP TABLE part_inherit;
+DROP FUNCTION part_inherit_trig CASCADE;
+DROP TABLE part_inherit_exchange_out;
+DROP ROLE part_inherit_role;
+DROP ROLE part_inherit_other_role;
+DROP ROLE part_inherit_priv_role;
+DROP ROLE part_inherit_attach_priv_role;
+DROP ROLE part_inherit_exchange_out_priv_role;
+
+--Test cases for data selection from range partitioned tables with predicate on date or timestamp type-------------
+drop table if exists test_rangePartition;
+create table public.test_rangePartition
+(datedday date)
+    WITH (
+        appendonly=false
+        )
+    PARTITION BY RANGE(datedday)
+(
+    PARTITION pn_20221022 START ('2022-10-22'::date) END ('2022-10-23'::date),
+    PARTITION pn_20221023 START ('2022-10-23'::date) END ('2022-10-24'::date),
+    DEFAULT PARTITION pdefault
+    );
+
+insert into public.test_rangePartition(datedday)
+select ('2022-10-22'::date)
+union
+select ('2022-10-23'::date);
+
+--Test case with condition on date and timestamp
+explain (costs off) select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+
+--Test case with condition on date and timestamp
+explain (costs off) select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday='2022-10-22';
+select max(datedday) from public.test_rangePartition where datedday='2022-10-23' or datedday='2022-10-22';
+
+--Test case with condition on timestamp and timestamp
+explain (costs off) select max(datedday) from public.test_rangePartition where datedday=('2022-10-23'::date -interval '0 day') or datedday=('2022-10-23'::date -interval '1 day');
+select max(datedday) from public.test_rangePartition where datedday=('2022-10-23'::date -interval '0 day') or datedday=('2022-10-23'::date -interval '1 day');
+
+--Test case with condition on date and timestamp
+explain (costs off) select datedday from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+select datedday from public.test_rangePartition where datedday='2022-10-23' or datedday=('2022-10-23'::date -interval '1 day');
+
+drop table test_rangePartition;
+
+--Test cases for data selection from List partitioned tables with predicate on date or timestamp type-------------
+drop table if exists test_listPartition;
+create table test_listPartition (i int, d date)
+    partition by list(d)
+ (partition p1 values('2022-10-22'), partition p2 values('2022-10-23'),
+ default partition pdefault  );
+
+
+insert into test_listPartition values(1,'2022-10-22');
+insert into test_listPartition values(2,'2022-10-23');
+insert into test_listPartition values(3,'2022-10-24');
+
+
+--Test case with condition on date and timestamp
+explain (costs off) select max(d) from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+select max(d) from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+
+--Test case with condition on date and date
+explain (costs off) select max(d) from test_listPartition where d='2022-10-23' or d='2022-10-22';
+select max(d) from test_listPartition where d='2022-10-23' or d='2022-10-22';
+
+--Test case with condition on timestamp and timestamp
+explain (costs off) select max(d) from test_listPartition where d=('2022-10-23'::date -interval '0 day') or d=('2022-10-23'::date -interval '1 day');
+select max(d) from test_listPartition where d=('2022-10-23'::date -interval '0 day') or d=('2022-10-23'::date -interval '1 day');
+
+--Test case with condition on timestamp and timestamp
+explain (costs off) select d from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+select d from test_listPartition where d='2022-10-23' or d=('2022-10-23'::date -interval '1 day');
+
+drop table test_listPartition;
+-- test guc gp_max_partition_level
+drop table p3_sales;
+set gp_max_partition_level = 2;
+CREATE TABLE p3_sales (id int, year int, month int, day int,
+region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+ SUBPARTITION BY RANGE (month)
+  SUBPARTITION TEMPLATE (
+    START (1) END (3) EVERY (1),
+    DEFAULT SUBPARTITION other_months )
+    SUBPARTITION BY LIST (region)
+      SUBPARTITION TEMPLATE (
+       SUBPARTITION usa VALUES ('usa'),
+       SUBPARTITION europe VALUES ('europe'),
+       DEFAULT SUBPARTITION other_regions )
+( START (2010) END (2012) EVERY (1),
+  DEFAULT PARTITION outlying_years );
+
+set gp_max_partition_level = 3;
+CREATE TABLE p3_sales (id int, year int, month int, day int,
+region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+ SUBPARTITION BY RANGE (month)
+  SUBPARTITION TEMPLATE (
+    START (1) END (3) EVERY (1),
+    DEFAULT SUBPARTITION other_months )
+    SUBPARTITION BY LIST (region)
+      SUBPARTITION TEMPLATE (
+       SUBPARTITION usa VALUES ('usa'),
+       SUBPARTITION europe VALUES ('europe'),
+       DEFAULT SUBPARTITION other_regions )
+( START (2010) END (2012) EVERY (1),
+  DEFAULT PARTITION outlying_years );
+
+drop table p3_sales;
+
+set gp_max_partition_level = 0;
+CREATE TABLE p3_sales (id int, year int, month int, day int,
+region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+ SUBPARTITION BY RANGE (month)
+  SUBPARTITION TEMPLATE (
+    START (1) END (3) EVERY (1),
+    DEFAULT SUBPARTITION other_months )
+    SUBPARTITION BY LIST (region)
+      SUBPARTITION TEMPLATE (
+       SUBPARTITION usa VALUES ('usa'),
+       SUBPARTITION europe VALUES ('europe'),
+       DEFAULT SUBPARTITION other_regions )
+( START (2010) END (2012) EVERY (1),
+  DEFAULT PARTITION outlying_years );
+
+drop table p3_sales;
+
+-- We should not allow subpartition by clause when creating empty partition hierarchy
+-- Should error out
+CREATE TABLE empty_partition_disallow_subpartition(i int, j int)
+PARTITION BY range(i) SUBPARTITION BY range(j);
+
+-- Check with other Partition syntax
+CREATE TABLE empty_partition_disallow_subpartition_2(i int, j int)
+    DISTRIBUTED BY (i) PARTITION BY range(i) SUBPARTITION BY range(j);
+
+-- Should work fine for empty hierarchy when subpartition is not specified
+CREATE TABLE empty_partition(i int, j int) PARTITION BY range(i);
+
+-- Check with other Partition syntax
+CREATE TABLE empty_partition2(i int, j int) DISTRIBUTED BY (i) PARTITION BY range(i);
+
+-- https://github.com/apache/cloudberry/issues/795
+CREATE TABLE t_issue_795_par (
+  name character varying,
+  last_modified_date timestamp without time zone
+)
+WITH (appendoptimized=true, orientation=column, compresslevel=1)
+DISTRIBUTED BY (name)
+PARTITION BY RANGE (last_modified_date)
+(
+    PARTITION partition_202411 START ('2024-11-01 00:00:00') INCLUSIVE END ('2024-12-01 00:00:00') EXCLUSIVE,
+    PARTITION partition_max START ('2024-12-01 00:00:00') INCLUSIVE END (MAXVALUE)
+);
+
+\d+ t_issue_795_par
+DROP TABLE t_issue_795_par;
+-- test the row-level security
+DROP USER IF EXISTS new_user_append;
+create user new_user_append;
+create table foo_part_rls ( a int, b int, c int) distributed by (a)
+partition by range(b) (start(0) end(100) every(20), default partition other_part);
+insert into foo_part_rls select i,i*10,i*100 from generate_series(1,5)i;
+insert into foo_part_rls values (NULL,50,500);;
+insert into foo_part_rls values (NULL,60,NULL);
+insert into foo_part_rls values (NULL,70,NULL);
+insert into foo_part_rls values (NULL,NULL,600);
+insert into foo_part_rls values (NULL,NULL,700);
+analyze foo_part_rls;
+
+grant select on foo_part_rls to new_user_append;
+alter table foo_part_rls enable row level security;
+create policy p1 on foo_part_rls using (a * 10 = b and c > 300);
+set session authorization new_user_append;
+explain select * from foo_part_rls;
+select * from foo_part_rls;
+
+reset session authorization;
+drop policy p1 on foo_part_rls;
+drop table foo_part_rls cascade;
+drop user new_user;
+
+-- test index-only scan
+
+create table pt(dist int, pt1 text, pt2 text, pt3 text, ptid int) DISTRIBUTED BY (dist) 
+PARTITION BY RANGE(ptid) (START (0) END (5) EVERY (1), DEFAULT PARTITION junk_data);
+
+create table pt1(dist int, pt1 text, pt2 text, pt3 text, ptid int) DISTRIBUTED BY (dist) 
+PARTITION BY RANGE(ptid) (START (0) END (5) EVERY (1), DEFAULT PARTITION junk_data);
+
+create table pt2(dist int, tid int, t1 text, t2 text);
+
+create index pt1_idx on pt using btree (pt1);
+create index ptid_idx on pt using btree (ptid);
+create index ptid_pt1_idx on pt using btree (ptid, pt1);
+
+insert into pt select i, 'hello' || i, 'world', 'drop this', i % 6 from generate_series(0,53) i;
+insert into pt2 select i, i % 6, 'hello' || i, 'bar' from generate_series(0,1) i;
+
+insert into pt1 select * from pt;
+insert into pt1 select dist, pt1, pt2, pt3, ptid-100 from pt;
+
+alter table pt1 set with(REORGANIZE=false) DISTRIBUTED RANDOMLY;
+
+vacuum analyze pt;
+analyze pt1;
+analyze pt2;
+
+explain (costs off, timing off, summary off, analyze) select * from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid);
+select * from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid);
+
+explain (costs off, timing off, summary off, analyze) select ptid from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid) and pt1 = 'hello1';
+select ptid from pt where ptid in (select tid from pt2 where t1 = 'hello' || tid) and pt1 = 'hello1';
+
+drop table pt;
+drop table pt1;
+drop table pt2;
+
+-- test bitmap heap/bitmap index scan
+CREATE TABLE rp_multi_inds (a int, b int, c int) DISTRIBUTED BY (a) PARTITION BY RANGE (b);
+CREATE TABLE rp_multi_inds_part1 PARTITION OF rp_multi_inds FOR VALUES FROM (MINVALUE) TO (10);
+CREATE TABLE rp_multi_inds_part2 PARTITION OF rp_multi_inds FOR VALUES FROM (10) TO (20);
+CREATE TABLE rp_multi_inds_part3 PARTITION OF rp_multi_inds FOR VALUES FROM (4201) TO (4203);
+INSERT INTO rp_multi_inds VALUES (0, 0, 0), (11, 11, 11), (4201, 4201, 4201);
+analyze rp_multi_inds;
+
+-- Create an index only on the selected partition
+CREATE INDEX other_idx ON rp_multi_inds_part2 USING btree(b);
+-- Create indexes on root table
+CREATE INDEX rp_btree_idx ON rp_multi_inds USING btree(c);
+CREATE INDEX rp_bitmap_idx ON rp_multi_inds USING bitmap(b);
+-- Expect a plan that only uses the two indexes inherited from root
+SET optimizer_enable_dynamictablescan TO off;
+EXPLAIN (COSTS OFF, VERBOSE) SELECT * FROM rp_multi_inds WHERE b = 11 AND (c = 11 OR c = 4201);
+RESET optimizer_enable_dynamictablescan;
+
+drop table rp_multi_inds;
\ No newline at end of file
diff --git a/src/test/regress/sql/partition_append_setup.sql b/src/test/regress/sql/partition_append_setup.sql
new file mode 100644
index 00000000000..60f91b444f9
--- /dev/null
+++ b/src/test/regress/sql/partition_append_setup.sql
@@ -0,0 +1,5 @@
+-- start_ignore
+DROP DATABASE IF EXISTS partition_append;
+-- end_ignore
+
+create database partition_append;
diff --git a/src/test/regress/sql/partition_append_teardown.sql b/src/test/regress/sql/partition_append_teardown.sql
new file mode 100644
index 00000000000..3a427acaa9f
--- /dev/null
+++ b/src/test/regress/sql/partition_append_teardown.sql
@@ -0,0 +1,3 @@
+DROP DATABASE IF EXISTS partition_append;
+reset optimizer_disable_dynamic_table_scan;
+reset optimizer;
\ No newline at end of file
diff --git a/src/test/regress/sql/partition_join.sql b/src/test/regress/sql/partition_join.sql
index 24baa458b1d..404f9242b16 100644
--- a/src/test/regress/sql/partition_join.sql
+++ b/src/test/regress/sql/partition_join.sql
@@ -1173,3 +1173,43 @@ SELECT t1.*, t2.* FROM alpha t1 INNER JOIN beta t2 ON (t1.a = t2.a AND t1.c = t2
 EXPLAIN (COSTS OFF)
 SELECT t1.*, t2.* FROM alpha t1 INNER JOIN beta t2 ON (t1.a = t2.a AND t1.b = t2.b AND t1.c = t2.c) WHERE ((t1.b >= 100 AND t1.b < 110) OR (t1.b >= 200 AND t1.b < 210)) AND ((t2.b >= 100 AND t2.b < 110) OR (t2.b >= 200 AND t2.b < 210)) AND t1.c IN ('0004', '0009') ORDER BY t1.a, t1.b;
 SELECT t1.*, t2.* FROM alpha t1 INNER JOIN beta t2 ON (t1.a = t2.a AND t1.b = t2.b AND t1.c = t2.c) WHERE ((t1.b >= 100 AND t1.b < 110) OR (t1.b >= 200 AND t1.b < 210)) AND ((t2.b >= 100 AND t2.b < 110) OR (t2.b >= 200 AND t2.b < 210)) AND t1.c IN ('0004', '0009') ORDER BY t1.a, t1.b;
+
+--
+-- test issue https://github.com/apache/cloudberry/issues/1301
+--
+begin;
+create table t_issue_1301_big(
+	id varchar(32),
+	t varchar(32)
+) distributed by (id)
+partition by range(t)
+(
+partition p1 start ('0') end ('5'),
+partition p2 start ('5') end ('9999999999999999999')
+);
+create index idx_t_issue_1301_big_id on t_issue_1301_big(id);
+insert into t_issue_1301_big select seq, seq from generate_series(1, 100000) as seq;
+create table t_issue_1301_small(
+  id varchar(32),
+  t varchar(32)
+) distributed by (id);
+insert into t_issue_1301_small select seq*10000, seq*10000 from generate_series(1, 100) as seq;
+set local optimizer = off;
+set local enable_nestloop to on;
+analyze t_issue_1301_big;
+analyze t_issue_1301_small;
+explain(costs off) select a.* from t_issue_1301_small a left join t_issue_1301_big b on a.id=b.id;
+abort;
+
+BEGIN;
+CREATE TABLE t1 (id varchar(32), date date) DISTRIBUTED BY (id)
+PARTITION BY RANGE (date)
+(START (date '2016-01-01') INCLUSIVE END (date '2016-01-04') EXCLUSIVE EVERY (INTERVAL '1 day'));
+CREATE TABLE t2 (id varchar(32)) DISTRIBUTED BY (id);
+analyze t1;
+analyze t2;
+\d+ t1;
+\d+ t2;
+EXPLAIN(COSTS OFF) SELECT COUNT(*) FROM t1_1_prt_1 JOIN t2 USING(id);
+EXPLAIN(COSTS OFF) SELECT COUNT(*) FROM t1 JOIN t2 USING(id);
+ABORT;
diff --git a/src/test/regress/sql/partition_prune.sql b/src/test/regress/sql/partition_prune.sql
index a496f1a7985..f9e3b1f2013 100644
--- a/src/test/regress/sql/partition_prune.sql
+++ b/src/test/regress/sql/partition_prune.sql
@@ -937,7 +937,7 @@ drop table pph_arrpart;
 
 -- enum type list partition key
 create type pp_colors as enum ('green', 'blue', 'black');
-create table pp_enumpart (col1 int, a pp_colors) partition by list (a);
+create table pp_enumpart (a pp_colors) partition by list (a);
 create table pp_enumpart_green partition of pp_enumpart for values in ('green');
 create table pp_enumpart_blue partition of pp_enumpart for values in ('blue');
 explain (costs off) select * from pp_enumpart where a = 'blue';
diff --git a/src/test/regress/sql/partition_prune_append.sql b/src/test/regress/sql/partition_prune_append.sql
new file mode 100644
index 00000000000..a865af8065b
--- /dev/null
+++ b/src/test/regress/sql/partition_prune_append.sql
@@ -0,0 +1,1141 @@
+--
+-- Test partitioning planner code
+--
+
+-- GPDB:
+-- One of the queries EXPLAINed in this file executes on one or two segments,
+-- depending on random choice by the planner. Accept either plan.
+-- start_matchsubs
+-- m/ Gather Motion [12]:1  \(slice1; segments: [12]\)/
+-- s/ Gather Motion [12]:1  \(slice1; segments: [12]\)/ Gather Motion XXX/
+-- m/Memory Usage: \d+\w?B/
+-- s/Memory Usage: \d+\w?B/Memory Usage: ###B/
+-- m/Buckets: \d+/
+-- s/Buckets: \d+/Buckets: ###/
+-- m/Batches: \d+/
+-- s/Batches: \d+/Batches: ###/
+-- m/Extra Text: \(seg\d+\)/
+-- s/Extra Text: \(seg\d+\)/Extra Text: ###/
+-- m/Hash chain length \d+\.\d+ avg, \d+ max/
+-- s/Hash chain length \d+\.\d+ avg, \d+ max/Hash chain length ###/
+-- m/using \d+ of \d+ buckets/
+-- s/using \d+ of \d+ buckets/using ## of ### buckets/
+-- m/((0[1-9]|1[0-2])-(0[1-9]|1[0-9]|2[0-9])|(0[13-9]|1[0-2])-30|(0[13578]|1[02])-31)-(?!0000)[0-9]{4}/
+-- s/((0[1-9]|1[0-2])-(0[1-9]|1[0-9]|2[0-9])|(0[13-9]|1[0-2])-30|(0[13578]|1[02])-31)-(?!0000)[0-9]{4}/xx-xx-xxxx/
+-- m/((Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (0[1-9]|[12][0-9]|3[01]) ([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](.[0-9]+)? (?!0000)[0-9]{4}.*)+(['"])/
+-- s/((Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (0[1-9]|[12][0-9]|3[01]) ([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](.[0-9]+)? (?!0000)[0-9]{4}.*)+(['"])/xxx xx xx xx:xx:xx xxxx"/
+-- end_matchsubs
+-- Force generic plans to be used for all prepared statements in this file.
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+set plan_cache_mode = force_generic_plan;
+
+create table lp (a char) partition by list (a);
+create table lp_default partition of lp default;
+create table lp_ef partition of lp for values in ('e', 'f');
+create table lp_ad partition of lp for values in ('a', 'd');
+create table lp_bc partition of lp for values in ('b', 'c');
+create table lp_g partition of lp for values in ('g');
+create table lp_null partition of lp for values in (null);
+explain (costs off) select * from lp;
+explain (costs off) select * from lp where a > 'a' and a < 'd';
+explain (costs off) select * from lp where a > 'a' and a <= 'd';
+explain (costs off) select * from lp where a = 'a';
+explain (costs off) select * from lp where 'a' = a;	/* commuted */
+explain (costs off) select * from lp where a is not null;
+explain (costs off) select * from lp where a is null;
+explain (costs off) select * from lp where a = 'a' or a = 'c';
+explain (costs off) select * from lp where a is not null and (a = 'a' or a = 'c');
+explain (costs off) select * from lp where a <> 'g';
+explain (costs off) select * from lp where a <> 'a' and a <> 'd';
+explain (costs off) select * from lp where a not in ('a', 'd');
+
+-- collation matches the partitioning collation, pruning works
+create table coll_pruning (a text collate "C") partition by list (a);
+create table coll_pruning_a partition of coll_pruning for values in ('a');
+create table coll_pruning_b partition of coll_pruning for values in ('b');
+create table coll_pruning_def partition of coll_pruning default;
+explain (costs off) select * from coll_pruning where a collate "C" = 'a' collate "C";
+-- collation doesn't match the partitioning collation, no pruning occurs
+explain (costs off) select * from coll_pruning where a collate "POSIX" = 'a' collate "POSIX";
+
+create table rlp (a int, b varchar) partition by range (a);
+create table rlp_default partition of rlp default partition by list (a);
+create table rlp_default_default partition of rlp_default default;
+create table rlp_default_10 partition of rlp_default for values in (10);
+create table rlp_default_30 partition of rlp_default for values in (30);
+create table rlp_default_null partition of rlp_default for values in (null);
+create table rlp1 partition of rlp for values from (minvalue) to (1);
+create table rlp2 partition of rlp for values from (1) to (10);
+
+create table rlp3 (b varchar, a int) partition by list (b varchar_ops);
+-- GPDB: distribution policy must match the parent table.
+alter table rlp3 set distributed by (a);
+create table rlp3_default partition of rlp3 default;
+create table rlp3abcd partition of rlp3 for values in ('ab', 'cd');
+create table rlp3efgh partition of rlp3 for values in ('ef', 'gh');
+create table rlp3nullxy partition of rlp3 for values in (null, 'xy');
+alter table rlp attach partition rlp3 for values from (15) to (20);
+
+create table rlp4 partition of rlp for values from (20) to (30) partition by range (a);
+create table rlp4_default partition of rlp4 default;
+create table rlp4_1 partition of rlp4 for values from (20) to (25);
+create table rlp4_2 partition of rlp4 for values from (25) to (29);
+
+create table rlp5 partition of rlp for values from (31) to (maxvalue) partition by range (a);
+create table rlp5_default partition of rlp5 default;
+create table rlp5_1 partition of rlp5 for values from (31) to (40);
+
+explain (costs off) select * from rlp where a < 1;
+explain (costs off) select * from rlp where 1 > a;	/* commuted */
+explain (costs off) select * from rlp where a <= 1;
+explain (costs off) select * from rlp where a = 1;
+explain (costs off) select * from rlp where a = 1::bigint;		/* same as above */
+explain (costs off) select * from rlp where a = 1::numeric;		/* no pruning */
+explain (costs off) select * from rlp where a <= 10;
+explain (costs off) select * from rlp where a > 10;
+explain (costs off) select * from rlp where a < 15;
+explain (costs off) select * from rlp where a <= 15;
+explain (costs off) select * from rlp where a > 15 and b = 'ab';
+explain (costs off) select * from rlp where a = 16;
+explain (costs off) select * from rlp where a = 16 and b in ('not', 'in', 'here');
+explain (costs off) select * from rlp where a = 16 and b < 'ab';
+explain (costs off) select * from rlp where a = 16 and b <= 'ab';
+explain (costs off) select * from rlp where a = 16 and b is null;
+explain (costs off) select * from rlp where a = 16 and b is not null;
+explain (costs off) select * from rlp where a is null;
+explain (costs off) select * from rlp where a is not null;
+explain (costs off) select * from rlp where a > 30;
+explain (costs off) select * from rlp where a = 30;	/* only default is scanned */
+explain (costs off) select * from rlp where a <= 31;
+explain (costs off) select * from rlp where a = 1 or a = 7;
+explain (costs off) select * from rlp where a = 1 or b = 'ab';
+
+explain (costs off) select * from rlp where a > 20 and a < 27;
+explain (costs off) select * from rlp where a = 29;
+explain (costs off) select * from rlp where a >= 29;
+explain (costs off) select * from rlp where a < 1 or (a > 20 and a < 25);
+
+-- where clause contradicts sub-partition's constraint
+explain (costs off) select * from rlp where a = 20 or a = 40;
+explain (costs off) select * from rlp3 where a = 20;   /* empty */
+
+-- redundant clauses are eliminated
+explain (costs off) select * from rlp where a > 1 and a = 10;	/* only default */
+explain (costs off) select * from rlp where a > 1 and a >=15;	/* rlp3 onwards, including default */
+explain (costs off) select * from rlp where a = 1 and a = 3;	/* empty */
+explain (costs off) select * from rlp where (a = 1 and a = 3) or (a > 1 and a = 15);
+
+-- multi-column keys
+create table mc3p (a int, b int, c int) partition by range (a, abs(b), c);
+create table mc3p_default partition of mc3p default;
+create table mc3p0 partition of mc3p for values from (minvalue, minvalue, minvalue) to (1, 1, 1);
+create table mc3p1 partition of mc3p for values from (1, 1, 1) to (10, 5, 10);
+create table mc3p2 partition of mc3p for values from (10, 5, 10) to (10, 10, 10);
+create table mc3p3 partition of mc3p for values from (10, 10, 10) to (10, 10, 20);
+create table mc3p4 partition of mc3p for values from (10, 10, 20) to (10, maxvalue, maxvalue);
+create table mc3p5 partition of mc3p for values from (11, 1, 1) to (20, 10, 10);
+create table mc3p6 partition of mc3p for values from (20, 10, 10) to (20, 20, 20);
+create table mc3p7 partition of mc3p for values from (20, 20, 20) to (maxvalue, maxvalue, maxvalue);
+
+explain (costs off) select * from mc3p where a = 1;
+explain (costs off) select * from mc3p where a = 1 and abs(b) < 1;
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1;
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1 and c < 8;
+explain (costs off) select * from mc3p where a = 10 and abs(b) between 5 and 35;
+explain (costs off) select * from mc3p where a > 10;
+explain (costs off) select * from mc3p where a >= 10;
+explain (costs off) select * from mc3p where a < 10;
+explain (costs off) select * from mc3p where a <= 10 and abs(b) < 10;
+explain (costs off) select * from mc3p where a = 11 and abs(b) = 0;
+explain (costs off) select * from mc3p where a = 20 and abs(b) = 10 and c = 100;
+explain (costs off) select * from mc3p where a > 20;
+explain (costs off) select * from mc3p where a >= 20;
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20);
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1;
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1 or a = 1;
+explain (costs off) select * from mc3p where a = 1 or abs(b) = 1 or c = 1;
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 10);
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 9);
+
+-- a simpler multi-column keys case
+create table mc2p (a int, b int) partition by range (a, b);
+create table mc2p_default partition of mc2p default;
+create table mc2p0 partition of mc2p for values from (minvalue, minvalue) to (1, minvalue);
+create table mc2p1 partition of mc2p for values from (1, minvalue) to (1, 1);
+create table mc2p2 partition of mc2p for values from (1, 1) to (2, minvalue);
+create table mc2p3 partition of mc2p for values from (2, minvalue) to (2, 1);
+create table mc2p4 partition of mc2p for values from (2, 1) to (2, maxvalue);
+create table mc2p5 partition of mc2p for values from (2, maxvalue) to (maxvalue, maxvalue);
+
+explain (costs off) select * from mc2p where a < 2;
+explain (costs off) select * from mc2p where a = 2 and b < 1;
+explain (costs off) select * from mc2p where a > 1;
+explain (costs off) select * from mc2p where a = 1 and b > 1;
+
+-- all partitions but the default one should be pruned
+explain (costs off) select * from mc2p where a = 1 and b is null;
+explain (costs off) select * from mc2p where a is null and b is null;
+explain (costs off) select * from mc2p where a is null and b = 1;
+explain (costs off) select * from mc2p where a is null;
+explain (costs off) select * from mc2p where b is null;
+
+-- boolean partitioning
+create table boolpart (a bool) partition by list (a);
+create table boolpart_default partition of boolpart default;
+create table boolpart_t partition of boolpart for values in ('true');
+create table boolpart_f partition of boolpart for values in ('false');
+
+explain (costs off) select * from boolpart where a in (true, false);
+explain (costs off) select * from boolpart where a = false;
+explain (costs off) select * from boolpart where not a = false;
+explain (costs off) select * from boolpart where a is true or a is not true;
+explain (costs off) select * from boolpart where a is not true;
+explain (costs off) select * from boolpart where a is not true and a is not false;
+explain (costs off) select * from boolpart where a is unknown;
+explain (costs off) select * from boolpart where a is not unknown;
+
+create table boolrangep (a bool, b bool, c int) partition by range (a,b,c);
+create table boolrangep_tf partition of boolrangep for values from ('true', 'false', 0) to ('true', 'false', 100);
+create table boolrangep_ft partition of boolrangep for values from ('false', 'true', 0) to ('false', 'true', 100);
+create table boolrangep_ff1 partition of boolrangep for values from ('false', 'false', 0) to ('false', 'false', 50);
+create table boolrangep_ff2 partition of boolrangep for values from ('false', 'false', 50) to ('false', 'false', 100);
+
+-- try a more complex case that's been known to trip up pruning in the past
+explain (costs off)  select * from boolrangep where not a and not b and c = 25;
+
+-- test scalar-to-array operators
+create table coercepart (a varchar) partition by list (a);
+create table coercepart_ab partition of coercepart for values in ('ab');
+create table coercepart_bc partition of coercepart for values in ('bc');
+create table coercepart_cd partition of coercepart for values in ('cd');
+
+explain (costs off) select * from coercepart where a in ('ab', to_char(125, '999'));
+explain (costs off) select * from coercepart where a ~ any ('{ab}');
+explain (costs off) select * from coercepart where a !~ all ('{ab}');
+explain (costs off) select * from coercepart where a ~ any ('{ab,bc}');
+explain (costs off) select * from coercepart where a !~ all ('{ab,bc}');
+explain (costs off) select * from coercepart where a = any ('{ab,bc}');
+explain (costs off) select * from coercepart where a = any ('{ab,null}');
+explain (costs off) select * from coercepart where a = any (null::text[]);
+explain (costs off) select * from coercepart where a = all ('{ab}');
+explain (costs off) select * from coercepart where a = all ('{ab,bc}');
+explain (costs off) select * from coercepart where a = all ('{ab,null}');
+explain (costs off) select * from coercepart where a = all (null::text[]);
+
+drop table coercepart;
+
+CREATE TABLE part (a INT, b INT) PARTITION BY LIST (a);
+CREATE TABLE part_p1 PARTITION OF part FOR VALUES IN (-2,-1,0,1,2);
+CREATE TABLE part_p2 PARTITION OF part DEFAULT PARTITION BY RANGE(a);
+CREATE TABLE part_p2_p1 PARTITION OF part_p2 DEFAULT;
+CREATE TABLE part_rev (b INT, c INT, a INT);
+-- The distribution key must be the same for partition tables.
+ALTER TABLE part_rev SET DISTRIBUTED BY(a);
+ALTER TABLE part ATTACH PARTITION part_rev FOR VALUES IN (3);  -- fail
+ALTER TABLE part_rev DROP COLUMN c;
+ALTER TABLE part ATTACH PARTITION part_rev FOR VALUES IN (3);  -- now it's ok
+INSERT INTO part VALUES (-1,-1), (1,1), (2,NULL), (NULL,-2),(NULL,NULL);
+EXPLAIN (COSTS OFF) SELECT tableoid::regclass as part, a, b FROM part WHERE a IS NULL ORDER BY 1, 2, 3;
+EXPLAIN (VERBOSE, COSTS OFF) SELECT * FROM part p(x) ORDER BY x;
+
+--
+-- some more cases
+--
+
+--
+-- pruning for partitioned table appearing inside a sub-query
+--
+-- pruning won't work for mc3p, because some keys are Params
+explain (costs off) select * from mc2p t1, lateral (select count(*) from mc3p t2 where t2.a = t1.b and abs(t2.b) = 1 and t2.c = 1) s where t1.a = 1;
+
+-- pruning should work fine, because values for a prefix of keys (a, b) are
+-- available
+explain (costs off) select * from mc2p t1, lateral (select count(*) from mc3p t2 where t2.c = t1.b and abs(t2.b) = 1 and t2.a = 1) s where t1.a = 1;
+
+-- also here, because values for all keys are provided
+explain (costs off) select * from mc2p t1, lateral (select count(*) from mc3p t2 where t2.a = 1 and abs(t2.b) = 1 and t2.c = 1) s where t1.a = 1;
+
+--
+-- pruning with clauses containing <> operator
+--
+
+-- doesn't prune range partitions
+create table rp (a int) partition by range (a);
+create table rp0 partition of rp for values from (minvalue) to (1);
+create table rp1 partition of rp for values from (1) to (2);
+create table rp2 partition of rp for values from (2) to (maxvalue);
+
+explain (costs off) select * from rp where a <> 1;
+explain (costs off) select * from rp where a <> 1 and a <> 2;
+
+-- null partition should be eliminated due to strict <> clause.
+explain (costs off) select * from lp where a <> 'a';
+
+-- ensure we detect contradictions in clauses; a can't be NULL and NOT NULL.
+explain (costs off) select * from lp where a <> 'a' and a is null;
+explain (costs off) select * from lp where (a <> 'a' and a <> 'd') or a is null;
+
+-- check that it also works for a partitioned table that's not root,
+-- which in this case are partitions of rlp that are themselves
+-- list-partitioned on b
+explain (costs off) select * from rlp where a = 15 and b <> 'ab' and b <> 'cd' and b <> 'xy' and b is not null;
+
+--
+-- different collations for different keys with same expression
+--
+create table coll_pruning_multi (a text) partition by range (substr(a, 1) collate "POSIX", substr(a, 1) collate "C");
+create table coll_pruning_multi1 partition of coll_pruning_multi for values from ('a', 'a') to ('a', 'e');
+create table coll_pruning_multi2 partition of coll_pruning_multi for values from ('a', 'e') to ('a', 'z');
+create table coll_pruning_multi3 partition of coll_pruning_multi for values from ('b', 'a') to ('b', 'e');
+
+-- no pruning, because no value for the leading key
+explain (costs off) select * from coll_pruning_multi where substr(a, 1) = 'e' collate "C";
+
+-- pruning, with a value provided for the leading key
+explain (costs off) select * from coll_pruning_multi where substr(a, 1) = 'a' collate "POSIX";
+
+-- pruning, with values provided for both keys
+explain (costs off) select * from coll_pruning_multi where substr(a, 1) = 'e' collate "C" and substr(a, 1) = 'a' collate "POSIX";
+
+--
+-- LIKE operators don't prune
+--
+create table like_op_noprune (a text) partition by list (a);
+create table like_op_noprune1 partition of like_op_noprune for values in ('ABC');
+create table like_op_noprune2 partition of like_op_noprune for values in ('BCD');
+explain (costs off) select * from like_op_noprune where a like '%BC';
+
+--
+-- tests wherein clause value requires a cross-type comparison function
+--
+create table lparted_by_int2 (a smallint) partition by list (a);
+create table lparted_by_int2_1 partition of lparted_by_int2 for values in (1);
+create table lparted_by_int2_16384 partition of lparted_by_int2 for values in (16384);
+explain (costs off) select * from lparted_by_int2 where a = 100000000000000;
+
+create table rparted_by_int2 (a smallint) partition by range (a);
+create table rparted_by_int2_1 partition of rparted_by_int2 for values from (1) to (10);
+create table rparted_by_int2_16384 partition of rparted_by_int2 for values from (10) to (16384);
+-- all partitions pruned
+explain (costs off) select * from rparted_by_int2 where a > 100000000000000;
+create table rparted_by_int2_maxvalue partition of rparted_by_int2 for values from (16384) to (maxvalue);
+-- all partitions but rparted_by_int2_maxvalue pruned
+explain (costs off) select * from rparted_by_int2 where a > 100000000000000;
+
+drop table lp, coll_pruning, rlp, mc3p, mc2p, boolpart, boolrangep, rp, coll_pruning_multi, like_op_noprune, lparted_by_int2, rparted_by_int2;
+
+--
+-- Test runtime partition pruning
+--
+create table ab (a int not null, b int not null) partition by list (a);
+create table ab_a2 partition of ab for values in(2) partition by list (b);
+create table ab_a2_b1 partition of ab_a2 for values in (1);
+create table ab_a2_b2 partition of ab_a2 for values in (2);
+create table ab_a2_b3 partition of ab_a2 for values in (3);
+create table ab_a1 partition of ab for values in(1) partition by list (b);
+create table ab_a1_b1 partition of ab_a1 for values in (1);
+create table ab_a1_b2 partition of ab_a1 for values in (2);
+create table ab_a1_b3 partition of ab_a1 for values in (3);
+create table ab_a3 partition of ab for values in(3) partition by list (b);
+create table ab_a3_b1 partition of ab_a3 for values in (1);
+create table ab_a3_b2 partition of ab_a3 for values in (2);
+create table ab_a3_b3 partition of ab_a3 for values in (3);
+
+-- Disallow index only scans as concurrent transactions may stop visibility
+-- bits being set causing "Heap Fetches" to be unstable in the EXPLAIN ANALYZE
+-- output.
+set enable_indexonlyscan = off;
+
+prepare ab_q1 (int, int, int) as
+select * from ab where a between $1 and $2 and b <= $3;
+
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (2, 2, 3);
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (1, 2, 3);
+
+deallocate ab_q1;
+
+-- Runtime pruning after optimizer pruning
+prepare ab_q1 (int, int) as
+select a from ab where a between $1 and $2 and b < 3;
+
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (2, 2);
+explain (analyze, costs off, summary off, timing off) execute ab_q1 (2, 4);
+
+-- Ensure a mix of PARAM_EXTERN and PARAM_EXEC Params work together at
+-- different levels of partitioning.
+prepare ab_q2 (int, int) as
+select a from ab where a between $1 and $2 and b < (select 3);
+
+explain (analyze, costs off, summary off, timing off) execute ab_q2 (2, 2);
+
+-- As above, but swap the PARAM_EXEC Param to the first partition level
+prepare ab_q3 (int, int) as
+select a from ab where b between $1 and $2 and a < (select 3);
+
+explain (analyze, costs off, summary off, timing off) execute ab_q3 (2, 2);
+
+-- Test a backwards Append scan
+create table list_part (a int) partition by list (a);
+create table list_part1 partition of list_part for values in (1);
+create table list_part2 partition of list_part for values in (2);
+create table list_part3 partition of list_part for values in (3);
+create table list_part4 partition of list_part for values in (4);
+
+insert into list_part select generate_series(1,4);
+
+begin;
+
+-- Don't select an actual value out of the table as the order of the Append's
+-- subnodes may not be stable.
+declare cur SCROLL CURSOR for select 1 from list_part where a > (select 1) and a < (select 4);
+
+-- move beyond the final row
+move 3 from cur;
+
+-- Ensure we get two rows.
+fetch backward all from cur;
+
+commit;
+
+begin;
+
+-- Test run-time pruning using stable functions
+create function list_part_fn(int) returns int as $$ begin return $1; end;$$ language plpgsql stable;
+
+-- Ensure pruning works using a stable function containing no Vars
+explain (analyze, costs off, summary off, timing off) select * from list_part where a = list_part_fn(1);
+
+-- Ensure pruning does not take place when the function has a Var parameter
+explain (analyze, costs off, summary off, timing off) select * from list_part where a = list_part_fn(a);
+
+-- Ensure pruning does not take place when the expression contains a Var.
+explain (analyze, costs off, summary off, timing off) select * from list_part where a = list_part_fn(1) + a;
+
+rollback;
+
+drop table list_part;
+
+-- Parallel append
+
+-- Parallel queries won't necessarily get as many workers as the planner
+-- asked for.  This affects not only the "Workers Launched:" field of EXPLAIN
+-- results, but also row counts and loop counts for parallel scans, Gathers,
+-- and everything in between.  This function filters out the values we can't
+-- rely on to be stable.
+-- This removes enough info that you might wonder why bother with EXPLAIN
+-- ANALYZE at all.  The answer is that we need to see '(never executed)'
+-- notations because that's the only way to verify runtime pruning.
+create function explain_parallel_append(text) returns setof text
+language plpgsql as
+$$
+declare
+    ln text;
+begin
+    set local enable_parallel = off;
+    for ln in
+        execute format('explain (analyze, costs off, summary off, timing off) %s',
+            $1)
+    loop
+        ln := regexp_replace(ln, 'Workers Launched: \d+', 'Workers Launched: N');
+        ln := regexp_replace(ln, 'actual rows=\d+ loops=\d+', 'actual rows=N loops=N');
+        ln := regexp_replace(ln, 'Rows Removed by Filter: \d+', 'Rows Removed by Filter: N');
+        return next ln;
+    end loop;
+    reset enable_parallel;
+end;
+$$;
+
+prepare ab_q4 (int, int) as
+select avg(a) from ab where a between $1 and $2 and b < 4;
+
+-- Encourage use of parallel plans
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set min_parallel_table_scan_size = 0;
+set max_parallel_workers_per_gather = 2;
+
+select explain_parallel_append('execute ab_q4 (2, 2)');
+
+-- Test run-time pruning with IN lists.
+prepare ab_q5 (int, int, int) as
+select avg(a) from ab where a in($1,$2,$3) and b < 4;
+
+select explain_parallel_append('execute ab_q5 (1, 1, 1)');
+select explain_parallel_append('execute ab_q5 (2, 3, 3)');
+
+-- Try some params whose values do not belong to any partition.
+select explain_parallel_append('execute ab_q5 (33, 44, 55)');
+
+-- Test Parallel Append with PARAM_EXEC Params
+select explain_parallel_append('select count(*) from ab where (a = (select 1) or a = (select 3)) and b = 2');
+
+-- Test pruning during parallel nested loop query
+create table lprt_a (a int not null);
+-- Insert some values we won't find in ab
+insert into lprt_a select 0 from generate_series(1,100);
+
+-- and insert some values that we should find.
+insert into lprt_a values(1),(1);
+
+analyze lprt_a;
+
+create index ab_a2_b1_a_idx on ab_a2_b1 (a);
+create index ab_a2_b2_a_idx on ab_a2_b2 (a);
+create index ab_a2_b3_a_idx on ab_a2_b3 (a);
+create index ab_a1_b1_a_idx on ab_a1_b1 (a);
+create index ab_a1_b2_a_idx on ab_a1_b2 (a);
+create index ab_a1_b3_a_idx on ab_a1_b3 (a);
+create index ab_a3_b1_a_idx on ab_a3_b1 (a);
+create index ab_a3_b2_a_idx on ab_a3_b2 (a);
+create index ab_a3_b3_a_idx on ab_a3_b3 (a);
+
+set enable_hashjoin = 0;
+set enable_mergejoin = 0;
+set enable_memoize = 0;
+
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(0, 0, 1)');
+
+-- Ensure the same partitions are pruned when we make the nested loop
+-- parameter an Expr rather than a plain Param.
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a + 0 where a.a in(0, 0, 1)');
+
+insert into lprt_a values(3),(3);
+
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(1, 0, 3)');
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(1, 0, 0)');
+
+delete from lprt_a where a = 1;
+
+select explain_parallel_append('select avg(ab.a) from ab inner join lprt_a a on ab.a = a.a where a.a in(1, 0, 0)');
+
+reset enable_hashjoin;
+reset enable_mergejoin;
+reset enable_memoize;
+reset parallel_setup_cost;
+reset parallel_tuple_cost;
+reset min_parallel_table_scan_size;
+reset max_parallel_workers_per_gather;
+
+-- Test run-time partition pruning with an initplan
+explain (analyze, costs off, summary off, timing off)
+select * from ab where a = (select max(a) from lprt_a) and b = (select max(a)-1 from lprt_a);
+
+-- Test run-time partition pruning with UNION ALL parents
+explain (analyze, costs off, summary off, timing off)
+select * from (select * from ab where a = 1 union all select * from ab) ab where b = (select 1);
+
+-- A case containing a UNION ALL with a non-partitioned child.
+explain (analyze, costs off, summary off, timing off)
+select * from (select * from ab where a = 1 union all (values(10,5)) union all select * from ab) ab where b = (select 1);
+
+-- Another UNION ALL test, but containing a mix of exec init and exec run-time pruning.
+create table xy_1 (x int, y int);
+insert into xy_1 values(100,-10);
+
+set enable_bitmapscan = 0;
+set enable_indexscan = 0;
+
+prepare ab_q6 as
+select * from (
+	select tableoid::regclass,a,b from ab
+union all
+	select tableoid::regclass,x,y from xy_1
+union all
+	select tableoid::regclass,a,b from ab
+) ab where a = $1 and b = (select -10);
+
+-- Ensure the xy_1 subplan is not pruned.
+explain (analyze, costs off, summary off, timing off) execute ab_q6(1);
+
+-- Ensure we see just the xy_1 row.
+execute ab_q6(100);
+
+reset enable_bitmapscan;
+reset enable_indexscan;
+
+deallocate ab_q1;
+deallocate ab_q2;
+deallocate ab_q3;
+deallocate ab_q4;
+deallocate ab_q5;
+deallocate ab_q6;
+
+-- UPDATE on a partition subtree has been seen to have problems.
+insert into ab values (1,2);
+explain (analyze, costs off, summary off, timing off)
+update ab_a1 set b = 3 from ab where ab.a = 1 and ab.a = ab_a1.a;
+table ab;
+
+-- Test UPDATE where source relation has run-time pruning enabled
+truncate ab;
+insert into ab values (1, 1), (1, 2), (1, 3), (2, 1);
+explain (analyze, costs off, summary off, timing off)
+update ab_a1 set b = 3 from ab_a2 where ab_a2.b = (select 1);
+select tableoid::regclass, * from ab;
+
+drop table ab, lprt_a;
+
+-- Join
+create table tbl1(col1 int);
+insert into tbl1 values (501), (505);
+analyze tbl1;
+
+-- Basic table
+create table tprt (col1 int) partition by range (col1);
+create table tprt_1 partition of tprt for values from (1) to (501);
+create table tprt_2 partition of tprt for values from (501) to (1001);
+create table tprt_3 partition of tprt for values from (1001) to (2001);
+create table tprt_4 partition of tprt for values from (2001) to (3001);
+create table tprt_5 partition of tprt for values from (3001) to (4001);
+create table tprt_6 partition of tprt for values from (4001) to (5001);
+
+create index tprt1_idx on tprt_1 (col1);
+create index tprt2_idx on tprt_2 (col1);
+create index tprt3_idx on tprt_3 (col1);
+create index tprt4_idx on tprt_4 (col1);
+create index tprt5_idx on tprt_5 (col1);
+create index tprt6_idx on tprt_6 (col1);
+
+insert into tprt values (10), (20), (501), (502), (505), (1001), (4500);
+
+set enable_hashjoin = off;
+set enable_mergejoin = off;
+set enable_seqscan=off;
+
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 > tprt.col1;
+
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 = tprt.col1;
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 > tprt.col1
+order by tbl1.col1, tprt.col1;
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 = tprt.col1
+order by tbl1.col1, tprt.col1;
+
+-- Multiple partitions
+insert into tbl1 values (1001), (1010), (1011);
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 inner join tprt on tbl1.col1 > tprt.col1;
+
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 inner join tprt on tbl1.col1 = tprt.col1;
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 > tprt.col1
+order by tbl1.col1, tprt.col1;
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 = tprt.col1
+order by tbl1.col1, tprt.col1;
+
+-- Last partition
+delete from tbl1;
+insert into tbl1 values (4400);
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 < tprt.col1;
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 < tprt.col1
+order by tbl1.col1, tprt.col1;
+
+reset enable_seqscan;
+
+-- No matching partition
+delete from tbl1;
+insert into tbl1 values (10000);
+explain (analyze, costs off, summary off, timing off)
+select * from tbl1 join tprt on tbl1.col1 = tprt.col1;
+
+select tbl1.col1, tprt.col1 from tbl1
+inner join tprt on tbl1.col1 = tprt.col1
+order by tbl1.col1, tprt.col1;
+
+drop table tbl1, tprt;
+
+-- Test with columns defined in varying orders between each level
+create table part_abc (a int not null, b int not null, c int not null) partition by list (a);
+create table part_bac (b int not null, a int not null, c int not null) partition by list (b);
+create table part_cab (c int not null, a int not null, b int not null) partition by list (c);
+create table part_abc_p1 (a int not null, b int not null, c int not null);
+
+-- GPDB: the distribution keys must be the same in all parts of partition
+-- hierarchy.
+alter table part_bac set distributed by (a);
+alter table part_cab set distributed by (a);
+
+alter table part_abc attach partition part_bac for values in(1);
+alter table part_bac attach partition part_cab for values in(2);
+alter table part_cab attach partition part_abc_p1 for values in(3);
+
+prepare part_abc_q1 (int, int, int) as
+select * from part_abc where a = $1 and b = $2 and c = $3;
+
+-- Single partition should be scanned.
+explain (analyze, costs off, summary off, timing off) execute part_abc_q1 (1, 2, 3);
+
+deallocate part_abc_q1;
+
+drop table part_abc;
+
+-- Ensure that an Append node properly handles a sub-partitioned table
+-- matching without any of its leaf partitions matching the clause.
+create table listp (a int, b int) partition by list (a);
+create table listp_1 partition of listp for values in(1) partition by list (b);
+create table listp_1_1 partition of listp_1 for values in(1);
+create table listp_2 partition of listp for values in(2) partition by list (b);
+create table listp_2_1 partition of listp_2 for values in(2);
+select * from listp where b = 1;
+
+-- Ensure that an Append node properly can handle selection of all first level
+-- partitions before finally detecting the correct set of 2nd level partitions
+-- which match the given parameter.
+prepare q1 (int,int) as select * from listp where b in ($1,$2);
+
+explain (analyze, costs off, summary off, timing off)  execute q1 (1,1);
+
+explain (analyze, costs off, summary off, timing off)  execute q1 (2,2);
+
+-- Try with no matching partitions.
+explain (analyze, costs off, summary off, timing off)  execute q1 (0,0);
+
+deallocate q1;
+
+-- Test more complex cases where a not-equal condition further eliminates partitions.
+prepare q1 (int,int,int,int) as select * from listp where b in($1,$2) and $3 <> b and $4 <> b;
+
+-- Both partitions allowed by IN clause, but one disallowed by <> clause
+explain (analyze, costs off, summary off, timing off)  execute q1 (1,2,2,0);
+
+-- Both partitions allowed by IN clause, then both excluded again by <> clauses.
+explain (analyze, costs off, summary off, timing off)  execute q1 (1,2,2,1);
+
+-- Ensure Params that evaluate to NULL properly prune away all partitions
+explain (analyze, costs off, summary off, timing off)
+select * from listp where a = (select null::int);
+
+drop table listp;
+
+--
+-- check that stable query clauses are only used in run-time pruning
+-- because a is the distributed key by default in stable_qual_pruning,
+-- to get consistent results, we make the table distributed randomly.
+--
+create table stable_qual_pruning (a timestamp) distributed randomly partition by range (a);
+create table stable_qual_pruning1 partition of stable_qual_pruning
+  for values from ('2000-01-01') to ('2000-02-01');
+create table stable_qual_pruning2 partition of stable_qual_pruning
+  for values from ('2000-02-01') to ('2000-03-01');
+create table stable_qual_pruning3 partition of stable_qual_pruning
+  for values from ('3000-02-01') to ('3000-03-01');
+
+-- comparison against a stable value requires run-time pruning
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning where a < localtimestamp;
+
+-- timestamp < timestamptz comparison is only stable, not immutable
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning where a < '2000-02-01'::timestamptz;
+
+-- check ScalarArrayOp cases
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2010-02-01', '2020-01-01']::timestamp[]);
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2000-02-01', '2010-01-01']::timestamp[]);
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2000-02-01', localtimestamp]::timestamp[]);
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2010-02-01', '2020-01-01']::timestamptz[]);
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(array['2000-02-01', '2010-01-01']::timestamptz[]);
+explain (analyze, costs off, summary off, timing off)
+select * from stable_qual_pruning
+  where a = any(null::timestamptz[]);
+
+drop table stable_qual_pruning;
+
+--
+-- Check that pruning with composite range partitioning works correctly when
+-- it must ignore clauses for trailing keys once it has seen a clause with
+-- non-inclusive operator for an earlier key
+--
+create table mc3p (a int, b int, c int) partition by range (a, abs(b), c);
+create table mc3p0 partition of mc3p
+  for values from (0, 0, 0) to (0, maxvalue, maxvalue);
+create table mc3p1 partition of mc3p
+  for values from (1, 1, 1) to (2, minvalue, minvalue);
+create table mc3p2 partition of mc3p
+  for values from (2, minvalue, minvalue) to (3, maxvalue, maxvalue);
+insert into mc3p values (0, 1, 1), (1, 1, 1), (2, 1, 1);
+
+explain (analyze, costs off, summary off, timing off)
+select * from mc3p where a < 3 and abs(b) = 1;
+
+--
+-- Check that pruning with composite range partitioning works correctly when
+-- a combination of runtime parameters is specified, not all of whose values
+-- are available at the same time
+--
+prepare ps1 as
+  select * from mc3p where a = $1 and abs(b) < (select 3);
+explain (analyze, costs off, summary off, timing off)
+execute ps1(1);
+deallocate ps1;
+prepare ps2 as
+  select * from mc3p where a <= $1 and abs(b) < (select 3);
+explain (analyze, costs off, summary off, timing off)
+execute ps2(1);
+deallocate ps2;
+
+drop table mc3p;
+
+-- Ensure runtime pruning works with initplans params with boolean types
+create table boolvalues (value bool not null);
+insert into boolvalues values('t'),('f');
+
+create table boolp (a bool) partition by list (a);
+create table boolp_t partition of boolp for values in('t');
+create table boolp_f partition of boolp for values in('f');
+
+explain (analyze, costs off, summary off, timing off)
+select * from boolp where a = (select value from boolvalues where value);
+
+explain (analyze, costs off, summary off, timing off)
+select * from boolp where a = (select value from boolvalues where not value);
+
+drop table boolp;
+
+--
+-- Test run-time pruning of MergeAppend subnodes
+--
+set enable_seqscan = off;
+set enable_sort = off;
+create table ma_test (a int, b int) partition by range (a);
+create table ma_test_p1 partition of ma_test for values from (0) to (10);
+create table ma_test_p2 partition of ma_test for values from (10) to (20);
+create table ma_test_p3 partition of ma_test for values from (20) to (30);
+insert into ma_test select x,x from generate_series(0,29) t(x);
+create index on ma_test (b);
+
+analyze ma_test;
+prepare mt_q1 (int) as select a from ma_test where a >= $1 and a % 10 = 5 order by b;
+
+explain (analyze, costs off, summary off, timing off) execute mt_q1(15);
+execute mt_q1(15);
+explain (analyze, costs off, summary off, timing off) execute mt_q1(25);
+execute mt_q1(25);
+-- Ensure MergeAppend behaves correctly when no subplans match
+explain (analyze, costs off, summary off, timing off) execute mt_q1(35);
+execute mt_q1(35);
+
+deallocate mt_q1;
+
+prepare mt_q2 (int) as select * from ma_test where a >= $1 order by b limit 1;
+
+-- Ensure output list looks sane when the MergeAppend has no subplans.
+explain (analyze, verbose, costs off, summary off, timing off) execute mt_q2 (35);
+
+deallocate mt_q2;
+
+-- ensure initplan params properly prune partitions
+explain (analyze, costs off, summary off, timing off) select * from ma_test where a >= (select min(b) from ma_test_p2) order by b;
+
+reset enable_seqscan;
+reset enable_sort;
+
+drop table ma_test;
+
+reset enable_indexonlyscan;
+
+--
+-- check that pruning works properly when the partition key is of a
+-- pseudotype
+--
+
+-- array type list partition key
+create table pp_arrpart (a int[]) partition by list (a);
+create table pp_arrpart1 partition of pp_arrpart for values in ('{1}');
+create table pp_arrpart2 partition of pp_arrpart for values in ('{2, 3}', '{4, 5}');
+explain (costs off) select * from pp_arrpart where a = '{1}';
+explain (costs off) select * from pp_arrpart where a = '{1, 2}';
+explain (costs off) select * from pp_arrpart where a in ('{4, 5}', '{1}');
+explain (costs off) update pp_arrpart set a = a where a = '{1}';
+explain (costs off) delete from pp_arrpart where a = '{1}';
+drop table pp_arrpart;
+
+-- array type hash partition key
+create table pph_arrpart (a int[]) partition by hash (a);
+create table pph_arrpart1 partition of pph_arrpart for values with (modulus 2, remainder 0);
+create table pph_arrpart2 partition of pph_arrpart for values with (modulus 2, remainder 1);
+insert into pph_arrpart values ('{1}'), ('{1, 2}'), ('{4, 5}');
+select tableoid::regclass, * from pph_arrpart order by 1;
+explain (costs off) select * from pph_arrpart where a = '{1}';
+explain (costs off) select * from pph_arrpart where a = '{1, 2}';
+explain (costs off) select * from pph_arrpart where a in ('{4, 5}', '{1}');
+drop table pph_arrpart;
+
+-- enum type list partition key
+create type pp_colors as enum ('green', 'blue', 'black');
+create table pp_enumpart (col1 int, a pp_colors) partition by list (a);
+create table pp_enumpart_green partition of pp_enumpart for values in ('green');
+create table pp_enumpart_blue partition of pp_enumpart for values in ('blue');
+explain (costs off) select * from pp_enumpart where a = 'blue';
+explain (costs off) select * from pp_enumpart where a = 'black';
+drop table pp_enumpart;
+drop type pp_colors;
+
+-- record type as partition key
+create type pp_rectype as (a int, b int);
+create table pp_recpart (a pp_rectype) partition by list (a);
+create table pp_recpart_11 partition of pp_recpart for values in ('(1,1)');
+create table pp_recpart_23 partition of pp_recpart for values in ('(2,3)');
+explain (costs off) select * from pp_recpart where a = '(1,1)'::pp_rectype;
+explain (costs off) select * from pp_recpart where a = '(1,2)'::pp_rectype;
+drop table pp_recpart;
+drop type pp_rectype;
+
+-- range type partition key
+create table pp_intrangepart (a int4range) partition by list (a);
+create table pp_intrangepart12 partition of pp_intrangepart for values in ('[1,2]');
+create table pp_intrangepart2inf partition of pp_intrangepart for values in ('[2,)');
+explain (costs off) select * from pp_intrangepart where a = '[1,2]'::int4range;
+explain (costs off) select * from pp_intrangepart where a = '(1,2)'::int4range;
+drop table pp_intrangepart;
+
+--
+-- Ensure the enable_partition_prune GUC properly disables partition pruning.
+--
+
+create table pp_lp (a int, value int) partition by list (a);
+create table pp_lp1 partition of pp_lp for values in(1);
+create table pp_lp2 partition of pp_lp for values in(2);
+
+explain (costs off) select * from pp_lp where a = 1;
+explain (costs off) update pp_lp set value = 10 where a = 1;
+explain (costs off) delete from pp_lp where a = 1;
+
+set enable_partition_pruning = off;
+
+set constraint_exclusion = 'partition'; -- this should not affect the result.
+
+explain (costs off) select * from pp_lp where a = 1;
+explain (costs off) update pp_lp set value = 10 where a = 1;
+explain (costs off) delete from pp_lp where a = 1;
+
+set constraint_exclusion = 'off'; -- this should not affect the result.
+
+explain (costs off) select * from pp_lp where a = 1;
+explain (costs off) update pp_lp set value = 10 where a = 1;
+explain (costs off) delete from pp_lp where a = 1;
+
+drop table pp_lp;
+
+-- Ensure enable_partition_prune does not affect non-partitioned tables.
+
+create table inh_lp (a int, value int);
+create table inh_lp1 (a int, value int, check(a = 1)) inherits (inh_lp);
+create table inh_lp2 (a int, value int, check(a = 2)) inherits (inh_lp);
+
+set constraint_exclusion = 'partition';
+
+-- inh_lp2 should be removed in the following 3 cases.
+explain (costs off) select * from inh_lp where a = 1;
+explain (costs off) update inh_lp set value = 10 where a = 1;
+explain (costs off) delete from inh_lp where a = 1;
+
+-- Ensure we don't exclude normal relations when we only expect to exclude
+-- inheritance children
+explain (costs off) update inh_lp1 set value = 10 where a = 2;
+
+drop table inh_lp cascade;
+
+reset enable_partition_pruning;
+reset constraint_exclusion;
+
+-- Check pruning for a partition tree containing only temporary relations
+create temp table pp_temp_parent (a int) partition by list (a);
+create temp table pp_temp_part_1 partition of pp_temp_parent for values in (1);
+create temp table pp_temp_part_def partition of pp_temp_parent default;
+explain (costs off) select * from pp_temp_parent where true;
+explain (costs off) select * from pp_temp_parent where a = 2;
+drop table pp_temp_parent;
+
+-- Stress run-time partition pruning a bit more, per bug reports
+create temp table p (a int, b int, c int) partition by list (a);
+create temp table p1 partition of p for values in (1);
+create temp table p2 partition of p for values in (2);
+create temp table q (a int, b int, c int) partition by list (a);
+create temp table q1 partition of q for values in (1) partition by list (b);
+create temp table q11 partition of q1 for values in (1) partition by list (c);
+create temp table q111 partition of q11 for values in (1);
+create temp table q2 partition of q for values in (2) partition by list (b);
+create temp table q21 partition of q2 for values in (1);
+create temp table q22 partition of q2 for values in (2);
+
+insert into q22 values (2, 2, 3);
+
+-- GPDB: This is the query that needs the "matchsubs" rule at the top of the file
+-- The constant third branch of the UNION is executed at random segment. If the
+-- randomly chosen segment is the same as the one that needed for the other branches,
+-- the whole query runs on that one segment. Otherwise, it runs on two segments.
+-- The choice is made randomly, so accept both plans.
+explain (costs off)
+select *
+from (
+      select * from p
+      union all
+      select * from q1
+      union all
+      select 1, 1, 1
+     ) s(a, b, c)
+where s.a = 1 and s.b = 1 and s.c = (select 1);
+
+select *
+from (
+      select * from p
+      union all
+      select * from q1
+      union all
+      select 1, 1, 1
+     ) s(a, b, c)
+where s.a = 1 and s.b = 1 and s.c = (select 1);
+
+prepare q (int, int) as
+select *
+from (
+      select * from p
+      union all
+      select * from q1
+      union all
+      select 1, 1, 1
+     ) s(a, b, c)
+where s.a = $1 and s.b = $2 and s.c = (select 1);
+
+explain (costs off) execute q (1, 1);
+execute q (1, 1);
+
+drop table p, q;
+
+-- Ensure run-time pruning works correctly when we match a partitioned table
+-- on the first level but find no matching partitions on the second level.
+create table listp (a int, b int) partition by list (a);
+create table listp1 partition of listp for values in(1);
+create table listp2 partition of listp for values in(2) partition by list(b);
+create table listp2_10 partition of listp2 for values in (10);
+
+explain (analyze, costs off, summary off, timing off)
+select * from listp where a = (select 2) and b <> 10;
+
+--
+-- check that a partition directly accessed in a query is excluded with
+-- constraint_exclusion = on
+--
+
+-- turn off partition pruning, so that it doesn't interfere
+set enable_partition_pruning to off;
+
+-- setting constraint_exclusion to 'partition' disables exclusion
+set constraint_exclusion to 'partition';
+explain (costs off) select * from listp1 where a = 2;
+explain (costs off) update listp1 set a = 1 where a = 2;
+-- constraint exclusion enabled
+set constraint_exclusion to 'on';
+explain (costs off) select * from listp1 where a = 2;
+explain (costs off) update listp1 set a = 1 where a = 2;
+
+reset constraint_exclusion;
+reset enable_partition_pruning;
+
+drop table listp;
+
+-- Ensure run-time pruning works correctly for nested Append nodes
+set parallel_setup_cost to 0;
+set parallel_tuple_cost to 0;
+
+create table listp (a int) partition by list(a);
+create table listp_12 partition of listp for values in(1,2) partition by list(a);
+create table listp_12_1 partition of listp_12 for values in(1);
+create table listp_12_2 partition of listp_12 for values in(2);
+
+-- Force the 2nd subnode of the Append to be non-parallel.  This results in
+-- a nested Append node because the mixed parallel / non-parallel paths cannot
+-- be pulled into the top-level Append.
+alter table listp_12_1 set (parallel_workers = 0);
+
+-- Ensure that listp_12_2 is not scanned.  (The nested Append is not seen in
+-- the plan as it's pulled in setref.c due to having just a single subnode).
+select explain_parallel_append('select * from listp where a = (select 1);');
+
+-- Like the above but throw some more complexity at the planner by adding
+-- a UNION ALL.  We expect both sides of the union not to scan the
+-- non-required partitions.
+select explain_parallel_append(
+'select * from listp where a = (select 1)
+  union all
+select * from listp where a = (select 2);');
+
+drop table listp;
+reset parallel_tuple_cost;
+reset parallel_setup_cost;
+
+-- Test case for run-time pruning with a nested Merge Append
+set enable_sort to 0;
+create table rangep (a int, b int) partition by range (a);
+create table rangep_0_to_100 partition of rangep for values from (0) to (100) partition by list (b);
+-- We need 3 sub-partitions. 1 to validate pruning worked and another two
+-- because a single remaining partition would be pulled up to the main Append.
+create table rangep_0_to_100_1 partition of rangep_0_to_100 for values in(1);
+create table rangep_0_to_100_2 partition of rangep_0_to_100 for values in(2);
+create table rangep_0_to_100_3 partition of rangep_0_to_100 for values in(3);
+create table rangep_100_to_200 partition of rangep for values from (100) to (200);
+create index on rangep (a);
+
+-- Ensure run-time pruning works on the nested Merge Append
+explain (analyze on, costs off, timing off, summary off)
+select * from rangep where b IN((select 1),(select 2)) order by a;
+reset enable_sort;
+drop table rangep;
+
+--
+-- Check that gen_prune_steps_from_opexps() works well for various cases of
+-- clauses for different partition keys
+--
+
+create table rp_prefix_test1 (a int, b varchar) partition by range(a, b);
+create table rp_prefix_test1_p1 partition of rp_prefix_test1 for values from (1, 'a') to (1, 'b');
+create table rp_prefix_test1_p2 partition of rp_prefix_test1 for values from (2, 'a') to (2, 'b');
+
+-- Don't call get_steps_using_prefix() with the last partition key b plus
+-- an empty prefix
+explain (costs off) select * from rp_prefix_test1 where a <= 1 and b = 'a';
+
+create table rp_prefix_test2 (a int, b int, c int) partition by range(a, b, c);
+create table rp_prefix_test2_p1 partition of rp_prefix_test2 for values from (1, 1, 0) to (1, 1, 10);
+create table rp_prefix_test2_p2 partition of rp_prefix_test2 for values from (2, 2, 0) to (2, 2, 10);
+
+-- Don't call get_steps_using_prefix() with the last partition key c plus
+-- an invalid prefix (ie, b = 1)
+explain (costs off) select * from rp_prefix_test2 where a <= 1 and b = 1 and c >= 0;
+
+create table rp_prefix_test3 (a int, b int, c int, d int) partition by range(a, b, c, d);
+create table rp_prefix_test3_p1 partition of rp_prefix_test3 for values from (1, 1, 1, 0) to (1, 1, 1, 10);
+create table rp_prefix_test3_p2 partition of rp_prefix_test3 for values from (2, 2, 2, 0) to (2, 2, 2, 10);
+
+-- Test that get_steps_using_prefix() handles a prefix that contains multiple
+-- clauses for the partition key b (ie, b >= 1 and b >= 2)
+explain (costs off) select * from rp_prefix_test3 where a >= 1 and b >= 1 and b >= 2 and c >= 2 and d >= 0;
+
+-- Test that get_steps_using_prefix() handles a prefix that contains multiple
+-- clauses for the partition key b (ie, b >= 1 and b = 2)  (This also tests
+-- that the caller arranges clauses in that prefix in the required order)
+explain (costs off) select * from rp_prefix_test3 where a >= 1 and b >= 1 and b = 2 and c = 2 and d >= 0;
diff --git a/src/test/regress/sql/partition_prune_opfamily_append.sql b/src/test/regress/sql/partition_prune_opfamily_append.sql
new file mode 100644
index 00000000000..599893c5711
--- /dev/null
+++ b/src/test/regress/sql/partition_prune_opfamily_append.sql
@@ -0,0 +1,351 @@
+-- https://gist.github.com/kainwen/df7c0d3149684e1256d31b5c39e02de7#file-gp7-sql
+-- This test is included in https://github.com/greenplum-db/gpdb/issues/14982
+
+-- The test creates an operator that performs absolute value comparisons of the input data.
+-- The operator belongs to a customized btree opfamily 16433, which supports cross-type (20, 23) comparisons.
+
+-- The test then creates two tables, t1 and t2.
+-- Both are distributed by column a, and partitioned by column b.
+-- t1.a is of type int, belonging to hash opfamily 1977, which supports cross-type (20, 21, 23) comparisons.
+-- t2.a is of type int, belonging to hash opfamily 1977, which supports cross-type (20, 21, 23) comparisons.
+-- t1.b is of type int4, belonging to btree opfamily 1976, which supports cross-type (20, 21, 23) comparisons.
+-- t2.b is of type int8, belonging to btree opfamily 1976, which supports cross-type (20, 21, 23) comparisons.
+
+-- As of now, ORCA doesn't consider partition key's opfamily when performing partition pruning
+-- Internally, operator |=| of opfamily 16433 is treated as operator = of opfamily 1977 or 1976, and generated
+-- incorrect hash join condition and unjustified partition pruning. This fix compares the operator to the
+-- column's opfamily, thence deriving correct properties from the predicates.
+-- greenplum
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+
+create schema partition_prune_opfamily;
+set search_path=partition_prune_opfamily;
+SET optimizer_trace_fallback=on;
+
+-- start_ignore
+create language plpython3u;
+-- end_ignore
+
+-- proc for int4
+create function abseq4(a int4, b int4) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+
+create function abslt4(a int4, b int4) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+
+create function absle4(a int4, b int4) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+
+create function absgt4(a int4, b int4) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+
+create function absge4(a int4, b int4) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+
+create function abscmp4(a int4, b int4) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+
+-- procs for int8
+create function abseq8(a int8, b int8) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+
+create function abslt8(a int8, b int8) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+
+create function absle8(a int8, b int8) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+
+create function absgt8(a int8, b int8) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+
+create function absge8(a int8, b int8) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+
+create function abscmp8(a int8, b int8) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+
+-- procs for cross type int4 int8
+create function abseq48(a int4, b int8) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+
+create function abslt48(a int4, b int8) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+
+create function absle48(a int4, b int8) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+
+create function absgt48(a int4, b int8) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+
+create function absge48(a int4, b int8) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+
+create function abscmp48(a int4, b int8) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+
+--procs for cross type int8 int4
+create function abseq84(a int8, b int4) returns bool as $$
+return abs(a) == abs(b)
+$$ language plpython3u strict immutable;
+
+create function abslt84(a int8, b int4) returns bool as $$
+return abs(a) < abs(b)
+$$ language plpython3u strict immutable;
+
+create function absle84(a int8, b int4) returns bool as $$
+return abs(a) <= abs(b)
+$$ language plpython3u strict immutable;
+
+create function absgt84(a int8, b int4) returns bool as $$
+return abs(a) > abs(b)
+$$ language plpython3u strict immutable;
+
+create function absge84(a int8, b int4) returns bool as $$
+return abs(a) >= abs(b)
+$$ language plpython3u strict immutable;
+
+create function abscmp84(a int8, b int4) returns int as $$
+if abs(a) < abs(b):
+    return -1
+if abs(a) > abs(b):
+    return 1
+return 0
+$$ language plpython3u strict immutable;
+
+-- |=|
+create operator |=| (
+  procedure = abseq4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |=|,
+  merges);
+
+create operator |=| (
+  procedure = abseq8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |=|,
+  merges);
+
+create operator |=| (
+  procedure = abseq48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |=|,
+  merges);
+
+create operator |=| (
+  procedure = abseq84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |=|,
+  merges);
+
+-- |<|
+create operator |<| (
+  procedure = abslt4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |<|);
+
+create operator |<| (
+  procedure = abslt8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |<|);
+
+create operator |<| (
+  procedure = abslt48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |<|);
+
+create operator |<| (
+  procedure = abslt84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |<|);
+
+-- |>|
+create operator |>| (
+  procedure = absgt4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |>|);
+
+create operator |>| (
+  procedure = absgt8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |>|);
+
+create operator |>| (
+  procedure = absgt48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |>|);
+
+create operator |>| (
+  procedure = absgt84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |>|);
+
+-- |<=|
+create operator |<=| (
+  procedure = absle4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |<=|);
+
+create operator |<=| (
+  procedure = absle8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |<=|);
+
+create operator |<=| (
+  procedure = absle48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |<=|);
+ 
+create operator |<=| (
+  procedure = absle84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |<=|);
+
+-- |>=|
+create operator |>=| (
+  procedure = absge4,
+  leftarg = int4,
+  rightarg = int4,
+  commutator = |>=|);
+
+create operator |>=| (
+  procedure = absge8,
+  leftarg = int8,
+  rightarg = int8,
+  commutator = |>=|);
+
+create operator |>=| (
+  procedure = absge48,
+  leftarg = int4,
+  rightarg = int8,
+  commutator = |>=|);
+
+create operator |>=| (
+  procedure = absge84,
+  leftarg = int8,
+  rightarg = int4,
+  commutator = |>=|);
+
+--------
+
+create operator family abs_int_ops using btree;
+
+create operator class abs_int4_ops for type int4
+  using btree FAMILY abs_int_ops  as
+  operator 1 |<|,
+  operator 3 |=|,
+  operator 5 |>|,
+  function 1 abscmp4(int4, int4);
+
+create operator class abs_int8_ops for type int8
+  using btree FAMILY abs_int_ops as
+  operator 1 |<|,
+  operator 3 |=|,
+  operator 5 |>|,
+  function 1 abscmp8(int8, int8);
+
+alter operator family abs_int_ops using btree add
+  -- cross-type comparisons int4 vs int8
+  operator 1 |<| (int4, int8),
+  operator 2 |<=| (int4, int8),
+  operator 3 |=| (int4, int8),
+  operator 4 |>=| (int4, int8),
+  operator 5 |>| (int4, int8),
+  function 1 abscmp48(int4, int8),
+  
+  -- cross-type comparisons int8 vs int4
+  operator 1 |<| (int8, int4),
+  operator 2 |<=| (int8, int4),
+  operator 3 |=| (int8, int4),
+  operator 4 |>=| (int8, int4),
+  operator 5 |>| (int8, int4),
+  function 1 abscmp84(int8, int4);
+
+-- gpdb
+
+-- start_ignore
+DROP TABLE t1;
+DROP TABLE t2;
+-- end_ignore
+
+create table t1 (a int, b int4)
+partition by list (b)
+(
+  partition p1 values (1),
+  partition p2 values (-1)
+);
+
+create table t2 (a int, b int8)
+partition by list (b)
+(
+  partition p1 values (1),
+  partition p2 values (-1)
+);
+
+insert into t1 values (1,1), (1,-1), (-1,1), (-1,-1);
+insert into t2 values (1,1), (1,-1), (-1,1), (-1,-1);
+
+explain select * from t1 where t1.b |=| 1;
+select * from t1 where t1.b |=| 1;
+
+explain select * from t1, t2 where t1.b = t2.b and t2.b |=| 1;
+select * from t1, t2 where t1.b = t2.b and t2.b |=| 1;
+
+explain select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b;
+select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b;
+
+explain select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b and t2.b = 1;
+select * from t1, t2 where t1.a = t2.a and t1.b |=| t2.b and t2.b = 1;
+
+-- CLEANUP
+
+-- start_ignore
+drop schema if exists partition_prune_opfamily cascade;
+-- end_ignore
\ No newline at end of file
diff --git a/src/test/regress/sql/partition_pruning_append.sql b/src/test/regress/sql/partition_pruning_append.sql
new file mode 100644
index 00000000000..e6ae56686b7
--- /dev/null
+++ b/src/test/regress/sql/partition_pruning_append.sql
@@ -0,0 +1,1053 @@
+-- TODO: incremental sort is turned off by default, because it may have
+-- wrong result for some core case. Turn it on to run the existing tests
+-- and minimize the difference from upstream.
+\c partition_append
+set optimizer to on;
+set optimizer_disable_dynamic_table_scan to on;
+set enable_incremental_sort=on;
+--
+-- Tests on partition pruning (with ORCA) or constraint exclusion (with the
+-- Postgres planner). These tests check that you get an "expected" plan, that
+-- only scans the partitions that are needed.
+--
+-- The "correct" plan for a given query depends a lot on the capabilities of
+-- the planner and the rest of the system, so the expected output can need
+-- updating, as the system improves.
+--
+
+-- Create test table with two partitions, for values equal to '1' and values equal to '2'.
+create table parttab (n numeric, t text)
+  partition by list (n)(partition one values ('1'), partition two values('2'));
+
+-- Insert three rows. They're all equal to '1', but different number of zeros after decimal point.
+insert into parttab values
+  ('1', 'one'),
+  ('1.0', 'one point zero'),
+  ('1.00', 'one point zero zero');
+
+-- select rows whose text representation is three characters long. This should return the '1.0' row.
+select * from parttab where length(n::text) = 3;
+explain select * from parttab where length(n::text) = 3;
+
+-- Use index scans when possible. That exercises more code, and allows us to
+-- spot the cases where the planner cannot use even when it exists.
+set enable_seqscan=off;
+set enable_bitmapscan=on;
+set enable_indexscan=on;
+
+create schema partition_pruning_append;
+set search_path to partition_pruning_append;
+
+-- Set up common test tables.
+CREATE TABLE pt_lt_tab
+(
+  col1 int,
+  col2 decimal,
+  col3 text,
+  col4 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(1,2,3,4,5,6,7,8,9,10),
+  partition part2 values(11,12,13,14,15,16,17,18,19,20),
+  partition part3 values(21,22,23,24,25,26,27,28,29,30),
+  partition part4 values(31,32,33,34,35,36,37,38,39,40),
+  partition part5 values(41,42,43,44,45,46,47,48,49,50)
+);
+
+INSERT INTO pt_lt_tab SELECT i, i,'a',True FROM generate_series(1,3)i;
+INSERT INTO pt_lt_tab SELECT i, i,'b',True FROM generate_series(4,6)i;
+INSERT INTO pt_lt_tab SELECT i, i,'c',True FROM generate_series(7,10)i;
+
+INSERT INTO pt_lt_tab SELECT i, i,'e',True FROM generate_series(11,13)i;
+INSERT INTO pt_lt_tab SELECT i, i,'f',True FROM generate_series(14,16)i;
+INSERT INTO pt_lt_tab SELECT i, i,'g',True FROM generate_series(17,20)i;
+
+INSERT INTO pt_lt_tab SELECT i, i,'i',False FROM generate_series(21,23)i;
+INSERT INTO pt_lt_tab SELECT i, i,'k',False FROM generate_series(24,26)i;
+INSERT INTO pt_lt_tab SELECT i, i,'h',False FROM generate_series(27,30)i;
+
+INSERT INTO pt_lt_tab SELECT i, i,'m',False FROM generate_series(31,33)i;
+INSERT INTO pt_lt_tab SELECT i, i,'o',False FROM generate_series(34,36)i;
+INSERT INTO pt_lt_tab SELECT i, i,'n',False FROM generate_series(37,40)i;
+
+INSERT INTO pt_lt_tab SELECT i, i,'p',False FROM generate_series(41,43)i;
+INSERT INTO pt_lt_tab SELECT i, i,'s',False FROM generate_series(44,46)i;
+INSERT INTO pt_lt_tab SELECT i, i,'q',False FROM generate_series(47,50)i;
+ANALYZE pt_lt_tab;
+
+-- pt_lt_tab_df is the same as pt_lt_tab, but with a default partition (and some
+-- values in the default partition, including NULLs).
+CREATE TABLE pt_lt_tab_df
+(
+  col1 int,
+  col2 decimal,
+  col3 text,
+  col4 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 VALUES(1,2,3,4,5,6,7,8,9,10),
+  partition part2 VALUES(11,12,13,14,15,16,17,18,19,20),
+  partition part3 VALUES(21,22,23,24,25,26,27,28,29,30),
+  partition part4 VALUES(31,32,33,34,35,36,37,38,39,40),
+  partition part5 VALUES(41,42,43,44,45,46,47,48,49,50),
+  default partition def
+);
+
+INSERT INTO pt_lt_tab_df SELECT i, i,'a',True FROM generate_series(1,3)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'b',True FROM generate_series(4,6)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'c',True FROM generate_series(7,10)i;
+
+INSERT INTO pt_lt_tab_df SELECT i, i,'e',True FROM generate_series(11,13)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'f',True FROM generate_series(14,16)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'g',True FROM generate_series(17,20)i;
+
+INSERT INTO pt_lt_tab_df SELECT i, i,'i',False FROM generate_series(21,23)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'k',False FROM generate_series(24,26)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'h',False FROM generate_series(27,30)i;
+
+INSERT INTO pt_lt_tab_df SELECT i, i,'m',False FROM generate_series(31,33)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'o',False FROM generate_series(34,36)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'n',False FROM generate_series(37,40)i;
+
+INSERT INTO pt_lt_tab_df SELECT i, i,'p',False FROM generate_series(41,43)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'s',False FROM generate_series(44,46)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'q',False FROM generate_series(47,50)i;
+
+INSERT INTO pt_lt_tab_df SELECT i, i,'u',True FROM generate_series(51,53)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'x',True FROM generate_series(54,56)i;
+INSERT INTO pt_lt_tab_df SELECT i, i,'w',True FROM generate_series(57,60)i;
+
+INSERT INTO pt_lt_tab_df VALUES(NULL,NULL,NULL,NULL);
+INSERT INTO pt_lt_tab_df VALUES(NULL,NULL,NULL,NULL);
+INSERT INTO pt_lt_tab_df VALUES(NULL,NULL,NULL,NULL);
+
+ANALYZE pt_lt_tab_df;
+
+--
+-- Test that stable functions are evaluated when constructing the plan. This
+-- differs from PostgreSQL. In PostgreSQL, PREPARE/EXECUTE creates a reusable
+-- plan, while in GPDB, we re-plan the query on every execution, so that the
+-- stable function is executed during planning, and we can therefore do
+-- partition pruning based on its result.
+--
+create or replace function stabletestfunc() returns integer as $$
+begin
+  return 10;
+end;
+$$ language plpgsql stable;
+
+PREPARE prep_prune AS select * from pt_lt_tab WHERE col2 = stabletestfunc();
+
+-- The plan should only scan one partition, where col2 = 10.
+EXPLAIN EXECUTE prep_prune;
+
+-- Also test that Params are const-evaluated.
+PREPARE prep_prune_param AS select * from pt_lt_tab WHERE col2 = $1;
+EXPLAIN EXECUTE prep_prune_param(10);
+
+
+-- @description B-tree single index key = non-partitioning key
+CREATE INDEX idx1 on pt_lt_tab(col1);
+
+SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col1 = 25 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 = 25 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col1 <> 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 <> 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col1 > 10 AND col1 < 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 10 AND col1 < 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col1 > 10 OR col1 = 25 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 10 OR col1 = 25 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col1 between 10 AND 25 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 between 10 AND 25 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+
+-- @description B-tree single index key = partitioning key
+CREATE INDEX idx1 on pt_lt_tab(col2);
+
+SELECT * FROM pt_lt_tab WHERE col2 < 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 < 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col2 < 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col2 < 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 > 10 OR col2 = 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10 OR col2 = 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+
+
+-- @description multiple column b-tree index
+CREATE INDEX idx1 on pt_lt_tab(col1,col2);
+
+SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+
+-- @description multi-column unique constraint (= b-tree index). Essentially the
+-- same as the previous case, but the columns are the other way 'round, and we
+-- do this on the table with default partition.
+ALTER TABLE pt_lt_tab_df ADD CONSTRAINT col2_col1_unique unique(col2,col1);
+
+SELECT * FROM pt_lt_tab_df WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 < 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 25 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 = 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 10.00 OR col1 = 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 between 10 AND 50 ORDER BY col2,col3 LIMIT 5;
+
+ALTER TABLE pt_lt_tab_df DROP CONSTRAINT col2_col1_unique;
+
+
+-- @description Heterogeneous index, index on partition key, b-tree index on all partitions
+CREATE INDEX idx1 on pt_lt_tab_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_1_prt_part3(col2);
+CREATE INDEX idx4 on pt_lt_tab_1_prt_part4(col2);
+CREATE INDEX idx5 on pt_lt_tab_1_prt_part5(col2);
+
+SELECT * FROM pt_lt_tab WHERE col2 between 1 AND 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 between 1 AND 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 > 5 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 5 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 = 5 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 = 5 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+
+
+-- @description Heterogeneous index,b-tree index on all parts,index, index on non-partition col
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col1);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col1);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col1);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col1);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col1);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col1);
+
+SELECT * FROM pt_lt_tab_df WHERE col1 between 1 AND 100 ORDER BY col1 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 between 1 AND 100 ORDER BY col1 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col1 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 > 50 ORDER BY col1 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col1 < 50 ORDER BY col1 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 < 50 ORDER BY col1 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+DROP INDEX idx6;
+
+
+-- @description Heterogeneous index,b-tree index on all parts including default, index on partition col
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col2);
+
+SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 <> 10 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 < 50 AND col1 > 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 < 50 AND col1 > 10 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+DROP INDEX idx6;
+
+
+-- @description Negative tests Combination tests, no index on default partition
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+
+SELECT * FROM pt_lt_tab_df WHERE col2 > 51 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 51 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+
+-- @description Negative tests Combination tests ,index exists on some regular partitions and not on the default partition
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+
+SELECT * FROM pt_lt_tab_df WHERE col2 is NULL ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx5;
+
+
+-- @description Heterogeneous index,b-tree index on all parts,index , multiple index 
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2,col1);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2,col1);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2,col1);
+CREATE INDEX idx4 on pt_lt_tab_df_1_prt_part4(col2,col1);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2,col1);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col2,col1);
+
+SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 50 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 10 AND col1 between 1 AND 100 ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab_df WHERE col1 = 10 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col1 = 10 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+DROP INDEX idx4;
+DROP INDEX idx5;
+DROP INDEX idx6;
+
+
+-- @description Index exists on some continuous set of partitions, e.g. p1,p2,p3
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx2 on pt_lt_tab_df_1_prt_part2(col2);
+CREATE INDEX idx3 on pt_lt_tab_df_1_prt_part3(col2);
+
+SELECT * FROM pt_lt_tab_df WHERE col2 = 35 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 = 35 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx2;
+DROP INDEX idx3;
+
+
+-- @description Index exists on some regular partitions and on the default partition [INDEX exists on non-consecutive partitions, e.g. p1,p3,p5]
+CREATE INDEX idx1 on pt_lt_tab_df_1_prt_part1(col2);
+CREATE INDEX idx5 on pt_lt_tab_df_1_prt_part5(col2);
+CREATE INDEX idx6 on pt_lt_tab_df_1_prt_def(col2);
+
+SELECT * FROM pt_lt_tab_df WHERE col2 > 15 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab_df WHERE col2 > 15 ORDER BY col2,col3 LIMIT 5;
+
+DROP INDEX idx1;
+DROP INDEX idx5;
+DROP INDEX idx6;
+
+
+--
+-- Finally, after running all the other tests on pg_lt_tab, test that
+-- partition pruning still works after dropping a column
+--
+CREATE INDEX idx1 on pt_lt_tab(col4);
+
+ALTER TABLE pt_lt_tab DROP column col1;
+
+SELECT * FROM pt_lt_tab WHERE col4 is False ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col4 is False ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col4 = False ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col4 = False ORDER BY col2,col3 LIMIT 5;
+SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+
+ALTER TABLE pt_lt_tab DROP column col4;
+
+SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+EXPLAIN SELECT * FROM pt_lt_tab WHERE col2 > 41 ORDER BY col2,col3 LIMIT 5;
+
+
+--
+-- Test a more complicated partitioning scheme, with subpartitions.
+--
+CREATE TABLE pt_complex (i int, j int, k int, l int, m int) DISTRIBUTED BY (i)
+PARTITION BY list(k)
+  SUBPARTITION BY list(j) SUBPARTITION TEMPLATE (subpartition p11 values (1), subpartition p12 values(2))
+  SUBPARTITION BY list(l) SUBPARTITION TEMPLATE (subpartition p11 values (1), subpartition p12 values(2))
+( partition p1 values(1), partition p2 values(2));
+
+INSERT INTO pt_complex VALUES (1, 1, 1, 1, 1), (2, 2, 2, 2, 2);
+
+CREATE INDEX i_pt_complex ON pt_complex (i);
+
+SELECT * FROM pt_complex WHERE i = 1 AND j = 1;
+EXPLAIN SELECT * FROM pt_complex WHERE i = 1 AND j = 1;
+
+--
+-- See MPP-6861
+--
+CREATE TABLE ds_4
+(
+  month_id character varying(6),
+  cust_group_acc numeric(10),
+  mobile_no character varying(10),
+  source character varying(12),
+  vas_group numeric(10),
+  vas_type numeric(10),
+  count_vas integer,
+  amt_vas numeric(10,2),
+  network_type character varying(3),
+  execution_id integer
+)
+WITH (
+  OIDS=FALSE
+)
+DISTRIBUTED BY (cust_group_acc, mobile_no)
+PARTITION BY LIST(month_id)
+          (
+          PARTITION p200800 VALUES('200800'),
+          PARTITION p200801 VALUES('200801'),
+          PARTITION p200802 VALUES('200802'),
+          PARTITION p200803 VALUES('200803')
+);
+
+-- this is the case that worked before MPP-6861
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id = '200800';
+
+
+-- now we can evaluate this function at planning/prune time
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int = 200800;
+
+-- this will be satisfied by 200800
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int - 801 < 200000;
+
+-- test OR case -- should NOT get pruning
+explain select * from ds_4 where month_id::int - 801 < 200000 OR count_vas > 10;
+
+-- test AND case -- should still get pruning
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int - 801 < 200000 AND count_vas > 10;
+
+-- test expression case : should get pruning
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where case when month_id = '200800' then 100 else 2 end = 100;
+
+-- test expression case : should get pruning
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where case when month_id = '200800' then NULL else 2 end IS NULL;
+
+-- should still get pruning here -- count_vas is only used in the path for month id = 200800
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where case when month_id::int = 200800 then count_vas else 2 end IS NULL;
+
+-- do one that matches a couple partitions
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain select * from ds_4 where month_id::int in (200801, 1,55,6,6,6,6,66,565,65,65,200803);
+
+-- cleanup
+drop table ds_4;
+
+
+--
+-- See MPP-18979
+--
+
+CREATE TABLE ds_2
+(
+  month_id character varying(6),
+  cust_group_acc numeric(10),
+  mobile_no character varying(10),
+  source character varying(12),
+  vas_group numeric(10),
+  vas_type numeric(10),
+  count_vas integer,
+  amt_vas numeric(10,2),
+  network_type character varying(3),
+  execution_id integer
+)
+WITH (
+  OIDS=FALSE
+)
+DISTRIBUTED BY (cust_group_acc, mobile_no)
+PARTITION BY LIST(month_id)
+          (
+          PARTITION p200800 VALUES('200800'),
+          PARTITION p200801 VALUES('200801'),
+          PARTITION p200802 VALUES('200802'),
+          PARTITION p200803 VALUES('200803'),
+          PARTITION p200804 VALUES('200804'),
+          PARTITION p200805 VALUES('200805'),
+          PARTITION p200806 VALUES('200806'),
+          PARTITION p200807 VALUES('200807'),
+          PARTITION p200808 VALUES('200808'),
+          PARTITION p200809 VALUES('200809')
+);
+
+insert into ds_2(month_id) values('200800');
+insert into ds_2(month_id) values('200801');
+insert into ds_2(month_id) values('200802');
+insert into ds_2(month_id) values('200803');
+insert into ds_2(month_id) values('200804');
+insert into ds_2(month_id) values('200805');
+insert into ds_2(month_id) values('200806');
+insert into ds_2(month_id) values('200807');
+insert into ds_2(month_id) values('200808');
+insert into ds_2(month_id) values('200809');
+
+-- queries without bitmap scan
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+set optimizer_segments=2;
+explain select * from ds_2 where month_id::int in (200808, 1315) order by month_id;
+
+-- start_ignore
+-- Known_opt_diff: MPP-21316
+-- end_ignore
+explain  select * from ds_2 where month_id::int in (200808, 200801, 2008010) order by month_id;
+reset optimizer_segments;
+select * from ds_2 where month_id::int in (200907, 1315) order by month_id;
+
+select * from ds_2 where month_id::int in (200808, 1315) order by month_id;
+
+select * from ds_2 where month_id::int in (200808, 200801) order by month_id;
+
+select * from ds_2 where month_id::int in (200808, 200801, 2008010) order by month_id;
+
+-- cleanup
+drop table ds_2;
+
+drop table if exists dnsdata cascade;
+
+CREATE TABLE dnsdata(dnsname text) DISTRIBUTED RANDOMLY;
+
+CREATE INDEX dnsdata_d1_idx ON dnsdata USING bitmap (split_part(reverse(dnsname),'.'::text,1));
+
+
+CREATE INDEX dnsdata_d2_idx ON dnsdata USING bitmap (split_part(reverse(dnsname),'.'::text,2));
+
+insert into dnsdata values('www.google.com');
+insert into dnsdata values('www.google1.com');
+insert into dnsdata values('1.google.com');
+insert into dnsdata values('2.google.com');
+insert into dnsdata select 'www.b.com' from generate_series(1, 100000) as x(a);
+
+analyze dnsdata;
+
+-- queries with bitmap scan enabled
+set enable_bitmapscan=on;
+set enable_indexscan=on;
+set enable_seqscan=off;
+
+Select dnsname from dnsdata
+where (split_part(reverse('cache.google.com'),'.',1))=(split_part(reverse(dnsname),'.',1))
+and (split_part(reverse('cache.google.com'),'.',2))=(split_part(reverse(dnsname),'.',2)) 
+order by dnsname;
+
+Select dnsname from dnsdata
+where (split_part(reverse('cache.google.com'),'.',1))=(split_part(reverse(dnsname),'.',1))
+and (split_part(reverse('cache.google.com'),'.',2))=(split_part(reverse(dnsname),'.',2))
+and dnsname = 'cache.google.com'
+order by dnsname;
+
+-- cleanup
+drop table dnsdata cascade;
+
+
+Create or replace function ZeroFunc(int) Returns int as $BODY$
+BEGIN
+  RETURN 0;
+END;
+$BODY$ LANGUAGE plpgsql IMMUTABLE;
+
+drop table if exists mytable cascade;
+
+create table mytable(i int, j int);
+insert into mytable select x, x+1 from generate_series(1, 100000) as x;
+analyze mytable;
+
+CREATE INDEX mytable_idx1 ON mytable USING bitmap(ZeroFunc(i));
+
+
+select * from mytable where ZeroFunc(i)=0 and i=100 order by i;
+
+select * from mytable where ZeroFunc(i)=0 and i=-1 order by i;
+
+-- cleanup
+drop function ZeroFunc(int) cascade;
+drop table mytable cascade;
+
+
+-- start_ignore
+create language plpython3u;
+-- end_ignore
+
+
+-- @description Tests for static partition selection (MPP-24709, GPSQL-2879)
+-- GPDB_12_MERGE_FIXME: this function extract the number such as [5,10] out of
+-- the string "Partition selected: 5 out of 10". We have temporarily broken
+-- that when we reimplemented dynamic seq scan. Currently only the number of
+-- selected partitions is avalable, get the total number of partitions back
+-- post merge.
+create or replace function get_selected_parts(explain_query text) returns text as
+$$
+import re
+rv = plpy.execute(explain_query)
+search_text = 'Dynamic Seq Scan on '
+result = []
+result.append(0)
+result.append(0)
+selected = 0
+out_of = 0
+pattern = re.compile(r"\s+Number of partitions to scan: (?P<selected>\d+)")
+for i in range(len(rv)):
+    cur_line = rv[i]['QUERY PLAN']
+    if search_text.lower() in cur_line.lower():
+        j = i+1
+        temp_line = rv[j]['QUERY PLAN']
+        while (not pattern.match(temp_line)):
+            j += 1
+            if j == len(rv) - 1:
+                break
+            temp_line = rv[j]['QUERY PLAN']
+
+        else:
+            selected += int(pattern.match(temp_line).group('selected'))
+result[0] = selected
+result[1] = out_of
+return result
+$$
+language plpython3u;
+
+drop table if exists partprune_foo;
+create table partprune_foo(a int, b int, c int) partition by range (b) (start (1) end (101) every (10));
+insert into partprune_foo select g % 5 + 1, g + 1, g % 10 + 1 from generate_series(0, 99) g;
+analyze partprune_foo;
+
+select get_selected_parts('explain select * from partprune_foo;');
+select * from partprune_foo;
+
+select get_selected_parts('explain select * from partprune_foo where b = 35;');
+select * from partprune_foo where b = 35;
+
+select get_selected_parts('explain select * from partprune_foo where b < 35;');
+select * from partprune_foo where b < 35;
+
+select get_selected_parts('explain select * from partprune_foo where b in (5, 6, 14, 23);');
+select * from partprune_foo where b in (5, 6, 14, 23);
+
+select get_selected_parts('explain select * from partprune_foo where b < 15 or b > 60;');
+select * from partprune_foo where b < 15 or b > 60;
+
+select get_selected_parts('explain select * from partprune_foo where b = 150;');
+select * from partprune_foo where b = 150;
+
+select get_selected_parts('explain select * from partprune_foo where b = a*5;');
+select * from partprune_foo where b = a*5;
+
+-- Test with IN() lists
+-- Number of elements > threshold, partition elimination is not performed
+set optimizer_array_expansion_threshold = 3;
+select get_selected_parts('explain select * from partprune_foo where b in (5, 6, 14, 23);');
+select * from partprune_foo where b in (5, 6, 14, 23);
+
+reset optimizer_array_expansion_threshold;
+
+-- Test "ANY (<array>)" syntax.
+select get_selected_parts($$ explain select * from partprune_foo where b = ANY ('{5, 6, 14}') $$);
+select * from partprune_foo where b = ANY ('{5, 6, 14}');
+
+select get_selected_parts($$ explain select * from partprune_foo where b < ANY ('{12, 14, 11}') $$);
+select * from partprune_foo where b < ANY ('{12, 14, 11}');
+
+
+-- Check for all the different number of partition selections
+DROP TABLE IF EXISTS DATE_PARTS;
+CREATE TABLE DATE_PARTS (id int, year int, month int, day int, region text)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE (year)
+    SUBPARTITION BY LIST (month)
+       SUBPARTITION TEMPLATE (
+        SUBPARTITION Q1 VALUES (1, 2, 3), 
+        SUBPARTITION Q2 VALUES (4 ,5 ,6),
+        SUBPARTITION Q3 VALUES (7, 8, 9),
+        SUBPARTITION Q4 VALUES (10, 11, 12),
+        DEFAULT SUBPARTITION other_months )
+        	SUBPARTITION BY RANGE(day)
+        		SUBPARTITION TEMPLATE (
+        		START (1) END (31) EVERY (10), 
+		        DEFAULT SUBPARTITION other_days)
+( START (2002) END (2012) EVERY (4), 
+  DEFAULT PARTITION outlying_years );
+
+insert into DATE_PARTS select i, extract(year from dt), extract(month from dt), extract(day from dt), NULL from (select i, '2002-01-01'::date + i * interval '1 day' day as dt from generate_series(1, 3650) as i) as t;
+
+-- Expected total parts => 4 * 1 * 4 => 16: 
+-- TODO #141973839: we selected extra parts because of disjunction: 32 parts: 4 * 2 * 4
+select get_selected_parts('explain analyze select * from DATE_PARTS where month between 1 and 3;');
+
+-- Expected total parts => 4 * 2 * 4 => 32: 
+-- TODO #141973839: we selected extra parts because of disjunction: 48 parts: 4 * 3 * 4
+select get_selected_parts('explain analyze select * from DATE_PARTS where month between 1 and 4;');
+
+-- Expected total parts => 1 * 2 * 4 => 8: 
+-- TODO #141973839: we selected extra parts because of disjunction: 24 parts: 2 * 3 * 4
+select get_selected_parts('explain analyze select * from DATE_PARTS where year = 2003 and month between 1 and 4;');
+
+-- 1 :: 5 :: 4 => 20 // Only default for year
+select get_selected_parts('explain analyze select * from DATE_PARTS where year = 1999;');
+
+-- 4 :: 1 :: 4 => 16 // Only default for month
+select get_selected_parts('explain analyze select * from DATE_PARTS where month = 13;');
+
+-- 1 :: 1 :: 4 => 4 // Default for both year and month
+select get_selected_parts('explain analyze select * from DATE_PARTS where year = 1999 and month = 13;');
+
+-- 4 :: 5 :: 1 => 20 // Only default part for day
+select get_selected_parts('explain analyze select * from DATE_PARTS where day = 40;');
+
+-- General predicate
+-- TODO #141973839. We expected 112 parts: (month = 1) =>   4 * 1 * 4 => 16, month > 3 => 4 * 4 * 4 => 64, month in (0, 1, 2) => 4 * 1 * 4 => 16, month is NULL => 4 * 1 * 4 => 16.
+-- However, we selected 128 parts: (month = 1) =>   4 * 1 * 4 => 16, month > 3 => 4 * 4 * 4 => 64, month in (0, 1, 2) => 4 * 2 * 4 => 32, month is NULL => 4 * 1 * 4 => 16.
+select get_selected_parts('explain analyze select * from DATE_PARTS where month = 1 union all select * from DATE_PARTS where month > 3 union all select * from DATE_PARTS where month in (0,1,2) union all select * from DATE_PARTS where month is null;');
+
+-- Equality predicate
+-- 16 partitions => 4 from year x 1 from month x 4 from days.
+select get_selected_parts('explain analyze select * from DATE_PARTS where month = 3;');  -- Not working (it only produces general)
+
+-- More Equality and General Predicates ---
+create table foo(a int, b int)
+partition by list (b)
+(partition p1 values(1,3), partition p2 values(4,2), default partition other);
+
+-- General predicate
+-- Total 6 parts. b = 1: 1 part, b > 3: 2 parts, b in (0, 1): 2 parts. b is null: 1 part
+select get_selected_parts('explain analyze select * from foo where b = 1 union all select * from foo where b > 3 union all select * from foo where b in (0,1) union all select * from foo where b is null;');
+
+drop table if exists pt;
+CREATE TABLE pt (id int, gender varchar(2)) 
+DISTRIBUTED BY (id)
+PARTITION BY LIST (gender)
+( PARTITION girls VALUES ('F', NULL), 
+  PARTITION boys VALUES ('M'), 
+  DEFAULT PARTITION other );
+
+-- General filter
+-- TODO #141916623. Expecting 6 parts, but optimizer plan selects 7 parts. The 6 parts breakdown is: gender = 'F': 1 part, gender < 'M': 2 parts (including default), gender in ('F', F'M'): 2 parts, gender is null => 1 part
+select get_selected_parts('explain analyze select * from pt where gender = ''F'' union all select * from pt where gender < ''M'' union all select * from pt where gender in (''F'', ''FM'') union all select * from pt where gender is null;');
+
+-- DML
+-- Non-default part
+insert into DATE_PARTS values (-1, 2004, 11, 30, NULL);
+select * from date_parts_1_prt_2_2_prt_q4_3_prt_4 where id < 0;
+
+-- Default year
+insert into DATE_PARTS values (-2, 1999, 11, 30, NULL);
+select * from date_parts_1_prt_outlying_years_2_prt_q4_3_prt_4 where id < 0;
+
+-- Default month
+insert into DATE_PARTS values (-3, 2004, 20, 30, NULL);
+select * from date_parts_1_prt_2_2_prt_other_months where id < 0;
+
+-- Default day
+insert into DATE_PARTS values (-4, 2004, 10, 50, NULL);
+select * from date_parts_1_prt_2_2_prt_q4_3_prt_other_days where id < 0;
+
+-- Default everything
+insert into DATE_PARTS values (-5, 1999, 20, 50, NULL);
+select * from date_parts_1_prt_outlying_years_2_prt_other_mo_3_prt_other_days where id < 0;
+
+-- Default month + day but not year
+insert into DATE_PARTS values (-6, 2002, 20, 50, NULL);
+select * from date_parts_1_prt_2_2_prt_other_months_3_prt_other_days where id < 0;
+
+-- Dropped columns with exchange
+drop table if exists sales;
+CREATE TABLE sales (trans_id int, to_be_dropped1 int, date date, amount 
+decimal(9,2), to_be_dropped2 int, region text) 
+DISTRIBUTED BY (trans_id)
+PARTITION BY RANGE (date)
+SUBPARTITION BY LIST (region)
+SUBPARTITION TEMPLATE
+( SUBPARTITION usa VALUES ('usa'), 
+  SUBPARTITION asia VALUES ('asia'), 
+  SUBPARTITION europe VALUES ('europe'), 
+  DEFAULT SUBPARTITION other_regions)
+  (START (date '2011-01-01') INCLUSIVE
+   END (date '2012-01-01') EXCLUSIVE
+   EVERY (INTERVAL '3 month'), 
+   DEFAULT PARTITION outlying_dates );
+
+-- This will introduce different column numbers in subsequent part tables
+alter table sales drop column to_be_dropped1;
+alter table sales drop column to_be_dropped2;
+
+-- Create the exchange candidate without dropped columns
+drop table if exists sales_exchange_part;
+create table sales_exchange_part (trans_id int, date date, amount 
+decimal(9,2), region text);
+
+-- Insert some data
+insert into sales_exchange_part values(1, '2011-01-01', 10.1, 'usa');
+
+-- Exchange
+ALTER TABLE sales 
+ALTER PARTITION FOR (date '2011-01-01')
+EXCHANGE PARTITION FOR ('usa') WITH TABLE sales_exchange_part ;
+ANALYZE sales;
+
+-- TODO: #141973839. Expected 10 parts, currently selecting 15 parts. First level: 4 parts + 1 default. Second level 2 parts. Total 10 parts.
+select get_selected_parts('explain analyze select * from sales where region = ''usa'' or region = ''asia'';');
+select * from sales where region = 'usa' or region = 'asia';
+
+-- Test DynamicIndexScan with extra filter
+create index idx_sales_date on sales(date);
+explain select * from sales where date = '2011-01-01' and region = 'usa';
+select * from sales where date = '2011-01-01' and region = 'usa';
+
+-- Updating partition key
+
+select * from sales_1_prt_2_2_prt_usa;
+select * from sales_1_prt_2_2_prt_europe;
+update sales set region = 'europe' where trans_id = 1;
+select * from sales_1_prt_2_2_prt_europe;
+select * from sales_1_prt_2_2_prt_usa;
+select * from sales;
+
+-- Distinct From
+drop table if exists bar;
+CREATE TABLE bar (i INTEGER, j decimal)
+partition by list (j)
+subpartition by range (i) subpartition template (start(1) end(4) every(2))
+(partition p1 values(0.2,2.8, NULL), partition p2 values(1.7,3.1),
+partition p3 values(5.6), default partition other);
+
+insert into bar values(1, 0.2); --p1
+insert into bar values(1, 1.7); --p2
+insert into bar values(1, 2.1); --default
+insert into bar values(1, 5.6); --default
+insert into bar values(1, NULL); --p1
+
+-- In-equality
+-- 8 parts: All 4 parts on first level and each will have 2 range parts 
+select get_selected_parts('explain analyze select * from bar where j>0.02;');
+-- 6 parts: Excluding 1 list parts at first level. So, 3 at first level and each has 2 at second level.
+select get_selected_parts('explain analyze select * from bar where j>2.8;');
+
+-- Distinct From
+-- 6 parts: Everything except 1 part that contains 5.6.
+select get_selected_parts('explain analyze select * from bar where j is distinct from 5.6;');
+-- 8 parts: NULL is shared with others on p1. So, all 8 parts.
+select get_selected_parts('explain analyze select * from bar where j is distinct from NULL;');
+
+
+-- Table partitioned by boolean column
+CREATE TABLE pt_bool_tab
+(
+  col1 int,
+  col2 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(true),
+  partition part2 values(false)
+);
+
+INSERT INTO pt_bool_tab SELECT i, true FROM generate_series(1,3)i;
+INSERT INTO pt_bool_tab SELECT i, false FROM generate_series(1,2)i;
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS true;
+SELECT * FROM pt_bool_tab WHERE col2 IS true;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS false;
+SELECT * FROM pt_bool_tab WHERE col2 IS false;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NULL;
+SELECT * FROM pt_bool_tab WHERE col2 IS NULL;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS unknown;
+SELECT * FROM pt_bool_tab WHERE col2 IS unknown;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT true;
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT true;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT false;
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT false;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT unknown;
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT unknown;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE col2 IS NOT NULL;
+SELECT * FROM pt_bool_tab WHERE col2 IS NOT NULL;
+
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS true;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS true;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS false;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS false;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NULL;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NULL;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS unknown;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS unknown;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT true;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT true;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT false;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT false;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT unknown;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT unknown;
+EXPLAIN SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT NULL;
+SELECT * FROM pt_bool_tab WHERE (not col2) IS NOT NULL;
+
+CREATE TABLE pt_bool_tab_df
+(
+  col1 int,
+  col2 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(true),
+  partition part2 values(false),
+  default partition def
+);
+
+INSERT INTO pt_bool_tab_df SELECT i, true FROM generate_series(1,3)i;
+INSERT INTO pt_bool_tab_df SELECT i, false FROM generate_series(1,2)i;
+INSERT INTO pt_bool_tab_df SELECT i, NULL FROM generate_series(1,1)i;
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS true;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS true;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS false;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS false;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NULL;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NULL;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS unknown;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT true;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT true;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT false;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT false;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT unknown;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT NULL;
+SELECT * FROM pt_bool_tab_df WHERE col2 IS NOT NULL;
+
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS true;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS true;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS false;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS false;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NULL;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NULL;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS unknown;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT true;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT true;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT false;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT false;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT unknown;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT NULL;
+SELECT * FROM pt_bool_tab_df WHERE (not col2) IS NOT NULL;
+
+
+CREATE TABLE pt_bool_tab_null
+(
+  col1 int,
+  col2 bool
+)
+distributed by (col1)
+partition by list(col2)
+(
+  partition part1 values(true),
+  partition part2 values(false),
+  partition part3 values(null)
+);
+INSERT INTO pt_bool_tab_null SELECT i, true FROM generate_series(1,3)i;
+INSERT INTO pt_bool_tab_null SELECT i, false FROM generate_series(1,2)i;
+INSERT INTO pt_bool_tab_null SELECT i, NULL FROM generate_series(1,1)i;
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS true;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS true;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS false;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS false;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NULL;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NULL;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS unknown;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT true;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT true;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT false;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT false;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT unknown;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT NULL;
+SELECT * FROM pt_bool_tab_null WHERE col2 IS NOT NULL;
+
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS true;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS true;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS false;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS false;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NULL;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NULL;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS unknown;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT true;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT true;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT false;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT false;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT unknown;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT unknown;
+EXPLAIN SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT NULL;
+SELECT * FROM pt_bool_tab_null WHERE (not col2) IS NOT NULL;
+
+RESET ALL;
\ No newline at end of file
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 1b17536838d..501579f22a8 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -477,6 +477,7 @@ CREATE MATERIALIZED VIEW mat_view_heap_psql USING heap_psql AS SELECT f1 from tb
 \set HIDE_TABLEAM off
 \d+ tbl_heap_psql
 \d+ tbl_heap
+\dit+ tbl_heap
 -- AM is displayed for tables, indexes and materialized views.
 \d+
 \dt+
diff --git a/src/test/regress/sql/qp_with_clause.sql b/src/test/regress/sql/qp_with_clause.sql
index 5164491251b..fbff6575d89 100644
--- a/src/test/regress/sql/qp_with_clause.sql
+++ b/src/test/regress/sql/qp_with_clause.sql
@@ -10331,7 +10331,7 @@ WHERE  e.deptno = dc1.deptno AND
        m.deptno = dmc1.dept_mgr_no
 ORDER BY 1, 2, 3, 4 DESC LIMIT 25;
 
--- Test that SharedInputScan within the same slice is always executed 
+-- Test that ShareInputScan within the same slice is always executed 
 set gp_cte_sharing=on;
 
 -- start_ignore
diff --git a/src/test/regress/sql/query_finish_pending.sql b/src/test/regress/sql/query_finish_pending.sql
index 220fd4c35e5..e2d0a186d0c 100644
--- a/src/test/regress/sql/query_finish_pending.sql
+++ b/src/test/regress/sql/query_finish_pending.sql
@@ -38,7 +38,7 @@ reset enable_parallel;
 
 select gp_inject_fault('execsort_sort_bounded_heap', 'status', 2);
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node
 drop table if exists testsisc;
 create table testsisc (i1 int, i2 int, i3 int, i4 int); 
@@ -48,13 +48,13 @@ insert into testsisc select i, i % 1000, i % 100000, i % 75 from
 
 set gp_resqueue_print_operator_memory_limits=on;
 set statement_mem='2MB';
--- ORCA does not generate SharedInputScan with a Sort node underneath it. For
+-- ORCA does not generate ShareInputScan with a Sort node underneath it. For
 -- the following query, ORCA disregards the order by inside the cte definition;
 -- planner on the other hand does not.
 set optimizer=off;
 select gp_inject_fault('execshare_input_next', 'reset', 2);
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
 
 set enable_parallel = off;
@@ -64,13 +64,13 @@ select * from cte c1, cte c2 limit 2;
 
 select gp_inject_fault('execshare_input_next', 'status', 2);
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node and sort_mk algorithm is used
 
 
 select gp_inject_fault('execshare_input_next', 'reset', 2);
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 2);
 
 with cte as (select i2 from testsisc order by i2)
diff --git a/src/test/regress/sql/select_parallel.sql b/src/test/regress/sql/select_parallel.sql
index 8a56061710e..846066fad05 100644
--- a/src/test/regress/sql/select_parallel.sql
+++ b/src/test/regress/sql/select_parallel.sql
@@ -389,6 +389,7 @@ reset force_parallel_mode;
 reset role;
 
 -- Window function calculation can't be pushed to workers.
+-- CBDB_PARALLEL: window function's subpath could be parallel.
 explain (costs off, verbose)
   select count(*) from tenk1 a where (unique1, two) in
     (select unique1, row_number() over() from tenk1 b);
diff --git a/src/test/regress/sql/statement_mem_for_windowagg.sql b/src/test/regress/sql/statement_mem_for_windowagg.sql
index 5c4b96a1761..a471690c6be 100644
--- a/src/test/regress/sql/statement_mem_for_windowagg.sql
+++ b/src/test/regress/sql/statement_mem_for_windowagg.sql
@@ -2,6 +2,7 @@ CREATE TABLE dummy_table(x int, y int) DISTRIBUTED BY (y);
 INSERT INTO dummy_table SELECT generate_series(0, 20000), 0;
 INSERT INTO dummy_table SELECT generate_series(0, 20000), 3;
 INSERT INTO dummy_table SELECT generate_series(0, 20000), 10;
+set enable_parallel = off; 
 
 -- 1. Test that if we set statement_mem to a larger value, the tuplestore
 -- for caching the tuples in partition used in WindowAgg is able to be fitted
@@ -53,5 +54,6 @@ SELECT gp_inject_fault_infinite('distinct_winagg_perform_sort', 'reset', dbid)
   FROM gp_segment_configuration WHERE role='p' AND content>=0;
 
 -- Do some clean-ups.
+reset enable_parallel;
 DROP TABLE dummy_table;
 RESET statement_mem;
diff --git a/src/test/regress/sql/stats_ext.sql b/src/test/regress/sql/stats_ext.sql
index f005f2c2957..91edd3a5bba 100644
--- a/src/test/regress/sql/stats_ext.sql
+++ b/src/test/regress/sql/stats_ext.sql
@@ -1651,3 +1651,15 @@ DROP FUNCTION op_leak(int, int);
 RESET SESSION AUTHORIZATION;
 DROP SCHEMA tststats CASCADE;
 DROP USER regress_stats_user1;
+
+-- test analyze with extended statistics 
+CREATE TABLE tbl_issue1293 (col1 int, col2 int);
+INSERT INTO tbl_issue1293
+SELECT i / 10000, i / 100000
+FROM generate_series(1, 1000000) s(i);
+ANALYZE tbl_issue1293;
+-- Create extended statistics on col1, col2
+CREATE STATISTICS s1 (dependencies) ON col1, col2 FROM tbl_issue1293;
+-- Trigger extended stats collection
+ANALYZE tbl_issue1293;
+DROP TABLE tbl_issue1293;
diff --git a/src/test/regress/sql/tpcds_q04.sql b/src/test/regress/sql/tpcds_q04.sql
new file mode 100644
index 00000000000..ea427b30076
--- /dev/null
+++ b/src/test/regress/sql/tpcds_q04.sql
@@ -0,0 +1,5591 @@
+CREATE SCHEMA cte_bug;
+
+SET gp_default_storage_options = '';
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = ao_column;
+
+--
+-- Name: catalog_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.catalog_sales;
+
+CREATE TABLE cte_bug.catalog_sales (
+    cs_sold_date_sk integer,
+    cs_sold_time_sk integer,
+    cs_ship_date_sk integer,
+    cs_bill_customer_sk integer,
+    cs_bill_cdemo_sk integer,
+    cs_bill_hdemo_sk integer,
+    cs_bill_addr_sk integer,
+    cs_ship_customer_sk integer,
+    cs_ship_cdemo_sk integer,
+    cs_ship_hdemo_sk integer,
+    cs_ship_addr_sk integer,
+    cs_call_center_sk integer,
+    cs_catalog_page_sk integer,
+    cs_ship_mode_sk integer,
+    cs_warehouse_sk integer,
+    cs_item_sk integer NOT NULL,
+    cs_promo_sk integer,
+    cs_order_number bigint NOT NULL,
+    cs_quantity integer,
+    cs_wholesale_cost numeric(7,2),
+    cs_list_price numeric(7,2),
+    cs_sales_price numeric(7,2),
+    cs_ext_discount_amt numeric(7,2),
+    cs_ext_sales_price numeric(7,2),
+    cs_ext_wholesale_cost numeric(7,2),
+    cs_ext_list_price numeric(7,2),
+    cs_ext_tax numeric(7,2),
+    cs_coupon_amt numeric(7,2),
+    cs_ext_ship_cost numeric(7,2),
+    cs_net_paid numeric(7,2),
+    cs_net_paid_inc_tax numeric(7,2),
+    cs_net_paid_inc_ship numeric(7,2),
+    cs_net_paid_inc_ship_tax numeric(7,2),
+    cs_net_profit numeric(7,2),
+    COLUMN cs_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_bill_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_call_center_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_catalog_page_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ship_mode_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_warehouse_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_order_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_ext_ship_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_ship ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_paid_inc_ship_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN cs_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (cs_item_sk);
+
+
+--
+-- Name: customer; Type: TABLE; Schema: cte_bug; Owner: -
+--
+
+DROP TABLE IF EXISTS cte_bug.customer;
+
+CREATE TABLE cte_bug.customer (
+    c_customer_sk integer NOT NULL,
+    c_customer_id character varying(16) NOT NULL,
+    c_current_cdemo_sk integer,
+    c_current_hdemo_sk integer,
+    c_current_addr_sk integer,
+    c_first_shipto_date_sk integer,
+    c_first_sales_date_sk integer,
+    c_salutation character varying(10),
+    c_first_name character varying(20),
+    c_last_name character varying(30),
+    c_preferred_cust_flag character(1),
+    c_birth_day integer,
+    c_birth_month integer,
+    c_birth_year integer,
+    c_birth_country character varying(20),
+    c_login character varying(13),
+    c_email_address character varying(50),
+    c_last_review_date integer,
+    COLUMN c_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_customer_id ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_current_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_shipto_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_sales_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_salutation ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_first_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_last_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_preferred_cust_flag ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_day ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_month ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_birth_country ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_login ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_email_address ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN c_last_review_date ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (c_customer_sk);
+
+
+--
+-- Name: date_dim; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.date_dim;
+
+CREATE TABLE cte_bug.date_dim (
+    d_date_sk integer NOT NULL,
+    d_date_id character varying(16) NOT NULL,
+    d_date date,
+    d_month_seq integer,
+    d_week_seq integer,
+    d_quarter_seq integer,
+    d_year integer,
+    d_dow integer,
+    d_moy integer,
+    d_dom integer,
+    d_qoy integer,
+    d_fy_year integer,
+    d_fy_quarter_seq integer,
+    d_fy_week_seq integer,
+    d_day_name character varying(9),
+    d_quarter_name character varying(6),
+    d_holiday character(1),
+    d_weekend character(1),
+    d_following_holiday character(1),
+    d_first_dom integer,
+    d_last_dom integer,
+    d_same_day_ly integer,
+    d_same_day_lq integer,
+    d_current_day character(1),
+    d_current_week character(1),
+    d_current_month character(1),
+    d_current_quarter character(1),
+    d_current_year character(1),
+    COLUMN d_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_date_id ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_date ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_month_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_week_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_quarter_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_dow ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_moy ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_qoy ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_quarter_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_fy_week_seq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_day_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_quarter_name ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_holiday ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_weekend ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_following_holiday ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_first_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_last_dom ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_same_day_ly ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_same_day_lq ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_day ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_week ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_month ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_quarter ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN d_current_year ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (d_date_sk);
+
+
+--
+-- Name: store_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.store_sales;
+
+CREATE TABLE cte_bug.store_sales (
+    ss_sold_date_sk integer,
+    ss_sold_time_sk integer,
+    ss_item_sk integer NOT NULL,
+    ss_customer_sk integer,
+    ss_cdemo_sk integer,
+    ss_hdemo_sk integer,
+    ss_addr_sk integer,
+    ss_store_sk integer,
+    ss_promo_sk integer,
+    ss_ticket_number bigint NOT NULL,
+    ss_quantity integer,
+    ss_wholesale_cost numeric(7,2),
+    ss_list_price numeric(7,2),
+    ss_sales_price numeric(7,2),
+    ss_ext_discount_amt numeric(7,2),
+    ss_ext_sales_price numeric(7,2),
+    ss_ext_wholesale_cost numeric(7,2),
+    ss_ext_list_price numeric(7,2),
+    ss_ext_tax numeric(7,2),
+    ss_coupon_amt numeric(7,2),
+    ss_net_paid numeric(7,2),
+    ss_net_paid_inc_tax numeric(7,2),
+    ss_net_profit numeric(7,2),
+    COLUMN ss_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_store_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ticket_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ss_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (ss_item_sk);
+
+
+--
+-- Name: web_sales; Type: TABLE; Schema: cte_bug; Owner: -
+--
+DROP TABLE IF EXISTS cte_bug.web_sales;
+
+CREATE TABLE cte_bug.web_sales (
+    ws_sold_date_sk integer,
+    ws_sold_time_sk integer,
+    ws_ship_date_sk integer,
+    ws_item_sk integer NOT NULL,
+    ws_bill_customer_sk integer,
+    ws_bill_cdemo_sk integer,
+    ws_bill_hdemo_sk integer,
+    ws_bill_addr_sk integer,
+    ws_ship_customer_sk integer,
+    ws_ship_cdemo_sk integer,
+    ws_ship_hdemo_sk integer,
+    ws_ship_addr_sk integer,
+    ws_web_page_sk integer,
+    ws_web_site_sk integer,
+    ws_ship_mode_sk integer,
+    ws_warehouse_sk integer,
+    ws_promo_sk integer,
+    ws_order_number bigint NOT NULL,
+    ws_quantity integer,
+    ws_wholesale_cost numeric(7,2),
+    ws_list_price numeric(7,2),
+    ws_sales_price numeric(7,2),
+    ws_ext_discount_amt numeric(7,2),
+    ws_ext_sales_price numeric(7,2),
+    ws_ext_wholesale_cost numeric(7,2),
+    ws_ext_list_price numeric(7,2),
+    ws_ext_tax numeric(7,2),
+    ws_coupon_amt numeric(7,2),
+    ws_ext_ship_cost numeric(7,2),
+    ws_net_paid numeric(7,2),
+    ws_net_paid_inc_tax numeric(7,2),
+    ws_net_paid_inc_ship numeric(7,2),
+    ws_net_paid_inc_ship_tax numeric(7,2),
+    ws_net_profit numeric(7,2),
+    COLUMN ws_sold_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_sold_time_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_date_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_item_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_bill_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_customer_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_cdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_hdemo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_addr_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_web_page_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_web_site_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ship_mode_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_warehouse_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_promo_sk ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_order_number ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_quantity ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_discount_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_sales_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_wholesale_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_list_price ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_coupon_amt ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_ext_ship_cost ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_ship ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_paid_inc_ship_tax ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576),
+    COLUMN ws_net_profit ENCODING (compresstype=zstd,compresslevel=5,blocksize=1048576)
+)
+WITH (appendonly = true, orientation = column, compresstype=zstd, compresslevel='5', blocksize='1048576') DISTRIBUTED BY (ws_item_sk);
+
+
+--
+-- Apache Cloudberry database dump complete
+--
+
+
+-- 
+-- Allow system table modifications
+-- 
+set allow_system_table_mods=true;
+
+-- Table: catalog_sales
+UPDATE pg_class
+SET
+	relpages = 1497467::int,
+	reltuples = 720015040.0::real,
+	relallvisible = 0::int
+WHERE relname = 'catalog_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+
+-- Table: date_dim
+UPDATE pg_class
+SET
+	relpages = 40::int,
+	reltuples = 73049.0::real,
+	relallvisible = 0::int
+WHERE relname = 'date_dim' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+
+-- Table: customer
+UPDATE pg_class
+SET
+	relpages = 2870::int,
+	reltuples = 2100000.0::real,
+	relallvisible = 0::int
+WHERE relname = 'customer' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+
+-- Table: store_sales
+UPDATE pg_class
+SET
+	relpages = 1930653::int,
+	reltuples = 1439977500.0::real,
+	relallvisible = 0::int
+WHERE relname = 'store_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+
+-- Table: web_sales
+UPDATE pg_class
+SET
+	relpages = 736204::int,
+	reltuples = 360014100.0::real,
+	relallvisible = 0::int
+WHERE relname = 'web_sales' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'cte_bug');
+
+--
+-- Table: catalog_sales, Attribute: cs_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0046333335::real,
+	4::integer,
+	1836.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0017666667, 0.0015666666, 0.0015666666, 0.0015, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014333334, 0.0014333334, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666}'::real[],
+	NULL::real[],
+	'{0.054781195}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2452618","2451872","2451875","2451537","2451130","2451869","2451873","2451891","2451908","2452223","2452613","2451169","2451486","2451513","2451904","2451163","2451173","2451541","2451885","2451177","2451504","2451876","2451884","2452249","2452264","2452587","2452606","2451138","2451146","2451158","2451491","2451523","2451536","2451540","2451544","2451883","2451899","2452217","2452222","2452248","2452593","2451535","2451864","2451874","2451894","2451896","2452230","2452588","2452597","2451156","2451505","2451514","2452247","2452259","2452269","2452585","2452627","2451150","2451157","2451166","2451171","2451512","2451515","2451519","2451526","2451881","2451886","2451893","2452232","2452254","2452265","2452576","2452583","2452609","2452612","2452616","2452630","2451132","2451136","2451522","2451529","2451887","2452220","2452235","2452498","2452594","2452595","2452601","2452620","2452624","2451029","2451131","2451133","2451139","2451147","2451170","2451525","2451532","2451856","2451858"}'::int4[],
+	E'{"2450815","2450843","2450872","2450902","2450927","2450954","2450982","2451010","2451032","2451043","2451055","2451066","2451078","2451090","2451102","2451116","2451125","2451142","2451153","2451165","2451181","2451211","2451241","2451266","2451295","2451323","2451348","2451375","2451397","2451409","2451421","2451434","2451446","2451458","2451471","2451483","2451494","2451506","2451520","2451539","2451563","2451589","2451616","2451645","2451670","2451696","2451724","2451754","2451768","2451782","2451795","2451807","2451818","2451831","2451842","2451853","2451865","2451879","2451898","2451910","2451933","2451960","2451990","2452016","2452042","2452069","2452097","2452122","2452135","2452147","2452158","2452169","2452182","2452195","2452207","2452218","2452231","2452242","2452255","2452267","2452278","2452309","2452340","2452369","2452396","2452424","2452450","2452480","2452497","2452509","2452521","2452533","2452544","2452556","2452568","2452582","2452599","2452610","2452625","2452636","2452654"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.005::real,
+	4::integer,
+	72297.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0002}'::real[],
+	NULL::real[],
+	'{0.0112536065}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"44417"}'::int4[],
+	E'{"19","3608","5437","7239","9103","10773","12524","14298","15582","16852","17926","19155","20275","21514","22764","24007","25186","26042","26962","27910","28794","29659","30546","31449","32213","32885","33617","34346","35082","35807","36509","37180","37892","38557","39244","39936","40721","41398","42183","42868","43569","44109","44624","45170","45703","46274","46759","47492","48133","48850","49628","50310","51472","52776","53993","54839","55874","56759","57696","58416","59123","59800","60516","61221","61836","62429","62989","63592","64155","64738","65238","65703","66205","66700","67247","67791","68275","68782","69195","69611","70077","70485","70923","71369","71847","72304","72827","73342","73877","74404","74966","75510","76220","76902","77680","78437","79149","80343","81522","82791","86392"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ship_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0052::real,
+	4::integer,
+	1914.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0014, 0.0013666666, 0.0013666666, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001}'::real[],
+	NULL::real[],
+	'{0.0545705}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451918","2451182","2451209","2452278","2451544","2451907","2452252","2452639","2452648","2452659","2451207","2452590","2451205","2451541","2451559","2451183","2451549","2451909","2451910","2451911","2451933","2452260","2452262","2452624","2452634","2452637","2451906","2451914","2452233","2452242","2452265","2452270","2451121","2451180","2451192","2451526","2451565","2451575","2451896","2451897","2451899","2451912","2451936","2452245","2452618","2452626","2452653","2451161","2451173","2451174","2451191","2451478","2451528","2451555","2451915","2451927","2452261","2452269","2452281","2452290","2452629","2452633","2452643","2451162","2451164","2451185","2451548","2451550","2451584","2451929","2451940","2452236","2452283","2452608","2452654","2451165","2451168","2451481","2451511","2451517","2451553","2451582","2451889","2451917","2452294","2452632","2452641","2452642","2452647","2452660","2451123","2451178","2451184","2451204","2451491","2451512","2451513","2451516","2451520","2451538"}'::int4[],
+	E'{"2450821","2450886","2450917","2450945","2450976","2451006","2451032","2451056","2451073","2451088","2451101","2451114","2451128","2451140","2451151","2451166","2451186","2451199","2451214","2451227","2451241","2451259","2451286","2451317","2451344","2451370","2451397","2451421","2451439","2451456","2451470","2451484","2451497","2451510","2451529","2451542","2451561","2451573","2451588","2451603","2451620","2451643","2451671","2451698","2451724","2451752","2451777","2451799","2451817","2451830","2451844","2451858","2451870","2451880","2451892","2451908","2451926","2451941","2451953","2451966","2451982","2452002","2452032","2452056","2452083","2452113","2452139","2452159","2452176","2452190","2452204","2452217","2452229","2452244","2452257","2452274","2452287","2452301","2452312","2452325","2452341","2452360","2452392","2452421","2452448","2452475","2452504","2452523","2452541","2452555","2452569","2452581","2452594","2452606","2452617","2452631","2452651","2452666","2452678","2452695","2452742"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_bill_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0047333334::real,
+	4::integer,
+	2076691.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.009644499}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"83","19255","38469","57334","77660","100353","121648","142864","164380","186732","206072","225376","246600","266629","288115","310326","332043","353860","375080","398568","418154","439646","461654","482840","506162","528559","549467","568302","588542","608968","630692","650223","671210","692175","713622","734326","754624","775800","798038","818056","841239","862315","882803","902700","923351","943590","963503","984723","1007978","1026125","1047160","1067477","1087789","1107171","1127082","1149889","1169435","1192194","1212249","1233291","1254464","1277232","1298034","1319408","1340687","1361652","1382794","1402582","1423476","1446047","1468226","1490417","1512333","1534704","1553629","1572989","1592634","1611613","1630695","1653622","1674063","1694178","1714594","1736071","1758421","1781336","1801193","1823164","1844186","1864368","1883410","1905171","1926138","1948282","1969988","1992903","2014079","2034696","2056865","2078611","2099787"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_bill_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.005133333::real,
+	4::integer,
+	2250439.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0031504256}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"302","18541","37466","54463","73740","92424","112008","130967","151053","169555","190110","209507","228068","249282","268918","288605","307024","325774","343640","360630","381214","401158","419575","438762","458312","478977","498196","516757","537388","556845","575435","593167","612925","631535","649867","668933","688696","708123","729225","748554","766895","786505","806811","825215","844584","864169","883774","902048","921519","939325","959048","977470","995552","1013270","1032128","1049619","1069099","1089358","1107492","1124109","1143285","1161705","1180858","1201502","1221860","1240948","1262383","1281164","1299986","1317873","1338886","1358783","1378683","1398812","1417832","1435737","1456539","1476597","1496447","1515429","1535261","1554963","1573327","1591123","1612033","1630239","1650833","1669983","1688937","1707342","1727798","1746079","1764329","1783178","1803869","1823803","1842989","1862762","1881322","1901969","1920750"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_bill_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0045666667::real,
+	4::integer,
+	7211.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.000111478614}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"952","3639","822","1878","3522","3566","4915","5053","5336"}'::int4[],
+	E'{"1","69","138","207","278","358","430","510","587","655","728","798","869","942","1011","1079","1148","1221","1293","1363","1436","1515","1590","1658","1727","1796","1869","1943","2011","2089","2164","2238","2309","2383","2458","2534","2607","2674","2744","2820","2896","2971","3050","3121","3192","3259","3330","3406","3478","3554","3622","3693","3766","3837","3910","3986","4059","4136","4203","4276","4352","4423","4495","4568","4638","4711","4786","4851","4924","4995","5071","5139","5209","5275","5348","5419","5491","5562","5630","5702","5783","5855","5928","6005","6074","6145","6221","6287","6362","6437","6509","6581","6652","6718","6791","6859","6925","6992","7067","7135","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_bill_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0049666665::real,
+	4::integer,
+	1046873.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.010069353}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"4","11125","22235","33070","44034","54814","66903","76551","86436","96499","107386","117375","127737","138201","149160","158550","169352","179553","191448","202662","213153","223343","232616","242533","253489","263641","274314","284608","294503","305542","316693","327046","337213","348029","358708","369038","379092","389216","399404","411658","421481","431880","442318","452462","463687","473855","484589","494142","504812","515093","525984","536447","546801","557909","568809","579887","590134","600989","611895","621827","631620","641611","653140","664172","674648","685363","696406","706802","717628","727362","737815","748416","758649","768984","779629","790315","800549","811382","821988","832542","842239","852925","861542","872217","882338","893425","903652","914043","925124","935145","946703","957135","966844","978263","987914","998584","1009037","1019530","1030620","1041099","1049900"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ship_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	1988803.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.012593937}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"112","19457","38552","56966","77106","98752","120684","141455","163448","185974","205916","225714","246798","267145","288778","309669","331415","352688","373910","396777","417012","437984","458412","480601","503081","525455","546630","566430","585396","605761","627797","647297","667174","689078","710793","730789","751531","771586","793233","812933","836114","858314","878748","899241","919733","940900","960199","982017","1005759","1024900","1046467","1067416","1087759","1107005","1127271","1149614","1169010","1191761","1212083","1233029","1254014","1275851","1297280","1318761","1339872","1360476","1383115","1402788","1422877","1446083","1468587","1490686","1513016","1535950","1556692","1575347","1593894","1613402","1634582","1657027","1677173","1698221","1719408","1739440","1762772","1784881","1805037","1826722","1847883","1868042","1887771","1909652","1929728","1951115","1972152","1994703","2015691","2036799","2059398","2079650","2099910"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ship_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0047::real,
+	4::integer,
+	2111792.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0029372792}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"302","18991","38051","55457","73906","92142","111203","130054","150524","168838","188615","208305","226780","247275","267002","286332","305964","323539","341623","359088","378908","398275","417006","435648","456039","475587","494530","514681","534729","554637","572188","589663","608849","627139","645797","665116","684344","704227","724342","743953","761704","781964","800445","819537","838906","859432","878743","896384","916344","935630","954106","974012","992877","1010876","1030092","1047512","1067272","1087763","1106244","1123512","1143152","1162252","1181423","1201399","1221079","1241127","1262335","1281211","1300282","1317917","1338913","1359409","1379678","1399509","1419706","1437833","1458212","1478319","1498253","1517308","1537216","1555785","1574809","1593715","1614555","1632477","1652767","1671255","1689246","1707832","1727015","1745671","1764329","1783647","1803713","1823176","1843528","1863426","1881885","1901131","1920750"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ship_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0045::real,
+	4::integer,
+	7216.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00046666668, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{-0.0024474491}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3639","952","4257","822","1910","4081","4594","4618","4915"}'::int4[],
+	E'{"1","73","142","207","280","358","430","508","582","649","721","795","869","944","1014","1083","1154","1229","1300","1373","1444","1523","1596","1662","1734","1808","1878","1946","2015","2092","2166","2242","2314","2390","2466","2538","2613","2681","2754","2829","2904","2980","3057","3130","3199","3265","3336","3409","3484","3555","3618","3692","3763","3836","3911","3985","4055","4135","4203","4280","4359","4429","4500","4572","4647","4723","4793","4861","4928","5004","5075","5142","5214","5279","5349","5422","5492","5565","5633","5704","5780","5856","5929","6005","6075","6144","6216","6286","6361","6433","6507","6577","6650","6717","6786","6857","6924","6990","7066","7134","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ship_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	1106888.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0052251625}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"4","10372","21281","32604","43275","54281","66191","75977","85966","96475","106785","117107","127166","137473","148549","158449","169288","179404","191400","202566","212568","223050","231983","242203","252330","262987","273206","284036","293651","303573","314592","325696","336019","346020","357411","367567","377578","387371","397564","409384","419885","430219","441268","451283","462534","472729","482897","493068","503727","514241","524681","535657","546641","557534","568161","579186","589218","600063","610499","620727","630611","640167","650891","661771","672763","683715","694487","704971","715589","725727","735602","745905","755951","765867","776755","787045","798005","808059","818665","829654","840229","849950","859637","870300","880895","892234","902478","912694","923652","933902","945183","955649","965499","976354","986841","997088","1007946","1018197","1029945","1040884","1049912"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_call_center_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0049::real,
+	4::integer,
+	6.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.32786667, 0.1994, 0.13533333, 0.13273333, 0.1306, 0.06916667}'::real[],
+	'{0.21526349}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","2","3","5","4","6"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_catalog_page_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0049333335::real,
+	4::integer,
+	5614.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0012666667, 0.0012666667, 0.0012333334, 0.0012, 0.0012, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.00093333336, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009, 0.0009}'::real[],
+	NULL::real[],
+	'{0.050873112}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"164","5975","2104","135","4000","7906","2144","5962","5966","7944","7992","2111","2149","5954","6016","6032","6043","7900","7908","2053","2075","4051","7954","150","151","160","183","186","2062","2090","2114","4010","4052","4084","5959","6025","7929","7941","116","117","194","2060","2119","4076","4094","5964","5999","6011","6019","7917","7973","118","120","129","163","190","212","2077","2078","2091","2093","2148","2156","4047","4050","4068","4097","5979","6003","6007","6021","6034","7890","7909","7919","7921","7932","7938","7953","7960","141","157","176","182","214","2118","4016","4028","4053","4065","4073","4086","5961","6010","7911","7914","7922","7923","7936","7956"}'::int4[],
+	E'{"1","29","53","79","106","124","139","154","172","189","205","230","290","340","380","413","614","843","1009","1150","1945","1972","1996","2020","2047","2067","2083","2099","2115","2131","2145","2168","2227","2279","2318","2361","2605","2813","2989","3129","3896","3920","3945","3968","3994","4009","4024","4038","4056","4070","4085","4101","4153","4215","4252","4289","4400","4718","4887","5022","5155","5852","5878","5903","5927","5946","5963","5980","5992","6006","6026","6040","6078","6144","6189","6232","6381","6650","6829","6974","7101","7800","7825","7851","7879","7895","7913","7935","7955","7971","7986","8023","8080","8130","8168","8207","8515","8701","8861","8977","9827"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ship_mode_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.004766667::real,
+	4::integer,
+	20.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0517, 0.051333334, 0.0507, 0.050466668, 0.0504, 0.050166667, 0.050166667, 0.050066665, 0.049966667, 0.0499, 0.0499, 0.049733333, 0.049333334, 0.0493, 0.049133334, 0.049066667, 0.049066667, 0.04853333, 0.0485, 0.0478}'::real[],
+	'{0.05016106}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"10","4","5","15","7","14","20","12","9","3","6","2","1","18","8","17","19","16","13","11"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_warehouse_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.0047::real,
+	4::integer,
+	5.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.2037, 0.20163333, 0.19836667, 0.19753334, 0.19406667}'::real[],
+	'{0.20946348}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"5","4","2","3","1"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	24934.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.00087319454}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2149","4123","7117","12451","15001","19603","20557","21523","22867","27235","55","841","2348","2545","4105","4159","4441","4843","5509","7513","7747","8827","9289","12031","13417","15541","15709","16730","18115","18805","18997","19495","20083","21073","23167","24679","26641"}'::int4[],
+	E'{"1","320","583","835","1138","1406","1673","1962","2264","2558","2845","3127","3446","3749","4031","4330","4573","4877","5173","5433","5703","5947","6237","6506","6775","7040","7307","7579","7873","8136","8404","8707","8984","9250","9532","9833","10123","10420","10678","10969","11250","11553","11826","12095","12364","12667","12956","13219","13486","13741","14042","14309","14602","14871","15161","15410","15665","15939","16212","16498","16763","17059","17351","17654","17945","18229","18514","18782","19059","19348","19609","19913","20198","20471","20743","21035","21331","21597","21883","22148","22442","22712","22966","23269","23567","23848","24106","24394","24668","24951","25221","25508","25796","26095","26365","26646","26927","27195","27461","27722","28000"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0049333335::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0039333333, 0.0036666666, 0.0036333334, 0.0035666667, 0.0035, 0.0035, 0.0035, 0.0035, 0.0034666667}'::real[],
+	NULL::real[],
+	'{0.012315235}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"305","89","51","343","11","49","195","258","355"}'::int4[],
+	E'{"1","4","8","12","16","19","23","26","30","33","37","40","44","47","53","56","60","63","67","70","74","78","81","85","88","92","96","99","102","106","109","113","116","120","123","127","130","134","137","141","144","148","151","155","158","162","165","168","172","175","179","182","186","189","193","197","201","204","208","211","215","218","221","225","228","232","235","239","242","246","249","253","256","261","264","268","271","275","278","282","285","289","293","296","299","303","307","311","314","318","321","325","328","331","335","339","342","346","350","353","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_order_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	-0.23808314::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.05413773}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1093","796094","1645931","2488328","3262945","4034487","4856771","5589623","6321306","7127852","7844455","8614283","9422592","10337715","11178214","11967077","12806598","13604549","14347663","15135994","15897089","16779779","17630658","18360193","19209296","19976804","20750598","21564225","22330137","23141252","23995273","24745890","25625704","26406125","27188856","28177645","29033724","29834605","30623466","31397341","32181036","32930216","33726353","34526912","35320855","36048980","36922780","37717474","38626712","39479583","40217298","41019974","41831233","42654275","43505081","44324401","44976357","45709232","46482483","47262545","48002145","48800151","49567190","50315617","51133372","51910262","52699539","53463422","54279944","55035406","55746486","56570321","57449909","58231103","58998945","59766115","60653209","61448393","62271704","63090076","63926111","64814052","65684644","66478632","67319176","68037038","68897841","69676370","70424558","71249378","72010418","72811451","73574543","74362921","75127096","75960745","76739924","77534318","78299599","79159205","79998254"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0044::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0111, 0.0111, 0.011, 0.011, 0.0109, 0.010833333, 0.010833333, 0.010833333, 0.0108, 0.010666667, 0.010666667, 0.0106, 0.010566667, 0.010566667, 0.010533334, 0.010533334, 0.010533334, 0.0105, 0.010466667, 0.010433333, 0.010433333, 0.010366667, 0.010366667, 0.010366667, 0.010366667, 0.010366667, 0.010333333, 0.0103, 0.0103, 0.010266666, 0.010266666, 0.010266666, 0.0102, 0.0102, 0.0102, 0.0102, 0.0101666665, 0.0101666665, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101, 0.0101, 0.010066667, 0.010033334, 0.010033334, 0.010033334, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.009933333, 0.009933333, 0.009933333, 0.009933333, 0.0099, 0.0099, 0.009866667, 0.009866667, 0.009833333, 0.009833333, 0.009833333, 0.009833333, 0.0098, 0.0098, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.0097, 0.009666666, 0.009666666, 0.009666666, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.0095, 0.009466667, 0.009333333, 0.009266667, 0.009266667, 0.009233333, 0.009233333, 0.0092, 0.009133333, 0.009133333, 0.0091, 0.008933334, 0.008866667, 0.008833333, 0.0088, 0.0087, 0.0084, 0.0084}'::real[],
+	'{0.009663152}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"41","52","9","44","27","58","86","89","77","36","80","17","16","42","45","46","83","15","91","12","14","57","67","68","74","96","84","25","64","28","71","82","11","56","60","98","1","6","23","7","95","61","94","47","5","69","72","3","48","70","92","34","54","76","79","81","32","38","62","78","2","13","18","55","37","40","75","100","22","97","4","33","51","8","35","73","88","24","49","87","21","26","53","66","99","39","65","20","93","30","43","90","29","63","85","59","19","50","10","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0042333333::real,
+	6::integer,
+	9853.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.00037631093}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"72.49","24.31","33.82","41.38","61.68","64.83","90.44","10.81","27.94","34.69","63.73","87.62","93.76","94.23"}'::numeric[],
+	E'{"1.00","1.97","2.96","3.92","4.94","5.97","7.01","7.93","8.86","9.79","10.76","11.74","12.69","13.67","14.71","15.61","16.55","17.55","18.59","19.64","20.69","21.72","22.70","23.70","24.74","25.76","26.74","27.83","28.84","29.88","30.96","31.96","32.90","33.95","34.88","35.82","36.86","37.79","38.78","39.75","40.65","41.59","42.57","43.46","44.53","45.59","46.66","47.73","48.74","49.72","50.69","51.60","52.56","53.41","54.44","55.38","56.44","57.38","58.32","59.33","60.46","61.51","62.59","63.51","64.50","65.52","66.49","67.40","68.34","69.30","70.25","71.22","72.19","73.17","74.18","75.21","76.17","77.18","78.10","79.08","80.07","81.02","81.93","82.86","83.87","84.82","85.83","86.83","87.81","88.79","89.69","90.75","91.71","92.69","93.69","94.73","95.80","96.89","97.92","99.02","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.0047333334::real,
+	6::integer,
+	23623.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667}'::real[],
+	NULL::real[],
+	'{0.0011046942}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"11.59","52.87","62.87","64.43","87.47","95.88","96.45","99.51"}'::numeric[],
+	E'{"1.00","3.51","5.35","7.23","9.15","10.91","12.55","14.37","16.10","17.87","19.59","21.31","23.22","24.95","26.59","28.36","30.12","31.92","33.70","35.45","37.37","39.21","40.96","42.63","44.39","46.23","48.04","49.97","52.04","53.81","55.47","57.35","59.13","60.99","62.98","64.76","66.54","68.45","70.35","72.20","74.06","75.90","77.63","79.47","81.31","83.10","84.84","86.86","88.69","90.45","92.15","94.08","95.99","97.69","99.41","101.23","103.18","104.97","107.17","108.94","110.89","112.85","114.87","116.76","119.10","121.18","123.40","125.73","128.23","130.50","132.97","135.31","138.15","140.60","143.29","145.79","148.51","151.34","154.23","157.06","160.08","163.23","166.75","170.63","174.29","177.79","181.55","185.86","189.57","193.79","198.05","202.87","207.95","213.14","219.21","225.93","233.84","241.92","252.53","265.43","299.64"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.0046666665::real,
+	6::integer,
+	14418.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.009733333, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{0.00090382085}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","4.11","1.12","1.14","1.19","1.41","2.07","3.47","0.45","0.86","0.99","1.11","1.66","1.79","2.22","2.36","4.79","5.00","5.07","19.14","0.34","0.77","0.98","1.17","1.38","1.39","1.53","1.60","2.13","2.14","2.41","2.70","2.91","3.55","5.02","0.32","0.61","0.81","1.02","1.20","1.63","1.78","1.83","1.98","2.16","2.57","2.58","2.63","2.71","2.82","3.02","3.07","3.31","3.49","4.09","4.70","5.83","6.20","6.42","6.65","6.71","6.81","7.47","7.73","8.32","8.90","11.94","13.00","23.92","25.86","0.52","0.60","0.68","0.83","0.85","0.90","0.92","1.00","1.03","1.22","1.40","1.42","1.52","1.62","1.70","1.89","1.90","1.92","1.95","1.99","2.08","2.45","2.48","2.80","2.85","2.86","3.05","3.57","3.58","4.26"}'::numeric[],
+	E'{"0.01","0.65","1.28","1.88","2.49","3.12","3.69","4.24","4.73","5.29","5.72","6.26","6.84","7.36","7.90","8.49","9.12","9.69","10.29","10.91","11.52","12.20","12.88","13.55","14.26","15.04","15.79","16.49","17.27","18.12","18.88","19.69","20.47","21.31","22.14","23.04","23.89","24.71","25.66","26.63","27.57","28.59","29.53","30.53","31.55","32.67","33.80","34.83","35.95","37.16","38.26","39.31","40.43","41.57","42.77","43.90","45.13","46.36","47.81","49.19","50.47","52.07","53.50","55.01","56.52","58.13","59.74","61.42","63.22","65.02","66.74","68.61","70.40","72.18","74.20","76.33","79.00","81.18","83.67","85.79","88.11","90.68","93.43","96.30","99.26","102.27","105.67","109.56","113.32","117.45","121.86","127.22","132.40","138.99","144.98","152.44","160.57","173.02","186.46","208.92","291.96"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.0044::real,
+	6::integer,
+	142728.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0095}'::real[],
+	NULL::real[],
+	'{-0.004464352}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.17","11.20","20.91","30.80","40.84","51.00","63.78","75.00","87.44","99.94","114.70","128.10","142.35","157.32","174.42","192.54","210.80","230.40","248.40","268.05","290.88","314.16","335.72","359.45","382.80","407.16","434.34","460.80","487.56","514.71","543.62","576.10","607.10","638.58","674.96","708.51","744.12","781.44","816.90","854.24","892.67","937.72","978.12","1024.92","1066.60","1115.40","1163.76","1213.44","1265.92","1319.64","1377.33","1435.50","1492.72","1553.06","1615.12","1676.76","1740.50","1811.01","1879.47","1944.96","2021.00","2099.24","2180.82","2254.08","2338.24","2431.94","2518.37","2613.97","2705.79","2811.90","2915.52","3030.87","3147.78","3268.80","3398.64","3537.80","3693.20","3853.00","4025.84","4178.16","4342.57","4533.75","4713.69","4897.32","5111.40","5372.25","5621.20","5899.18","6182.22","6506.64","6877.80","7259.75","7668.62","8199.00","8717.40","9363.69","10163.70","11203.92","12513.40","14893.36","26922.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	24::smallint,
+	False::boolean,
+	0.0043666665::real,
+	6::integer,
+	142257.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.009733333, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.003978702}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","46.08","221.76","229.32","324.00"}'::numeric[],
+	E'{"0.12","10.50","20.06","29.43","40.50","50.88","62.55","73.71","86.88","99.80","112.70","127.52","143.62","159.84","176.54","195.30","213.76","232.57","250.81","273.00","293.44","314.88","338.10","359.04","380.19","405.00","429.60","451.68","477.47","502.86","527.96","553.70","584.44","614.88","648.96","678.59","714.00","752.49","789.24","832.00","873.60","918.00","961.62","1002.87","1045.32","1088.01","1138.32","1187.80","1240.32","1290.56","1343.52","1398.63","1453.80","1514.52","1579.89","1641.03","1707.15","1777.62","1850.16","1929.60","2006.40","2085.16","2172.12","2258.24","2346.43","2432.08","2522.40","2612.40","2716.00","2822.00","2941.68","3047.40","3167.66","3290.34","3408.50","3542.00","3672.90","3827.25","3964.16","4119.20","4284.36","4443.82","4620.28","4815.00","5049.41","5287.50","5540.15","5817.90","6091.80","6419.70","6763.11","7107.12","7533.20","7984.68","8549.10","9239.68","10028.92","11141.40","12375.32","14442.82","25866.02"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	25::smallint,
+	False::boolean,
+	0.004466667::real,
+	6::integer,
+	199389.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0034636194}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.06","33.44","56.88","76.70","95.46","117.98","141.00","166.72","189.80","211.64","240.48","270.13","296.05","322.14","351.56","382.20","408.80","443.17","471.27","503.04","536.48","569.53","605.88","642.30","676.20","713.25","748.00","784.08","822.58","862.92","904.12","944.00","988.12","1033.94","1078.22","1125.57","1174.44","1219.20","1271.47","1321.32","1373.73","1424.13","1473.56","1523.06","1577.80","1632.80","1692.33","1751.88","1804.98","1865.64","1925.04","1986.64","2048.64","2112.36","2177.07","2241.60","2304.72","2377.20","2443.50","2515.50","2594.70","2670.36","2747.52","2824.00","2907.76","2981.60","3064.35","3151.04","3236.05","3335.04","3423.42","3510.24","3609.13","3694.74","3790.59","3900.42","3997.84","4093.60","4201.20","4315.14","4440.32","4580.68","4717.80","4850.32","4981.08","5120.57","5295.40","5446.35","5591.49","5754.84","5939.64","6145.90","6353.16","6573.59","6818.15","7085.50","7369.09","7709.87","8107.01","8627.71","9908.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	26::smallint,
+	False::boolean,
+	0.0046::real,
+	7::integer,
+	360309.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0035410712}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.31","59.20","97.76","139.16","175.10","215.86","258.20","301.76","346.30","395.71","441.67","491.37","543.03","588.96","647.90","704.77","761.60","820.05","876.37","931.44","988.52","1051.24","1114.54","1179.42","1241.24","1315.60","1390.35","1465.83","1545.12","1616.40","1698.12","1773.90","1846.20","1925.82","1999.80","2079.66","2167.27","2254.16","2349.06","2439.60","2538.36","2639.88","2745.00","2842.88","2945.84","3061.35","3159.96","3268.20","3385.82","3497.60","3619.28","3731.16","3844.31","3972.32","4086.60","4223.18","4350.00","4491.60","4633.60","4772.85","4900.80","5039.44","5187.14","5331.15","5491.76","5659.20","5821.20","5993.74","6151.74","6324.80","6490.96","6680.54","6873.60","7073.04","7286.40","7516.05","7726.84","7955.22","8181.76","8428.98","8698.56","8945.39","9241.96","9521.28","9816.00","10132.22","10488.06","10859.64","11241.16","11644.83","12054.38","12542.40","13138.72","13710.72","14384.79","15172.80","16106.68","17329.62","18721.00","21017.28","28889.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	27::smallint,
+	False::boolean,
+	0.004766667::real,
+	6::integer,
+	21954.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10706667, 0.00063333334, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333}'::real[],
+	NULL::real[],
+	'{0.004360509}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.04","0.17","0.02","0.28","0.84","1.06","1.14","0.13","0.14","0.25","0.36","0.79","0.03","0.33","0.34","0.39","0.48","0.90","0.91","1.10","0.08","0.09","0.18","0.42","0.45","0.54","1.25","1.40","1.41","0.07","0.30","0.32","0.50","0.63","0.78","0.93","1.56","1.58","2.01","2.83","4.17","4.23","5.38","0.01","0.05","0.06","0.23","0.35","0.37","0.44","0.51","0.65","0.66","0.69","0.72","0.92","1.07","1.20","1.91","2.25","2.35","2.39","2.49","2.59","2.61","2.84","3.46","5.14","0.11","0.12","0.29","0.31","0.55","0.64","0.86","0.94","0.97","1.04","1.11","1.27","1.34","1.72","1.74","1.82","2.07","2.41","2.63","3.16","3.22","3.31","4.24","4.37","4.50","4.67","6.56","7.04","7.48","9.72","0.20"}'::numeric[],
+	E'{"0.10","0.76","1.28","1.69","2.10","2.54","3.00","3.45","3.87","4.42","4.93","5.42","5.92","6.50","7.06","7.75","8.39","9.02","9.63","10.39","11.20","12.02","12.86","13.70","14.51","15.26","16.17","17.18","18.15","19.08","20.18","21.20","22.36","23.50","24.63","25.72","26.96","28.39","29.87","31.24","32.78","34.20","35.67","37.38","39.11","41.00","42.83","44.65","46.61","48.72","50.66","53.20","55.29","57.88","60.49","63.18","66.04","69.09","72.25","75.29","78.51","82.02","85.29","89.36","92.98","96.95","101.40","105.70","110.69","116.16","120.93","126.18","131.91","137.88","143.80","151.06","157.08","164.57","172.99","181.14","190.17","200.65","210.92","221.02","232.90","244.78","259.12","273.65","291.32","310.11","330.23","353.23","380.19","411.93","449.37","493.85","546.42","616.37","721.39","893.95","2142.09"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	28::smallint,
+	False::boolean,
+	0.0052333334::real,
+	3::integer,
+	6889.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.80296665}'::real[],
+	NULL::real[],
+	'{0.6553299}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.01","2.20","4.55","7.28","10.58","14.36","17.92","22.46","25.33","29.09","32.44","36.89","41.40","45.19","49.75","55.22","62.09","68.46","74.86","81.76","91.57","99.10","106.96","114.24","121.21","127.94","137.96","148.71","157.54","170.28","181.68","193.93","204.76","214.01","227.90","241.64","255.16","269.95","283.85","297.98","314.58","330.18","348.86","367.79","387.60","402.79","419.99","435.31","461.47","484.00","509.09","533.90","558.08","588.06","619.44","645.35","672.88","700.29","729.03","760.23","796.67","836.28","873.12","909.36","951.28","1008.91","1061.09","1112.98","1155.96","1201.35","1259.28","1324.66","1399.44","1477.63","1548.31","1632.65","1703.81","1774.10","1847.07","1944.10","2036.97","2136.30","2215.42","2317.48","2479.32","2652.32","2791.40","2968.30","3152.68","3345.17","3578.36","3851.51","4127.20","4451.55","4914.34","5421.31","6009.40","6794.45","7819.40","9995.94","21255.41"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_ext_ship_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=29;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	29::smallint,
+	False::boolean,
+	0.0045::real,
+	6::integer,
+	81417.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0188, 0.0003, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0046927556}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","124.80","123.20","39.60","54.00","79.80","138.60","216.72","14.00","23.40","45.60","48.30","73.44","82.80","83.52","128.64","148.50","201.60","369.60"}'::numeric[],
+	E'{"0.01","5.94","11.44","16.77","22.24","28.70","34.72","40.68","46.76","54.04","61.00","68.16","76.50","85.26","94.55","103.02","111.44","121.44","132.24","143.40","153.90","165.76","177.65","188.67","201.11","212.38","224.93","238.72","252.96","266.76","282.10","299.12","315.56","331.39","347.22","363.12","379.85","399.00","416.25","434.16","453.96","475.60","497.55","521.70","543.90","568.03","592.20","618.64","644.00","669.06","697.92","724.13","755.70","784.09","816.31","849.52","882.75","915.75","950.25","987.00","1022.35","1059.10","1097.07","1144.50","1187.60","1237.04","1284.01","1339.45","1388.34","1443.94","1496.00","1543.70","1598.74","1656.20","1727.70","1794.60","1866.41","1936.12","2007.84","2091.57","2178.28","2270.17","2367.40","2465.85","2573.55","2691.00","2809.66","2948.40","3100.80","3253.56","3417.26","3620.70","3826.12","4070.04","4341.72","4685.14","5057.36","5597.70","6345.93","7552.84","14029.29"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=30;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	30::smallint,
+	False::boolean,
+	0.0045666667::real,
+	6::integer,
+	155617.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.011266666, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0071978415}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","221.76","267.30"}'::numeric[],
+	E'{"0.04","6.30","13.46","20.10","27.38","36.00","45.37","54.42","64.17","74.16","84.95","95.83","107.47","120.56","133.68","147.52","161.55","176.09","192.62","209.85","225.68","242.40","260.64","280.40","299.63","319.88","342.68","361.62","383.67","407.20","430.95","452.40","478.20","502.86","526.93","551.28","580.65","609.84","645.84","672.01","705.60","742.28","777.65","819.77","859.65","905.32","946.21","988.00","1030.29","1072.29","1120.20","1169.28","1222.48","1277.88","1335.95","1393.40","1452.30","1510.88","1577.52","1643.88","1712.18","1783.60","1864.20","1941.02","2021.80","2110.48","2194.50","2288.80","2382.00","2480.31","2575.77","2686.53","2796.40","2918.30","3030.33","3153.62","3270.28","3405.85","3555.37","3689.67","3856.30","4006.50","4182.84","4362.48","4551.55","4780.32","5045.92","5298.28","5580.25","5880.00","6219.92","6583.20","6993.36","7441.75","7943.75","8616.00","9434.75","10515.84","11757.96","14014.08","25785.76"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=31;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	31::smallint,
+	False::boolean,
+	0.004766667::real,
+	6::integer,
+	266415.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.011266666}'::real[],
+	NULL::real[],
+	'{-0.007137176}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","6.57","13.94","21.03","28.62","37.23","47.06","56.65","66.91","77.14","88.19","99.88","111.66","125.70","139.15","153.96","167.98","183.70","200.51","218.37","234.41","252.12","271.21","292.28","311.64","332.88","354.70","376.40","397.68","423.75","447.30","472.27","496.81","520.51","546.40","573.95","604.97","637.86","669.29","702.85","736.56","771.82","808.78","850.00","894.59","941.49","983.86","1030.60","1072.51","1120.44","1164.50","1218.82","1276.89","1328.94","1392.76","1450.62","1515.35","1577.79","1642.09","1715.87","1785.64","1867.43","1945.94","2025.64","2113.90","2200.02","2292.15","2386.61","2484.22","2590.13","2687.89","2800.02","2917.72","3043.84","3167.64","3291.60","3406.12","3562.87","3712.26","3872.48","4020.94","4187.61","4364.95","4559.15","4755.57","4989.93","5272.48","5532.24","5829.06","6143.38","6489.24","6878.77","7303.39","7746.09","8295.79","9014.30","9837.86","11001.37","12381.74","14679.09","26662.34"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_ship
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=32;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	32::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	280640.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0071525415}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","23.85","47.34","67.95","89.80","110.58","132.44","153.00","179.04","202.51","229.06","255.64","281.80","311.22","340.96","371.09","403.00","434.83","466.69","497.15","530.10","562.00","593.67","628.20","664.69","704.00","739.88","780.85","825.34","866.72","907.27","949.41","994.16","1044.45","1096.50","1144.92","1195.21","1250.15","1305.36","1361.76","1416.36","1475.91","1536.25","1598.70","1665.83","1732.92","1800.90","1873.10","1941.75","2016.72","2092.86","2175.34","2253.86","2345.76","2434.51","2518.72","2608.45","2696.29","2793.56","2894.40","2985.12","3079.88","3181.62","3294.00","3407.10","3528.30","3649.14","3775.68","3899.28","4033.51","4169.60","4307.38","4456.66","4620.28","4793.89","4963.42","5138.76","5318.80","5502.90","5715.60","5907.94","6131.28","6356.80","6629.70","6889.46","7169.33","7478.59","7780.37","8131.05","8498.52","8903.58","9369.99","9838.92","10426.64","11123.84","11986.61","13051.50","14332.97","16169.95","19117.60","36471.09"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_net_paid_inc_ship_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=33;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	33::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	613201.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00728921}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","24.55","48.62","69.15","91.91","112.84","135.45","157.97","183.66","207.27","233.71","261.95","289.12","318.33","350.11","381.22","413.11","444.48","477.58","508.92","542.83","576.18","609.45","644.62","682.66","719.94","759.00","801.51","845.42","887.38","930.05","971.99","1022.12","1070.40","1121.18","1175.11","1228.42","1282.74","1334.77","1397.05","1456.76","1508.61","1575.93","1641.47","1709.47","1778.38","1844.93","1917.32","1990.71","2063.03","2147.81","2231.80","2316.78","2402.40","2493.91","2591.15","2678.00","2770.78","2865.32","2974.50","3066.56","3162.22","3269.67","3378.18","3496.07","3622.04","3743.00","3878.25","4003.40","4149.54","4287.78","4434.50","4591.26","4750.74","4944.45","5105.41","5289.66","5467.44","5660.87","5871.93","6090.64","6310.11","6551.52","6808.71","7096.07","7374.30","7678.33","8022.91","8355.36","8765.02","9187.25","9660.31","10158.98","10789.68","11521.51","12322.88","13498.43","14789.11","16663.22","19689.06","37177.23"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: catalog_sales, Attribute: cs_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.catalog_sales'::regclass AND staattnum=34;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.catalog_sales'::regclass,
+	34::smallint,
+	False::boolean,
+	0.0::real,
+	6::integer,
+	206524.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0003, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0019606797}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","-47.52"}'::numeric[],
+	E'{"-9478.75","-6317.17","-5427.84","-4811.17","-4310.01","-3964.66","-3670.14","-3411.00","-3196.27","-2980.12","-2792.84","-2624.60","-2471.95","-2325.60","-2192.15","-2061.36","-1940.00","-1830.51","-1735.50","-1637.76","-1537.14","-1452.35","-1375.59","-1298.36","-1224.32","-1155.27","-1092.42","-1022.40","-963.48","-909.46","-846.45","-791.42","-741.60","-693.68","-651.75","-611.00","-571.48","-529.55","-492.82","-458.06","-424.16","-393.25","-361.82","-332.56","-302.38","-277.25","-248.65","-223.78","-199.01","-180.17","-158.72","-138.32","-121.68","-105.41","-89.61","-74.48","-59.72","-46.63","-35.01","-23.56","-13.29","-4.92","3.90","16.20","29.60","44.02","63.55","84.33","106.65","130.83","159.30","193.63","231.83","274.32","317.52","364.48","414.57","470.10","538.53","608.95","685.44","768.20","856.98","953.40","1053.60","1164.76","1294.00","1444.00","1596.00","1771.35","1966.12","2176.68","2427.26","2738.40","3132.80","3548.87","4041.96","4805.58","5798.10","7455.03","16965.90"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: customer, Attribute: c_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.09763528}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"9","21261","42021","62080","82255","103369","125043","144232","165965","190286","211001","230315","251065","272203","292790","312482","334187","353856","373058","396690","415673","436316","456746","480529","502046","524523","546632","568546","589481","610972","631185","654707","675842","698400","718405","739653","760815","781559","803530","825502","846209","866622","888173","908015","929893","950771","971557","991734","1015944","1037799","1059421","1080667","1101711","1122753","1142324","1163272","1183361","1204818","1225216","1247329","1269800","1290928","1313000","1333417","1354039","1374731","1393758","1413066","1434044","1455682","1476112","1499430","1518599","1539394","1559012","1578764","1600604","1620632","1642082","1661234","1681629","1701960","1723759","1745015","1765218","1786153","1808002","1827671","1848579","1869421","1889087","1911370","1931677","1953626","1974278","1994274","2014813","2037922","2058859","2079452","2099872"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_customer_id
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0::real,
+	17::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.008318781}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"AAAAAAAAAAABNBAA","AAAAAAAAACGBGAAA","AAAAAAAAAELNKBAA","AAAAAAAAAHEPIBAA","AAAAAAAAAJKFCAAA","AAAAAAAAAMDPPBAA","AAAAAAAAAOPLIAAA","AAAAAAAABBKGGAAA","AAAAAAAABEDPKBAA","AAAAAAAABGMDNAAA","AAAAAAAABJECAAAA","AAAAAAAABMDEJBAA","AAAAAAAABONCCAAA","AAAAAAAACBEIBBAA","AAAAAAAACDPKGBAA","AAAAAAAACGLFEAAA","AAAAAAAACJEIMAAA","AAAAAAAACMCDAAAA","AAAAAAAACOLBDBAA","AAAAAAAADBIDOAAA","AAAAAAAADEGFPBAA","AAAAAAAADGPJIAAA","AAAAAAAADJHBOAAA","AAAAAAAADMAFGAAA","AAAAAAAADOHCCAAA","AAAAAAAAEAOAEBAA","AAAAAAAAEDNGDBAA","AAAAAAAAEGIFIAAA","AAAAAAAAEJAMPBAA","AAAAAAAAELLKDAAA","AAAAAAAAEOCLPAAA","AAAAAAAAFAINOAAA","AAAAAAAAFDBIJBAA","AAAAAAAAFFHIMBAA","AAAAAAAAFHPMHAAA","AAAAAAAAFKIAPBAA","AAAAAAAAFNCOBAAA","AAAAAAAAFPKHLAAA","AAAAAAAAGCDNHAAA","AAAAAAAAGEJHIBAA","AAAAAAAAGHBCCAAA","AAAAAAAAGJJENBAA","AAAAAAAAGMCKCAAA","AAAAAAAAGOMBABAA","AAAAAAAAHBIPLBAA","AAAAAAAAHDPAKAAA","AAAAAAAAHGJCKBAA","AAAAAAAAHJALPAAA","AAAAAAAAHLOFPAAA","AAAAAAAAHOHAAAAA","AAAAAAAAIAOACBAA","AAAAAAAAIDGNKAAA","AAAAAAAAIGCCNBAA","AAAAAAAAIIMJAAAA","AAAAAAAAILNBOBAA","AAAAAAAAIOCOJBAA","AAAAAAAAJAIBNBAA","AAAAAAAAJDBAABAA","AAAAAAAAJFFOFBAA","AAAAAAAAJICEDBAA","AAAAAAAAJKILJBAA","AAAAAAAAJMOJNBAA","AAAAAAAAJPEMKBAA","AAAAAAAAKBMKDBAA","AAAAAAAAKEDLDAAA","AAAAAAAAKGMFDBAA","AAAAAAAAKJJJCBAA","AAAAAAAAKMAFLBAA","AAAAAAAAKOGELBAA","AAAAAAAALAOCABAA","AAAAAAAALDGGLAAA","AAAAAAAALGAJJBAA","AAAAAAAALIJMEAAA","AAAAAAAALKOLOBAA","AAAAAAAALNFAKBAA","AAAAAAAALPKMDBAA","AAAAAAAAMCDMMBAA","AAAAAAAAMELNCBAA","AAAAAAAAMHFNBBAA","AAAAAAAAMJMFPBAA","AAAAAAAAMMGBFAAA","AAAAAAAAMPBPFAAA","AAAAAAAANBJMLAAA","AAAAAAAANECPPBAA","AAAAAAAANHBEAAAA","AAAAAAAANJIOCBAA","AAAAAAAANMDCBAAA","AAAAAAAANPAGFBAA","AAAAAAAAOBIDJBAA","AAAAAAAAODNGFAAA","AAAAAAAAOGECJBAA","AAAAAAAAOINLGAAA","AAAAAAAAOLGCEBAA","AAAAAAAAONPNAAAA","AAAAAAAAPAKLGAAA","AAAAAAAAPDDNKAAA","AAAAAAAAPFNALBAA","AAAAAAAAPIFFFAAA","AAAAAAAAPLABOAAA","AAAAAAAAPNGKCBAA","AAAAAAAAPPPOAAAA"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: customer, Attribute: c_current_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	3::smallint,
+	False::boolean,
+	0.036333334::real,
+	4::integer,
+	-0.50137764::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0013170508}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"83","18955","39087","58094","75845","95317","115100","134187","152171","172644","193010","211552","231710","251817","270655","288181","306995","323507","344088","362797","382712","404200","423621","442226","460401","479260","497142","517339","536731","556732","574796","592497","612826","632068","650345","670861","690813","710439","729562","747865","768032","784796","804004","823342","840808","862022","880748","899717","920319","938794","957931","976962","994731","1014023","1033686","1051262","1072185","1092147","1113436","1132849","1151543","1170064","1188829","1208390","1228056","1247895","1268450","1286523","1306787","1325642","1344821","1361249","1380841","1399617","1418271","1436735","1456195","1476598","1496520","1514478","1535680","1554729","1573897","1593768","1614360","1634204","1654338","1672759","1691901","1711514","1731470","1749749","1767712","1787017","1807176","1824761","1843120","1863530","1883265","1901706","1920535"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_current_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0347::real,
+	4::integer,
+	7192.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.00030779035}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"882","1308","3965","367","666","1327","6987"}'::int4[],
+	E'{"1","72","141","218","292","372","440","506","579","647","728","799","868","940","1006","1081","1151","1224","1294","1368","1432","1502","1576","1650","1728","1803","1873","1941","2024","2095","2168","2245","2318","2395","2472","2542","2617","2682","2751","2823","2897","2969","3041","3110","3179","3248","3319","3390","3457","3520","3590","3657","3725","3801","3881","3954","4024","4098","4179","4251","4312","4383","4451","4522","4604","4674","4745","4814","4885","4954","5024","5095","5171","5245","5317","5386","5452","5523","5591","5664","5732","5805","5883","5956","6025","6099","6170","6241","6316","6392","6464","6534","6610","6685","6756","6829","6900","6980","7059","7129","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_current_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.32888332::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0058509638}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"52","10026","21386","32663","42941","53021","65083","75763","86063","96263","107445","117990","127743","138145","147534","158592","168713","178593","188864","199238","210017","220563","231187","241437","252281","263159","273251","284057","295058","305713","315928","326018","336613","346947","357443","368266","378995","388655","399147","410310","419835","429767","442179","452745","463314","473270","483327","494816","505073","515313","525490","536085","546403","556179","567315","577096","587145","597369","608015","619292","629700","640103","651254","661172","671946","681745","691688","702105","712203","721654","733295","743331","753425","764850","774949","785116","795978","806368","817723","827531","838047","849099","859705","870677","881136","891818","902438","912558","922958","933355","943287","953511","964298","974663","985836","996922","1007782","1017952","1029639","1040067","1049984"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_first_shipto_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	6::smallint,
+	False::boolean,
+	0.035633333::real,
+	4::integer,
+	3649.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665}'::real[],
+	NULL::real[],
+	'{-0.0058256034}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2450039","2451757","2449267","2449566","2449608","2450648","2450973","2451697","2452197"}'::int4[],
+	E'{"2449028","2449061","2449097","2449131","2449163","2449198","2449239","2449274","2449311","2449346","2449381","2449417","2449457","2449492","2449530","2449568","2449601","2449635","2449669","2449706","2449746","2449780","2449818","2449857","2449893","2449930","2449972","2450009","2450045","2450081","2450118","2450155","2450194","2450228","2450265","2450301","2450337","2450372","2450407","2450444","2450483","2450523","2450560","2450594","2450633","2450672","2450708","2450743","2450779","2450812","2450853","2450890","2450930","2450969","2451005","2451044","2451078","2451114","2451147","2451184","2451221","2451261","2451295","2451334","2451370","2451411","2451449","2451486","2451523","2451560","2451594","2451627","2451664","2451702","2451740","2451774","2451810","2451846","2451879","2451918","2451954","2451991","2452028","2452063","2452099","2452135","2452172","2452207","2452242","2452277","2452312","2452352","2452389","2452429","2452461","2452495","2452530","2452566","2452602","2452640","2452678"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_first_sales_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	7::smallint,
+	False::boolean,
+	0.034733333::real,
+	4::integer,
+	3650.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665}'::real[],
+	NULL::real[],
+	'{-0.008479864}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2450009","2451727","2449237","2449536","2450618","2450943","2451260","2451667","2452039","2452167"}'::int4[],
+	E'{"2448998","2449032","2449067","2449101","2449135","2449170","2449209","2449245","2449281","2449317","2449352","2449389","2449428","2449463","2449500","2449537","2449571","2449603","2449637","2449673","2449713","2449747","2449785","2449823","2449859","2449897","2449940","2449977","2450013","2450049","2450084","2450121","2450161","2450196","2450234","2450270","2450306","2450341","2450375","2450412","2450450","2450489","2450526","2450562","2450599","2450638","2450674","2450708","2450743","2450778","2450819","2450854","2450894","2450934","2450971","2451008","2451044","2451079","2451114","2451151","2451188","2451226","2451263","2451301","2451338","2451379","2451417","2451453","2451492","2451528","2451561","2451594","2451629","2451669","2451706","2451741","2451776","2451811","2451845","2451884","2451921","2451957","2451993","2452029","2452067","2452104","2452140","2452175","2452211","2452245","2452281","2452322","2452358","2452398","2452431","2452465","2452501","2452536","2452573","2452610","2452648"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_salutation
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	8::smallint,
+	False::boolean,
+	0.035633333::real,
+	4::integer,
+	6.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.2827, 0.16666667, 0.166, 0.117466666, 0.11726667, 0.114266664}'::real[],
+	'{0.19105348}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Dr.","Mr.","Sir","Miss","Mrs.","Ms."}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: customer, Attribute: c_first_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0351::real,
+	6::integer,
+	2938.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.019733334, 0.0178, 0.0177, 0.014733333, 0.013333334, 0.012866667, 0.011166667, 0.0086, 0.008466667, 0.0082, 0.006, 0.0059666666, 0.0059666666, 0.0055, 0.0055, 0.0053666667, 0.0053, 0.0053, 0.0051, 0.0049666665, 0.0049, 0.0049, 0.0047, 0.0045, 0.0042, 0.004166667, 0.0041333335, 0.0040666666, 0.0039666668, 0.0039333333, 0.0039333333, 0.0038666667, 0.0038666667, 0.0038333333, 0.0038333333, 0.0038, 0.0038, 0.0037333334, 0.0036666666, 0.0035, 0.0035, 0.0034666667, 0.0034333332, 0.0034333332, 0.0033666666, 0.0033666666, 0.0033333334, 0.0031666667, 0.0031, 0.0031, 0.0030666667, 0.003, 0.0029666666, 0.0029666666, 0.0028666668, 0.0028333333, 0.0028333333, 0.0028, 0.0027666667, 0.0027, 0.0027, 0.0026666666, 0.0026333334, 0.0026333334, 0.0026, 0.0026, 0.0025666666, 0.0025666666, 0.0025, 0.0024666667, 0.0024666667, 0.0024333333, 0.0024, 0.0024, 0.0023666667, 0.0023333333, 0.0023333333, 0.0023333333, 0.0022666666, 0.0022333334, 0.0022333334, 0.0022, 0.0022, 0.0022, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021666666, 0.0021333334, 0.0020666667, 0.0020666667, 0.0020666667, 0.0020333333, 0.002, 0.0019666667, 0.0019666667, 0.0019333333, 0.0019, 0.0018666667}'::real[],
+	NULL::real[],
+	'{0.0041609285}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"John","James","Robert","Michael","David","William","Richard","Joseph","Charles","Thomas","Christopher","Linda","Mark","Daniel","Donald","Jennifer","Elizabeth","George","Barbara","Kenneth","Margaret","Paul","Dorothy","Edward","Susan","Brian","Jason","Lisa","Steven","Gary","Ronald","Anthony","Larry","Karen","Sandra","Helen","Matthew","Nancy","Kevin","Andrew","Eric","Sharon","Donna","Jeffrey","Betty","Timothy","Raymond","Jose","Frank","Jessica","Angela","Ruth","Melissa","Rebecca","Anna","Gloria","Laura","Stephen","Amy","Brenda","Cynthia","Deborah","Pamela","Patrick","Martha","Virginia","Michelle","Sarah","Diane","Joshua","Kimberly","Ann","Arthur","Scott","Douglas","Christine","Gregory","Harold","Katherine","Dennis","Joyce","Alice","Janet","Stephanie","Jerry","Kathleen","Marie","Peter","Theresa","Walter","Albert","Amanda","Teresa","Debra","Jonathan","Fred","Keith","Willie","Gerald","Lori"}'::varchar[],
+	E'{"Aaron","Adrienne","Alexander","Allyson","Andrea","Anne","April","Audrey","Benjamin","Bessie","Billy","Bradley","Brigitte","Caitlyn","Carlos","Carrie","Cecelia","Charlotte","Christian","Clara","Clifton","Cornelius","Cyrus","Danny","Dawn","Delta","Diana","Dora","Earl","Edna","Elena","Elsie","Erika","Ethel","Evelyn","Fleta","Freddie","Georgia","Glen","Gregorio","Hattie","Henriette","Homer","Ingrid","Jack","Jaleesa","Janis","Jed","Jerome","Jimmie","Joe","Jon","Juan","Julia","Justin","Kathy","Kerry","Kurt","Lavon","Leo","Letitia","Lois","Louis","Luis","Mae","Marco","Marilynn","Martin","Maurice","Melvin","Mike","Mitchell","Naomi","Nicholas","Norma","Oscar","Pauline","Phillip","Rachel","Randy","Renee","Robbie","Roger","Rose","Roy","Sabrina","Sara","Sharlene","Sherry","Stanley","Suzi","Tanya","Terry","Tina","Tonya","Tyrone","Veronica","Viola","Warren","Willian","Zulma"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: customer, Attribute: c_last_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	10::smallint,
+	False::boolean,
+	0.033933334::real,
+	7::integer,
+	4529.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.015133333, 0.011733334, 0.011033333, 0.009233333, 0.008533333, 0.008166667, 0.0059666666, 0.0048666666, 0.0048, 0.0047, 0.0046333335, 0.0046333335, 0.0043666665, 0.0043, 0.0041333335, 0.004, 0.0039666668, 0.0039, 0.0039, 0.0037333334, 0.0036333334, 0.0032666668, 0.0031666667, 0.0031333333, 0.0030666667, 0.003, 0.003, 0.0029, 0.0029, 0.0027666667, 0.0027333333, 0.0027333333, 0.0027, 0.0026333334, 0.0026333334, 0.0026333334, 0.0026, 0.0026, 0.0026, 0.0025666666, 0.0025, 0.0024666667, 0.0024333333, 0.0023666667, 0.0023666667, 0.0023333333, 0.0022, 0.0022, 0.0021333334, 0.0021333334, 0.0021333334, 0.0020666667, 0.0020333333, 0.0019, 0.0019, 0.0018666667, 0.0018666667, 0.0018333333, 0.0018, 0.0017666667, 0.0017666667, 0.0017666667, 0.0017333333, 0.0017333333, 0.0017333333, 0.0017333333, 0.0017, 0.0016666667, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016, 0.0016, 0.0016, 0.0015666666, 0.0015666666, 0.0015333333, 0.0015333333, 0.0015333333, 0.0015333333, 0.0015, 0.0015, 0.0015, 0.0015, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333}'::real[],
+	NULL::real[],
+	'{0.0012389864}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Smith","Johnson","Williams","Jones","Brown","Davis","Miller","Taylor","Thomas","Jackson","Moore","Wilson","Garcia","Anderson","Martin","Walker","Harris","Martinez","Robinson","Thompson","White","Young","Wright","Lee","Lewis","Hall","King","Rodriguez","Turner","Nelson","Allen","Hill","Roberts","Carter","Clark","Gonzalez","Adams","Hernandez","Scott","Campbell","Lopez","Baker","Green","Bell","Evans","Bailey","Rogers","Torres","Mitchell","Morgan","Stewart","Perez","Edwards","Collins","Sanchez","Morris","Phillips","Gray","Parker","Cox","Reed","Rivera","Brooks","Diaz","Richardson","Watson","Washington","Perry","Murphy","Patterson","Ross","Bryant","Cooper","Kelly","Henderson","Howard","Cook","James","Peterson","Simmons","Long","Mason","Russell","Wood","Gonzales","Murray","Price","Ramirez","Ward","Hughes","Myers","Barnes","Daniels","Harrison","Alexander","Bennett","Ford","Graham","Burns","Powell"}'::varchar[],
+	E'{"Aaron","Allison","Armstrong","Ayala","Barlow","Baxter","Benson","Black","Bonilla","Boyer","Bright","Burdick","Butler","Cano","Carroll","Chambers","Chinn","Coats","Comer","Correa","Creech","Cupp","Davies","Dent","Donovan","Duffy","Eaton","Enriquez","Farrington","Fink","Flynn","Frank","Fuller","Garrett","Gibson","Golding","Graves","Gross","Hale","Hardaway","Harvey","Heard","Herrera","Hobbs","Holt","Howe","Hunter","Jacobs","Johnston","Keller","Kirby","Kurtz","Larkin","Ledoux","Lindsey","Lowe","Mack","Markley","May","Mccormick","Mcgrath","Mcneil","Mercier","Moffitt","Morrison","Nagel","Nichols","Ocampo","Orozco","Padilla","Patton","Perkins","Pinto","Pratt","Raines","Reece","Rhodes","Ritter","Roman","Ruby","Salinas","Saylor","Seiler","Shepherd","Simpson","Snyder","Sperry","Stephens","Strickland","Sweeney","Thornton","Trejo","Valencia","Vernon","Walls","Weaver","West","Wiley","Winters","Worsham","Zuniga"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: customer, Attribute: c_preferred_cust_flag
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	11::smallint,
+	False::boolean,
+	0.03533333::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.49123332, 0.47343335}'::real[],
+	'{0.4982882}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: customer, Attribute: c_birth_day
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0334::real,
+	4::integer,
+	31.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0341, 0.0336, 0.0335, 0.033166666, 0.0326, 0.032266665, 0.032233335, 0.0321, 0.031933334, 0.0319, 0.0319, 0.0319, 0.031866666, 0.031833332, 0.031833332, 0.0317, 0.031533334, 0.031533334, 0.0315, 0.031466667, 0.031166667, 0.0311, 0.030966667, 0.030733334, 0.0307, 0.030533334, 0.030066667, 0.029833334, 0.029666666, 0.028233333, 0.019133333}'::real[],
+	'{0.03440461}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"27","15","26","5","10","23","21","19","14","6","7","18","12","13","24","17","16","22","1","25","8","11","9","3","28","4","29","2","20","30","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_birth_month
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0355::real,
+	4::integer,
+	12.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.08296666, 0.0828, 0.0826, 0.082166664, 0.08143333, 0.08093333, 0.079966664, 0.079733334, 0.079166666, 0.0789, 0.07836667, 0.07546667}'::real[],
+	'{0.08591734}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","1","8","7","9","10","5","6","12","4","11","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_birth_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	14::smallint,
+	False::boolean,
+	0.036066666::real,
+	4::integer,
+	69.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0158, 0.015133333, 0.0151, 0.0150666665, 0.014966667, 0.014966667, 0.014966667, 0.014966667, 0.0148, 0.014766667, 0.014733333, 0.0147, 0.0146, 0.0146, 0.014566666, 0.014366667, 0.014366667, 0.014366667, 0.014333333, 0.014333333, 0.0143, 0.014266667, 0.014266667, 0.014266667, 0.014233333, 0.0142, 0.014166667, 0.014166667, 0.014066666, 0.014066666, 0.014033333, 0.014033333, 0.014, 0.013966667, 0.013966667, 0.013966667, 0.013933334, 0.013933334, 0.013933334, 0.013866667, 0.013866667, 0.0138, 0.0138, 0.013733333, 0.013733333, 0.013666667, 0.0136, 0.0135, 0.0135, 0.013466666, 0.0134333335, 0.0134333335, 0.0134, 0.013366667, 0.013366667, 0.013266667, 0.013266667, 0.013266667, 0.013266667, 0.0132, 0.0131, 0.0131, 0.013066667, 0.013066667, 0.013033333, 0.013033333, 0.012933333, 0.012833334, 0.0127}'::real[],
+	'{0.023301385}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1940","1978","1935","1970","1955","1957","1959","1990","1988","1925","1956","1987","1972","1985","1946","1926","1932","1933","1929","1979","1968","1930","1951","1961","1975","1966","1953","1971","1939","1977","1941","1991","1960","1937","1948","1952","1927","1938","1962","1964","1976","1958","1986","1924","1928","1965","1983","1942","1963","1931","1944","1945","1984","1934","1954","1947","1980","1981","1989","1982","1950","1969","1973","1974","1936","1949","1943","1967","1992"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: customer, Attribute: c_birth_country
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	15::smallint,
+	False::boolean,
+	0.035633333::real,
+	9::integer,
+	211.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.0056666667, 0.0055333334}'::real[],
+	NULL::real[],
+	'{0.013934988}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"GEORGIA","GREENLAND"}'::varchar[],
+	E'{"AFGHANISTAN","ALBANIA","AMERICAN SAMOA","ANGOLA","ANGUILLA","ARGENTINA","ARUBA","AUSTRIA","BAHAMAS","BANGLADESH","BELARUS","BELIZE","BERMUDA","BOLIVIA","BOUVET ISLAND","BRUNEI DARUSSALAM","BURUNDI","CAMBODIA","CANADA","CAYMAN ISLANDS","CHRISTMAS ISLAND","COSTA RICA","CROATIA","CYPRUS","DENMARK","DOMINICA","EGYPT","EQUATORIAL GUINEA","ETHIOPIA","FIJI","FRANCE","FRENCH POLYNESIA","GAMBIA","GHANA","GREECE","GUADELOUPE","GUATEMALA","GUINEA","HAITI","HONDURAS","ICELAND","INDONESIA","IRELAND","ISRAEL","JAMAICA","JERSEY","KAZAKHSTAN","KIRIBATI","KUWAIT","LEBANON","LIBERIA","LITHUANIA","LUXEMBOURG","MALAWI","MALDIVES","MALTA","MARTINIQUE","MAURITIUS","MEXICO","MONACO","MONTENEGRO","MOROCCO","NAMIBIA","NEPAL","NETHERLANDS ANTILLES","NEW ZEALAND","NIGER","NIUE","NORWAY","PALAU","PAPUA NEW GUINEA","PERU","PITCAIRN","PORTUGAL","QATAR","ROMANIA","RWANDA","SAMOA","SAUDI ARABIA","SERBIA","SIERRA LEONE","SLOVAKIA","SOLOMON ISLANDS","SOUTH AFRICA","SRI LANKA","SURINAME","SWEDEN","SYRIAN ARAB REPUBLIC","THAILAND","TOGO","TONGA","TUNISIA","TUVALU","UKRAINE","UNITED KINGDOM","URUGUAY","VANUATU","VIET NAM","WALLIS AND FUTUNA","YEMEN","ZIMBABWE"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: customer, Attribute: c_login
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	16::smallint,
+	False::boolean,
+	1.0::real,
+	0::integer,
+	0.0::real,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: customer, Attribute: c_email_address
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	17::smallint,
+	False::boolean,
+	0.03596667::real,
+	28::integer,
+	-0.9640333::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00065877277}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Aaron.Allen@QVp8KYxoqS.edu","Albert.Mcnabb@JqFg1Vfr.edu","Allen.Blackmon@rDQezy0Iy.org","Amy.Moore@lIXLGiGxl.com","Angela.Perez@9CODy4qpPeA8HCLX.com","Annie.Anderson@D1dOEV8V7YH.edu","April.Sanchez@MlJE7Jyr1KnbMizt8.com","Barbara.Bird@Bsz4Y8vF.edu","Bennie.Mcdonald@8a.com","Beverly.Armstrong@QKMtgEU.edu","Brady.Pacheco@V3G7zDs.org","Brian.Otto@5Ue35SXHl043P.org","Candy.Cox@BmsyXv426e.edu","Casey.Steele@TkMmIusn.com","Charles.Brito@qPU9PAt6xF.com","Chelsey.Gil@U7R6AeIVeQNbM.org","Christopher.Caraway@baXEFsAXkiXc4H.com","Clarence.Martinez@Tjom5JSSLsiqH.edu","Corinne.Blount@gG8DjsIs77.edu","Dale.Peterson@UP1FQ.com","Danny.Rudd@Qj.edu","David.Hernandez@XvDstf8oVspNVEq9N2ek.edu","Dawn.Washington@UZL4A2cTelj.org","Delorse.Mann@p1.edu","Diane.Ruiz@tq8V3.edu","Dona.Rucker@U5tPkxBoh3Nvvr.edu","Dorothy.Ledoux@6UXxuie.org","Ebony.Straub@O0ny7G.edu","Edwin.Brown@jifz5d3.com","Elizabeth.Rowe@x7a.com","Erica.Stewart@MjVPLVkiTTx1k9xvn.com","Ethel.Bowers@BchSkuO.edu","Felisha.White@4KHiD3EfpI.org","Fred.Burns@YAxMo0quQt02.org","Gaynell.Duran@PP5khP2OBXNnz.edu","Gerald.Olivas@Hs63PKrg.org","Goldie.Costello@74uH9.com","Harold.Mckinney@0Ymy5L.edu","Helene.Lockhart@4guNOhMAJ.org","Howard.Clarkson@KEs7Z6hdVT5d.edu","Jack.Davis@D7dTycb6ort.org","James.Cockrell@5lqoIx4paJn9P.org","James.Richter@7JahtLhEvS.org","Janice.Choate@ItXxi6VjtefUmkF.org","Jeanette.Mathews@mXCyZTs8MaGK9.org","Jennifer.Emerson@LADJl.com","Jerry.Willoughby@4h6L6um1aOm0JTk.edu","Joanna.French@Dn.com","John.Byrd@xAeLnuIQqDO4V.edu","John.Nail@vdm7UXfYYeeR5.org","Jonathan.Cochran@a1YLy7.com","Josephine.Barton@jbuycDaa1Dih2f6TbHs.org","Joshua.Trent@P5VKT8eLAEqph7.org","Julia.Mcneil@UXUiYMm4Rf1r1ysly2.com","Karen.Salmon@hVtuyn2.org","Kathy.Roush@f1.com","Kenneth.Nolen@fXIxCA8ecA7kUe.edu","Kimberly.Ward@UjmN1i5S0HqjOSB6P.org","Larry.Mccollum@KM3A2VsKR51LR7aSC2.edu","Leann.Lindsay@CYHO5.org","Lillian.Gibbons@ex2.edu","Lisa.Kaiser@2.edu","Lorraine.Wasson@fxUN1RDnuPC.com","Lyn.Green@ab9AnRe6OP.edu","Margaret.Childers@I2BJusIOR.org","Marilyn.Cochran@fXUsGKiG2pQn5p.org","Mark.Townsend@QRk6f4vPmjzGsd.edu","Matthew.Brown@BbgxEpsOa2.edu","Melissa.Brown@tU.org","Michael.Evans@na3Fzya.edu","Michael.Vickery@tGpS.edu","Millie.Wood@CYrA5ZCpBUxN.com","Nancy.Hubbard@1Dij5VOarSDD.com","Nicole.Cartwright@XVpmQfap67h39R.edu","Otha.Mathews@Q.edu","Paul.Bernard@l8hNZT.com","Peter.Bean@1hcfjEMbL.com","Rafael.Walker@DdbVsZ48tXFR.org","Raymond.Willis@FuCYxX.org","Richard.Blue@hk6sJl.org","Richard.Walker@QkOyOiijkoT6tALu.org","Robert.Feliciano@zrxHvBIUT1.org","Robert.Schrader@84hFFO.edu","Ronald.Barajas@SmV.edu","Rose.Rivera@nI5i3amDP9e.com","Ruth.Noble@nsRPMH7imQms.edu","Sandra.Ngo@NpRHjOrv.org","Sean.Young@cSmSeTb.edu","Shelly.Prentice@fOdVDfc3l.org","Stephanie.Maupin@1aO67HVBb4t.org","Stuart.Mintz@sCH9lO.com","Tamika.Walker@LypSN7cml.com","Terry.Pence@9V95I2n.edu","Thomas.Logan@62ZLdPqs6.edu","Tina.Fry@ggnu7.com","Troy.Hunt@HEIC1huvlV2.com","Vicky.Smith@7NTjUV1y.com","Walter.Guinn@q0V9yqO.com","William.Biddle@X3bGbi3YEGk.edu","William.Silva@OsUh7.edu","Zulma.Williams@NNUybLiKUcP.com"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: customer, Attribute: c_last_review_date
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.customer'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.customer'::regclass,
+	18::smallint,
+	False::boolean,
+	0.03643333::real,
+	4::integer,
+	366.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0033333334, 0.0033333334}'::real[],
+	NULL::real[],
+	'{-0.010210618}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2452342","2452574"}'::int4[],
+	E'{"2452283","2452286","2452290","2452293","2452297","2452301","2452304","2452308","2452312","2452315","2452318","2452322","2452326","2452329","2452333","2452337","2452341","2452345","2452349","2452352","2452356","2452360","2452363","2452367","2452371","2452374","2452378","2452382","2452386","2452389","2452393","2452397","2452400","2452404","2452408","2452411","2452414","2452418","2452422","2452425","2452429","2452433","2452437","2452440","2452444","2452447","2452451","2452455","2452458","2452462","2452465","2452469","2452473","2452476","2452480","2452483","2452487","2452491","2452494","2452498","2452501","2452505","2452508","2452512","2452515","2452519","2452523","2452527","2452531","2452535","2452538","2452542","2452545","2452549","2452553","2452556","2452560","2452563","2452568","2452571","2452576","2452579","2452583","2452587","2452591","2452594","2452598","2452601","2452605","2452608","2452612","2452616","2452619","2452623","2452626","2452630","2452634","2452638","2452641","2452645","2452648"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	1::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2415027","2415771","2416520","2417211","2417903","2418630","2419355","2420088","2420908","2421635","2422337","2423125","2423817","2424576","2425331","2426034","2426734","2427456","2428161","2428886","2429586","2430281","2431030","2431747","2432487","2433188","2433919","2434660","2435416","2436096","2436816","2437551","2438254","2438932","2439677","2440414","2441121","2441884","2442643","2443351","2444066","2444821","2445520","2446305","2447089","2447791","2448548","2449230","2449930","2450652","2451408","2452175","2452928","2453663","2454412","2455152","2455942","2456650","2457349","2458087","2458835","2459531","2460255","2460995","2461677","2462381","2463126","2463880","2464613","2465432","2466146","2466884","2467605","2468353","2469108","2469764","2470509","2471242","2471960","2472732","2473465","2474220","2474963","2475782","2476553","2477254","2477964","2478666","2479406","2480132","2480928","2481630","2482367","2483101","2483817","2484513","2485191","2485905","2486655","2487351","2488066"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_date_id
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0::real,
+	17::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.004197001}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"AAAAAAAAAAABFCAA","AAAAAAAAACLOFCAA","AAAAAAAAAFFCFCAA","AAAAAAAAAHNPECAA","AAAAAAAAAKHDFCAA","AAAAAAAAAMPOECAA","AAAAAAAAAPIBFCAA","AAAAAAAABBPBFCAA","AAAAAAAABEFFFCAA","AAAAAAAABGOIFCAA","AAAAAAAABJKKFCAA","AAAAAAAABMDCFCAA","AAAAAAAABONBFCAA","AAAAAAAACBFDFCAA","AAAAAAAACDNAFCAA","AAAAAAAACGHOFCAA","AAAAAAAACJCMFCAA","AAAAAAAACLLAFCAA","AAAAAAAACOBLFCAA","AAAAAAAADAMDFCAA","AAAAAAAADDFPECAA","AAAAAAAADGAOFCAA","AAAAAAAADIKLFCAA","AAAAAAAADLDCFCAA","AAAAAAAADOCDFCAA","AAAAAAAAEAKPECAA","AAAAAAAAEDEAFCAA","AAAAAAAAEFPHFCAA","AAAAAAAAEILJFCAA","AAAAAAAAELGOECAA","AAAAAAAAENOOFCAA","AAAAAAAAFAFPECAA","AAAAAAAAFCPJFCAA","AAAAAAAAFFGHFCAA","AAAAAAAAFHMOECAA","AAAAAAAAFKEKFCAA","AAAAAAAAFMMJFCAA","AAAAAAAAFPCKFCAA","AAAAAAAAGBKJFCAA","AAAAAAAAGEDOECAA","AAAAAAAAGGOAFCAA","AAAAAAAAGJKHFCAA","AAAAAAAAGMEBFCAA","AAAAAAAAGONOFCAA","AAAAAAAAHBJHFCAA","AAAAAAAAHECHFCAA","AAAAAAAAHGLOECAA","AAAAAAAAHJFDFCAA","AAAAAAAAHLOBFCAA","AAAAAAAAHOFIFCAA","AAAAAAAAIANCFCAA","AAAAAAAAIDFPECAA","AAAAAAAAIFMFFCAA","AAAAAAAAIIGHFCAA","AAAAAAAAILABFCAA","AAAAAAAAINJEFCAA","AAAAAAAAJADHFCAA","AAAAAAAAJCLBFCAA","AAAAAAAAJFDCFCAA","AAAAAAAAJHLMFCAA","AAAAAAAAJKDBFCAA","AAAAAAAAJMKOFCAA","AAAAAAAAJPCHFCAA","AAAAAAAAKBMIFCAA","AAAAAAAAKEEPECAA","AAAAAAAAKGODFCAA","AAAAAAAAKJGPECAA","AAAAAAAAKLMAFCAA","AAAAAAAAKOFCFCAA","AAAAAAAALBAAFCAA","AAAAAAAALDKOECAA","AAAAAAAALGBIFCAA","AAAAAAAALIGMFCAA","AAAAAAAALKMOECAA","AAAAAAAALNENFCAA","AAAAAAAALPMOFCAA","AAAAAAAAMCFFFCAA","AAAAAAAAMELFFCAA","AAAAAAAAMHFJFCAA","AAAAAAAAMJOIFCAA","AAAAAAAAMMHDFCAA","AAAAAAAAMPBJFCAA","AAAAAAAANBKMFCAA","AAAAAAAANEHIFCAA","AAAAAAAANGMPECAA","AAAAAAAANJIAFCAA","AAAAAAAANMDDFCAA","AAAAAAAANOPGFCAA","AAAAAAAAOBHNFCAA","AAAAAAAAOEAPFCAA","AAAAAAAAOGKIFCAA","AAAAAAAAOJBGFCAA","AAAAAAAAOLIJFCAA","AAAAAAAAOOALFCAA","AAAAAAAAPAJMFCAA","AAAAAAAAPDCOECAA","AAAAAAAAPFLAFCAA","AAAAAAAAPIECFCAA","AAAAAAAAPKNIFCAA","AAAAAAAAPNFPFCAA","AAAAAAAAPPPOFCAA"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: date_dim, Attribute: d_date
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-1.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1095::oid,
+	1095::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1900-01-07","1902-01-21","1904-02-09","1905-12-31","1907-11-23","1909-11-19","1911-11-14","1913-11-16","1916-02-14","1918-02-10","1920-01-13","1922-03-11","1924-02-01","1926-03-01","1928-03-25","1930-02-26","1932-01-27","1934-01-18","1935-12-24","1937-12-18","1939-11-18","1941-10-13","1943-11-01","1945-10-18","1947-10-28","1949-09-28","1951-09-29","1953-10-09","1955-11-04","1957-09-14","1959-09-04","1961-09-08","1963-08-12","1965-06-20","1967-07-05","1969-07-11","1971-06-18","1973-07-20","1975-08-18","1977-07-26","1979-07-11","1981-08-04","1983-07-04","1985-08-27","1987-10-20","1989-09-21","1991-10-18","1993-08-30","1995-07-31","1997-07-22","1999-08-17","2001-09-22","2003-10-15","2005-10-19","2007-11-07","2009-11-16","2012-01-15","2013-12-23","2015-11-22","2017-11-29","2019-12-17","2021-11-12","2023-11-06","2025-11-15","2027-09-28","2029-09-01","2031-09-16","2033-10-09","2035-10-12","2038-01-08","2039-12-23","2041-12-30","2043-12-21","2046-01-07","2048-02-01","2049-11-18","2051-12-03","2053-12-05","2055-11-23","2058-01-03","2060-01-06","2062-01-30","2064-02-12","2066-05-11","2068-06-20","2070-05-22","2072-05-01","2074-04-03","2076-04-12","2078-04-08","2080-06-12","2082-05-15","2084-05-21","2086-05-25","2088-05-10","2090-04-06","2092-02-13","2094-01-27","2096-02-16","2098-01-12","2099-12-28"}'::date[],
+	NULL::date[],
+	NULL::date[],
+	NULL::date[],
+	NULL::date[]);
+
+--
+-- Table: date_dim, Attribute: d_month_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"979","1761","198","288","356","445","552","594","751","941","1154","1251"}'::int4[],
+	E'{"0","24","48","71","94","117","141","164","191","217","239","265","289","314","339","363","386","409","432","458","480","503","528","551","577","601","625","649","675","695","719","743","768","790","814","838","861","885","911","934","959","985","1009","1034","1059","1083","1106","1130","1152","1176","1201","1226","1252","1277","1301","1326","1351","1373","1396","1421","1444","1467","1491","1515","1537","1560","1585","1609","1633","1661","1684","1707","1731","1755","1781","1803","1827","1851","1874","1900","1923","1948","1973","1999","2024","2048","2070","2094","2117","2141","2167","2190","2213","2238","2261","2283","2306","2329","2354","2376","2399"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_week_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.14316417::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","108","215","313","412","516","620","724","841","945","1046","1158","1257","1365","1473","1574","1674","1777","1878","1981","2081","2180","2287","2390","2496","2596","2700","2806","2914","3011","3114","3219","3319","3416","3523","3628","3729","3838","3946","4048","4150","4258","4357","4470","4582","4682","4790","4887","4987","5091","5199","5308","5416","5521","5628","5733","5846","5947","6047","6153","6260","6359","6462","6568","6666","6766","6873","6980","7085","7202","7304","7409","7512","7619","7727","7821","7927","8032","8135","8245","8350","8457","8564","8681","8791","8891","8992","9093","9198","9302","9416","9516","9621","9726","9828","9928","10025","10127","10234","10333","10435"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_quarter_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	801.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0018, 0.0018, 0.0017333333}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"141","754","588"}'::int4[],
+	E'{"1","9","17","25","32","40","48","56","65","73","81","89","97","105","113","121","128","136","145","153","161","169","177","184","192","200","208","216","225","232","240","248","255","263","271","279","287","295","303","311","319","327","335","343","352","359","367","375","383","390","399","407","415","423","431","439","448","456","463","471","480","487","495","503","511","518","526","534","543","551","559","567","575","583","593","600","608","616","624","632","640","648","657","665","674","682","689","697","705","713","721","729","737","745","753","762","769","777","786","793","801"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0060666665, 0.006, 0.0058333334, 0.0057666665, 0.0056666667}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1957","2088","1929","1907","2027"}'::int4[],
+	E'{"1900","1902","1904","1905","1908","1910","1912","1914","1916","1918","1920","1922","1924","1926","1928","1931","1933","1935","1937","1939","1940","1942","1944","1946","1948","1950","1952","1954","1956","1959","1961","1963","1965","1967","1969","1970","1972","1974","1976","1978","1980","1982","1984","1986","1988","1990","1992","1994","1996","1998","2000","2002","2004","2006","2008","2010","2012","2014","2016","2017","2019","2021","2023","2025","2028","2030","2032","2034","2036","2038","2040","2042","2044","2046","2048","2050","2052","2054","2055","2058","2059","2061","2064","2066","2068","2070","2072","2073","2075","2077","2079","2081","2083","2085","2087","2090","2092","2094","2096","2098","2099"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_dow
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	8::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	7.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.14473334, 0.14406666, 0.14326666, 0.14316666, 0.14263333, 0.14153333, 0.1406}'::real[],
+	'{0.13635832}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2","3","1","4","0","6","5"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_moy
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	9::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	12.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.085533336, 0.085433334, 0.0849, 0.0846, 0.084366664, 0.08426667, 0.08393333, 0.08316667, 0.0829, 0.082, 0.08183333, 0.07706667}'::real[],
+	'{0.088353634}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","5","10","12","1","7","6","8","9","11","4","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	31.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0351, 0.0338, 0.03376667, 0.033733334, 0.033733334, 0.033633333, 0.033466667, 0.033466667, 0.03313333, 0.0331, 0.032966666, 0.032966666, 0.032966666, 0.0329, 0.032866668, 0.032766666, 0.0327, 0.0326, 0.0325, 0.0325, 0.0324, 0.032366667, 0.032333333, 0.032266665, 0.032133333, 0.032, 0.031533334, 0.030833334, 0.0305, 0.0304, 0.018566666}'::real[],
+	'{0.03590256}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"13","23","22","1","24","5","7","16","26","21","14","17","28","20","6","2","9","10","12","19","18","8","15","27","4","25","11","30","29","3","31"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_qoy
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	11::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	4.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.25106665, 0.25043333, 0.2494, 0.2491}'::real[],
+	'{0.25712454}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2","3","4","1"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_fy_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0060666665, 0.006, 0.0058333334, 0.0057666665, 0.0056666667}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1957","2088","1929","1907","2027"}'::int4[],
+	E'{"1900","1902","1904","1905","1908","1910","1912","1914","1916","1918","1920","1922","1924","1926","1928","1931","1933","1935","1937","1939","1940","1942","1944","1946","1948","1950","1952","1954","1956","1959","1961","1963","1965","1967","1969","1970","1972","1974","1976","1978","1980","1982","1984","1986","1988","1990","1992","1994","1996","1998","2000","2002","2004","2006","2008","2010","2012","2014","2016","2017","2019","2021","2023","2025","2028","2030","2032","2034","2036","2038","2040","2042","2044","2046","2048","2050","2052","2054","2055","2058","2059","2061","2064","2066","2068","2070","2072","2073","2075","2077","2079","2081","2083","2085","2087","2090","2092","2094","2096","2098","2099"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_fy_quarter_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	801.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0018, 0.0018, 0.0017333333}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"141","754","588"}'::int4[],
+	E'{"1","9","17","25","32","40","48","56","65","73","81","89","97","105","113","121","128","136","145","153","161","169","177","184","192","200","208","216","225","232","240","248","255","263","271","279","287","295","303","311","319","327","335","343","352","359","367","375","383","390","399","407","415","423","431","439","448","456","463","471","480","487","495","503","511","518","526","534","543","551","559","567","575","583","593","600","608","616","624","632","640","648","657","665","674","682","689","697","705","713","721","729","737","745","753","762","769","777","786","793","801"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_fy_week_seq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	14::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.14316417::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1","108","215","313","412","516","620","724","841","945","1046","1158","1257","1365","1473","1574","1674","1777","1878","1981","2081","2180","2287","2390","2496","2596","2700","2806","2914","3011","3114","3219","3319","3416","3523","3628","3729","3838","3946","4048","4150","4258","4357","4470","4582","4682","4790","4887","4987","5091","5199","5308","5416","5521","5628","5733","5846","5947","6047","6153","6260","6359","6462","6568","6666","6766","6873","6980","7085","7202","7304","7409","7512","7619","7727","7821","7927","8032","8135","8245","8350","8457","8564","8681","8791","8891","8992","9093","9198","9302","9416","9516","9621","9726","9828","9928","10025","10127","10234","10333","10435"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_day_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	15::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	7.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.14473334, 0.14406666, 0.14326666, 0.14316666, 0.14263333, 0.14153333, 0.1406}'::real[],
+	'{0.14524722}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"Tuesday","Wednesday","Monday","Thursday","Sunday","Saturday","Friday"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: date_dim, Attribute: d_quarter_name
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	16::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	800.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	98::oid,
+	664::oid,
+	664::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	'{0.0017666667, 0.0016666667, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334, 0.0016333334}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2088Q2","1957Q2","1907Q3","1937Q1","2049Q2","2051Q2","2055Q2","2096Q4"}'::varchar[],
+	E'{"1900Q1","1902Q1","1904Q1","1905Q4","1908Q1","1910Q1","1912Q1","1913Q4","1916Q1","1918Q1","1920Q1","1922Q1","1924Q1","1926Q1","1928Q1","1930Q1","1931Q4","1933Q4","1935Q4","1938Q1","1940Q1","1941Q4","1943Q4","1945Q4","1947Q4","1949Q3","1951Q3","1953Q3","1955Q4","1957Q4","1959Q4","1961Q4","1963Q4","1965Q3","1967Q3","1969Q3","1971Q3","1973Q3","1975Q3","1977Q3","1979Q2","1981Q2","1983Q2","1985Q2","1987Q3","1989Q3","1991Q3","1993Q2","1995Q2","1997Q1","1999Q2","2001Q2","2003Q2","2005Q2","2007Q2","2009Q2","2011Q3","2013Q2","2015Q2","2017Q2","2019Q2","2021Q1","2023Q1","2025Q1","2027Q1","2028Q4","2030Q4","2032Q4","2034Q4","2037Q1","2039Q1","2041Q1","2043Q1","2045Q1","2046Q4","2049Q1","2051Q1","2053Q3","2055Q4","2057Q4","2059Q4","2061Q4","2063Q4","2065Q4","2068Q1","2070Q1","2072Q1","2073Q4","2075Q4","2077Q4","2079Q4","2081Q4","2083Q4","2085Q4","2087Q4","2090Q1","2091Q4","2093Q4","2095Q4","2098Q1","2099Q4"}'::varchar[],
+	NULL::varchar[],
+	NULL::varchar[],
+	NULL::varchar[]);
+
+--
+-- Table: date_dim, Attribute: d_holiday
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9912, 0.0088}'::real[],
+	'{0.9816509}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: date_dim, Attribute: d_weekend
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.71786666, 0.28213334}'::real[],
+	'{0.59107685}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: date_dim, Attribute: d_following_holiday
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9918333, 0.008166667}'::real[],
+	'{0.98435473}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: date_dim, Attribute: d_first_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2444818","2468620","2421046","2423786","2425856","2428566","2431822","2433099","2437878","2443661","2450144","2453097"}'::int4[],
+	E'{"2415021","2415751","2416481","2417181","2417881","2418581","2419311","2420012","2420833","2421626","2422294","2423087","2423817","2424576","2425338","2426068","2426768","2427470","2428169","2428959","2429630","2430330","2431091","2431791","2432583","2433314","2434044","2434775","2435565","2436174","2436904","2437635","2438396","2439066","2439796","2440527","2441226","2441957","2442748","2443449","2444209","2445002","2445732","2446491","2447253","2447983","2448683","2449413","2450084","2450815","2451576","2452335","2453127","2453888","2454619","2455379","2456141","2456810","2457510","2458271","2458971","2459671","2460402","2461132","2461803","2462503","2463264","2463995","2464725","2465576","2466276","2466976","2467707","2468437","2469229","2469898","2470629","2471359","2472059","2472850","2473551","2474311","2475073","2475864","2476626","2477356","2478025","2478755","2479456","2480186","2480978","2481677","2482378","2483138","2483839","2484508","2485208","2485910","2486669","2487340","2488039"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_last_dom
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	21::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	2400.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00073333335, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666, 0.00066666666}'::real[],
+	NULL::real[],
+	'{0.99998605}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2445029","2468892","2421227","2423785","2426098","2428596","2431821","2433279","2438089","2443811","2450203","2453187"}'::int4[],
+	E'{"2415020","2415930","2416661","2417332","2418061","2418734","2419522","2420195","2420984","2421834","2422505","2423236","2424027","2424756","2425489","2426279","2426889","2427619","2428350","2429139","2429810","2430481","2431271","2432002","2432732","2433463","2434194","2434983","2435715","2436385","2437055","2437786","2438576","2439244","2439977","2440705","2441437","2442166","2442899","2443627","2444360","2445151","2445881","2446671","2447404","2448132","2448864","2449534","2450265","2450995","2451786","2452518","2453308","2454039","2454770","2455559","2456293","2456961","2457691","2458422","2459152","2459882","2460553","2461284","2461953","2462683","2463414","2464203","2464935","2465727","2466457","2467128","2467858","2468648","2469380","2470050","2470780","2471511","2472240","2473031","2473702","2474492","2475224","2476016","2476807","2477477","2478206","2478935","2479607","2480337","2481130","2481857","2482529","2483318","2483990","2484660","2485389","2486059","2486790","2487519","2488372"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_same_day_ly
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	22::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.9988364::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2414662","2415406","2416155","2416846","2417538","2418265","2418990","2419723","2420543","2421270","2421972","2422760","2423452","2424211","2424965","2425669","2426369","2427091","2427796","2428521","2429221","2429916","2430665","2431382","2432122","2432823","2433554","2434295","2435051","2435731","2436451","2437186","2437889","2438567","2439312","2440049","2440756","2441519","2442278","2442986","2443701","2444456","2445155","2445940","2446724","2447426","2448183","2448865","2449565","2450287","2451043","2451810","2452563","2453298","2454047","2454787","2455577","2456285","2456984","2457722","2458470","2459166","2459890","2460630","2461312","2462016","2462761","2463515","2464248","2465067","2465781","2466519","2467240","2467988","2468743","2469399","2470144","2470877","2471595","2472367","2473100","2473855","2474598","2475417","2476187","2476889","2477598","2478301","2479040","2479767","2480562","2481265","2482001","2482736","2483451","2484148","2484826","2485540","2486290","2486986","2487701"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_same_day_lq
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	23::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	-0.99268985::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2414935","2415679","2416428","2417119","2417811","2418538","2419263","2419996","2420816","2421543","2422245","2423033","2423725","2424484","2425239","2425942","2426642","2427364","2428069","2428794","2429494","2430189","2430938","2431655","2432395","2433097","2433828","2434568","2435324","2436005","2436725","2437460","2438163","2438842","2439586","2440323","2441031","2441793","2442552","2443260","2443975","2444730","2445429","2446214","2446997","2447700","2448456","2449139","2449839","2450561","2451317","2452084","2452836","2453571","2454320","2455060","2455850","2456558","2457257","2457995","2458743","2459439","2460163","2460903","2461586","2462290","2463035","2463788","2464521","2465340","2466054","2466792","2467513","2468261","2469016","2469672","2470417","2471150","2471868","2472640","2473373","2474128","2474871","2475692","2476462","2477164","2477873","2478576","2479315","2480042","2480837","2481540","2482276","2483011","2483726","2484423","2485099","2485813","2486563","2487259","2487974"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: date_dim, Attribute: d_current_day
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	24::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	1.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{1.0}'::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: date_dim, Attribute: d_current_week
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	25::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	1.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{1.0}'::real[],
+	'{1.0}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: date_dim, Attribute: d_current_month
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	26::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.9996, 0.0004}'::real[],
+	'{0.9994385}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: date_dim, Attribute: d_current_quarter
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	27::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.99873334, 0.0012666667}'::real[],
+	'{0.9982279}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: date_dim, Attribute: d_current_year
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.date_dim'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.date_dim'::regclass,
+	28::smallint,
+	False::boolean,
+	0.0::real,
+	2::integer,
+	2.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1054::oid,
+	1058::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	100::oid,
+	100::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.99543333, 0.0045666667}'::real[],
+	'{0.99365747}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"N","Y"}'::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[],
+	NULL::bpchar[]);
+
+--
+-- Table: store_sales, Attribute: ss_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.044::real,
+	4::integer,
+	1823.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0015, 0.0014666667, 0.0014666667, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011}'::real[],
+	NULL::real[],
+	'{-0.0022345192}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451534","2452228","2451129","2452240","2451139","2451161","2451546","2452258","2452621","2452589","2452600","2452625","2451137","2451148","2451181","2451896","2452251","2452260","2451178","2451528","2451904","2451909","2452242","2452250","2452628","2452642","2451121","2451134","2451174","2451496","2451864","2451872","2451879","2451910","2452257","2452271","2452592","2451112","2451149","2451525","2451865","2452232","2452277","2452598","2452640","2451127","2451136","2451153","2451177","2451505","2451541","2451851","2451862","2452230","2452238","2452266","2452607","2452609","2452627","2452641","2451142","2451158","2451160","2451491","2451868","2451885","2451887","2452248","2452601","2452606","2452634","2451123","2451125","2451133","2451138","2451144","2451506","2451509","2451529","2451884","2451898","2452219","2452221","2452225","2452246","2452256","2452274","2452597","2452602","2452614","2452623","2451126","2451141","2451154","2451493","2451494","2451497","2451513","2451516","2451526"}'::int4[],
+	E'{"2450816","2450843","2450874","2450900","2450926","2450953","2450982","2451010","2451033","2451045","2451057","2451070","2451082","2451095","2451107","2451119","2451143","2451157","2451169","2451184","2451213","2451241","2451267","2451294","2451322","2451349","2451372","2451398","2451410","2451423","2451435","2451448","2451460","2451472","2451485","2451499","2451511","2451522","2451536","2451545","2451572","2451600","2451626","2451650","2451679","2451703","2451734","2451760","2451772","2451783","2451795","2451806","2451818","2451830","2451843","2451855","2451867","2451877","2451890","2451901","2451916","2451945","2451974","2451999","2452025","2452053","2452081","2452109","2452129","2452140","2452151","2452163","2452173","2452185","2452195","2452207","2452218","2452233","2452245","2452262","2452275","2452301","2452329","2452358","2452385","2452413","2452437","2452464","2452492","2452504","2452516","2452528","2452540","2452553","2452566","2452578","2452587","2452604","2452617","2452630","2452639"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.04476667::real,
+	4::integer,
+	42441.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00023333334}'::real[],
+	NULL::real[],
+	'{-0.0029273503}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"53826"}'::int4[],
+	E'{"28802","29544","30512","31386","32305","32816","33250","33722","34146","34599","35052","35511","35964","36268","36566","36863","37172","37485","37828","38121","38401","38684","38983","39275","39560","40075","40557","41068","41530","42041","42524","43017","43474","43957","44423","44910","45389","45848","46343","46755","47169","47614","48001","48403","48805","49181","49610","50080","50477","50759","51068","51365","51655","51931","52218","52524","52799","53101","53418","53732","54105","54884","55780","56713","57597","58420","59372","60285","61221","61506","61795","62076","62374","62681","62967","63254","63580","63859","64159","64441","64733","65144","65590","66065","66523","66923","67434","67869","68271","68722","69211","69656","70119","70604","71096","71498","71944","72815","73678","74590","75597"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	25013.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0003, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.000308136}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"18140","1183","1921","10183","13837","16333","22268","26593","27325","2035","3793","4081","4525","5833","8575","9103","9211","9703","10507","11761","12685","13513","14792","15871","15907","15998","17095","17455","19111","20875","21085","21457","22741","24703","24817","26851","26971","27337","27709","27919"}'::int4[],
+	E'{"1","260","575","888","1162","1441","1707","1975","2264","2523","2847","3115","3368","3650","3951","4214","4523","4827","5071","5329","5587","5894","6181","6496","6776","7024","7312","7591","7855","8113","8398","8682","8957","9245","9530","9823","10114","10405","10699","10959","11247","11525","11781","12061","12360","12613","12889","13190","13453","13731","14017","14294","14575","14877","15152","15457","15733","16015","16291","16579","16861","17155","17437","17702","17984","18247","18519","18783","19092","19380","19642","19943","20221","20467","20723","20995","21311","21596","21870","22136","22427","22700","22970","23261","23533","23805","24082","24344","24628","24932","25220","25519","25800","26063","26331","26591","26879","27151","27422","27705","27999"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.043866668::real,
+	4::integer,
+	1787614.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.002228295}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"17","21786","42607","63355","81931","104851","124188","143682","164679","186368","206598","227797","248026","266122","287862","306345","328795","349339","369849","390012","413705","437205","457764","479231","501632","523614","545267","564653","584588","603322","628035","648054","668479","689551","709515","730333","751340","771680","793540","814237","835667","857070","877179","899789","920597","942338","962762","984964","1006607","1027347","1048659","1070611","1092247","1111106","1131352","1152543","1173197","1192658","1215327","1237528","1259725","1279865","1300200","1324729","1344982","1367029","1388243","1408781","1430858","1451533","1472783","1491853","1512116","1533678","1554248","1577279","1600025","1621228","1641577","1663202","1683219","1704339","1723327","1742744","1763526","1783848","1805196","1826090","1845634","1865356","1885579","1905861","1925869","1946542","1969323","1991449","2012218","2035047","2058343","2079610","2099931"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.044433333::real,
+	4::integer,
+	1889709.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.00950842}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"30","17849","37904","56865","76186","96917","115542","134186","152099","172680","192783","211817","229921","248171","269276","287913","306855","326795","345207","365388","382970","404387","425118","443738","463882","483064","501977","520761","538035","556646","576673","595274","615470","633068","652437","671351","689763","709263","728426","748174","767474","786428","805372","823760","843936","863306","880648","898664","917543","936304","956226","976161","994176","1014253","1033333","1051646","1070542","1089363","1107670","1128460","1147427","1166875","1187090","1205515","1224744","1244031","1263305","1283771","1301649","1319446","1337051","1356966","1373991","1393391","1412686","1433469","1453024","1470147","1488228","1507316","1525606","1543945","1563428","1582932","1601688","1622584","1644497","1663783","1684160","1704534","1724056","1744635","1764898","1783571","1802036","1823303","1844256","1864851","1883445","1902230","1920718"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.0444::real,
+	4::integer,
+	7203.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.0004}'::real[],
+	NULL::real[],
+	'{0.0009649638}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3964","3629"}'::int4[],
+	E'{"1","77","150","224","302","367","433","498","566","636","710","784","865","941","1013","1088","1170","1244","1323","1388","1461","1536","1606","1672","1735","1809","1876","1952","2024","2098","2172","2244","2307","2379","2456","2534","2602","2673","2742","2818","2892","2971","3037","3111","3186","3257","3327","3396","3472","3543","3613","3687","3768","3845","3910","3981","4050","4116","4188","4251","4325","4393","4463","4541","4613","4685","4755","4830","4903","4980","5052","5126","5195","5262","5335","5402","5469","5534","5604","5673","5747","5823","5891","5960","6032","6112","6185","6259","6335","6407","6479","6552","6629","6696","6762","6836","6906","6982","7054","7128","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0441::real,
+	4::integer,
+	1054173.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.009495346}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"24","10492","20174","30656","40366","50491","61387","71217","82320","93176","103530","113999","124922","135328","145700","156238","168283","179107","189968","200308","210858","220931","230791","240825","252093","261999","273446","284421","294475","304990","315199","325963","336804","346964","358483","369478","379508","390126","400826","411839","423548","433723","444375","455042","465928","476227","487109","496816","507138","516971","528312","538979","549252","559578","569918","580340","590219","600402","612301","623316","633219","642905","653631","665000","674723","685655","695157","706546","716090","726191","735744","745583","756508","767077","776705","787088","798590","810484","820976","832448","843248","854009","864628","873989","883994","894860","905009","916085","924744","935185","945700","956390","965553","975624","987328","997741","1008137","1018620","1029054","1039248","1049982"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_store_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.045766667::real,
+	4::integer,
+	35.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.029033333, 0.0287, 0.028266666, 0.0282, 0.028066667, 0.028, 0.027966667, 0.027833333, 0.027766667, 0.027666667, 0.027666667, 0.0276, 0.0276, 0.0275, 0.027466666, 0.027433334, 0.027433334, 0.027366666, 0.027366666, 0.0273, 0.027233334, 0.027133333, 0.027066667, 0.027033333, 0.0269, 0.0269, 0.026833333, 0.026733333, 0.0267, 0.026633333, 0.026333334, 0.026066666, 0.026066666, 0.025666667, 0.0247}'::real[],
+	'{0.025343372}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"19","34","2","61","62","7","32","13","52","4","38","55","56","28","49","1","37","16","67","50","31","64","22","68","20","58","26","46","14","10","25","8","43","40","44"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.04413333::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0036666666, 0.0036666666, 0.0036333334, 0.0036333334, 0.0035333333, 0.0035, 0.0033666666, 0.0033666666}'::real[],
+	NULL::real[],
+	'{0.009066247}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"37","139","81","228","350","223","293","304"}'::int4[],
+	E'{"1","4","7","11","14","18","21","25","28","32","35","40","43","47","50","54","57","61","64","68","71","75","78","83","86","89","93","96","100","103","107","110","114","118","121","124","128","132","136","140","143","147","150","153","157","160","163","166","170","174","177","180","183","187","190","194","197","201","204","208","211","214","218","221","226","230","234","237","241","245","249","252","256","259","262","266","270","274","277","280","284","288","291","296","300","303","308","311","315","319","322","326","329","332","336","339","343","346","351","354","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_ticket_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	135837840.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.06078869}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"813","1375913","2727072","3857212","5016369","6156850","7386542","8690070","9789582","11044399","12265523","13510184","14717978","15785339","16975428","18197314","19442297","20772509","21903183","23100195","24331207","25452464","26678265","27922018","29143270","30353305","31671176","32953618","34109365","35253703","36385377","37447554","38717221","39999948","41154706","42417922","43652601","44968753","46342094","47459202","48642561","49683656","50998261","52288399","53487733","54680281","55833024","57017267","58237604","59472084","60696465","61996614","63179509","64401202","65651723","66926244","68011538","69269328","70341852","71528693","72651930","73713093","74849544","75928064","77033905","78162650","79324991","80585670","81761102","82828934","84032244","85334532","86494728","87598137","88860063","89922519","91069374","92276218","93495454","94722691","95959052","97146341","98399034","99566170","100766327","101898400","103223735","104414548","105602699","106825065","108029779","109174799","110420663","111591894","112817588","113975952","115181211","116399324","117672963","118888721","119999864"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+
+--
+-- Table: store_sales, Attribute: ss_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.045466665::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010833333, 0.010766666, 0.010766666, 0.010766666, 0.010633334, 0.0106, 0.010566667, 0.0104, 0.0104, 0.0104, 0.0104, 0.010366667, 0.010366667, 0.010366667, 0.0103, 0.010266666, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.0099, 0.009866667, 0.009833333, 0.0098, 0.009766666, 0.009766666, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.009666666, 0.009666666, 0.009666666, 0.009633333, 0.0096, 0.0096, 0.0096, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.009466667, 0.009433334, 0.0094, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009366667, 0.009333333, 0.009266667, 0.0092, 0.0092, 0.0092, 0.009133333, 0.009133333, 0.009133333, 0.009133333, 0.0091, 0.0091, 0.0091, 0.0091, 0.0090666665, 0.0090666665, 0.0090333335, 0.009, 0.008966667, 0.008933334, 0.0089, 0.0089, 0.008833333, 0.008666666, 0.008633333, 0.0086, 0.008566666, 0.0084, 0.0084, 0.008366667, 0.008366667, 0.008233333, 0.008233333, 0.0081, 0.0079333335}'::real[],
+	'{0.0045824465}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"29","7","10","21","27","92","86","5","55","71","81","33","79","93","6","99","40","39","57","32","53","73","84","97","85","90","38","91","12","69","76","41","23","22","37","45","63","44","61","88","100","20","98","26","49","67","14","18","78","87","95","3","31","46","15","36","58","42","64","11","13","50","59","60","68","70","19","54","25","35","66","24","52","56","83","4","16","47","74","80","96","34","51","75","82","30","77","65","28","1","48","9","2","72","43","94","17","89","62","8"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: store_sales, Attribute: ss_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.0435::real,
+	6::integer,
+	9909.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.004772207}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"32.94","43.22","71.68","76.26","91.35","96.72"}'::numeric[],
+	E'{"1.00","1.97","3.01","4.10","5.06","6.04","7.00","8.01","9.01","9.96","10.88","11.91","12.82","13.84","14.95","15.91","16.85","17.91","18.92","19.94","20.89","22.01","23.08","24.06","25.02","26.03","26.96","27.89","28.91","29.93","30.90","31.93","32.96","33.91","34.98","35.96","36.94","37.90","38.81","39.70","40.61","41.67","42.74","43.73","44.66","45.63","46.59","47.53","48.55","49.54","50.48","51.56","52.62","53.42","54.39","55.28","56.33","57.36","58.37","59.23","60.15","61.15","62.19","63.21","64.16","65.22","66.31","67.27","68.29","69.31","70.23","71.24","72.24","73.25","74.22","75.12","76.09","77.07","78.06","79.07","80.05","81.10","82.08","83.09","84.06","85.12","86.17","87.18","88.23","89.18","90.13","91.20","92.19","93.19","94.14","95.07","95.98","96.91","97.92","98.92","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.0447::real,
+	6::integer,
+	16808.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.0003, 0.0003, 0.0003, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667, 0.00026666667}'::real[],
+	NULL::real[],
+	'{-0.00067186705}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"27.24","7.02","96.36","105.63","17.20","33.52","39.04","40.68","48.96","59.81","68.69","76.24","87.92","99.16"}'::numeric[],
+	E'{"1.00","2.89","4.28","5.87","7.42","8.80","10.10","11.63","12.99","14.42","15.98","17.40","18.87","20.21","21.63","23.04","24.51","25.90","27.36","28.81","30.36","31.81","33.34","34.72","36.09","37.52","38.95","40.43","41.88","43.30","44.81","46.40","47.73","49.18","50.55","52.07","53.40","54.73","56.17","57.55","58.87","60.19","61.77","63.07","64.57","66.02","67.39","68.92","70.40","72.03","73.45","74.87","76.26","77.73","79.03","80.35","81.92","83.32","84.72","86.21","87.59","88.96","90.45","91.78","93.16","94.66","96.19","97.64","98.92","100.52","101.88","103.28","104.72","106.11","107.69","109.21","110.85","112.64","114.53","116.30","118.00","119.87","121.88","123.90","126.04","128.34","130.66","133.07","135.58","137.97","140.53","143.39","146.70","149.95","153.65","157.50","161.61","166.70","172.67","180.23","199.18"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.043866668::real,
+	6::integer,
+	11406.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.008633333, 0.00063333334, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667}'::real[],
+	NULL::real[],
+	'{0.00037045707}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","5.56","1.37","1.33","1.74","3.53","1.67","3.48","0.51","5.54","6.41","0.82","1.50","1.72","1.83","1.99","2.02","2.25","3.32","3.84","5.66","12.86","0.97","0.98","1.28","1.62","1.65","1.90","2.00","3.08","4.40","5.92","8.40","8.74","11.16","15.51","0.44","0.57","0.65","0.68","0.75","0.94","1.17","1.20","1.22","1.29","1.32","1.35","1.36","2.08","2.14","2.50","2.78","2.82","2.83","3.09","3.64","3.73","3.82","4.51","4.55","5.22","5.43","6.63","6.69","6.90","7.61","7.63","8.09","9.03","9.09","9.44","9.63","11.42","15.16","0.11","0.21","0.60","0.63","0.66","0.93","1.06","1.10","1.16","1.18","1.25","1.42","1.47","1.76","2.09","2.16","2.18","2.60","2.68","2.74","3.11","3.18","3.26","3.27","3.31"}'::numeric[],
+	E'{"0.01","0.50","1.00","1.49","2.01","2.44","2.89","3.38","3.80","4.27","4.73","5.13","5.65","6.12","6.56","7.05","7.48","8.02","8.51","9.01","9.57","10.13","10.69","11.20","11.77","12.34","12.88","13.44","14.06","14.61","15.26","15.88","16.54","17.11","17.71","18.35","19.04","19.73","20.46","21.14","21.86","22.67","23.36","24.08","24.87","25.77","26.56","27.30","28.12","28.99","29.85","30.74","31.71","32.63","33.58","34.48","35.42","36.45","37.56","38.53","39.65","40.76","41.86","43.05","44.18","45.37","46.57","47.77","49.08","50.38","51.70","53.17","54.47","55.96","57.34","58.84","60.52","62.13","63.82","65.63","67.20","69.11","71.20","73.12","75.38","77.56","79.86","82.27","85.02","87.88","90.64","93.54","97.22","101.21","105.84","110.61","116.50","123.46","132.30","145.64","193.12"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.045333333::real,
+	3::integer,
+	6760.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.7661}'::real[],
+	NULL::real[],
+	'{0.6438912}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","1.34","3.72","6.09","8.37","10.99","14.04","16.95","19.44","22.34","24.81","28.43","32.34","35.35","39.39","44.25","49.00","54.54","59.98","65.63","71.63","78.32","84.28","90.37","96.62","104.19","111.32","118.10","126.42","136.18","143.96","153.17","162.16","171.42","182.95","192.33","201.85","211.36","222.74","236.09","252.09","266.81","278.33","292.76","310.46","324.68","340.74","359.05","380.26","398.53","416.30","434.21","455.13","474.14","491.53","516.67","538.59","556.85","586.81","610.95","636.53","667.62","692.38","723.55","756.71","796.95","834.72","868.00","906.95","948.96","993.70","1033.87","1089.17","1132.81","1184.95","1228.29","1281.16","1347.98","1408.84","1480.92","1572.04","1643.21","1731.83","1830.90","1925.89","2022.22","2130.03","2281.99","2428.33","2573.26","2717.71","2913.34","3146.60","3438.96","3740.97","4126.94","4666.03","5274.03","6096.32","7082.14","12922.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.045333333::real,
+	6::integer,
+	119811.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0087, 0.00026666667, 0.00023333334, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.00332316}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","25.20","10.92","36.96","469.20"}'::numeric[],
+	E'{"0.27","8.61","16.80","24.36","33.50","42.56","50.49","61.05","71.40","82.38","93.84","106.14","118.17","131.32","144.00","157.78","172.64","188.16","203.84","220.80","236.84","255.08","271.45","288.48","308.34","327.28","345.73","367.84","387.02","408.00","432.63","453.75","480.22","504.24","530.66","558.80","588.24","616.30","644.76","674.50","704.16","734.58","766.92","802.75","838.24","871.04","910.52","945.76","983.29","1024.86","1063.30","1102.08","1147.38","1190.70","1237.47","1284.12","1331.00","1387.50","1440.24","1503.28","1554.80","1610.95","1676.49","1742.20","1808.00","1867.45","1933.08","2001.48","2087.67","2170.21","2251.53","2342.40","2428.20","2526.36","2617.12","2724.48","2827.24","2944.32","3046.35","3173.12","3294.25","3442.56","3588.09","3734.64","3902.60","4072.80","4240.57","4428.00","4642.32","4906.57","5147.50","5431.50","5743.00","6100.32","6469.35","6901.32","7510.60","8168.50","9050.41","10628.04","17738.88"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.044966668::real,
+	6::integer,
+	207111.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0051949597}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.08","33.20","56.42","79.36","97.98","121.59","144.80","167.70","191.00","218.46","244.03","270.55","299.76","327.80","355.32","384.30","414.52","442.20","475.83","508.95","544.25","578.25","612.36","650.43","688.35","727.92","765.38","803.60","837.20","874.56","916.09","960.94","1003.45","1044.66","1092.25","1140.48","1185.60","1238.61","1289.29","1337.70","1390.55","1444.40","1496.49","1548.16","1605.87","1662.12","1713.60","1764.63","1817.76","1875.30","1937.05","1999.50","2060.11","2128.60","2196.21","2259.76","2326.32","2396.25","2465.40","2539.24","2614.56","2685.00","2761.38","2840.04","2925.35","3015.87","3097.05","3179.52","3263.77","3343.96","3431.34","3528.32","3624.37","3716.85","3814.10","3920.27","4022.88","4127.23","4243.63","4356.48","4476.15","4597.05","4738.23","4865.40","5000.80","5143.91","5291.12","5444.00","5603.10","5773.32","5947.83","6145.55","6364.80","6594.77","6830.75","7087.20","7404.30","7745.95","8124.04","8664.15","9992.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.044166666::real,
+	7::integer,
+	281020.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.005409235}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.37","48.18","81.41","111.00","143.56","176.12","208.48","244.00","277.10","312.00","354.24","397.50","432.81","473.83","514.15","559.74","605.17","653.04","703.08","749.70","793.80","843.72","897.00","950.04","1005.84","1059.20","1111.86","1168.53","1220.78","1273.14","1335.78","1395.80","1464.48","1525.11","1588.62","1662.60","1733.62","1808.00","1876.80","1943.17","2017.47","2095.83","2176.23","2255.84","2332.80","2416.80","2500.54","2583.36","2660.40","2751.20","2841.54","2936.19","3028.06","3126.61","3219.72","3316.14","3407.04","3508.20","3613.50","3714.04","3820.32","3927.70","4045.88","4164.11","4286.55","4404.60","4526.64","4639.62","4772.80","4907.30","5047.20","5174.40","5313.60","5456.64","5608.32","5770.80","5925.96","6098.88","6277.32","6458.50","6637.23","6822.90","7017.40","7216.44","7423.52","7672.96","7894.12","8146.60","8427.82","8709.95","8969.40","9303.91","9642.60","10018.92","10424.34","10892.97","11484.75","12242.88","13182.40","14456.88","19415.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0449::real,
+	6::integer,
+	18471.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10456666, 0.0009, 0.00073333335, 0.00073333335, 0.0007, 0.0007, 0.00066666666, 0.00066666666, 0.00066666666, 0.00063333334, 0.00063333334, 0.00063333334, 0.00063333334, 0.00063333334, 0.0006, 0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.014879999}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.01","0.17","0.65","0.13","0.29","0.05","0.08","0.36","0.10","0.27","0.28","0.40","0.45","0.19","0.30","2.24","0.15","0.18","0.21","0.41","3.94","0.14","0.46","0.47","0.52","0.88","1.04","1.51","1.66","0.02","0.12","0.16","0.20","0.25","0.34","0.77","0.96","0.98","1.29","1.92","3.80","0.11","0.32","0.42","0.43","0.51","0.68","0.99","1.05","1.22","1.31","1.36","1.54","1.80","1.90","2.04","2.10","3.32","0.09","0.22","0.44","0.50","0.58","0.66","0.94","1.13","1.15","1.68","2.74","3.78","4.08","8.96","0.04","0.07","0.23","0.33","0.37","0.59","0.69","0.78","0.81","0.82","0.85","0.91","1.08","1.12","1.18","1.26","1.32","1.35","1.50","1.59","1.64","1.76","1.79","2.26","2.83","3.35","3.43"}'::numeric[],
+	E'{"0.03","0.74","1.20","1.60","2.01","2.39","2.72","3.10","3.50","3.90","4.30","4.72","5.16","5.57","6.04","6.50","7.03","7.58","8.18","8.74","9.36","9.98","10.62","11.27","12.01","12.69","13.39","14.17","14.94","15.73","16.52","17.47","18.36","19.22","20.18","21.05","22.15","23.17","24.17","25.34","26.50","27.68","28.91","30.07","31.25","32.68","34.20","35.59","37.26","38.92","40.45","42.33","44.13","45.79","47.82","49.94","51.93","54.20","56.44","58.78","61.05","63.96","66.70","69.47","72.63","75.56","78.68","82.11","85.62","89.37","92.68","96.79","100.78","105.67","110.09","114.97","120.82","125.97","132.10","138.64","145.86","152.49","159.87","168.58","177.12","186.59","196.23","208.25","220.55","235.45","251.96","267.62","288.25","309.58","335.43","364.88","405.05","457.89","534.84","648.41","1390.48"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.045333333::real,
+	3::integer,
+	6760.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.7661}'::real[],
+	NULL::real[],
+	'{0.6438912}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","1.34","3.72","6.09","8.37","10.99","14.04","16.95","19.44","22.34","24.81","28.43","32.34","35.35","39.39","44.25","49.00","54.54","59.98","65.63","71.63","78.32","84.28","90.37","96.62","104.19","111.32","118.10","126.42","136.18","143.96","153.17","162.16","171.42","182.95","192.33","201.85","211.36","222.74","236.09","252.09","266.81","278.33","292.76","310.46","324.68","340.74","359.05","380.26","398.53","416.30","434.21","455.13","474.14","491.53","516.67","538.59","556.85","586.81","610.95","636.53","667.62","692.38","723.55","756.71","796.95","834.72","868.00","906.95","948.96","993.70","1033.87","1089.17","1132.81","1184.95","1228.29","1281.16","1347.98","1408.84","1480.92","1572.04","1643.21","1731.83","1830.90","1925.89","2022.22","2130.03","2281.99","2428.33","2573.26","2717.71","2913.34","3146.60","3438.96","3740.97","4126.94","4666.03","5274.03","6096.32","7082.14","12922.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.045033332::real,
+	6::integer,
+	130231.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010733333}'::real[],
+	NULL::real[],
+	'{-0.003218649}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.04","5.14","10.18","16.30","21.88","28.60","36.24","44.10","51.49","60.06","68.70","77.69","87.72","97.58","108.51","119.68","131.13","142.74","154.70","167.30","180.87","194.66","210.49","225.68","242.00","258.44","273.14","288.96","307.68","325.44","342.37","363.00","380.16","400.43","423.00","444.15","468.72","492.00","519.68","544.00","572.40","600.96","629.30","656.70","686.28","718.06","749.00","782.88","817.80","854.72","893.10","930.83","967.59","1008.80","1050.42","1093.00","1135.33","1181.62","1229.40","1280.52","1326.28","1383.48","1439.88","1500.29","1556.02","1618.37","1682.20","1751.04","1818.15","1884.06","1955.88","2033.45","2126.88","2215.62","2305.35","2400.96","2495.65","2607.80","2725.97","2838.84","2961.00","3081.25","3215.94","3363.36","3525.20","3685.50","3870.99","4065.12","4264.36","4472.25","4715.82","5020.00","5297.49","5657.44","6056.08","6494.87","7012.56","7766.28","8648.46","10058.40","17738.88"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.04476667::real,
+	6::integer,
+	216373.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.010666667, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0055286656}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","32.50"}'::numeric[],
+	E'{"0.04","5.34","10.64","16.84","22.78","29.76","37.54","45.88","53.55","63.01","71.53","81.22","91.04","101.48","113.40","124.84","136.79","148.47","160.74","174.09","189.27","202.53","219.10","235.75","252.63","270.30","284.97","302.27","321.39","339.01","359.73","379.11","399.51","420.01","443.22","467.14","491.68","517.50","543.21","569.64","598.99","628.01","657.79","689.15","718.44","753.62","785.05","818.47","856.64","895.72","934.06","972.23","1014.07","1056.37","1098.32","1143.65","1191.49","1240.73","1292.04","1341.11","1393.32","1450.62","1510.08","1566.98","1629.98","1689.68","1763.67","1840.23","1903.93","1975.54","2049.22","2126.92","2226.03","2316.79","2410.56","2506.52","2616.49","2727.26","2849.57","2970.38","3085.20","3217.68","3363.97","3517.49","3689.45","3858.39","4052.56","4254.30","4465.59","4690.92","4962.17","5234.70","5542.48","5925.61","6319.65","6827.42","7372.02","8128.19","9079.02","10544.85","18803.21"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: store_sales, Attribute: ss_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.store_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.store_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.043933332::real,
+	6::integer,
+	164410.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00036666667, 0.0002}'::real[],
+	NULL::real[],
+	'{0.0071685645}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","-86.40"}'::numeric[],
+	E'{"-9756.88","-6515.41","-5668.87","-5123.34","-4724.97","-4368.00","-4064.06","-3808.62","-3576.47","-3373.46","-3174.31","-3012.09","-2859.44","-2725.70","-2593.63","-2458.24","-2337.30","-2214.00","-2107.00","-2001.96","-1904.70","-1816.40","-1727.86","-1642.55","-1561.33","-1494.48","-1420.30","-1356.48","-1294.21","-1224.96","-1162.20","-1101.58","-1048.46","-992.62","-942.72","-898.95","-853.76","-806.47","-765.12","-727.68","-693.00","-655.50","-623.42","-589.44","-557.05","-526.40","-495.72","-462.77","-435.73","-406.64","-378.40","-353.30","-328.97","-301.50","-278.13","-255.75","-233.87","-214.09","-195.96","-178.34","-162.31","-147.92","-132.24","-117.78","-104.00","-89.56","-76.54","-65.12","-54.20","-43.00","-32.46","-23.28","-14.28","-7.00","0.39","9.24","20.91","35.88","53.56","74.70","99.36","127.98","158.51","193.25","233.24","281.96","341.00","404.32","478.86","563.93","661.20","773.80","891.78","1050.06","1209.00","1410.30","1700.48","2034.00","2537.48","3429.36","8262.72"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_sold_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=1;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	1::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1823.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0016, 0.0016, 0.0015333333, 0.0015, 0.0015, 0.0015, 0.0014666667, 0.0014666667, 0.0014333334, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013666666, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013333333, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0013, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011666666}'::real[],
+	NULL::real[],
+	'{-0.0030525422}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451524","2452255","2452593","2451546","2452243","2452632","2451179","2451491","2451545","2451176","2451487","2451860","2451866","2452271","2452626","2451154","2451534","2451536","2452228","2452236","2452592","2452603","2451135","2451495","2451871","2451887","2451901","2451910","2452267","2452605","2451053","2451121","2451177","2451537","2451539","2452220","2452229","2452241","2452261","2452617","2452621","2452630","2451122","2451142","2451143","2451144","2451169","2451174","2451490","2452225","2452234","2452245","2452582","2451150","2451156","2451410","2451505","2451510","2451527","2451543","2451867","2451873","2451881","2452219","2452227","2452248","2452262","2452265","2452272","2452624","2451124","2451129","2451145","2451159","2451161","2451165","2451512","2451532","2451544","2451858","2452247","2452249","2452252","2452266","2452277","2452585","2452589","2452591","2452610","2452612","2451094","2451134","2451139","2451155","2451157","2451166","2451171","2451181","2451521","2451522"}'::int4[],
+	E'{"2450816","2450841","2450870","2450898","2450927","2450953","2450978","2451005","2451030","2451041","2451052","2451067","2451078","2451090","2451104","2451115","2451127","2451140","2451158","2451173","2451198","2451225","2451253","2451279","2451305","2451336","2451363","2451388","2451405","2451418","2451431","2451444","2451456","2451468","2451480","2451494","2451504","2451516","2451529","2451542","2451574","2451599","2451625","2451654","2451681","2451709","2451736","2451761","2451773","2451785","2451798","2451811","2451824","2451835","2451849","2451857","2451872","2451883","2451893","2451902","2451912","2451938","2451969","2451995","2452023","2452052","2452082","2452108","2452130","2452142","2452153","2452165","2452176","2452188","2452200","2452213","2452226","2452240","2452256","2452270","2452289","2452315","2452345","2452373","2452401","2452429","2452455","2452480","2452497","2452509","2452522","2452534","2452547","2452559","2452571","2452584","2452597","2452607","2452619","2452633","2452642"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_sold_time_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=2;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	2::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	72739.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0002}'::real[],
+	NULL::real[],
+	'{-0.004440563}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"61224"}'::int4[],
+	E'{"0","3453","5358","7271","8890","10655","12362","14210","15455","16483","17601","18731","20003","21248","22548","23694","24821","25793","26731","27644","28537","29469","30431","31334","32383","33161","33815","34512","35196","35909","36662","37414","38129","38856","39594","40332","41139","41826","42634","43309","43883","44435","44958","45430","45979","46461","47039","47768","48454","49168","49903","50684","51931","53162","54270","55196","56147","57080","57913","58603","59313","60034","60759","61432","62068","62610","63196","63765","64286","64834","65399","65944","66456","66942","67447","67990","68472","68929","69389","69801","70217","70674","71131","71595","72062","72552","73092","73643","74121","74642","75146","75708","76439","77167","77837","78531","79155","80293","81570","82687","86389"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_ship_date_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=3;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	3::smallint,
+	False::boolean,
+	0.00033333333::real,
+	4::integer,
+	1933.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0015333333, 0.0014666667, 0.0013333333, 0.0013, 0.0012666667, 0.0012333334, 0.0012333334, 0.0012, 0.0012, 0.0012, 0.0012, 0.0012, 0.0011666666, 0.0011666666, 0.0011666666, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011333333, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0011, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010666667, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.0010333334, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.001, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667, 0.0009666667}'::real[],
+	NULL::real[],
+	'{-0.0028389376}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"2451902","2451188","2451164","2451549","2452285","2451156","2451195","2451918","2451956","2452264","2452636","2452641","2451197","2451870","2452241","2451538","2451539","2452279","2452292","2452608","2452626","2452633","2451146","2451167","2451178","2451537","2451547","2451905","2451923","2452250","2452263","2451133","2451201","2451557","2451563","2451607","2451612","2451975","2451986","2452226","2452273","2452281","2452358","2452657","2451171","2451181","2451489","2451518","2451550","2451569","2451935","2451964","2451965","2451966","2451974","2452219","2452251","2452259","2452260","2452261","2452271","2452280","2452300","2452301","2452302","2452317","2452604","2452652","2452665","2451147","2451161","2451177","2451183","2451187","2451189","2451196","2451229","2451545","2451565","2451573","2451575","2451601","2451904","2451951","2451952","2452265","2452288","2452342","2452629","2452635","2452637","2452639","2452696","2451173","2451174","2451184","2451192","2451202","2451212","2451242"}'::int4[],
+	E'{"2450823","2450897","2450934","2450961","2450989","2451015","2451043","2451061","2451080","2451098","2451114","2451127","2451140","2451154","2451169","2451191","2451209","2451222","2451235","2451248","2451263","2451281","2451306","2451332","2451361","2451390","2451416","2451438","2451454","2451470","2451485","2451500","2451513","2451526","2451540","2451555","2451568","2451582","2451595","2451611","2451627","2451646","2451668","2451693","2451722","2451751","2451778","2451800","2451819","2451836","2451850","2451863","2451876","2451888","2451900","2451914","2451927","2451940","2451953","2451971","2451990","2452009","2452037","2452064","2452091","2452121","2452146","2452167","2452186","2452203","2452218","2452232","2452246","2452262","2452278","2452295","2452310","2452322","2452335","2452350","2452367","2452385","2452412","2452441","2452470","2452495","2452518","2452538","2452555","2452572","2452587","2452600","2452614","2452625","2452644","2452658","2452670","2452682","2452699","2452719","2452762"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_item_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=4;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	4::smallint,
+	False::boolean,
+	0.0::real,
+	4::integer,
+	25062.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334}'::real[],
+	NULL::real[],
+	'{0.0007646001}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1309","3001","4099","5413","8575","10591","14557","17821","19507","20473","22969","24061","25279","25891","27685"}'::int4[],
+	E'{"3","292","595","880","1169","1423","1683","1956","2282","2539","2800","3062","3343","3608","3865","4153","4415","4682","4951","5245","5505","5762","6071","6367","6655","6949","7232","7535","7831","8117","8386","8665","8928","9193","9470","9724","10001","10264","10546","10828","11122","11402","11708","11998","12271","12547","12823","13105","13399","13675","13977","14251","14527","14821","15112","15404","15715","16020","16304","16561","16846","17098","17353","17617","17892","18163","18434","18732","19039","19317","19609","19870","20149","20450","20749","21043","21305","21579","21881","22171","22460","22750","23029","23276","23536","23794","24084","24373","24664","24932","25236","25519","25793","26068","26349","26599","26899","27169","27447","27703","28000"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_bill_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=5;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	5::smallint,
+	False::boolean,
+	0.0005::real,
+	4::integer,
+	2118340.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0010770214}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"116","19276","39962","61407","85373","106315","126227","147006","167677","187188","207807","226047","246827","269215","286863","307913","329088","349611","369725","390185","410503","432212","454393","475658","496403","519145","539722","559383","580534","601568","623450","645203","665659","686268","708568","730472","751325","772013","790899","811688","835234","859298","877602","896824","916526","937382","958518","980789","1000789","1022926","1044299","1064876","1087128","1107756","1128946","1150087","1170021","1189394","1210544","1229439","1250913","1270764","1292927","1312446","1334616","1355684","1377519","1397078","1417253","1439187","1460077","1482246","1504744","1525557","1548534","1571550","1593101","1612385","1632941","1652821","1671352","1691730","1714302","1736611","1757116","1778569","1799839","1820986","1843004","1862949","1886606","1909295","1929403","1952006","1972435","1993425","2015871","2037659","2058030","2078476","2099961"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_bill_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=6;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	6::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1963935.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.008824349}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"40","19928","41222","60907","80036","96922","115963","135857","155159","175803","193832","214446","233794","253659","271138","289757","310150","329469","349317","369098","389298","407426","427564","448714","467530","487468","506816","526861","546227","565019","583873","602430","621270","641783","661497","681303","700310","718758","737636","756383","774238","793788","810674","829641","848804","867427","886648","906085","926348","946633","965764","984667","1004930","1025614","1045598","1064240","1084145","1103410","1122730","1141053","1162951","1181651","1200809","1219112","1239681","1256860","1276450","1295516","1315122","1334158","1352740","1370260","1387732","1406685","1424904","1445396","1462767","1481762","1502206","1522443","1540631","1559362","1578315","1599220","1619332","1635595","1652747","1672436","1691569","1710869","1731393","1750861","1769679","1790304","1809446","1827792","1845980","1861792","1881771","1900390","1920682"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_bill_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=7;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	7::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	7218.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.0033058901}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3781","4004","5987","61","843","1723","3981","4638","5516","6255"}'::int4[],
+	E'{"1","74","151","220","297","366","438","505","572","641","716","798","874","948","1023","1092","1157","1226","1295","1359","1442","1517","1582","1651","1718","1792","1861","1935","2012","2083","2154","2230","2301","2372","2434","2504","2576","2652","2724","2792","2863","2944","3013","3076","3151","3224","3294","3362","3441","3513","3581","3647","3726","3800","3878","3953","4022","4092","4172","4242","4311","4397","4466","4540","4612","4679","4750","4824","4901","4972","5042","5119","5194","5265","5338","5410","5486","5560","5636","5707","5777","5842","5916","5982","6054","6128","6200","6267","6337","6411","6487","6563","6634","6700","6776","6846","6915","6987","7054","7128","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_bill_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=8;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	8::smallint,
+	False::boolean,
+	0.00043333333::real,
+	4::integer,
+	1052357.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.0035874592}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"85","9940","19201","29062","39466","49793","60322","70621","81217","91226","101312","111021","121563","131884","142160","151553","162420","173225","183462","193550","204825","215954","226612","236859","247641","257974","268112","278524","289530","301367","312534","323713","334146","344753","354965","366093","376805","387572","399555","409543","419685","430267","441452","451787","461680","472204","482625","492470","503572","513596","523426","533872","543655","554311","565216","576083","586017","596802","607700","617077","626774","637067","646810","658305","668298","678578","689888","699650","709454","719802","731419","742750","753186","764659","775390","785925","795925","806880","817378","827664","838917","850289","860509","871551","882170","892610","902269","911835","922478","933542","944712","955041","966086","976281","986032","996335","1007079","1017272","1027779","1039161","1049977"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_ship_customer_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=9;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	9::smallint,
+	False::boolean,
+	0.00046666668::real,
+	4::integer,
+	2017265.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0043712403}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"132","20637","42180","65350","82849","103817","124318","145423","166944","187687","208737","230590","251949","273686","293387","311515","330800","353486","374240","393971","413452","433019","454488","476432","498011","518833","539886","561032","582486","602670","621844","644001","664886","685045","704748","725254","746493","768247","789025","809330","830506","851780","873145","893841","916134","939717","961138","980901","1000505","1021471","1041002","1061792","1082164","1105084","1127234","1147741","1168328","1188890","1211298","1233312","1255587","1277390","1297125","1318745","1339393","1359133","1378504","1398143","1419107","1441128","1464282","1484205","1506371","1531184","1554208","1572948","1594637","1616564","1637230","1658766","1679115","1701388","1723406","1741784","1760843","1783047","1803735","1827219","1849463","1870419","1891620","1911234","1930891","1951173","1973089","1994829","2016556","2037533","2057883","2079450","2099912"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_ship_cdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=10;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	10::smallint,
+	False::boolean,
+	0.0004::real,
+	4::integer,
+	1696478.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.002879893}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"58","18440","37296","56770","75852","94757","113452","130704","151005","170386","188845","208340","228843","248582","267435","285987","306015","323298","341709","360888","379541","400412","418373","438856","457414","475601","496722","517639","535895","554469","574493","594102","613853","632766","651384","668989","687375","706348","726205","744691","763517","783257","803277","822267","842706","862226","882815","901593","921645","941476","960097","979312","997703","1019580","1040057","1057255","1076091","1095006","1112147","1132100","1151343","1170491","1188950","1206650","1225084","1243585","1261069","1279776","1298943","1318050","1338726","1357162","1375169","1394096","1413110","1433576","1450829","1470097","1488671","1509355","1530203","1549360","1567854","1587699","1610090","1629275","1648075","1668590","1688396","1707068","1725533","1743917","1762980","1780125","1799583","1819263","1838350","1859271","1880426","1901289","1920663"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_ship_hdemo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=11;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	11::smallint,
+	False::boolean,
+	0.00033333333::real,
+	4::integer,
+	7200.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004}'::real[],
+	NULL::real[],
+	'{0.007957798}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1687","262","626","3196","3456","3820","5684","5796","5891","5987","6436","6562"}'::int4[],
+	E'{"1","76","145","212","285","352","423","496","571","640","719","798","867","940","1016","1091","1163","1231","1304","1381","1455","1523","1597","1669","1746","1814","1887","1962","2035","2099","2168","2246","2310","2377","2455","2530","2597","2668","2741","2817","2892","2966","3033","3103","3170","3247","3325","3396","3465","3541","3609","3678","3755","3821","3889","3959","4025","4088","4162","4242","4318","4386","4454","4527","4593","4658","4728","4800","4870","4940","5010","5077","5153","5225","5302","5373","5446","5510","5580","5652","5726","5799","5877","5947","6019","6099","6174","6247","6329","6399","6475","6552","6625","6697","6761","6831","6904","6984","7057","7129","7200"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_ship_addr_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=12;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	12::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	1114224.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.001420308}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"26","11309","20636","30995","41857","51685","61820","71405","82282","92581","103069","114250","123704","133498","144567","155732","164935","175559","186082","196700","207930","217367","227511","237781","248348","259679","269692","279097","289318","300619","311485","321268","331270","341882","352231","361830","372945","383382","393987","405239","415555","427032","438461","448473","459112","470359","481524","492717","502982","513710","524165","534333","544663","554875","565192","576567","586168","598386","608959","620175","629750","639772","650199","660474","671797","681920","692252","703223","713224","723069","733136","744467","754388","765063","775010","786658","796244","807059","817848","828650","839270","851099","861790","871850","883229","894821","905183","915481","925975","936732","947814","958254","967993","977342","988420","998860","1009253","1019245","1029913","1039907","1049935"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_web_page_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=13;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	13::smallint,
+	False::boolean,
+	0.00026666667::real,
+	4::integer,
+	172.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.012433333, 0.012266667, 0.012233334, 0.0122, 0.012133333, 0.012133333, 0.0121, 0.011833333, 0.0117, 0.011633334, 0.0116, 0.0114, 0.0114, 0.011366666, 0.011366666, 0.011166667, 0.0111, 0.0111, 0.0111, 0.011066667, 0.011, 0.011, 0.010966667, 0.010866666, 0.010866666, 0.0108, 0.010733333, 0.010666667, 0.010366667, 0.0101333335, 0.008866667, 0.0079, 0.0078, 0.0075333333, 0.0075, 0.0074333334, 0.0074, 0.0072333333, 0.0071666664, 0.0071333335, 0.0071333335, 0.0071, 0.0070666666, 0.0070666666, 0.007033333, 0.007033333, 0.007, 0.0069, 0.0069, 0.0068333335, 0.0068, 0.0067, 0.0067, 0.006666667, 0.0066333334, 0.0064666667, 0.0063, 0.0061666667, 0.0061, 0.0056666667, 0.005433333, 0.0054, 0.0052, 0.0052, 0.0051666666, 0.005133333, 0.0051, 0.0051, 0.0050666668, 0.0050666668, 0.0050333333, 0.0050333333, 0.0049666665, 0.0049666665, 0.0049333335, 0.0049333335, 0.0049333335, 0.0049333335, 0.0049, 0.004833333, 0.004833333, 0.004833333, 0.0048, 0.0048, 0.004766667, 0.0047, 0.0047, 0.0047, 0.0046666665, 0.0046666665, 0.0046666665, 0.0046333335, 0.0046333335, 0.0046333335, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667, 0.0045666667}'::real[],
+	NULL::real[],
+	'{0.0037705055}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"31","25","103","145","7","163","109","49","151","115","157","55","97","73","169","37","61","79","127","172","91","121","139","1","85","13","67","43","19","133","122","44","116","152","74","68","128","80","26","38","164","2","98","170","62","86","134","32","146","50","92","56","104","20","158","8","140","110","14","130","129","57","89","136","29","87","113","135","112","142","75","99","17","106","35","64","69","125","33","15","46","82","88","155","141","11","39","154","45","83","117","9","77","160","27","59","63","81","94","118"}'::int4[],
+	E'{"3","3","4","5","6","10","12","16","18","21","22","23","24","28","30","34","40","40","41","47","47","51","52","52","53","54","58","65","65","70","71","71","76","76","84","93","93","95","100","100","101","105","107","107","111","114","119","120","123","124","126","131","132","137","138","143","144","147","148","149","150","153","156","159","161","162","165","166","167","167","171","171"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_web_site_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=14;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	14::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	32.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.060833335, 0.059366666, 0.058766667, 0.0585, 0.0584, 0.0576, 0.0549, 0.036, 0.0357, 0.034733333, 0.034666665, 0.034433335, 0.025, 0.0247, 0.024433333, 0.0242, 0.0242, 0.024066666, 0.024033334, 0.023866666, 0.023566667, 0.023533333, 0.023266668, 0.023166666, 0.0231, 0.022766666, 0.022666667, 0.013133333, 0.012033333, 0.011566667, 0.011566667, 0.010933333}'::real[],
+	'{0.04239957}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"31","7","32","19","1","25","13","2","14","8","26","20","28","22","4","21","23","27","3","9","16","10","17","15","11","5","29","6","24","12","30","18"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_ship_mode_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=15;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	15::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	20.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0519, 0.05183333, 0.050966665, 0.050866667, 0.050633334, 0.050566666, 0.050533332, 0.050333332, 0.049933333, 0.049933333, 0.049933333, 0.049833335, 0.049833335, 0.0496, 0.049433332, 0.049233332, 0.0488, 0.0488, 0.048466668, 0.0482}'::real[],
+	'{0.056176268}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"11","4","17","19","16","5","8","12","6","7","18","2","10","15","9","20","1","3","13","14"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_warehouse_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=16;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	16::smallint,
+	False::boolean,
+	0.00036666667::real,
+	4::integer,
+	5.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.20156667, 0.20043333, 0.19946666, 0.19943333, 0.19873333}'::real[],
+	'{0.19803289}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3","4","1","5","2"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_promo_sk
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=17;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	17::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	357.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0037666666, 0.0037, 0.0035333333, 0.0035333333, 0.0035}'::real[],
+	NULL::real[],
+	'{0.005415437}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"169","252","72","118","335"}'::int4[],
+	E'{"1","4","7","11","15","19","22","26","29","33","36","39","43","47","51","54","58","61","65","68","71","76","79","83","86","89","93","96","100","103","107","110","114","117","122","125","129","132","136","139","143","146","150","153","157","161","164","168","173","176","180","183","187","190","193","197","200","204","208","211","215","218","222","225","229","233","236","240","244","247","251","255","259","262","266","269","273","276","279","283","287","290","294","297","300","304","308","311","315","318","322","325","329","332","337","340","344","347","351","354","357"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_order_number
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=18;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	18::smallint,
+	False::boolean,
+	0.0::real,
+	8::integer,
+	31567772.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	412::oid,
+	412::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{0.06999581}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"121","317641","648578","945597","1288393","1573610","1860492","2157681","2459791","2761260","3028976","3321440","3616466","3914756","4237831","4544558","4833953","5074651","5373885","5669291","6007647","6291071","6582751","6873797","7171514","7488211","7794326","8082653","8395928","8704266","9030833","9316184","9652205","9924686","10207036","10507877","10826653","11124316","11413852","11700753","11996463","12275214","12553434","12843505","13133657","13432219","13722004","14024091","14320895","14620641","14953137","15244476","15539965","15844103","16163890","16449629","16748023","17025956","17343876","17630387","17939341","18239124","18538613","18878347","19178480","19467260","19779045","20065269","20381326","20712670","20992673","21280690","21613312","21911183","22191172","22482391","22796790","23114702","23395001","23716661","24042960","24340548","24628420","24894268","25221472","25528346","25827723","26138822","26441040","26745092","27033424","27319988","27614893","27924604","28205457","28532777","28829016","29120974","29422245","29678171","29997708"}'::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[],
+	NULL::int8[]);
+
+--
+-- Table: web_sales, Attribute: ws_quantity
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=19;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	19::smallint,
+	False::boolean,
+	0.0003::real,
+	4::integer,
+	100.0::real,
+	1::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	96::oid,
+	97::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0117, 0.011633334, 0.0113, 0.0111, 0.011066667, 0.010933333, 0.010933333, 0.0109, 0.0109, 0.0109, 0.010833333, 0.0108, 0.010766666, 0.0107, 0.010666667, 0.010566667, 0.010466667, 0.010466667, 0.0104, 0.010366667, 0.010366667, 0.010333333, 0.0103, 0.010266666, 0.010266666, 0.010266666, 0.010233333, 0.010233333, 0.010233333, 0.0102, 0.0101666665, 0.0101666665, 0.0101333335, 0.0101333335, 0.0101333335, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010066667, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.010033334, 0.01, 0.01, 0.01, 0.009966667, 0.009966667, 0.009933333, 0.0099, 0.0099, 0.009866667, 0.009866667, 0.009866667, 0.009833333, 0.0098, 0.0098, 0.009766666, 0.009766666, 0.009766666, 0.009733333, 0.009733333, 0.0097, 0.0097, 0.0097, 0.0097, 0.009666666, 0.009633333, 0.0096, 0.0096, 0.0096, 0.009566667, 0.009533334, 0.009533334, 0.009533334, 0.009533334, 0.0095, 0.0095, 0.009466667, 0.009466667, 0.0094, 0.0094, 0.0094, 0.009366667, 0.009366667, 0.009366667, 0.009333333, 0.009266667, 0.009233333, 0.0092, 0.009133333, 0.009133333, 0.009, 0.008933334, 0.008666666}'::real[],
+	'{0.014699079}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"55","56","49","74","6","69","80","42","53","76","82","93","23","10","41","7","26","61","70","73","90","68","40","58","72","78","39","59","71","2","21","34","17","54","84","8","22","24","38","60","75","77","29","33","47","95","96","98","18","52","66","3","64","15","31","83","5","57","87","13","36","67","9","37","79","4","46","1","45","91","92","11","97","30","50","81","43","16","44","48","85","25","100","12","63","20","32","86","19","27","99","35","89","62","65","28","51","14","88","94"}'::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[],
+	NULL::int4[]);
+
+--
+-- Table: web_sales, Attribute: ws_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=20;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	20::smallint,
+	False::boolean,
+	0.0004::real,
+	6::integer,
+	9928.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.007165513}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"25.53","30.19","51.31","53.30","55.63","60.00","60.37","72.31","83.48","87.79"}'::numeric[],
+	E'{"1.00","2.00","3.01","3.99","5.01","5.98","6.90","7.81","8.78","9.77","10.82","11.75","12.73","13.64","14.64","15.70","16.68","17.70","18.55","19.52","20.51","21.47","22.49","23.60","24.61","25.59","26.60","27.68","28.73","29.69","30.74","31.63","32.62","33.59","34.69","35.74","36.73","37.59","38.60","39.62","40.68","41.65","42.59","43.49","44.44","45.41","46.35","47.34","48.33","49.28","50.23","51.18","52.17","53.17","54.21","55.20","56.12","57.20","58.17","59.12","60.16","61.11","62.13","63.13","64.04","65.08","66.03","66.99","67.92","69.02","69.96","71.00","71.88","72.93","73.95","74.98","76.06","77.09","78.09","79.05","79.99","81.05","82.06","83.02","84.06","85.19","86.28","87.20","88.17","89.18","90.18","91.03","92.00","92.96","94.05","94.97","95.97","96.93","97.94","98.99","100.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=21;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	21::smallint,
+	False::boolean,
+	0.00026666667::real,
+	6::integer,
+	23431.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333, 0.0003, 0.00026666667}'::real[],
+	NULL::real[],
+	'{-0.011709301}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"12.66","82.70","21.34"}'::numeric[],
+	E'{"1.11","3.63","5.56","7.34","9.01","10.72","12.60","14.50","16.23","17.89","19.83","21.55","23.30","25.17","26.92","28.63","30.25","31.84","33.78","35.57","37.56","39.36","41.23","42.89","44.61","46.36","48.07","50.03","51.95","53.80","55.48","57.36","59.16","60.92","62.83","64.68","66.48","68.14","69.79","71.63","73.63","75.51","77.07","78.85","80.80","82.62","84.47","86.12","88.00","89.88","91.57","93.44","95.26","97.24","99.03","100.89","102.79","104.74","106.47","108.50","110.28","112.13","114.15","116.34","118.35","120.77","122.81","124.89","127.28","129.50","131.92","134.57","136.88","139.32","142.07","144.61","147.18","150.06","152.87","155.83","158.87","161.99","165.25","168.54","172.12","175.74","179.09","183.39","187.67","192.09","197.29","201.65","207.10","212.73","218.60","225.49","232.53","240.48","251.38","266.95","296.85"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=22;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	22::smallint,
+	False::boolean,
+	0.00036666667::real,
+	6::integer,
+	14531.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0104, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333, 0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.0046185157}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","2.06","2.70","3.03","3.83","3.87","0.80","0.94","3.04","4.70","5.59","11.09","0.70","0.89","1.17","1.28","1.33","1.55","1.81","2.13","2.80","3.51","3.68","3.75","3.77","4.11","4.41","6.03","15.17","0.41","0.72","0.86","1.12","1.21","1.44","1.66","2.24","2.46","2.92","3.38","3.40","3.43","4.23","4.64","4.98","5.48","5.60","5.68","6.12","6.37","6.49","7.58","8.47","11.40","15.80","0.30","0.66","0.71","1.14","1.18","1.32","1.49","1.53","1.70","1.89","2.03","2.05","2.22","2.37","2.43","2.52","2.53","2.78","2.82","2.87","2.88","3.25","3.61","3.67","3.71","3.94","3.95","4.17","4.22","4.59","4.82","4.91","5.07","5.19","5.24","5.64","5.70","6.11","6.53","6.57","6.95","7.00","7.73","7.84","7.99"}'::numeric[],
+	E'{"0.01","0.60","1.11","1.64","2.20","2.74","3.31","3.91","4.48","5.09","5.63","6.17","6.81","7.45","8.09","8.66","9.30","9.96","10.52","11.12","11.75","12.44","13.09","13.82","14.54","15.25","15.99","16.72","17.50","18.22","19.04","19.87","20.70","21.43","22.29","23.23","24.09","25.02","25.92","26.85","27.82","28.75","29.71","30.71","31.75","32.78","33.78","34.80","35.93","37.02","38.14","39.29","40.43","41.60","42.81","44.07","45.33","46.59","47.86","49.28","50.73","52.22","53.69","55.11","56.86","58.38","60.03","61.68","63.22","65.10","66.78","68.62","70.35","72.19","74.30","76.43","78.67","81.00","83.19","85.26","87.83","90.51","93.08","95.96","98.78","102.09","105.42","109.06","112.87","116.26","120.47","125.09","130.89","136.72","143.90","151.28","160.21","170.24","184.92","205.80","292.81"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_ext_discount_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=23;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	23::smallint,
+	False::boolean,
+	0.00023333334::real,
+	6::integer,
+	143461.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.008966667, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0031384944}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","47.60","333.00"}'::numeric[],
+	E'{"0.11","11.18","20.44","31.11","41.86","52.90","64.50","75.24","88.16","100.08","113.88","127.60","141.90","158.13","176.97","194.72","211.91","230.04","247.80","270.20","292.80","314.96","336.26","358.72","384.84","412.08","437.64","462.84","489.06","516.88","547.36","574.47","607.20","636.57","669.28","702.30","740.88","777.49","815.40","855.00","891.48","929.25","969.54","1014.26","1058.88","1106.04","1154.78","1202.30","1251.81","1305.20","1355.86","1412.46","1469.43","1528.56","1594.50","1659.35","1728.00","1792.70","1862.70","1933.38","2005.02","2079.36","2157.40","2242.56","2326.52","2413.80","2503.90","2604.75","2707.31","2815.80","2923.56","3023.16","3143.36","3267.04","3403.08","3542.86","3676.34","3816.00","3975.42","4122.84","4289.29","4480.63","4684.35","4859.40","5062.32","5306.40","5536.80","5796.00","6095.70","6444.80","6772.48","7170.48","7599.34","8105.58","8650.46","9275.07","10054.69","11049.02","12248.28","14374.90","25989.60"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_ext_sales_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=24;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	24::smallint,
+	False::boolean,
+	0.00033333333::real,
+	6::integer,
+	145118.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0104, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-3.1174983e-05}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","42.12","43.56"}'::numeric[],
+	E'{"0.15","11.55","21.09","31.38","41.40","52.47","63.68","75.30","87.36","102.00","115.28","130.23","143.98","161.58","177.08","195.03","212.64","231.77","250.56","270.60","291.64","313.31","336.44","359.92","382.11","408.00","433.65","460.80","487.06","515.16","541.38","569.88","600.62","631.67","663.75","696.96","733.08","770.99","809.00","848.70","887.04","930.69","971.28","1008.54","1054.04","1100.44","1151.97","1201.56","1252.10","1308.53","1366.40","1428.45","1484.64","1537.62","1599.40","1660.56","1730.20","1807.20","1873.92","1944.84","2025.30","2097.54","2180.70","2264.22","2351.00","2447.28","2539.20","2636.70","2733.72","2834.16","2948.78","3067.62","3174.24","3287.79","3403.35","3526.74","3663.90","3815.55","3966.90","4120.92","4294.76","4473.13","4690.56","4881.66","5088.60","5302.54","5533.92","5818.56","6094.50","6392.75","6752.16","7092.90","7519.73","7968.00","8494.71","9116.10","9877.56","10865.55","12247.37","14678.04","25048.32"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_ext_wholesale_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=25;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	25::smallint,
+	False::boolean,
+	6.666667e-05::real,
+	6::integer,
+	196312.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0027050157}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"1.93","35.43","56.70","76.82","96.60","119.36","142.52","164.70","188.88","216.20","242.60","269.10","293.82","318.16","349.23","379.35","408.51","439.04","467.04","497.98","532.65","566.68","603.20","640.29","677.73","713.32","749.62","785.46","825.12","866.00","906.84","950.49","991.20","1035.40","1086.15","1131.19","1176.84","1221.96","1272.15","1321.00","1365.67","1417.72","1474.75","1528.74","1580.92","1635.13","1688.70","1744.40","1798.35","1854.56","1916.24","1981.60","2043.72","2105.60","2172.12","2249.94","2313.36","2380.16","2454.80","2530.80","2606.81","2680.56","2757.50","2832.83","2910.27","2989.11","3068.24","3147.96","3230.25","3327.77","3416.49","3506.28","3596.71","3686.50","3790.16","3884.76","3987.72","4089.55","4193.84","4304.25","4429.44","4544.01","4671.15","4795.30","4936.88","5074.40","5225.22","5382.29","5548.20","5722.02","5905.20","6111.16","6317.28","6532.92","6787.56","7078.66","7384.50","7726.50","8117.00","8641.90","9964.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_ext_list_price
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=26;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	26::smallint,
+	False::boolean,
+	0.00046666668::real,
+	7::integer,
+	373627.0::real,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	0::smallint,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	NULL::real[],
+	'{-0.0056457715}'::real[],
+	NULL::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"3.82","64.44","101.53","139.08","181.44","220.10","260.15","300.40","347.16","399.06","442.80","490.98","543.49","592.36","645.05","702.61","756.24","813.24","866.12","923.12","986.70","1051.75","1114.12","1180.48","1241.10","1306.88","1373.56","1443.48","1522.30","1594.02","1668.20","1759.04","1834.80","1908.80","1995.12","2087.00","2170.48","2274.40","2365.65","2454.60","2553.48","2645.06","2748.90","2856.00","2958.12","3067.00","3175.68","3276.80","3382.95","3504.28","3617.46","3732.75","3852.12","3975.75","4098.27","4220.40","4355.04","4483.16","4613.12","4751.70","4888.73","5040.00","5184.62","5346.00","5487.69","5630.85","5786.64","5954.61","6113.82","6291.90","6477.02","6674.57","6870.24","7079.40","7274.74","7502.88","7699.20","7915.05","8155.70","8392.50","8646.08","8912.73","9191.07","9444.42","9740.49","10052.91","10348.48","10732.50","11116.80","11510.34","11983.48","12501.83","13062.54","13645.80","14316.72","15042.00","15921.12","16966.66","18501.25","20712.09","29685.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_ext_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=27;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	27::smallint,
+	False::boolean,
+	0.00033333333::real,
+	6::integer,
+	21995.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.10896666, 0.00066666666, 0.0006, 0.0006, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00056666665, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.00053333334, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.0005, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00046666668, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.00043333333, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.0004, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667, 0.00036666667}'::real[],
+	NULL::real[],
+	'{0.004573461}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","0.35","0.50","2.16","0.22","0.26","0.34","1.08","1.53","0.37","0.46","0.52","0.57","0.92","2.29","0.03","0.09","0.12","0.21","0.42","0.43","0.60","0.75","0.04","0.07","0.28","0.32","0.36","0.78","0.87","1.16","1.94","2.24","2.35","3.04","3.72","5.24","0.11","0.27","0.39","0.48","0.53","0.56","0.58","0.69","0.90","1.02","1.07","1.18","1.44","1.72","2.20","2.67","4.41","0.06","0.16","0.25","0.38","0.47","0.77","0.79","0.85","1.01","1.04","1.19","1.23","1.78","1.90","1.91","1.92","2.21","2.60","2.94","4.33","5.60","0.02","0.08","0.18","0.19","0.23","0.24","0.30","0.31","0.49","0.51","0.54","0.55","0.66","0.67","0.81","0.93","1.00","1.14","1.42","1.45","1.56","1.80","1.88","2.26","2.50"}'::numeric[],
+	E'{"0.01","0.83","1.34","1.75","2.23","2.69","3.10","3.49","3.97","4.43","4.88","5.35","5.90","6.43","7.00","7.69","8.38","8.95","9.70","10.49","11.20","11.89","12.64","13.48","14.34","15.18","16.14","16.99","18.05","19.01","19.99","21.08","22.13","23.33","24.48","25.75","26.99","28.33","29.92","31.37","32.94","34.59","36.09","37.92","39.69","41.47","43.32","45.30","47.20","48.97","50.94","53.17","55.40","57.80","60.19","62.89","65.72","68.28","71.23","74.17","77.49","81.04","84.54","88.21","91.73","95.71","100.03","104.60","109.56","114.83","119.85","125.13","131.38","137.60","144.21","150.45","157.35","164.05","171.91","179.70","189.75","199.15","211.02","222.05","234.00","246.12","259.74","274.59","291.64","309.69","330.12","352.06","377.91","410.73","445.30","487.66","545.67","620.87","718.11","874.66","2139.82"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_coupon_amt
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=28;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	28::smallint,
+	False::boolean,
+	0.00043333333::real,
+	3::integer,
+	6981.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.8047}'::real[],
+	NULL::real[],
+	'{0.6524823}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.07","2.81","5.16","8.29","11.57","14.98","18.25","22.17","25.74","29.25","33.46","38.75","43.09","47.74","52.23","58.18","63.93","69.06","75.54","81.43","90.24","97.41","105.00","112.34","119.93","128.94","139.96","150.39","161.12","170.13","179.08","190.02","204.24","216.80","230.79","242.88","256.72","269.70","285.28","299.98","321.93","337.96","359.92","379.16","398.56","411.26","434.53","456.18","480.99","503.11","534.41","559.69","587.89","615.55","642.62","675.15","706.02","738.29","769.44","805.37","834.44","867.90","910.13","947.74","994.63","1042.05","1081.01","1133.06","1191.03","1244.46","1291.32","1335.46","1389.96","1451.73","1524.48","1590.31","1679.40","1745.45","1825.78","1907.96","2007.12","2097.34","2207.59","2313.09","2431.84","2586.43","2750.05","2882.04","3053.86","3220.08","3468.52","3726.47","4048.99","4401.10","4748.00","5156.34","5788.23","6391.13","7477.72","9404.42","23044.45"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_ext_ship_cost
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=29;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	29::smallint,
+	False::boolean,
+	0.00026666667::real,
+	6::integer,
+	83043.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.020966666, 0.00026666667, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.00023333334, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.006589469}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","450.80","10.92","48.40","68.40","79.20","93.60","113.40","142.80","6.72","9.18","15.84","16.80","23.10","32.40","37.80","38.22","52.80","84.00","105.30","106.26","111.60","126.00","131.04","143.04","184.80","198.00","216.72","305.76","333.00","369.60"}'::numeric[],
+	E'{"0.12","6.44","12.04","17.91","23.85","29.60","36.11","42.78","49.62","56.16","63.60","71.04","78.89","87.72","96.00","104.00","113.54","123.20","133.92","145.52","155.25","165.02","176.80","189.20","201.63","213.48","226.80","240.50","253.76","267.85","282.72","298.89","316.10","330.25","346.00","363.00","380.52","400.32","419.76","438.40","457.56","477.96","499.20","523.27","545.37","568.70","592.32","616.00","643.86","672.10","699.48","723.24","752.40","785.46","813.93","846.30","879.06","914.50","948.00","983.84","1020.80","1057.50","1097.25","1140.48","1180.20","1229.80","1277.46","1323.70","1377.74","1434.40","1494.96","1555.07","1608.18","1672.32","1736.04","1799.16","1871.10","1948.48","2020.46","2099.31","2180.40","2270.40","2362.56","2458.14","2562.12","2692.80","2810.50","2931.74","3077.75","3238.31","3432.00","3613.44","3833.20","4076.73","4350.06","4641.78","5042.73","5561.25","6238.65","7336.85","12822.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_net_paid
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=30;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	30::smallint,
+	False::boolean,
+	0.00043333333::real,
+	6::integer,
+	155462.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0125, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0023643773}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","43.56"}'::numeric[],
+	E'{"0.06","6.90","13.40","20.67","28.47","35.91","44.46","53.53","63.00","73.44","83.29","95.48","107.88","119.93","132.34","144.75","160.46","175.10","190.14","206.83","222.10","239.84","258.46","275.49","294.81","315.96","336.50","358.36","379.82","403.62","429.78","456.00","481.00","507.99","534.40","561.61","589.38","619.65","651.00","683.82","717.57","755.54","794.30","830.96","872.19","911.09","954.18","992.44","1035.44","1083.95","1133.73","1186.24","1242.02","1296.12","1352.96","1411.83","1470.70","1528.24","1597.05","1662.45","1734.44","1814.25","1880.05","1954.56","2034.12","2110.08","2198.27","2289.76","2377.50","2475.02","2583.69","2686.32","2791.36","2899.80","3029.56","3156.05","3271.45","3395.25","3526.10","3668.35","3836.05","4007.85","4182.57","4382.49","4602.96","4828.07","5062.08","5308.86","5595.68","5910.43","6219.45","6596.00","7000.70","7489.02","8014.44","8603.82","9384.00","10412.72","11672.78","14217.46","24307.65"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=31;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	31::smallint,
+	False::boolean,
+	0.0003::real,
+	6::integer,
+	246002.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.012466666, 0.0002}'::real[],
+	NULL::real[],
+	'{-0.0024806631}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00","57.28"}'::numeric[],
+	E'{"0.06","7.24","14.07","21.63","29.77","37.41","46.45","56.03","66.38","76.71","87.19","99.41","112.52","125.57","138.96","151.61","167.50","182.92","198.36","216.24","231.78","251.32","269.52","288.70","306.76","329.56","350.90","374.93","397.02","422.18","449.02","474.60","501.75","531.09","559.18","587.44","616.28","646.64","680.44","714.49","750.33","786.11","828.41","870.48","912.34","955.22","997.24","1039.57","1083.93","1132.88","1186.06","1237.31","1299.09","1355.29","1409.04","1474.72","1532.54","1592.67","1668.97","1738.60","1815.18","1890.75","1969.95","2046.13","2120.47","2201.72","2290.88","2394.32","2487.04","2585.21","2701.06","2805.79","2915.24","3036.02","3164.89","3298.38","3422.94","3549.84","3672.00","3832.97","4016.75","4182.78","4379.44","4577.43","4811.80","5061.31","5307.67","5555.95","5845.41","6173.76","6521.98","6885.89","7318.05","7810.46","8377.41","8999.04","9828.90","10854.91","12167.98","14819.83","25915.60"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_ship
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=32;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	32::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	301791.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004}'::real[],
+	NULL::real[],
+	'{-0.0042563225}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.15","26.90","47.27","66.00","87.66","110.70","130.90","153.36","177.10","200.26","226.76","251.37","278.08","304.01","330.99","360.93","391.74","422.88","454.10","486.85","518.42","554.54","589.68","627.00","662.74","700.56","740.52","781.44","822.39","863.04","903.00","950.37","1000.58","1042.83","1092.42","1141.32","1193.41","1249.05","1308.51","1363.96","1424.64","1479.06","1542.09","1608.99","1672.64","1734.00","1802.29","1875.28","1951.50","2031.12","2099.65","2168.25","2252.68","2350.87","2431.91","2518.02","2615.34","2697.47","2798.23","2897.37","3002.40","3098.34","3202.68","3308.00","3423.75","3542.37","3654.66","3775.98","3909.42","4028.66","4167.30","4309.90","4464.88","4615.84","4766.58","4937.48","5114.56","5268.48","5449.86","5643.55","5859.42","6093.48","6323.40","6589.80","6865.04","7151.04","7471.75","7798.48","8167.15","8545.18","8940.05","9403.24","9923.00","10538.58","11210.00","12020.74","12946.34","14134.36","15809.06","18879.36","36064.00"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_net_paid_inc_ship_tax
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=33;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	33::smallint,
+	False::boolean,
+	0.0::real,
+	7::integer,
+	580101.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.0004}'::real[],
+	NULL::real[],
+	'{-0.0042436747}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"0.15","27.32","48.14","67.61","90.21","112.88","134.60","157.01","181.53","205.08","232.37","257.90","285.99","310.90","338.12","369.71","401.62","432.71","466.15","498.29","532.67","568.73","606.20","644.59","677.83","716.94","756.42","802.49","841.36","885.36","929.11","973.55","1022.68","1069.26","1124.40","1170.12","1225.33","1284.57","1342.88","1398.12","1459.13","1514.68","1583.89","1648.82","1714.40","1780.42","1851.90","1924.20","2000.32","2078.12","2156.48","2230.86","2317.75","2412.28","2495.80","2582.42","2677.84","2771.12","2874.03","2977.91","3073.79","3182.59","3288.45","3403.98","3512.75","3630.83","3761.65","3884.79","4011.93","4143.91","4277.61","4436.91","4583.20","4733.60","4884.95","5069.66","5251.05","5427.69","5605.76","5797.65","6025.63","6250.68","6502.49","6751.35","7071.69","7353.10","7674.41","8024.66","8431.89","8815.18","9204.22","9715.49","10211.19","10847.31","11539.04","12347.17","13354.05","14622.68","16369.05","19567.99","38203.82"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+--
+-- Table: web_sales, Attribute: ws_net_profit
+--
+-- DELETE FROM pg_statistic WHERE starelid='cte_bug.web_sales'::regclass AND staattnum=34;
+INSERT INTO pg_statistic VALUES (
+	'cte_bug.web_sales'::regclass,
+	34::smallint,
+	False::boolean,
+	0.0::real,
+	6::integer,
+	206397.0::real,
+	1::smallint,
+	2::smallint,
+	3::smallint,
+	0::smallint,
+	0::smallint,
+	1752::oid,
+	1754::oid,
+	1754::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	0::oid,
+	'{0.00033333333}'::real[],
+	NULL::real[],
+	'{-0.009154078}'::real[],
+	NULL::real[],
+	NULL::real[],
+	E'{"0.00"}'::numeric[],
+	E'{"-9828.00","-6282.88","-5353.36","-4759.04","-4327.14","-3980.40","-3689.38","-3415.01","-3200.70","-2979.08","-2776.62","-2608.96","-2449.44","-2301.84","-2164.10","-2041.05","-1931.67","-1824.00","-1713.27","-1605.45","-1519.20","-1432.56","-1351.42","-1271.98","-1193.64","-1123.08","-1053.59","-994.98","-939.75","-874.80","-825.28","-773.60","-726.24","-683.34","-636.68","-597.28","-559.37","-523.79","-486.00","-449.68","-416.64","-383.24","-353.70","-325.01","-296.56","-271.44","-246.81","-222.48","-199.76","-177.30","-156.21","-138.71","-119.47","-102.79","-85.56","-72.32","-58.00","-46.02","-34.44","-22.62","-11.88","-1.54","7.80","20.24","33.81","49.02","66.06","87.48","111.15","138.51","166.66","197.05","235.56","273.56","316.31","364.32","415.57","472.36","537.60","604.77","677.15","764.42","854.28","951.99","1064.31","1176.00","1306.32","1449.60","1614.67","1788.28","1984.00","2213.82","2467.72","2782.77","3119.84","3508.34","4027.92","4724.10","5672.52","7345.81","15055.16"}'::numeric[],
+	NULL::numeric[],
+	NULL::numeric[],
+	NULL::numeric[]);
+
+
+-- 
+-- Query text
+-- 
+
+ set search_path=cte_bug,public;
+ set gp_cte_sharing = on;
+
+ explain(costs off)
+ with year_total as (
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum(((ss_ext_list_price-ss_ext_wholesale_cost-ss_ext_discount_amt)+ss_ext_sales_price)/2)
+ year_total
+        ,'s' sale_type
+  from cte_bug.customer
+      ,cte_bug.store_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = ss_customer_sk
+    and ss_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+  union all
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum((((cs_ext_list_price-cs_ext_wholesale_cost-cs_ext_discount_amt)+cs_ext_sales_price)/2)
+ ) year_total
+        ,'c' sale_type
+  from cte_bug.customer
+      ,cte_bug.catalog_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = cs_bill_customer_sk
+    and cs_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+ union all
+  select c_customer_id customer_id
+        ,c_first_name customer_first_name
+        ,c_last_name customer_last_name
+        ,c_preferred_cust_flag customer_preferred_cust_flag
+        ,c_birth_country customer_birth_country
+        ,c_login customer_login
+        ,c_email_address customer_email_address
+        ,d_year dyear
+        ,sum((((ws_ext_list_price-ws_ext_wholesale_cost-ws_ext_discount_amt)+ws_ext_sales_price)/2)
+ ) year_total
+        ,'w' sale_type
+  from cte_bug.customer
+      ,cte_bug.web_sales
+      ,cte_bug.date_dim
+  where c_customer_sk = ws_bill_customer_sk
+    and ws_sold_date_sk = d_date_sk
+  group by c_customer_id
+          ,c_first_name
+          ,c_last_name
+          ,c_preferred_cust_flag
+          ,c_birth_country
+          ,c_login
+          ,c_email_address
+          ,d_year
+          )
+   select  
+                   t_s_secyear.customer_id
+                  ,t_s_secyear.customer_first_name
+                  ,t_s_secyear.customer_last_name
+                  ,t_s_secyear.customer_login
+  from year_total t_s_firstyear
+      ,year_total t_s_secyear
+      ,year_total t_c_firstyear
+      ,year_total t_c_secyear
+      ,year_total t_w_firstyear
+      ,year_total t_w_secyear
+  where t_s_secyear.customer_id = t_s_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_c_secyear.customer_id
+    and t_s_firstyear.customer_id = t_c_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_w_firstyear.customer_id
+    and t_s_firstyear.customer_id = t_w_secyear.customer_id
+    and t_s_firstyear.sale_type = 's'
+    and t_c_firstyear.sale_type = 'c'
+    and t_w_firstyear.sale_type = 'w'
+    and t_s_secyear.sale_type = 's'
+    and t_c_secyear.sale_type = 'c'
+    and t_w_secyear.sale_type = 'w'
+    and t_s_firstyear.dyear =  2001
+    and t_s_secyear.dyear = 2001+1
+    and t_c_firstyear.dyear =  2001
+    and t_c_secyear.dyear =  2001+1
+    and t_w_firstyear.dyear = 2001
+    and t_w_secyear.dyear = 2001+1
+    and t_s_firstyear.year_total > 0
+    and t_c_firstyear.year_total > 0
+    and t_w_firstyear.year_total > 0
+    and case when t_c_firstyear.year_total > 0 then
+ t_c_secyear.year_total / t_c_firstyear.year_total else null end > case
+ when t_s_firstyear.year_total > 0 then t_s_secyear.year_total /
+ t_s_firstyear.year_total else null end
+    and case when t_c_firstyear.year_total > 0 then
+ t_c_secyear.year_total / t_c_firstyear.year_total else null end > case
+ when t_w_firstyear.year_total > 0 then t_w_secyear.year_total /
+ t_w_firstyear.year_total else null end
+  order by t_s_secyear.customer_id
+          ,t_s_secyear.customer_first_name
+          ,t_s_secyear.customer_last_name
+          ,t_s_secyear.customer_login
+ limit 100;
diff --git a/src/test/regress/sql/union_gp.sql b/src/test/regress/sql/union_gp.sql
index 124ac877836..e7cac952704 100644
--- a/src/test/regress/sql/union_gp.sql
+++ b/src/test/regress/sql/union_gp.sql
@@ -708,6 +708,18 @@ select json_data,id from my_table  where json_data->>'age' = '30' union all sele
 set optimizer_parallel_union to off;
 drop table if exists my_table;
 
+--
+-- test Github issue https://github.com/apache/cloudberry/issues/1240
+--
+create table r_1240(a int) distributed replicated;
+insert into r_1240 select generate_series(1,10);
+create table p1_1240(a int) distributed by (a);
+insert into p1_1240 select generate_series(1,3);
+explain(costs off) with result as (update r_1240 set a = a +1 where a < 5 returning *) select * from result except select * from p1_1240;
+with result as (update r_1240 set a = a +1 where a < 5 returning *) select * from result except select * from p1_1240;
+drop table r_1240;
+drop table p1_1240;
+
 --
 -- Clean up
 --
diff --git a/src/test/regress/sql/vacuum_gp.sql b/src/test/regress/sql/vacuum_gp.sql
index 04f88df9e0c..198a80f4a93 100644
--- a/src/test/regress/sql/vacuum_gp.sql
+++ b/src/test/regress/sql/vacuum_gp.sql
@@ -290,4 +290,19 @@ VACUUM vac_reltuple_distortion;
 VACUUM vac_reltuple_distortion; -- 2nd call to VACUUM after ANALYZE
 SELECT reltuples, relname FROM pg_class WHERE oid='vac_reltuple_distortion'::regclass;
 VACUUM vac_reltuple_distortion;
-SELECT reltuples, relname FROM pg_class WHERE oid='vac_reltuple_distortion'::regclass;
\ No newline at end of file
+SELECT reltuples, relname FROM pg_class WHERE oid='vac_reltuple_distortion'::regclass;
+
+-- test wrong log relcache leak in pg_catalog.gp_acquire_sample_rows
+-- start_ignore
+drop table if exists relcache_leak_in_motion;
+-- end_ignore
+create table relcache_leak_in_motion(v1 int);
+insert into relcache_leak_in_motion values(generate_series(0, 10000));
+SELECT gp_inject_fault('interconnect_stop_recv_chunk', 'interrupt', dbid)
+  FROM gp_segment_configuration WHERE content = -1 and role='p';
+analyze relcache_leak_in_motion;
+SELECT gp_inject_fault('interconnect_stop_recv_chunk', 'reset', dbid)
+  FROM gp_segment_configuration WHERE content = -1 and role='p';
+-- start_ignore
+drop table if exists relcache_leak_in_motion;
+-- end_ignore
diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql
index 70dd94fafae..1ae2af61983 100644
--- a/src/test/regress/sql/window.sql
+++ b/src/test/regress/sql/window.sql
@@ -242,63 +242,63 @@ SELECT sum(unique1) over (order by four range between current row and unbounded
 FROM tenk1 WHERE unique1 < 10;
 
 set search_path=singleseg, public;
-SELECT sum(unique1) over (rows between current row and unbounded following),
+SELECT sum(unique1) over (order by unique1 rows between current row and unbounded following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude no others),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude no others),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude current row),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude group),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude ties),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+SELECT first_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude current row),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude group),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+SELECT last_value(unique1) over (ORDER BY four, unique1 rows between current row and 2 following exclude ties),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between 2 preceding and 1 preceding),
+SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 1 preceding),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between 1 following and 3 following),
+SELECT sum(unique1) over (order by unique1 rows between 1 following and 3 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
-SELECT sum(unique1) over (rows between unbounded preceding and 1 following),
+SELECT sum(unique1) over (order by unique1 rows between unbounded preceding and 1 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
@@ -322,7 +322,7 @@ SELECT first_value(unique1) over w,
 	nth_value(unique1, 2) over w AS nth_2,
 	last_value(unique1) over w, unique1, four
 FROM tenk1 WHERE unique1 < 10
-WINDOW w AS (order by four range between current row and unbounded following);
+WINDOW w AS (order by unique1, four range between current row and unbounded following);
 
 SELECT sum(unique1) over
 	(order by unique1
diff --git a/src/test/regress/sql/window_parallel.sql b/src/test/regress/sql/window_parallel.sql
new file mode 100644
index 00000000000..c6cd5e197cc
--- /dev/null
+++ b/src/test/regress/sql/window_parallel.sql
@@ -0,0 +1,269 @@
+set force_parallel_mode = 0;
+set optimizer = off;
+
+create schema window_parallel;
+set search_path to window_parallel;
+set gp_appendonly_insert_files = 4;
+set min_parallel_table_scan_size = 0;
+
+--
+-- Test of Parallel process of Window Functions.
+--
+CREATE TABLE empsalary (
+    depname varchar,
+    empno bigint,
+    salary int,
+    enroll_date date
+);
+
+INSERT INTO empsalary VALUES
+('develop', 10, 5200, '2007-08-01'),
+('sales', 1, 5000, '2006-10-01'),
+('personnel', 5, 3500, '2007-12-10'),
+('sales', 4, 4800, '2007-08-08'),
+('personnel', 2, 3900, '2006-12-23'),
+('develop', 7, 4200, '2008-01-01'),
+('develop', 9, 4500, '2008-01-01'),
+('sales', 3, 4800, '2007-08-01'),
+('develop', 8, 6000, '2006-10-01'),
+('develop', 11, 5200, '2007-08-15');
+
+
+-- w1
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) FROM empsalary ORDER BY depname, salary;
+
+-- w2
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+SELECT depname, empno, salary, rank() OVER (PARTITION BY depname ORDER BY salary) FROM empsalary;
+
+-- w3
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+SELECT depname, empno, salary, sum(salary) OVER w FROM empsalary WINDOW w AS (PARTITION BY depname);
+
+-- w4
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+SELECT depname, empno, salary, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary) ORDER BY rank() OVER w;
+
+-- w5
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+SELECT sum(salary),
+	row_number() OVER (ORDER BY depname),
+	sum(sum(salary)) OVER (ORDER BY depname DESC)
+FROM empsalary GROUP BY depname;
+
+
+-- w6
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+-- identical windows with different names
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+-- identical windows with different names
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+SELECT sum(salary) OVER w1, count(*) OVER w2
+FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary);
+
+-- w7
+-- mixture of agg/wfunc in the same window
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+SELECT sum(salary) OVER w, rank() OVER w FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC);
+
+-- w8
+-- window agg in CASE WHEN clause
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno), MAX(depadj) OVER () FROM(
+	SELECT *,
+		CASE WHEN enroll_date < '2008-01-01' THEN 2008 - extract(YEAR FROM enroll_date) END * 500 AS bonus,
+		CASE WHEN
+			AVG(salary) OVER (PARTITION BY depname) < salary
+		THEN 200 END AS depadj FROM empsalary
+)s;
+
+-- w9
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+
+-- w10 
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+
+-- w11
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+
+-- w12
+set enable_parallel = off;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+set enable_parallel = on;
+EXPLAIN(COSTS OFF)
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+
+--
+-- End of test of Parallel process of Window Functions.
+--
+
+--
+-- Test Parallel UNION ALL
+--
+create table t1(a int, b int) with(parallel_workers=2);
+create table t2(a int, b int) with(parallel_workers=2);
+insert into t1 select i, i from generate_series(1, 10000) i;
+insert into t1 select i, i from generate_series(1, 10000) i;
+analyze t1;
+analyze t2;
+
+begin;
+set local enable_parallel = on;
+set local enable_parallel_append = on;
+set local min_parallel_table_scan_size = 0;
+
+-- If parallel-aware append encounters a motion hazard, fall back to parallel-oblivious append.
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+
+set local enable_parallel_append = off;
+-- Naturally, use parallel-oblivious append directly when parallel-aware mode is disabled.
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+
+-- Ensure compatibility between different paths when using parallel workers
+set local enable_parallel_append = on;
+set max_parallel_workers_per_gather = 3;
+alter table t2 set(parallel_workers=3);
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+
+-- Could not drive a parallel plan if no partial paths are avaliable
+alter table t2 set(parallel_workers=0);
+-- parallel-aware
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+set local enable_parallel_append = off;
+-- Also applies to parallel-oblivious
+explain(costs off, verbose)
+select b, count(*) from t1 group by b union all select b, count(*) from t2 group by b;
+abort;
+
+--
+-- End of test Parallel UNION ALL
+--
+-- start_ignore
+drop schema window_parallel cascade;
+-- end_ignore
+reset min_parallel_table_scan_size;
+reset enable_parallel;
+reset gp_appendonly_insert_files;
+reset force_parallel_mode;
+reset optimizer;
\ No newline at end of file
diff --git a/src/test/regress/sql/with.sql b/src/test/regress/sql/with.sql
index ca071d01a41..0b3da6cd98c 100644
--- a/src/test/regress/sql/with.sql
+++ b/src/test/regress/sql/with.sql
@@ -1575,3 +1575,71 @@ create temp table with_test (i int);
 with with_test as (select 42) insert into with_test select * from with_test;
 select * from with_test;
 drop table with_test;
+
+--
+-- writable CTE with SELECT INTO clause.
+--
+CREATE TABLE t_w_cte(a integer);
+EXPLAIN(COSTS OFF, VERBOSE) WITH ins AS (
+  INSERT INTO t_w_cte(a) VALUES (1), (2), (3)
+  RETURNING a
+)
+SELECT sum(a) INTO t_w_cte_1 FROM ins;
+DROP TABLE t_w_cte;
+
+CREATE TABLE t_w_cte_relp(a integer) distributed replicated;
+EXPLAIN(COSTS OFF, VERBOSE) WITH ins AS (
+  INSERT INTO t_w_cte_relp(a) VALUES (1), (2), (3)
+  RETURNING a
+)
+SELECT sum(a) INTO t_w_cte_relp_1 FROM ins;
+DROP TABLE t_w_cte_relp;
+
+--
+-- readable CTE with SELECT INTO clause.
+--
+WITH sel AS (
+  SELECT 1 as a
+)
+SELECT a INTO t_r_cte FROM sel;
+SELECT * FROM t_r_cte;
+DROP TABLE t_r_cte;
+
+--
+-- Multiple readable CTEs with SELECT INTO
+--
+WITH cte1 AS (SELECT 1 as a),
+     cte2 AS (SELECT 2 as b)
+SELECT a, b INTO t_multi_r_cte FROM cte1, cte2;
+SELECT * FROM t_multi_r_cte;
+DROP TABLE t_multi_r_cte;
+
+--
+-- Nested SELECT in CTE with SELECT INTO
+--
+WITH nested_cte AS (
+  SELECT * FROM (SELECT 100 as val, 'test'::text as name) subq
+)
+SELECT val, name INTO t_nested_r_cte FROM nested_cte;
+SELECT * FROM t_nested_r_cte;
+DROP TABLE t_nested_r_cte;
+
+--
+-- CTE with JOIN and SELECT INTO
+--
+WITH cte1 AS (SELECT 1 as id, 'foo' as val),
+     cte2 AS (SELECT 1 as id, 'bar' as val)
+SELECT cte1.id, cte1.val as val1, cte2.val as val2
+INTO t_join_r_cte
+FROM cte1 JOIN cte2 ON cte1.id = cte2.id;
+SELECT * FROM t_join_r_cte;
+DROP TABLE t_join_r_cte;
+
+--
+-- Verify mixed readable and writable CTEs blocked (negative test)
+--
+CREATE TABLE t_mixed_test (a int);
+WITH read_cte AS (SELECT 1 as x),
+     write_cte AS (INSERT INTO t_mixed_test VALUES (1) RETURNING *)
+SELECT x INTO t_should_fail2 FROM read_cte;  -- should fail
+DROP TABLE t_mixed_test;
diff --git a/src/test/regress/sql/with_clause.sql b/src/test/regress/sql/with_clause.sql
index 0ef209415ab..149edfe92af 100644
--- a/src/test/regress/sql/with_clause.sql
+++ b/src/test/regress/sql/with_clause.sql
@@ -462,3 +462,32 @@ UNION ALL
   SELECT 'sleep', 1 where pg_sleep(1) is not null
 UNION ALL
   SELECT 'c', j FROM cte;
+
+
+-- Test issue from PR#1204
+-- Executor used to fail to execute this query
+
+CREATE TABLE foo_issue_1204_test (a INT, b INT, c INT, d INT, e INT, f INT);
+INSERT INTO foo_issue_1204_test SELECT generate_series(1,10000);
+
+ANALYZE foo_issue_1204_test;
+
+-- Assert than plan uses Merge Append strategy, and has Share Input Scan node.
+-- Also we are not actaully interested in output so discard it using SELECT EXISTS() hack
+EXPLAIN (COSTS OFF, TIMING OFF, BUFFERS OFF)
+SELECT EXISTS(
+	with inp as MATERIALIZED (select * from  foo_issue_1204_test ) select a,b,c, count(distinct d), count(distinct e), count(distinct f) from inp group by 1,2,3
+	UNION ALL
+	select a,b,c, count(distinct d), count(distinct e), count(distinct f) from foo_issue_1204_test group by 1,2,3
+	ORDER BY 1
+);
+
+-- Check execution is ok
+SELECT EXISTS(
+	with inp as MATERIALIZED (select * from  foo_issue_1204_test ) select a,b,c, count(distinct d), count(distinct e), count(distinct f) from inp group by 1,2,3
+	UNION ALL
+	select a,b,c, count(distinct d), count(distinct e), count(distinct f) from foo_issue_1204_test group by 1,2,3
+	ORDER BY 1
+);
+
+DROP TABLE foo_issue_1204_test;
diff --git a/src/test/singlenode_regress/expected/groupingsets.out b/src/test/singlenode_regress/expected/groupingsets.out
index 36872ea7a29..83d6890b95d 100644
--- a/src/test/singlenode_regress/expected/groupingsets.out
+++ b/src/test/singlenode_regress/expected/groupingsets.out
@@ -2069,14 +2069,13 @@ select g100, g10, sum(g::numeric), count(*), max(g::text)
 from gs_data_1 group by cube (g1000, g100,g10);
              QUERY PLAN              
 -------------------------------------
- GroupAggregate
+ MixedAggregate
+   Hash Key: g100
+   Hash Key: g100, g10
    Group Key: g1000, g100, g10
    Group Key: g1000, g100
    Group Key: g1000
    Group Key: ()
-   Sort Key: g100, g10
-     Group Key: g100, g10
-     Group Key: g100
    Sort Key: g10, g1000
      Group Key: g10, g1000
      Group Key: g10
@@ -2084,7 +2083,7 @@ from gs_data_1 group by cube (g1000, g100,g10);
          Sort Key: g1000, g100, g10
          ->  Seq Scan on gs_data_1
  Optimizer: Postgres query optimizer
-(15 rows)
+(14 rows)
 
 create table gs_hash_1 as
 select g100, g10, sum(g::numeric), count(*), max(g::text)
diff --git a/src/test/singlenode_regress/expected/matview_data.out b/src/test/singlenode_regress/expected/matview_data.out
index 4139b96f5f3..14c7fc48f45 100644
--- a/src/test/singlenode_regress/expected/matview_data.out
+++ b/src/test/singlenode_regress/expected/matview_data.out
@@ -462,7 +462,7 @@ select mvname, datastatus from gp_matview_aux where mvname like 'mv_par%';
  mv_par1_1 | i
  mv_par1   | i
  mv_par    | i
- mv_par2   | u
+ mv_par2   | i
 (6 rows)
 
 refresh materialized view mv_par;
diff --git a/src/test/singlenode_regress/expected/qp_with_clause.out b/src/test/singlenode_regress/expected/qp_with_clause.out
index 70620fb5dd8..35831398b32 100644
--- a/src/test/singlenode_regress/expected/qp_with_clause.out
+++ b/src/test/singlenode_regress/expected/qp_with_clause.out
@@ -11078,7 +11078,7 @@ ORDER BY 1, 2, 3, 4 DESC LIMIT 25;
  35NAME        |              7 | 5NAME        |              1
 (25 rows)
 
--- Test that SharedInputScan within the same slice is always executed 
+-- Test that ShareInputScan within the same slice is always executed 
 set gp_cte_sharing=on;
 -- start_ignore
 CREATE TABLE car (a int, b int);
diff --git a/src/test/singlenode_regress/expected/query_finish_pending.out b/src/test/singlenode_regress/expected/query_finish_pending.out
index 92a45ebf7b6..92b96a14d53 100644
--- a/src/test/singlenode_regress/expected/query_finish_pending.out
+++ b/src/test/singlenode_regress/expected/query_finish_pending.out
@@ -98,7 +98,7 @@ select gp_inject_fault('execsort_sort_bounded_heap', 'status', 1);
  
 (1 row)
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node
 drop table if exists testsisc;
 NOTICE:  table "testsisc" does not exist, skipping
@@ -110,7 +110,7 @@ insert into testsisc select i, i % 1000, i % 100000, i % 75 from
 	(select count(*) as nsegments from gp_segment_configuration where role='p' and content >= -1) foo) bar; 
 set gp_resqueue_print_operator_memory_limits=on;
 set statement_mem='2MB';
--- ORCA does not generate SharedInputScan with a Sort node underneath it. For
+-- ORCA does not generate ShareInputScan with a Sort node underneath it. For
 -- the following query, ORCA disregards the order by inside the cte definition;
 -- planner on the other hand does not.
 set optimizer=off;
@@ -120,8 +120,8 @@ select gp_inject_fault('execshare_input_next', 'reset', 1);
  Success:
 (1 row)
 
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 1);
  gp_inject_fault 
 -----------------
@@ -145,7 +145,7 @@ select gp_inject_fault('execshare_input_next', 'status', 1);
  
 (1 row)
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node and sort_mk algorithm is used
 select gp_inject_fault('execshare_input_next', 'reset', 1);
  gp_inject_fault 
@@ -153,8 +153,8 @@ select gp_inject_fault('execshare_input_next', 'reset', 1);
  Success:
 (1 row)
 
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 1);
  gp_inject_fault 
 -----------------
diff --git a/src/test/singlenode_regress/expected/workfile/hashagg_spill.out b/src/test/singlenode_regress/expected/workfile/hashagg_spill.out
index 4a61fc97090..cc98d3a785a 100644
--- a/src/test/singlenode_regress/expected/workfile/hashagg_spill.out
+++ b/src/test/singlenode_regress/expected/workfile/hashagg_spill.out
@@ -112,6 +112,7 @@ reset optimizer_force_multistage_agg;
 CREATE TABLE hashagg_spill(col1 numeric, col2 int);
 INSERT INTO hashagg_spill SELECT id, 1 FROM generate_series(1,20000) id;
 ANALYZE hashagg_spill;
+set hash_mem_multiplier = 1;
 SET statement_mem='1000kB';
 SET gp_workfile_compression = OFF;
 select * from hashagg_spill.is_workfile_created('explain (analyze, verbose) SELECT avg(col2) col2 FROM hashagg_spill GROUP BY col1 HAVING(sum(col1)) < 0;');
@@ -131,6 +132,7 @@ select * from hashagg_spill.is_workfile_created('explain (analyze, verbose) SELE
 CREATE TABLE spill_temptblspace (a numeric);
 SET temp_tablespaces=pg_default;
 INSERT INTO spill_temptblspace SELECT avg(col2) col2 FROM hashagg_spill GROUP BY col1 HAVING(sum(col1)) < 0;
+reset hash_mem_multiplier;
 RESET temp_tablespaces;
 RESET statement_mem;
 RESET gp_workfile_compression;
diff --git a/src/test/singlenode_regress/sql/qp_with_clause.sql b/src/test/singlenode_regress/sql/qp_with_clause.sql
index 117da4ce87a..5ca3593210b 100644
--- a/src/test/singlenode_regress/sql/qp_with_clause.sql
+++ b/src/test/singlenode_regress/sql/qp_with_clause.sql
@@ -10329,7 +10329,7 @@ WHERE  e.deptno = dc1.deptno AND
        m.deptno = dmc1.dept_mgr_no
 ORDER BY 1, 2, 3, 4 DESC LIMIT 25;
 
--- Test that SharedInputScan within the same slice is always executed 
+-- Test that ShareInputScan within the same slice is always executed 
 set gp_cte_sharing=on;
 
 -- start_ignore
diff --git a/src/test/singlenode_regress/sql/query_finish_pending.sql b/src/test/singlenode_regress/sql/query_finish_pending.sql
index b59fced52ac..c353bf82abf 100644
--- a/src/test/singlenode_regress/sql/query_finish_pending.sql
+++ b/src/test/singlenode_regress/sql/query_finish_pending.sql
@@ -45,7 +45,7 @@ select i1 from _tmp_table order by i2 limit 3;
 
 select gp_inject_fault('execsort_sort_bounded_heap', 'status', 1);
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node
 drop table if exists testsisc;
 create table testsisc (i1 int, i2 int, i3 int, i4 int); 
@@ -55,13 +55,13 @@ insert into testsisc select i, i % 1000, i % 100000, i % 75 from
 
 set gp_resqueue_print_operator_memory_limits=on;
 set statement_mem='2MB';
--- ORCA does not generate SharedInputScan with a Sort node underneath it. For
+-- ORCA does not generate ShareInputScan with a Sort node underneath it. For
 -- the following query, ORCA disregards the order by inside the cte definition;
 -- planner on the other hand does not.
 set optimizer=off;
 select gp_inject_fault('execshare_input_next', 'reset', 1);
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 1);
 
 -- In cbdb single node, if we inject fault in the single node, no data should return. 
@@ -71,13 +71,13 @@ select * from cte c1, cte c2 limit 2;
 -- end_ignore
 select gp_inject_fault('execshare_input_next', 'status', 1);
 
--- test if shared input scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
+-- test if Share Input Scan deletes memory correctly when QueryFinishPending and its child has been eagerly freed,
 -- where the child is a Sort node and sort_mk algorithm is used
 
 
 select gp_inject_fault('execshare_input_next', 'reset', 1);
--- Set QueryFinishPending to true after SharedInputScan has retrieved the first tuple. 
--- This will eagerly free the memory context of shared input scan's child node.  
+-- Set QueryFinishPending to true after ShareInputScan has retrieved the first tuple. 
+-- This will eagerly free the memory context of Share Input Scan's child node.  
 select gp_inject_fault('execshare_input_next', 'finish_pending', 1);
 
 -- In cbdb single node, if we inject fault in the single node, no data should return. 
diff --git a/src/test/singlenode_regress/sql/workfile/hashagg_spill.sql b/src/test/singlenode_regress/sql/workfile/hashagg_spill.sql
index 6f22b57a99a..7cbcd11b8ec 100644
--- a/src/test/singlenode_regress/sql/workfile/hashagg_spill.sql
+++ b/src/test/singlenode_regress/sql/workfile/hashagg_spill.sql
@@ -85,6 +85,7 @@ reset optimizer_force_multistage_agg;
 CREATE TABLE hashagg_spill(col1 numeric, col2 int);
 INSERT INTO hashagg_spill SELECT id, 1 FROM generate_series(1,20000) id;
 ANALYZE hashagg_spill;
+set hash_mem_multiplier = 1;
 SET statement_mem='1000kB';
 SET gp_workfile_compression = OFF;
 select * from hashagg_spill.is_workfile_created('explain (analyze, verbose) SELECT avg(col2) col2 FROM hashagg_spill GROUP BY col1 HAVING(sum(col1)) < 0;');
@@ -95,6 +96,7 @@ select * from hashagg_spill.is_workfile_created('explain (analyze, verbose) SELE
 CREATE TABLE spill_temptblspace (a numeric);
 SET temp_tablespaces=pg_default;
 INSERT INTO spill_temptblspace SELECT avg(col2) col2 FROM hashagg_spill GROUP BY col1 HAVING(sum(col1)) < 0;
+reset hash_mem_multiplier;
 RESET temp_tablespaces;
 RESET statement_mem;
 RESET gp_workfile_compression;
diff --git a/src/test/unit/mock/gpopt_mock.c b/src/test/unit/mock/gpopt_mock.c
index 39bf2c49e82..ae16a4cab75 100644
--- a/src/test/unit/mock/gpopt_mock.c
+++ b/src/test/unit/mock/gpopt_mock.c
@@ -3,6 +3,7 @@
 #include "lib/stringinfo.h"
 #include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
+#include "optimizer/orcaopt.h"
 
 char *
 SerializeDXLPlan(Query *pquery)
@@ -12,7 +13,7 @@ SerializeDXLPlan(Query *pquery)
 }
 
 PlannedStmt *
-GPOPTOptimizedPlan(Query *pquery, bool pfUnexpectedFailure)
+GPOPTOptimizedPlan(Query *pquery, bool pfUnexpectedFailure, OptimizerOptions *opts)
 {
 	elog(ERROR, "mock implementation of GPOPTOptimizedPlan called");
 	return NULL;
diff --git a/src/tools/hooks/install b/src/tools/hooks/install
deleted file mode 100755
index ca10e19d00d..00000000000
--- a/src/tools/hooks/install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-hookdir=$(git rev-parse --git-dir)/hooks
-echo "Creating symlinks in $hookdir"
-
-set -ex
-ln -sf ../../hooks/pre-push $hookdir
diff --git a/src/tools/hooks/pre-push b/src/tools/hooks/pre-push
deleted file mode 100755
index dd7c8d16a7d..00000000000
--- a/src/tools/hooks/pre-push
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Hook to try to catch pushing pipelines without running `fly set-pipeline` first.
-
-# Refer to .git/hooks/pre-push.sample for more info on how it works.
-
-remote="$1"
-url="$2"
-
-z40=0000000000000000000000000000000000000000
-
-function user_input_to_proceed() {
-  read -p 'Proceed with push? (y/N): ' yesno </dev/tty
-  case "$yesno" in
-    y|Y|yes|Yes|YES) ;;
-    *) echo "Aborting push" >&2; exit 1 ;;
-  esac
-}
-
-while read local_ref local_sha remote_ref remote_sha ; do
-  if [ "$local_sha" = $z40 ] ; then
-    # Handle delete
-    continue
-  fi
-  if [ "$remote_sha" = $z40 ] ; then
-    # New branch
-    continue
-  fi
-  # Update to existing branch, examine new commits
-  range="$remote_sha..$local_sha"
-
-  # Check for changed files in concourse/pipelines
-  changed_pipeline_ymls=$(git rev-list -n 1 "$range" -- concourse/pipelines/*.yml)
-  changed_pipeline_pys=$(git rev-list -n 1 "$range" -- concourse/pipelines/*.py)
-  changed_pipeline_templates=$(git rev-list -n 1 "$range" -- concourse/pipelines/templates/*)
-
-  # if either a change to generators or a change to the templates, but no new pipeline file, warn user
-  if [ -n "${changed_pipeline_pys}${changed_pipeline_templates}" ] && [ -z "$changed_pipeline_ymls" ] ; then
-    echo 'You appear to have changed pipeline inputs (generator or template). Please check in the corresponding generated pipeline.'
-    user_input_to_proceed
-  elif [ -n "$changed_pipeline_ymls" ] ; then
-    echo 'You appear to be pushing a change to a pipeline. Please make sure you ran `fly set-pipeline` first.'
-    user_input_to_proceed
-  fi
-done
-
-exit 0