Merge branch 'main' into cherry-pick-pg_dump

Author: yjhjstz

.asf.yaml

@@ -90,6 +90,10 @@ github:
           - RPM Install Test Apache Cloudberry
           - ic-good-opt-off
           - ic-good-opt-on
+          - pax-ic-good-opt-off
+          - pax-ic-good-opt-on
+          - pax-ic-isolation2-opt-off
+          - pax-ic-isolation2-opt-on
           - ic-expandshrink
           - ic-singlenode
           - ic-resgroup-v2

.github/workflows/build-cloudberry.yml

@@ -230,6 +230,42 @@ jobs:
                "make_configs":["src/test/regress:installcheck-good"],
                "pg_settings":{"optimizer":"on"}
               },
+              {"test":"pax-ic-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-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":"pax-ic-isolation2-opt-off",
+               "make_configs":["contrib/pax_storage/:isolation2_test"],
+               "pg_settings":{
+                 "optimizer":"off",
+                 "default_table_access_method":"pax"
+                },
+                "enable_core_check":false
+              },
+              {"test":"pax-ic-isolation2-opt-on",
+               "make_configs":["contrib/pax_storage/:isolation2_test"],
+               "pg_settings":{
+                 "optimizer":"on",
+                 "default_table_access_method":"pax"
+                },
+                "enable_core_check":false
+              },
               {"test":"ic-expandshrink",
                "make_configs":["src/test/isolation2:installcheck-expandshrink"]
               },
@@ -482,6 +518,11 @@ jobs:
         run: |
           set -eo pipefail
 
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && git submodule update --init"; then
+            echo "::error::Fail to pull submodule."
+            exit 1
+          fi
+
           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
             echo "::error::Build script failed"
@@ -1267,6 +1308,10 @@ jobs:
             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, ' ') }}"
 

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

@@ -427,6 +427,11 @@ jobs:
         run: |
           set -eo pipefail
 
+          if ! time su - gpadmin -c "cd ${SRC_DIR} && git submodule update --init"; then
+            echo "::error::Fail to pull submodule."
+            exit 1
+          fi
+
           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
             echo "::error::Build script failed"

.github/workflows/coverity.yml

@@ -90,12 +90,14 @@ jobs:
         su - gpadmin -c "cd $WORKSPACE"
         export LD_LIBRARY_PATH=/usr/local/cloudberry-db/lib:LD_LIBRARY_PATH
         export PATH=$WORKSPACE/coverity_tool/bin:$PATH
+        git submodule update --init
         ./configure --prefix=/usr/local/cloudberry-db \
             --disable-external-fts \
             --enable-gpcloud \
             --enable-ic-proxy \
             --enable-orafce \
             --enable-orca \
+            --enable-pax \
             --enable-pxf \
             --enable-tap-tests \
             --with-gssapi \
@@ -122,4 +124,4 @@ jobs:
           --form file=@cov.tar.gz \
           --form version="Commit $GITHUB_SHA" \
           --form description="Build submitted via CI" \
-          https://scan.coverity.com/builds?project=apache%2Fcloudberry
+          https://scan.coverity.com/builds?project=apache%2Fcloudberry

.gitmodules

@@ -1,3 +1,20 @@
 [submodule "gpcontrib/gpcloud/test/googletest"]
 	path = gpcontrib/gpcloud/test/googletest
 	url = https://github.com/google/googletest.git
+[submodule "contrib/pax_storage/src/cpp/contrib/googletest"]
+	path = contrib/pax_storage/src/cpp/contrib/googletest
+	url = https://github.com/google/googletest.git
+	branch = v1.15.x
+[submodule "contrib/pax_storage/src/cpp/contrib/tabulate"]
+	path = contrib/pax_storage/src/cpp/contrib/tabulate
+	url = https://github.com/p-ranav/tabulate.git
+[submodule "contrib/pax_storage/src/cpp/contrib/googlebench"]
+	path = contrib/pax_storage/src/cpp/contrib/googlebench
+	url = https://github.com/google/benchmark.git
+[submodule "contrib/pax_storage/src/cpp/contrib/cpp-stub"]
+	path = contrib/pax_storage/src/cpp/contrib/cpp-stub
+	url = https://github.com/coolxv/cpp-stub.git
+[submodule "dependency/yyjson"]
+	path = dependency/yyjson
+	url = https://github.com/ibireme/yyjson.git
+

GNUmakefile.in

@@ -31,6 +31,9 @@ all:
 	$(MAKE) -C contrib/pg_buffercache all
 ifeq ($(with_openssl), yes)
 	$(MAKE) -C contrib/sslinfo all
+endif
+ifeq ($(enable_pax), yes)
+	$(MAKE) -C contrib/pax_storage all
 endif
 	$(MAKE) -C gpMgmt all
 	$(MAKE) -C gpcontrib all
@@ -73,6 +76,9 @@ install:
 	$(MAKE) -C contrib/tablefunc $@
 	$(MAKE) -C contrib/passwordcheck $@
 	$(MAKE) -C contrib/pg_buffercache $@
+ifeq ($(enable_pax), yes)
+	$(MAKE) -C contrib/pax_storage $@
+endif
 ifeq ($(with_openssl), yes)
 	$(MAKE) -C contrib/sslinfo $@
 endif
@@ -180,6 +186,9 @@ ICW_TARGETS += contrib/extprotocol contrib/dblink contrib/pg_trgm
 ICW_TARGETS += contrib/indexscan contrib/hstore contrib/pgcrypto
 ICW_TARGETS += contrib/tablefunc contrib/passwordcheck
 ICW_TARGETS += contrib/pg_buffercache
+ifeq ($(enable_pax), yes)
+ICW_TARGETS += contrib/pax_storage
+endif
 # sslinfo depends on openssl
 ifeq ($(with_openssl), yes)
 ICW_TARGETS += contrib/sslinfo

configure

@@ -751,6 +751,7 @@ ICU_CFLAGS
 with_icu
 enable_thread_safety
 INCLUDES
+enable_pax
 enable_preload_ic_module
 enable_ic_proxy
 enable_external_fts
@@ -901,6 +902,7 @@ enable_gpcloud
 enable_external_fts
 enable_ic_proxy
 enable_preload_ic_module
+enable_pax
 enable_thread_safety
 with_icu
 with_tcl
@@ -1616,6 +1618,7 @@ Optional Features:
                           library)
   --disable-preload-ic-module
                           disable preload interconnect module
+  --enable-pax            enable pax support
   --disable-thread-safety disable thread-safety in client libraries
   --enable-openssl-redirect
                           enable redirect openssl interface to internal
@@ -9098,6 +9101,36 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with preload ic module ... $enable_preload_ic_module" >&5
 $as_echo "checking whether to build with preload ic module ... $enable_preload_ic_module" >&6; }
 
+#
+# pax support
+#
+
+
+# Check whether --enable-pax was given.
+if test "${enable_pax+set}" = set; then :
+  enableval=$enable_pax;
+  case $enableval in
+    yes)
+
+$as_echo "#define USE_PAX_STORAGE 1" >>confdefs.h
+
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --enable-pax option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  enable_pax=yes
+  
+  $as_echo "#define USE_PAX_STORAGE 1" >>confdefs.h
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with pax support ... $enable_pax" >&5
+$as_echo "checking whether to build with pax support ... $enable_pax" >&6; }
 
 #
 # Include directories

configure.ac

@@ -925,6 +925,16 @@ PGAC_ARG_BOOL(enable, preload-ic-module, yes,
 AC_MSG_RESULT([checking whether to build with preload ic module ... $enable_preload_ic_module])
 AC_SUBST(enable_preload_ic_module)
 
+#
+# pax support
+#
+PGAC_ARG_BOOL(enable, pax, yes,
+              [disable PAX support],
+              [AC_DEFINE(USE_PAX_STORAGE, 1,
+                         [Define to 1 to support PAX])])
+AC_MSG_RESULT([checking whether to build with PAX support ... $enable_pax])
+AC_SUBST(enable_pax)
+
 #
 # Include directories
 #

contrib/Makefile

@@ -98,6 +98,12 @@ else
 ALWAYS_SUBDIRS += hstore_plpython jsonb_plpython ltree_plpython
 endif
 
+ifeq ($(enable_pax),yes)
+SUBDIRS += pax_storage
+else
+ALWAYS_SUBDIRS += pax_storage
+endif
+
 # Missing:
 #		start-scripts	\ (does not have a makefile)