Merge branch 'apache:main' into main

Author: leborchuk

.asf.yaml

@@ -122,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

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

@@ -32,9 +32,9 @@ name: Apache Rat License Check
 
 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:
 

.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:
@@ -316,7 +316,8 @@ jobs:
                                "gpcontrib/pxf_fdw:installcheck",
                                "gpcontrib/zstd:installcheck",
                                "gpcontrib/gp_sparse_vector:installcheck",
-                               "gpcontrib/gp_toolkit:installcheck"]
+                               "gpcontrib/gp_toolkit:installcheck",
+                               "gpcontrib/gp_exttable_fdw:installcheck"]
               },
               {"test":"ic-fixme",
                "make_configs":["src/test/regress:installcheck-fixme"],

.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:

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

@@ -74,9 +74,9 @@ name: Apache Cloudberry Debian 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:  # Manual trigger
     inputs:

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]
-)
+)

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]
-)
+)

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,

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

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