Skip to content

Commit 41f8339

Browse files
gfphoenix78my-ship-it
authored andcommitted
Update database name from Cloudberry Database to Apache Cloudberry
Since Cloudberry was donated to Apache, the database name in version() was renamed from Cloudberry Database to Apache Cloudberry. Some tools or extensions rely on the name to recognize database. This commit renames the database name to adapt the change from Apache Cloudberry.
1 parent a2404e6 commit 41f8339

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
value: "Thank you for reporting the problem! We really appreciate your efforts to improve cbcopy. Before reporting it, please (ideally) test on the latest release or main to see if the issue is fixed."
99
- type: textarea
1010
attributes:
11-
label: Cloudberry Database and cbcopy version
11+
label: Apache Cloudberry and cbcopy version
1212
description: What version are you using?
1313
- type: textarea
1414
attributes:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Cloudberry Database community welcomes contributions from anyone, new and
1+
Apache Cloudberry community welcomes contributions from anyone, new and
22
experienced! We appreciate your interest in contributing. This guide will help
33
you get started with the contribution.
44

55
## Code of Conduct
66

7-
Everyone who participates in Cloudberry Database, either as a user or a
7+
Everyone who participates in Apache Cloudberry, either as a user or a
88
contributor, is obliged to follow our community [Code of
99
Conduct](./CODE_OF_CONDUCT.md). Every violation against it will be reviewed
1010
and investigated and will result in a response that is deemed necessary and

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cbcopy
22

3-
cbcopy is an efficient database migration tool designed to transfer data and metadata from Greenplum Database(GPDB) to Cloudberry Database(Cloudberrydb), while also supporting migrations between Greenplum databases and between Cloudberry databases for disaster recovery and database version upgrades.
3+
cbcopy is an efficient database migration tool designed to transfer data and metadata from Greenplum Database(GPDB) to Apache Cloudberry(Cloudberrydb), while also supporting migrations between Greenplum databases and between Cloudberry databases for disaster recovery and database version upgrades.
44

55
![cbcopy_arch](.github/cbcopy_arch.png)
66

@@ -252,7 +252,7 @@ For more detailed examples, you can refer to our test files:
252252

253253
## cbcopy reference
254254
```
255-
cbcopy utility for migrating data from Greenplum Database (GPDB) to Cloudberry Database (CBDB)
255+
cbcopy utility for migrating data from Greenplum Database (GPDB) to Apache Cloudberry (CBDB)
256256
257257
Usage:
258258
cbcopy [flags]

SECURITY.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Thanks for helping make Cloudberry Database safe!
1+
Thanks for helping make Apache Cloudberry safe!
22

33
---
44

@@ -48,14 +48,14 @@ For better collaboration, we hope you:
4848

4949
Here's an overview of the security issues handling process:
5050

51-
* The reporter reports the security issues to the Cloudberry Database
51+
* The reporter reports the security issues to the Apache Cloudberry
5252
team.
53-
* The Cloudberry Database team investigates the report and decides to
53+
* The Apache Cloudberry team investigates the report and decides to
5454
accept or reject the report. If our team rejects the report, the
5555
team will explain why to the reporter. If we accept the report, our
5656
team will work privately with the reporter to fix the security
5757
issues.
58-
* Release the new version of the Cloudberry Database that includes the
58+
* Release the new version of the Apache Cloudberry that includes the
5959
fix.
6060
* Public the security issues.
6161

cbcopy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func main() {
1515

1616
var rootCmd = &cobra.Command{
1717
Use: "cbcopy",
18-
Short: "cbcopy utility for migrating data from Greenplum Database (GPDB) to Cloudberry Database (CBDB)",
18+
Short: "cbcopy utility for migrating data from Greenplum Database (GPDB) to Apache Cloudberry (CBDB)",
1919
Args: cobra.NoArgs,
2020
Version: utils.GetVersion(),
2121
Run: func(cmd *cobra.Command, args []string) {

internal/dbconn/version.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ type DBType int
1515
const (
1616
Unknown DBType = iota
1717
GPDB // Greenplum Database
18-
CBDB // Cloudberry Database
18+
CBDB // Apache Cloudberry
1919
HDW // HashData Database
2020
PGSQL // PostgreSQL
2121
)
2222

2323
const (
2424
gpdbPattern = `\(Greenplum Database ([0-9]+\.[0-9]+\.[0-9]+)[^)]*\)`
25-
cbdbPattern = `\(Cloudberry Database ([0-9]+\.[0-9]+\.[0-9]+)[^)]*\)`
25+
cbdbPattern = `\(Apache Cloudberry ([0-9]+\.[0-9]+\.[0-9]+)[^)]*\)`
2626
hdwPattern = `\(HashData Warehouse ([0-9]+\.[0-9]+\.[0-9]+)[^)]*\)`
2727
pgsqlPattern = `^PostgreSQL\s+([0-9]+\.[0-9]+\.[0-9]+)`
2828
)
@@ -33,7 +33,7 @@ func (t DBType) String() string {
3333
case GPDB:
3434
return "Greenplum Database"
3535
case CBDB:
36-
return "Cloudberry Database"
36+
return "Apache Cloudberry"
3737
case HDW:
3838
return "HashData Database"
3939
case PGSQL:
@@ -81,7 +81,7 @@ func NewVersion(versionStr string) GPDBVersion {
8181
//
8282
// Cloudberry:
8383
//
84-
// PostgreSQL 14.4 (Cloudberry Database 1.2.0 build commit:5b5ae3f8aa638786f01bbd08307b6474a1ba1997)
84+
// PostgreSQL 14.4 (Apache Cloudberry 1.2.0 build commit:5b5ae3f8aa638786f01bbd08307b6474a1ba1997)
8585
// on x86_64-pc-linux-gnu, compiled by gcc (GCC) 10.2.1 20210130 (Red Hat 10.2.1-11), 64-bit compiled on Feb 16 2023 23:44:39
8686
//
8787
// Greenplum:

testutils/functions.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ func GetServerVersion(host string, port int, user string) string {
642642
/*
643643
PostgreSQL 9.4.26 (Greenplum Database 6.20.0 build 9999) (HashData Warehouse 3.13.8 build 27594) on x86_64-unknown-linux-gnu, compiled by gcc (GCC) 10.2.1 20210130 (Red Hat 10.2.1-11), 64-bit compiled on Feb 10 2023 17:22:03
644644
645-
PostgreSQL 14.4 (Cloudberry Database 1.2.0 build commit:5b5ae3f8aa638786f01bbd08307b6474a1ba1997) on x86_64-pc-linux-gnu, compiled by gcc (GCC) 10.2.1 20210130 (Red Hat 10.2.1-11), 64-bit compiled on Feb 16 2023 23:44:39
645+
PostgreSQL 14.4 (Apache Cloudberry 1.2.0 build commit:5b5ae3f8aa638786f01bbd08307b6474a1ba1997) on x86_64-pc-linux-gnu, compiled by gcc (GCC) 10.2.1 20210130 (Red Hat 10.2.1-11), 64-bit compiled on Feb 16 2023 23:44:39
646646
*/
647647

648648
re := regexp.MustCompile(`\d+\.\d+(\.\d+)?`)
@@ -665,7 +665,7 @@ func GetPslVersion() string {
665665
psqlVersion := strings.TrimSpace(string(out))
666666

667667
/*
668-
psql (Cloudberry Database) 14.4
668+
psql (Apache Cloudberry) 14.4
669669
670670
psql (PostgreSQL) 9.4.26
671671
*/

0 commit comments

Comments
 (0)