Browse Source

新版架构移动到新仓库

gitlink
Sydonian 7 months ago
parent
commit
febfd49692
100 changed files with 287 additions and 286 deletions
  1. +20
    -20
      agent/internal/cmd/serve.go
  2. +5
    -5
      agent/internal/config/config.go
  3. +1
    -1
      agent/internal/grpc/io.go
  4. +1
    -1
      agent/internal/grpc/ping.go
  5. +2
    -2
      agent/internal/grpc/service.go
  6. +1
    -1
      agent/internal/http/service.go
  7. +1
    -1
      agent/internal/mq/agent.go
  8. +2
    -2
      agent/internal/mq/cache.go
  9. +3
    -3
      agent/internal/mq/service.go
  10. +3
    -3
      agent/internal/mq/storage.go
  11. +4
    -4
      agent/internal/task/cache_move_package.go
  12. +3
    -3
      agent/internal/task/create_package.go
  13. +5
    -5
      agent/internal/task/task.go
  14. +4
    -4
      agent/internal/tickevent/report_hub_stats.go
  15. +3
    -3
      agent/internal/tickevent/report_storage_stats.go
  16. +1
    -1
      agent/main.go
  17. +1
    -1
      client/internal/cmdline/commandline.go
  18. +1
    -1
      client/internal/cmdline/distlock.go
  19. +2
    -2
      client/internal/cmdline/getp.go
  20. +1
    -1
      client/internal/cmdline/package.go
  21. +1
    -1
      client/internal/cmdline/scanner.go
  22. +2
    -2
      client/internal/cmdline/serve.go
  23. +2
    -2
      client/internal/cmdline/sysevent.go
  24. +5
    -5
      client/internal/config/config.go
  25. +1
    -1
      client/internal/http/aws_auth.go
  26. +2
    -2
      client/internal/http/object.go
  27. +2
    -2
      client/internal/http/presigned.go
  28. +1
    -1
      client/internal/http/server.go
  29. +2
    -2
      client/internal/services/bucket.go
  30. +4
    -4
      client/internal/services/cache.go
  31. +3
    -2
      client/internal/services/hub.go
  32. +7
    -7
      client/internal/services/object.go
  33. +3
    -3
      client/internal/services/package.go
  34. +3
    -3
      client/internal/services/scanner.go
  35. +6
    -6
      client/internal/services/service.go
  36. +10
    -10
      client/internal/services/storage.go
  37. +2
    -2
      client/internal/services/user.go
  38. +4
    -4
      client/internal/task/task.go
  39. +14
    -14
      client/main.go
  40. +13
    -13
      client2/internal/cmd/mount.go
  41. +6
    -6
      client2/internal/config/config.go
  42. +1
    -1
      client2/internal/mount/fuse/fuse.go
  43. +6
    -6
      client2/internal/mount/mount.go
  44. +4
    -4
      client2/internal/mount/mount_win.go
  45. +5
    -5
      client2/internal/mount/vfs/cache/cache.go
  46. +1
    -1
      client2/internal/mount/vfs/cache/file.go
  47. +1
    -1
      client2/internal/mount/vfs/dir_reader.go
  48. +3
    -3
      client2/internal/mount/vfs/fuse_bucket.go
  49. +3
    -3
      client2/internal/mount/vfs/fuse_dir.go
  50. +2
    -2
      client2/internal/mount/vfs/fuse_file.go
  51. +3
    -3
      client2/internal/mount/vfs/fuse_package.go
  52. +3
    -3
      client2/internal/mount/vfs/fuse_root.go
  53. +6
    -6
      client2/internal/mount/vfs/vfs.go
  54. +1
    -1
      client2/main.go
  55. +1
    -1
      common/globals/globals.go
  56. +4
    -4
      common/globals/pools.go
  57. +1
    -1
      common/globals/stats.go
  58. +2
    -2
      common/pkgs/accessstat/access_stat.go
  59. +2
    -2
      common/pkgs/connectivity/collector.go
  60. +1
    -1
      common/pkgs/db2/bucket.go
  61. +1
    -1
      common/pkgs/db2/cache.go
  62. +1
    -1
      common/pkgs/db2/db2.go
  63. +1
    -1
      common/pkgs/db2/hub_connectivity.go
  64. +1
    -1
      common/pkgs/db2/location.go
  65. +1
    -1
      common/pkgs/db2/model/model.go
  66. +3
    -3
      common/pkgs/db2/object.go
  67. +2
    -2
      common/pkgs/db2/object_access_stat.go
  68. +1
    -1
      common/pkgs/db2/object_block.go
  69. +1
    -1
      common/pkgs/db2/package.go
  70. +2
    -2
      common/pkgs/db2/package_access_stat.go
  71. +2
    -2
      common/pkgs/db2/storage.go
  72. +1
    -1
      common/pkgs/db2/user_bucket.go
  73. +1
    -1
      common/pkgs/db2/user_hub.go
  74. +1
    -1
      common/pkgs/db2/user_storage.go
  75. +1
    -1
      common/pkgs/distlock/reqbuilder/metadata.go
  76. +1
    -1
      common/pkgs/distlock/reqbuilder/metadata_object.go
  77. +1
    -1
      common/pkgs/distlock/reqbuilder/shard_store.go
  78. +1
    -1
      common/pkgs/distlock/reqbuilder/storage.go
  79. +1
    -1
      common/pkgs/distlock/service.go
  80. +6
    -6
      common/pkgs/downloader/downloader.go
  81. +7
    -7
      common/pkgs/downloader/iterator.go
  82. +1
    -1
      common/pkgs/downloader/lrc.go
  83. +2
    -2
      common/pkgs/downloader/lrc_strip_iterator.go
  84. +3
    -3
      common/pkgs/downloader/strategy/selector.go
  85. +3
    -3
      common/pkgs/downloader/strip_iterator.go
  86. +1
    -1
      common/pkgs/ec/block.go
  87. +2
    -2
      common/pkgs/ioswitch2/agent_worker.go
  88. +1
    -1
      common/pkgs/ioswitch2/fromto.go
  89. +1
    -1
      common/pkgs/ioswitch2/http_hub_worker.go
  90. +2
    -2
      common/pkgs/ioswitch2/ops2/bypass.go
  91. +1
    -1
      common/pkgs/ioswitch2/ops2/driver.go
  92. +4
    -4
      common/pkgs/ioswitch2/ops2/ec.go
  93. +2
    -2
      common/pkgs/ioswitch2/ops2/faas.go
  94. +3
    -3
      common/pkgs/ioswitch2/ops2/multipart.go
  95. +1
    -1
      common/pkgs/ioswitch2/ops2/ops.go
  96. +3
    -3
      common/pkgs/ioswitch2/ops2/public_store.go
  97. +3
    -3
      common/pkgs/ioswitch2/ops2/s2s.go
  98. +4
    -4
      common/pkgs/ioswitch2/ops2/shard_store.go
  99. +4
    -4
      common/pkgs/ioswitch2/parser/gen/generator.go
  100. +2
    -2
      common/pkgs/ioswitch2/parser/opt/chunked.go

+ 20
- 20
agent/internal/cmd/serve.go View File

@@ -8,35 +8,35 @@ import (
"time" "time"


"github.com/go-co-op/gocron/v2" "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/ioswitch/exec"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "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) { func serve(configPath string) {


+ 5
- 5
agent/internal/config/config.go View File

@@ -6,11 +6,11 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
c "gitlink.org.cn/cloudream/common/utils/config" 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 { type Config struct {


+ 1
- 1
agent/internal/grpc/io.go View File

@@ -11,7 +11,7 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/io2"
"gitlink.org.cn/cloudream/common/utils/serder" "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) { func (s *Service) ExecuteIOPlan(ctx context.Context, req *agtrpc.ExecuteIOPlanReq) (*agtrpc.ExecuteIOPlanResp, error) {


+ 1
- 1
agent/internal/grpc/ping.go View File

@@ -3,7 +3,7 @@ package grpc
import ( import (
"context" "context"


agtrpc "gitlink.org.cn/cloudream/storage/common/pkgs/grpc/agent"
agtrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/agent"
) )


// Ping 是一个RPC方法,用于验证服务的可用性。 // Ping 是一个RPC方法,用于验证服务的可用性。


+ 2
- 2
agent/internal/grpc/service.go View File

@@ -2,8 +2,8 @@ package grpc


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "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 { type Service struct {


+ 1
- 1
agent/internal/http/service.go View File

@@ -2,7 +2,7 @@ package http


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "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 { type Service struct {


+ 1
- 1
agent/internal/mq/agent.go View File

@@ -2,7 +2,7 @@ package mq


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/mq" "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) { func (svc *Service) GetState(msg *agtmq.GetState) (*agtmq.GetStateResp, *mq.CodeMessage) {


+ 2
- 2
agent/internal/mq/cache.go View File

@@ -7,8 +7,8 @@ import (
"gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/consts/errorcode"
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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) { func (svc *Service) CheckCache(msg *agtmq.CheckCache) (*agtmq.CheckCacheResp, *mq.CodeMessage) {


+ 3
- 3
agent/internal/mq/service.go View File

@@ -1,9 +1,9 @@
package mq package mq


import ( 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 { type Service struct {


+ 3
- 3
agent/internal/mq/storage.go View File

@@ -4,9 +4,9 @@ import (
"gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/consts/errorcode"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/mq" "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) { func (svc *Service) StorageCreatePackage(msg *agtmq.StorageCreatePackage) (*agtmq.StorageCreatePackageResp, *mq.CodeMessage) {


+ 4
- 4
agent/internal/task/cache_move_package.go View File

@@ -7,10 +7,10 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/task" "gitlink.org.cn/cloudream/common/pkgs/task"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type CacheMovePackage struct {


+ 3
- 3
agent/internal/task/create_package.go View File

@@ -9,9 +9,9 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/pkgs/task" "gitlink.org.cn/cloudream/common/pkgs/task"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 定义创建包的结果结构 // CreatePackageResult 定义创建包的结果结构


+ 5
- 5
agent/internal/task/task.go View File

@@ -3,11 +3,11 @@ package task
import ( import (
"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
"gitlink.org.cn/cloudream/common/pkgs/task" "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开关和网络连接状态收集器 // TaskContext 定义了任务执行的上下文环境,包含分布式锁服务、IO开关和网络连接状态收集器


+ 4
- 4
agent/internal/tickevent/report_hub_stats.go View File

@@ -2,10 +2,10 @@ package tickevent


import ( import (
"gitlink.org.cn/cloudream/common/utils/math2" "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) { func ReportHubTransferStats(evtPub *sysevent.Publisher) {


+ 3
- 3
agent/internal/tickevent/report_storage_stats.go View File

@@ -1,9 +1,9 @@
package tickevent package tickevent


import ( 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) { func ReportStorageStats(agtPool *agtpool.AgentPool, evtPub *sysevent.Publisher) {


+ 1
- 1
agent/main.go View File

@@ -1,6 +1,6 @@
package main package main


import "gitlink.org.cn/cloudream/storage/agent/internal/cmd"
import "gitlink.org.cn/cloudream/storage2/agent/internal/cmd"


func main() { func main() {
cmd.RootCmd.Execute() cmd.RootCmd.Execute()


+ 1
- 1
client/internal/cmdline/commandline.go View File

@@ -7,7 +7,7 @@ import (


"github.com/spf13/cobra" "github.com/spf13/cobra"
"gitlink.org.cn/cloudream/common/pkgs/cmdtrie" "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 { type CommandContext struct {


+ 1
- 1
client/internal/cmdline/distlock.go View File

@@ -6,7 +6,7 @@ import (


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/distlock" "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 尝试获取分布式锁。 // DistLockLock 尝试获取分布式锁。


+ 2
- 2
client/internal/cmdline/getp.go View File

@@ -12,8 +12,8 @@ import (
"github.com/inhies/go-bytesize" "github.com/inhies/go-bytesize"
"github.com/spf13/cobra" "github.com/spf13/cobra"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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() { func init() {


+ 1
- 1
client/internal/cmdline/package.go View File

@@ -9,7 +9,7 @@ import (


"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 列出指定存储桶中的所有包裹。 // PackageListBucketPackages 列出指定存储桶中的所有包裹。


+ 1
- 1
client/internal/cmdline/scanner.go View File

@@ -5,7 +5,7 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/cmdtrie" "gitlink.org.cn/cloudream/common/pkgs/cmdtrie"
"gitlink.org.cn/cloudream/common/utils/reflect2" "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]() var parseScannerEventCmdTrie cmdtrie.StaticCommandTrie[any] = cmdtrie.NewStaticCommandTrie[any]()


+ 2
- 2
client/internal/cmdline/serve.go View File

@@ -3,8 +3,8 @@ package cmdline
import ( import (
"fmt" "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服务。 // ServeHTTP 启动HTTP服务。


+ 2
- 2
client/internal/cmdline/sysevent.go View File

@@ -7,8 +7,8 @@ import (


"github.com/spf13/cobra" "github.com/spf13/cobra"
"gitlink.org.cn/cloudream/common/utils/serder" "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() { func init() {


+ 5
- 5
client/internal/config/config.go View File

@@ -6,11 +6,11 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/config" "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 { type Config struct {


+ 1
- 1
client/internal/http/aws_auth.go View File

@@ -18,7 +18,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/consts/errorcode"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage/client/internal/config"
"gitlink.org.cn/cloudream/storage2/client/internal/config"
) )


const ( const (


+ 2
- 2
client/internal/http/object.go View File

@@ -15,8 +15,8 @@ import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi"
"gitlink.org.cn/cloudream/common/utils/math2" "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 { type ObjectService struct {


+ 2
- 2
client/internal/http/presigned.go View File

@@ -13,8 +13,8 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi"
"gitlink.org.cn/cloudream/common/utils/math2" "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 { type PresignedService struct {


+ 1
- 1
client/internal/http/server.go View File

@@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "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 { type Server struct {


+ 2
- 2
client/internal/services/bucket.go View File

@@ -4,8 +4,8 @@ import (
"fmt" "fmt"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 是对存储桶进行操作的服务类 // BucketService 是对存储桶进行操作的服务类


+ 4
- 4
client/internal/services/cache.go View File

@@ -6,10 +6,10 @@ import (


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type CacheService struct {


+ 3
- 2
client/internal/services/hub.go View File

@@ -2,9 +2,10 @@ package services


import ( import (
"fmt" "fmt"

cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 是关于节点操作的服务结构体 // HubService 是关于节点操作的服务结构体


+ 7
- 7
client/internal/services/object.go View File

@@ -7,13 +7,13 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "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 定义了对象服务,负责管理对象的上传、下载等操作。 // ObjectService 定义了对象服务,负责管理对象的上传、下载等操作。


+ 3
- 3
client/internal/services/package.go View File

@@ -5,9 +5,9 @@ import (


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 提供对包相关操作的服务接口 // PackageService 提供对包相关操作的服务接口


+ 3
- 3
client/internal/services/scanner.go View File

@@ -3,9 +3,9 @@ package services
import ( import (
"fmt" "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 是扫描器服务结构体,封装了与扫描器相关的服务功能。 // ScannerService 是扫描器服务结构体,封装了与扫描器相关的服务功能。


+ 6
- 6
client/internal/services/service.go View File

@@ -4,12 +4,12 @@ package services


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/distlock" "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 结构体封装了分布锁服务和任务管理服务。 // Service 结构体封装了分布锁服务和任务管理服务。


+ 10
- 10
client/internal/services/storage.go View File

@@ -8,16 +8,16 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type StorageService struct {


+ 2
- 2
client/internal/services/user.go View File

@@ -4,8 +4,8 @@ import (
"fmt" "fmt"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type UserService struct {


+ 4
- 4
client/internal/task/task.go View File

@@ -1,10 +1,10 @@
package task package task


import ( 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 定义了任务执行的上下文环境,包含分布式锁服务和网络连接状态收集器 // TaskContext 定义了任务执行的上下文环境,包含分布式锁服务和网络连接状态收集器


+ 14
- 14
client/main.go View File

@@ -9,20 +9,20 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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() { func main() {


+ 13
- 13
client2/internal/cmd/mount.go View File

@@ -7,19 +7,19 @@ import (


"github.com/spf13/cobra" "github.com/spf13/cobra"
"gitlink.org.cn/cloudream/common/pkgs/logger" "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() { func init() {


+ 6
- 6
client2/internal/config/config.go View File

@@ -6,12 +6,12 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/mq"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
c "gitlink.org.cn/cloudream/common/utils/config" 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 { type Config struct {


+ 1
- 1
client2/internal/mount/fuse/fuse.go View File

@@ -8,7 +8,7 @@ import (


fusefs "github.com/hanwen/go-fuse/v2/fs" fusefs "github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse" "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 { type Fuse struct {


+ 6
- 6
client2/internal/mount/mount.go View File

@@ -7,12 +7,12 @@ import (
"github.com/hanwen/go-fuse/v2/fuse" "github.com/hanwen/go-fuse/v2/fuse"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/sync2" "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 { type MountEvent interface {


+ 4
- 4
client2/internal/mount/mount_win.go View File

@@ -7,10 +7,10 @@ import (


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/sync2" "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 { type MountEvent interface {


+ 5
- 5
client2/internal/mount/vfs/cache/cache.go View File

@@ -16,11 +16,11 @@ import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/io2"
"gitlink.org.cn/cloudream/common/utils/lo2" "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 { type CacheEntry interface {


+ 1
- 1
client2/internal/mount/vfs/cache/file.go View File

@@ -13,7 +13,7 @@ import (
"gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/lo2"
"gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/math2"
"gitlink.org.cn/cloudream/common/utils/serder" "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 { type FileInfo struct {


+ 1
- 1
client2/internal/mount/vfs/dir_reader.go View File

@@ -1,6 +1,6 @@
package vfs 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 { type FuseDirReader struct {
allEntries []fuse.FsEntry allEntries []fuse.FsEntry


+ 3
- 3
client2/internal/mount/vfs/fuse_bucket.go View File

@@ -7,9 +7,9 @@ import (
"time" "time"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "gorm.io/gorm"
) )




+ 3
- 3
client2/internal/mount/vfs/fuse_dir.go View File

@@ -8,9 +8,9 @@ import (


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/lo2" "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" "gorm.io/gorm"
) )




+ 2
- 2
client2/internal/mount/vfs/fuse_file.go View File

@@ -5,8 +5,8 @@ import (
"time" "time"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "gorm.io/gorm"
) )




+ 3
- 3
client2/internal/mount/vfs/fuse_package.go View File

@@ -8,9 +8,9 @@ import (


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/lo2" "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" "gorm.io/gorm"
) )




+ 3
- 3
client2/internal/mount/vfs/fuse_root.go View File

@@ -6,9 +6,9 @@ import (
"time" "time"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "gorm.io/gorm"
) )




+ 6
- 6
client2/internal/mount/vfs/vfs.go View File

@@ -1,12 +1,12 @@
package vfs package vfs


import ( 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 { type Vfs struct {


+ 1
- 1
client2/main.go View File

@@ -1,6 +1,6 @@
package main package main


import "gitlink.org.cn/cloudream/storage/client2/internal/cmd"
import "gitlink.org.cn/cloudream/storage2/client2/internal/cmd"


func main() { func main() {
cmd.RootCmd.Execute() cmd.RootCmd.Execute()


+ 1
- 1
common/globals/globals.go View File

@@ -1,7 +1,7 @@
package stgglb package stgglb


import ( import (
stgmodels "gitlink.org.cn/cloudream/storage/common/models"
stgmodels "gitlink.org.cn/cloudream/storage2/common/models"
) )


var Local *stgmodels.LocalMachineInfo var Local *stgmodels.LocalMachineInfo


+ 4
- 4
common/globals/pools.go View File

@@ -2,10 +2,10 @@ package stgglb


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/mq" "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 var AgentMQPool agtmq.Pool


+ 1
- 1
common/globals/stats.go View File

@@ -1,5 +1,5 @@
package stgglb package stgglb


import "gitlink.org.cn/cloudream/storage/common/pkgs/servicestats"
import "gitlink.org.cn/cloudream/storage2/common/pkgs/servicestats"


var Stats servicestats.StatsHost var Stats servicestats.StatsHost

+ 2
- 2
common/pkgs/accessstat/access_stat.go View File

@@ -8,8 +8,8 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/sync2" "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{} type AccessStatEvent interface{}


+ 2
- 2
common/pkgs/connectivity/collector.go View File

@@ -7,8 +7,8 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type Connectivity struct {


+ 1
- 1
common/pkgs/db2/bucket.go View File

@@ -8,7 +8,7 @@ import (
"gorm.io/gorm" "gorm.io/gorm"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type BucketDB struct {


+ 1
- 1
common/pkgs/db2/cache.go View File

@@ -4,7 +4,7 @@ import (
"time" "time"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "gorm.io/gorm/clause"
) )




+ 1
- 1
common/pkgs/db2/db2.go View File

@@ -3,7 +3,7 @@ package db2
import ( import (
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/sirupsen/logrus" "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/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"
) )


+ 1
- 1
common/pkgs/db2/hub_connectivity.go View File

@@ -2,7 +2,7 @@ package db2


import ( import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "gorm.io/gorm/clause"
) )




+ 1
- 1
common/pkgs/db2/location.go View File

@@ -3,7 +3,7 @@ package db2
import ( import (
"fmt" "fmt"


"gitlink.org.cn/cloudream/storage/common/pkgs/db2/model"
"gitlink.org.cn/cloudream/storage2/common/pkgs/db2/model"
) )


type LocationDB struct { type LocationDB struct {


+ 1
- 1
common/pkgs/db2/model/model.go View File

@@ -4,7 +4,7 @@ import (
"time" "time"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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中,内部使用的一些特殊字段则留在这里 // TODO 可以考虑逐步迁移到cdssdk中。迁移思路:数据对象应该包含的字段都迁移到cdssdk中,内部使用的一些特殊字段则留在这里


+ 3
- 3
common/pkgs/db2/object.go View File

@@ -9,9 +9,9 @@ import (
"gorm.io/gorm/clause" "gorm.io/gorm/clause"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type ObjectDB struct {


+ 2
- 2
common/pkgs/db2/object_access_stat.go View File

@@ -2,8 +2,8 @@ package db2


import ( import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )


+ 1
- 1
common/pkgs/db2/object_block.go View File

@@ -5,7 +5,7 @@ import (
"strings" "strings"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "gorm.io/gorm/clause"
) )




+ 1
- 1
common/pkgs/db2/package.go View File

@@ -7,7 +7,7 @@ import (
"gorm.io/gorm" "gorm.io/gorm"


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type PackageDB struct {


+ 2
- 2
common/pkgs/db2/package_access_stat.go View File

@@ -2,8 +2,8 @@ package db2


import ( import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )


+ 2
- 2
common/pkgs/db2/storage.go View File

@@ -5,8 +5,8 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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" "gorm.io/gorm"
) )




+ 1
- 1
common/pkgs/db2/user_bucket.go View File

@@ -2,7 +2,7 @@ package db2


import ( import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type UserBucketDB struct {


+ 1
- 1
common/pkgs/db2/user_hub.go View File

@@ -2,7 +2,7 @@ package db2


import ( import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type UserHubDB struct {


+ 1
- 1
common/pkgs/db2/user_storage.go View File

@@ -2,7 +2,7 @@ package db2


import ( import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type UserStorageDB struct {


+ 1
- 1
common/pkgs/distlock/reqbuilder/metadata.go View File

@@ -1,7 +1,7 @@
package reqbuilder package reqbuilder


import ( import (
"gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider"
"gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider"
) )


type MetadataLockReqBuilder struct { type MetadataLockReqBuilder struct {


+ 1
- 1
common/pkgs/distlock/reqbuilder/metadata_object.go View File

@@ -3,7 +3,7 @@ package reqbuilder
import ( import (
"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type MetadataObjectLockReqBuilder struct {


+ 1
- 1
common/pkgs/distlock/reqbuilder/shard_store.go View File

@@ -5,7 +5,7 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type ShardStoreLockReqBuilder struct {


+ 1
- 1
common/pkgs/distlock/reqbuilder/storage.go View File

@@ -5,7 +5,7 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type StorageLockReqBuilder struct {


+ 1
- 1
common/pkgs/distlock/service.go View File

@@ -3,7 +3,7 @@ package distlock
import ( import (
"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
"gitlink.org.cn/cloudream/common/pkgs/trie" "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 type Service = distlock.Service


+ 6
- 6
common/pkgs/downloader/downloader.go View File

@@ -7,12 +7,12 @@ import (
lru "github.com/hashicorp/golang-lru/v2" lru "github.com/hashicorp/golang-lru/v2"
"gitlink.org.cn/cloudream/common/pkgs/iterator" "gitlink.org.cn/cloudream/common/pkgs/iterator"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 ( const (


+ 7
- 7
common/pkgs/downloader/iterator.go View File

@@ -12,13 +12,13 @@ import (


"gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/io2"
"gitlink.org.cn/cloudream/common/utils/math2" "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 { type downloadStorageInfo struct {


+ 1
- 1
common/pkgs/downloader/lrc.go View File

@@ -8,7 +8,7 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/io2"
"gitlink.org.cn/cloudream/common/utils/math2" "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) { func (iter *DownloadObjectIterator) downloadLRCReconstruct(req downloadReqeust2, strg strategy.LRCReconstructStrategy) (io.ReadCloser, error) {


+ 2
- 2
common/pkgs/downloader/lrc_strip_iterator.go View File

@@ -10,8 +10,8 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/math2" "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 { type LRCStripIterator struct {


+ 3
- 3
common/pkgs/downloader/strategy/selector.go View File

@@ -11,9 +11,9 @@ import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/math2"
"gitlink.org.cn/cloudream/common/utils/sort2" "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 { type Request struct {


+ 3
- 3
common/pkgs/downloader/strip_iterator.go View File

@@ -10,9 +10,9 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/math2" "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 { type downloadBlock struct {


+ 1
- 1
common/pkgs/ec/block.go View File

@@ -7,7 +7,7 @@ package ec


// "gitlink.org.cn/cloudream/common/pkgs/ipfs" // "gitlink.org.cn/cloudream/common/pkgs/ipfs"
// "gitlink.org.cn/cloudream/common/pkgs/logger" // "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 { // type BlockReader struct {


+ 2
- 2
common/pkgs/ioswitch2/agent_worker.go View File

@@ -9,8 +9,8 @@ import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/io2"
"gitlink.org.cn/cloudream/common/utils/serder" "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]( var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo](


+ 1
- 1
common/pkgs/ioswitch2/fromto.go View File

@@ -4,7 +4,7 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/math2" "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 { type From interface {


+ 1
- 1
common/pkgs/ioswitch2/http_hub_worker.go View File

@@ -9,7 +9,7 @@ import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi"
"gitlink.org.cn/cloudream/common/utils/io2" "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 { type HttpHubWorker struct {


+ 2
- 2
common/pkgs/ioswitch2/ops2/bypass.go View File

@@ -6,8 +6,8 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag"
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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() { func init() {


+ 1
- 1
common/pkgs/ioswitch2/ops2/driver.go View File

@@ -4,7 +4,7 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag"
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
"gitlink.org.cn/cloudream/common/utils/math2" "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,而不是重新实现一遍 // TODO 想办法直接使用ops里的Node,而不是重新实现一遍


+ 4
- 4
common/pkgs/ioswitch2/ops2/ec.go View File

@@ -12,10 +12,10 @@ import (
"gitlink.org.cn/cloudream/common/utils/io2" "gitlink.org.cn/cloudream/common/utils/io2"
"gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/math2"
"gitlink.org.cn/cloudream/common/utils/sync2" "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() { func init() {


+ 2
- 2
common/pkgs/ioswitch2/ops2/faas.go View File

@@ -7,8 +7,8 @@ import (
"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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 { type InternalFaaSGalMultiply struct {


+ 3
- 3
common/pkgs/ioswitch2/ops2/multipart.go View File

@@ -7,9 +7,9 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag"
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
log "gitlink.org.cn/cloudream/common/pkgs/logger" 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() { func init() {


+ 1
- 1
common/pkgs/ioswitch2/ops2/ops.go View File

@@ -3,7 +3,7 @@ package ops2
import ( import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag"
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/plan/ops" "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 { type GraphNodeBuilder struct {


+ 3
- 3
common/pkgs/ioswitch2/ops2/public_store.go View File

@@ -7,9 +7,9 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" 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() { func init() {


+ 3
- 3
common/pkgs/ioswitch2/ops2/s2s.go View File

@@ -5,9 +5,9 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag"
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "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() { func init() {


+ 4
- 4
common/pkgs/ioswitch2/ops2/shard_store.go View File

@@ -10,10 +10,10 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/io2" "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() { func init() {


+ 4
- 4
common/pkgs/ioswitch2/parser/gen/generator.go View File

@@ -8,10 +8,10 @@ import (
cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
"gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/lo2"
"gitlink.org.cn/cloudream/common/utils/math2" "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"
) )


// 检查使用不同编码时参数是否设置到位 // 检查使用不同编码时参数是否设置到位


+ 2
- 2
common/pkgs/ioswitch2/parser/opt/chunked.go View File

@@ -2,8 +2,8 @@ package opt


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/dag" "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指令 // 删除输出流未被使用的Join指令


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save