Package: update rpm and deb package files

Main changes are included:
  * Rename package from pxf-gpX to cloudberry-pxf
  * Update installation paths to /usr/local/cloudberry-pxf-[VERSION]
  * Remove legacy pxf-gp7.spec and pxf-cbdb1.spec files
  * Update DEBIAN package control files with new naming
  * Standardize package configuration based on cloudberry-pxf.spec

Author: tuhaihe

Makefile

@@ -98,7 +98,7 @@ endif
 	set -e ;\
 	GP_MAJOR_VERSION=$$(cat $(SOURCE_EXTENSION_DIR)/build/metadata/gp_major_version) ;\
 	GP_BUILD_ARCH=$$(cat $(SOURCE_EXTENSION_DIR)/build/metadata/build_arch) ;\
-	PXF_PACKAGE_NAME=pxf-cbdb$${GP_MAJOR_VERSION}-$${PXF_VERSION}-$${GP_BUILD_ARCH} ;\
+	PXF_PACKAGE_NAME=pxf-cloudberry$${GP_MAJOR_VERSION}-$${PXF_VERSION}-$${GP_BUILD_ARCH} ;\
 	mkdir -p build/stage/$${PXF_PACKAGE_NAME} ;\
 	cp -a $(SOURCE_EXTENSION_DIR)/build/stage/* build/stage/$${PXF_PACKAGE_NAME} ;\
 	cp -a cli/build/stage/* build/stage/$${PXF_PACKAGE_NAME} ;\
@@ -118,14 +118,14 @@ gppkg-rpm: rpm
 	mkdir -p gppkg/deps
 	GP_MAJOR_VERSION=$$(cat $(SOURCE_EXTENSION_DIR)/build/metadata/gp_major_version)
 	cat package/gppkg_spec.yml.in | sed "s,#arch,`arch`," | sed "s,#os,$(TEST_OS)," | sed "s,#gppkgver,1.0," | sed "s,#gpver,1," > gppkg/gppkg_spec.yml
-	find build/rpmbuild/RPMS -name pxf-cbdb$(GP_MAJOR_VERSION)-*.rpm -exec cp {} gppkg/ \;
+	find build/rpmbuild/RPMS -name pxf-cloudberry$(GP_MAJOR_VERSION)-*.rpm -exec cp {} gppkg/ \;
 	source $(GPHOME)/greenplum_path.sh || source $(GPHOME)/cloudberry-env.sh && gppkg --build gppkg
 
 rpm: stage
 	set -e ;\
 	GP_MAJOR_VERSION=$$(cat $(SOURCE_EXTENSION_DIR)/build/metadata/gp_major_version) ;\
 	GP_BUILD_ARCH=$$(cat $(SOURCE_EXTENSION_DIR)/build/metadata/build_arch) ;\
-	PXF_PACKAGE_NAME=pxf-cbdb$${GP_MAJOR_VERSION}-${PXF_VERSION}-$${GP_BUILD_ARCH} ;\
+	PXF_PACKAGE_NAME=pxf-cloudberry$${GP_MAJOR_VERSION}-${PXF_VERSION}-$${GP_BUILD_ARCH} ;\
 	PXF_FULL_VERSION=${PXF_VERSION} ;\
 	PXF_MAIN_VERSION=$$(echo $${PXF_FULL_VERSION} | sed -E 's/(-SNAPSHOT|-rc[0-9]+)$$//') ;\
 	if [[ $${PXF_FULL_VERSION} == *"-SNAPSHOT" ]]; then \

package/DEBIAN/conffiles

@@ -1,4 +1,4 @@
-/usr/local/pxf-gp6/conf/pxf-application.properties
-/usr/local/pxf-gp6/conf/pxf-env.sh
-/usr/local/pxf-gp6/conf/pxf-log4j2.xml
-/usr/local/pxf-gp6/conf/pxf-profiles.xml
+/usr/local/cloudberry-pxf/conf/pxf-application.properties
+/usr/local/cloudberry-pxf/conf/pxf-env.sh
+/usr/local/cloudberry-pxf/conf/pxf-log4j2.xml
+/usr/local/cloudberry-pxf/conf/pxf-profiles.xml

package/DEBIAN/control

@@ -1,5 +1,5 @@
-Package: pxf-gp6
+Package: cloudberry-pxf
 Version: %VERSION%
-Architecture: amd64
+Architecture: %ARCH%
 Maintainer: %MAINTAINER%
-Description: Greenplum PXF framework for external data access
+Description: Apache Cloudberry PXF (Platform Extension Framework) for advanced data access

package/DEBIAN/postinst

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-sed -i "s|directory =.*|directory = '/usr/local/pxf-gp6/gpextable/'|g" /usr/local/pxf-gp6/gpextable/pxf.control
-sed -i "s|module_pathname =.*|module_pathname = '/usr/local/pxf-gp6/gpextable/pxf'|g" /usr/local/pxf-gp6/gpextable/pxf.control
+sed -i "s|directory =.*|directory = '/usr/local/cloudberry-pxf/gpextable/'|g" "/usr/local/cloudberry-pxf/gpextable/pxf.control"
+sed -i "s|module_pathname =.*|module_pathname = '/usr/local/cloudberry-pxf/gpextable/pxf'|g" "/usr/local/cloudberry-pxf/gpextable/pxf.control"

package/DEBIAN/prerm

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-rm -f /usr/local/pxf-gp6/conf/pxf-private.classpath
-rm -rf /usr/local/pxf-gp6/pxf-service
-rm -rf /usr/local/pxf-gp6/run
+rm -f /usr/local/cloudberry-pxf/conf/pxf-private.classpath
+rm -rf /usr/local/cloudberry-pxf/pxf-service
+rm -rf /usr/local/cloudberry-pxf/run

package/README.md

@@ -1,60 +1,60 @@
 PXF Packaging
 ============
 
-PXF consists of 3 groups of artifacts, each developed using a different underlying technology:
+Apache Cloudberry PXF (Platform Extension Framework) consists of 3 groups of artifacts, each developed using a different underlying technology:
 
-* Greenplum extension -- written in C; when built, produces a `pxf.so` library and configuration files
+* Apache Cloudberry extension -- written in C; when built, produces a `pxf.so` library and configuration files
 * PXF Server -- written in Java; when built, produces a `pxf.war` file, Tomcat server, dependent JAR files, templates and scripts
 * Script Cluster Plugin -- written in Go; when built, produces a `pxf-cli` executable
 
-The PXF build system can create an RPM package on CentOs platform and a DEB package on Ubuntu platform,
-respectively. PXF compiles against and generates a different package for every major Greenplum version.
+The PXF build system can create an RPM package on CentOS platform and a DEB package on Ubuntu platform,
+respectively. PXF compiles against and generates packages for Apache Cloudberry.
 
-For example, `pxf-gp5-1.2.3-1.el7.x86_64.rpm` represents an RPM package of PXF version 1.2.3 intended to work with
-Greenplum 5 on Centos / Redhat 7 operating systems.
+For example, `cloudberry-pxf-1.2.3-1.el7.x86_64.rpm` represents an RPM package of PXF version 1.2.3 intended to work with
+Apache Cloudberry on CentOS / Red Hat 7 operating systems.
 
 ## PXF RPM specification
-On Centos platforms PXF product is packaged as an RPM. The specification on how to build the RPM is provided by the
-`pxf-gpX.spec` files in this directory. The following key design decisions were made:
+On CentOS platforms PXF product is packaged as an RPM. The specification on how to build the RPM is provided by the
+`cloudberry-pxf.spec` file in this directory. The following key design decisions were made:
 
-* the name of the RPM package is `pxf-gpX`, where X is the major Greenplum version (e.g. `pxf-gp5`, `pxf-gp6`)
-* to install a newer RPM package for the same Greenplum major release, a user will have to upgrade the PXF RPM
-* the RPM installs PXF server into `/usr/local/pxf-gpX` directory (e.g. `/usr/local/pxf-gp6`)
+* the name of the RPM package is `cloudberry-pxf`
+* to install a newer RPM package, a user will have to upgrade the PXF RPM
+* the RPM installs PXF server into `/usr/local/cloudberry-pxf-[VERSION]` directory (e.g. `/usr/local/cloudberry-pxf-1.2.3`)
 * the RPM is relocatable, a user can specify --prefix option when installing the RPM to install the server into another directory
-* the PXF greenplum extension is initially installed by RPM alongside the PXF server and is not initially active
-* the PXF greenplum extension is copied into Greenplum install location during `pxf init` command issued by a user after the install
+* the PXF Apache Cloudberry extension is initially installed by RPM alongside the PXF server and is not initially active
+* the PXF Apache Cloudberry extension is copied into Cloudberry install location during `pxf init` command issued by a user after the install
 * the PXF RPM version number follows 3-number semantic versioning and must be provided during the RPM build process
 * the PXF RPM release number is usually specified as `1`
-* example PXF RPM names are : `pxf-gp5-1.2.3-1.el6.x86_64.rpm` and `pxf-gp5-1.2.3-1.el7.x86_64.rpm` 
+* example PXF RPM names are : `cloudberry-pxf-1.2.3-1.el7.x86_64.rpm` and `cloudberry-pxf-1.2.3-1.el8.x86_64.rpm` 
 
 ## PXF RPM build process
 
 To build an RPM, follow these steps:
 1. Install the `rpm-build` package: `sudo yum install rpm-build`
-2. Install Greenplum database
-3. Run `source $GPHOME/greenplum_path.sh` to configure your `PATH` to be able to find `pg_config` program
+2. Install Apache Cloudberry
+3. Run `source $GPHOME/greenplum_path.sh`(for Cloudberry 2.0) or `source $GPHOME/cloudberry-env.sh` (for Cloudberry 2.1+) to configure your `PATH` to be able to find `pg_config` program
 4. Run `make clean rpm` from the top-level directory to build artifacts and assemble the RPM
 5. The RPM will be available in `build/rpmbuild/RPMS` directory
 
 
 ## PXF RPM installation process
 To install PXF from an RPM, follow these steps:
-1. Build or download PXF RPM for the corresponding major version of Greenplum. The following example will assume
-   that PXF version `1.2.3` will be installed to work with with Greenplum 5.
-2. Decide which OS user will own the PXF installation. If PXF is installed alongside Greenplum, the user that owns the PXF
-installation should either be the same as the one owning the Greenplum installation or have write privilleges to the
-Greenplum installation directory. This is necessary to be able to register the PXF Greenplum extension with Greenplum.
+1. Build or download PXF RPM for Apache Cloudberry. The following example will assume
+   that PXF version `1.2.3` will be installed to work with Apache Cloudberry.
+2. Decide which OS user will own the PXF installation. If PXF is installed alongside Apache Cloudberry, the user that owns the PXF
+installation should either be the same as the one owning the Cloudberry installation or have write privileges to the
+Cloudberry installation directory. This is necessary to be able to register the PXF Apache Cloudberry extension with Cloudberry.
 3. If a previous PXF version has been installed, stop the PXF server.
-4. As a superuser, run `rpm -Uvh pxf-gp5-1.2.3-1.el7.x86_64.rpm` to install the RPM into `/usr/local/pxf-gp5`
-5. As a superuser, run `chown gpadmin:gpadmin /usr/local/pxf-gp5` to change ownership of PXF installation to the user `gpadmin`.
+4. As a superuser, run `rpm -Uvh cloudberry-pxf-1.2.3-1.el7.x86_64.rpm` to install the RPM into `/usr/local/cloudberry-pxf-1.2.3`
+5. As a superuser, run `chown gpadmin:gpadmin /usr/local/cloudberry-pxf-1.2.3` to change ownership of PXF installation to the user `gpadmin`.
 Specify a different user other than `gpadmin`, if desired.
 
 After these steps, the PXF product will be installed and is ready to be configured. If there was a previous installation of
-PXF for the same major Greenplum version, the files and the runtime directories from the older version will be removed.
+PXF, the files and the runtime directories from the older version will be removed.
 The PXF configuration directory should remain intact. You will need to have Java installed to run the PXF server.
 
 ## PXF removal process
 To remove the installed PXF package, follow these steps:
 1. Stop the PXF server.
-2. As a superuser, run `rpm -e pxf-gp5` (or `rpm -e pxf-gp6`). This will remove all files installed by the RPM package
+2. As a superuser, run `rpm -e cloudberry-pxf`. This will remove all files installed by the RPM package
 and the PXF runtime directories. The PXF configuration directory should remain intact.

package/cloudberry-pxf.spec

@@ -27,8 +27,6 @@ Requires: bash
 # installing on Cloudberry node, so inherit Cloudberry's dependencies
 # implicitly
 
-Requires: cloudberry-db
-
 # Weak dependencies either OpenJDK 8 or 11
 Suggests: java-1.8.0-openjdk
 Suggests: java-11-openjdk

package/install_binary

@@ -4,9 +4,9 @@ INSTALL_COMPONENT_SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 PXF_VERSION=$(<"${INSTALL_COMPONENT_SCRIPT_DIR}/pxf/version")
 
 function show_help() {
-    echo "This script installs PXF Greenplum Extension and PXF Server"
+    echo "This script installs PXF Extension and PXF Server"
     echo "to install the PXF Extension :"
-    echo "  set GPHOME environment variable to the installation directory of Greenplum Database"
+    echo "  set GPHOME environment variable to the installation directory of Apache Cloudberry"
     echo "to install the PXF Server :"
     echo "  either set PXF_HOME environment variable to the target PXF Server installation directory"
     echo "  or     set GPHOME   environment variable to have PXF Server installed into \${GPHOME}/pxf"
@@ -29,8 +29,8 @@ function check_gphome() {
             exit 1
         fi
     else
-        if [[ ! -f ${GPHOME}/greenplum_path.sh ]]; then
-            echo "Error: environment variable GPHOME (${GPHOME}) must be set to a valid Greenplum installation"
+        if [[ ! -f ${GPHOME}/greenplum_path.sh ]] && [[ ! -f ${GPHOME}/cloudberry-env.sh ]]; then
+            echo "Error: environment variable GPHOME (${GPHOME}) must be set to a valid Apache Cloudberry installation"
             exit 1
         fi
         if [[ -z "${PXF_HOME}" ]]; then
@@ -58,11 +58,11 @@ function install_new_component() {
     echo "Installing PXF version ${PXF_VERSION} ..."
 
     if [[ ! -z "${GPHOME}" ]]; then
-        echo "... installing PXF Greenplum Extension into ${GPHOME} ..."
+        echo "... installing PXF Extension into ${GPHOME} ..."
         cp -av ${INSTALL_COMPONENT_SCRIPT_DIR}/{lib,share} ${GPHOME}
         check_status $?
     else
-        echo "... skipping PXF Greenplum Extension as GPHOME environment variable is not set ..."
+        echo "... skipping PXF Extension as GPHOME environment variable is not set ..."
     fi
 
     if [[ ! -z "${PXF_HOME}" ]]; then

package/install_deb

@@ -14,6 +14,6 @@ if [[ "${owner}" != "root" ]]; then
 fi
 
 ${sudo_if_needed} dpkg --install ${INSTALL_COMPONENT_SCRIPT_DIR}/${DEB_FILE}
-${sudo_if_needed} chown --recursive ${owner} /usr/local/pxf-gp*
+${sudo_if_needed} chown --recursive ${owner} /usr/local/cloudberry-pxf*
 
-echo "Successfully installed PXF version $(cat /usr/local/pxf-gp*/version)"
+echo "Successfully installed PXF version $(cat /usr/local/cloudberry-pxf*/version)"

package/install_rpm

@@ -14,6 +14,6 @@ if [[ "${owner}" != "root" ]]; then
 fi
 
 ${sudo_if_needed} rpm -Uvh ${INSTALL_COMPONENT_SCRIPT_DIR}/${RPM_FILE}
-${sudo_if_needed} chown -R ${owner} /usr/local/pxf-gp*
+${sudo_if_needed} chown -R ${owner} /usr/local/cloudberry-pxf*
 
-echo "Successfully installed PXF version $(cat /usr/local/pxf-gp*/version)"
+echo "Successfully installed PXF version $(cat /usr/local/cloudberry-pxf*/version)"