Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions backup/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion backup/backup_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions backup/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions backup/dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion backup/dependencies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions backup/global_variables.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions backup/incremental.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions backup/incremental_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backup/metadata_globals.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion backup/metadata_globals_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion backup/postdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions backup/predata_acl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backup/predata_externals_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backup/predata_functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion backup/predata_functions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions backup/predata_relations.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions backup/predata_relations_other_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backup/predata_relations_tables_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion backup/predata_shared.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion backup/predata_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion backup/queries_acl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion backup/queries_acl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backup/queries_externals.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions backup/queries_functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backup/queries_functions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions backup/queries_globals.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backup/queries_incremental.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions backup/queries_operators.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions backup/queries_postdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion backup/queries_postdata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion backup/queries_relation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading