From 18ca1ea26db276eec58e2986476d5ab03753553f Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Mon, 20 Nov 2023 10:52:18 +0800 Subject: [PATCH] Update package name to CloudberryDB --- .github/workflows/build_and_unit_test.yml | 8 ++--- backup/backup.go | 20 ++++++------ backup/backup_internal_test.go | 2 +- backup/backup_suite_test.go | 10 +++--- backup/data.go | 8 ++--- backup/data_test.go | 12 +++---- backup/dependencies.go | 8 ++--- backup/dependencies_test.go | 6 ++-- backup/global_variables.go | 14 ++++---- backup/incremental.go | 12 +++---- backup/incremental_test.go | 18 +++++------ backup/metadata_globals.go | 6 ++-- backup/metadata_globals_test.go | 6 ++-- backup/postdata.go | 6 ++-- backup/postdata_test.go | 4 +-- backup/predata_acl.go | 4 +-- backup/predata_acl_test.go | 8 ++--- backup/predata_externals.go | 4 +-- backup/predata_externals_test.go | 6 ++-- backup/predata_functions.go | 6 ++-- backup/predata_functions_test.go | 6 ++-- backup/predata_operators.go | 4 +-- backup/predata_operators_test.go | 4 +-- backup/predata_relations.go | 8 ++--- backup/predata_relations_other_test.go | 10 +++--- backup/predata_relations_tables_test.go | 6 ++-- backup/predata_shared.go | 6 ++-- backup/predata_shared_test.go | 4 +-- backup/predata_textsearch.go | 4 +-- backup/predata_textsearch_test.go | 4 +-- backup/predata_types.go | 6 ++-- backup/predata_types_test.go | 4 +-- backup/queries_acl.go | 6 ++-- backup/queries_acl_test.go | 4 +-- backup/queries_externals.go | 6 ++-- backup/queries_functions.go | 8 ++--- backup/queries_functions_test.go | 4 +-- backup/queries_globals.go | 8 ++--- backup/queries_incremental.go | 6 ++-- backup/queries_operators.go | 8 ++--- backup/queries_postdata.go | 8 ++--- backup/queries_postdata_test.go | 4 +-- backup/queries_relation_test.go | 4 +-- backup/queries_relations.go | 10 +++--- backup/queries_shared.go | 10 +++--- backup/queries_shared_test.go | 6 ++-- backup/queries_statistics.go | 6 ++-- backup/queries_table_defs.go | 8 ++--- backup/queries_textsearch.go | 8 ++--- backup/queries_types.go | 8 ++--- backup/snapshot.go | 4 +-- backup/statistics.go | 4 +-- backup/statistics_test.go | 4 +-- backup/validate.go | 12 +++---- backup/validate_test.go | 6 ++-- backup/wrappers.go | 14 ++++---- ci/gen_pipeline.py | 6 ++-- ci/regression/regression_pipeline.yml | 4 +-- ci/scale/scale_pipeline.yml | 4 +-- ci/scripts/all-tests.bash | 2 +- ci/scripts/build-go-binaries.bash | 4 +-- ci/scripts/ddboost-plugin-perf.bash | 2 +- ci/scripts/ddboost-plugin-tests.bash | 4 +-- ci/scripts/gpbackup-tests.bash | 4 +-- .../integration-tests-fixed-version.bash | 4 +-- ci/scripts/s3-plugin-perf.bash | 2 +- ci/scripts/s3-plugin-tests.bash | 2 +- ci/scripts/setup-centos-env.bash | 2 +- ci/scripts/test-on-local-cluster.bash | 4 +-- ci/tasks/build-go-binaries.yml | 6 ++-- ci/templates/gpbackup-tpl.yml | 4 +-- end_to_end/end_to_end_suite_test.go | 32 +++++++++---------- end_to_end/filtered_test.go | 6 ++-- end_to_end/incremental_test.go | 8 ++--- end_to_end/locks_test.go | 6 ++-- end_to_end/plugin_test.go | 30 ++++++++--------- end_to_end/signal_handler_test.go | 2 +- end_to_end/special_characters_test.go | 2 +- filepath/filepath.go | 8 ++--- filepath/filepath_test.go | 8 ++--- go.mod | 4 +-- go.sum | 12 +++---- gpbackup.go | 6 ++-- gpbackup_helper.go | 2 +- gppkg/gpbackup_control.in | 8 ++--- gprestore.go | 6 ++-- helper/backup_helper.go | 4 +-- helper/helper.go | 6 ++-- helper/restore_helper.go | 4 +-- history/history.go | 6 ++-- history/history_test.go | 16 +++++----- integration/agent_remote_test.go | 6 ++-- integration/dependency_queries_test.go | 6 ++-- integration/gpexpand_not_running_test.go | 14 ++++---- integration/helper_test.go | 4 +-- integration/incremental_queries_test.go | 8 ++--- integration/inheritance_test.go | 4 +-- integration/integration_suite_test.go | 16 +++++----- integration/metadata_globals_create_test.go | 8 ++--- integration/metadata_globals_queries_test.go | 8 ++--- integration/options_integration_test.go | 6 ++-- integration/parallel_queries_test.go | 12 +++---- integration/postdata_create_test.go | 8 ++--- integration/postdata_queries_test.go | 10 +++--- integration/predata_acl_create_test.go | 8 ++--- integration/predata_acl_queries_test.go | 10 +++--- integration/predata_externals_create_test.go | 8 ++--- integration/predata_externals_queries_test.go | 8 ++--- integration/predata_functions_create_test.go | 8 ++--- integration/predata_functions_queries_test.go | 10 +++--- integration/predata_operators_create_test.go | 8 ++--- integration/predata_operators_queries_test.go | 10 +++--- integration/predata_relations_create_test.go | 8 ++--- integration/predata_relations_queries_test.go | 10 +++--- integration/predata_shared_create_test.go | 8 ++--- integration/predata_shared_queries_test.go | 10 +++--- .../predata_table_defs_queries_test.go | 10 +++--- integration/predata_textsearch_create_test.go | 8 ++--- .../predata_textsearch_queries_test.go | 10 +++--- integration/predata_types_create_test.go | 8 ++--- integration/predata_types_queries_test.go | 10 +++--- integration/snapshot_test.go | 4 +-- integration/statistics_create_test.go | 8 ++--- integration/statistics_queries_test.go | 8 ++--- integration/utils_test.go | 10 +++--- integration/wrappers_test.go | 8 ++--- options/flag.go | 2 +- options/flag_test.go | 4 +-- options/options.go | 8 ++--- options/options_suite_test.go | 2 +- options/options_test.go | 6 ++-- plugins/README.md | 4 +-- plugins/example_plugin_config.yaml | 2 +- report/report.go | 14 ++++---- report/report_test.go | 26 +++++++-------- restore/data.go | 14 ++++---- restore/data_test.go | 12 +++---- restore/global_variables.go | 14 ++++---- restore/parallel.go | 8 ++--- restore/parallel_test.go | 4 +-- restore/remote.go | 8 ++--- restore/remote_test.go | 16 +++++----- restore/restore.go | 16 +++++----- restore/restore_internal_test.go | 2 +- restore/restore_suite_test.go | 6 ++-- restore/validate.go | 8 ++--- restore/validate_test.go | 14 ++++---- restore/wrappers.go | 18 +++++------ restore/wrappers_test.go | 16 +++++----- show_coverage.sh | 2 +- testutils/functions.go | 22 ++++++------- testutils/functions_test.go | 6 ++-- toc/toc.go | 4 +-- toc/toc_test.go | 4 +-- utils/agent_remote.go | 10 +++--- utils/agent_remote_test.go | 10 +++--- utils/compression_test.go | 10 +++--- utils/gpexpand_sensor.go | 4 +-- utils/gpexpand_sensor_test.go | 4 +-- utils/io.go | 2 +- utils/io_test.go | 6 ++-- utils/plugin.go | 10 +++--- utils/plugin_test.go | 12 +++---- utils/progress_bar.go | 2 +- utils/progress_bar_test.go | 8 ++--- utils/set_test.go | 2 +- utils/util.go | 8 ++--- utils/util_test.go | 4 +-- utils/utils_suite_test.go | 4 +-- 169 files changed, 644 insertions(+), 644 deletions(-) diff --git a/.github/workflows/build_and_unit_test.yml b/.github/workflows/build_and_unit_test.yml index 291a680b..3d37f640 100644 --- a/.github/workflows/build_and_unit_test.yml +++ b/.github/workflows/build_and_unit_test.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - path: go/src/github.com/greenplum-db/gpbackup + path: go/src/github.com/cloudberrydb/gpbackup - name: Set up Go uses: actions/setup-go@v2 @@ -29,15 +29,15 @@ jobs: - name: Dependencies run: | - cd ${GOPATH}/src/github.com/greenplum-db/gpbackup + cd ${GOPATH}/src/github.com/cloudberrydb/gpbackup make depend - name: Build run: | - cd ${GOPATH}/src/github.com/greenplum-db/gpbackup + cd ${GOPATH}/src/github.com/cloudberrydb/gpbackup make build - name: Unit Test run: | - cd ${GOPATH}/src/github.com/greenplum-db/gpbackup + cd ${GOPATH}/src/github.com/cloudberrydb/gpbackup make unit_all_gpdb_versions diff --git a/backup/backup.go b/backup/backup.go index b4633450..8a292f7e 100644 --- a/backup/backup.go +++ b/backup/backup.go @@ -11,16 +11,16 @@ import ( "sync" "time" - "github.com/greenplum-db/gp-common-go-libs/cluster" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gp-common-go-libs/operating" - "github.com/greenplum-db/gpbackup/filepath" - "github.com/greenplum-db/gpbackup/history" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/report" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/cluster" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gp-common-go-libs/operating" + "github.com/cloudberrydb/gpbackup/filepath" + "github.com/cloudberrydb/gpbackup/history" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/report" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/spf13/cobra" ) diff --git a/backup/backup_internal_test.go b/backup/backup_internal_test.go index 959a637a..ca2883ba 100644 --- a/backup/backup_internal_test.go +++ b/backup/backup_internal_test.go @@ -1,7 +1,7 @@ package backup import ( - "github.com/greenplum-db/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/backup_suite_test.go b/backup/backup_suite_test.go index 74f6cc5d..801b90bc 100644 --- a/backup/backup_suite_test.go +++ b/backup/backup_suite_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/spf13/pflag" . "github.com/onsi/ginkgo/v2" diff --git a/backup/data.go b/backup/data.go index d65086ac..4dd0de0f 100644 --- a/backup/data.go +++ b/backup/data.go @@ -12,10 +12,10 @@ import ( "sync/atomic" "time" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/utils" "github.com/jackc/pgconn" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/backup/data_test.go b/backup/data_test.go index 2743d132..f0ecd5bd 100644 --- a/backup/data_test.go +++ b/backup/data_test.go @@ -5,12 +5,12 @@ import ( "regexp" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/history" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/report" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/history" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/report" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "gopkg.in/cheggaaa/pb.v1" . "github.com/onsi/ginkgo/v2" diff --git a/backup/dependencies.go b/backup/dependencies.go index 7fed0166..73a0f45a 100644 --- a/backup/dependencies.go +++ b/backup/dependencies.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/pkg/errors" ) diff --git a/backup/dependencies_test.go b/backup/dependencies_test.go index d4da8e47..657a8f2f 100644 --- a/backup/dependencies_test.go +++ b/backup/dependencies_test.go @@ -4,9 +4,9 @@ import ( "database/sql" "fmt" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/global_variables.go b/backup/global_variables.go index 957d169c..520e6236 100644 --- a/backup/global_variables.go +++ b/backup/global_variables.go @@ -3,13 +3,13 @@ package backup import ( "sync" - "github.com/greenplum-db/gp-common-go-libs/cluster" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gpbackup/filepath" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/report" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/cluster" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gpbackup/filepath" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/report" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/nightlyone/lockfile" "github.com/spf13/pflag" ) diff --git a/backup/incremental.go b/backup/incremental.go index 66d0765d..7961beea 100644 --- a/backup/incremental.go +++ b/backup/incremental.go @@ -3,12 +3,12 @@ package backup import ( "path" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gp-common-go-libs/iohelper" - "github.com/greenplum-db/gpbackup/history" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gp-common-go-libs/iohelper" + "github.com/cloudberrydb/gpbackup/history" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/pkg/errors" ) diff --git a/backup/incremental_test.go b/backup/incremental_test.go index 2a5b1183..29987173 100644 --- a/backup/incremental_test.go +++ b/backup/incremental_test.go @@ -1,15 +1,15 @@ package backup_test import ( - "github.com/greenplum-db/gp-common-go-libs/operating" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/filepath" - "github.com/greenplum-db/gpbackup/history" - "github.com/greenplum-db/gpbackup/report" - "github.com/greenplum-db/gpbackup/testutils" - "github.com/greenplum-db/gpbackup/toc" + "github.com/cloudberrydb/gp-common-go-libs/operating" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/filepath" + "github.com/cloudberrydb/gpbackup/history" + "github.com/cloudberrydb/gpbackup/report" + "github.com/cloudberrydb/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/toc" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/metadata_globals.go b/backup/metadata_globals.go index 85106734..612b02fc 100644 --- a/backup/metadata_globals.go +++ b/backup/metadata_globals.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) /* diff --git a/backup/metadata_globals_test.go b/backup/metadata_globals_test.go index 110fa5e4..b8e8518c 100644 --- a/backup/metadata_globals_test.go +++ b/backup/metadata_globals_test.go @@ -3,9 +3,9 @@ package backup_test import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" ) diff --git a/backup/postdata.go b/backup/postdata.go index b43bb878..559299b6 100644 --- a/backup/postdata.go +++ b/backup/postdata.go @@ -9,9 +9,9 @@ package backup import ( "strings" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/pkg/errors" ) diff --git a/backup/postdata_test.go b/backup/postdata_test.go index e14fabc9..3848cb24 100644 --- a/backup/postdata_test.go +++ b/backup/postdata_test.go @@ -4,8 +4,8 @@ import ( "database/sql" "fmt" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" ) diff --git a/backup/predata_acl.go b/backup/predata_acl.go index 10943fdf..da53f533 100644 --- a/backup/predata_acl.go +++ b/backup/predata_acl.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) var ACLRegex = regexp.MustCompile(`^(.*)=([a-zA-Z\*]*)/(.*)$`) diff --git a/backup/predata_acl_test.go b/backup/predata_acl_test.go index c70ccc4e..d14cb0a5 100644 --- a/backup/predata_acl_test.go +++ b/backup/predata_acl_test.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/predata_externals.go b/backup/predata_externals.go index 5bf05d0d..c4d5a68f 100644 --- a/backup/predata_externals.go +++ b/backup/predata_externals.go @@ -11,8 +11,8 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) const ( diff --git a/backup/predata_externals_test.go b/backup/predata_externals_test.go index 92fc1a4a..9f91b605 100644 --- a/backup/predata_externals_test.go +++ b/backup/predata_externals_test.go @@ -3,9 +3,9 @@ package backup_test import ( "database/sql" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/predata_functions.go b/backup/predata_functions.go index e4dd1333..61cd31d8 100644 --- a/backup/predata_functions.go +++ b/backup/predata_functions.go @@ -9,9 +9,9 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) func PrintCreateFunctionStatement(metadataFile *utils.FileWithByteCount, toc *toc.TOC, funcDef Function, funcMetadata ObjectMetadata) { diff --git a/backup/predata_functions_test.go b/backup/predata_functions_test.go index a4304c78..60637793 100644 --- a/backup/predata_functions_test.go +++ b/backup/predata_functions_test.go @@ -4,9 +4,9 @@ import ( "database/sql" "fmt" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/predata_operators.go b/backup/predata_operators.go index 8c64f0c6..208e48e3 100644 --- a/backup/predata_operators.go +++ b/backup/predata_operators.go @@ -11,8 +11,8 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) func PrintCreateOperatorStatement(metadataFile *utils.FileWithByteCount, toc *toc.TOC, operator Operator, operatorMetadata ObjectMetadata) { diff --git a/backup/predata_operators_test.go b/backup/predata_operators_test.go index fd3fd19e..51c62dd5 100644 --- a/backup/predata_operators_test.go +++ b/backup/predata_operators_test.go @@ -3,8 +3,8 @@ package backup_test import ( "fmt" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" ) diff --git a/backup/predata_relations.go b/backup/predata_relations.go index 0730010f..1e28ce3c 100644 --- a/backup/predata_relations.go +++ b/backup/predata_relations.go @@ -12,10 +12,10 @@ import ( "github.com/pkg/errors" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) /* diff --git a/backup/predata_relations_other_test.go b/backup/predata_relations_other_test.go index 41b162ef..56499217 100644 --- a/backup/predata_relations_other_test.go +++ b/backup/predata_relations_other_test.go @@ -6,11 +6,11 @@ import ( "math" "sort" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/predata_relations_tables_test.go b/backup/predata_relations_tables_test.go index f4a74811..9055a062 100644 --- a/backup/predata_relations_tables_test.go +++ b/backup/predata_relations_tables_test.go @@ -3,9 +3,9 @@ package backup_test import ( "database/sql" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" ) diff --git a/backup/predata_shared.go b/backup/predata_shared.go index 951b1829..7058a7e5 100644 --- a/backup/predata_shared.go +++ b/backup/predata_shared.go @@ -7,9 +7,9 @@ package backup */ import ( - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/pkg/errors" ) diff --git a/backup/predata_shared_test.go b/backup/predata_shared_test.go index 91df019f..7ab3d38e 100644 --- a/backup/predata_shared_test.go +++ b/backup/predata_shared_test.go @@ -3,8 +3,8 @@ package backup_test import ( "database/sql" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" ) diff --git a/backup/predata_textsearch.go b/backup/predata_textsearch.go index 1fd25010..2f2f5b4c 100644 --- a/backup/predata_textsearch.go +++ b/backup/predata_textsearch.go @@ -13,8 +13,8 @@ import ( "sort" "strings" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) func PrintCreateTextSearchParserStatement(metadataFile *utils.FileWithByteCount, toc *toc.TOC, parser TextSearchParser, parserMetadata ObjectMetadata) { diff --git a/backup/predata_textsearch_test.go b/backup/predata_textsearch_test.go index 6769b208..e0cf0543 100644 --- a/backup/predata_textsearch_test.go +++ b/backup/predata_textsearch_test.go @@ -1,8 +1,8 @@ package backup_test import ( - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" ) diff --git a/backup/predata_types.go b/backup/predata_types.go index fc3b671d..56feb31e 100644 --- a/backup/predata_types.go +++ b/backup/predata_types.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/pkg/errors" ) diff --git a/backup/predata_types_test.go b/backup/predata_types_test.go index 05563688..db7dde8e 100644 --- a/backup/predata_types_test.go +++ b/backup/predata_types_test.go @@ -4,8 +4,8 @@ import ( "database/sql" "fmt" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" ) diff --git a/backup/queries_acl.go b/backup/queries_acl.go index fb388687..09a21b2b 100644 --- a/backup/queries_acl.go +++ b/backup/queries_acl.go @@ -10,9 +10,9 @@ import ( "fmt" "sort" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" ) /* diff --git a/backup/queries_acl_test.go b/backup/queries_acl_test.go index 677c6aa3..ebe77bb7 100644 --- a/backup/queries_acl_test.go +++ b/backup/queries_acl_test.go @@ -6,8 +6,8 @@ import ( "regexp" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gpbackup/backup" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gpbackup/backup" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/queries_externals.go b/backup/queries_externals.go index bf207918..c2d76eb8 100644 --- a/backup/queries_externals.go +++ b/backup/queries_externals.go @@ -6,9 +6,9 @@ package backup */ import ( - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" ) func GetExternalTableDefinitions(connectionPool *dbconn.DBConn) map[uint32]ExternalTableDefinition { diff --git a/backup/queries_functions.go b/backup/queries_functions.go index 54bea392..9ae73e3f 100644 --- a/backup/queries_functions.go +++ b/backup/queries_functions.go @@ -11,10 +11,10 @@ import ( "regexp" "strings" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) type Function struct { diff --git a/backup/queries_functions_test.go b/backup/queries_functions_test.go index d93ef5ed..05a997af 100644 --- a/backup/queries_functions_test.go +++ b/backup/queries_functions_test.go @@ -5,8 +5,8 @@ import ( "database/sql/driver" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gpbackup/backup" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gpbackup/backup" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/queries_globals.go b/backup/queries_globals.go index 4e6346f3..2ba770fd 100644 --- a/backup/queries_globals.go +++ b/backup/queries_globals.go @@ -8,10 +8,10 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) type SessionGUCs struct { diff --git a/backup/queries_incremental.go b/backup/queries_incremental.go index f700f888..11472062 100644 --- a/backup/queries_incremental.go +++ b/backup/queries_incremental.go @@ -3,9 +3,9 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" ) func GetAOIncrementalMetadata(connectionPool *dbconn.DBConn) map[string]toc.AOEntry { diff --git a/backup/queries_operators.go b/backup/queries_operators.go index a56492f9..f1a9273e 100644 --- a/backup/queries_operators.go +++ b/backup/queries_operators.go @@ -8,10 +8,10 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) type Operator struct { diff --git a/backup/queries_postdata.go b/backup/queries_postdata.go index e92a0ec6..2eab3c32 100644 --- a/backup/queries_postdata.go +++ b/backup/queries_postdata.go @@ -10,10 +10,10 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) /* diff --git a/backup/queries_postdata_test.go b/backup/queries_postdata_test.go index 702d6f91..6e392e52 100644 --- a/backup/queries_postdata_test.go +++ b/backup/queries_postdata_test.go @@ -5,8 +5,8 @@ import ( "database/sql/driver" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gpbackup/backup" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gpbackup/backup" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/queries_relation_test.go b/backup/queries_relation_test.go index 03786f46..680545f0 100644 --- a/backup/queries_relation_test.go +++ b/backup/queries_relation_test.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gpbackup/backup" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gpbackup/backup" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/queries_relations.go b/backup/queries_relations.go index bbdac655..6e4224b5 100644 --- a/backup/queries_relations.go +++ b/backup/queries_relations.go @@ -10,11 +10,11 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/pkg/errors" ) diff --git a/backup/queries_shared.go b/backup/queries_shared.go index 4c2d7dcf..6c2ff895 100644 --- a/backup/queries_shared.go +++ b/backup/queries_shared.go @@ -10,11 +10,11 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) /* diff --git a/backup/queries_shared_test.go b/backup/queries_shared_test.go index 2a4686c3..eae2b51f 100644 --- a/backup/queries_shared_test.go +++ b/backup/queries_shared_test.go @@ -5,9 +5,9 @@ import ( "database/sql/driver" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/structmatcher" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gp-common-go-libs/structmatcher" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/backup/queries_statistics.go b/backup/queries_statistics.go index 35dbae6f..08131e27 100644 --- a/backup/queries_statistics.go +++ b/backup/queries_statistics.go @@ -8,9 +8,9 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/utils" "github.com/lib/pq" ) diff --git a/backup/queries_table_defs.go b/backup/queries_table_defs.go index d616ca35..0bcbf5d1 100644 --- a/backup/queries_table_defs.go +++ b/backup/queries_table_defs.go @@ -10,10 +10,10 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/toc" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/toc" ) type Table struct { diff --git a/backup/queries_textsearch.go b/backup/queries_textsearch.go index 15eca53d..a16e183e 100644 --- a/backup/queries_textsearch.go +++ b/backup/queries_textsearch.go @@ -11,10 +11,10 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) type TextSearchParser struct { diff --git a/backup/queries_types.go b/backup/queries_types.go index 601f1db8..cabb25c0 100644 --- a/backup/queries_types.go +++ b/backup/queries_types.go @@ -8,10 +8,10 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" ) func GetTypeMetadataEntry(schema string, name string) (string, toc.MetadataEntry) { diff --git a/backup/snapshot.go b/backup/snapshot.go index 38cfd700..8b53d70c 100644 --- a/backup/snapshot.go +++ b/backup/snapshot.go @@ -7,8 +7,8 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" ) const ( diff --git a/backup/statistics.go b/backup/statistics.go index 5ea1741c..c8cf9182 100644 --- a/backup/statistics.go +++ b/backup/statistics.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/greenplum-db/gpbackup/toc" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gpbackup/toc" + "github.com/cloudberrydb/gpbackup/utils" "github.com/lib/pq" ) diff --git a/backup/statistics_test.go b/backup/statistics_test.go index fb527932..a30b5a29 100644 --- a/backup/statistics_test.go +++ b/backup/statistics_test.go @@ -3,8 +3,8 @@ package backup_test import ( "fmt" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/testutils" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/testutils" "github.com/lib/pq" . "github.com/onsi/ginkgo/v2" diff --git a/backup/validate.go b/backup/validate.go index 3e8de8e2..067eea69 100644 --- a/backup/validate.go +++ b/backup/validate.go @@ -3,12 +3,12 @@ package backup import ( "fmt" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/filepath" - "github.com/greenplum-db/gpbackup/history" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/filepath" + "github.com/cloudberrydb/gpbackup/history" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/utils" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/backup/validate_test.go b/backup/validate_test.go index c7a058ee..7c463c49 100644 --- a/backup/validate_test.go +++ b/backup/validate_test.go @@ -4,9 +4,9 @@ import ( "strings" "github.com/DATA-DOG/go-sqlmock" - "github.com/greenplum-db/gp-common-go-libs/testhelper" - "github.com/greenplum-db/gpbackup/backup" - "github.com/greenplum-db/gpbackup/options" + "github.com/cloudberrydb/gp-common-go-libs/testhelper" + "github.com/cloudberrydb/gpbackup/backup" + "github.com/cloudberrydb/gpbackup/options" "github.com/spf13/cobra" . "github.com/onsi/ginkgo/v2" diff --git a/backup/wrappers.go b/backup/wrappers.go index 93ce2559..4e7d94f0 100644 --- a/backup/wrappers.go +++ b/backup/wrappers.go @@ -5,13 +5,13 @@ import ( "path" "reflect" - "github.com/greenplum-db/gp-common-go-libs/cluster" - "github.com/greenplum-db/gp-common-go-libs/dbconn" - "github.com/greenplum-db/gp-common-go-libs/gplog" - "github.com/greenplum-db/gpbackup/history" - "github.com/greenplum-db/gpbackup/options" - "github.com/greenplum-db/gpbackup/report" - "github.com/greenplum-db/gpbackup/utils" + "github.com/cloudberrydb/gp-common-go-libs/cluster" + "github.com/cloudberrydb/gp-common-go-libs/dbconn" + "github.com/cloudberrydb/gp-common-go-libs/gplog" + "github.com/cloudberrydb/gpbackup/history" + "github.com/cloudberrydb/gpbackup/options" + "github.com/cloudberrydb/gpbackup/report" + "github.com/cloudberrydb/gpbackup/utils" "github.com/nightlyone/lockfile" "github.com/pkg/errors" ) diff --git a/ci/gen_pipeline.py b/ci/gen_pipeline.py index 1920b8e7..47018fc3 100755 --- a/ci/gen_pipeline.py +++ b/ci/gen_pipeline.py @@ -89,7 +89,7 @@ def print_output_message(args): if git_branch == "main": print "\n[WARNING] You are generating a dev pipeline pointed to the main branch!\n" cmd = """fly -t dp set-pipeline -p dev:%s_%s \ --c ~/go/src/github.com/greenplum-db/gpbackup/ci/%s-dev-generated.yml \ +-c ~/go/src/github.com/cloudberrydb/gpbackup/ci/%s-dev-generated.yml \ -v gpbackup-git-branch=%s""" % (args.pipeline_name, git_branch, args.pipeline_name, git_branch) print "To set this pipeline on dev, run: \n%s" % (cmd) join = raw_input('Would you like to run the pipeline now? [yN]: ') @@ -104,10 +104,10 @@ def print_output_message(args): if git_branch != "main": print "\n[WARNING] You are generating a prod pipeline, but are not on the main branch!\n" cmd1 = "fly -t gpdb-prod set-pipeline -p %s \ --c ~/go/src/github.com/greenplum-db/gpbackup/ci/%s-generated.yml" % (args.pipeline_name, args.pipeline_name) +-c ~/go/src/github.com/cloudberrydb/gpbackup/ci/%s-generated.yml" % (args.pipeline_name, args.pipeline_name) args.pipeline_name = "gpbackup" cmd2 = "fly -t gpdb-prod set-pipeline -p %s \ --c ~/go/src/github.com/greenplum-db/gpbackup/ci/%s-generated.yml" % (args.pipeline_name, args.pipeline_name) +-c ~/go/src/github.com/cloudberrydb/gpbackup/ci/%s-generated.yml" % (args.pipeline_name, args.pipeline_name) print "To set these pipelines (gpbackup / gpbackup-release) on prod, run: \n%s\n%s" % (cmd2, cmd1) def main(): diff --git a/ci/regression/regression_pipeline.yml b/ci/regression/regression_pipeline.yml index dc78bf6e..09f44d8a 100644 --- a/ci/regression/regression_pipeline.yml +++ b/ci/regression/regression_pipeline.yml @@ -58,7 +58,7 @@ resources: type: git icon: github-circle source: - uri: https://github.com/greenplum-db/gpbackup + uri: https://github.com/cloudberrydb/gpbackup branch: ((gpbackup-git-branch)) - name: diffdb_src @@ -95,7 +95,7 @@ resources: icon: github-circle source: branch: ((dp/dev/gpbackup-s3-plugin-git-branch)) - uri: https://github.com/greenplum-db/gpbackup-s3-plugin + uri: https://github.com/cloudberrydb/gpbackup-s3-plugin - name: gpbackup_ddboost_plugin type: git diff --git a/ci/scale/scale_pipeline.yml b/ci/scale/scale_pipeline.yml index 2e8a3588..9fd2eca1 100644 --- a/ci/scale/scale_pipeline.yml +++ b/ci/scale/scale_pipeline.yml @@ -63,7 +63,7 @@ resources: type: git icon: github-circle source: - uri: https://github.com/greenplum-db/gpbackup + uri: https://github.com/cloudberrydb/gpbackup branch: ((gpbackup-git-branch)) - name: gpdb6_src @@ -86,7 +86,7 @@ resources: icon: github-circle source: branch: ((dp/dev/gpbackup-s3-plugin-git-branch)) - uri: https://github.com/greenplum-db/gpbackup-s3-plugin + uri: https://github.com/cloudberrydb/gpbackup-s3-plugin - name: gpbackup_ddboost_plugin type: git diff --git a/ci/scripts/all-tests.bash b/ci/scripts/all-tests.bash index 506e9444..dc4f6532 100755 --- a/ci/scripts/all-tests.bash +++ b/ci/scripts/all-tests.bash @@ -27,7 +27,7 @@ cat <