Skip to content

Commit

Permalink
Doc: cleanup the old URLs and old brand names
Browse files Browse the repository at this point in the history 
This commit is part of the ongoing cleanup effort to comply with ASF rules.

The changes include:
* Updating the Cloudberry GitHub repo URL to reflect the new location.
* Rebranding all instances of the old names (“CloudberryDB”, “Cloudberry
* DB”,etc) to the new brand name “Apache Cloudberry” or simply “Cloudberry"
* depending on the context.

This commit mostly happens in the dir deploy/*, gpAux/*, gpMgmt/*, and
src/*.

These updates ensure consistency with ASF branding requirements and improve
clarity across the project.
  • Loading branch information
@tuhaihe
tuhaihe committed Dec 11, 2024
1 parent 86c730b commit ab4f5d9
Show file tree
Hide file tree
Showing 78 changed files with 204 additions and 204 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ feedback, and chat:
| Slack | [Click to Join](https://inviter.co/apache-cloudberry) the real-time chat on Slack for QA, Dev, Events, and more. Don't miss out! Check out the [Slack guide](https://cloudberry.apache.org/community/slack) to learn more. |
| Q&A | Ask for help when running/developing Cloudberry, visit [GitHub Discussions - QA](https://github.com/apache/cloudberry/discussions/categories/q-a). |
| New ideas / Feature Requests | Share ideas for new features, visit [GitHub Discussions - Ideas](https://github.com/apache/cloudberry/discussions/categories/ideas-feature-requests). |
| Report bugs | Problems and issues in Apache Cloudberry core. If you find bugs, welcome to submit them [here](https://github.com/apache/cloudberrydb/issues). |
| Report bugs | Problems and issues in Apache Cloudberry core. If you find bugs, welcome to submit them [here](https://github.com/apache/cloudberry/issues). |
| Report a security vulnerability | View our [security policy](https://github.com/apache/cloudberry/security/policy) to learn how to report and contact us. |
| Community events | Including meetups, webinars, conferences, and more events, visit the [Events page](https://cloudberry.apache.org/community/events) and subscribe events calendar. |
| Documentation | [Official documentation](https://cloudberry.apache.org/docs/) for Cloudberry. You can explore it to discover more details about us. |
Expand All @@ -91,7 +91,7 @@ with the contribution.
## Roadmap

You can check our [Cloudberry Roadmap
2024](https://github.com/orgs/cloudberrydb/discussions/369) out to see the
2024](https://github.com/orgs/cloudberry/discussions/369) out to see the
product plans and goals we want to achieve in 2024. Welcome to share your
thoughts and ideas to join us in shaping the future of Apache Cloudberry
(Incubating). (We will update the Roadmap after entering the Incubator.)
Expand Down
2 changes: 1 addition & 1 deletion config/programs.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ else
break 2
else
AC_MSG_WARN([
*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB.
*** The installed version of Flex, $pgac_candidate, is too old to use with Apache Cloudberry.
*** Flex version 2.5.4 or later is required, but this is $pgac_flex_version.])
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11763,10 +11763,10 @@ else
break 2
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB.
*** The installed version of Flex, $pgac_candidate, is too old to use with Apache Cloudberry.
*** Flex version 2.5.4 or later is required, but this is $pgac_flex_version." >&5
$as_echo "$as_me: WARNING:
*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB.
*** The installed version of Flex, $pgac_candidate, is too old to use with Apache Cloudberry.
*** Flex version 2.5.4 or later is required, but this is $pgac_flex_version." >&2;}
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion contrib/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ SUBDIRS = \
unaccent \
vacuumlo

# CloudberryDB-specific additions (to ease merge pain).
# Cloudberry-specific additions (to ease merge pain).
SUBDIRS += \
formatter \
formatter_fixedwidth \
Expand Down
4 changes: 2 additions & 2 deletions deploy/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Before you begin your automation build, make sure the following preparation work
1. Download the Cloudberry Database source code into your local machine:

```bash
git clone git@github.com:cloudberrydb/cloudberrydb.git
git clone https://github.com/apache/cloudberry.git
```

2. Install the required [Vagrant](https://developer.hashicorp.com/vagrant/docs/installation) or [Docker](https://docs.docker.com/desktop/install/mac-install/) in your local environment, depending on your deployment preference.
Expand All @@ -32,7 +32,7 @@ Before you begin your automation build, make sure the following preparation work
2. Start the automatic compilation and deployment process.

```
$ cd /cloudberrydb/deploy/vagrant
$ cd /cloudberry/deploy/vagrant
$ vagrant up
```

Expand Down
46 changes: 23 additions & 23 deletions deploy/build/README.Linux.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Take the following steps to set up the development environments:

## Step 1. Clone the GitHub repo

Clone the GitHub repository `cloudberrydb/cloudberrydb` to the target machine:
Clone the GitHub repository `apache/cloudberry` to the target machine:

```shell
git clone https://github.com/cloudberrydb/cloudberrydb.git
git clone https://github.com/apache/cloudberry.git
```

## Step 2. Install dependencies
Expand All @@ -33,10 +33,10 @@ Enter the repository and install dependencies according to your operating system
The following steps work on CentOS 7. For other CentOS versions, these steps might work but are not guaranteed to work.

1. Run the bash script `README.CentOS.bash` in the `deploy/build` directory of the `cloudberrydb/cloudberrydb` repository. To run this script, password is required. Then, some required dependencies will be automatically downloaded.
1. Run the bash script `README.CentOS.bash` in the `deploy/build` directory of the `apache/cloudberry` repository. To run this script, password is required. Then, some required dependencies will be automatically downloaded.

```bash
cd cloudberrydb/deploy/build
cd cloudberry/deploy/build
./README.CentOS.bash
```

Expand Down Expand Up @@ -84,7 +84,7 @@ The following steps work on CentOS 7. For other CentOS versions, these steps mig
3. Install more dependencies by running the `README.Rhel-Rocky.bash` script.

```bash
~/cloudberrydb/deploy/build/README.Rhel-Rocky.bash
~/cloudberry/deploy/build/README.Rhel-Rocky.bash
```

### For Ubuntu 18.04 or later
Expand All @@ -93,7 +93,7 @@ The following steps work on CentOS 7. For other CentOS versions, these steps mig

```shell
# You need to enter your password to run.
sudo ~/cloudberrydb/deploy/build/README.Ubuntu.bash
sudo ~/cloudberry/deploy/build/README.Ubuntu.bash
```

> [!Note]
Expand Down Expand Up @@ -149,18 +149,18 @@ After you have installed all the dependencies for your operating system, it is t

After you have installed all the dependencies and performed the prerequisite platform tasks, you can start to build Apache Cloudberry. Run the following commands in sequence.

1. Configure the build environment. Enter the `cloudberrydb` directory and run the `configure` script.
1. Configure the build environment. Enter the `cloudberry` directory and run the `configure` script.

```bash
cd cloudberrydb
./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberrydb
cd cloudberry
./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberry
```

> [!Note]
> CloudberryDB is built with GPORCA by default. If you want to build CBDB without GPORCA, add the `--disable-orca` flag in the `./configure` command.
> Cloudberry is built with GPORCA by default. If you want to build CBDB without GPORCA, add the `--disable-orca` flag in the `./configure` command.
>
> ```bash
> ./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberrydb
> ./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberry
> ```

2. Compile the code and install the database.
Expand All @@ -174,12 +174,12 @@ After you have installed all the dependencies and performed the prerequisite pla

```bash
cd ..
cp -r cloudberrydb/ /home/gpadmin/
cp -r cloudberry/ /home/gpadmin/
cd /home/gpadmin/
chown -R gpadmin:gpadmin cloudberrydb/
chown -R gpadmin:gpadmin cloudberry/
su - gpadmin
cd cloudberrydb/
source /usr/local/cloudberrydb/greenplum_path.sh
cd cloudberry/
source /usr/local/cloudberry/greenplum_path.sh
```

4. Start the demo cluster.
Expand Down Expand Up @@ -230,13 +230,13 @@ After you have installed all the dependencies and performed the prerequisite pla
postgres=# select * from gp_segment_configuration;
dbid | content | role | preferred_role | mode | status | port | hostname | address | datadir | warehouseid
------+---------+------+----------------+------+--------+------+------------+------------+------------------------------------------------------------------------------+-------------
1 | -1 | p | p | n | u | 7000 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0
8 | -1 | m | m | s | u | 7001 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/standby | 0
3 | 1 | p | p | s | u | 7003 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0
6 | 1 | m | m | s | u | 7006 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0
2 | 0 | p | p | s | u | 7002 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0
5 | 0 | m | m | s | u | 7005 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0
4 | 2 | p | p | s | u | 7004 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0
7 | 2 | m | m | s | u | 7007 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0
1 | -1 | p | p | n | u | 7000 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0
8 | -1 | m | m | s | u | 7001 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/standby | 0
3 | 1 | p | p | s | u | 7003 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0
6 | 1 | m | m | s | u | 7006 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0
2 | 0 | p | p | s | u | 7002 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0
5 | 0 | m | m | s | u | 7005 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0
4 | 2 | p | p | s | u | 7004 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0
7 | 2 | m | m | s | u | 7007 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0
(8 rows)
```
20 changes: 10 additions & 10 deletions deploy/build/README.macOS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ source deploy/build/README.macOS.bash
## Step 3. Configure, compile, and install
```bash
# Run the following commands under the `cloudberrydb/` dir.
# Run the following commands under the `cloudberry/` dir.
# 1. Configure the build environment.
BREWPREFIX=$(brew --prefix); export PATH="$BREWPREFIX/opt/gnu-sed/libexec/gnubin:$BREWPREFIX/opt/apr/bin:$PATH"; CXXFLAGS="-I $BREWPREFIX/include" CFLAGS="-ggdb -Og -g3 -fno-omit-frame-pointer -I $BREWPREFIX/include" LDFLAGS="-L $BREWPREFIX/lib" CC=$(which gcc-13) CXX=$(which g++-13) ./configure --enable-debug --prefix=$(cd ~; pwd)/install/cbdb;
Expand Down Expand Up @@ -108,14 +108,14 @@ source gpAux/gpdemo/gpdemo-env.sh
postgres=# select * from gp_segment_configuration;
dbid | content | role | preferred_role | mode | status | port | hostname | address | datadir | warehouseid
------+---------+------+----------------+------+--------+------+-----------------------------+-----------------------------+----------------------------------------------------------------------------------------------------------+-------------
1 | -1 | p | p | n | u | 8000 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0
8 | -1 | m | m | s | u | 8001 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/standby | 0
3 | 1 | p | p | s | u | 8003 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0
6 | 1 | m | m | s | u | 8006 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0
2 | 0 | p | p | s | u | 8002 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0
5 | 0 | m | m | s | u | 8005 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0
4 | 2 | p | p | s | u | 8004 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0
7 | 2 | m | m | s | u | 8007 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0
1 | -1 | p | p | n | u | 8000 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0
8 | -1 | m | m | s | u | 8001 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/standby | 0
3 | 1 | p | p | s | u | 8003 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0
6 | 1 | m | m | s | u | 8006 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0
2 | 0 | p | p | s | u | 8002 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0
5 | 0 | m | m | s | u | 8005 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0
4 | 2 | p | p | s | u | 8004 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0
7 | 2 | m | m | s | u | 8007 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0
(8 rows)
postgres=#
Expand All @@ -128,5 +128,5 @@ source gpAux/gpdemo/gpdemo-env.sh
make installcheck-world
```
Congratulations 🎉! You've successfully installed and created a CloudberryDB cluster. Happy Hacking! 😉
Congratulations 🎉! You've successfully installed and created a Cloudberry cluster. Happy Hacking! 😉
10 changes: 5 additions & 5 deletions deploy/build/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ This guides describes how to build Apache Cloudberry from source code.
## Build the database

```
# Configure build environment to install at /usr/local/cloudberrydb
./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberrydb
# Configure build environment to install at /usr/local/cloudberry
./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberry
# Compile and install
make -j8
make -j8 install
# Bring in greenplum environment for CBDB into your running shell
source /usr/local/cloudberrydb/greenplum_path.sh
source /usr/local/cloudberry/greenplum_path.sh
# Start demo cluster
make create-demo-cluster
Expand Down Expand Up @@ -90,8 +90,8 @@ without GPORCA, configure requires `--disable-orca` flag to be set.
# Clean environment
make distclean
# Configure build environment to install at /usr/local/cloudberrydb
./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberrydb
# Configure build environment to install at /usr/local/cloudberry
./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberry
```

## Building Apache Cloudberry with PXF
Expand Down
4 changes: 2 additions & 2 deletions gpAux/client/install/src/windows/greenplum-clients.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1174,9 +1174,9 @@ If you want to review or change any of your installation settings, click Back. C
</Directory>
</Directory>
<Media Id="1" Cabinet="greenplumClientTools.cab" EmbedCab="yes" CompressionLevel="mszip" />
<Feature Id="Base" Level="1" ConfigurableDirectory="BASEDIR" Title="Cloudberry DB Clients" Display="expand" AllowAdvertise="no" Description="Cloudberry DB Clients">
<Feature Id="Base" Level="1" ConfigurableDirectory="BASEDIR" Title="Apache Cloudberry Clients" Display="expand" AllowAdvertise="no" Description="Apache Cloudberry Clients">
<ComponentRef Id="TOPLEVELTextFiles" />
<Feature Id="psql" Level="1" Title="Cloudberry DB client command line tools" Description="Cloudberry DB client command line tools" AllowAdvertise="no" Display="expand">
<Feature Id="psql" Level="1" Title="Apache Cloudberry client command line tools" Description="Apache Cloudberry client command line tools" AllowAdvertise="no" Display="expand">
<ComponentRef Id="TOPLEVELbin" />
<ComponentRef Id="GPPYlib" />
<ComponentRef Id="PYGRESQLlib" />
Expand Down
8 changes: 4 additions & 4 deletions gpAux/gpdemo/demo_cluster.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ 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 " file in your CloudberryDB installation directory."
echo " file in your Cloudberry installation directory."
echo ""
exit 1
fi
Expand Down Expand Up @@ -235,17 +235,17 @@ GPPATH=`find -H $GPHOME -name gpstart| tail -1`
RETVAL=$?

if [ "$RETVAL" -ne 0 ]; then
echo "Error attempting to find CloudberryDB executables in $GPHOME"
echo "Error attempting to find Cloudberry executables in $GPHOME"
exit 1
fi

if [ ! -x "$GPPATH" ]; then
echo "No executables found for CloudberryDB installation in $GPHOME"
echo "No executables found for Cloudberry installation in $GPHOME"
exit 1
fi
GPPATH=`dirname $GPPATH`
if [ ! -x $GPPATH/gpinitsystem ]; then
echo "No mgmt executables(gpinitsystem) found for CloudberryDB installation in $GPPATH"
echo "No mgmt executables(gpinitsystem) found for Cloudberry installation in $GPPATH"
exit 1
fi

Expand Down
Loading

0 comments on commit ab4f5d9

Please sign in to comment.