This is an automated email from the ASF dual-hosted git repository.
gfphoenix78 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 b3883aec feat: Enable Cloudberry DB support via new dependency (#13)
b3883aec is described below
commit b3883aeccb3417b6daa28f7c5c68e0dbadff0456
Author: Robert Mu <[email protected]>
AuthorDate: Wed Jul 30 10:46:38 2025 +0800
feat: Enable Cloudberry DB support via new dependency (#13)
Switch from the upstream `gp-common-go-libs` to the `cloudberrydb` fork.
This is necessary to import new version-parsing logic that allows the tool
to correctly differentiate between Greenplum and Apache Cloudberry Database,
which is a prerequisite for proper Cloudberry DB backup support.
---
backup/backup.go | 8 ++++----
backup/backup_internal_test.go | 2 +-
backup/backup_suite_test.go | 2 +-
backup/data.go | 4 ++--
backup/dependencies.go | 4 ++--
backup/dependencies_test.go | 2 +-
backup/global_variables.go | 6 +++---
backup/incremental.go | 6 +++---
backup/incremental_test.go | 6 +++---
backup/metadata_globals.go | 2 +-
backup/metadata_globals_test.go | 2 +-
backup/postdata.go | 2 +-
backup/predata_acl_test.go | 4 ++--
backup/predata_externals_test.go | 2 +-
backup/predata_functions.go | 2 +-
backup/predata_functions_test.go | 2 +-
backup/predata_relations.go | 4 ++--
backup/predata_relations_other_test.go | 4 ++--
backup/predata_relations_tables_test.go | 2 +-
backup/predata_shared.go | 2 +-
backup/predata_types.go | 2 +-
backup/queries_acl.go | 4 ++--
backup/queries_acl_test.go | 2 +-
backup/queries_externals.go | 4 ++--
backup/queries_functions.go | 4 ++--
backup/queries_functions_test.go | 2 +-
backup/queries_globals.go | 4 ++--
backup/queries_incremental.go | 4 ++--
backup/queries_operators.go | 4 ++--
backup/queries_postdata.go | 4 ++--
backup/queries_postdata_test.go | 2 +-
backup/queries_relation_test.go | 2 +-
backup/queries_relations.go | 4 ++--
backup/queries_shared.go | 4 ++--
backup/queries_shared_test.go | 2 +-
backup/queries_statistics.go | 4 ++--
backup/queries_table_defs.go | 8 ++++----
backup/queries_textsearch.go | 4 ++--
backup/queries_types.go | 4 ++--
backup/snapshot.go | 26 +++++++++++++-------------
backup/validate.go | 4 ++--
backup/validate_test.go | 2 +-
backup/wrappers.go | 6 +++---
end_to_end/end_to_end_suite_test.go | 12 ++++++------
end_to_end/filtered_test.go | 4 ++--
end_to_end/incremental_test.go | 4 ++--
end_to_end/locks_test.go | 2 +-
end_to_end/plugin_test.go | 8 ++++----
end_to_end/signal_handler_test.go | 2 +-
end_to_end/special_characters_test.go | 2 +-
filepath/filepath.go | 8 ++++----
filepath/filepath_test.go | 6 +++---
go.mod | 4 ++--
go.sum | 9 +++++++--
helper/helper.go | 4 ++--
history/history.go | 10 +++++-----
history/history_test.go | 6 +++---
integration/agent_remote_test.go | 2 +-
integration/data_backup_test.go | 4 ++--
integration/dependency_queries_test.go | 2 +-
integration/gpexpand_not_running_test.go | 6 +++---
integration/helper_test.go | 2 +-
integration/incremental_queries_test.go | 2 +-
integration/inheritance_test.go | 4 ++--
integration/integration_suite_test.go | 8 ++++----
integration/metadata_globals_create_test.go | 4 ++--
integration/metadata_globals_queries_test.go | 4 ++--
integration/options_integration_test.go | 2 +-
integration/parallel_queries_test.go | 4 ++--
integration/postdata_create_test.go | 4 ++--
integration/postdata_queries_test.go | 4 ++--
integration/predata_acl_create_test.go | 4 ++--
integration/predata_acl_queries_test.go | 5 ++---
integration/predata_externals_create_test.go | 4 ++--
integration/predata_externals_queries_test.go | 4 ++--
integration/predata_functions_create_test.go | 4 ++--
integration/predata_functions_queries_test.go | 4 ++--
integration/predata_operators_create_test.go | 4 ++--
integration/predata_operators_queries_test.go | 6 +++---
integration/predata_relations_create_test.go | 8 ++++----
integration/predata_relations_queries_test.go | 6 +++---
integration/predata_shared_create_test.go | 4 ++--
integration/predata_shared_queries_test.go | 4 ++--
integration/predata_table_defs_queries_test.go | 4 ++--
integration/predata_textsearch_create_test.go | 4 ++--
integration/predata_textsearch_queries_test.go | 4 ++--
integration/predata_types_create_test.go | 4 ++--
integration/predata_types_queries_test.go | 4 ++--
integration/statistics_create_test.go | 4 ++--
integration/statistics_queries_test.go | 4 ++--
integration/utils_test.go | 6 +++---
integration/wrappers_test.go | 4 ++--
options/flag.go | 2 +-
options/flag_test.go | 2 +-
options/options.go | 6 +++---
options/options_suite_test.go | 2 +-
options/options_test.go | 4 ++--
report/report.go | 10 +++++-----
report/report_test.go | 12 ++++++------
restore/data.go | 6 +++---
restore/data_test.go | 2 +-
restore/global_variables.go | 4 ++--
restore/parallel.go | 2 +-
restore/remote.go | 6 +++---
restore/remote_test.go | 10 +++++-----
restore/restore.go | 6 +++---
restore/restore_internal_test.go | 2 +-
restore/restore_suite_test.go | 2 +-
restore/validate.go | 4 ++--
restore/validate_test.go | 2 +-
restore/wrappers.go | 8 ++++----
restore/wrappers_test.go | 4 ++--
testutils/functions.go | 12 ++++++------
toc/toc.go | 2 +-
utils/agent_remote.go | 8 ++++----
utils/agent_remote_test.go | 8 ++++----
utils/compression_test.go | 8 ++++----
utils/gpexpand_sensor.go | 4 ++--
utils/gpexpand_sensor_test.go | 2 +-
utils/io.go | 2 +-
utils/io_test.go | 4 ++--
utils/plugin.go | 8 ++++----
utils/plugin_test.go | 8 ++++----
utils/progress_bar.go | 2 +-
utils/progress_bar_test.go | 6 +++---
utils/util.go | 6 +++---
utils/util_test.go | 2 +-
utils/utils_suite_test.go | 2 +-
128 files changed, 293 insertions(+), 289 deletions(-)
diff --git a/backup/backup.go b/backup/backup.go
index 4c29768d..54bf1167 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -11,10 +11,10 @@ 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/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/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
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..46128e04 100644
--- a/backup/backup_suite_test.go
+++ b/backup/backup_suite_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/data.go b/backup/data.go
index 68bc2cb4..277e5b06 100644
--- a/backup/data.go
+++ b/backup/data.go
@@ -12,8 +12,8 @@ import (
"sync/atomic"
"time"
- "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"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/utils"
"github.com/jackc/pgconn"
diff --git a/backup/dependencies.go b/backup/dependencies.go
index 4dcff19f..5f467cc2 100644
--- a/backup/dependencies.go
+++ b/backup/dependencies.go
@@ -5,8 +5,8 @@ import (
"sort"
"strings"
- "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"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/backup/dependencies_test.go b/backup/dependencies_test.go
index 7cc4cbf3..9c307735 100644
--- a/backup/dependencies_test.go
+++ b/backup/dependencies_test.go
@@ -4,7 +4,7 @@ import (
"database/sql"
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/backup/global_variables.go b/backup/global_variables.go
index b96c7d8d..c34bcc64 100644
--- a/backup/global_variables.go
+++ b/backup/global_variables.go
@@ -3,8 +3,8 @@ package backup
import (
"sync"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/report"
@@ -27,7 +27,7 @@ const (
Deferred
Complete
PG_LOCK_NOT_AVAILABLE = "55P03"
- ENUM_TYPE_OID = 3500
+ ENUM_TYPE_OID = 3500
)
/*
diff --git a/backup/incremental.go b/backup/incremental.go
index c9985665..25f3ca35 100644
--- a/backup/incremental.go
+++ b/backup/incremental.go
@@ -4,8 +4,8 @@ import (
"fmt"
"path"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
@@ -77,7 +77,7 @@ func GetLatestMatchingBackupConfig(historyDBPath string,
currentBackupConfig *hi
currentBackupConfig.Plugin,
MustGetFlagBool(options.SINGLE_DATA_FILE),
currentBackupConfig.Compressed,
- history.BackupStatusSucceed)
+ history.BackupStatusSucceed)
getBackupTimetampsQuery := fmt.Sprintf(`
SELECT timestamp
diff --git a/backup/incremental_test.go b/backup/incremental_test.go
index b1ce1f10..059e5f9c 100644
--- a/backup/incremental_test.go
+++ b/backup/incremental_test.go
@@ -3,9 +3,9 @@ package backup_test
import (
"os"
- "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/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
diff --git a/backup/metadata_globals.go b/backup/metadata_globals.go
index de44e182..c0a0777e 100644
--- a/backup/metadata_globals.go
+++ b/backup/metadata_globals.go
@@ -5,7 +5,7 @@ import (
"strconv"
"strings"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/metadata_globals_test.go b/backup/metadata_globals_test.go
index 03bb505e..1f07253b 100644
--- a/backup/metadata_globals_test.go
+++ b/backup/metadata_globals_test.go
@@ -3,7 +3,7 @@ package backup_test
import (
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/postdata.go b/backup/postdata.go
index e367b96f..a177e183 100644
--- a/backup/postdata.go
+++ b/backup/postdata.go
@@ -9,7 +9,7 @@ package backup
import (
"strings"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/backup/predata_acl_test.go b/backup/predata_acl_test.go
index 0495b65b..a1a9f522 100644
--- a/backup/predata_acl_test.go
+++ b/backup/predata_acl_test.go
@@ -5,8 +5,8 @@ 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/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_externals_test.go b/backup/predata_externals_test.go
index 45941e90..85c01c3e 100644
--- a/backup/predata_externals_test.go
+++ b/backup/predata_externals_test.go
@@ -3,7 +3,7 @@ package backup_test
import (
"database/sql"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_functions.go b/backup/predata_functions.go
index 7c79d9bf..da6a79e7 100644
--- a/backup/predata_functions.go
+++ b/backup/predata_functions.go
@@ -9,7 +9,7 @@ package backup
import (
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/predata_functions_test.go b/backup/predata_functions_test.go
index c112e36a..b7e44eef 100644
--- a/backup/predata_functions_test.go
+++ b/backup/predata_functions_test.go
@@ -4,7 +4,7 @@ import (
"database/sql"
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_relations.go b/backup/predata_relations.go
index 5678e1a9..dd10a203 100644
--- a/backup/predata_relations.go
+++ b/backup/predata_relations.go
@@ -13,8 +13,8 @@ import (
"github.com/pkg/errors"
- "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"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
diff --git a/backup/predata_relations_other_test.go
b/backup/predata_relations_other_test.go
index 1896365c..f5dadd07 100644
--- a/backup/predata_relations_other_test.go
+++ b/backup/predata_relations_other_test.go
@@ -6,8 +6,8 @@ import (
"math"
"sort"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/backup/predata_relations_tables_test.go
b/backup/predata_relations_tables_test.go
index bd49f8a3..2fef2e3d 100644
--- a/backup/predata_relations_tables_test.go
+++ b/backup/predata_relations_tables_test.go
@@ -3,7 +3,7 @@ package backup_test
import (
"database/sql"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/predata_shared.go b/backup/predata_shared.go
index 56097fb0..0c016bb1 100644
--- a/backup/predata_shared.go
+++ b/backup/predata_shared.go
@@ -7,7 +7,7 @@ package backup
*/
import (
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/backup/predata_types.go b/backup/predata_types.go
index 4c13c510..b54c7038 100644
--- a/backup/predata_types.go
+++ b/backup/predata_types.go
@@ -9,7 +9,7 @@ import (
"fmt"
"strings"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/backup/queries_acl.go b/backup/queries_acl.go
index 27ae2d53..febe37da 100644
--- a/backup/queries_acl.go
+++ b/backup/queries_acl.go
@@ -10,8 +10,8 @@ import (
"fmt"
"sort"
- "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"
"github.com/greenplum-db/gpbackup/toc"
)
diff --git a/backup/queries_acl_test.go b/backup/queries_acl_test.go
index e8018a4b..2e2e17ab 100644
--- a/backup/queries_acl_test.go
+++ b/backup/queries_acl_test.go
@@ -6,7 +6,7 @@ import (
"regexp"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/backup/queries_externals.go b/backup/queries_externals.go
index 900fde3a..2f3e224f 100644
--- a/backup/queries_externals.go
+++ b/backup/queries_externals.go
@@ -6,8 +6,8 @@ package backup
*/
import (
- "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"
"github.com/greenplum-db/gpbackup/toc"
)
diff --git a/backup/queries_functions.go b/backup/queries_functions.go
index 76fd583f..7cacace5 100644
--- a/backup/queries_functions.go
+++ b/backup/queries_functions.go
@@ -11,8 +11,8 @@ import (
"regexp"
"strings"
- "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"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/queries_functions_test.go b/backup/queries_functions_test.go
index 19b76cde..ba152aec 100644
--- a/backup/queries_functions_test.go
+++ b/backup/queries_functions_test.go
@@ -5,7 +5,7 @@ import (
"database/sql/driver"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
"github.com/greenplum-db/gpbackup/backup"
. "github.com/onsi/ginkgo/v2"
diff --git a/backup/queries_globals.go b/backup/queries_globals.go
index bb3c6175..adf600c3 100644
--- a/backup/queries_globals.go
+++ b/backup/queries_globals.go
@@ -8,8 +8,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"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/queries_incremental.go b/backup/queries_incremental.go
index a3e2d7fa..51d9970e 100644
--- a/backup/queries_incremental.go
+++ b/backup/queries_incremental.go
@@ -3,8 +3,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"
"github.com/greenplum-db/gpbackup/toc"
)
diff --git a/backup/queries_operators.go b/backup/queries_operators.go
index 95ed3598..889d50a1 100644
--- a/backup/queries_operators.go
+++ b/backup/queries_operators.go
@@ -8,8 +8,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"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/queries_postdata.go b/backup/queries_postdata.go
index c2baee9f..69a52186 100644
--- a/backup/queries_postdata.go
+++ b/backup/queries_postdata.go
@@ -10,8 +10,8 @@ import (
"fmt"
"strings"
- "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"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/queries_postdata_test.go b/backup/queries_postdata_test.go
index caa344b9..b40b6b22 100644
--- a/backup/queries_postdata_test.go
+++ b/backup/queries_postdata_test.go
@@ -5,7 +5,7 @@ import (
"database/sql/driver"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
"github.com/greenplum-db/gpbackup/backup"
. "github.com/onsi/ginkgo/v2"
diff --git a/backup/queries_relation_test.go b/backup/queries_relation_test.go
index a52f6acf..4640cd3d 100644
--- a/backup/queries_relation_test.go
+++ b/backup/queries_relation_test.go
@@ -6,7 +6,7 @@ import (
"fmt"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
"github.com/greenplum-db/gpbackup/backup"
. "github.com/onsi/ginkgo/v2"
diff --git a/backup/queries_relations.go b/backup/queries_relations.go
index 3fc39b0e..ad3dad51 100644
--- a/backup/queries_relations.go
+++ b/backup/queries_relations.go
@@ -11,8 +11,8 @@ import (
"strconv"
"strings"
- "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"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
diff --git a/backup/queries_shared.go b/backup/queries_shared.go
index 61597e06..7bcc7426 100644
--- a/backup/queries_shared.go
+++ b/backup/queries_shared.go
@@ -10,8 +10,8 @@ import (
"fmt"
"strings"
- "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"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
diff --git a/backup/queries_shared_test.go b/backup/queries_shared_test.go
index d5112e86..dbf889f2 100644
--- a/backup/queries_shared_test.go
+++ b/backup/queries_shared_test.go
@@ -5,7 +5,7 @@ import (
"database/sql/driver"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/backup/queries_statistics.go b/backup/queries_statistics.go
index 4f9a4eac..df8e9a68 100644
--- a/backup/queries_statistics.go
+++ b/backup/queries_statistics.go
@@ -8,8 +8,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"
"github.com/greenplum-db/gpbackup/utils"
"github.com/lib/pq"
)
diff --git a/backup/queries_table_defs.go b/backup/queries_table_defs.go
index d1943ebb..0a67dcbe 100644
--- a/backup/queries_table_defs.go
+++ b/backup/queries_table_defs.go
@@ -11,8 +11,8 @@ import (
"strconv"
"strings"
- "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"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
)
@@ -428,7 +428,7 @@ func GetDistributionPolicies(connectionPool *dbconn.DBConn,
relations interface{
tbloids += strconv.Itoa(int(oid))
}
tbloids += "}"
- } else if rels, ok := relations.([]View); ok {
+ } else if rels, ok := relations.([]View); ok {
for _, rel := range rels {
oid := rel.GetUniqueID().Oid
if len(tbloids) > 1 {
@@ -459,7 +459,7 @@ func GetDistributionPolicies(connectionPool *dbconn.DBConn,
relations interface{
FROM gp_distribution_policy
) t
ON t.localoid=distpol.oid
- LEFT JOIN pg_opclass opc ON opc.oid=t.distclass;`,
tbloids, ENUM_TYPE_OID);
+ LEFT JOIN pg_opclass opc ON opc.oid=t.distclass;`,
tbloids, ENUM_TYPE_OID)
}
results := make([]DistPolicy, 0)
diff --git a/backup/queries_textsearch.go b/backup/queries_textsearch.go
index ee97a586..c86db823 100644
--- a/backup/queries_textsearch.go
+++ b/backup/queries_textsearch.go
@@ -8,8 +8,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"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/queries_types.go b/backup/queries_types.go
index ad16bcde..7aa8c3a7 100644
--- a/backup/queries_types.go
+++ b/backup/queries_types.go
@@ -8,8 +8,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"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/backup/snapshot.go b/backup/snapshot.go
index 8b97bc55..49c05b71 100644
--- a/backup/snapshot.go
+++ b/backup/snapshot.go
@@ -7,27 +7,27 @@ 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 (
SNAPSHOT_GPDB_MIN_VERSION = "6.21.0"
)
- // Export synchronized snapshot using connection 0 and return snapshotId
value as string
- func GetSynchronizedSnapshot(connectionPool *dbconn.DBConn) (string, error) {
- var snapshotId string
- err := connectionPool.Get(&snapshotId, "SELECT
pg_catalog.pg_export_snapshot()", 0)
- if err != nil {
- return "", err
- }
- gplog.Debug("Exported synchronized snapshot %s", snapshotId)
- return snapshotId, nil
- }
+// Export synchronized snapshot using connection 0 and return snapshotId value
as string
+func GetSynchronizedSnapshot(connectionPool *dbconn.DBConn) (string, error) {
+ var snapshotId string
+ err := connectionPool.Get(&snapshotId, "SELECT
pg_catalog.pg_export_snapshot()", 0)
+ if err != nil {
+ return "", err
+ }
+ gplog.Debug("Exported synchronized snapshot %s", snapshotId)
+ return snapshotId, nil
+}
// Set synchronized snapshot for connNum to snapshotId
-func SetSynchronizedSnapshot(connectionPool *dbconn.DBConn, connNum int,
snapshotId string) error {
+func SetSynchronizedSnapshot(connectionPool *dbconn.DBConn, connNum int,
snapshotId string) error {
if connectionPool.Tx[connNum] == nil {
err := connectionPool.Begin(connNum) // Begins transaction in
repeatable read
if err != nil {
diff --git a/backup/validate.go b/backup/validate.go
index 9c618898..47e41b54 100644
--- a/backup/validate.go
+++ b/backup/validate.go
@@ -3,8 +3,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"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
diff --git a/backup/validate_test.go b/backup/validate_test.go
index 19a15430..0630e8a6 100644
--- a/backup/validate_test.go
+++ b/backup/validate_test.go
@@ -4,7 +4,7 @@ import (
"strings"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/spf13/cobra"
diff --git a/backup/wrappers.go b/backup/wrappers.go
index b54d91f7..8ea73e25 100644
--- a/backup/wrappers.go
+++ b/backup/wrappers.go
@@ -6,9 +6,9 @@ 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/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/report"
diff --git a/end_to_end/end_to_end_suite_test.go
b/end_to_end/end_to_end_suite_test.go
index 3b5c5f6a..0598a97d 100644
--- a/end_to_end/end_to_end_suite_test.go
+++ b/end_to_end/end_to_end_suite_test.go
@@ -19,12 +19,12 @@ import (
"time"
"github.com/blang/semver"
- "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/iohelper"
- "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/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "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/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/end_to_end/filtered_test.go b/end_to_end/filtered_test.go
index 91068670..059fbf8d 100644
--- a/end_to_end/filtered_test.go
+++ b/end_to_end/filtered_test.go
@@ -3,8 +3,8 @@ package end_to_end_test
import (
"os"
- "github.com/greenplum-db/gp-common-go-libs/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/utils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/end_to_end/incremental_test.go b/end_to_end/incremental_test.go
index fef3b32a..402195c7 100644
--- a/end_to_end/incremental_test.go
+++ b/end_to_end/incremental_test.go
@@ -7,8 +7,8 @@ import (
"strconv"
"github.com/blang/semver"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/history"
. "github.com/onsi/ginkgo/v2"
diff --git a/end_to_end/locks_test.go b/end_to_end/locks_test.go
index 31bf3dd8..5ebdb60f 100644
--- a/end_to_end/locks_test.go
+++ b/end_to_end/locks_test.go
@@ -5,7 +5,7 @@ import (
"os/exec"
"time"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
. "github.com/onsi/ginkgo/v2"
diff --git a/end_to_end/plugin_test.go b/end_to_end/plugin_test.go
index 8fd8b549..d73930d2 100644
--- a/end_to_end/plugin_test.go
+++ b/end_to_end/plugin_test.go
@@ -6,10 +6,10 @@ import (
"os/exec"
path "path/filepath"
- "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/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/utils"
diff --git a/end_to_end/signal_handler_test.go
b/end_to_end/signal_handler_test.go
index 016b95ed..fa7d84e2 100644
--- a/end_to_end/signal_handler_test.go
+++ b/end_to_end/signal_handler_test.go
@@ -5,7 +5,7 @@ import (
"os/exec"
"time"
- "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"
"golang.org/x/sys/unix"
diff --git a/end_to_end/special_characters_test.go
b/end_to_end/special_characters_test.go
index e7af9acd..e65b7a4e 100644
--- a/end_to_end/special_characters_test.go
+++ b/end_to_end/special_characters_test.go
@@ -4,7 +4,7 @@ import (
"fmt"
"os/exec"
- "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/filepath/filepath.go b/filepath/filepath.go
index af7235b6..1f49a462 100644
--- a/filepath/filepath.go
+++ b/filepath/filepath.go
@@ -14,10 +14,10 @@ import (
"strconv"
"strings"
- "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/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"
)
type FilePathInfo struct {
diff --git a/filepath/filepath_test.go b/filepath/filepath_test.go
index 90649f54..584835bf 100644
--- a/filepath/filepath_test.go
+++ b/filepath/filepath_test.go
@@ -5,9 +5,9 @@ import (
path "path/filepath"
"testing"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/operating"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
. "github.com/greenplum-db/gpbackup/filepath"
. "github.com/onsi/ginkgo/v2"
diff --git a/go.mod b/go.mod
index 25079cab..ab9c6a4f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,12 @@
module github.com/greenplum-db/gpbackup
-go 1.19
+go 1.21
require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/blang/semver v3.5.1+incompatible
github.com/blang/vfs v1.0.0
- github.com/greenplum-db/gp-common-go-libs v1.0.19
+ github.com/cloudberrydb/gp-common-go-libs
v1.0.12-0.20250723025810-7e1b684694b9
github.com/jackc/pgconn v1.14.3
github.com/jmoiron/sqlx v1.3.5
github.com/klauspost/compress v1.15.15
diff --git a/go.sum b/go.sum
index 761f29cc..222da28c 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,8 @@ github.com/blang/vfs v1.0.0/go.mod
h1:jjuNUc/IKcRNNWC9NUCvz4fR9PZLPIKxEygtPs/4tS
github.com/chzyer/logex v1.1.10/go.mod
h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod
h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod
h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cloudberrydb/gp-common-go-libs
v1.0.12-0.20250723025810-7e1b684694b9
h1:zzhl7xRkxIPiwCwym74nMVFKuo6xXSzvTzEQWOBPEVY=
+github.com/cloudberrydb/gp-common-go-libs
v1.0.12-0.20250723025810-7e1b684694b9/go.mod
h1:W9k5v2xUJLhDHJmYI/UktGdI0zNI71vPHZhAIot40Mw=
github.com/cockroachdb/apd v1.1.0
h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
github.com/cockroachdb/apd v1.1.0/go.mod
h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod
h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -27,19 +29,19 @@ github.com/go-logr/logr v1.2.4
h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-logr/logr v1.2.4/go.mod
h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-sql-driver/mysql v1.6.0/go.mod
h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-sql-driver/mysql v1.7.0
h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod
h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/go-stack/stack v1.8.0/go.mod
h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572
h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod
h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
github.com/gofrs/uuid v4.0.0+incompatible
h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod
h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/golang/protobuf v1.5.3
h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod
h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod
h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38
h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod
h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod
h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/greenplum-db/gp-common-go-libs v1.0.19
h1:nTz7OQUccRNgGeCbWyalffNii7OZtJ1e29UJkgQA4xE=
-github.com/greenplum-db/gp-common-go-libs v1.0.19/go.mod
h1:e2B0tIHAZbEzzjqzKgl4/9KX+7xRrnB5vsgG0UkLbZI=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod
h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/inconshreveable/mousetrap v1.0.1
h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
github.com/inconshreveable/mousetrap v1.0.1/go.mod
h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -118,6 +120,7 @@ github.com/mattn/go-isatty v0.0.7/go.mod
h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
github.com/mattn/go-isatty v0.0.12/go.mod
h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.16/go.mod
h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.17
h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod
h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-runewidth v0.0.13
h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
github.com/mattn/go-runewidth v0.0.13/go.mod
h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-sqlite3 v1.14.6/go.mod
h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
@@ -163,6 +166,7 @@ github.com/stretchr/testify v1.5.1/go.mod
h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.1
h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod
h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/zenazn/goji v0.9.0/go.mod
h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
go.uber.org/atomic v1.3.2/go.mod
h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod
h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -240,6 +244,7 @@ golang.org/x/xerrors
v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.28.0
h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod
h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
diff --git a/helper/helper.go b/helper/helper.go
index 1c1c56e7..7475da63 100644
--- a/helper/helper.go
+++ b/helper/helper.go
@@ -15,8 +15,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/utils"
)
diff --git a/history/history.go b/history/history.go
index 6d288571..2f7a3eb3 100644
--- a/history/history.go
+++ b/history/history.go
@@ -7,8 +7,8 @@ import (
"io/ioutil"
"os"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/utils"
_ "github.com/mattn/go-sqlite3"
"gopkg.in/yaml.v2"
@@ -20,9 +20,9 @@ type RestorePlanEntry struct {
}
const (
- BackupStatusInProgress = "In Progress"
- BackupStatusSucceed = "Success"
- BackupStatusFailed = "Failure"
+ BackupStatusInProgress = "In Progress"
+ BackupStatusSucceed = "Success"
+ BackupStatusFailed = "Failure"
)
type BackupConfig struct {
diff --git a/history/history_test.go b/history/history_test.go
index 30a340ba..a0b178fd 100644
--- a/history/history_test.go
+++ b/history/history_test.go
@@ -5,9 +5,9 @@ import (
"testing"
"time"
- "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/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/history"
. "github.com/onsi/ginkgo/v2"
diff --git a/integration/agent_remote_test.go b/integration/agent_remote_test.go
index 7c312a35..72291fe5 100644
--- a/integration/agent_remote_test.go
+++ b/integration/agent_remote_test.go
@@ -3,7 +3,7 @@ package integration
import (
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/utils"
diff --git a/integration/data_backup_test.go b/integration/data_backup_test.go
index 372c5ceb..7840ceb0 100644
--- a/integration/data_backup_test.go
+++ b/integration/data_backup_test.go
@@ -6,8 +6,8 @@ import (
"path"
"github.com/blang/semver"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/dependency_queries_test.go
b/integration/dependency_queries_test.go
index 5fa44243..d41fc221 100644
--- a/integration/dependency_queries_test.go
+++ b/integration/dependency_queries_test.go
@@ -1,7 +1,7 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/gpexpand_not_running_test.go
b/integration/gpexpand_not_running_test.go
index db3d164b..77809a40 100644
--- a/integration/gpexpand_not_running_test.go
+++ b/integration/gpexpand_not_running_test.go
@@ -5,9 +5,9 @@ import (
"os"
"path/filepath"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
- "github.com/greenplum-db/gp-common-go-libs/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/restore"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/helper_test.go b/integration/helper_test.go
index a91dd807..6c253a26 100644
--- a/integration/helper_test.go
+++ b/integration/helper_test.go
@@ -13,7 +13,7 @@ import (
"strings"
"time"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/klauspost/compress/zstd"
"golang.org/x/sys/unix"
diff --git a/integration/incremental_queries_test.go
b/integration/incremental_queries_test.go
index e2d9b702..0f80ed6c 100644
--- a/integration/incremental_queries_test.go
+++ b/integration/incremental_queries_test.go
@@ -3,7 +3,7 @@ package integration
import (
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/inheritance_test.go b/integration/inheritance_test.go
index 575894c7..1fc392c7 100644
--- a/integration/inheritance_test.go
+++ b/integration/inheritance_test.go
@@ -3,8 +3,8 @@ package integration
import (
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/integration_suite_test.go
b/integration/integration_suite_test.go
index a14581de..e1e19977 100644
--- a/integration/integration_suite_test.go
+++ b/integration/integration_suite_test.go
@@ -8,10 +8,10 @@ import (
"testing"
"github.com/blang/semver"
- "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/testhelper"
+ "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/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/restore"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/metadata_globals_create_test.go
b/integration/metadata_globals_create_test.go
index 7378ba06..4694fc05 100644
--- a/integration/metadata_globals_create_test.go
+++ b/integration/metadata_globals_create_test.go
@@ -4,8 +4,8 @@ import (
"fmt"
"regexp"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/metadata_globals_queries_test.go
b/integration/metadata_globals_queries_test.go
index bc5d553f..5409290c 100644
--- a/integration/metadata_globals_queries_test.go
+++ b/integration/metadata_globals_queries_test.go
@@ -3,8 +3,8 @@ package integration
import (
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/options_integration_test.go
b/integration/options_integration_test.go
index efa002d8..2197a041 100644
--- a/integration/options_integration_test.go
+++ b/integration/options_integration_test.go
@@ -4,7 +4,7 @@ import (
"fmt"
"sort"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
diff --git a/integration/parallel_queries_test.go
b/integration/parallel_queries_test.go
index 98e080c7..3de84668 100644
--- a/integration/parallel_queries_test.go
+++ b/integration/parallel_queries_test.go
@@ -5,8 +5,8 @@ import (
"regexp"
"strings"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/restore"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/postdata_create_test.go
b/integration/postdata_create_test.go
index 6930dc2a..ab57a374 100644
--- a/integration/postdata_create_test.go
+++ b/integration/postdata_create_test.go
@@ -4,8 +4,8 @@ import (
"database/sql"
"strings"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/postdata_queries_test.go
b/integration/postdata_queries_test.go
index a0c4cd86..486518a5 100644
--- a/integration/postdata_queries_test.go
+++ b/integration/postdata_queries_test.go
@@ -4,8 +4,8 @@ import (
"database/sql"
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_acl_create_test.go
b/integration/predata_acl_create_test.go
index c5b73f05..f119cd85 100644
--- a/integration/predata_acl_create_test.go
+++ b/integration/predata_acl_create_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_acl_queries_test.go
b/integration/predata_acl_queries_test.go
index 0603545f..427c57bc 100644
--- a/integration/predata_acl_queries_test.go
+++ b/integration/predata_acl_queries_test.go
@@ -3,8 +3,8 @@ package integration
import (
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
@@ -200,7 +200,6 @@ LANGUAGE SQL`)
testhelper.AssertQueryRuns(connectionPool,
`CREATE FUNCTION public.mycombine_accum(numeric, numeric) RETURNS numeric AS
'select $1 + $2' LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT`)
testhelper.AssertQueryRuns(connectionPool,
`CREATE AGGREGATE public.agg_prefunc(numeric, numeric) (SFUNC =
public.mysfunc_accum, STYPE = numeric, COMBINEFUNC = public.mycombine_accum,
INITCOND = '0')`)
-
defer
testhelper.AssertQueryRuns(connectionPool, "DROP FUNCTION
public.mysfunc_accum(numeric, numeric, numeric)")
defer
testhelper.AssertQueryRuns(connectionPool, "DROP FUNCTION
public.mycombine_accum(numeric, numeric)")
defer
testhelper.AssertQueryRuns(connectionPool, "DROP AGGREGATE
public.agg_prefunc(numeric, numeric)")
diff --git a/integration/predata_externals_create_test.go
b/integration/predata_externals_create_test.go
index 98ae4eea..4739e3c3 100644
--- a/integration/predata_externals_create_test.go
+++ b/integration/predata_externals_create_test.go
@@ -4,8 +4,8 @@ import (
"database/sql"
"os"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_externals_queries_test.go
b/integration/predata_externals_queries_test.go
index 2a1721f9..324b1aa2 100644
--- a/integration/predata_externals_queries_test.go
+++ b/integration/predata_externals_queries_test.go
@@ -3,8 +3,8 @@ package integration
import (
"database/sql"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_functions_create_test.go
b/integration/predata_functions_create_test.go
index 322b8bfb..a4a4bfbe 100644
--- a/integration/predata_functions_create_test.go
+++ b/integration/predata_functions_create_test.go
@@ -4,8 +4,8 @@ import (
"database/sql"
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_functions_queries_test.go
b/integration/predata_functions_queries_test.go
index fbf04731..7ace65c7 100644
--- a/integration/predata_functions_queries_test.go
+++ b/integration/predata_functions_queries_test.go
@@ -4,8 +4,8 @@ import (
"database/sql"
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_operators_create_test.go
b/integration/predata_operators_create_test.go
index cbad84f0..c6af7eb3 100644
--- a/integration/predata_operators_create_test.go
+++ b/integration/predata_operators_create_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_operators_queries_test.go
b/integration/predata_operators_queries_test.go
index bf0b6c8a..0a341c71 100644
--- a/integration/predata_operators_queries_test.go
+++ b/integration/predata_operators_queries_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
@@ -179,7 +179,7 @@ var _ = Describe("backup integration tests", func() {
results := backup.GetOperatorClasses(connectionPool)
Expect(results).To(HaveLen(1))
-
structmatcher.ExpectStructsToMatchExcluding(&expected, &results[0], "Oid")
+ structmatcher.ExpectStructsToMatchExcluding(&expected,
&results[0], "Oid")
})
It("returns a slice of operator classes with an operator with a
sort family", func() {
diff --git a/integration/predata_relations_create_test.go
b/integration/predata_relations_create_test.go
index a9f1dfc7..5c9ffece 100644
--- a/integration/predata_relations_create_test.go
+++ b/integration/predata_relations_create_test.go
@@ -5,8 +5,8 @@ import (
"fmt"
"math"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
@@ -27,8 +27,8 @@ var _ = Describe("backup integration create statement tests",
func() {
partitionPartFalseExpectation = "false"
)
BeforeEach(func() {
- extTableEmpty = backup.ExternalTableDefinition{Oid: 0,
Type: -2, Protocol: -2, Location: sql.NullString{String: "", Valid: true},
ExecLocation: "ALL_SEGMENTS",
- FormatType: "t", FormatOpts: "", Command: "",
RejectLimit: 0, RejectLimitType: "", ErrTableName: "", ErrTableSchema: "",
Encoding: "UTF-8", Writable: false, URIs: nil}
+ extTableEmpty = backup.ExternalTableDefinition{Oid: 0,
Type: -2, Protocol: -2, Location: sql.NullString{String: "", Valid: true},
ExecLocation: "ALL_SEGMENTS",
+ FormatType: "t", FormatOpts: "", Command: "",
RejectLimit: 0, RejectLimitType: "", ErrTableName: "", ErrTableSchema: "",
Encoding: "UTF-8", Writable: false, URIs: nil}
distPolicy = backup.DistPolicy{Policy: "DISTRIBUTED
RANDOMLY"}
testTable = backup.Table{
Relation: backup.Relation{Schema:
"public", Name: "testtable"},
diff --git a/integration/predata_relations_queries_test.go
b/integration/predata_relations_queries_test.go
index a18a795b..87382741 100644
--- a/integration/predata_relations_queries_test.go
+++ b/integration/predata_relations_queries_test.go
@@ -6,9 +6,9 @@ import (
"sort"
"strconv"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_shared_create_test.go
b/integration/predata_shared_create_test.go
index 37097f12..96dbde5a 100644
--- a/integration/predata_shared_create_test.go
+++ b/integration/predata_shared_create_test.go
@@ -3,8 +3,8 @@ package integration
import (
"database/sql"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_shared_queries_test.go
b/integration/predata_shared_queries_test.go
index 56d5d0e4..194a7d04 100644
--- a/integration/predata_shared_queries_test.go
+++ b/integration/predata_shared_queries_test.go
@@ -3,8 +3,8 @@ package integration
import (
"database/sql"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_table_defs_queries_test.go
b/integration/predata_table_defs_queries_test.go
index 6bac04e3..35c4ba30 100644
--- a/integration/predata_table_defs_queries_test.go
+++ b/integration/predata_table_defs_queries_test.go
@@ -4,8 +4,8 @@ import (
"database/sql"
"fmt"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/predata_textsearch_create_test.go
b/integration/predata_textsearch_create_test.go
index 0c6ae0f6..8d23fcaa 100644
--- a/integration/predata_textsearch_create_test.go
+++ b/integration/predata_textsearch_create_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_textsearch_queries_test.go
b/integration/predata_textsearch_queries_test.go
index 13b4cf25..6c8e19c9 100644
--- a/integration/predata_textsearch_queries_test.go
+++ b/integration/predata_textsearch_queries_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
diff --git a/integration/predata_types_create_test.go
b/integration/predata_types_create_test.go
index 9e05db74..85c36660 100644
--- a/integration/predata_types_create_test.go
+++ b/integration/predata_types_create_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/integration/predata_types_queries_test.go
b/integration/predata_types_queries_test.go
index 8d17aacc..b1062988 100644
--- a/integration/predata_types_queries_test.go
+++ b/integration/predata_types_queries_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/statistics_create_test.go
b/integration/statistics_create_test.go
index 9dc74fad..8cf03ae1 100644
--- a/integration/statistics_create_test.go
+++ b/integration/statistics_create_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/statistics_queries_test.go
b/integration/statistics_queries_test.go
index ad8e6599..ed021162 100644
--- a/integration/statistics_queries_test.go
+++ b/integration/statistics_queries_test.go
@@ -3,8 +3,8 @@ package integration
import (
"sort"
- "github.com/greenplum-db/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/testutils"
diff --git a/integration/utils_test.go b/integration/utils_test.go
index 5977ecb9..ecef44ec 100644
--- a/integration/utils_test.go
+++ b/integration/utils_test.go
@@ -7,8 +7,8 @@ import (
"path/filepath"
"time"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
fp "github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/greenplum-db/gpbackup/utils"
@@ -50,7 +50,7 @@ var _ = Describe("utils integration", func() {
query := `SELECT count(*) FROM pg_stat_activity WHERE
application_name = 'hangingApplication'`
Eventually(func() string { return
dbconn.MustSelectString(connectionPool, query) }, 5*time.Second,
100*time.Millisecond).Should(Equal("1"))
- utils.TerminateHangingCopySessions(fpInfo,
"hangingApplication", 30 * time.Second, 1 * time.Second)
+ utils.TerminateHangingCopySessions(fpInfo,
"hangingApplication", 30*time.Second, 1*time.Second)
Eventually(func() string { return
dbconn.MustSelectString(connectionPool, query) }, 5*time.Second,
100*time.Millisecond).Should(Equal("0"))
diff --git a/integration/wrappers_test.go b/integration/wrappers_test.go
index ac3968eb..36f4b1ad 100644
--- a/integration/wrappers_test.go
+++ b/integration/wrappers_test.go
@@ -1,8 +1,8 @@
package integration
import (
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/options"
"github.com/spf13/cobra"
diff --git a/options/flag.go b/options/flag.go
index 4ae14be4..cb757d0d 100644
--- a/options/flag.go
+++ b/options/flag.go
@@ -8,7 +8,7 @@ import (
"regexp"
"strings"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/pkg/errors"
"github.com/spf13/pflag"
)
diff --git a/options/flag_test.go b/options/flag_test.go
index 088d66bc..45edde35 100644
--- a/options/flag_test.go
+++ b/options/flag_test.go
@@ -3,7 +3,7 @@ package options_test
import (
"flag"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/options"
"github.com/spf13/pflag"
diff --git a/options/options.go b/options/options.go
index fc92fc8f..9473093a 100644
--- a/options/options.go
+++ b/options/options.go
@@ -5,9 +5,9 @@ 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/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
"github.com/spf13/pflag"
diff --git a/options/options_suite_test.go b/options/options_suite_test.go
index 093c04e2..c09df76e 100644
--- a/options/options_suite_test.go
+++ b/options/options_suite_test.go
@@ -3,7 +3,7 @@ package options_test
import (
"testing"
- "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/options/options_test.go b/options/options_test.go
index c318b4e7..f55c6893 100644
--- a/options/options_test.go
+++ b/options/options_test.go
@@ -5,8 +5,8 @@ import (
"os"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/options"
"github.com/spf13/pflag"
diff --git a/report/report.go b/report/report.go
index e170a7ab..76f57171 100644
--- a/report/report.go
+++ b/report/report.go
@@ -10,11 +10,11 @@ import (
"time"
"github.com/blang/semver"
- "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/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "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/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/report/report_test.go b/report/report_test.go
index b8b35a33..ca47d49f 100644
--- a/report/report_test.go
+++ b/report/report_test.go
@@ -10,12 +10,12 @@ import (
"time"
"github.com/blang/semver"
- "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/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "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/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
diff --git a/restore/data.go b/restore/data.go
index 92c82c60..273275df 100644
--- a/restore/data.go
+++ b/restore/data.go
@@ -9,9 +9,9 @@ import (
"sync"
"sync/atomic"
- "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/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
diff --git a/restore/data_test.go b/restore/data_test.go
index e12448ca..ce340c65 100644
--- a/restore/data_test.go
+++ b/restore/data_test.go
@@ -7,7 +7,7 @@ import (
"strings"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
diff --git a/restore/global_variables.go b/restore/global_variables.go
index 92196867..613e6494 100644
--- a/restore/global_variables.go
+++ b/restore/global_variables.go
@@ -3,8 +3,8 @@ package restore
import (
"sync"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
diff --git a/restore/parallel.go b/restore/parallel.go
index 8a1c11d8..ac8ae7a1 100644
--- a/restore/parallel.go
+++ b/restore/parallel.go
@@ -10,7 +10,7 @@ import (
"sync"
"sync/atomic"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
diff --git a/restore/remote.go b/restore/remote.go
index b4dc678f..a7bf0f11 100644
--- a/restore/remote.go
+++ b/restore/remote.go
@@ -6,9 +6,9 @@ import (
"strconv"
"strings"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
"github.com/greenplum-db/gpbackup/options"
"github.com/pkg/errors"
)
diff --git a/restore/remote_test.go b/restore/remote_test.go
index c3e4f4c5..a4c63863 100644
--- a/restore/remote_test.go
+++ b/restore/remote_test.go
@@ -3,9 +3,9 @@ package restore_test
import (
"os/user"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/operating"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
@@ -92,8 +92,8 @@ var _ = Describe("restore/remote tests", func() {
It("panics if it cannot verify some backup file counts", func()
{
testExecutor.ClusterOutput = &cluster.RemoteOutput{
NumErrors: 1,
- FailedCommands: []*cluster.ShellCommand{
- &cluster.ShellCommand{Content: 1,
Stdout: "1"},
+ FailedCommands: []cluster.ShellCommand{
+ {Content: 1, Stdout: "1"},
},
}
testCluster.Executor = testExecutor
diff --git a/restore/restore.go b/restore/restore.go
index bfa8cf13..4ba3c800 100644
--- a/restore/restore.go
+++ b/restore/restore.go
@@ -10,9 +10,9 @@ import (
"sync"
"time"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
diff --git a/restore/restore_internal_test.go b/restore/restore_internal_test.go
index 6744a9e8..0acf4fc7 100644
--- a/restore/restore_internal_test.go
+++ b/restore/restore_internal_test.go
@@ -1,7 +1,7 @@
package restore
import (
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
"github.com/greenplum-db/gpbackup/toc"
. "github.com/onsi/ginkgo/v2"
diff --git a/restore/restore_suite_test.go b/restore/restore_suite_test.go
index 63781269..3d1eadb3 100644
--- a/restore/restore_suite_test.go
+++ b/restore/restore_suite_test.go
@@ -9,7 +9,7 @@ import (
"testing"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
"github.com/greenplum-db/gpbackup/restore"
"github.com/greenplum-db/gpbackup/testutils"
"github.com/spf13/pflag"
diff --git a/restore/validate.go b/restore/validate.go
index 30d1c39a..adb7021e 100644
--- a/restore/validate.go
+++ b/restore/validate.go
@@ -5,8 +5,8 @@ import (
"strconv"
"strings"
- "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"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/toc"
"github.com/greenplum-db/gpbackup/utils"
diff --git a/restore/validate_test.go b/restore/validate_test.go
index 35428af2..015c5031 100644
--- a/restore/validate_test.go
+++ b/restore/validate_test.go
@@ -4,7 +4,7 @@ import (
"strings"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/restore"
diff --git a/restore/wrappers.go b/restore/wrappers.go
index 4c663e7a..27ad4b32 100644
--- a/restore/wrappers.go
+++ b/restore/wrappers.go
@@ -6,10 +6,10 @@ import (
"strconv"
"strings"
- "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/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
diff --git a/restore/wrappers_test.go b/restore/wrappers_test.go
index 137d3ae2..5911d1f8 100644
--- a/restore/wrappers_test.go
+++ b/restore/wrappers_test.go
@@ -6,8 +6,8 @@ import (
"path/filepath"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/history"
"github.com/greenplum-db/gpbackup/options"
"github.com/greenplum-db/gpbackup/restore"
diff --git a/testutils/functions.go b/testutils/functions.go
index 264cffbb..05c38d49 100644
--- a/testutils/functions.go
+++ b/testutils/functions.go
@@ -8,12 +8,12 @@ import (
"strings"
"github.com/DATA-DOG/go-sqlmock"
- "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/gp-common-go-libs/structmatcher"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "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/gp-common-go-libs/structmatcher"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/backup"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/restore"
diff --git a/toc/toc.go b/toc/toc.go
index fe8b0b43..18a1de81 100644
--- a/toc/toc.go
+++ b/toc/toc.go
@@ -7,7 +7,7 @@ import (
"regexp"
"strings"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"github.com/greenplum-db/gpbackup/utils"
"gopkg.in/yaml.v2"
)
diff --git a/utils/agent_remote.go b/utils/agent_remote.go
index af43f42d..80064408 100644
--- a/utils/agent_remote.go
+++ b/utils/agent_remote.go
@@ -10,10 +10,10 @@ import (
"sync"
"time"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/pkg/errors"
)
diff --git a/utils/agent_remote_test.go b/utils/agent_remote_test.go
index 8b1c6b56..0001aae2 100644
--- a/utils/agent_remote_test.go
+++ b/utils/agent_remote_test.go
@@ -5,10 +5,10 @@ import (
"io"
"os"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/operating"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/utils/compression_test.go b/utils/compression_test.go
index 7451b2e2..2238c4bb 100644
--- a/utils/compression_test.go
+++ b/utils/compression_test.go
@@ -3,10 +3,10 @@ package utils_test
import (
"os/user"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "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/cloudberrydb/gp-common-go-libs/cluster"
+ "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/greenplum-db/gpbackup/utils"
. "github.com/onsi/ginkgo/v2"
diff --git a/utils/gpexpand_sensor.go b/utils/gpexpand_sensor.go
index a635dd04..bee283b1 100644
--- a/utils/gpexpand_sensor.go
+++ b/utils/gpexpand_sensor.go
@@ -6,8 +6,8 @@ import (
"path/filepath"
"github.com/blang/vfs"
- "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"
"github.com/pkg/errors"
)
diff --git a/utils/gpexpand_sensor_test.go b/utils/gpexpand_sensor_test.go
index f18d9c0d..6905222a 100644
--- a/utils/gpexpand_sensor_test.go
+++ b/utils/gpexpand_sensor_test.go
@@ -7,7 +7,7 @@ import (
"github.com/DATA-DOG/go-sqlmock"
"github.com/blang/vfs"
"github.com/blang/vfs/memfs"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/utils/io.go b/utils/io.go
index 4097099e..040c000c 100644
--- a/utils/io.go
+++ b/utils/io.go
@@ -11,7 +11,7 @@ import (
"io/ioutil"
"os"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
)
/*
diff --git a/utils/io_test.go b/utils/io_test.go
index 9c19f4b5..f0ded124 100644
--- a/utils/io_test.go
+++ b/utils/io_test.go
@@ -4,8 +4,8 @@ import (
"io/ioutil"
"os"
- "github.com/greenplum-db/gp-common-go-libs/operating"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/utils"
. "github.com/onsi/ginkgo/v2"
diff --git a/utils/plugin.go b/utils/plugin.go
index d4a5fa15..bf035abd 100644
--- a/utils/plugin.go
+++ b/utils/plugin.go
@@ -10,10 +10,10 @@ import (
"time"
"github.com/blang/semver"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
diff --git a/utils/plugin_test.go b/utils/plugin_test.go
index a916233e..832b8e36 100644
--- a/utils/plugin_test.go
+++ b/utils/plugin_test.go
@@ -10,10 +10,10 @@ import (
"strings"
"github.com/blang/semver"
- "github.com/greenplum-db/gp-common-go-libs/cluster"
- "github.com/greenplum-db/gp-common-go-libs/iohelper"
- "github.com/greenplum-db/gp-common-go-libs/operating"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/cluster"
+ "github.com/cloudberrydb/gp-common-go-libs/iohelper"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/utils"
"github.com/pkg/errors"
diff --git a/utils/progress_bar.go b/utils/progress_bar.go
index 61ba64a7..02844437 100644
--- a/utils/progress_bar.go
+++ b/utils/progress_bar.go
@@ -8,7 +8,7 @@ import (
"sync"
"time"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
"gopkg.in/cheggaaa/pb.v1"
)
diff --git a/utils/progress_bar_test.go b/utils/progress_bar_test.go
index 04cebd18..581a5a37 100644
--- a/utils/progress_bar_test.go
+++ b/utils/progress_bar_test.go
@@ -6,9 +6,9 @@ import (
"os/user"
"time"
- "github.com/greenplum-db/gp-common-go-libs/gplog"
- "github.com/greenplum-db/gp-common-go-libs/operating"
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/utils"
"gopkg.in/cheggaaa/pb.v1"
diff --git a/utils/util.go b/utils/util.go
index 89b9a961..3353d413 100644
--- a/utils/util.go
+++ b/utils/util.go
@@ -16,9 +16,9 @@ import (
"strings"
"time"
- "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/cloudberrydb/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/gplog"
+ "github.com/cloudberrydb/gp-common-go-libs/operating"
"github.com/greenplum-db/gpbackup/filepath"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
diff --git a/utils/util_test.go b/utils/util_test.go
index 49f5d270..6303a64d 100644
--- a/utils/util_test.go
+++ b/utils/util_test.go
@@ -1,7 +1,7 @@
package utils_test
import (
- "github.com/greenplum-db/gp-common-go-libs/testhelper"
+ "github.com/cloudberrydb/gp-common-go-libs/testhelper"
"github.com/greenplum-db/gpbackup/utils"
. "github.com/onsi/ginkgo/v2"
diff --git a/utils/utils_suite_test.go b/utils/utils_suite_test.go
index 07d6d409..feb9011e 100644
--- a/utils/utils_suite_test.go
+++ b/utils/utils_suite_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/greenplum-db/gp-common-go-libs/dbconn"
+ "github.com/cloudberrydb/gp-common-go-libs/dbconn"
"github.com/greenplum-db/gpbackup/testutils"
. "github.com/onsi/ginkgo/v2"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
