Cleanup: update the name and information in files

.cloudberry-db.spec

@@ -13,7 +13,7 @@ Summary:	A High Performance Massively Parallel Data Warehouse
 
 Group:		Applications/Databases
 License:	Apache License Version 2.0
-URL:		http://www.cloudberrydb.org
+URL:		http://cloudberry.apache.org
 Source0:	bin_cbdb.tar.gz
 Prefix: 	%{cbdb_install_prefix}
 AutoReqProv: 	no

CONTRIBUTING.md

@@ -47,7 +47,7 @@ You can participate by:
 * [Reporting security issues](./SECURITY.md).
 * Testing code, testing releases.
 * Creating educational content (Blog posts, tutorials, videos, etc.)
-* Spreading the word about Cloudberry Database on social media(eg,
+* Spreading the word about Apache Cloudberry on social media(eg,
   Twitter, LinkedIn).
 * ...
 * More things to make Cloudberry better.

GNUmakefile.in

@@ -33,7 +33,7 @@ ifeq ($(with_openssl), yes)
 endif
 	$(MAKE) -C gpMgmt all
 	$(MAKE) -C gpcontrib all
-	+@echo "All of Cloudberry Database successfully made. Ready to install."
+	+@echo "All of Apache Cloudberry (Incubating) successfully made. Ready to install."
 
 docs:
 	$(MAKE) -C doc all
@@ -76,7 +76,7 @@ ifeq ($(with_openssl), yes)
 endif
 	$(MAKE) -C gpMgmt $@
 	$(MAKE) -C gpcontrib $@
-	+@echo "Cloudberry Database installation complete."
+	+@echo "Apache Cloudberry (Incubating) installation complete."
 
 install-docs:
 	$(MAKE) -C doc install

README.md

@@ -4,7 +4,7 @@
   <picture>
     <source media="(prefers-color-scheme: light)" srcset="./.github/full_color_black.svg">
     <source media="(prefers-color-scheme: dark)" srcset="./.github/full_color_white.svg">
-    <img alt="Cloudberry Database Logo" src="./.github/full_color_black.svg" width="400px">
+    <img alt="Apache Cloudberry Logo" src="./.github/full_color_black.svg" width="400px">
   </picture>
 </p>
 
@@ -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. |
@@ -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.)

config/programs.m4

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

configure

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Cloudberry Database 1.0.0.
+# Generated by GNU Autoconf 2.69 for Apache Cloudberry 1.0.0.
 #
-# Report bugs to <info@cloudberrydb.org>.
+# Report bugs to <[email protected].org>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -269,10 +269,10 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell [email protected] and
-$0: info@cloudberrydb.org about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: [email protected].org about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -580,12 +580,12 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='Cloudberry Database'
-PACKAGE_TARNAME='cloudberry-database'
+PACKAGE_NAME='Apache Cloudberry'
+PACKAGE_TARNAME='apache-cloudberry'
 PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='Cloudberry Database 1.0.0'
-PACKAGE_BUGREPORT='info@cloudberrydb.org'
-PACKAGE_URL='https://www.cloudberrydb.org/'
+PACKAGE_STRING='Apache Cloudberry 1.0.0'
+PACKAGE_BUGREPORT='[email protected].org'
+PACKAGE_URL='https://cloudberry.apache.org/'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
 ac_default_prefix=/usr/local/cbdb
@@ -1509,7 +1509,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Cloudberry Database 1.0.0 to adapt to many kinds of systems.
+\`configure' configures Apache Cloudberry 1.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1558,7 +1558,7 @@ Fine tuning of the installation directories:
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/cloudberry-database]
+                          [DATAROOTDIR/doc/apache-cloudberry]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1575,7 +1575,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Cloudberry Database 1.0.0:";;
+     short | recursive ) echo "Configuration of Apache Cloudberry 1.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1712,8 +1712,8 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <info@cloudberrydb.org>.
-Cloudberry Database home page: <https://www.cloudberrydb.org/>.
+Report bugs to <[email protected].org>.
+Apache Cloudberry home page: <https://cloudberry.apache.org/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1776,7 +1776,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Cloudberry Database configure 1.0.0
+Apache Cloudberry configure 1.0.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2021,9 +2021,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------ ##
-## Report this to info@cloudberrydb.org ##
-## ------------------------------------ ##"
+( $as_echo "## ---------------------------------------- ##
+## Report this to [email protected].org ##
+## ---------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -2529,7 +2529,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Cloudberry Database $as_me 1.0.0, which was
+It was created by Apache Cloudberry $as_me 1.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3097,7 +3097,7 @@ PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
 for a similar platform and use the '--with-template=' option.
 
-Please also contact <info@cloudberrydb.org> to see about
+Please also contact <[email protected].org> to see about
 rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
@@ -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
@@ -22623,7 +22623,7 @@ fi
 
 
 cat >>confdefs.h <<_ACEOF
-#define PG_VERSION_STR "PostgreSQL $PG_VERSION (Cloudberry Database $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
+#define PG_VERSION_STR "PostgreSQL $PG_VERSION (Apache Cloudberry $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
 _ACEOF
 
 
@@ -23234,7 +23234,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Cloudberry Database $as_me 1.0.0, which was
+This file was extended by Apache Cloudberry $as_me 1.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23298,14 +23298,14 @@ $config_links
 Configuration commands:
 $config_commands
 
-Report bugs to <info@cloudberrydb.org>.
-Cloudberry Database home page: <https://www.cloudberrydb.org/>."
+Report bugs to <[email protected].org>.
+Apache Cloudberry home page: <https://cloudberry.apache.org/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Cloudberry Database config.status 1.0.0
+Apache Cloudberry config.status 1.0.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -20,7 +20,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 dnl The PACKAGE_VERSION from upstream PostgreSQL is maintained in the
 dnl PG_PACKAGE_VERSION variable, when merging make sure to update this
 dnl variable with the merge conflict from the AC_INIT() statement.
-AC_INIT([Cloudberry Database], [1.0.0], [info@cloudberrydb.org], [], [https://www.cloudberrydb.org/])
+AC_INIT([Apache Cloudberry], [1.0.0], [[email protected].org], [], [https://cloudberry.apache.org/])
 [PG_PACKAGE_VERSION=14.4]
 AC_SUBST(PG_PACKAGE_VERSION)
 
@@ -45,7 +45,7 @@ AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor vers
 
 [PG_VERSION="$PG_PACKAGE_VERSION"]
 PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version], [], [])
-AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_PACKAGE_VERSION", [Postgres version Cloudberry Database is based on])
+AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_PACKAGE_VERSION", [Postgres version Apache Cloudberry is based on])
 
 AC_CANONICAL_HOST
 
@@ -2972,7 +2972,7 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(PG_VERSION_STR,
-                   ["PostgreSQL $PG_VERSION (Cloudberry Database $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
+                   ["PostgreSQL $PG_VERSION (Apache Cloudberry $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
                    [A string containing the version number, platform, and C compiler])
 
 # Supply a numeric version string for use by 3rd party add-ons

contrib/Makefile

@@ -4,7 +4,7 @@ subdir = contrib
 top_builddir = ..
 include $(top_builddir)/src/Makefile.global
 
-# Cloudberry Database specific changes to the targetlist:
+# Apache Cloudberry specific changes to the targetlist:
 # tsearch2 and postgres_fdw are currently disabled due to test failures.
 # cube and the related earthdistance are disabled since GPDB define CUBE
 # as a keyword. lo is disabled since large objects aren't supported.
@@ -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 \

contrib/auto_explain/expected/auto_explain.out

@@ -4,12 +4,12 @@
 -- end_matchsubs
 CREATE SCHEMA auto_explain_test;
 CREATE TABLE auto_explain_test.t1(a int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+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 auto_explain_test.t1 VALUES(generate_series(0, 1000));
 ANALYZE auto_explain_test.t1;
 CREATE TABLE auto_explain_test.t2(b int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '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.
 INSERT INTO auto_explain_test.t2 VALUES(generate_series(0, 1000));
 ANALYZE auto_explain_test.t2;

contrib/auto_explain/expected/auto_explain_optimizer.out

@@ -4,12 +4,12 @@
 -- end_matchsubs
 CREATE SCHEMA auto_explain_test;
 CREATE TABLE auto_explain_test.t1(a int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table.
+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 auto_explain_test.t1 VALUES(generate_series(0, 1000));
 ANALYZE auto_explain_test.t1;
 CREATE TABLE auto_explain_test.t2(b int);
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table.
+NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '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.
 INSERT INTO auto_explain_test.t2 VALUES(generate_series(0, 1000));
 ANALYZE auto_explain_test.t2;

contrib/bloom/expected/bloom.out

@@ -3,7 +3,7 @@ CREATE TABLE tst (
 	i	int4,
 	t	text
 );
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table.
+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 tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i;
 CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3);
@@ -154,7 +154,7 @@ CREATE UNLOGGED TABLE tstu (
 	i	int4,
 	t	text
 );
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table.
+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 tstu SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i;
 CREATE INDEX bloomidxu ON tstu USING bloom (i, t) WITH (col2 = 4);

contrib/bloom/expected/bloom_optimizer.out

@@ -3,7 +3,7 @@ CREATE TABLE tst (
 	i	int4,
 	t	text
 );
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table.
+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 tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i;
 CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3);
@@ -146,7 +146,7 @@ CREATE UNLOGGED TABLE tstu (
 	i	int4,
 	t	text
 );
-NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table.
+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 tstu SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i;
 CREATE INDEX bloomidxu ON tstu USING bloom (i, t) WITH (col2 = 4);

contrib/btree_gist/init_file

@@ -7,7 +7,7 @@
 # modify the corresponding expected output. Hence we want to ignore these.
 # Some of the messages include:
 #
-# NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '<colname>' as the Cloudberry Database data distribution key for this table.
+# NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '<colname>' as the Apache Cloudberry data distribution key for this table.
 # NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE 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.
 #

contrib/file_fdw/init_file

@@ -12,7 +12,7 @@ m/^ Settings:.*/
 # modify the corresponding expected output. Hence we want to ignore these.
 # Some of the messages include:
 #
-# NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '<colname>' as the Cloudberry Database data distribution key for this table.
+# NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '<colname>' as the Apache Cloudberry data distribution key for this table.
 # NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE 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.
 #

contrib/file_fdw/input/gp_file_fdw.source

@@ -1,5 +1,5 @@
 --
--- Test foreign-data wrapper file_fdw. Cloudberry Database MPP specific
+-- Test foreign-data wrapper file_fdw. Apache Cloudberry MPP specific
 --
 
 -- Clean up in case a prior regression run failed

contrib/file_fdw/output/gp_file_fdw.source

@@ -1,5 +1,5 @@
 --
--- Test foreign-data wrapper file_fdw. Cloudberry Database MPP specific
+-- Test foreign-data wrapper file_fdw. Apache Cloudberry MPP specific
 --
 -- Clean up in case a prior regression run failed
 SET client_min_messages TO 'error';