Skip to content

Commit c3bcdb3

Browse files
*: move storage to internal (#813)
Signed-off-by: huanghaoyuanhhy <[email protected]>
1 parent 80e73a2 commit c3bcdb3

34 files changed

+23
-26
lines changed

.mockery.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ packages:
1111
Grpc:
1212
Manage:
1313

14-
github.com/zilliztech/milvus-backup/core/storage:
14+
github.com/zilliztech/milvus-backup/internal/storage:
1515
interfaces:
1616
Client:
1717

cmd/restore/restore.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
"github.com/zilliztech/milvus-backup/core/meta"
1818
"github.com/zilliztech/milvus-backup/core/paramtable"
1919
"github.com/zilliztech/milvus-backup/core/restore"
20-
"github.com/zilliztech/milvus-backup/core/storage"
21-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
2220
"github.com/zilliztech/milvus-backup/internal/log"
2321
"github.com/zilliztech/milvus-backup/internal/namespace"
22+
"github.com/zilliztech/milvus-backup/internal/storage"
23+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
2424
)
2525

2626
type options struct {

core/backup/collection.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import (
1919
"github.com/zilliztech/milvus-backup/core/client/milvus"
2020
"github.com/zilliztech/milvus-backup/core/meta"
2121
"github.com/zilliztech/milvus-backup/core/proto/backuppb"
22-
"github.com/zilliztech/milvus-backup/core/storage"
23-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
2422
"github.com/zilliztech/milvus-backup/internal/log"
2523
"github.com/zilliztech/milvus-backup/internal/namespace"
2624
"github.com/zilliztech/milvus-backup/internal/pbconv"
25+
"github.com/zilliztech/milvus-backup/internal/storage"
26+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
2727
)
2828

2929
const _allPartitionID = -1

core/backup/collection_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414

1515
"github.com/zilliztech/milvus-backup/core/client/milvus"
1616
"github.com/zilliztech/milvus-backup/core/proto/backuppb"
17-
"github.com/zilliztech/milvus-backup/core/storage"
18-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
1917
"github.com/zilliztech/milvus-backup/internal/pbconv"
18+
"github.com/zilliztech/milvus-backup/internal/storage"
19+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
2020
)
2121

2222
func newTestCollectionTask() *CollectionTask { return &CollectionTask{logger: zap.NewNop()} }

core/backup/task.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"github.com/zilliztech/milvus-backup/core/meta"
1717
"github.com/zilliztech/milvus-backup/core/paramtable"
1818
"github.com/zilliztech/milvus-backup/core/proto/backuppb"
19-
"github.com/zilliztech/milvus-backup/core/storage"
20-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
2119
"github.com/zilliztech/milvus-backup/core/utils"
2220
"github.com/zilliztech/milvus-backup/internal/log"
2321
"github.com/zilliztech/milvus-backup/internal/namespace"
22+
"github.com/zilliztech/milvus-backup/internal/storage"
23+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
2424
)
2525

2626
const (

core/backup_context.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
"github.com/zilliztech/milvus-backup/core/meta"
1818
"github.com/zilliztech/milvus-backup/core/paramtable"
1919
"github.com/zilliztech/milvus-backup/core/proto/backuppb"
20-
"github.com/zilliztech/milvus-backup/core/storage"
21-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
2220
"github.com/zilliztech/milvus-backup/internal/log"
2321
"github.com/zilliztech/milvus-backup/internal/pbconv"
22+
"github.com/zilliztech/milvus-backup/internal/storage"
23+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
2424
"github.com/zilliztech/milvus-backup/internal/taskmgr"
2525
)
2626

core/backup_impl_create_backup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"github.com/zilliztech/milvus-backup/core/client/milvus"
1414
"github.com/zilliztech/milvus-backup/core/meta"
1515
"github.com/zilliztech/milvus-backup/core/proto/backuppb"
16-
"github.com/zilliztech/milvus-backup/core/storage"
17-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
1816
"github.com/zilliztech/milvus-backup/core/utils"
1917
"github.com/zilliztech/milvus-backup/internal/log"
18+
"github.com/zilliztech/milvus-backup/internal/storage"
19+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
2020
)
2121

2222
func (b *BackupContext) CreateBackup(ctx context.Context, request *backuppb.CreateBackupRequest) *backuppb.BackupInfoResponse {

core/meta/meta.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/samber/lo"
99

1010
"github.com/zilliztech/milvus-backup/core/proto/backuppb"
11-
"github.com/zilliztech/milvus-backup/core/storage"
12-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
11+
"github.com/zilliztech/milvus-backup/internal/storage"
12+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
1313
)
1414

1515
func readFromFull(ctx context.Context, backupDir string, cli storage.Client) (*backuppb.BackupInfo, error) {

core/meta/meta_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/stretchr/testify/mock"
1212

1313
"github.com/zilliztech/milvus-backup/core/proto/backuppb"
14-
"github.com/zilliztech/milvus-backup/core/storage"
14+
"github.com/zilliztech/milvus-backup/internal/storage"
1515
)
1616

1717
func newTestLevelBackupInfo() *levelBackupInfo {

core/migrate/task.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/zilliztech/milvus-backup/core/client/cloud"
1313
"github.com/zilliztech/milvus-backup/core/meta"
1414
"github.com/zilliztech/milvus-backup/core/paramtable"
15-
"github.com/zilliztech/milvus-backup/core/storage"
16-
"github.com/zilliztech/milvus-backup/core/storage/mpath"
1715
"github.com/zilliztech/milvus-backup/internal/log"
16+
"github.com/zilliztech/milvus-backup/internal/storage"
17+
"github.com/zilliztech/milvus-backup/internal/storage/mpath"
1818
"github.com/zilliztech/milvus-backup/internal/taskmgr"
1919
)
2020

0 commit comments

Comments
 (0)