This is an automated email from the ASF dual-hosted git repository.
djwang pushed a commit to branch sync-with-upstream
in repository https://gitbox.apache.org/repos/asf/cloudberry-gpbackup.git
The following commit(s) were added to refs/heads/sync-with-upstream by this
push:
new ae1c4c4a Rebrand Greenplum to Apache Cloudberry
ae1c4c4a is described below
commit ae1c4c4a5df5238c31ab063d36287e740f2db847
Author: Dianjin Wang <[email protected]>
AuthorDate: Thu Sep 11 17:37:59 2025 +0800
Rebrand Greenplum to Apache Cloudberry
---
README.md | 4 ++--
backup/backup.go | 2 +-
end_to_end/resources/test_tables_data.sql | 4 ++--
end_to_end/resources/test_tables_ddl.sql | 4 ++--
gppkg/gpbackup_control.in | 6 +++---
plugins/README.md | 2 +-
report/report.go | 4 ++--
report/report_test.go | 20 ++++++++++----------
restore/restore.go | 2 +-
9 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index 6c26c1d4..b8cb1b16 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Greenplum Backup
-`gpbackup` and `gprestore` are Go utilities for performing Greenplum Database
backups. They are still currently in active development.
+`gpbackup` and `gprestore` are Go utilities for performing Apache Cloudberry
backups. They are still currently in active development.
## Pre-Requisites
@@ -50,7 +50,7 @@ popd
### Test execution
-**NOTE**: The integration and end_to_end tests require a running Greenplum
Database instance.
+**NOTE**: The integration and end_to_end tests require a running Apache
Cloudberry instance.
To run all tests except end-to-end (linters, unit, and integration), use
```bash
diff --git a/backup/backup.go b/backup/backup.go
index 448b8c5d..0bcb3d35 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -50,7 +50,7 @@ func DoSetup() {
timestamp := history.CurrentTimestamp()
createBackupLockFile(timestamp)
initializeConnectionPool(timestamp)
- gplog.Info("Greenplum Database Version = %s",
connectionPool.Version.VersionString)
+ gplog.Info("Apache Cloudberry Version = %s",
connectionPool.Version.VersionString)
gplog.Info("Starting backup of database %s",
MustGetFlagString(options.DBNAME))
opts, err := options.NewOptions(cmdFlags)
diff --git a/end_to_end/resources/test_tables_data.sql
b/end_to_end/resources/test_tables_data.sql
index a9a6548e..eb435df2 100644
--- a/end_to_end/resources/test_tables_data.sql
+++ b/end_to_end/resources/test_tables_data.sql
@@ -1,5 +1,5 @@
--
--- Greenplum Database database dump
+-- Apache Cloudberry database dump
--
SET statement_timeout = 0;
@@ -68,6 +68,6 @@ COPY returns (id, date, amt) FROM stdin;
--
--- Greenplum Database database dump complete
+-- Apache Cloudberry database dump complete
--
diff --git a/end_to_end/resources/test_tables_ddl.sql
b/end_to_end/resources/test_tables_ddl.sql
index f6ce3ece..2e411257 100644
--- a/end_to_end/resources/test_tables_ddl.sql
+++ b/end_to_end/resources/test_tables_ddl.sql
@@ -1,5 +1,5 @@
--
--- Greenplum Database database dump
+-- Apache Cloudberry database dump
--
SET statement_timeout = 0;
@@ -132,6 +132,6 @@ CREATE TABLE public."FOObar" (i int);
insert into public."FOObar" values (1);
--
--- Greenplum Database database dump complete
+-- Apache Cloudberry database dump complete
--
diff --git a/gppkg/gpbackup_control.in b/gppkg/gpbackup_control.in
index 8097858f..973439ad 100644
--- a/gppkg/gpbackup_control.in
+++ b/gppkg/gpbackup_control.in
@@ -1,8 +1,8 @@
-Package: GreenplumBackupTools
+Package: CloudberryBackupTools
Priority: extra
-Maintainer: [email protected]
+Maintainer: [email protected]
Architecture: ${ARCH}
Version: ${GPBACKUP_TOOLS_VERSION}
Provides: gpbackup_tools
-Description: gpbackup and gprestore are Go utilities for performing Greenplum
Database backups.
+Description: backup and restore are Go utilities for performing Apache
Cloudberry backups.
Homepage: https://github.com/apache/cloudberry-gpbackup
diff --git a/plugins/README.md b/plugins/README.md
index 6781e844..4fe80fc9 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -32,7 +32,7 @@ options:
```
## Available plugins
-[gpbackup_s3_plugin](https://github.com/apache/cloudberry-gpbackup-s3-plugin):
Allows users to back up their Greenplum Database to Amazon S3.
+[gpbackup_s3_plugin](https://github.com/apache/cloudberry-gpbackup-s3-plugin):
Allows users to back up their Apache Cloudberry to Amazon S3.
## Developing plugins
diff --git a/report/report.go b/report/report.go
index f8a286e5..9516aebd 100644
--- a/report/report.go
+++ b/report/report.go
@@ -159,7 +159,7 @@ func (report *Report) WriteBackupReportFile(reportFilename
string, timestamp str
reportInfo = append(reportInfo,
LineInfo{Key: "segment count:", Value: fmt.Sprintf("%d",
report.SegmentCount)})
- _, err = fmt.Fprint(reportFile, "Greenplum Database Backup Report\n\n")
+ _, err = fmt.Fprint(reportFile, "Apache Cloudberry Backup Report\n\n")
if err != nil {
gplog.Error("Unable to write backup report file %s",
reportFilename)
return
@@ -184,7 +184,7 @@ func WriteRestoreReportFile(reportFilename string,
backupTimestamp string, start
gprestoreCommandLine := strings.Join(os.Args, " ")
start, end, duration := GetDurationInfo(startTimestamp,
operating.System.Now())
- utils.MustPrintf(reportFile, "Greenplum Database Restore Report\n\n")
+ utils.MustPrintf(reportFile, "Apache Cloudberry Restore Report\n\n")
reportInfo := make([]LineInfo, 0)
reportInfo = append(reportInfo,
diff --git a/report/report_test.go b/report/report_test.go
index f8ec3a2b..c92ab2b3 100644
--- a/report/report_test.go
+++ b/report/report_test.go
@@ -94,7 +94,7 @@ data file format: Single Data File Per Segment`,
It("writes a report for a successful backup", func() {
backupReport.WriteBackupReportFile("filename",
timestamp, endtime, objectCounts, "")
- Expect(buffer).To(Say(`Greenplum Database Backup Report
+ Expect(buffer).To(Say(`Apache Cloudberry Backup Report
timestamp key: 20170101010101
gpdb version: 5\.0\.0 build test
@@ -124,7 +124,7 @@ types 1000`))
})
It("writes a report for a failed backup", func() {
backupReport.WriteBackupReportFile("filename",
timestamp, endtime, objectCounts, "Cannot access /tmp/backups: Permission
denied")
- Expect(buffer).To(Say(`Greenplum Database Backup Report
+ Expect(buffer).To(Say(`Apache Cloudberry Backup Report
timestamp key: 20170101010101
gpdb version: 5\.0\.0 build test
@@ -156,7 +156,7 @@ types 1000`))
It("writes a report without database size information", func() {
backupReport.DatabaseSize = ""
backupReport.WriteBackupReportFile("filename",
timestamp, endtime, objectCounts, "")
- Expect(buffer).To(Say(`Greenplum Database Backup Report
+ Expect(buffer).To(Say(`Apache Cloudberry Backup Report
timestamp key: 20170101010101
gpdb version: 5\.0\.0 build test
@@ -245,7 +245,7 @@ incremental backup set:
It("writes a report for a failed restore", func() {
gplog.SetErrorCode(2)
report.WriteRestoreReportFile("filename", timestamp,
restoreStartTime, connectionPool, restoreVersion, 3, 4, "Cannot access
/tmp/backups: Permission denied")
- Expect(buffer).To(Say(`Greenplum Database Restore Report
+ Expect(buffer).To(Say(`Apache Cloudberry Restore Report
timestamp key: 20170101010101
gpdb version: 5\.0\.0 build test
@@ -266,7 +266,7 @@ restore error: Cannot access /tmp/backups:
Permission denied`))
It("writes a report for a successful restore", func() {
gplog.SetErrorCode(0)
report.WriteRestoreReportFile("filename", timestamp,
restoreStartTime, connectionPool, restoreVersion, 3, 3, "")
- Expect(buffer).To(Say(`Greenplum Database Restore Report
+ Expect(buffer).To(Say(`Apache Cloudberry Restore Report
timestamp key: 20170101010101
gpdb version: 5\.0\.0 build test
@@ -286,7 +286,7 @@ restore status: Success`))
It("writes a report for a successful restore with errors",
func() {
gplog.SetErrorCode(1)
report.WriteRestoreReportFile("filename", timestamp,
restoreStartTime, connectionPool, restoreVersion, 3, 3, "")
- Expect(buffer).To(Say(`Greenplum Database Restore Report
+ Expect(buffer).To(Say(`Apache Cloudberry Restore Report
timestamp key: 20170101010101
gpdb version: 5\.0\.0 build test
@@ -310,7 +310,7 @@ restore status: Success but non-fatal errors
occurred. See log file .+
}
report.WriteRestoreReportFile("filename", timestamp,
restoreStartTime, connectionPool, restoreVersion, 3, 3, "")
Expect(stdout).To(Say("skipping report creation"))
- Expect(buffer).ToNot(Say("Greenplum Database Restore
Report"))
+ Expect(buffer).ToNot(Say("Apache Cloudberry Restore
Report"))
Expect(gplog.GetErrorCode()).To(Equal(0))
})
@@ -437,7 +437,7 @@ restore status: Success but non-fatal errors
occurred. See log file .+
})
Describe("Email-related functions", func() {
- reportFileContents := []byte(`Greenplum Database Backup Report
+ reportFileContents := []byte(`Apache Cloudberry Backup Report
Timestamp Key: 20170101010101`)
contactsFileContents, _ := yaml.Marshal(report.ContactFile{
@@ -545,7 +545,7 @@ Content-Disposition: inline
<html>
<body>
<pre style=\"font: monospace\">
-Greenplum Database Backup Report
+Apache Cloudberry Backup Report
Timestamp Key: 20170101010101
</pre>
@@ -567,7 +567,7 @@ Content-Disposition: inline
<html>
<body>
<pre style=\"font: monospace\">
-Greenplum Database Backup Report
+Apache Cloudberry Backup Report
Timestamp Key: 20170101010101
</pre>
diff --git a/restore/restore.go b/restore/restore.go
index da51f200..aaea206e 100644
--- a/restore/restore.go
+++ b/restore/restore.go
@@ -102,7 +102,7 @@ func DoSetup() {
gplog.Info("gpbackup version = %s", backupConfig.BackupVersion)
gplog.Info("gprestore version = %s", GetVersion())
- gplog.Info("Greenplum Database Version = %s",
connectionPool.Version.VersionString)
+ gplog.Info("Apache Cloudberry Version = %s",
connectionPool.Version.VersionString)
BackupConfigurationValidation()
metadataFilename := globalFPInfo.GetMetadataFilePath()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
