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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPYHELPER=cbcopy_helper

GINKGO_FLAGS := -r --keep-going --no-color
GIT_VERSION := $(shell git describe --tags | perl -pe 's/(.*)-([0-9]*)-(g[0-9a-f]*)/\1+dev.\2.\3/')
VERSION_STR="-X github.com/cloudberrydb/cbcopy/utils.Version=$(GIT_VERSION)"
VERSION_STR="-X github.com/cloudberry-contrib/cbcopy/utils.Version=$(GIT_VERSION)"

SUBDIRS_HAS_UNIT= meta/builtin/ testutils/ utils/
GINKGO=$(shell go env GOPATH)/bin/ginkgo
Expand Down
4 changes: 2 additions & 2 deletions cbcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package main
import (
"os"

"github.com/cloudberrydb/cbcopy/copy"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/copy"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cbcopy_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package main
import (
"os"

"github.com/cloudberrydb/cbcopy/helper"
"github.com/cloudberry-contrib/cbcopy/helper"
"github.com/greenplum-db/gp-common-go-libs/gplog"
)

Expand Down
6 changes: 3 additions & 3 deletions copy/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"sync"
"time"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down
6 changes: 3 additions & 3 deletions copy/copy_command.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strconv"
"strings"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
uuid "github.com/satori/go.uuid"
)
Expand Down
6 changes: 3 additions & 3 deletions copy/copy_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"sync"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
"github.com/greenplum-db/gp-common-go-libs/operating"
)
Expand Down
8 changes: 4 additions & 4 deletions copy/copy_metadata.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package copy

import (
"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/meta"
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/meta"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
)

// MetadataManager handles all metadata related operations during copy process
Expand Down
6 changes: 3 additions & 3 deletions copy/copy_operation.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"
Expand Down
2 changes: 1 addition & 1 deletion copy/copy_port_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sort"
"strings"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/greenplum-db/gp-common-go-libs/gplog"
)

Expand Down
6 changes: 3 additions & 3 deletions copy/copy_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
)

Expand Down
6 changes: 3 additions & 3 deletions copy/copy_query_wrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"strconv"
"strings"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions copy/copy_validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strconv"
"strings"

"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/spf13/pflag"
)

Expand Down
2 changes: 1 addition & 1 deletion copy/variable.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package copy

import (
"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/option"
)

/*
Expand Down
6 changes: 3 additions & 3 deletions end_to_end/basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"testing"
"time"

"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/testutils"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/testutils"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
6 changes: 3 additions & 3 deletions end_to_end/table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"strconv"
"strings"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

"github.com/cloudberrydb/cbcopy/testutils"
"github.com/cloudberry-contrib/cbcopy/testutils"

. "github.com/onsi/ginkgo/v2"
)
Expand Down
6 changes: 3 additions & 3 deletions end_to_end/tablespace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"strconv"
"strings"

"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

"github.com/cloudberrydb/cbcopy/testutils"
"github.com/cloudberry-contrib/cbcopy/testutils"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cloudberrydb/cbcopy
module github.com/cloudberry-contrib/cbcopy

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion helper/concurrent_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"
"time"

"github.com/cloudberrydb/cbcopy/internal/reader"
"github.com/cloudberry-contrib/cbcopy/internal/reader"
"github.com/greenplum-db/gp-common-go-libs/gplog"
)

Expand Down
2 changes: 1 addition & 1 deletion helper/concurrent_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/greenplum-db/gp-common-go-libs/gplog"

"github.com/cloudberrydb/cbcopy/internal/reader"
"github.com/cloudberry-contrib/cbcopy/internal/reader"
)

type ConcurrentServer struct {
Expand Down
2 changes: 1 addition & 1 deletion helper/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/pkg/errors"
flag "github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion helper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"runtime/debug"

"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
)

Expand Down
2 changes: 1 addition & 1 deletion helper/one_time_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
)

Expand Down
2 changes: 1 addition & 1 deletion helper/one_time_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net"
"os"

"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/utils"
"github.com/greenplum-db/gp-common-go-libs/gplog"
)

Expand Down
4 changes: 2 additions & 2 deletions integration/agent_remote_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"fmt"

// "github.com/greenplum-db/gp-common-go-libs/cluster"
"github.com/cloudberrydb/cbcopy/internal/cluster"
"github.com/cloudberry-contrib/cbcopy/internal/cluster"

"github.com/greenplum-db/gpbackup/filepath"

// "github.com/greenplum-db/gpbackup/utils"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/utils"


. "github.com/onsi/ginkgo/v2"
Expand Down
6 changes: 3 additions & 3 deletions integration/dependency_queries_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package integration

import (
// "github.com/greenplum-db/gp-common-go-libs/testhelper"
"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

// "github.com/greenplum-db/gpbackup/backup"
"github.com/cloudberrydb/cbcopy/meta/builtin"
"github.com/cloudberry-contrib/cbcopy/meta/builtin"

// "github.com/greenplum-db/gpbackup/testutils"
"github.com/cloudberrydb/cbcopy/testutils"
"github.com/cloudberry-contrib/cbcopy/testutils"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
10 changes: 5 additions & 5 deletions integration/gpexpand_not_running_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import (
"path/filepath"

// "github.com/greenplum-db/gp-common-go-libs/dbconn"
"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"

"github.com/greenplum-db/gp-common-go-libs/iohelper"
// "github.com/greenplum-db/gp-common-go-libs/testhelper"
"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

// "github.com/greenplum-db/gpbackup/backup"
"github.com/cloudberrydb/cbcopy/meta/builtin"
"github.com/cloudberry-contrib/cbcopy/meta/builtin"

"github.com/greenplum-db/gpbackup/restore"
// "github.com/greenplum-db/gpbackup/testutils"
"github.com/cloudberrydb/cbcopy/testutils"
"github.com/cloudberry-contrib/cbcopy/testutils"

// "github.com/greenplum-db/gpbackup/utils"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/utils"


. "github.com/onsi/ginkgo/v2"
Expand Down
8 changes: 4 additions & 4 deletions integration/incremental_queries_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ package integration
import (
"fmt"

"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/option"

// "github.com/greenplum-db/gp-common-go-libs/testhelper"
"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

// "github.com/greenplum-db/gpbackup/backup"
"github.com/cloudberrydb/cbcopy/meta/builtin"
"github.com/cloudberry-contrib/cbcopy/meta/builtin"

//"github.com/greenplum-db/gpbackup/options"

// "github.com/greenplum-db/gpbackup/toc"
"github.com/cloudberrydb/cbcopy/meta/builtin/toc"
"github.com/cloudberry-contrib/cbcopy/meta/builtin/toc"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions integration/inheritance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"

// "github.com/greenplum-db/gp-common-go-libs/dbconn"
"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"

// "github.com/greenplum-db/gp-common-go-libs/testhelper"
"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
18 changes: 9 additions & 9 deletions integration/integration_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ import (
"strings"
"testing"

"github.com/cloudberrydb/cbcopy/option"
"github.com/cloudberry-contrib/cbcopy/option"
"github.com/greenplum-db/gp-common-go-libs/gplog"

// "github.com/greenplum-db/gp-common-go-libs/cluster"
"github.com/cloudberrydb/cbcopy/internal/cluster"
"github.com/cloudberry-contrib/cbcopy/internal/cluster"

// "github.com/greenplum-db/gp-common-go-libs/dbconn"
"github.com/cloudberrydb/cbcopy/internal/dbconn"
"github.com/cloudberry-contrib/cbcopy/internal/dbconn"

// "github.com/greenplum-db/gp-common-go-libs/testhelper"
"github.com/cloudberrydb/cbcopy/internal/testhelper"
"github.com/cloudberry-contrib/cbcopy/internal/testhelper"

// "github.com/greenplum-db/gpbackup/backup"
"github.com/cloudberrydb/cbcopy/meta/builtin"
"github.com/cloudberry-contrib/cbcopy/meta/builtin"

//"github.com/greenplum-db/gpbackup/restore"

// "github.com/greenplum-db/gpbackup/testutils"
"github.com/cloudberrydb/cbcopy/testutils"
"github.com/cloudberry-contrib/cbcopy/testutils"

// "github.com/greenplum-db/gpbackup/toc"
"github.com/cloudberrydb/cbcopy/meta/builtin/toc"
"github.com/cloudberry-contrib/cbcopy/meta/builtin/toc"

// "github.com/greenplum-db/gpbackup/utils"
"github.com/cloudberrydb/cbcopy/utils"
"github.com/cloudberry-contrib/cbcopy/utils"

"github.com/cloudberrydb/cbcopy/copy"
"github.com/cloudberry-contrib/cbcopy/copy"

"github.com/spf13/pflag"

Expand Down
Loading