From b89edb0a6ca23a2615ba33364d72e1dfb8766f64 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Tue, 10 Feb 2026 14:03:45 +0800 Subject: [PATCH 1/2] Docs: update README.md and brand name Main changes are included in this commit: * Update NOTICE year to 2026 * Update README.md for a clear installation guide * Update brand name for a general format --- NOTICE | 2 +- README.md | 5 +++++ report/report.go | 4 ++-- report/report_test.go | 12 ++++++------ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/NOTICE b/NOTICE index 173b7c01..1bc302b6 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Cloudberry (Incubating) -Copyright 2024-2025 The Apache Software Foundation +Copyright 2024-2026 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index d902c1b0..e3efa584 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,11 @@ Follow the directions [here](https://golang.org/doc/) for installation, usage and configuration instructions. Make sure to set the [Go PATH environment variable](https://go.dev/doc/install) before starting the following steps. +``` +export GOPATH=$HOME/go +export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin +``` + ## Download & Build 1. Downloading the latest version: diff --git a/report/report.go b/report/report.go index 2716a6ff..0b3a2153 100644 --- a/report/report.go +++ b/report/report.go @@ -127,7 +127,7 @@ func (report *Report) WriteBackupReportFile(reportFilename string, timestamp str reportInfo := make([]LineInfo, 0) reportInfo = append(reportInfo, LineInfo{Key: "timestamp key:", Value: timestamp}, - LineInfo{Key: "gpdb version:", Value: report.DatabaseVersion}, + LineInfo{Key: "database version:", Value: report.DatabaseVersion}, LineInfo{Key: "gpbackup version:", Value: fmt.Sprintf("%s\n", report.BackupVersion)}, LineInfo{Key: "database name:", Value: report.DatabaseName}, LineInfo{Key: "command line:", Value: gpbackupCommandLine}, @@ -189,7 +189,7 @@ func WriteRestoreReportFile(reportFilename string, backupTimestamp string, start reportInfo := make([]LineInfo, 0) reportInfo = append(reportInfo, LineInfo{Key: "timestamp key:", Value: backupTimestamp}, - LineInfo{Key: "gpdb version:", Value: connectionPool.Version.VersionString}, + LineInfo{Key: "database version:", Value: connectionPool.Version.VersionString}, LineInfo{Key: "gprestore version:", Value: fmt.Sprintf("%s\n", restoreVersion)}, LineInfo{Key: "database name:", Value: connectionPool.DBName}, LineInfo{Key: "command line:", Value: fmt.Sprintf("%s\n", gprestoreCommandLine)}, diff --git a/report/report_test.go b/report/report_test.go index 199a8ee0..0d2f6409 100644 --- a/report/report_test.go +++ b/report/report_test.go @@ -97,7 +97,7 @@ data file format: Single Data File Per Segment`, Expect(buffer).To(Say(`Apache Cloudberry Backup Report timestamp key: 20170101010101 -gpdb version: 5\.0\.0 build test +database version: 5\.0\.0 build test gpbackup version: 0\.1\.0 database name: testdb @@ -127,7 +127,7 @@ types 1000`)) Expect(buffer).To(Say(`Apache Cloudberry Backup Report timestamp key: 20170101010101 -gpdb version: 5\.0\.0 build test +database version: 5\.0\.0 build test gpbackup version: 0\.1\.0 database name: testdb @@ -159,7 +159,7 @@ types 1000`)) Expect(buffer).To(Say(`Apache Cloudberry Backup Report timestamp key: 20170101010101 -gpdb version: 5\.0\.0 build test +database version: 5\.0\.0 build test gpbackup version: 0\.1\.0 database name: testdb @@ -248,7 +248,7 @@ incremental backup set: Expect(buffer).To(Say(`Apache Cloudberry Restore Report timestamp key: 20170101010101 -gpdb version: 5\.0\.0 build test +database version: 5\.0\.0 build test gprestore version: 0\.1\.0 database name: testdb @@ -269,7 +269,7 @@ restore error: Cannot access /tmp/backups: Permission denied`)) Expect(buffer).To(Say(`Apache Cloudberry Restore Report timestamp key: 20170101010101 -gpdb version: 5\.0\.0 build test +database version: 5\.0\.0 build test gprestore version: 0\.1\.0 database name: testdb @@ -289,7 +289,7 @@ restore status: Success`)) Expect(buffer).To(Say(`Apache Cloudberry Restore Report timestamp key: 20170101010101 -gpdb version: 5\.0\.0 build test +database version: 5\.0\.0 build test gprestore version: 0\.1\.0 database name: testdb From 558f199a6661f7d12d13aff175a910e5557ff8fa Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Wed, 11 Feb 2026 16:57:08 +0800 Subject: [PATCH 2/2] Rename Greenplum to Cloudberry --- gpbackup.go | 2 +- gprestore.go | 2 +- integration/gpexpand_not_running_test.go | 8 ++++---- utils/gpexpand_sensor.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gpbackup.go b/gpbackup.go index d7caaf80..9b75b920 100644 --- a/gpbackup.go +++ b/gpbackup.go @@ -14,7 +14,7 @@ import ( func main() { var rootCmd = &cobra.Command{ Use: "gpbackup", - Short: "gpbackup is the parallel backup utility for Greenplum", + Short: "gpbackup is the parallel backup utility for Cloudberry", Args: cobra.NoArgs, Version: GetVersion(), Run: func(cmd *cobra.Command, args []string) { diff --git a/gprestore.go b/gprestore.go index 827836c6..ac97c1dd 100644 --- a/gprestore.go +++ b/gprestore.go @@ -14,7 +14,7 @@ import ( func main() { var rootCmd = &cobra.Command{ Use: "gprestore", - Short: "gprestore is the parallel restore utility for Greenplum", + Short: "gprestore is the parallel restore utility for Cloudberry", Args: cobra.NoArgs, Version: GetVersion(), Run: func(cmd *cobra.Command, args []string) { diff --git a/integration/gpexpand_not_running_test.go b/integration/gpexpand_not_running_test.go index e534fcf1..3a593d40 100644 --- a/integration/gpexpand_not_running_test.go +++ b/integration/gpexpand_not_running_test.go @@ -41,7 +41,7 @@ var _ = Describe("gpexpand_sensor", func() { } }() - defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`) + defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Cloudberry expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`) restore.DoSetup() }) It("should prevent gprestore from starting when gpexpand is in phase 2", func() { @@ -54,7 +54,7 @@ var _ = Describe("gpexpand_sensor", func() { testhelper.AssertQueryRuns(postgresConn, "CREATE TABLE gpexpand.status (status text, updated timestamp)") testhelper.AssertQueryRuns(postgresConn, "INSERT INTO gpexpand.status VALUES ('IN PROGRESS', now())") - defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`) + defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Cloudberry expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration`) restore.DoSetup() }) It("should prevent gpbackup from starting when gpexpand is in phase 1", func() { @@ -76,7 +76,7 @@ var _ = Describe("gpexpand_sensor", func() { } }() - defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process, please re-run gpbackup when the expansion has completed`) + defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Cloudberry expansion currently in process, please re-run gpbackup when the expansion has completed`) backup.DoSetup() }) It("should prevent gpbackup from starting when gpexpand is in phase 2", func() { @@ -89,7 +89,7 @@ var _ = Describe("gpexpand_sensor", func() { testhelper.AssertQueryRuns(postgresConn, "CREATE TABLE gpexpand.status (status text, updated timestamp)") testhelper.AssertQueryRuns(postgresConn, "INSERT INTO gpexpand.status VALUES ('IN PROGRESS', now())") - defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Greenplum expansion currently in process, please re-run gpbackup when the expansion has completed`) + defer testhelper.ShouldPanicWithMessage(`[CRITICAL]:-Cloudberry expansion currently in process, please re-run gpbackup when the expansion has completed`) backup.DoSetup() }) }) diff --git a/utils/gpexpand_sensor.go b/utils/gpexpand_sensor.go index f6bb5d21..8ca83676 100644 --- a/utils/gpexpand_sensor.go +++ b/utils/gpexpand_sensor.go @@ -12,9 +12,9 @@ import ( ) const ( - BackupPreventedByGpexpandMessage GpexpandFailureMessage = `Greenplum expansion currently in process, please re-run gpbackup when the expansion has completed` + BackupPreventedByGpexpandMessage GpexpandFailureMessage = `Cloudberry expansion currently in process, please re-run gpbackup when the expansion has completed` - RestorePreventedByGpexpandMessage GpexpandFailureMessage = `Greenplum expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration` + RestorePreventedByGpexpandMessage GpexpandFailureMessage = `Cloudberry expansion currently in process. Once expansion is complete, it will be possible to restart gprestore, but please note existing backup sets taken with a different cluster configuration may no longer be compatible with the newly expanded cluster configuration` CoordinatorDataDirQuery = `select datadir from gp_segment_configuration where content=-1 and role='p'` GpexpandTemporaryTableStatusQuery = `SELECT status FROM gpexpand.status ORDER BY updated DESC LIMIT 1`