diff --git a/agent/internal/cmd/serve.go b/agent/internal/cmd/serve.go index 6731e29..45604f2 100644 --- a/agent/internal/cmd/serve.go +++ b/agent/internal/cmd/serve.go @@ -8,35 +8,35 @@ import ( "time" "github.com/go-co-op/gocron/v2" - "gitlink.org.cn/cloudream/storage/agent/internal/http" - "gitlink.org.cn/cloudream/storage/agent/internal/tickevent" + "gitlink.org.cn/cloudream/storage2/agent/internal/http" + "gitlink.org.cn/cloudream/storage2/agent/internal/tickevent" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/agent/internal/config" - "gitlink.org.cn/cloudream/storage/agent/internal/task" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/accessstat" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" - "gitlink.org.cn/cloudream/storage/common/pkgs/metacache" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/agent/internal/config" + "gitlink.org.cn/cloudream/storage2/agent/internal/task" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/accessstat" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" + "gitlink.org.cn/cloudream/storage2/common/pkgs/metacache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" "google.golang.org/grpc" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" - grpcsvc "gitlink.org.cn/cloudream/storage/agent/internal/grpc" - cmdsvc "gitlink.org.cn/cloudream/storage/agent/internal/mq" + grpcsvc "gitlink.org.cn/cloudream/storage2/agent/internal/grpc" + cmdsvc "gitlink.org.cn/cloudream/storage2/agent/internal/mq" ) func serve(configPath string) { diff --git a/agent/internal/config/config.go b/agent/internal/config/config.go index 40b3f28..ff8ef99 100644 --- a/agent/internal/config/config.go +++ b/agent/internal/config/config.go @@ -6,11 +6,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" c "gitlink.org.cn/cloudream/common/utils/config" - stgmodels "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - "gitlink.org.cn/cloudream/storage/common/pkgs/grpc" + stgmodels "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc" ) type Config struct { diff --git a/agent/internal/grpc/io.go b/agent/internal/grpc/io.go index 15c49a8..81a4a20 100644 --- a/agent/internal/grpc/io.go +++ b/agent/internal/grpc/io.go @@ -11,7 +11,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/serder" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" ) func (s *Service) ExecuteIOPlan(ctx context.Context, req *agtrpc.ExecuteIOPlanReq) (*agtrpc.ExecuteIOPlanResp, error) { diff --git a/agent/internal/grpc/ping.go b/agent/internal/grpc/ping.go index b06ebcc..b344339 100644 --- a/agent/internal/grpc/ping.go +++ b/agent/internal/grpc/ping.go @@ -3,7 +3,7 @@ package grpc import ( "context" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" ) // Ping 是一个RPC方法，用于验证服务的可用性。 diff --git a/agent/internal/grpc/service.go b/agent/internal/grpc/service.go index 3dbbf85..1b63b9e 100644 --- a/agent/internal/grpc/service.go +++ b/agent/internal/grpc/service.go @@ -2,8 +2,8 @@ package grpc import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - agentserver "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" + agentserver "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" ) type Service struct { diff --git a/agent/internal/http/service.go b/agent/internal/http/service.go index 2c38d36..875ef37 100644 --- a/agent/internal/http/service.go +++ b/agent/internal/http/service.go @@ -2,7 +2,7 @@ package http import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" ) type Service struct { diff --git a/agent/internal/mq/agent.go b/agent/internal/mq/agent.go index cbfef37..73f4c77 100644 --- a/agent/internal/mq/agent.go +++ b/agent/internal/mq/agent.go @@ -2,7 +2,7 @@ package mq import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" ) func (svc *Service) GetState(msg *agtmq.GetState) (*agtmq.GetStateResp, *mq.CodeMessage) { diff --git a/agent/internal/mq/cache.go b/agent/internal/mq/cache.go index 735e1e3..d7de1d2 100644 --- a/agent/internal/mq/cache.go +++ b/agent/internal/mq/cache.go @@ -7,8 +7,8 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - mytask "gitlink.org.cn/cloudream/storage/agent/internal/task" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" + mytask "gitlink.org.cn/cloudream/storage2/agent/internal/task" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" ) func (svc *Service) CheckCache(msg *agtmq.CheckCache) (*agtmq.CheckCacheResp, *mq.CodeMessage) { diff --git a/agent/internal/mq/service.go b/agent/internal/mq/service.go index 95cd4e3..f55caa7 100644 --- a/agent/internal/mq/service.go +++ b/agent/internal/mq/service.go @@ -1,9 +1,9 @@ package mq import ( - "gitlink.org.cn/cloudream/storage/agent/internal/task" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/agent/internal/task" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) type Service struct { diff --git a/agent/internal/mq/storage.go b/agent/internal/mq/storage.go index cdc3871..a3c01bb 100644 --- a/agent/internal/mq/storage.go +++ b/agent/internal/mq/storage.go @@ -4,9 +4,9 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) StorageCreatePackage(msg *agtmq.StorageCreatePackage) (*agtmq.StorageCreatePackageResp, *mq.CodeMessage) { diff --git a/agent/internal/task/cache_move_package.go b/agent/internal/task/cache_move_package.go index 404d7ec..bb5bf85 100644 --- a/agent/internal/task/cache_move_package.go +++ b/agent/internal/task/cache_move_package.go @@ -7,10 +7,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/task" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage/common/pkgs/iterator" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) type CacheMovePackage struct { diff --git a/agent/internal/task/create_package.go b/agent/internal/task/create_package.go index f5c8ae3..507d3b7 100644 --- a/agent/internal/task/create_package.go +++ b/agent/internal/task/create_package.go @@ -9,9 +9,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/task" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/iterator" - "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) // CreatePackageResult 定义创建包的结果结构 diff --git a/agent/internal/task/task.go b/agent/internal/task/task.go index 4080005..9def3b5 100644 --- a/agent/internal/task/task.go +++ b/agent/internal/task/task.go @@ -3,11 +3,11 @@ package task import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/task" - "gitlink.org.cn/cloudream/storage/common/pkgs/accessstat" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/accessstat" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) // TaskContext 定义了任务执行的上下文环境，包含分布式锁服务、IO开关和网络连接状态收集器 diff --git a/agent/internal/tickevent/report_hub_stats.go b/agent/internal/tickevent/report_hub_stats.go index 4c744f3..e24859f 100644 --- a/agent/internal/tickevent/report_hub_stats.go +++ b/agent/internal/tickevent/report_hub_stats.go @@ -2,10 +2,10 @@ package tickevent import ( "gitlink.org.cn/cloudream/common/utils/math2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" ) func ReportHubTransferStats(evtPub *sysevent.Publisher) { diff --git a/agent/internal/tickevent/report_storage_stats.go b/agent/internal/tickevent/report_storage_stats.go index 600acf6..35b2f65 100644 --- a/agent/internal/tickevent/report_storage_stats.go +++ b/agent/internal/tickevent/report_storage_stats.go @@ -1,9 +1,9 @@ package tickevent import ( - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" ) func ReportStorageStats(agtPool *agtpool.AgentPool, evtPub *sysevent.Publisher) { diff --git a/agent/main.go b/agent/main.go index 930a898..79d58c0 100644 --- a/agent/main.go +++ b/agent/main.go @@ -1,6 +1,6 @@ package main -import "gitlink.org.cn/cloudream/storage/agent/internal/cmd" +import "gitlink.org.cn/cloudream/storage2/agent/internal/cmd" func main() { cmd.RootCmd.Execute() diff --git a/client/internal/cmdline/commandline.go b/client/internal/cmdline/commandline.go index eea72cd..78db3df 100644 --- a/client/internal/cmdline/commandline.go +++ b/client/internal/cmdline/commandline.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "gitlink.org.cn/cloudream/common/pkgs/cmdtrie" - "gitlink.org.cn/cloudream/storage/client/internal/services" + "gitlink.org.cn/cloudream/storage2/client/internal/services" ) type CommandContext struct { diff --git a/client/internal/cmdline/distlock.go b/client/internal/cmdline/distlock.go index 73b792e..74d3f1c 100644 --- a/client/internal/cmdline/distlock.go +++ b/client/internal/cmdline/distlock.go @@ -6,7 +6,7 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" ) // DistLockLock 尝试获取分布式锁。 diff --git a/client/internal/cmdline/getp.go b/client/internal/cmdline/getp.go index ba2be44..8707078 100644 --- a/client/internal/cmdline/getp.go +++ b/client/internal/cmdline/getp.go @@ -12,8 +12,8 @@ import ( "github.com/inhies/go-bytesize" "github.com/spf13/cobra" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/client/internal/config" - "gitlink.org.cn/cloudream/storage/common/pkgs/iterator" + "gitlink.org.cn/cloudream/storage2/client/internal/config" + "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" ) func init() { diff --git a/client/internal/cmdline/package.go b/client/internal/cmdline/package.go index 32ed829..3f46781 100644 --- a/client/internal/cmdline/package.go +++ b/client/internal/cmdline/package.go @@ -9,7 +9,7 @@ import ( "github.com/jedib0t/go-pretty/v6/table" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/iterator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" ) // PackageListBucketPackages 列出指定存储桶中的所有包裹。 diff --git a/client/internal/cmdline/scanner.go b/client/internal/cmdline/scanner.go index 3a13b7f..e7ae75c 100644 --- a/client/internal/cmdline/scanner.go +++ b/client/internal/cmdline/scanner.go @@ -5,7 +5,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/cmdtrie" "gitlink.org.cn/cloudream/common/utils/reflect2" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" ) var parseScannerEventCmdTrie cmdtrie.StaticCommandTrie[any] = cmdtrie.NewStaticCommandTrie[any]() diff --git a/client/internal/cmdline/serve.go b/client/internal/cmdline/serve.go index 95f8da0..a498926 100644 --- a/client/internal/cmdline/serve.go +++ b/client/internal/cmdline/serve.go @@ -3,8 +3,8 @@ package cmdline import ( "fmt" - "gitlink.org.cn/cloudream/storage/client/internal/config" - "gitlink.org.cn/cloudream/storage/client/internal/http" + "gitlink.org.cn/cloudream/storage2/client/internal/config" + "gitlink.org.cn/cloudream/storage2/client/internal/http" ) // ServeHTTP 启动HTTP服务。 diff --git a/client/internal/cmdline/sysevent.go b/client/internal/cmdline/sysevent.go index d110ae6..dc8741f 100644 --- a/client/internal/cmdline/sysevent.go +++ b/client/internal/cmdline/sysevent.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/storage/client/internal/config" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/storage2/client/internal/config" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" ) func init() { diff --git a/client/internal/config/config.go b/client/internal/config/config.go index 9f556f5..ba9cd77 100644 --- a/client/internal/config/config.go +++ b/client/internal/config/config.go @@ -6,11 +6,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/config" - stgmodels "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" + stgmodels "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" ) type Config struct { diff --git a/client/internal/http/aws_auth.go b/client/internal/http/aws_auth.go index fdfc7a5..e8b97c5 100644 --- a/client/internal/http/aws_auth.go +++ b/client/internal/http/aws_auth.go @@ -18,7 +18,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage/client/internal/config" + "gitlink.org.cn/cloudream/storage2/client/internal/config" ) const ( diff --git a/client/internal/http/object.go b/client/internal/http/object.go index 2ba37f5..02617cf 100644 --- a/client/internal/http/object.go +++ b/client/internal/http/object.go @@ -15,8 +15,8 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/client/internal/config" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/client/internal/config" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" ) type ObjectService struct { diff --git a/client/internal/http/presigned.go b/client/internal/http/presigned.go index 3e4d73d..2ab34b2 100644 --- a/client/internal/http/presigned.go +++ b/client/internal/http/presigned.go @@ -13,8 +13,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/client/internal/config" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/client/internal/config" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" ) type PresignedService struct { diff --git a/client/internal/http/server.go b/client/internal/http/server.go index 66faf64..980c08b 100644 --- a/client/internal/http/server.go +++ b/client/internal/http/server.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" - "gitlink.org.cn/cloudream/storage/client/internal/services" + "gitlink.org.cn/cloudream/storage2/client/internal/services" ) type Server struct { diff --git a/client/internal/services/bucket.go b/client/internal/services/bucket.go index 5a8e694..e1be893 100644 --- a/client/internal/services/bucket.go +++ b/client/internal/services/bucket.go @@ -4,8 +4,8 @@ import ( "fmt" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) // BucketService 是对存储桶进行操作的服务类 diff --git a/client/internal/services/cache.go b/client/internal/services/cache.go index 04bcb5a..acd8251 100644 --- a/client/internal/services/cache.go +++ b/client/internal/services/cache.go @@ -6,10 +6,10 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" ) type CacheService struct { diff --git a/client/internal/services/hub.go b/client/internal/services/hub.go index 7e3e94d..eecc66d 100644 --- a/client/internal/services/hub.go +++ b/client/internal/services/hub.go @@ -2,9 +2,10 @@ package services import ( "fmt" + cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) // HubService 是关于节点操作的服务结构体 diff --git a/client/internal/services/object.go b/client/internal/services/object.go index 6488769..75d5213 100644 --- a/client/internal/services/object.go +++ b/client/internal/services/object.go @@ -7,13 +7,13 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/plans" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/plans" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) // ObjectService 定义了对象服务，负责管理对象的上传、下载等操作。 diff --git a/client/internal/services/package.go b/client/internal/services/package.go index f31938c..81ac84b 100644 --- a/client/internal/services/package.go +++ b/client/internal/services/package.go @@ -5,9 +5,9 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) // PackageService 提供对包相关操作的服务接口 diff --git a/client/internal/services/scanner.go b/client/internal/services/scanner.go index 0186e7d..3898212 100644 --- a/client/internal/services/scanner.go +++ b/client/internal/services/scanner.go @@ -3,9 +3,9 @@ package services import ( "fmt" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - scmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" ) // ScannerService 是扫描器服务结构体，封装了与扫描器相关的服务功能。 diff --git a/client/internal/services/service.go b/client/internal/services/service.go index 260bbb3..8ce1541 100644 --- a/client/internal/services/service.go +++ b/client/internal/services/service.go @@ -4,12 +4,12 @@ package services import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/client/internal/task" - "gitlink.org.cn/cloudream/storage/common/pkgs/accessstat" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - "gitlink.org.cn/cloudream/storage/common/pkgs/metacache" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/client/internal/task" + "gitlink.org.cn/cloudream/storage2/common/pkgs/accessstat" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + "gitlink.org.cn/cloudream/storage2/common/pkgs/metacache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) // Service 结构体封装了分布锁服务和任务管理服务。 diff --git a/client/internal/services/storage.go b/client/internal/services/storage.go index 267e369..56906b7 100644 --- a/client/internal/services/storage.go +++ b/client/internal/services/storage.go @@ -8,16 +8,16 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" ) type StorageService struct { diff --git a/client/internal/services/user.go b/client/internal/services/user.go index cfb440c..7fef843 100644 --- a/client/internal/services/user.go +++ b/client/internal/services/user.go @@ -4,8 +4,8 @@ import ( "fmt" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) type UserService struct { diff --git a/client/internal/task/task.go b/client/internal/task/task.go index 348621b..b3294f6 100644 --- a/client/internal/task/task.go +++ b/client/internal/task/task.go @@ -1,10 +1,10 @@ package task import ( - "gitlink.org.cn/cloudream/common/pkgs/distlock" // 引入分布式锁服务 - "gitlink.org.cn/cloudream/common/pkgs/task" // 引入任务处理相关的包 - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" // 引入网络连接状态收集器 - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/common/pkgs/distlock" // 引入分布式锁服务 + "gitlink.org.cn/cloudream/common/pkgs/task" // 引入任务处理相关的包 + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" // 引入网络连接状态收集器 + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" ) // TaskContext 定义了任务执行的上下文环境，包含分布式锁服务和网络连接状态收集器 diff --git a/client/main.go b/client/main.go index abd1a45..38934dd 100644 --- a/client/main.go +++ b/client/main.go @@ -9,20 +9,20 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/client/internal/cmdline" - "gitlink.org.cn/cloudream/storage/client/internal/config" - "gitlink.org.cn/cloudream/storage/client/internal/services" - "gitlink.org.cn/cloudream/storage/client/internal/task" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/accessstat" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - "gitlink.org.cn/cloudream/storage/common/pkgs/metacache" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/client/internal/cmdline" + "gitlink.org.cn/cloudream/storage2/client/internal/config" + "gitlink.org.cn/cloudream/storage2/client/internal/services" + "gitlink.org.cn/cloudream/storage2/client/internal/task" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + "gitlink.org.cn/cloudream/storage2/common/pkgs/accessstat" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + "gitlink.org.cn/cloudream/storage2/common/pkgs/metacache" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) func main() { diff --git a/client2/internal/cmd/mount.go b/client2/internal/cmd/mount.go index 9e2e852..ea437d7 100644 --- a/client2/internal/cmd/mount.go +++ b/client2/internal/cmd/mount.go @@ -7,19 +7,19 @@ import ( "github.com/spf13/cobra" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage/client2/internal/config" - "gitlink.org.cn/cloudream/storage/client2/internal/mount" - mntcfg "gitlink.org.cn/cloudream/storage/client2/internal/mount/config" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" - "gitlink.org.cn/cloudream/storage/common/pkgs/metacache" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/client2/internal/config" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount" + mntcfg "gitlink.org.cn/cloudream/storage2/client2/internal/mount/config" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" + "gitlink.org.cn/cloudream/storage2/common/pkgs/metacache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) func init() { diff --git a/client2/internal/config/config.go b/client2/internal/config/config.go index c40b118..82f6ee8 100644 --- a/client2/internal/config/config.go +++ b/client2/internal/config/config.go @@ -6,12 +6,12 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" c "gitlink.org.cn/cloudream/common/utils/config" - stgmodels "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - db "gitlink.org.cn/cloudream/storage/common/pkgs/db2/config" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - "gitlink.org.cn/cloudream/storage/common/pkgs/grpc" + stgmodels "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + db "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/config" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc" ) type Config struct { diff --git a/client2/internal/mount/fuse/fuse.go b/client2/internal/mount/fuse/fuse.go index a69ccd1..9a4dc5e 100644 --- a/client2/internal/mount/fuse/fuse.go +++ b/client2/internal/mount/fuse/fuse.go @@ -8,7 +8,7 @@ import ( fusefs "github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/config" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/config" ) type Fuse struct { diff --git a/client2/internal/mount/mount.go b/client2/internal/mount/mount.go index 2de2590..7f1d097 100644 --- a/client2/internal/mount/mount.go +++ b/client2/internal/mount/mount.go @@ -7,12 +7,12 @@ import ( "github.com/hanwen/go-fuse/v2/fuse" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/sync2" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/config" - fuse2 "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/vfs" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/config" + fuse2 "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/vfs" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) type MountEvent interface { diff --git a/client2/internal/mount/mount_win.go b/client2/internal/mount/mount_win.go index 5bfc91f..dd36491 100644 --- a/client2/internal/mount/mount_win.go +++ b/client2/internal/mount/mount_win.go @@ -7,10 +7,10 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/sync2" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/config" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/config" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) type MountEvent interface { diff --git a/client2/internal/mount/vfs/cache/cache.go b/client2/internal/mount/vfs/cache/cache.go index f2466b8..b433fdd 100644 --- a/client2/internal/mount/vfs/cache/cache.go +++ b/client2/internal/mount/vfs/cache/cache.go @@ -16,11 +16,11 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/config" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/config" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) type CacheEntry interface { diff --git a/client2/internal/mount/vfs/cache/file.go b/client2/internal/mount/vfs/cache/file.go index 88f8ca9..28dd2ea 100644 --- a/client2/internal/mount/vfs/cache/file.go +++ b/client2/internal/mount/vfs/cache/file.go @@ -13,7 +13,7 @@ import ( "gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" ) type FileInfo struct { diff --git a/client2/internal/mount/vfs/dir_reader.go b/client2/internal/mount/vfs/dir_reader.go index 2fd4f01..2f374d3 100644 --- a/client2/internal/mount/vfs/dir_reader.go +++ b/client2/internal/mount/vfs/dir_reader.go @@ -1,6 +1,6 @@ package vfs -import "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" +import "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" type FuseDirReader struct { allEntries []fuse.FsEntry diff --git a/client2/internal/mount/vfs/fuse_bucket.go b/client2/internal/mount/vfs/fuse_bucket.go index 6dea9d9..32e988c 100644 --- a/client2/internal/mount/vfs/fuse_bucket.go +++ b/client2/internal/mount/vfs/fuse_bucket.go @@ -7,9 +7,9 @@ import ( "time" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/vfs/cache" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gorm.io/gorm" ) diff --git a/client2/internal/mount/vfs/fuse_dir.go b/client2/internal/mount/vfs/fuse_dir.go index 5eb5bfe..03e3bea 100644 --- a/client2/internal/mount/vfs/fuse_dir.go +++ b/client2/internal/mount/vfs/fuse_dir.go @@ -8,9 +8,9 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/vfs/cache" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gorm.io/gorm" ) diff --git a/client2/internal/mount/vfs/fuse_file.go b/client2/internal/mount/vfs/fuse_file.go index 1593d03..0113636 100644 --- a/client2/internal/mount/vfs/fuse_file.go +++ b/client2/internal/mount/vfs/fuse_file.go @@ -5,8 +5,8 @@ import ( "time" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/vfs/cache" "gorm.io/gorm" ) diff --git a/client2/internal/mount/vfs/fuse_package.go b/client2/internal/mount/vfs/fuse_package.go index b574893..94a5ec5 100644 --- a/client2/internal/mount/vfs/fuse_package.go +++ b/client2/internal/mount/vfs/fuse_package.go @@ -8,9 +8,9 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/vfs/cache" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gorm.io/gorm" ) diff --git a/client2/internal/mount/vfs/fuse_root.go b/client2/internal/mount/vfs/fuse_root.go index 649fd75..da28795 100644 --- a/client2/internal/mount/vfs/fuse_root.go +++ b/client2/internal/mount/vfs/fuse_root.go @@ -6,9 +6,9 @@ import ( "time" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/vfs/cache" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gorm.io/gorm" ) diff --git a/client2/internal/mount/vfs/vfs.go b/client2/internal/mount/vfs/vfs.go index 4a8d4cd..6316fac 100644 --- a/client2/internal/mount/vfs/vfs.go +++ b/client2/internal/mount/vfs/vfs.go @@ -1,12 +1,12 @@ package vfs import ( - "gitlink.org.cn/cloudream/storage/client2/internal/mount/config" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/fuse" - "gitlink.org.cn/cloudream/storage/client2/internal/mount/vfs/cache" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" - "gitlink.org.cn/cloudream/storage/common/pkgs/uploader" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/config" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/fuse" + "gitlink.org.cn/cloudream/storage2/client2/internal/mount/vfs/cache" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader" + "gitlink.org.cn/cloudream/storage2/common/pkgs/uploader" ) type Vfs struct { diff --git a/client2/main.go b/client2/main.go index a315e94..873593f 100644 --- a/client2/main.go +++ b/client2/main.go @@ -1,6 +1,6 @@ package main -import "gitlink.org.cn/cloudream/storage/client2/internal/cmd" +import "gitlink.org.cn/cloudream/storage2/client2/internal/cmd" func main() { cmd.RootCmd.Execute() diff --git a/common/globals/globals.go b/common/globals/globals.go index 27f236c..291be35 100644 --- a/common/globals/globals.go +++ b/common/globals/globals.go @@ -1,7 +1,7 @@ package stgglb import ( - stgmodels "gitlink.org.cn/cloudream/storage/common/models" + stgmodels "gitlink.org.cn/cloudream/storage2/common/models" ) var Local *stgmodels.LocalMachineInfo diff --git a/common/globals/pools.go b/common/globals/pools.go index 53841f9..7b7f264 100644 --- a/common/globals/pools.go +++ b/common/globals/pools.go @@ -2,10 +2,10 @@ package stgglb import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - scmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner" ) var AgentMQPool agtmq.Pool diff --git a/common/globals/stats.go b/common/globals/stats.go index 87ed604..20a9e1d 100644 --- a/common/globals/stats.go +++ b/common/globals/stats.go @@ -1,5 +1,5 @@ package stgglb -import "gitlink.org.cn/cloudream/storage/common/pkgs/servicestats" +import "gitlink.org.cn/cloudream/storage2/common/pkgs/servicestats" var Stats servicestats.StatsHost diff --git a/common/pkgs/accessstat/access_stat.go b/common/pkgs/accessstat/access_stat.go index 7820626..b7d1982 100644 --- a/common/pkgs/accessstat/access_stat.go +++ b/common/pkgs/accessstat/access_stat.go @@ -8,8 +8,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/sync2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) type AccessStatEvent interface{} diff --git a/common/pkgs/connectivity/collector.go b/common/pkgs/connectivity/collector.go index 31d30e4..819e7fe 100644 --- a/common/pkgs/connectivity/collector.go +++ b/common/pkgs/connectivity/collector.go @@ -7,8 +7,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) type Connectivity struct { diff --git a/common/pkgs/db2/bucket.go b/common/pkgs/db2/bucket.go index a0ba3c8..a46d6eb 100644 --- a/common/pkgs/db2/bucket.go +++ b/common/pkgs/db2/bucket.go @@ -8,7 +8,7 @@ import ( "gorm.io/gorm" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type BucketDB struct { diff --git a/common/pkgs/db2/cache.go b/common/pkgs/db2/cache.go index 26627ad..556f9c5 100644 --- a/common/pkgs/db2/cache.go +++ b/common/pkgs/db2/cache.go @@ -4,7 +4,7 @@ import ( "time" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" "gorm.io/gorm/clause" ) diff --git a/common/pkgs/db2/db2.go b/common/pkgs/db2/db2.go index 2df3bf2..8e807bc 100644 --- a/common/pkgs/db2/db2.go +++ b/common/pkgs/db2/db2.go @@ -3,7 +3,7 @@ package db2 import ( _ "github.com/go-sql-driver/mysql" "github.com/sirupsen/logrus" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/config" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/config" "gorm.io/driver/mysql" "gorm.io/gorm" ) diff --git a/common/pkgs/db2/hub_connectivity.go b/common/pkgs/db2/hub_connectivity.go index b9263ec..5fe27e7 100644 --- a/common/pkgs/db2/hub_connectivity.go +++ b/common/pkgs/db2/hub_connectivity.go @@ -2,7 +2,7 @@ package db2 import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" "gorm.io/gorm/clause" ) diff --git a/common/pkgs/db2/location.go b/common/pkgs/db2/location.go index 39cd960..49bfc96 100644 --- a/common/pkgs/db2/location.go +++ b/common/pkgs/db2/location.go @@ -3,7 +3,7 @@ package db2 import ( "fmt" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type LocationDB struct { diff --git a/common/pkgs/db2/model/model.go b/common/pkgs/db2/model/model.go index e69a64b..70d7c28 100644 --- a/common/pkgs/db2/model/model.go +++ b/common/pkgs/db2/model/model.go @@ -4,7 +4,7 @@ import ( "time" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) // TODO 可以考虑逐步迁移到cdssdk中。迁移思路：数据对象应该包含的字段都迁移到cdssdk中，内部使用的一些特殊字段则留在这里 diff --git a/common/pkgs/db2/object.go b/common/pkgs/db2/object.go index d97f264..5325ac4 100644 --- a/common/pkgs/db2/object.go +++ b/common/pkgs/db2/object.go @@ -9,9 +9,9 @@ import ( "gorm.io/gorm/clause" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) type ObjectDB struct { diff --git a/common/pkgs/db2/object_access_stat.go b/common/pkgs/db2/object_access_stat.go index 52e79d5..b305582 100644 --- a/common/pkgs/db2/object_access_stat.go +++ b/common/pkgs/db2/object_access_stat.go @@ -2,8 +2,8 @@ package db2 import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/common/pkgs/db2/object_block.go b/common/pkgs/db2/object_block.go index b6e8511..2d2729c 100644 --- a/common/pkgs/db2/object_block.go +++ b/common/pkgs/db2/object_block.go @@ -5,7 +5,7 @@ import ( "strings" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" "gorm.io/gorm/clause" ) diff --git a/common/pkgs/db2/package.go b/common/pkgs/db2/package.go index 8a9046e..c6af549 100644 --- a/common/pkgs/db2/package.go +++ b/common/pkgs/db2/package.go @@ -7,7 +7,7 @@ import ( "gorm.io/gorm" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type PackageDB struct { diff --git a/common/pkgs/db2/package_access_stat.go b/common/pkgs/db2/package_access_stat.go index 5e93bfc..9032645 100644 --- a/common/pkgs/db2/package_access_stat.go +++ b/common/pkgs/db2/package_access_stat.go @@ -2,8 +2,8 @@ package db2 import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/common/pkgs/db2/storage.go b/common/pkgs/db2/storage.go index f2ad541..a558e37 100644 --- a/common/pkgs/db2/storage.go +++ b/common/pkgs/db2/storage.go @@ -5,8 +5,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" "gorm.io/gorm" ) diff --git a/common/pkgs/db2/user_bucket.go b/common/pkgs/db2/user_bucket.go index 4bf8bff..70b1152 100644 --- a/common/pkgs/db2/user_bucket.go +++ b/common/pkgs/db2/user_bucket.go @@ -2,7 +2,7 @@ package db2 import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type UserBucketDB struct { diff --git a/common/pkgs/db2/user_hub.go b/common/pkgs/db2/user_hub.go index 6d94eca..e68a57e 100644 --- a/common/pkgs/db2/user_hub.go +++ b/common/pkgs/db2/user_hub.go @@ -2,7 +2,7 @@ package db2 import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type UserHubDB struct { diff --git a/common/pkgs/db2/user_storage.go b/common/pkgs/db2/user_storage.go index 8ef7d77..2cccdbe 100644 --- a/common/pkgs/db2/user_storage.go +++ b/common/pkgs/db2/user_storage.go @@ -2,7 +2,7 @@ package db2 import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type UserStorageDB struct { diff --git a/common/pkgs/distlock/reqbuilder/metadata.go b/common/pkgs/distlock/reqbuilder/metadata.go index 6c4a4d6..2d5c333 100644 --- a/common/pkgs/distlock/reqbuilder/metadata.go +++ b/common/pkgs/distlock/reqbuilder/metadata.go @@ -1,7 +1,7 @@ package reqbuilder import ( - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" ) type MetadataLockReqBuilder struct { diff --git a/common/pkgs/distlock/reqbuilder/metadata_object.go b/common/pkgs/distlock/reqbuilder/metadata_object.go index ae2c2e9..4767b2d 100644 --- a/common/pkgs/distlock/reqbuilder/metadata_object.go +++ b/common/pkgs/distlock/reqbuilder/metadata_object.go @@ -3,7 +3,7 @@ package reqbuilder import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" ) type MetadataObjectLockReqBuilder struct { diff --git a/common/pkgs/distlock/reqbuilder/shard_store.go b/common/pkgs/distlock/reqbuilder/shard_store.go index 23c631a..756ce34 100644 --- a/common/pkgs/distlock/reqbuilder/shard_store.go +++ b/common/pkgs/distlock/reqbuilder/shard_store.go @@ -5,7 +5,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" ) type ShardStoreLockReqBuilder struct { diff --git a/common/pkgs/distlock/reqbuilder/storage.go b/common/pkgs/distlock/reqbuilder/storage.go index 0e9a219..84086f2 100644 --- a/common/pkgs/distlock/reqbuilder/storage.go +++ b/common/pkgs/distlock/reqbuilder/storage.go @@ -5,7 +5,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" ) type StorageLockReqBuilder struct { diff --git a/common/pkgs/distlock/service.go b/common/pkgs/distlock/service.go index a30a49e..a90c303 100644 --- a/common/pkgs/distlock/service.go +++ b/common/pkgs/distlock/service.go @@ -3,7 +3,7 @@ package distlock import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/trie" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider" ) type Service = distlock.Service diff --git a/common/pkgs/downloader/downloader.go b/common/pkgs/downloader/downloader.go index 90d23e9..4bb59e1 100644 --- a/common/pkgs/downloader/downloader.go +++ b/common/pkgs/downloader/downloader.go @@ -7,12 +7,12 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "gitlink.org.cn/cloudream/common/pkgs/iterator" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" ) const ( diff --git a/common/pkgs/downloader/iterator.go b/common/pkgs/downloader/iterator.go index df66758..2046bd6 100644 --- a/common/pkgs/downloader/iterator.go +++ b/common/pkgs/downloader/iterator.go @@ -12,13 +12,13 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/math2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/storage/common/pkgs/iterator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/storage2/common/pkgs/iterator" ) type downloadStorageInfo struct { diff --git a/common/pkgs/downloader/lrc.go b/common/pkgs/downloader/lrc.go index f38168a..4a1c007 100644 --- a/common/pkgs/downloader/lrc.go +++ b/common/pkgs/downloader/lrc.go @@ -8,7 +8,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/downloader/strategy" + "gitlink.org.cn/cloudream/storage2/common/pkgs/downloader/strategy" ) func (iter *DownloadObjectIterator) downloadLRCReconstruct(req downloadReqeust2, strg strategy.LRCReconstructStrategy) (io.ReadCloser, error) { diff --git a/common/pkgs/downloader/lrc_strip_iterator.go b/common/pkgs/downloader/lrc_strip_iterator.go index 4270ec5..df40aca 100644 --- a/common/pkgs/downloader/lrc_strip_iterator.go +++ b/common/pkgs/downloader/lrc_strip_iterator.go @@ -10,8 +10,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc/parser" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/parser" ) type LRCStripIterator struct { diff --git a/common/pkgs/downloader/strategy/selector.go b/common/pkgs/downloader/strategy/selector.go index a629cb2..8155acf 100644 --- a/common/pkgs/downloader/strategy/selector.go +++ b/common/pkgs/downloader/strategy/selector.go @@ -11,9 +11,9 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage/common/consts" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/metacache" + "gitlink.org.cn/cloudream/storage2/common/consts" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/metacache" ) type Request struct { diff --git a/common/pkgs/downloader/strip_iterator.go b/common/pkgs/downloader/strip_iterator.go index ad7f94c..0ae904f 100644 --- a/common/pkgs/downloader/strip_iterator.go +++ b/common/pkgs/downloader/strip_iterator.go @@ -10,9 +10,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" ) type downloadBlock struct { diff --git a/common/pkgs/ec/block.go b/common/pkgs/ec/block.go index 34a47af..1259376 100644 --- a/common/pkgs/ec/block.go +++ b/common/pkgs/ec/block.go @@ -7,7 +7,7 @@ package ec // "gitlink.org.cn/cloudream/common/pkgs/ipfs" // "gitlink.org.cn/cloudream/common/pkgs/logger" -// stgglb "gitlink.org.cn/cloudream/storage/common/globals" +// stgglb "gitlink.org.cn/cloudream/storage2/common/globals" // ) // type BlockReader struct { diff --git a/common/pkgs/ioswitch2/agent_worker.go b/common/pkgs/ioswitch2/agent_worker.go index f2bcdc4..7ee72ad 100644 --- a/common/pkgs/ioswitch2/agent_worker.go +++ b/common/pkgs/ioswitch2/agent_worker.go @@ -9,8 +9,8 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/serder" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" ) var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo]( diff --git a/common/pkgs/ioswitch2/fromto.go b/common/pkgs/ioswitch2/fromto.go index f153776..e52a820 100644 --- a/common/pkgs/ioswitch2/fromto.go +++ b/common/pkgs/ioswitch2/fromto.go @@ -4,7 +4,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) type From interface { diff --git a/common/pkgs/ioswitch2/http_hub_worker.go b/common/pkgs/ioswitch2/http_hub_worker.go index c1db4f9..c1ad220 100644 --- a/common/pkgs/ioswitch2/http_hub_worker.go +++ b/common/pkgs/ioswitch2/http_hub_worker.go @@ -9,7 +9,7 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/utils/io2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" ) type HttpHubWorker struct { diff --git a/common/pkgs/ioswitch2/ops2/bypass.go b/common/pkgs/ioswitch2/ops2/bypass.go index 496c0db..2abe0a2 100644 --- a/common/pkgs/ioswitch2/ops2/bypass.go +++ b/common/pkgs/ioswitch2/ops2/bypass.go @@ -6,8 +6,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/driver.go b/common/pkgs/ioswitch2/ops2/driver.go index 6e5fd1c..9d89659 100644 --- a/common/pkgs/ioswitch2/ops2/driver.go +++ b/common/pkgs/ioswitch2/ops2/driver.go @@ -4,7 +4,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" ) // TODO 想办法直接使用ops里的Node，而不是重新实现一遍 diff --git a/common/pkgs/ioswitch2/ops2/ec.go b/common/pkgs/ioswitch2/ops2/ec.go index 8fa3bdc..be979c5 100644 --- a/common/pkgs/ioswitch2/ops2/ec.go +++ b/common/pkgs/ioswitch2/ops2/ec.go @@ -12,10 +12,10 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sync2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/ec" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ec" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/faas.go b/common/pkgs/ioswitch2/ops2/faas.go index a6c7c63..b4f4f47 100644 --- a/common/pkgs/ioswitch2/ops2/faas.go +++ b/common/pkgs/ioswitch2/ops2/faas.go @@ -7,8 +7,8 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type InternalFaaSGalMultiply struct { diff --git a/common/pkgs/ioswitch2/ops2/multipart.go b/common/pkgs/ioswitch2/ops2/multipart.go index 7a5cd3a..e673a53 100644 --- a/common/pkgs/ioswitch2/ops2/multipart.go +++ b/common/pkgs/ioswitch2/ops2/multipart.go @@ -7,9 +7,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" log "gitlink.org.cn/cloudream/common/pkgs/logger" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/ops.go b/common/pkgs/ioswitch2/ops2/ops.go index ab75df5..993db54 100644 --- a/common/pkgs/ioswitch2/ops2/ops.go +++ b/common/pkgs/ioswitch2/ops2/ops.go @@ -3,7 +3,7 @@ package ops2 import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan/ops" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" ) type GraphNodeBuilder struct { diff --git a/common/pkgs/ioswitch2/ops2/public_store.go b/common/pkgs/ioswitch2/ops2/public_store.go index 8846c97..ac261f2 100644 --- a/common/pkgs/ioswitch2/ops2/public_store.go +++ b/common/pkgs/ioswitch2/ops2/public_store.go @@ -7,9 +7,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/s2s.go b/common/pkgs/ioswitch2/ops2/s2s.go index 3fab454..49be5c4 100644 --- a/common/pkgs/ioswitch2/ops2/s2s.go +++ b/common/pkgs/ioswitch2/ops2/s2s.go @@ -5,9 +5,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/ops2/shard_store.go b/common/pkgs/ioswitch2/ops2/shard_store.go index 5878884..518119f 100644 --- a/common/pkgs/ioswitch2/ops2/shard_store.go +++ b/common/pkgs/ioswitch2/ops2/shard_store.go @@ -10,10 +10,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/io2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitch2/parser/gen/generator.go b/common/pkgs/ioswitch2/parser/gen/generator.go index b9da733..4c566f2 100644 --- a/common/pkgs/ioswitch2/parser/gen/generator.go +++ b/common/pkgs/ioswitch2/parser/gen/generator.go @@ -8,10 +8,10 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) // 检查使用不同编码时参数是否设置到位 diff --git a/common/pkgs/ioswitch2/parser/opt/chunked.go b/common/pkgs/ioswitch2/parser/opt/chunked.go index 05efc7a..06325f9 100644 --- a/common/pkgs/ioswitch2/parser/opt/chunked.go +++ b/common/pkgs/ioswitch2/parser/opt/chunked.go @@ -2,8 +2,8 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" ) // 删除输出流未被使用的Join指令 diff --git a/common/pkgs/ioswitch2/parser/opt/ec.go b/common/pkgs/ioswitch2/parser/opt/ec.go index d477b81..3b3000d 100644 --- a/common/pkgs/ioswitch2/parser/opt/ec.go +++ b/common/pkgs/ioswitch2/parser/opt/ec.go @@ -4,10 +4,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/lo2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" ) // 减少未使用的Multiply指令的输出流。如果减少到0，则删除该指令 diff --git a/common/pkgs/ioswitch2/parser/opt/misc.go b/common/pkgs/ioswitch2/parser/opt/misc.go index c9a8cb6..90726db 100644 --- a/common/pkgs/ioswitch2/parser/opt/misc.go +++ b/common/pkgs/ioswitch2/parser/opt/misc.go @@ -3,8 +3,8 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" ) // 删除未使用的From流，不会删除FromDriver diff --git a/common/pkgs/ioswitch2/parser/opt/multipart.go b/common/pkgs/ioswitch2/parser/opt/multipart.go index 7169b2f..3e7ba9d 100644 --- a/common/pkgs/ioswitch2/parser/opt/multipart.go +++ b/common/pkgs/ioswitch2/parser/opt/multipart.go @@ -3,9 +3,9 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" ) // 将SegmentJoin指令替换成分片上传指令 diff --git a/common/pkgs/ioswitch2/parser/opt/pin.go b/common/pkgs/ioswitch2/parser/opt/pin.go index 066aba9..f580273 100644 --- a/common/pkgs/ioswitch2/parser/opt/pin.go +++ b/common/pkgs/ioswitch2/parser/opt/pin.go @@ -2,7 +2,7 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" ) // 通过流的输入输出位置来确定指令的执行位置。 diff --git a/common/pkgs/ioswitch2/parser/opt/s2s.go b/common/pkgs/ioswitch2/parser/opt/s2s.go index d0bdbdd..ba2e63c 100644 --- a/common/pkgs/ioswitch2/parser/opt/s2s.go +++ b/common/pkgs/ioswitch2/parser/opt/s2s.go @@ -1,10 +1,10 @@ package opt import ( - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" ) // 将直接从一个存储服务传到另一个存储服务的过程换成S2S传输 diff --git a/common/pkgs/ioswitch2/parser/opt/segment.go b/common/pkgs/ioswitch2/parser/opt/segment.go index 79f5d6a..e4e8670 100644 --- a/common/pkgs/ioswitch2/parser/opt/segment.go +++ b/common/pkgs/ioswitch2/parser/opt/segment.go @@ -2,8 +2,8 @@ package opt import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" ) // 删除未使用的SegmentJoin diff --git a/common/pkgs/ioswitch2/parser/parser.go b/common/pkgs/ioswitch2/parser/parser.go index 6796375..5adc636 100644 --- a/common/pkgs/ioswitch2/parser/parser.go +++ b/common/pkgs/ioswitch2/parser/parser.go @@ -3,10 +3,10 @@ package parser import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/gen" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/opt" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser/state" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/gen" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/opt" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser/state" ) func Parse(ft ioswitch2.FromTo, blder *exec.PlanBuilder) error { diff --git a/common/pkgs/ioswitch2/parser/state/state.go b/common/pkgs/ioswitch2/parser/state/state.go index 9b8f483..e5c6244 100644 --- a/common/pkgs/ioswitch2/parser/state/state.go +++ b/common/pkgs/ioswitch2/parser/state/state.go @@ -3,8 +3,8 @@ package state import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" ) type IndexedStream struct { diff --git a/common/pkgs/ioswitch2/plans/complete_multipart.go b/common/pkgs/ioswitch2/plans/complete_multipart.go index 1644a1d..587aa12 100644 --- a/common/pkgs/ioswitch2/plans/complete_multipart.go +++ b/common/pkgs/ioswitch2/plans/complete_multipart.go @@ -3,9 +3,9 @@ package plans import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func CompleteMultipart(blocks []stgmod.ObjectBlock, blockStgs []stgmod.StorageDetail, targetStg stgmod.StorageDetail, shardInfoKey string, blder *exec.PlanBuilder) error { diff --git a/common/pkgs/ioswitch2/plans/utils.go b/common/pkgs/ioswitch2/plans/utils.go index 47e9003..14fffee 100644 --- a/common/pkgs/ioswitch2/plans/utils.go +++ b/common/pkgs/ioswitch2/plans/utils.go @@ -3,7 +3,7 @@ package plans import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" ) func getWorkerInfo(hub cdssdk.Hub) exec.WorkerInfo { diff --git a/common/pkgs/ioswitchlrc/agent_worker.go b/common/pkgs/ioswitchlrc/agent_worker.go index 469fe1a..3d2f30d 100644 --- a/common/pkgs/ioswitchlrc/agent_worker.go +++ b/common/pkgs/ioswitchlrc/agent_worker.go @@ -6,8 +6,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" ) // var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo]( diff --git a/common/pkgs/ioswitchlrc/ops2/ec.go b/common/pkgs/ioswitchlrc/ops2/ec.go index b12b71c..6e2f627 100644 --- a/common/pkgs/ioswitchlrc/ops2/ec.go +++ b/common/pkgs/ioswitchlrc/ops2/ec.go @@ -11,8 +11,8 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/sync2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ec" - "gitlink.org.cn/cloudream/storage/common/pkgs/ec/lrc" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ec" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ec/lrc" ) func init() { diff --git a/common/pkgs/ioswitchlrc/ops2/shard_store.go b/common/pkgs/ioswitchlrc/ops2/shard_store.go index 34c0e33..57b4934 100644 --- a/common/pkgs/ioswitchlrc/ops2/shard_store.go +++ b/common/pkgs/ioswitchlrc/ops2/shard_store.go @@ -10,9 +10,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/io2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/ioswitchlrc/parser/generator.go b/common/pkgs/ioswitchlrc/parser/generator.go index c32867a..30b167e 100644 --- a/common/pkgs/ioswitchlrc/parser/generator.go +++ b/common/pkgs/ioswitchlrc/parser/generator.go @@ -8,8 +8,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/ops2" ) type GenerateContext struct { diff --git a/common/pkgs/ioswitchlrc/parser/passes.go b/common/pkgs/ioswitchlrc/parser/passes.go index d7f3606..48d7344 100644 --- a/common/pkgs/ioswitchlrc/parser/passes.go +++ b/common/pkgs/ioswitchlrc/parser/passes.go @@ -7,9 +7,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) // 计算输入流的打开范围。会把流的范围按条带大小取整 diff --git a/common/pkgs/metacache/connectivity.go b/common/pkgs/metacache/connectivity.go index 7924661..ffdcb26 100644 --- a/common/pkgs/metacache/connectivity.go +++ b/common/pkgs/metacache/connectivity.go @@ -6,8 +6,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (m *MetaCacheHost) AddConnectivity() *Connectivity { diff --git a/common/pkgs/metacache/hubmeta.go b/common/pkgs/metacache/hubmeta.go index e81455c..b9f94b4 100644 --- a/common/pkgs/metacache/hubmeta.go +++ b/common/pkgs/metacache/hubmeta.go @@ -5,8 +5,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (m *MetaCacheHost) AddHubMeta() *HubMeta { diff --git a/common/pkgs/metacache/storagemeta.go b/common/pkgs/metacache/storagemeta.go index 9d1a041..1ad73f0 100644 --- a/common/pkgs/metacache/storagemeta.go +++ b/common/pkgs/metacache/storagemeta.go @@ -5,9 +5,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (m *MetaCacheHost) AddStorageMeta() *StorageMeta { diff --git a/common/pkgs/mq/agent/client.go b/common/pkgs/mq/agent/client.go index 4a84ed7..3a72bf3 100644 --- a/common/pkgs/mq/agent/client.go +++ b/common/pkgs/mq/agent/client.go @@ -5,7 +5,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq" + stgmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" ) type Client struct { diff --git a/common/pkgs/mq/agent/server.go b/common/pkgs/mq/agent/server.go index ec55be5..df39606 100644 --- a/common/pkgs/mq/agent/server.go +++ b/common/pkgs/mq/agent/server.go @@ -4,7 +4,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/sync2" - mymq "gitlink.org.cn/cloudream/storage/common/pkgs/mq" + mymq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" ) type Service interface { diff --git a/common/pkgs/mq/coordinator/bucket.go b/common/pkgs/mq/coordinator/bucket.go index f629144..238eb61 100644 --- a/common/pkgs/mq/coordinator/bucket.go +++ b/common/pkgs/mq/coordinator/bucket.go @@ -3,7 +3,7 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type BucketService interface { diff --git a/common/pkgs/mq/coordinator/client.go b/common/pkgs/mq/coordinator/client.go index ad7c1cb..350e163 100644 --- a/common/pkgs/mq/coordinator/client.go +++ b/common/pkgs/mq/coordinator/client.go @@ -4,7 +4,7 @@ import ( "sync" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq" + stgmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" ) type Client struct { diff --git a/common/pkgs/mq/coordinator/hub.go b/common/pkgs/mq/coordinator/hub.go index bc2cf7b..e8dfe70 100644 --- a/common/pkgs/mq/coordinator/hub.go +++ b/common/pkgs/mq/coordinator/hub.go @@ -3,7 +3,7 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) type HubService interface { diff --git a/common/pkgs/mq/coordinator/object.go b/common/pkgs/mq/coordinator/object.go index 51a800c..9c2fba4 100644 --- a/common/pkgs/mq/coordinator/object.go +++ b/common/pkgs/mq/coordinator/object.go @@ -5,8 +5,8 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type ObjectService interface { diff --git a/common/pkgs/mq/coordinator/package.go b/common/pkgs/mq/coordinator/package.go index 1bbc0b3..f8dada3 100644 --- a/common/pkgs/mq/coordinator/package.go +++ b/common/pkgs/mq/coordinator/package.go @@ -6,7 +6,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type PackageService interface { diff --git a/common/pkgs/mq/coordinator/server.go b/common/pkgs/mq/coordinator/server.go index 1a8faec..933d9c8 100644 --- a/common/pkgs/mq/coordinator/server.go +++ b/common/pkgs/mq/coordinator/server.go @@ -3,7 +3,7 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/utils/sync2" - mymq "gitlink.org.cn/cloudream/storage/common/pkgs/mq" + mymq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" ) // Service 协调端接口 diff --git a/common/pkgs/mq/coordinator/storage.go b/common/pkgs/mq/coordinator/storage.go index 9eff9fc..025a9d8 100644 --- a/common/pkgs/mq/coordinator/storage.go +++ b/common/pkgs/mq/coordinator/storage.go @@ -3,8 +3,8 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" ) type StorageService interface { diff --git a/common/pkgs/mq/coordinator/temp.go b/common/pkgs/mq/coordinator/temp.go index 3dda538..893cb74 100644 --- a/common/pkgs/mq/coordinator/temp.go +++ b/common/pkgs/mq/coordinator/temp.go @@ -3,7 +3,7 @@ package coordinator import ( "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) // 删除Object diff --git a/common/pkgs/mq/scanner/client.go b/common/pkgs/mq/scanner/client.go index 0970d53..58dc6d0 100644 --- a/common/pkgs/mq/scanner/client.go +++ b/common/pkgs/mq/scanner/client.go @@ -4,7 +4,7 @@ import ( "sync" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq" + stgmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" ) type Client struct { diff --git a/common/pkgs/mq/scanner/event.go b/common/pkgs/mq/scanner/event.go index bc1238a..88997bb 100644 --- a/common/pkgs/mq/scanner/event.go +++ b/common/pkgs/mq/scanner/event.go @@ -2,7 +2,7 @@ package scanner import ( "gitlink.org.cn/cloudream/common/pkgs/mq" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" ) type EventService interface { diff --git a/common/pkgs/mq/scanner/server.go b/common/pkgs/mq/scanner/server.go index 2ca0c64..df9e940 100644 --- a/common/pkgs/mq/scanner/server.go +++ b/common/pkgs/mq/scanner/server.go @@ -3,7 +3,7 @@ package scanner import ( "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/utils/sync2" - mymq "gitlink.org.cn/cloudream/storage/common/pkgs/mq" + mymq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq" ) // Service 协调端接口 diff --git a/common/pkgs/storage/agtpool/pool.go b/common/pkgs/storage/agtpool/pool.go index 69ed71e..0de6f27 100644 --- a/common/pkgs/storage/agtpool/pool.go +++ b/common/pkgs/storage/agtpool/pool.go @@ -5,9 +5,9 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/async" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type storage struct { diff --git a/common/pkgs/storage/all.go b/common/pkgs/storage/all.go index 8220709..7cb77db 100644 --- a/common/pkgs/storage/all.go +++ b/common/pkgs/storage/all.go @@ -2,8 +2,8 @@ package storage import ( // !!! 需要导入所有存储服务的包 !!! - _ "gitlink.org.cn/cloudream/storage/common/pkgs/storage/efile" - _ "gitlink.org.cn/cloudream/storage/common/pkgs/storage/local" - _ "gitlink.org.cn/cloudream/storage/common/pkgs/storage/mashup" - _ "gitlink.org.cn/cloudream/storage/common/pkgs/storage/obs" + _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/efile" + _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/local" + _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/mashup" + _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/obs" ) diff --git a/common/pkgs/storage/efile/ec_multiplier.go b/common/pkgs/storage/efile/ec_multiplier.go index 1ccc052..79588c3 100644 --- a/common/pkgs/storage/efile/ec_multiplier.go +++ b/common/pkgs/storage/efile/ec_multiplier.go @@ -10,7 +10,7 @@ import ( "gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/os2" "gitlink.org.cn/cloudream/common/utils/serder" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type ECMultiplier struct { diff --git a/common/pkgs/storage/efile/efile.go b/common/pkgs/storage/efile/efile.go index 851afcd..b81bcf6 100644 --- a/common/pkgs/storage/efile/efile.go +++ b/common/pkgs/storage/efile/efile.go @@ -9,10 +9,10 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/serder" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/utils" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" ) func init() { diff --git a/common/pkgs/storage/factory/factory.go b/common/pkgs/storage/factory/factory.go index 5b75890..4074ffb 100644 --- a/common/pkgs/storage/factory/factory.go +++ b/common/pkgs/storage/factory/factory.go @@ -3,10 +3,10 @@ package factory import ( "reflect" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - _ "gitlink.org.cn/cloudream/storage/common/pkgs/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + _ "gitlink.org.cn/cloudream/storage2/common/pkgs/storage" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) // 此函数永远不会返回nil。如果找不到对应的Builder，则会返回EmptyBuilder， diff --git a/common/pkgs/storage/factory/reg/reg.go b/common/pkgs/storage/factory/reg/reg.go index ef86de5..0b43a59 100644 --- a/common/pkgs/storage/factory/reg/reg.go +++ b/common/pkgs/storage/factory/reg/reg.go @@ -5,8 +5,8 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/reflect2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type BuilderCtor func(detail stgmod.StorageDetail) types.StorageBuilder diff --git a/common/pkgs/storage/local/agent.go b/common/pkgs/storage/local/agent.go index ab5f252..3289c3f 100644 --- a/common/pkgs/storage/local/agent.go +++ b/common/pkgs/storage/local/agent.go @@ -1,8 +1,8 @@ package local import ( - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type agent struct { diff --git a/common/pkgs/storage/local/local.go b/common/pkgs/storage/local/local.go index e1a81d7..368bf28 100644 --- a/common/pkgs/storage/local/local.go +++ b/common/pkgs/storage/local/local.go @@ -4,10 +4,10 @@ import ( "fmt" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/utils" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" ) func init() { diff --git a/common/pkgs/storage/local/multipart_upload.go b/common/pkgs/storage/local/multipart_upload.go index 78486e7..b2fce0f 100644 --- a/common/pkgs/storage/local/multipart_upload.go +++ b/common/pkgs/storage/local/multipart_upload.go @@ -13,7 +13,7 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/os2" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type Multiparter struct { diff --git a/common/pkgs/storage/local/public_store.go b/common/pkgs/storage/local/public_store.go index 1d5fab3..57b6ae0 100644 --- a/common/pkgs/storage/local/public_store.go +++ b/common/pkgs/storage/local/public_store.go @@ -8,7 +8,7 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type PublicStoreDesc struct { diff --git a/common/pkgs/storage/local/s2s.go b/common/pkgs/storage/local/s2s.go index c7b8126..445c86a 100644 --- a/common/pkgs/storage/local/s2s.go +++ b/common/pkgs/storage/local/s2s.go @@ -9,7 +9,7 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/os2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) type S2STransfer struct { diff --git a/common/pkgs/storage/local/shard_store.go b/common/pkgs/storage/local/shard_store.go index 88d8208..287185c 100644 --- a/common/pkgs/storage/local/shard_store.go +++ b/common/pkgs/storage/local/shard_store.go @@ -14,8 +14,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/io2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) const ( diff --git a/common/pkgs/storage/mashup/mashup.go b/common/pkgs/storage/mashup/mashup.go index 8a48464..59dca30 100644 --- a/common/pkgs/storage/mashup/mashup.go +++ b/common/pkgs/storage/mashup/mashup.go @@ -2,9 +2,9 @@ package mashup import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) func init() { diff --git a/common/pkgs/storage/obs/agent.go b/common/pkgs/storage/obs/agent.go index df2ad78..48f9249 100644 --- a/common/pkgs/storage/obs/agent.go +++ b/common/pkgs/storage/obs/agent.go @@ -1,8 +1,8 @@ package obs import ( - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type Agent struct { diff --git a/common/pkgs/storage/obs/obs.go b/common/pkgs/storage/obs/obs.go index f137d02..1d3488d 100644 --- a/common/pkgs/storage/obs/obs.go +++ b/common/pkgs/storage/obs/obs.go @@ -7,11 +7,11 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/s3" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory/reg" - s3stg "gitlink.org.cn/cloudream/storage/common/pkgs/storage/s3" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/utils" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" + s3stg "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/s3" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" ) func init() { diff --git a/common/pkgs/storage/obs/obs_test.go b/common/pkgs/storage/obs/obs_test.go index d874473..9a2497a 100644 --- a/common/pkgs/storage/obs/obs_test.go +++ b/common/pkgs/storage/obs/obs_test.go @@ -6,7 +6,7 @@ import ( . "github.com/smartystreets/goconvey/convey" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) func Test_S2S(t *testing.T) { diff --git a/common/pkgs/storage/obs/s2s.go b/common/pkgs/storage/obs/s2s.go index 5e1f40f..4a586eb 100644 --- a/common/pkgs/storage/obs/s2s.go +++ b/common/pkgs/storage/obs/s2s.go @@ -12,8 +12,8 @@ import ( omsregion "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/oms/v2/region" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/os2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/s3" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/s3" ) type S2STransfer struct { diff --git a/common/pkgs/storage/obs/shard_store.go b/common/pkgs/storage/obs/shard_store.go index 25317a0..c117bfa 100644 --- a/common/pkgs/storage/obs/shard_store.go +++ b/common/pkgs/storage/obs/shard_store.go @@ -3,9 +3,9 @@ package obs import ( "github.com/huaweicloud/huaweicloud-sdk-go-obs/obs" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/s3" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/s3" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type ShardStoreDesc struct { diff --git a/common/pkgs/storage/s3/agent.go b/common/pkgs/storage/s3/agent.go index 35c561b..cb085c5 100644 --- a/common/pkgs/storage/s3/agent.go +++ b/common/pkgs/storage/s3/agent.go @@ -1,8 +1,8 @@ package s3 import ( - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type Agent struct { diff --git a/common/pkgs/storage/s3/multipart_upload.go b/common/pkgs/storage/s3/multipart_upload.go index d5a8a4d..38bbd38 100644 --- a/common/pkgs/storage/s3/multipart_upload.go +++ b/common/pkgs/storage/s3/multipart_upload.go @@ -13,8 +13,8 @@ import ( "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/os2" "gitlink.org.cn/cloudream/common/utils/sort2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type Multiparter struct { diff --git a/common/pkgs/storage/s3/public_store.go b/common/pkgs/storage/s3/public_store.go index 2ba5641..ca2b35a 100644 --- a/common/pkgs/storage/s3/public_store.go +++ b/common/pkgs/storage/s3/public_store.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) type PublicStoreDesc struct { diff --git a/common/pkgs/storage/s3/s3.go b/common/pkgs/storage/s3/s3.go index 8fa563d..9022c49 100644 --- a/common/pkgs/storage/s3/s3.go +++ b/common/pkgs/storage/s3/s3.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/s3" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory/reg" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/utils" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory/reg" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/utils" ) func init() { diff --git a/common/pkgs/storage/s3/shard_store.go b/common/pkgs/storage/s3/shard_store.go index e2e0a5e..a51495e 100644 --- a/common/pkgs/storage/s3/shard_store.go +++ b/common/pkgs/storage/s3/shard_store.go @@ -17,9 +17,9 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/os2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types" ) const ( diff --git a/common/pkgs/storage/types/empty_builder.go b/common/pkgs/storage/types/empty_builder.go index 667af24..2079d6d 100644 --- a/common/pkgs/storage/types/empty_builder.go +++ b/common/pkgs/storage/types/empty_builder.go @@ -3,7 +3,7 @@ package types import ( "fmt" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) type EmptyBuilder struct { diff --git a/common/pkgs/storage/types/s2s.go b/common/pkgs/storage/types/s2s.go index fccb1f2..ef4748b 100644 --- a/common/pkgs/storage/types/s2s.go +++ b/common/pkgs/storage/types/s2s.go @@ -3,7 +3,7 @@ package types import ( "context" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) type S2STransfer interface { diff --git a/common/pkgs/storage/types/types.go b/common/pkgs/storage/types/types.go index e74a1af..2786796 100644 --- a/common/pkgs/storage/types/types.go +++ b/common/pkgs/storage/types/types.go @@ -4,7 +4,7 @@ import ( "errors" "gitlink.org.cn/cloudream/common/pkgs/async" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) var ErrStorageNotFound = errors.New("storage not found") diff --git a/common/pkgs/storage/utils/utils.go b/common/pkgs/storage/utils/utils.go index df1ecf5..13a100b 100644 --- a/common/pkgs/storage/utils/utils.go +++ b/common/pkgs/storage/utils/utils.go @@ -5,7 +5,7 @@ import ( "path/filepath" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) func MakeLoadedPackagePath(userID cdssdk.UserID, packageID cdssdk.PackageID) string { diff --git a/common/pkgs/sysevent/publisher.go b/common/pkgs/sysevent/publisher.go index bb95065..3c3a5e6 100644 --- a/common/pkgs/sysevent/publisher.go +++ b/common/pkgs/sysevent/publisher.go @@ -7,7 +7,7 @@ import ( "github.com/streadway/amqp" "gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/utils/serder" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) type PublisherEvent interface{} diff --git a/common/pkgs/sysevent/sysevent.go b/common/pkgs/sysevent/sysevent.go index 00feb1f..4c9ef00 100644 --- a/common/pkgs/sysevent/sysevent.go +++ b/common/pkgs/sysevent/sysevent.go @@ -1,7 +1,7 @@ package sysevent import ( - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) const ( diff --git a/common/pkgs/uploader/create_load.go b/common/pkgs/uploader/create_load.go index 1bc7fc7..3121260 100644 --- a/common/pkgs/uploader/create_load.go +++ b/common/pkgs/uploader/create_load.go @@ -10,13 +10,13 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) type CreateLoadUploader struct { diff --git a/common/pkgs/uploader/update.go b/common/pkgs/uploader/update.go index d0078ad..4d628b7 100644 --- a/common/pkgs/uploader/update.go +++ b/common/pkgs/uploader/update.go @@ -11,13 +11,13 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) type UpdateUploader struct { diff --git a/common/pkgs/uploader/uploader.go b/common/pkgs/uploader/uploader.go index b98a05b..c484727 100644 --- a/common/pkgs/uploader/uploader.go +++ b/common/pkgs/uploader/uploader.go @@ -12,18 +12,18 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/sort2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/connectivity" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/storage/common/pkgs/metacache" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/factory" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/storage2/common/pkgs/metacache" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory" ) type Uploader struct { diff --git a/coordinator/internal/cmd/migrate.go b/coordinator/internal/cmd/migrate.go index a73b856..4cd89ab 100644 --- a/coordinator/internal/cmd/migrate.go +++ b/coordinator/internal/cmd/migrate.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" - "gitlink.org.cn/cloudream/storage/coordinator/internal/config" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/coordinator/internal/config" "gorm.io/driver/mysql" "gorm.io/gorm" ) diff --git a/coordinator/internal/cmd/serve.go b/coordinator/internal/cmd/serve.go index 664dfdf..fbb33e6 100644 --- a/coordinator/internal/cmd/serve.go +++ b/coordinator/internal/cmd/serve.go @@ -7,12 +7,12 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gitlink.org.cn/cloudream/storage/coordinator/internal/config" - mymq "gitlink.org.cn/cloudream/storage/coordinator/internal/mq" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/storage2/coordinator/internal/config" + mymq "gitlink.org.cn/cloudream/storage2/coordinator/internal/mq" ) func serve(configPath string) { diff --git a/coordinator/internal/config/config.go b/coordinator/internal/config/config.go index 76789e7..4197dae 100644 --- a/coordinator/internal/config/config.go +++ b/coordinator/internal/config/config.go @@ -4,7 +4,7 @@ import ( log "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" c "gitlink.org.cn/cloudream/common/utils/config" - db "gitlink.org.cn/cloudream/storage/common/pkgs/db2/config" + db "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/config" ) type Config struct { diff --git a/coordinator/internal/mq/bucket.go b/coordinator/internal/mq/bucket.go index 12f3c91..a2f13ca 100644 --- a/coordinator/internal/mq/bucket.go +++ b/coordinator/internal/mq/bucket.go @@ -5,16 +5,16 @@ import ( "fmt" "time" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gorm.io/gorm" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) GetBucket(userID cdssdk.UserID, bucketID cdssdk.BucketID) (model.Bucket, error) { diff --git a/coordinator/internal/mq/cache.go b/coordinator/internal/mq/cache.go index 50af64f..dc7db2b 100644 --- a/coordinator/internal/mq/cache.go +++ b/coordinator/internal/mq/cache.go @@ -3,12 +3,12 @@ package mq import ( "fmt" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) CachePackageMoved(msg *coormq.CachePackageMoved) (*coormq.CachePackageMovedResp, *mq.CodeMessage) { diff --git a/coordinator/internal/mq/hub.go b/coordinator/internal/mq/hub.go index 59f49a4..217d82c 100644 --- a/coordinator/internal/mq/hub.go +++ b/coordinator/internal/mq/hub.go @@ -3,14 +3,14 @@ package mq import ( "fmt" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) GetHubConfig(msg *coormq.GetHubConfig) (*coormq.GetHubConfigResp, *mq.CodeMessage) { diff --git a/coordinator/internal/mq/object.go b/coordinator/internal/mq/object.go index e41a0eb..d9ee1c2 100644 --- a/coordinator/internal/mq/object.go +++ b/coordinator/internal/mq/object.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2/model" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model" "gorm.io/gorm" "github.com/samber/lo" @@ -16,8 +16,8 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/utils/sort2" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) GetObjects(msg *coormq.GetObjects) (*coormq.GetObjectsResp, *mq.CodeMessage) { diff --git a/coordinator/internal/mq/package.go b/coordinator/internal/mq/package.go index f285d26..6779705 100644 --- a/coordinator/internal/mq/package.go +++ b/coordinator/internal/mq/package.go @@ -5,15 +5,15 @@ import ( "fmt" "sort" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gorm.io/gorm" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) GetPackage(msg *coormq.GetPackage) (*coormq.GetPackageResp, *mq.CodeMessage) { diff --git a/coordinator/internal/mq/service.go b/coordinator/internal/mq/service.go index d6f2481..8f65b12 100644 --- a/coordinator/internal/mq/service.go +++ b/coordinator/internal/mq/service.go @@ -1,8 +1,8 @@ package mq import ( - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" ) type Service struct { diff --git a/coordinator/internal/mq/storage.go b/coordinator/internal/mq/storage.go index fb61606..06b15bc 100644 --- a/coordinator/internal/mq/storage.go +++ b/coordinator/internal/mq/storage.go @@ -11,9 +11,9 @@ import ( "gorm.io/gorm" "gitlink.org.cn/cloudream/common/pkgs/mq" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) GetStorage(msg *coormq.GetStorage) (*coormq.GetStorageResp, *mq.CodeMessage) { diff --git a/coordinator/internal/mq/temp.go b/coordinator/internal/mq/temp.go index 513a536..b1f565b 100644 --- a/coordinator/internal/mq/temp.go +++ b/coordinator/internal/mq/temp.go @@ -3,14 +3,14 @@ package mq import ( "fmt" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" ) func (svc *Service) GetDatabaseAll(msg *coormq.GetDatabaseAll) (*coormq.GetDatabaseAllResp, *mq.CodeMessage) { diff --git a/coordinator/internal/mq/user.go b/coordinator/internal/mq/user.go index 24e8ecf..1cfad67 100644 --- a/coordinator/internal/mq/user.go +++ b/coordinator/internal/mq/user.go @@ -8,8 +8,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" "gorm.io/gorm" ) diff --git a/coordinator/internal/mq/utils.go b/coordinator/internal/mq/utils.go index 6b68c28..d1c3971 100644 --- a/coordinator/internal/mq/utils.go +++ b/coordinator/internal/mq/utils.go @@ -2,7 +2,7 @@ package mq import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" ) func getBlockTypeFromRed(red cdssdk.Redundancy) string { diff --git a/coordinator/main.go b/coordinator/main.go index 212b22e..55895be 100644 --- a/coordinator/main.go +++ b/coordinator/main.go @@ -1,7 +1,7 @@ package main import ( - "gitlink.org.cn/cloudream/storage/coordinator/internal/cmd" + "gitlink.org.cn/cloudream/storage2/coordinator/internal/cmd" ) func main() { diff --git a/datamap/.env b/datamap/.env deleted file mode 100644 index 12a1727..0000000 --- a/datamap/.env +++ /dev/null @@ -1,15 +0,0 @@ -# 数据库配置 -DB_HOST=175.178.223.172 -DB_PORT=3306 -DB_USER=root -DB_PASSWORD= -DB_NAME=storage_datamap - -# RabbitMQ 配置 -RABBITMQ_HOST=175.178.223.172 -RABBITMQ_PORT=5672 -RABBITMQ_USER=guest -RABBITMQ_PASSWORD= - -# 服务配置 -SERVER_PORT=8080 \ No newline at end of file diff --git a/datamap/internal/config/config.go b/datamap/internal/config/config.go deleted file mode 100644 index 069d877..0000000 --- a/datamap/internal/config/config.go +++ /dev/null @@ -1,54 +0,0 @@ -package config - -import ( - "github.com/spf13/viper" -) - -type Config struct { - Database DatabaseConfig - RabbitMQ RabbitMQConfig - Server ServerConfig -} - -type DatabaseConfig struct { - Host string - Port string - User string - Password string - DBName string -} - -type RabbitMQConfig struct { - Host string - Port string - User string - Password string -} - -type ServerConfig struct { - Port string -} - -func LoadConfig() *Config { - viper.SetConfigFile("C:\\Users\\Administrator\\workspace\\workspace\\storage\\datamap\\.env") - viper.ReadInConfig() - - return &Config{ - Database: DatabaseConfig{ - Host: viper.GetString("DB_HOST"), - Port: viper.GetString("DB_PORT"), - User: viper.GetString("DB_USER"), - Password: viper.GetString("DB_PASSWORD"), - DBName: viper.GetString("DB_NAME"), - }, - RabbitMQ: RabbitMQConfig{ - Host: viper.GetString("RABBITMQ_HOST"), - Port: viper.GetString("RABBITMQ_PORT"), - User: viper.GetString("RABBITMQ_USER"), - Password: viper.GetString("RABBITMQ_PASSWORD"), - }, - Server: ServerConfig{ - Port: viper.GetString("SERVER_PORT"), - }, - } -} diff --git a/datamap/internal/db/db.go b/datamap/internal/db/db.go deleted file mode 100644 index 4f2d1d5..0000000 --- a/datamap/internal/db/db.go +++ /dev/null @@ -1,32 +0,0 @@ -package db - -import ( - "fmt" - "gitlink.org.cn/cloudream/storage/datamap/internal/config" - "gorm.io/driver/mysql" - "gorm.io/gorm" - "gorm.io/gorm/schema" -) - -func InitDB(cfg config.DatabaseConfig) (*gorm.DB, error) { - dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Local", - cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.DBName) - db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{ - NamingStrategy: schema.NamingStrategy{ - SingularTable: true, // 禁用自动复数化表名 - }, - }) - if err != nil { - return nil, err - } - - //// 自动迁移表结构 - //db.AutoMigrate( - // &models.Hub{}, - // &models.Storage{}, - // &models.HubRequest{}, - // &models.BlockDistribution{}, - //) - - return db, nil -} diff --git a/datamap/internal/handlers/handlers.go b/datamap/internal/handlers/handlers.go deleted file mode 100644 index b206d0a..0000000 --- a/datamap/internal/handlers/handlers.go +++ /dev/null @@ -1,174 +0,0 @@ -package handlers - -import ( - "github.com/gin-gonic/gin" - "gitlink.org.cn/cloudream/storage/datamap/internal/models" - "gorm.io/gorm" - "net/http" - "strconv" -) - -// DB 全局数据库连接实例 -var DB *gorm.DB - -// SetDB 设置数据库连接实例 -func SetDB(db *gorm.DB) { - DB = db -} - -// GetHubInfo 获取 节点交互数据 -func GetHubInfo(c *gin.Context) { - - repoHub := models.NewHubRepository(DB) - repoStorage := models.NewStorageRepository(DB) - repoHubReq := models.NewHubRequestRepository(DB) - - nodes := make([]models.Node, 0) - edges := make([]models.Edge, 0) - - //添加所有节点信息 - hubs, _ := repoHub.GetAllHubs() - storages, _ := repoStorage.GetAllStorages() - for _, hub := range hubs { - node := models.Node{ - ID: "hub" + strconv.FormatInt(int64(hub.HubID), 10), - NodeType: "hub", - Name: hub.Name, - Address: hub.Address, - } - nodes = append(nodes, node) - } - for _, storage := range storages { - node := models.Node{ - ID: "storage" + strconv.FormatInt(int64(storage.StorageID), 10), - NodeType: "storage", - Name: storage.StorageName, - DataCount: storage.DataCount, - NewDataCount: storage.NewDataCount, - Timestamp: storage.Timestamp, - } - nodes = append(nodes, node) - } - - // 添加所有边信息 - hubReqs, _ := repoHubReq.GetAllHubRequests() - for _, hubReq := range hubReqs { - edge := models.Edge{ - SourceType: hubReq.SourceType, - SourceID: hubReq.SourceType + strconv.FormatInt(int64(hubReq.SourceID), 10), - TargetType: hubReq.TargetType, - TargetID: hubReq.TargetType + strconv.FormatInt(int64(hubReq.TargetID), 10), - DataTransferCount: hubReq.DataTransferCount, - RequestCount: hubReq.RequestCount, - FailedRequestCount: hubReq.FailedRequestCount, - AvgTransferCount: hubReq.AvgTransferCount, - MaxTransferCount: hubReq.MaxTransferCount, - MinTransferCount: hubReq.MinTransferCount, - StartTimestamp: hubReq.StartTimestamp, - EndTimestamp: hubReq.EndTimestamp, - } - edges = append(edges, edge) - } - hubRelationship := models.HubRelationship{ - Nodes: nodes, - Edges: edges, - } - c.JSON(http.StatusOK, hubRelationship) -} - -func containsCombo(combos []models.Combo, targetID string, targetComboType string) bool { - for _, combo := range combos { - if combo.ID == targetID && combo.ComboType == targetComboType { - return true - } - } - return false -} - -// GetDataTransfer 数据对象的节点间传输量 -func GetDataTransfer(c *gin.Context) { - - repoObject := models.NewObjectRepository(DB) - repoBlockDistribution := models.NewBlockDistributionRepository(DB) - repoStorageTrans := models.NewStorageTransferCountRepository(DB) - - //首先判断object是否存在 - objectIDStr := c.Param("objectID") - objectID, _ := strconv.ParseInt(objectIDStr, 10, 64) - object, _ := repoObject.GetObjectByID(objectID) - if object == nil { - c.JSON(http.StatusOK, []interface{}{}) - return - } - - nodes := make([]models.DistNode, 0) - combos := make([]models.Combo, 0) - edges := make([]models.DistEdge, 0) - - //根据ObjectID查询出在所有storage中存储的块或副本 - blocks, _ := repoBlockDistribution.GetBlockDistributionByObjectID(objectID) - for _, block := range blocks { - //nodes --------- block - //添加node信息 - node := models.DistNode{ - //block id - ID: strconv.FormatInt(block.BlockID, 10), - //storage id - ComboID: "storage" + strconv.FormatInt(block.StorageID, 10), - //block index - Label: block.Type + strconv.FormatInt(block.Index, 10), - //block type - NodeType: block.Type, - } - nodes = append(nodes, node) - - //combos ------- state or storage - //添加storage combo信息 - if !containsCombo(combos, "storage"+strconv.FormatInt(block.StorageID, 10), "storage") { - combo := models.Combo{ - ID: "storage" + strconv.FormatInt(block.StorageID, 10), - Label: "存储中心" + strconv.FormatInt(block.StorageID, 10), - ParentId: "state" + strconv.Itoa(block.Status), - ComboType: "storage", - } - combos = append(combos, combo) - } - //添加state combo信息 - if !containsCombo(combos, "state"+strconv.Itoa(block.Status), "state") { - var statusStr string - switch block.Status { - case 0: - statusStr = "实时情况" - case 1: - statusStr = block.Timestamp.Format("2006-01-02") + "布局调整后" - case 2: - statusStr = block.Timestamp.Format("2006-01-02") + "布局调整前" - case 3: - statusStr = block.Timestamp.Format("2006-01-02") + "布局调整后" - default: - statusStr = "未知状态" - } - combo := models.Combo{ - ID: "state" + strconv.Itoa(block.Status), - Label: statusStr, - ComboType: "state", - } - combos = append(combos, combo) - } - } - //edges data trans between storage and storage - relations, _ := repoStorageTrans.GetStorageTransferCountByObjectID(objectID) - for _, relation := range relations { - edge := models.DistEdge{ - Source: "storage" + strconv.FormatInt(relation.SourceStorageID, 10), - Target: "storage" + strconv.FormatInt(relation.TargetStorageID, 10), - } - edges = append(edges, edge) - } - result := models.ObjectDistribution{ - Nodes: nodes, - Combos: combos, - Edges: edges, - } - c.JSON(http.StatusOK, result) -} diff --git a/datamap/internal/models/blockdistribution.go b/datamap/internal/models/blockdistribution.go deleted file mode 100644 index 10e0d6e..0000000 --- a/datamap/internal/models/blockdistribution.go +++ /dev/null @@ -1,187 +0,0 @@ -package models - -import ( - "errors" - "log" - "strconv" - "time" - - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gorm.io/gorm" -) - -type BlockDistribution struct { - BlockID int64 `gorm:"column:BlockID; primaryKey; type:bigint; autoIncrement" json:"blockID"` - ObjectID int64 `gorm:"column:ObjectID; type:bigint; not null" json:"objectID"` - Type string `gorm:"column:Type; type:varchar(1024); not null" json:"type"` - Index int64 `gorm:"column:Index; type:bigint; not null" json:"index"` - StorageID int64 `gorm:"column:StorageID; type:bigint; not null" json:"storageID"` - Status int `gorm:"column:Status; type:tinyint; not null" json:"status"` - Timestamp time.Time `gorm:"column:Timestamp; type:datatime; not null" json:"timestamp"` -} - -func (BlockDistribution) TableName() string { - return "blockdistribution" -} - -type BlockDistributionRepository struct { - repo *GormRepository -} - -func NewBlockDistributionRepository(db *gorm.DB) *BlockDistributionRepository { - return &BlockDistributionRepository{repo: NewGormRepository(db)} -} - -func (r *BlockDistributionRepository) CreateBlockDistribution(block *BlockDistribution) error { - return r.repo.Create(block) -} - -func (r *BlockDistributionRepository) UpdateBlockDistribution(block *BlockDistribution) error { - return r.repo.Update(block) -} - -func (r *BlockDistributionRepository) GetAllBlocks() ([]BlockDistribution, error) { - var blocks []BlockDistribution - err := r.repo.GetAll(&blocks) - if err != nil { - return nil, err - } - return blocks, nil -} - -func (r *BlockDistributionRepository) GetBlockDistributionByObjectID(objectID int64) ([]BlockDistribution, error) { - var blocks []BlockDistribution - query := "SELECT * FROM blockdistribution WHERE ObjectID = ?" - err := r.repo.db.Raw(query, objectID).Scan(&blocks).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - return []BlockDistribution{}, errors.New("block not found") - } - return blocks, nil -} - -func (r *BlockDistributionRepository) GetStorageIDsByObjectID(objectID int64) ([]int64, error) { - var storageIDs []int64 - query := "SELECT distinct storageID FROM blockdistribution WHERE ObjectID = ?" - // 通过 ObjectID 查询 - err := r.repo.db.Raw(query, objectID).Scan(&storageIDs).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - return []int64{}, errors.New("block not found") - } - return storageIDs, nil -} - -func (r *BlockDistributionRepository) GetBlockDistributionByIndex(objectID int64, index int64, storageID int64) (BlockDistribution, error) { - var block BlockDistribution - query := "SELECT * FROM blockdistribution WHERE ObjectID = ? AND `Index` = ? AND StorageID = ?" - // 通过 ObjectID 和 Index 联合查询 - err := r.repo.db.Exec(query, objectID, index, storageID).First(&block).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - return BlockDistribution{}, errors.New("block not found") - } - return block, nil -} - -// DeleteBlockDistribution 删除 BlockDistribution 记录 (根据 ObjectID 和 Index) - -func (r *BlockDistributionRepository) DeleteBlockDistribution(objectID int64, index int64, storageID int64) error { - query := "DELETE FROM blockdistribution WHERE ObjectID = ? AND `Index` = ? AND StorageID = ?" - - return r.repo.db.Exec(query, objectID, index, storageID).Error -} - -type BlockDistributionWatcher struct { - Name string -} - -func (w *BlockDistributionWatcher) OnEvent(event sysevent.SysEvent) { - body, ok := event.Body.(*stgmod.BodyBlockDistribution) - if !ok { - return - } - - repoObject := NewObjectRepository(DB) - repoBlock := NewBlockDistributionRepository(DB) - repoStorage := NewStorageTransferCountRepository(DB) - - //更新object表中的状态 - object, err := repoObject.GetObjectByID(int64(body.ObjectID)) - faultTolerance, _ := strconv.ParseFloat(body.FaultTolerance, 64) - redundancy, _ := strconv.ParseFloat(body.Redundancy, 64) - avgAccessCost, _ := strconv.ParseFloat(body.AvgAccessCost, 64) - if errors.Is(err, gorm.ErrRecordNotFound) { - err := repoObject.CreateObject(&Object{ - ObjectID: body.ObjectID, - PackageID: body.PackageID, - Path: body.Path, - Size: body.Size, - FileHash: body.FileHash, - Status: StatusYesterdayAfter, - FaultTolerance: faultTolerance, - Redundancy: redundancy, - AvgAccessCost: avgAccessCost, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error create object: %v", err) - } - } else { - object.Status = StatusYesterdayAfter - err = repoObject.UpdateObject(object) - if err != nil { - log.Printf("Error update object: %v", err) - } - } - - //更新block表中的状态 - for _, blockDist := range body.BlockDistribution { - blockIndex, _ := strconv.ParseInt(blockDist.Index, 10, 64) - blockStorageID, _ := strconv.ParseInt(blockDist.StorageID, 10, 64) - blockDist, err := repoBlock.GetBlockDistributionByIndex(int64(body.ObjectID), blockIndex, blockStorageID) - if errors.Is(err, gorm.ErrRecordNotFound) { - err := repoBlock.CreateBlockDistribution(&BlockDistribution{ - BlockID: blockDist.BlockID, - ObjectID: blockDist.ObjectID, - Type: blockDist.Type, - Index: blockIndex, - StorageID: blockStorageID, - Status: StatusYesterdayAfter, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error create BlockDistribution: %v", err) - } - } else { - err := repoBlock.UpdateBlockDistribution(&BlockDistribution{ - BlockID: blockDist.BlockID, - ObjectID: blockDist.ObjectID, - Type: blockDist.Type, - Index: blockIndex, - StorageID: blockStorageID, - Status: StatusYesterdayAfter, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error update BlockDistribution: %v", err) - } - } - } - //在storageTransferCount表中添加记录 - for _, dataTransfer := range body.DataTransfers { - sourceStorageID, _ := strconv.ParseInt(string(dataTransfer.SourceStorageID), 10, 64) - targetStorageID, _ := strconv.ParseInt(string(dataTransfer.TargetStorageID), 10, 64) - dataTransferCount, _ := strconv.ParseInt(dataTransfer.TransferBytes, 10, 64) - - err := repoStorage.CreateStorageTransferCount(&StorageTransferCount{ - ObjectID: int64(body.ObjectID), - Status: StatusTodayBeforeYesterday, - SourceStorageID: sourceStorageID, - TargetStorageID: targetStorageID, - DataTransferCount: dataTransferCount, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error create StorageTransferCount : %v", err) - } - } -} diff --git a/datamap/internal/models/blocktransfer.go b/datamap/internal/models/blocktransfer.go deleted file mode 100644 index 6b40071..0000000 --- a/datamap/internal/models/blocktransfer.go +++ /dev/null @@ -1,234 +0,0 @@ -package models - -import ( - "errors" - "log" - "strconv" - "time" - - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gorm.io/gorm" -) - -type StorageTransferCount struct { - RelationshipID int64 `gorm:"column:RelationshipID; primaryKey; type:bigint; autoIncrement" json:"relationshipID"` - ObjectID int64 `gorm:"column:ObjectID; type:bigint; not null" json:"objectID"` - Status int64 `gorm:"column:Status; type:bigint; not null" json:"status"` // 连线左侧的状态 - SourceStorageID int64 `gorm:"column:SourceStorageID; type:bigint; not null" json:"sourceStorageID"` // 源存储节点 ID - TargetStorageID int64 `gorm:"column:TargetStorageID; type:bigint; not null" json:"targetStorageID"` // 目标存储节点 ID - DataTransferCount int64 `gorm:"column:DataTransferCount; type:bigint; not null" json:"dataTransferCount"` // 数据传输量 - Timestamp time.Time `gorm:"column:Timestamp; type:datatime; not null" json:"timestamp"` // 变化结束时间戳 -} - -func (StorageTransferCount) TableName() string { - return "storagetransfercount" -} - -type StorageTransferCountRepository struct { - repo *GormRepository -} - -func NewStorageTransferCountRepository(db *gorm.DB) *StorageTransferCountRepository { - return &StorageTransferCountRepository{repo: NewGormRepository(db)} -} - -func (r *StorageTransferCountRepository) CreateStorageTransferCount(storageTransferCount *StorageTransferCount) error { - return r.repo.Create(storageTransferCount) -} - -func (r *StorageTransferCountRepository) UpdateStorageTransferCount(storageTransferCount *StorageTransferCount) error { - return r.repo.Update(storageTransferCount) -} - -func (r *StorageTransferCountRepository) GetStorageTransferCountByID(id int) (*StorageTransferCount, error) { - var storageTransferCount StorageTransferCount - err := r.repo.GetByID(uint(id), &storageTransferCount) - if err != nil { - return nil, err - } - return &storageTransferCount, nil -} - -func (r *StorageTransferCountRepository) GetStorageTransferCountByObjectID(objectID int64) ([]StorageTransferCount, error) { - var storageTransferCounts []StorageTransferCount - query := "SELECT * FROM storagetransfercount WHERE ObjectID = ?" - err := r.repo.db.Raw(query, objectID).Scan(&storageTransferCounts).Error - if err != nil { - return nil, err - } - return storageTransferCounts, nil -} - -func (r *StorageTransferCountRepository) GetAllStorageTransferCounts() ([]StorageTransferCount, error) { - var storageTransferCounts []StorageTransferCount - err := r.repo.GetAll(&storageTransferCounts) - if err != nil { - return nil, err - } - return storageTransferCounts, nil -} - -type BlockTransferWatcher struct { - Name string -} - -func (w *BlockTransferWatcher) OnEvent(event sysevent.SysEvent) { - body, ok := event.Body.(*stgmod.BodyBlockTransfer) - if !ok { - return - } - - repoDist := NewBlockDistributionRepository(DB) - repoStorage := NewStorageRepository(DB) - repoStorageTrans := NewStorageTransferCountRepository(DB) - repoObject := NewObjectRepository(DB) - - for _, change := range body.BlockChanges { - - objectID, _ := strconv.ParseInt(string(body.ObjectID), 10, 64) - object, _ := repoObject.GetObjectByID(objectID) - // index, _ := strconv.ParseInt(change.Index, 10, 64) - // sourceStorageID, _ := strconv.ParseInt(string(change.SourceStorageID), 10, 64) - // targetStorageID, _ := strconv.ParseInt(string(change.TargetStorageID), 10, 64) - // newDataCount, _ := strconv.ParseInt(change.DataTransferCount, 10, 64) - - switch change := change.(type) { - case *stgmod.BlockChangeClone: //拷贝 - // TODO 从change中获取index, sourceStorageID, targetStorageID, newDataCount，下同 - - //查询出存储在数据库中的BlockDistribution信息 - blockSource, errSource := repoDist.GetBlockDistributionByIndex(objectID, index, sourceStorageID) - //没有记录就将source和target的信息都保存到库中 - if errors.Is(errSource, gorm.ErrRecordNotFound) { - err := repoDist.CreateBlockDistribution(&BlockDistribution{ - ObjectID: objectID, - Type: change.BlockType, - Index: index, - StorageID: sourceStorageID, - Status: StatusNow, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error create source blockdistribution: %v", err) - } - } else { - //有数据则新增一条storageID为targetStorageID的记录,同时更新状态 - err := repoDist.CreateBlockDistribution(&BlockDistribution{ - ObjectID: blockSource.ObjectID, - Type: change.BlockType, - Index: index, - StorageID: targetStorageID, - Status: StatusNow, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error update blockdistribution: %v", err) - } - //复制完成之后增加的dataCount要加到targetStorage的记录中 - storageOld, err := repoStorage.GetStorageByID(targetStorageID) - if errors.Is(err, gorm.ErrRecordNotFound) { - err = repoStorage.CreateStorage(&Storage{ - StorageID: cdssdk.StorageID(targetStorageID), - DataCount: newDataCount, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error increase datacount in targetstorage: %v", err) - } - } else { - err = repoStorage.UpdateStorage(&Storage{ - StorageID: cdssdk.StorageID(targetStorageID), - DataCount: storageOld.DataCount + newDataCount, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error increase datacount in targetstorage: %v", err) - } - } - - } - //新增记录到storageTransferCount表中 - err := repoStorageTrans.CreateStorageTransferCount(&StorageTransferCount{ - ObjectID: objectID, - Status: int64(blockSource.Status), - SourceStorageID: sourceStorageID, - TargetStorageID: targetStorageID, - DataTransferCount: newDataCount, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error create StorageTransferCount : %v", err) - } - case *stgmod.BlockChangeEnDecode: //编解码 - //删除所有的sourceBlock - for _, sourceBlock := range change.SourceBlocks { - sourceBlockIndex, _ := strconv.ParseInt(sourceBlock.Index, 10, 64) - err := repoDist.DeleteBlockDistribution(objectID, sourceBlockIndex, sourceStorageID) - if err != nil { - log.Printf("Error delete blockdistribution: %v", err) - } - } - //插入所有的targetBlock - for _, targetBlock := range change.TargetBlocks { - storageID, _ := strconv.ParseInt(string(targetBlock.StorageID), 10, 64) - err := repoDist.CreateBlockDistribution(&BlockDistribution{ - ObjectID: objectID, - Type: targetBlock.BlockType, - Index: index, - //直接保存到目标中心 - StorageID: storageID, - Status: StatusNow, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error create blockdistribution: %v", err) - } - } - //新增记录到storageTransferCount表中 - err := repoStorageTrans.CreateStorageTransferCount(&StorageTransferCount{ - ObjectID: objectID, - Status: int64(object.Status), - SourceStorageID: sourceStorageID, - TargetStorageID: targetStorageID, - DataTransferCount: newDataCount, - Timestamp: time.Now(), - }) - if err != nil { - log.Printf("Error create StorageTransferCount : %v", err) - } - - case *stgmod.BlockChangeDeleted: //删除 - storageID, _ := strconv.ParseInt(string(change.StorageID), 10, 64) - changeIndex, _ := strconv.ParseInt(change.Index, 10, 64) - err := repoDist.DeleteBlockDistribution(objectID, changeIndex, storageID) - if err != nil { - log.Printf("Error delete blockdistribution: %v", err) - } - - // case *stgmod.BlockChangeUpdated: //更新 - // for _, blockUpdate := range change.Blocks { - // //查询出存储在数据库中的BlockDistribution信息 - // blockIndex, _ := strconv.ParseInt(blockUpdate.Index, 10, 64) - // blockOld, err := repoDist.GetBlockDistributionByIndex(objectID, blockIndex, sourceStorageID) - // newStorageID, _ := strconv.ParseInt(string(blockUpdate.StorageID), 10, 64) - // err = repoDist.UpdateBlockDistribution(&BlockDistribution{ - // BlockID: blockOld.BlockID, - // ObjectID: blockOld.ObjectID, - // Type: blockUpdate.BlockType, - // Index: blockIndex, - // StorageID: newStorageID, - // Status: StatusNow, - // Timestamp: time.Now(), - // }) - // if err != nil { - // log.Printf("Error delete blockdistribution: %v", err) - // } - // } - - default: - break - } - } -} diff --git a/datamap/internal/models/hub.go b/datamap/internal/models/hub.go deleted file mode 100644 index 327c22b..0000000 --- a/datamap/internal/models/hub.go +++ /dev/null @@ -1,52 +0,0 @@ -package models - -import ( - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gorm.io/gorm" -) - -type Hub struct { - HubID cdssdk.HubID `gorm:"column:HubID; primaryKey; type:bigint; autoIncrement" json:"hubID"` - Name string `gorm:"column:Name; type:varchar(255); not null" json:"name"` - Address cdssdk.HubAddressInfo `gorm:"column:Address; type:json; " json:"address"` -} - -func (Hub) TableName() string { return "hub" } - -type HubRepository struct { - repo *GormRepository -} - -func NewHubRepository(db *gorm.DB) *HubRepository { - return &HubRepository{repo: NewGormRepository(db)} -} - -func (r *HubRepository) CreateHub(hub *Hub) error { - return r.repo.Create(hub) -} - -func (r *HubRepository) UpdateHub(hub *Hub) error { - return r.repo.Update(hub) -} - -func (r *HubRepository) DeleteHub(hub *Hub) error { - return r.repo.Delete(hub, uint(hub.HubID)) -} - -func (r *HubRepository) GetHubByID(id int) (*Hub, error) { - var hub Hub - err := r.repo.GetByID(uint(id), &hub) - if err != nil { - return nil, err - } - return &hub, nil -} - -func (r *HubRepository) GetAllHubs() ([]Hub, error) { - var hubs []Hub - err := r.repo.GetAll(&hubs) - if err != nil { - return nil, err - } - return hubs, nil -} diff --git a/datamap/internal/models/hubinfo.go b/datamap/internal/models/hubinfo.go deleted file mode 100644 index 423c1e6..0000000 --- a/datamap/internal/models/hubinfo.go +++ /dev/null @@ -1,85 +0,0 @@ -package models - -import ( - "encoding/json" - - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" -) - -// LocalHub 本地结构体，嵌入cdssdk.Hub -type LocalHub struct { - cdssdk.Hub -} - -type ConcreteHubType struct { - Address string -} - -func (c ConcreteHubType) GetStorageType() string { - return c.Address -} - -func (c ConcreteHubType) String() string { - return c.Address -} - -func (s *LocalHub) UnmarshalJSON(data []byte) error { - // 定义一个临时结构体来解析 JSON - type Alias LocalHub - aux := &struct { - Address string `json:"address"` - *Alias - }{ - Alias: (*Alias)(s), - } - - if err := json.Unmarshal(data, &aux); err != nil { - return err - } - - s.Address = ConcreteHubType{Address: aux.Address} - return nil -} - -// 实现 Watcher 接口的结构体 -type HubInfoWatcher struct { - Name string -} - -// 实现 OnEvent 方法 -func (w *HubInfoWatcher) OnEvent(event sysevent.SysEvent) { - - repo := NewHubRepository(DB) - - switch body := event.Body.(type) { - case *stgmod.BodyNewHub: - err := repo.CreateHub(&Hub{ - HubID: body.Info.HubID, - Name: body.Info.Name, - Address: body.Info.Address, - }) - if err != nil { - return - } - - case *stgmod.BodyHubUpdated: - err := repo.UpdateHub(&Hub{ - HubID: body.Info.HubID, - Name: body.Info.Name, - Address: body.Info.Address, - }) - if err != nil { - return - } - - case *stgmod.BodyHubDeleted: - err := repo.DeleteHub(&Hub{ - HubID: body.HubID, - }) - if err != nil { - return - } - } -} diff --git a/datamap/internal/models/hubrequest.go b/datamap/internal/models/hubrequest.go deleted file mode 100644 index 766c085..0000000 --- a/datamap/internal/models/hubrequest.go +++ /dev/null @@ -1,157 +0,0 @@ -package models - -import ( - "fmt" - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gorm.io/gorm" - "log" - "time" -) - -type HubRequest struct { - //todo source和target类型的区分 - RequestID int64 `gorm:"column:RequestID; primaryKey; type:bigint; autoIncrement" json:"RequestID"` - SourceType string `gorm:"column:SourceType; type:varchar(255); not null" json:"sourceType"` - SourceID cdssdk.HubID `gorm:"column:SourceID; type:bigint; not null" json:"sourceID"` - TargetType string `gorm:"column:TargetType; type:varchar(255); not null" json:"targetType"` - TargetID cdssdk.HubID `gorm:"column:TargetID; type:bigint; not null" json:"targetID"` - DataTransferCount int64 `gorm:"column:DataTransferCount; type:bigint; not null" json:"dataTransferCount"` - RequestCount int64 `gorm:"column:RequestCount; type:bigint; not null" json:"requestCount"` - FailedRequestCount int64 `gorm:"column:FailedRequestCount; type:bigint; not null" json:"failedRequestCount"` - AvgTransferCount int64 `gorm:"column:AvgTransferCount; type:bigint; not null" json:"avgTransferCount"` - MaxTransferCount int64 `gorm:"column:MaxTransferCount; type:bigint; not null" json:"maxTransferCount"` - MinTransferCount int64 `gorm:"column:MinTransferCount; type:bigint; not null" json:"minTransferCount"` - StartTimestamp time.Time `gorm:"column:StartTimestamp; type:datatime; not null" json:"startTimestamp"` - EndTimestamp time.Time `gorm:"column:EndTimestamp; type:datatime; not null" json:"endTimestamp"` -} - -func (HubRequest) TableName() string { return "hubrequest" } - -type HubRequestRepository struct { - repo *GormRepository -} - -func NewHubRequestRepository(db *gorm.DB) *HubRequestRepository { - return &HubRequestRepository{repo: NewGormRepository(db)} -} - -func (r *HubRequestRepository) CreateHubRequest(request *HubRequest) error { - return r.repo.Create(request) -} - -func (r *HubRequestRepository) GetHubRequestByHubID(hubId int64) ([]HubRequest, error) { - var hubRequests []HubRequest - query := "SELECT * FROM hubrequest WHERE SourceHubID = ?" - err := r.repo.db.Raw(query, hubId).Scan(&hubRequests).Error - if err != nil { - return nil, err - } - return hubRequests, nil -} - -func (r *HubRequestRepository) GetAllHubRequests() ([]HubRequest, error) { - var hubRequests []HubRequest - err := r.repo.GetAll(&hubRequests) - if err != nil { - return nil, err - } - return hubRequests, nil -} - -type HubTransferStatsWatcher struct { - Name string -} - -func (w *HubTransferStatsWatcher) OnEvent(event sysevent.SysEvent) { - repo := NewHubRequestRepository(DB) - - if event.Category == "hubTransferStats" { - if hubTransferStats, ok := event.Body.(*stgmod.BodyHubTransferStats); ok { - hubRequest := &HubRequest{ - SourceType: "hub", - SourceID: hubTransferStats.SourceHubID, - TargetType: "hub", - TargetID: hubTransferStats.TargetHubID, - DataTransferCount: hubTransferStats.Send.TotalTransfer, - RequestCount: hubTransferStats.Send.RequestCount, - FailedRequestCount: hubTransferStats.Send.FailedRequestCount, - AvgTransferCount: hubTransferStats.Send.AvgTransfer, - MaxTransferCount: hubTransferStats.Send.MaxTransfer, - MinTransferCount: hubTransferStats.Send.MinTransfer, - StartTimestamp: hubTransferStats.StartTimestamp, - EndTimestamp: hubTransferStats.EndTimestamp, - } - - err := repo.CreateHubRequest(hubRequest) - if err != nil { - log.Printf("Error update hubrequest: %v", err) - - } - } else { - fmt.Printf("Watcher %s: Unexpected Body type, expected *BodyStorageInfo, got %T\n", w.Name, event.Body) - } - } else { - fmt.Printf("Watcher %s received an event with category %s\n", w.Name, event.Category) - } -} - -type HubStorageTransferStatsWatcher struct { - Name string -} - -func (w *HubStorageTransferStatsWatcher) OnEvent(event sysevent.SysEvent) { - repo := NewHubRequestRepository(DB) - - if event.Category == "hubStorageTransferStats" { - if hubStorageTransferStats, ok := event.Body.(*stgmod.BodyHubStorageTransferStats); ok { - - hubRequestSend := &HubRequest{ - SourceType: "hub", - SourceID: hubStorageTransferStats.HubID, - TargetType: "storage", - TargetID: cdssdk.HubID(hubStorageTransferStats.StorageID), - DataTransferCount: hubStorageTransferStats.Send.TotalTransfer, - RequestCount: hubStorageTransferStats.Send.RequestCount, - FailedRequestCount: hubStorageTransferStats.Send.FailedRequestCount, - AvgTransferCount: hubStorageTransferStats.Send.AvgTransfer, - MaxTransferCount: hubStorageTransferStats.Send.MaxTransfer, - MinTransferCount: hubStorageTransferStats.Send.MinTransfer, - StartTimestamp: hubStorageTransferStats.StartTimestamp, - EndTimestamp: hubStorageTransferStats.EndTimestamp, - } - - err := repo.CreateHubRequest(hubRequestSend) - if err != nil { - log.Printf("Error update hubrequest: %v", err) - - } - - hubRequestReceive := &HubRequest{ - SourceType: "storage", - SourceID: cdssdk.HubID(hubStorageTransferStats.StorageID), - TargetType: "hub", - TargetID: hubStorageTransferStats.HubID, - DataTransferCount: hubStorageTransferStats.Receive.TotalTransfer, - RequestCount: hubStorageTransferStats.Receive.RequestCount, - FailedRequestCount: hubStorageTransferStats.Receive.FailedRequestCount, - AvgTransferCount: hubStorageTransferStats.Receive.AvgTransfer, - MaxTransferCount: hubStorageTransferStats.Receive.MaxTransfer, - MinTransferCount: hubStorageTransferStats.Receive.MinTransfer, - StartTimestamp: hubStorageTransferStats.StartTimestamp, - EndTimestamp: hubStorageTransferStats.EndTimestamp, - } - - err = repo.CreateHubRequest(hubRequestReceive) - if err != nil { - log.Printf("Error update hubrequest: %v", err) - - } - } else { - fmt.Printf("Watcher %s: Unexpected Body type, expected *BodyStorageInfo, got %T\n", w.Name, event.Body) - } - } else { - fmt.Printf("Watcher %s received an event with category %s\n", w.Name, event.Category) - } -} diff --git a/datamap/internal/models/models.go b/datamap/internal/models/models.go deleted file mode 100644 index 3c2bb51..0000000 --- a/datamap/internal/models/models.go +++ /dev/null @@ -1,124 +0,0 @@ -package models - -import ( - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - "gorm.io/gorm" - "time" -) - -var DB *gorm.DB - -// InitDB 初始化数据库连接 -func InitDB(db *gorm.DB) { - DB = db -} - -type RequestID int64 -type BlockID int64 -type RelationshipID int64 -type Status int - -const ( - StatusNow = 0 //表示当前实时状态 - StatusYesterdayAfter = 1 // 表示前一天调整后的状态 - StatusYesterdayBefore = 2 // 表示前一天调整前的状态 - StatusTodayBeforeYesterday = 3 // 表示前两天调整后的状态 -) - -// 节点间关系图 - -type HubRelationship struct { - Nodes []Node `json:"nodes"` // 节点列表 - Edges []Edge `json:"edges"` // 名称 -} - -type Node struct { - ID string `json:"id"` // 节点/中心ID - NodeType string `json:"nodeType"` //节点类型 storage/hub - Name string `json:"name"` // 节点/中心名称 - Address cdssdk.HubAddressInfo `json:"address"` // 地址 - DataCount int64 `json:"dataCount"` // 总数据量（文件分块数） - NewDataCount int64 `json:"newdataCount"` // 新增数据量（文件分块数） - Timestamp time.Time `json:"timestamp"` // 时间戳 -} - -type Edge struct { - SourceType string `json:"sourceType"` // 源节点类型 - SourceID string `json:"source"` // 源节点ID - TargetType string `json:"targetType"` // 目标节点类型 - TargetID string `json:"target"` // 目标节点ID - DataTransferCount int64 `json:"dataTransferCount"` // 数据传输量 - RequestCount int64 `json:"requestCount"` // 请求数 - FailedRequestCount int64 `json:"failedRequestCount"` // 失败请求数 - AvgTransferCount int64 `json:"avgTransferCount"` // 平均数据传输量 - MaxTransferCount int64 `json:"maxTransferCount"` // 最大数据传输量 - MinTransferCount int64 `json:"minTransferCount"` // 最小数据传输量 - StartTimestamp time.Time `json:"startTimestamp"` // 起始时间戳 - EndTimestamp time.Time `json:"endTimestamp"` // 结束时间戳 -} - -// 对象分布 -type ObjectDistribution struct { - Nodes []DistNode `json:"nodes"` - Combos []Combo `json:"combos"` - Edges []DistEdge `json:"edges"` -} - -type DistNode struct { - ID string `json:"id"` - ComboID string `json:"comboId"` - Label string `json:"label"` - NodeType string `json:"nodeType"` -} - -type Combo struct { - ID string `json:"id"` - Label string `json:"label"` - ParentId string `json:"parentId"` - ComboType string `json:"comboType"` -} - -type DistEdge struct { - Source string `json:"source"` - Target string `json:"target"` -} - -// 对象块分布结构 -//type ObjectDistribution struct { -// ObjectID cdssdk.ObjectID `json:"objectID"` // 对象 ID -// PackageID cdssdk.PackageID `json:"packageID"` // 包 ID -// Path string `json:"path"` // 路径 -// Size int64 `json:"size"` // 大小 -// FileHash string `json:"fileHash"` // 文件哈希 -// States []State `json:"states"` // 各阶段状态信息（只需要传1、2、3阶段） -// Relationships []Relationship `json:"relationships"` // 节点间传输量 -// Timestamp time.Time `json:"timestamp"` // 请求中的时间戳 -//} -// -//type State struct { -// Timestamp time.Time `json:"timestamp"` // 时间戳 -// Status string `json:"status"` // 状态 -// FaultTolerance string `json:"faultTolerance"` // 容灾度（仅布局调整后） -// Redundancy string `json:"redundancy"` // 冗余度（仅布局调整后） -// AvgAccessCost float64 `json:"avgAccessCost"` // 平均访问开销（仅布局调整前） -// BlockDistributions []BlockDist `json:"blockDistributions"` // 块分布情况 -//} -// -//type BlockDist struct { -// StorageID cdssdk.StorageID `json:"storageID"` // 中心ID -// Blocks []Block `json:"blocks"` // 该中心的所有块 -//} -// -//type Block struct { -// Type string `json:"type"` // 块类型 -// Index string `json:"index"` // 块编号 -// ID string `json:"id"` // 块ID -//} -// -//type Relationship struct { -// Status Status `json:"status"` // 连线左侧的状态 -// SourceStorageID string `json:"sourceStorageID"` // 源存储节点 ID -// TargetStorageID string `json:"targetStorageID"` // 目标存储节点 ID -// DataTransferCount string `json:"dataTransferCount"` // 数据传输量 -// Timestamp time.Time `json:"timestamp"` // 变化结束时间戳 -//} diff --git a/datamap/internal/models/object.go b/datamap/internal/models/object.go deleted file mode 100644 index 77d5ac2..0000000 --- a/datamap/internal/models/object.go +++ /dev/null @@ -1,86 +0,0 @@ -package models - -import ( - "fmt" - "time" - - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gorm.io/gorm" -) - -type Object struct { - ObjectID cdssdk.ObjectID `gorm:"column:ObjectID; primaryKey; type:bigint; autoIncrement" json:"objectID"` - PackageID cdssdk.PackageID `gorm:"column:PackageID; type:bigint; not null" json:"packageID"` - Path string `gorm:"column:Path; type:varchar(1024); not null" json:"path"` - Size int64 `gorm:"column:Size; type:bigint; not null" json:"size"` - FileHash string `gorm:"column:FileHash; type:varchar(255); not null" json:"fileHash"` - Status Status `gorm:"column:Status; type:tinyint; not null" json:"status"` - FaultTolerance float64 `gorm:"column:faultTolerance; type:float; not null" json:"faultTolerance"` - Redundancy float64 `gorm:"column:redundancy; type:float; not null" json:"redundancy"` - AvgAccessCost float64 `gorm:"column:avgAccessCost; type:float; not null" json:"avgAccessCost"` - Timestamp time.Time `gorm:"column:Timestamp; type:datatime; not null" json:"timestamp"` -} - -func (Object) TableName() string { - return "object" -} - -// ObjectRepository 块传输记录的 Repository -type ObjectRepository struct { - repo *GormRepository -} - -// NewObjectRepository 创建 ObjectRepository 实例 -func NewObjectRepository(db *gorm.DB) *ObjectRepository { - return &ObjectRepository{repo: NewGormRepository(db)} -} - -// CreateObject 创建块传输记录 -func (r *ObjectRepository) CreateObject(object *Object) error { - return r.repo.Create(object) -} - -// GetObjectByID 查询单个Object -func (r *ObjectRepository) GetObjectByID(objectID int64) (*Object, error) { - var object Object - query := "SELECT * FROM object WHERE ObjectID = ?" - err := r.repo.db.Raw(query, objectID).First(&object).Error - if err != nil { - return nil, err - } - return &object, nil -} - -// UpdateObject 更新块传输记录 -func (r *ObjectRepository) UpdateObject(object *Object) error { - return r.repo.Update(object) -} - -// GetAllObjects 获取所有块传输记录 -func (r *ObjectRepository) GetAllObjects() ([]Object, error) { - var objects []Object - err := r.repo.GetAll(&objects) - if err != nil { - return nil, err - } - return objects, nil -} - -type ObjectWatcher struct { - Name string -} - -func (w *ObjectWatcher) OnEvent(event sysevent.SysEvent) { - - if event.Category == "objectChange" { - if _, ok := event.Body.(*stgmod.BodyNewOrUpdateObject); ok { - - } else { - fmt.Printf("Watcher %s: Unexpected Body type, expected *ObjectInfo, got %T\n", w.Name, event.Body) - } - } else { - fmt.Printf("Watcher %s received an event with category %s\n", w.Name, event.Category) - } -} diff --git a/datamap/internal/models/repository.go b/datamap/internal/models/repository.go deleted file mode 100644 index 4ffce91..0000000 --- a/datamap/internal/models/repository.go +++ /dev/null @@ -1,43 +0,0 @@ -package models - -import ( - "gorm.io/gorm" -) - -// Repository 通用接口 -type Repository interface { - Create(value interface{}) error - Update(value interface{}) error - Delete(value interface{}, id uint) error - GetByID(id uint, out interface{}) error - GetAll(out interface{}) error -} - -// GormRepository 基于 GORM 的通用实现 -type GormRepository struct { - db *gorm.DB -} - -func NewGormRepository(db *gorm.DB) *GormRepository { - return &GormRepository{db: db} -} - -func (r *GormRepository) Create(value interface{}) error { - return r.db.Create(value).Error -} - -func (r *GormRepository) Update(value interface{}) error { - return r.db.Save(value).Error -} - -func (r *GormRepository) Delete(value interface{}, id uint) error { - return r.db.Delete(value, id).Error -} - -func (r *GormRepository) GetByID(id uint, out interface{}) error { - return r.db.First(out, id).Error -} - -func (r *GormRepository) GetAll(out interface{}) error { - return r.db.Find(out).Error -} diff --git a/datamap/internal/models/storageStats.go b/datamap/internal/models/storageStats.go deleted file mode 100644 index 2020946..0000000 --- a/datamap/internal/models/storageStats.go +++ /dev/null @@ -1,51 +0,0 @@ -package models - -import ( - "errors" - "fmt" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gorm.io/gorm" - "log" -) - -type StorageStatsWatcher struct { - Name string -} - -func (w *StorageStatsWatcher) OnEvent(event sysevent.SysEvent) { - repo := NewStorageRepository(DB) - - if event.Category == "storageStats" { - if storageStats, ok := event.Body.(*stgmod.BodyStorageStats); ok { - - storage, err := repo.GetStorageByID(int64(storageStats.StorageID)) - if err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - // 插入新记录 - newStorage := &Storage{ - StorageID: storageStats.StorageID, - DataCount: storageStats.DataCount, - NewDataCount: 0, - } - repo.CreateStorage(newStorage) - } else { - log.Printf("Error querying storage: %v", err) - } - } else { - // 更新记录 - newDataCount := storageStats.DataCount - storage.DataCount - storage.DataCount = storageStats.DataCount - storage.NewDataCount = newDataCount - err := repo.UpdateStorage(storage) - if err != nil { - log.Printf("Error update storage: %v", err) - } - } - } else { - fmt.Printf("Watcher %s: Unexpected Body type, expected *BodyStorageInfo, got %T\n", w.Name, event.Body) - } - } else { - fmt.Printf("Watcher %s received an event with category %s\n", w.Name, event.Category) - } -} diff --git a/datamap/internal/models/storageinfo.go b/datamap/internal/models/storageinfo.go deleted file mode 100644 index 7d13510..0000000 --- a/datamap/internal/models/storageinfo.go +++ /dev/null @@ -1,110 +0,0 @@ -package models - -import ( - "time" - - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gorm.io/gorm" -) - -type Storage struct { - StorageID cdssdk.StorageID `gorm:"column:StorageID; primaryKey; type:bigint; autoIncrement" json:"storageID"` - StorageName string `gorm:"column:StorageName; type:varchar(1024); not null" json:"storageName"` - HubID cdssdk.HubID `gorm:"column:HubID; type:bigint; not null" json:"hubID"` - DataCount int64 `gorm:"column:DataCount; type:bigint; not null" json:"dataCount"` - NewDataCount int64 `gorm:"column:NewDataCount; type:bigint; not null" json:"newDataCount"` - Timestamp time.Time `gorm:"column:Timestamp; type:datatime; not null" json:"timestamp"` -} - -func (Storage) TableName() string { return "storage" } - -type StorageRepository struct { - repo *GormRepository -} - -func NewStorageRepository(db *gorm.DB) *StorageRepository { - return &StorageRepository{repo: NewGormRepository(db)} -} - -func (r *StorageRepository) CreateStorage(storage *Storage) error { - return r.repo.Create(storage) -} - -func (r *StorageRepository) UpdateStorage(storage *Storage) error { - return r.repo.Update(storage) -} -func (r *StorageRepository) DeleteStorage(storage *Storage) error { - return r.repo.Delete(storage, uint(storage.StorageID)) -} - -func (r *StorageRepository) GetStorageByID(id int64) (*Storage, error) { - var storage Storage - err := r.repo.GetByID(uint(id), &storage) - if err != nil { - return nil, err - } - return &storage, nil -} - -func (r *StorageRepository) GetStorageByHubID(hubId int64) (*Storage, error) { - var storage Storage - query := "SELECT * FROM storage WHERE HubID = ?" - err := r.repo.db.Raw(query, hubId).Scan(&storage).Error - if err != nil { - return nil, err - } - return &storage, nil -} - -func (r *StorageRepository) GetAllStorages() ([]Storage, error) { - var storages []Storage - err := r.repo.GetAll(&storages) - if err != nil { - return nil, err - } - return storages, nil -} - -type StorageInfoWatcher struct { - Name string -} - -func (w *StorageInfoWatcher) OnEvent(event sysevent.SysEvent) { - repo := NewStorageRepository(DB) - - switch body := event.Body.(type) { - case *stgmod.BodyNewStorage: - storage := &Storage{ - StorageID: body.Info.StorageID, - StorageName: body.Info.Name, - HubID: body.Info.MasterHub, - Timestamp: time.Now(), - } - err := repo.CreateStorage(storage) - if err != nil { - return - } - - case *stgmod.BodyStorageUpdated: - storage := &Storage{ - StorageID: body.Info.StorageID, - StorageName: body.Info.Name, - HubID: body.Info.MasterHub, - Timestamp: time.Now(), - } - err := repo.UpdateStorage(storage) - if err != nil { - return - } - case *stgmod.BodyStorageDeleted: - storage := &Storage{ - StorageID: body.StorageID, - } - err := repo.DeleteStorage(storage) - if err != nil { - return - } - } -} diff --git a/datamap/internal/mq/mq.go b/datamap/internal/mq/mq.go deleted file mode 100644 index 07c9d9b..0000000 --- a/datamap/internal/mq/mq.go +++ /dev/null @@ -1,117 +0,0 @@ -package mq - -import ( - "fmt" - jsoniter "github.com/json-iterator/go" - "github.com/streadway/amqp" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/datamap/internal/config" - "gitlink.org.cn/cloudream/storage/datamap/internal/models" - "log" -) - -func InitMQ(cfg config.RabbitMQConfig) (*amqp.Connection, error) { - conn, err := amqp.Dial(fmt.Sprintf("amqp://%s:%s@%s:%s/", - cfg.User, cfg.Password, cfg.Host, cfg.Port)) - if err != nil { - return nil, err - } - - // 启动队列监听 - go listenQueues(conn) - - return conn, nil -} - -func listenQueues(conn *amqp.Connection) { - queues := []string{ - "datamap_hubinfo", - "datamap_storageinfo", - "datamap_storagestats", - "datamap_hubtransferstats", - "datamap_hubstoragetransferstats", - "datamap_blocktransfer", - "datamap_blockdistribution", - } - - for _, queue := range queues { - go func(q string) { - ch, err := conn.Channel() - if err != nil { - log.Printf("Failed to open channel for queue %s: %v", q, err) - return - } - defer ch.Close() - - msgs, err := ch.Consume(q, "", true, false, false, false, nil) - if err != nil { - log.Printf("Failed to register consumer for queue %s: %v", q, err) - return - } - - for msg := range msgs { - processMessage(q, msg.Body) - } - }(queue) - } -} - -func processMessage(queue string, body []byte) { - switch queue { - case "datamap_hubinfo": - var data stgmod.HubInfo - if err := jsoniter.Unmarshal(body, &data); err != nil { - log.Printf("Failed to unmarshal HubInfo: %v, body: %s", err, body) - return - } - models.ProcessHubInfo(data) - case "datamap_storageinfo": - var data stgmod.StorageInfo - if err := jsoniter.Unmarshal(body, &data); err != nil { - log.Printf("Failed to unmarshal StorageInfo: %v, body: %s", err, body) - return - } - models.ProcessStorageInfo(data) - case "datamap_storagestats": - var data stgmod.StorageStats - if err := jsoniter.Unmarshal(body, &data); err != nil { - log.Printf("Failed to unmarshal StorageStats: %v, body: %s", err, body) - return - } - models.ProcessStorageStats(data) - case "datamap_hubtransferstats": - var data stgmod.HubTransferStats - err := jsoniter.Unmarshal(body, &data) - if err != nil { - log.Printf("Failed to unmarshal HubTransferStats: %v, body: %s", err, body) - return - } - models.ProcessHubTransfer(data) - case "datamap_hubstoragetransferstats": - var data stgmod.HubStorageTransferStats - err := jsoniter.Unmarshal(body, &data) - if err != nil { - log.Printf("Failed to unmarshal HubStorageTransferStats: %v, body: %s", err, body) - return - } - models.ProcessHubStorageTransfer(data) - case "datamap_blocktransfer": - var data stgmod.BlockTransfer - err := jsoniter.Unmarshal(body, &data) - if err != nil { - log.Printf("Failed to unmarshal BlockTransfer: %v, body: %s", err, body) - return - } - models.ProcessBlockTransfer(data) - case "datamap_blockdistribution": - var data stgmod.BlockDistribution - err := jsoniter.Unmarshal(body, &data) - if err != nil { - log.Printf("Failed to unmarshal BlockDistribution: %v, body: %s", err, body) - return - } - models.ProcessBlockDistribution(data) - default: - log.Printf("Unknown queue: %s", queue) - } -} diff --git a/datamap/internal/server/server.go b/datamap/internal/server/server.go deleted file mode 100644 index f3233cb..0000000 --- a/datamap/internal/server/server.go +++ /dev/null @@ -1,23 +0,0 @@ -package server - -import ( - "github.com/gin-gonic/gin" - "github.com/streadway/amqp" - "gitlink.org.cn/cloudream/storage/datamap/internal/handlers" - "gorm.io/gorm" - "log" -) - -func StartServer(db *gorm.DB, mq *amqp.Connection) { - r := gin.Default() - - handlers.SetDB(db) - // 注册HTTP接口 - r.GET("/hubInfo", handlers.GetHubInfo) - r.GET("/dataTransfer/:objectID", handlers.GetDataTransfer) - - // 启动服务 - if err := r.Run(":8080"); err != nil { - log.Fatalf("Failed to start server: %v", err) - } -} diff --git a/datamap/main.go b/datamap/main.go deleted file mode 100644 index da0ce32..0000000 --- a/datamap/main.go +++ /dev/null @@ -1,32 +0,0 @@ -package main - -import ( - "gitlink.org.cn/cloudream/storage/datamap/internal/config" - "gitlink.org.cn/cloudream/storage/datamap/internal/db" - "gitlink.org.cn/cloudream/storage/datamap/internal/models" - "gitlink.org.cn/cloudream/storage/datamap/internal/mq" - "gitlink.org.cn/cloudream/storage/datamap/internal/server" - "log" -) - -func main() { - // 加载配置 - cfg := config.LoadConfig() - - // 初始化数据库 - dbConn, err := db.InitDB(cfg.Database) - if err != nil { - log.Fatalf("Failed to initialize database: %v", err) - } - - models.InitDB(dbConn) - - // 初始化RabbitMQ - mqConn, err := mq.InitMQ(cfg.RabbitMQ) - if err != nil { - log.Fatalf("Failed to initialize RabbitMQ: %v", err) - } - - // 启动Gin服务 - server.StartServer(dbConn, mqConn) -} diff --git a/go.mod b/go.mod index 92cbdff..a755f21 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlink.org.cn/cloudream/storage +module gitlink.org.cn/cloudream/storage2 go 1.23.0 diff --git a/scanner/internal/config/config.go b/scanner/internal/config/config.go index 46cd5f2..85c4bbc 100644 --- a/scanner/internal/config/config.go +++ b/scanner/internal/config/config.go @@ -5,7 +5,7 @@ import ( log "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" c "gitlink.org.cn/cloudream/common/utils/config" - db "gitlink.org.cn/cloudream/storage/common/pkgs/db2/config" + db "gitlink.org.cn/cloudream/storage2/common/pkgs/db2/config" ) type Config struct { diff --git a/scanner/internal/event/agent_check_shardstore.go b/scanner/internal/event/agent_check_shardstore.go index e3447ff..17a7e9c 100644 --- a/scanner/internal/event/agent_check_shardstore.go +++ b/scanner/internal/event/agent_check_shardstore.go @@ -7,11 +7,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" ) // AgentCheckShardStore 代表一个用于处理代理缓存检查事件的结构体 diff --git a/scanner/internal/event/agent_check_state.go b/scanner/internal/event/agent_check_state.go index 22bb474..6e8d628 100644 --- a/scanner/internal/event/agent_check_state.go +++ b/scanner/internal/event/agent_check_state.go @@ -6,11 +6,11 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" - "gitlink.org.cn/cloudream/storage/common/consts" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage/scanner/internal/config" + "gitlink.org.cn/cloudream/storage2/common/consts" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/config" ) type AgentCheckState struct { diff --git a/scanner/internal/event/agent_shardstore_gc.go b/scanner/internal/event/agent_shardstore_gc.go index 6093265..9fe331c 100644 --- a/scanner/internal/event/agent_shardstore_gc.go +++ b/scanner/internal/event/agent_shardstore_gc.go @@ -7,12 +7,12 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/mq" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/reqbuilder" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" - agtmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/agent" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" + agtmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/agent" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" ) // AgentShardStoreGC 类封装了扫描器事件中的AgentShardStoreGC结构。 diff --git a/scanner/internal/event/check_package_redundancy.go b/scanner/internal/event/check_package_redundancy.go index e66fabd..2b35301 100644 --- a/scanner/internal/event/check_package_redundancy.go +++ b/scanner/internal/event/check_package_redundancy.go @@ -12,17 +12,17 @@ import ( cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sort2" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc" - lrcparser "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitchlrc/parser" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage/scanner/internal/config" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc" + lrcparser "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/parser" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/config" ) type CheckPackageRedundancy struct { diff --git a/scanner/internal/event/clean_pinned.go b/scanner/internal/event/clean_pinned.go index 7d7d6fc..d4fd6d0 100644 --- a/scanner/internal/event/clean_pinned.go +++ b/scanner/internal/event/clean_pinned.go @@ -16,15 +16,15 @@ import ( "gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/sort2" - "gitlink.org.cn/cloudream/storage/common/consts" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock/reqbuilder" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/ops2" - "gitlink.org.cn/cloudream/storage/common/pkgs/ioswitch2/parser" - coormq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/coordinator" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/common/consts" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/reqbuilder" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser" + coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" ) type CleanPinned struct { diff --git a/scanner/internal/event/event.go b/scanner/internal/event/event.go index c20efb5..293cd95 100644 --- a/scanner/internal/event/event.go +++ b/scanner/internal/event/event.go @@ -7,10 +7,10 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/distlock" event "gitlink.org.cn/cloudream/common/pkgs/event" "gitlink.org.cn/cloudream/common/pkgs/typedispatcher" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" ) type ExecuteArgs struct { diff --git a/scanner/internal/event/update_package_access_stat_amount.go b/scanner/internal/event/update_package_access_stat_amount.go index d8d288f..8a45e94 100644 --- a/scanner/internal/event/update_package_access_stat_amount.go +++ b/scanner/internal/event/update_package_access_stat_amount.go @@ -5,8 +5,8 @@ import ( "github.com/samber/lo" "gitlink.org.cn/cloudream/common/pkgs/logger" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage/scanner/internal/config" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/config" ) type UpdatePackageAccessStatAmount struct { diff --git a/scanner/internal/mq/event.go b/scanner/internal/mq/event.go index e6f83c0..657d69e 100644 --- a/scanner/internal/mq/event.go +++ b/scanner/internal/mq/event.go @@ -2,8 +2,8 @@ package mq import ( "gitlink.org.cn/cloudream/common/pkgs/logger" - scmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner" - "gitlink.org.cn/cloudream/storage/scanner/internal/event" + scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner" + "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) func (svc *Service) PostEvent(msg *scmq.PostEvent) { diff --git a/scanner/internal/mq/service.go b/scanner/internal/mq/service.go index 0a234d3..0afcc27 100644 --- a/scanner/internal/mq/service.go +++ b/scanner/internal/mq/service.go @@ -1,7 +1,7 @@ package mq import ( - "gitlink.org.cn/cloudream/storage/scanner/internal/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) type Service struct { diff --git a/scanner/internal/tickevent/batch_all_agent_check_shardstore.go b/scanner/internal/tickevent/batch_all_agent_check_shardstore.go index 73cac98..f60dcc4 100644 --- a/scanner/internal/tickevent/batch_all_agent_check_shardstore.go +++ b/scanner/internal/tickevent/batch_all_agent_check_shardstore.go @@ -3,8 +3,8 @@ package tickevent import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage/scanner/internal/event" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) const AGENT_CHECK_CACHE_BATCH_SIZE = 2 diff --git a/scanner/internal/tickevent/batch_check_package_redudancy.go b/scanner/internal/tickevent/batch_check_package_redudancy.go index a8c6dd2..48a4796 100644 --- a/scanner/internal/tickevent/batch_check_package_redudancy.go +++ b/scanner/internal/tickevent/batch_check_package_redudancy.go @@ -4,8 +4,8 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - evt "gitlink.org.cn/cloudream/storage/scanner/internal/event" + "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + evt "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) const ( diff --git a/scanner/internal/tickevent/batch_clean_pinned.go b/scanner/internal/tickevent/batch_clean_pinned.go index 0826834..92c508c 100644 --- a/scanner/internal/tickevent/batch_clean_pinned.go +++ b/scanner/internal/tickevent/batch_clean_pinned.go @@ -4,8 +4,8 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - evt "gitlink.org.cn/cloudream/storage/scanner/internal/event" + "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + evt "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) type BatchCleanPinned struct { diff --git a/scanner/internal/tickevent/check_agent_state.go b/scanner/internal/tickevent/check_agent_state.go index 3d4f460..2108af0 100644 --- a/scanner/internal/tickevent/check_agent_state.go +++ b/scanner/internal/tickevent/check_agent_state.go @@ -2,8 +2,8 @@ package tickevent import ( "gitlink.org.cn/cloudream/common/pkgs/logger" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage/scanner/internal/event" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) type CheckAgentState struct { diff --git a/scanner/internal/tickevent/storage_gc.go b/scanner/internal/tickevent/storage_gc.go index 35e7b1b..7dd5379 100644 --- a/scanner/internal/tickevent/storage_gc.go +++ b/scanner/internal/tickevent/storage_gc.go @@ -5,8 +5,8 @@ import ( "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" - scevt "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - "gitlink.org.cn/cloudream/storage/scanner/internal/event" + scevt "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) type StorageGC struct { diff --git a/scanner/internal/tickevent/tick_event.go b/scanner/internal/tickevent/tick_event.go index 7ebe9d4..8f9cd8d 100644 --- a/scanner/internal/tickevent/tick_event.go +++ b/scanner/internal/tickevent/tick_event.go @@ -2,8 +2,8 @@ package tickevent import ( tickevent "gitlink.org.cn/cloudream/common/pkgs/tickevent" - mydb "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/scanner/internal/event" + mydb "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) type ExecuteArgs struct { diff --git a/scanner/internal/tickevent/update_all_package_access_stat_amount.go b/scanner/internal/tickevent/update_all_package_access_stat_amount.go index e9da0b5..32ca817 100644 --- a/scanner/internal/tickevent/update_all_package_access_stat_amount.go +++ b/scanner/internal/tickevent/update_all_package_access_stat_amount.go @@ -4,8 +4,8 @@ import ( "time" "gitlink.org.cn/cloudream/common/pkgs/logger" - "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner/event" - evt "gitlink.org.cn/cloudream/storage/scanner/internal/event" + "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner/event" + evt "gitlink.org.cn/cloudream/storage2/scanner/internal/event" ) type UpdateAllPackageAccessStatAmount struct { diff --git a/scanner/main.go b/scanner/main.go index 80510ef..be42611 100644 --- a/scanner/main.go +++ b/scanner/main.go @@ -6,18 +6,18 @@ import ( "os" "gitlink.org.cn/cloudream/common/pkgs/logger" - stgglb "gitlink.org.cn/cloudream/storage/common/globals" - stgmod "gitlink.org.cn/cloudream/storage/common/models" - "gitlink.org.cn/cloudream/storage/common/pkgs/db2" - "gitlink.org.cn/cloudream/storage/common/pkgs/distlock" - agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent" - scmq "gitlink.org.cn/cloudream/storage/common/pkgs/mq/scanner" - "gitlink.org.cn/cloudream/storage/common/pkgs/storage/agtpool" - "gitlink.org.cn/cloudream/storage/common/pkgs/sysevent" - "gitlink.org.cn/cloudream/storage/scanner/internal/config" - "gitlink.org.cn/cloudream/storage/scanner/internal/event" - "gitlink.org.cn/cloudream/storage/scanner/internal/mq" - "gitlink.org.cn/cloudream/storage/scanner/internal/tickevent" + stgglb "gitlink.org.cn/cloudream/storage2/common/globals" + stgmod "gitlink.org.cn/cloudream/storage2/common/models" + "gitlink.org.cn/cloudream/storage2/common/pkgs/db2" + "gitlink.org.cn/cloudream/storage2/common/pkgs/distlock" + agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent" + scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner" + "gitlink.org.cn/cloudream/storage2/common/pkgs/storage/agtpool" + "gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent" + "gitlink.org.cn/cloudream/storage2/scanner/internal/config" + "gitlink.org.cn/cloudream/storage2/scanner/internal/event" + "gitlink.org.cn/cloudream/storage2/scanner/internal/mq" + "gitlink.org.cn/cloudream/storage2/scanner/internal/tickevent" ) func main() {