This is an automated email from the ASF dual-hosted git repository.
djwang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry-backup.git
The following commit(s) were added to refs/heads/main by this push:
new 536e3851 Update format using make format
536e3851 is described below
commit 536e38510738e2d656f149c36eb18015ff2e4d82
Author: Dianjin Wang <[email protected]>
AuthorDate: Sat Oct 11 13:40:57 2025 +0800
Update format using make format
---
backup/backup.go | 8 ++++----
backup/backup_suite_test.go | 2 +-
backup/data.go | 4 ++--
backup/dependencies.go | 4 ++--
backup/dependencies_test.go | 2 +-
backup/global_variables.go | 4 ++--
backup/incremental.go | 4 ++--
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 | 2 +-
backup/queries_acl_test.go | 2 +-
backup/queries_externals.go | 2 +-
backup/queries_functions.go | 4 ++--
backup/queries_functions_test.go | 2 +-
backup/queries_globals.go | 4 ++--
backup/queries_incremental.go | 2 +-
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 | 2 +-
backup/queries_table_defs.go | 4 ++--
backup/queries_textsearch.go | 4 ++--
backup/queries_types.go | 4 ++--
backup/validate.go | 4 ++--
backup/validate_test.go | 2 +-
backup/wrappers.go | 6 +++---
end_to_end/end_to_end_suite_test.go | 10 +++++-----
end_to_end/filtered_test.go | 2 +-
end_to_end/incremental_test.go | 2 +-
end_to_end/locks_test.go | 2 +-
end_to_end/plugin_test.go | 6 +++---
helper/helper.go | 2 +-
history/history.go | 2 +-
history/history_test.go | 2 +-
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/incremental_queries_test.go | 2 +-
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 | 4 ++--
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 | 4 ++--
integration/predata_relations_create_test.go | 4 ++--
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 | 4 ++--
integration/wrappers_test.go | 4 ++--
options/flag_test.go | 2 +-
options/options.go | 2 +-
options/options_test.go | 2 +-
report/report.go | 4 ++--
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 | 2 +-
restore/remote_test.go | 6 +++---
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 | 10 +++++-----
toc/toc.go | 2 +-
utils/agent_remote.go | 2 +-
utils/agent_remote_test.go | 4 ++--
utils/compression_test.go | 2 +-
utils/gpexpand_sensor_test.go | 2 +-
utils/io_test.go | 2 +-
utils/plugin.go | 2 +-
utils/plugin_test.go | 2 +-
utils/progress_bar_test.go | 2 +-
utils/util.go | 2 +-
utils/util_test.go | 2 +-
utils/utils_suite_test.go | 2 +-
113 files changed, 199 insertions(+), 199 deletions(-)
diff --git a/backup/backup.go b/backup/backup.go
index 5d1e04ee..0c8249ac 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -11,16 +11,16 @@ import (
"sync"
"time"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/report"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/operating"
"github.com/spf13/cobra"
)
diff --git a/backup/backup_suite_test.go b/backup/backup_suite_test.go
index b3f22fec..2eb4bc1f 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/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/spf13/pflag"
. "github.com/onsi/ginkgo/v2"
diff --git a/backup/data.go b/backup/data.go
index d6b3376a..85ee1de9 100644
--- a/backup/data.go
+++ b/backup/data.go
@@ -12,10 +12,10 @@ import (
"sync/atomic"
"time"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/jackc/pgconn"
"gopkg.in/cheggaaa/pb.v1"
)
diff --git a/backup/dependencies.go b/backup/dependencies.go
index 96c4cc2c..64445e52 100644
--- a/backup/dependencies.go
+++ b/backup/dependencies.go
@@ -5,10 +5,10 @@ import (
"sort"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/pkg/errors"
)
diff --git a/backup/dependencies_test.go b/backup/dependencies_test.go
index d680860d..fd645182 100644
--- a/backup/dependencies_test.go
+++ b/backup/dependencies_test.go
@@ -4,9 +4,9 @@ import (
"database/sql"
"fmt"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/global_variables.go b/backup/global_variables.go
index 97aaa04d..3397c6b3 100644
--- a/backup/global_variables.go
+++ b/backup/global_variables.go
@@ -3,13 +3,13 @@ package backup
import (
"sync"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/report"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/nightlyone/lockfile"
"github.com/spf13/pflag"
)
diff --git a/backup/incremental.go b/backup/incremental.go
index dce68bce..0326c940 100644
--- a/backup/incremental.go
+++ b/backup/incremental.go
@@ -4,12 +4,12 @@ import (
"fmt"
"path"
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/operating"
"github.com/pkg/errors"
)
diff --git a/backup/incremental_test.go b/backup/incremental_test.go
index 3afd11d2..425313d1 100644
--- a/backup/incremental_test.go
+++ b/backup/incremental_test.go
@@ -3,15 +3,15 @@ package backup_test
import (
"os"
- "github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/report"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/operating"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/metadata_globals.go b/backup/metadata_globals.go
index 416c2566..94d50972 100644
--- a/backup/metadata_globals.go
+++ b/backup/metadata_globals.go
@@ -6,9 +6,9 @@ import (
"strconv"
"strings"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
/*
diff --git a/backup/metadata_globals_test.go b/backup/metadata_globals_test.go
index 0cf7844c..dd42df51 100644
--- a/backup/metadata_globals_test.go
+++ b/backup/metadata_globals_test.go
@@ -3,10 +3,10 @@ package backup_test
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
)
diff --git a/backup/postdata.go b/backup/postdata.go
index 624ea4a4..ff6e1f76 100644
--- a/backup/postdata.go
+++ b/backup/postdata.go
@@ -9,9 +9,9 @@ package backup
import (
"strings"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/pkg/errors"
)
diff --git a/backup/predata_acl_test.go b/backup/predata_acl_test.go
index a6d5d539..18867233 100644
--- a/backup/predata_acl_test.go
+++ b/backup/predata_acl_test.go
@@ -5,11 +5,11 @@ import (
"fmt"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/predata_externals_test.go b/backup/predata_externals_test.go
index 68572e12..2eac072f 100644
--- a/backup/predata_externals_test.go
+++ b/backup/predata_externals_test.go
@@ -3,10 +3,10 @@ package backup_test
import (
"database/sql"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/predata_functions.go b/backup/predata_functions.go
index 1f875799..f7953932 100644
--- a/backup/predata_functions.go
+++ b/backup/predata_functions.go
@@ -9,9 +9,9 @@ package backup
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
func PrintCreateFunctionStatement(metadataFile *utils.FileWithByteCount,
objToc *toc.TOC, funcDef Function, funcMetadata ObjectMetadata) {
diff --git a/backup/predata_functions_test.go b/backup/predata_functions_test.go
index 9b9446ce..e6e45590 100644
--- a/backup/predata_functions_test.go
+++ b/backup/predata_functions_test.go
@@ -4,10 +4,10 @@ import (
"database/sql"
"fmt"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/predata_relations.go b/backup/predata_relations.go
index f8ea2678..8f42a8a2 100644
--- a/backup/predata_relations.go
+++ b/backup/predata_relations.go
@@ -13,11 +13,11 @@ import (
"github.com/pkg/errors"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/spf13/pflag"
)
diff --git a/backup/predata_relations_other_test.go
b/backup/predata_relations_other_test.go
index 70f49639..e52a7b91 100644
--- a/backup/predata_relations_other_test.go
+++ b/backup/predata_relations_other_test.go
@@ -6,12 +6,12 @@ import (
"math"
"sort"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "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 a66f03bc..dbff267c 100644
--- a/backup/predata_relations_tables_test.go
+++ b/backup/predata_relations_tables_test.go
@@ -3,10 +3,10 @@ package backup_test
import (
"database/sql"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
)
diff --git a/backup/predata_shared.go b/backup/predata_shared.go
index 471430c6..760d36ea 100644
--- a/backup/predata_shared.go
+++ b/backup/predata_shared.go
@@ -7,9 +7,9 @@ package backup
*/
import (
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/pkg/errors"
)
diff --git a/backup/predata_types.go b/backup/predata_types.go
index 12edb68c..15af4998 100644
--- a/backup/predata_types.go
+++ b/backup/predata_types.go
@@ -9,9 +9,9 @@ import (
"fmt"
"strings"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/pkg/errors"
)
diff --git a/backup/queries_acl.go b/backup/queries_acl.go
index 0afda279..b47a4be7 100644
--- a/backup/queries_acl.go
+++ b/backup/queries_acl.go
@@ -10,9 +10,9 @@ import (
"fmt"
"sort"
+ "github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-backup/toc"
)
/*
diff --git a/backup/queries_acl_test.go b/backup/queries_acl_test.go
index bb68cc6b..133de182 100644
--- a/backup/queries_acl_test.go
+++ b/backup/queries_acl_test.go
@@ -6,9 +6,9 @@ import (
"regexp"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/queries_externals.go b/backup/queries_externals.go
index ae73b75f..da9c15bb 100644
--- a/backup/queries_externals.go
+++ b/backup/queries_externals.go
@@ -6,9 +6,9 @@ package backup
*/
import (
+ "github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-backup/toc"
)
func GetExternalTableDefinitions(connectionPool *dbconn.DBConn)
map[uint32]ExternalTableDefinition {
diff --git a/backup/queries_functions.go b/backup/queries_functions.go
index 3d2e14c4..8fb04069 100644
--- a/backup/queries_functions.go
+++ b/backup/queries_functions.go
@@ -11,10 +11,10 @@ import (
"regexp"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
type Function struct {
diff --git a/backup/queries_functions_test.go b/backup/queries_functions_test.go
index 569aedea..33d08cd0 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/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-backup/backup"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/queries_globals.go b/backup/queries_globals.go
index a5b49d99..b2cd25f2 100644
--- a/backup/queries_globals.go
+++ b/backup/queries_globals.go
@@ -8,10 +8,10 @@ package backup
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
type SessionGUCs struct {
diff --git a/backup/queries_incremental.go b/backup/queries_incremental.go
index c5932d6b..abc295da 100644
--- a/backup/queries_incremental.go
+++ b/backup/queries_incremental.go
@@ -3,9 +3,9 @@ package backup
import (
"fmt"
+ "github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-backup/toc"
)
func GetAOIncrementalMetadata(connectionPool *dbconn.DBConn)
map[string]toc.AOEntry {
diff --git a/backup/queries_operators.go b/backup/queries_operators.go
index 3e10711e..eae3111b 100644
--- a/backup/queries_operators.go
+++ b/backup/queries_operators.go
@@ -8,10 +8,10 @@ package backup
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
type Operator struct {
diff --git a/backup/queries_postdata.go b/backup/queries_postdata.go
index e43a5f40..1c73dd33 100644
--- a/backup/queries_postdata.go
+++ b/backup/queries_postdata.go
@@ -10,10 +10,10 @@ import (
"fmt"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
/*
diff --git a/backup/queries_postdata_test.go b/backup/queries_postdata_test.go
index eca28a96..5572f540 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/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-backup/backup"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/queries_relation_test.go b/backup/queries_relation_test.go
index 564ab133..911d0e8e 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/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-backup/backup"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/queries_relations.go b/backup/queries_relations.go
index 032e632b..ed16db98 100644
--- a/backup/queries_relations.go
+++ b/backup/queries_relations.go
@@ -11,11 +11,11 @@ import (
"strconv"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/pkg/errors"
)
diff --git a/backup/queries_shared.go b/backup/queries_shared.go
index 2fa09960..c9998d5f 100644
--- a/backup/queries_shared.go
+++ b/backup/queries_shared.go
@@ -10,11 +10,11 @@ import (
"fmt"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
/*
diff --git a/backup/queries_shared_test.go b/backup/queries_shared_test.go
index 4293c899..b2793365 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/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/backup/queries_statistics.go b/backup/queries_statistics.go
index 8f5faafd..ff33a021 100644
--- a/backup/queries_statistics.go
+++ b/backup/queries_statistics.go
@@ -8,9 +8,9 @@ package backup
import (
"fmt"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-backup/utils"
"github.com/lib/pq"
)
diff --git a/backup/queries_table_defs.go b/backup/queries_table_defs.go
index 7f788ff7..5edb1040 100644
--- a/backup/queries_table_defs.go
+++ b/backup/queries_table_defs.go
@@ -11,10 +11,10 @@ import (
"strconv"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
type Table struct {
diff --git a/backup/queries_textsearch.go b/backup/queries_textsearch.go
index fa6ff0e1..eb0d7908 100644
--- a/backup/queries_textsearch.go
+++ b/backup/queries_textsearch.go
@@ -8,10 +8,10 @@ package backup
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
type TextSearchParser struct {
diff --git a/backup/queries_types.go b/backup/queries_types.go
index 9515ffd1..730c307e 100644
--- a/backup/queries_types.go
+++ b/backup/queries_types.go
@@ -8,10 +8,10 @@ package backup
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
func GetTypeMetadataEntry(schema string, name string) (string,
toc.MetadataEntry) {
diff --git a/backup/validate.go b/backup/validate.go
index fd7c51b8..e3169d6f 100644
--- a/backup/validate.go
+++ b/backup/validate.go
@@ -3,12 +3,12 @@ package backup
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/pkg/errors"
"github.com/spf13/pflag"
)
diff --git a/backup/validate_test.go b/backup/validate_test.go
index 382cd5e9..29e200c8 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/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/spf13/cobra"
. "github.com/onsi/ginkgo/v2"
diff --git a/backup/wrappers.go b/backup/wrappers.go
index f1ee6ed7..c32df413 100644
--- a/backup/wrappers.go
+++ b/backup/wrappers.go
@@ -6,14 +6,14 @@ import (
"path"
"reflect"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/report"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/nightlyone/lockfile"
"github.com/pkg/errors"
)
diff --git a/end_to_end/end_to_end_suite_test.go
b/end_to_end/end_to_end_suite_test.go
index 903b3474..5738e924 100644
--- a/end_to_end/end_to_end_suite_test.go
+++ b/end_to_end/end_to_end_suite_test.go
@@ -18,17 +18,17 @@ import (
"testing"
"time"
+ "github.com/apache/cloudberry-backup/backup"
+ "github.com/apache/cloudberry-backup/filepath"
+ "github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/iohelper"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/backup"
- "github.com/apache/cloudberry-backup/filepath"
- "github.com/apache/cloudberry-backup/testutils"
- "github.com/apache/cloudberry-backup/toc"
- "github.com/apache/cloudberry-backup/utils"
"github.com/blang/semver"
"github.com/pkg/errors"
"github.com/spf13/pflag"
diff --git a/end_to_end/filtered_test.go b/end_to_end/filtered_test.go
index 8b511242..5b2cb1fd 100644
--- a/end_to_end/filtered_test.go
+++ b/end_to_end/filtered_test.go
@@ -3,9 +3,9 @@ package end_to_end_test
import (
"os"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/iohelper"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/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 85ff7941..50a15802 100644
--- a/end_to_end/incremental_test.go
+++ b/end_to_end/incremental_test.go
@@ -6,9 +6,9 @@ import (
"os/exec"
"strconv"
+ "github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/history"
"github.com/blang/semver"
. "github.com/onsi/ginkgo/v2"
diff --git a/end_to_end/locks_test.go b/end_to_end/locks_test.go
index 2b3ff90d..8b7ee35d 100644
--- a/end_to_end/locks_test.go
+++ b/end_to_end/locks_test.go
@@ -5,9 +5,9 @@ import (
"os/exec"
"time"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)
diff --git a/end_to_end/plugin_test.go b/end_to_end/plugin_test.go
index d6b41877..f56ecfff 100644
--- a/end_to_end/plugin_test.go
+++ b/end_to_end/plugin_test.go
@@ -6,13 +6,13 @@ import (
"os/exec"
path "path/filepath"
+ "github.com/apache/cloudberry-backup/filepath"
+ "github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/iohelper"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/filepath"
- "github.com/apache/cloudberry-backup/testutils"
- "github.com/apache/cloudberry-backup/utils"
. "github.com/onsi/ginkgo/v2"
)
diff --git a/helper/helper.go b/helper/helper.go
index b0793fce..216783ce 100644
--- a/helper/helper.go
+++ b/helper/helper.go
@@ -15,9 +15,9 @@ import (
"golang.org/x/sys/unix"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-backup/utils"
)
/*
diff --git a/history/history.go b/history/history.go
index 9807bc06..ff07e106 100644
--- a/history/history.go
+++ b/history/history.go
@@ -7,9 +7,9 @@ import (
"io/ioutil"
"os"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-backup/utils"
_ "github.com/mattn/go-sqlite3"
"gopkg.in/yaml.v2"
)
diff --git a/history/history_test.go b/history/history_test.go
index 5ae0b9b6..4d8d0e87 100644
--- a/history/history_test.go
+++ b/history/history_test.go
@@ -5,10 +5,10 @@ import (
"testing"
"time"
+ "github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/history"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/agent_remote_test.go b/integration/agent_remote_test.go
index 91f27eab..f9925e7a 100644
--- a/integration/agent_remote_test.go
+++ b/integration/agent_remote_test.go
@@ -3,9 +3,9 @@ package integration
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/data_backup_test.go b/integration/data_backup_test.go
index 25d6530b..7e8ba574 100644
--- a/integration/data_backup_test.go
+++ b/integration/data_backup_test.go
@@ -5,12 +5,12 @@ import (
"os"
"path"
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/blang/semver"
. "github.com/onsi/ginkgo/v2"
diff --git a/integration/dependency_queries_test.go
b/integration/dependency_queries_test.go
index 18c5ba08..ddb9f89b 100644
--- a/integration/dependency_queries_test.go
+++ b/integration/dependency_queries_test.go
@@ -1,9 +1,9 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/gpexpand_not_running_test.go
b/integration/gpexpand_not_running_test.go
index 6b15b6ef..e534fcf1 100644
--- a/integration/gpexpand_not_running_test.go
+++ b/integration/gpexpand_not_running_test.go
@@ -5,13 +5,13 @@ import (
"os"
"path/filepath"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/iohelper"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/iohelper"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/incremental_queries_test.go
b/integration/incremental_queries_test.go
index 9632c5ef..c55d18b9 100644
--- a/integration/incremental_queries_test.go
+++ b/integration/incremental_queries_test.go
@@ -3,10 +3,10 @@ package integration
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-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 d80d04f9..15de88ea 100644
--- a/integration/integration_suite_test.go
+++ b/integration/integration_suite_test.go
@@ -7,15 +7,15 @@ import (
"os/exec"
"testing"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/blang/semver"
"github.com/spf13/pflag"
diff --git a/integration/metadata_globals_create_test.go
b/integration/metadata_globals_create_test.go
index 045b60ed..2063c3a1 100644
--- a/integration/metadata_globals_create_test.go
+++ b/integration/metadata_globals_create_test.go
@@ -4,11 +4,11 @@ import (
"fmt"
"regexp"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/metadata_globals_queries_test.go
b/integration/metadata_globals_queries_test.go
index 198e90e5..d6182e69 100644
--- a/integration/metadata_globals_queries_test.go
+++ b/integration/metadata_globals_queries_test.go
@@ -3,10 +3,10 @@ package integration
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/options_integration_test.go
b/integration/options_integration_test.go
index ff84cee8..a57938d0 100644
--- a/integration/options_integration_test.go
+++ b/integration/options_integration_test.go
@@ -4,9 +4,9 @@ import (
"fmt"
"sort"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/parallel_queries_test.go
b/integration/parallel_queries_test.go
index 585a0928..46524587 100644
--- a/integration/parallel_queries_test.go
+++ b/integration/parallel_queries_test.go
@@ -5,11 +5,11 @@ import (
"regexp"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/postdata_create_test.go
b/integration/postdata_create_test.go
index 7cd61a25..aba3cfb1 100644
--- a/integration/postdata_create_test.go
+++ b/integration/postdata_create_test.go
@@ -4,11 +4,11 @@ import (
"database/sql"
"strings"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/postdata_queries_test.go
b/integration/postdata_queries_test.go
index 394f06eb..d44e1591 100644
--- a/integration/postdata_queries_test.go
+++ b/integration/postdata_queries_test.go
@@ -4,11 +4,11 @@ import (
"database/sql"
"fmt"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_acl_create_test.go
b/integration/predata_acl_create_test.go
index a5263807..293ba9bb 100644
--- a/integration/predata_acl_create_test.go
+++ b/integration/predata_acl_create_test.go
@@ -1,11 +1,11 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_acl_queries_test.go
b/integration/predata_acl_queries_test.go
index 81e86c7d..0eb0bbc4 100644
--- a/integration/predata_acl_queries_test.go
+++ b/integration/predata_acl_queries_test.go
@@ -3,12 +3,12 @@ package integration
import (
"fmt"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_externals_create_test.go
b/integration/predata_externals_create_test.go
index 00921a81..8e0d8c4e 100644
--- a/integration/predata_externals_create_test.go
+++ b/integration/predata_externals_create_test.go
@@ -4,10 +4,10 @@ import (
"database/sql"
"os"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_externals_queries_test.go
b/integration/predata_externals_queries_test.go
index 566549cb..78575de8 100644
--- a/integration/predata_externals_queries_test.go
+++ b/integration/predata_externals_queries_test.go
@@ -3,10 +3,10 @@ package integration
import (
"database/sql"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_functions_create_test.go
b/integration/predata_functions_create_test.go
index 9275529b..ddf69885 100644
--- a/integration/predata_functions_create_test.go
+++ b/integration/predata_functions_create_test.go
@@ -4,11 +4,11 @@ import (
"database/sql"
"fmt"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_functions_queries_test.go
b/integration/predata_functions_queries_test.go
index b6ccc8b5..026af163 100644
--- a/integration/predata_functions_queries_test.go
+++ b/integration/predata_functions_queries_test.go
@@ -4,11 +4,11 @@ import (
"database/sql"
"fmt"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_operators_create_test.go
b/integration/predata_operators_create_test.go
index 009f41c4..75a03826 100644
--- a/integration/predata_operators_create_test.go
+++ b/integration/predata_operators_create_test.go
@@ -1,11 +1,11 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_operators_queries_test.go
b/integration/predata_operators_queries_test.go
index 92977748..0cf70a64 100644
--- a/integration/predata_operators_queries_test.go
+++ b/integration/predata_operators_queries_test.go
@@ -1,11 +1,11 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_relations_create_test.go
b/integration/predata_relations_create_test.go
index 831e1962..3d825f11 100644
--- a/integration/predata_relations_create_test.go
+++ b/integration/predata_relations_create_test.go
@@ -5,11 +5,11 @@ import (
"fmt"
"math"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_relations_queries_test.go
b/integration/predata_relations_queries_test.go
index a74cfa39..af97c5c9 100644
--- a/integration/predata_relations_queries_test.go
+++ b/integration/predata_relations_queries_test.go
@@ -6,12 +6,12 @@ import (
"sort"
"strconv"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_shared_create_test.go
b/integration/predata_shared_create_test.go
index d303b5f9..53969c12 100644
--- a/integration/predata_shared_create_test.go
+++ b/integration/predata_shared_create_test.go
@@ -3,11 +3,11 @@ package integration
import (
"database/sql"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_shared_queries_test.go
b/integration/predata_shared_queries_test.go
index 536d93e9..dfc42e59 100644
--- a/integration/predata_shared_queries_test.go
+++ b/integration/predata_shared_queries_test.go
@@ -3,11 +3,11 @@ package integration
import (
"database/sql"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_table_defs_queries_test.go
b/integration/predata_table_defs_queries_test.go
index 5561267a..79a5d4ed 100644
--- a/integration/predata_table_defs_queries_test.go
+++ b/integration/predata_table_defs_queries_test.go
@@ -5,11 +5,11 @@ import (
"fmt"
"strings"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_textsearch_create_test.go
b/integration/predata_textsearch_create_test.go
index f6a4f929..cdf2d658 100644
--- a/integration/predata_textsearch_create_test.go
+++ b/integration/predata_textsearch_create_test.go
@@ -1,11 +1,11 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_textsearch_queries_test.go
b/integration/predata_textsearch_queries_test.go
index 4acfd6cc..22adbfe5 100644
--- a/integration/predata_textsearch_queries_test.go
+++ b/integration/predata_textsearch_queries_test.go
@@ -1,10 +1,10 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_types_create_test.go
b/integration/predata_types_create_test.go
index bb88a3a2..6d769595 100644
--- a/integration/predata_types_create_test.go
+++ b/integration/predata_types_create_test.go
@@ -1,11 +1,11 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/predata_types_queries_test.go
b/integration/predata_types_queries_test.go
index 4fd778ee..222ad9f8 100644
--- a/integration/predata_types_queries_test.go
+++ b/integration/predata_types_queries_test.go
@@ -1,11 +1,11 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/statistics_create_test.go
b/integration/statistics_create_test.go
index 5be9d897..91bfc71e 100644
--- a/integration/statistics_create_test.go
+++ b/integration/statistics_create_test.go
@@ -1,10 +1,10 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/statistics_queries_test.go
b/integration/statistics_queries_test.go
index 57f20ff5..a6932d61 100644
--- a/integration/statistics_queries_test.go
+++ b/integration/statistics_queries_test.go
@@ -3,10 +3,10 @@ package integration
import (
"sort"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/integration/utils_test.go b/integration/utils_test.go
index 5a5febf8..efeabab0 100644
--- a/integration/utils_test.go
+++ b/integration/utils_test.go
@@ -7,11 +7,11 @@ import (
"path/filepath"
"time"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/testhelper"
fp "github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"golang.org/x/sys/unix"
diff --git a/integration/wrappers_test.go b/integration/wrappers_test.go
index 058e8dc1..cb64c3f2 100644
--- a/integration/wrappers_test.go
+++ b/integration/wrappers_test.go
@@ -1,10 +1,10 @@
package integration
import (
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/options"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/spf13/cobra"
. "github.com/onsi/ginkgo/v2"
diff --git a/options/flag_test.go b/options/flag_test.go
index 626f3bda..b9ecb277 100644
--- a/options/flag_test.go
+++ b/options/flag_test.go
@@ -3,8 +3,8 @@ package options_test
import (
"flag"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/options"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/spf13/pflag"
. "github.com/onsi/ginkgo/v2"
diff --git a/options/options.go b/options/options.go
index 722f5427..8dff3ffe 100644
--- a/options/options.go
+++ b/options/options.go
@@ -5,10 +5,10 @@ import (
"regexp"
"strings"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/iohelper"
- "github.com/apache/cloudberry-backup/utils"
"github.com/pkg/errors"
"github.com/spf13/pflag"
)
diff --git a/options/options_test.go b/options/options_test.go
index 2f6b77c0..396c572b 100644
--- a/options/options_test.go
+++ b/options/options_test.go
@@ -5,9 +5,9 @@ import (
"os"
"github.com/DATA-DOG/go-sqlmock"
+ "github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/options"
"github.com/spf13/pflag"
. "github.com/onsi/ginkgo/v2"
diff --git a/report/report.go b/report/report.go
index 5ead61e3..2716a6ff 100644
--- a/report/report.go
+++ b/report/report.go
@@ -9,13 +9,13 @@ import (
"strings"
"time"
+ "github.com/apache/cloudberry-backup/history"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/iohelper"
"github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-backup/history"
- "github.com/apache/cloudberry-backup/utils"
"github.com/blang/semver"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
diff --git a/report/report_test.go b/report/report_test.go
index c78f4d69..199a8ee0 100644
--- a/report/report_test.go
+++ b/report/report_test.go
@@ -9,18 +9,18 @@ import (
"testing"
"time"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-go-libs/structmatcher"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/operating"
+ "github.com/apache/cloudberry-go-libs/structmatcher"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/blang/semver"
"github.com/pkg/errors"
"github.com/spf13/pflag"
diff --git a/restore/data.go b/restore/data.go
index 6ba130d7..ee073379 100644
--- a/restore/data.go
+++ b/restore/data.go
@@ -9,13 +9,13 @@ import (
"sync"
"sync/atomic"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/jackc/pgconn"
"github.com/pkg/errors"
"gopkg.in/cheggaaa/pb.v1"
diff --git a/restore/data_test.go b/restore/data_test.go
index 3f715ed8..940a9927 100644
--- a/restore/data_test.go
+++ b/restore/data_test.go
@@ -7,12 +7,12 @@ import (
"strings"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-backup/backup"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
"github.com/jackc/pgconn"
. "github.com/onsi/ginkgo/v2"
diff --git a/restore/global_variables.go b/restore/global_variables.go
index 14b517ea..6955ba89 100644
--- a/restore/global_variables.go
+++ b/restore/global_variables.go
@@ -3,13 +3,13 @@ package restore
import (
"sync"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/spf13/pflag"
)
diff --git a/restore/parallel.go b/restore/parallel.go
index 65d78a2d..1697ff3d 100644
--- a/restore/parallel.go
+++ b/restore/parallel.go
@@ -10,10 +10,10 @@ import (
"sync"
"sync/atomic"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
)
var (
diff --git a/restore/remote.go b/restore/remote.go
index 9f4ede7f..dd02854b 100644
--- a/restore/remote.go
+++ b/restore/remote.go
@@ -6,10 +6,10 @@ import (
"strconv"
"strings"
+ "github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/iohelper"
- "github.com/apache/cloudberry-backup/options"
"github.com/pkg/errors"
)
diff --git a/restore/remote_test.go b/restore/remote_test.go
index c1470b1d..71edf4a8 100644
--- a/restore/remote_test.go
+++ b/restore/remote_test.go
@@ -3,14 +3,14 @@ package restore_test
import (
"os/user"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/operating"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/restore/restore.go b/restore/restore.go
index 2d571483..c91d0ec1 100644
--- a/restore/restore.go
+++ b/restore/restore.go
@@ -10,15 +10,15 @@ import (
"sync"
"time"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/report"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/operating"
"github.com/pkg/errors"
"github.com/spf13/cobra"
diff --git a/restore/restore_internal_test.go b/restore/restore_internal_test.go
index 3d13b08e..d74e2065 100644
--- a/restore/restore_internal_test.go
+++ b/restore/restore_internal_test.go
@@ -1,8 +1,8 @@
package restore
import (
- "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-go-libs/dbconn"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/restore/restore_suite_test.go b/restore/restore_suite_test.go
index e1d99d80..ace3adba 100644
--- a/restore/restore_suite_test.go
+++ b/restore/restore_suite_test.go
@@ -9,9 +9,9 @@ import (
"testing"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/spf13/pflag"
. "github.com/onsi/ginkgo/v2"
diff --git a/restore/validate.go b/restore/validate.go
index 1a1bc516..be0ee281 100644
--- a/restore/validate.go
+++ b/restore/validate.go
@@ -5,11 +5,11 @@ import (
"strconv"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
"github.com/pkg/errors"
"github.com/spf13/pflag"
)
diff --git a/restore/validate_test.go b/restore/validate_test.go
index 19419250..3e123da8 100644
--- a/restore/validate_test.go
+++ b/restore/validate_test.go
@@ -4,13 +4,13 @@ import (
"strings"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/spf13/cobra"
. "github.com/onsi/ginkgo/v2"
diff --git a/restore/wrappers.go b/restore/wrappers.go
index 1b8e85e8..73d7e22c 100644
--- a/restore/wrappers.go
+++ b/restore/wrappers.go
@@ -5,16 +5,16 @@ import (
path "path/filepath"
"strings"
- "github.com/apache/cloudberry-go-libs/dbconn"
- "github.com/apache/cloudberry-go-libs/gplog"
- "github.com/apache/cloudberry-go-libs/iohelper"
- "github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/report"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
+ "github.com/apache/cloudberry-go-libs/gplog"
+ "github.com/apache/cloudberry-go-libs/iohelper"
+ "github.com/apache/cloudberry-go-libs/operating"
)
/*
diff --git a/restore/wrappers_test.go b/restore/wrappers_test.go
index 86dcb7d8..5ddccb76 100644
--- a/restore/wrappers_test.go
+++ b/restore/wrappers_test.go
@@ -6,14 +6,14 @@ import (
"path/filepath"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/cluster"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/history"
"github.com/apache/cloudberry-backup/options"
"github.com/apache/cloudberry-backup/restore"
"github.com/apache/cloudberry-backup/testutils"
"github.com/apache/cloudberry-backup/toc"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/cluster"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/pkg/errors"
. "github.com/onsi/ginkgo/v2"
diff --git a/testutils/functions.go b/testutils/functions.go
index e64f87bc..3a16ff8c 100644
--- a/testutils/functions.go
+++ b/testutils/functions.go
@@ -8,17 +8,17 @@ import (
"strings"
"github.com/DATA-DOG/go-sqlmock"
+ "github.com/apache/cloudberry-backup/backup"
+ "github.com/apache/cloudberry-backup/filepath"
+ "github.com/apache/cloudberry-backup/restore"
+ "github.com/apache/cloudberry-backup/toc"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/backup"
- "github.com/apache/cloudberry-backup/filepath"
- "github.com/apache/cloudberry-backup/restore"
- "github.com/apache/cloudberry-backup/toc"
- "github.com/apache/cloudberry-backup/utils"
"github.com/jmoiron/sqlx"
"github.com/pkg/errors"
"github.com/sergi/go-diff/diffmatchpatch"
diff --git a/toc/toc.go b/toc/toc.go
index 36f41e5a..42d727ca 100644
--- a/toc/toc.go
+++ b/toc/toc.go
@@ -7,8 +7,8 @@ import (
"regexp"
"strings"
- "github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/gplog"
"gopkg.in/yaml.v2"
)
diff --git a/utils/agent_remote.go b/utils/agent_remote.go
index 7c5f2f0c..39a019ab 100644
--- a/utils/agent_remote.go
+++ b/utils/agent_remote.go
@@ -10,11 +10,11 @@ import (
"sync"
"time"
+ "github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/iohelper"
"github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-backup/filepath"
"github.com/pkg/errors"
)
diff --git a/utils/agent_remote_test.go b/utils/agent_remote_test.go
index ed1fe2e2..a09cc2d5 100644
--- a/utils/agent_remote_test.go
+++ b/utils/agent_remote_test.go
@@ -5,12 +5,12 @@ import (
"io"
"os"
+ "github.com/apache/cloudberry-backup/filepath"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/filepath"
- "github.com/apache/cloudberry-backup/utils"
"github.com/pkg/errors"
. "github.com/onsi/ginkgo/v2"
diff --git a/utils/compression_test.go b/utils/compression_test.go
index d66fd51b..967bb3b1 100644
--- a/utils/compression_test.go
+++ b/utils/compression_test.go
@@ -3,11 +3,11 @@ package utils_test
import (
"os/user"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/structmatcher"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/utils"
. "github.com/onsi/ginkgo/v2"
)
diff --git a/utils/gpexpand_sensor_test.go b/utils/gpexpand_sensor_test.go
index 5d2f171d..475e7959 100644
--- a/utils/gpexpand_sensor_test.go
+++ b/utils/gpexpand_sensor_test.go
@@ -5,8 +5,8 @@ import (
"regexp"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/blang/vfs"
"github.com/blang/vfs/memfs"
"github.com/pkg/errors"
diff --git a/utils/io_test.go b/utils/io_test.go
index 17d662dc..17f9ce61 100644
--- a/utils/io_test.go
+++ b/utils/io_test.go
@@ -4,9 +4,9 @@ import (
"io/ioutil"
"os"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/utils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/utils/plugin.go b/utils/plugin.go
index d8101455..d6f3259a 100644
--- a/utils/plugin.go
+++ b/utils/plugin.go
@@ -9,11 +9,11 @@ import (
"strings"
"time"
+ "github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/iohelper"
"github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-backup/filepath"
"github.com/blang/semver"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
diff --git a/utils/plugin_test.go b/utils/plugin_test.go
index 61fc5419..b292cde6 100644
--- a/utils/plugin_test.go
+++ b/utils/plugin_test.go
@@ -9,11 +9,11 @@ import (
"strconv"
"strings"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/cluster"
"github.com/apache/cloudberry-go-libs/iohelper"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/utils"
"github.com/blang/semver"
"github.com/pkg/errors"
diff --git a/utils/progress_bar_test.go b/utils/progress_bar_test.go
index a19121ab..6ff95c98 100644
--- a/utils/progress_bar_test.go
+++ b/utils/progress_bar_test.go
@@ -6,10 +6,10 @@ import (
"os/user"
"time"
+ "github.com/apache/cloudberry-backup/utils"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/operating"
"github.com/apache/cloudberry-go-libs/testhelper"
- "github.com/apache/cloudberry-backup/utils"
"gopkg.in/cheggaaa/pb.v1"
. "github.com/onsi/ginkgo/v2"
diff --git a/utils/util.go b/utils/util.go
index e270b387..f13b1c35 100644
--- a/utils/util.go
+++ b/utils/util.go
@@ -16,10 +16,10 @@ import (
"strings"
"time"
+ "github.com/apache/cloudberry-backup/filepath"
"github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-go-libs/gplog"
"github.com/apache/cloudberry-go-libs/operating"
- "github.com/apache/cloudberry-backup/filepath"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
)
diff --git a/utils/util_test.go b/utils/util_test.go
index 7d31661c..f2a63b05 100644
--- a/utils/util_test.go
+++ b/utils/util_test.go
@@ -1,8 +1,8 @@
package utils_test
import (
- "github.com/apache/cloudberry-go-libs/testhelper"
"github.com/apache/cloudberry-backup/utils"
+ "github.com/apache/cloudberry-go-libs/testhelper"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
diff --git a/utils/utils_suite_test.go b/utils/utils_suite_test.go
index 0ed1e8e8..794dcd9a 100644
--- a/utils/utils_suite_test.go
+++ b/utils/utils_suite_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"github.com/DATA-DOG/go-sqlmock"
- "github.com/apache/cloudberry-go-libs/dbconn"
"github.com/apache/cloudberry-backup/testutils"
+ "github.com/apache/cloudberry-go-libs/dbconn"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
