JointCloud
/
JCS-pub
Not watched
1
0
Fork 0
Code
Releases 0 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

storage2重命名为jcs-pub

feature_gxh
Sydonian 7 months ago
parent
71e73fa462
commit
b198ddeb4c
100 changed files with 278 additions and 278 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      client/internal/accessstat/access_stat.go
  2. +1
    -1
      client/internal/cmdline/bucket.go
  3. +1
    -1
      client/internal/cmdline/cache.go
  4. +1
    -1
      client/internal/cmdline/commandline.go
  5. +1
    -1
      client/internal/cmdline/distlock.go
  6. +3
    -3
      client/internal/cmdline/getp.go
  7. +1
    -1
      client/internal/cmdline/load.go
  8. +1
    -1
      client/internal/cmdline/lsp.go
  9. +2
    -2
      client/internal/cmdline/migrate.go
  10. +1
    -1
      client/internal/cmdline/newloadp.go
  11. +1
    -1
      client/internal/cmdline/object.go
  12. +2
    -2
      client/internal/cmdline/package.go
  13. +1
    -1
      client/internal/cmdline/put.go
  14. +16
    -16
      client/internal/cmdline/serve.go
  15. +2
    -2
      client/internal/cmdline/sysevent.go
  16. +4
    -4
      client/internal/cmdline/test.go
  17. +17
    -17
      client/internal/cmdline/vfstest.go
  18. +8
    -8
      client/internal/config/config.go
  19. +1
    -1
      client/internal/db/bucket.go
  20. +1
    -1
      client/internal/db/object.go
  21. +1
    -1
      client/internal/db/object_access_stat.go
  22. +1
    -1
      client/internal/db/object_block.go
  23. +1
    -1
      client/internal/db/package.go
  24. +1
    -1
      client/internal/db/package_access_stat.go
  25. +1
    -1
      client/internal/db/pinned_object.go
  26. +1
    -1
      client/internal/db/user_space.go
  27. +5
    -5
      client/internal/downloader/downloader.go
  28. +8
    -8
      client/internal/downloader/iterator.go
  29. +1
    -1
      client/internal/downloader/lrc.go
  30. +3
    -3
      client/internal/downloader/lrc_strip_iterator.go
  31. +4
    -4
      client/internal/downloader/strategy/selector.go
  32. +3
    -3
      client/internal/downloader/strip_iterator.go
  33. +1
    -1
      client/internal/http/bucket.go
  34. +2
    -2
      client/internal/http/cache.go
  35. +1
    -1
      client/internal/http/config.go
  36. +1
    -1
      client/internal/http/mount.go
  37. +3
    -3
      client/internal/http/object.go
  38. +2
    -2
      client/internal/http/package.go
  39. +2
    -2
      client/internal/http/presigned.go
  40. +2
    -2
      client/internal/http/server.go
  41. +1
    -1
      client/internal/http/temp.go
  42. +1
    -1
      client/internal/http/user_space.go
  43. +3
    -3
      client/internal/metacache/connectivity.go
  44. +1
    -1
      client/internal/metacache/host.go
  45. +3
    -3
      client/internal/metacache/hubmeta.go
  46. +4
    -4
      client/internal/metacache/storagemeta.go
  47. +1
    -1
      client/internal/mount/fuse/fuse.go
  48. +1
    -1
      client/internal/mount/mount.go
  49. +7
    -7
      client/internal/mount/mount_linux.go
  50. +5
    -5
      client/internal/mount/mount_win.go
  51. +6
    -6
      client/internal/mount/vfs/cache/cache.go
  52. +2
    -2
      client/internal/mount/vfs/cache/file.go
  53. +1
    -1
      client/internal/mount/vfs/dir_reader.go
  54. +4
    -4
      client/internal/mount/vfs/fuse.go
  55. +4
    -4
      client/internal/mount/vfs/fuse_bucket.go
  56. +4
    -4
      client/internal/mount/vfs/fuse_dir.go
  57. +3
    -3
      client/internal/mount/vfs/fuse_file.go
  58. +2
    -2
      client/internal/mount/vfs/fuse_package.go
  59. +4
    -4
      client/internal/mount/vfs/fuse_root.go
  60. +6
    -6
      client/internal/mount/vfs/vfs.go
  61. +1
    -1
      client/internal/mount/vfstest/fs.go
  62. +1
    -1
      client/internal/services/bucket.go
  63. +4
    -4
      client/internal/services/cache.go
  64. +7
    -7
      client/internal/services/object.go
  65. +4
    -4
      client/internal/services/package.go
  66. +8
    -8
      client/internal/services/service.go
  67. +8
    -8
      client/internal/services/storage.go
  68. +2
    -2
      client/internal/services/utils.go
  69. +5
    -5
      client/internal/uploader/create_load.go
  70. +5
    -5
      client/internal/uploader/update.go
  71. +10
    -10
      client/internal/uploader/uploader.go
  72. +1
    -1
      client/main.go
  73. +1
    -1
      client/sdk/api/bucket.go
  74. +1
    -1
      client/sdk/api/cache.go
  75. +1
    -1
      client/sdk/api/mount.go
  76. +1
    -1
      client/sdk/api/object.go
  77. +1
    -1
      client/sdk/api/package.go
  78. +1
    -1
      client/sdk/api/presigned.go
  79. +1
    -1
      client/sdk/api/storage_test.go
  80. +1
    -1
      client/sdk/api/userspace.go
  81. +1
    -1
      client/types/types.go
  82. +1
    -1
      common/globals/globals.go
  83. +4
    -4
      common/globals/pools.go
  84. +1
    -1
      common/globals/stats.go
  85. +1
    -1
      common/globals/utils.go
  86. +2
    -2
      common/models/datamap/datamap.go
  87. +3
    -3
      common/pkgs/connectivity/collector.go
  88. +1
    -1
      common/pkgs/distlock/reqbuilder/metadata.go
  89. +2
    -2
      common/pkgs/distlock/reqbuilder/metadata_object.go
  90. +2
    -2
      common/pkgs/distlock/reqbuilder/shard_store.go
  91. +2
    -2
      common/pkgs/distlock/reqbuilder/storage.go
  92. +1
    -1
      common/pkgs/distlock/service.go
  93. +2
    -2
      common/pkgs/ioswitch2/fromto.go
  94. +2
    -2
      common/pkgs/ioswitch2/http_hub_worker.go
  95. +3
    -3
      common/pkgs/ioswitch2/hub_worker.go
  96. +3
    -3
      common/pkgs/ioswitch2/ops2/bypass.go
  97. +1
    -1
      common/pkgs/ioswitch2/ops2/driver.go
  98. +4
    -4
      common/pkgs/ioswitch2/ops2/ec.go
  99. +3
    -3
      common/pkgs/ioswitch2/ops2/multipart.go
  100. +1
    -1
      common/pkgs/ioswitch2/ops2/ops.go

+ 2
- 2
client/internal/accessstat/access_stat.go View File

@@ -6,8 +6,8 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/pkgs/async"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type AccessStatEventChan = async.UnboundChannel[AccessStatEvent] type AccessStatEventChan = async.UnboundChannel[AccessStatEvent]


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

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


"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


func BucketListUserBuckets(ctx CommandContext) error { func BucketListUserBuckets(ctx CommandContext) error {


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

@@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"time" "time"


cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


func CacheMovePackage(ctx CommandContext, packageID cdssdk.PackageID, stgID cdssdk.StorageID) error { func CacheMovePackage(ctx CommandContext, packageID cdssdk.PackageID, stgID cdssdk.StorageID) error {


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

@@ -2,7 +2,7 @@ package cmdline


import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gitlink.org.cn/cloudream/storage2/client/internal/services"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/services"
) )


type CommandContext struct { type CommandContext struct {


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

@@ -7,7 +7,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/storage2/common/pkgs/distlock/lockprovider"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider"
) )


// DistLockLock 尝试获取分布式锁。 // DistLockLock 尝试获取分布式锁。


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

@@ -12,9 +12,9 @@ import (


"github.com/inhies/go-bytesize" "github.com/inhies/go-bytesize"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gitlink.org.cn/cloudream/storage2/client/internal/config"
cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/iterator"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/config"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator"
) )


func init() { func init() {


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

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


"github.com/spf13/cobra" "github.com/spf13/cobra"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


func init() { func init() {


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

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


"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
"github.com/spf13/cobra" "github.com/spf13/cobra"
cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


func init() { func init() {


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

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


"github.com/spf13/cobra" "github.com/spf13/cobra"
"gitlink.org.cn/cloudream/storage2/client/internal/config"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/config"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"
) )


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

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


"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
"github.com/spf13/cobra" "github.com/spf13/cobra"
cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


func init() { func init() {


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

@@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"


cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


// 必须添加的命令函数，用于处理对象上传。 // 必须添加的命令函数，用于处理对象上传。


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

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


"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/iterator"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator"
) )


// PackageListBucketPackages 列出指定存储桶中的所有包裹。 // PackageListBucketPackages 列出指定存储桶中的所有包裹。


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

@@ -12,7 +12,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"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/storage2/client/types"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


func init() { func init() {


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

@@ -7,22 +7,22 @@ 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/storage2/client/internal/accessstat"
"gitlink.org.cn/cloudream/storage2/client/internal/config"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/storage2/client/internal/http"
"gitlink.org.cn/cloudream/storage2/client/internal/metacache"
"gitlink.org.cn/cloudream/storage2/client/internal/mount"
"gitlink.org.cn/cloudream/storage2/client/internal/services"
"gitlink.org.cn/cloudream/storage2/client/internal/uploader"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/models/datamap"
"gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity"
"gitlink.org.cn/cloudream/storage2/common/pkgs/distlock"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/accessstat"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/config"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/http"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/services"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/models/datamap"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent"
) )


// 初始化函数，将ServeHTTP命令注册到命令列表中。 // 初始化函数，将ServeHTTP命令注册到命令列表中。


+ 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/storage2/client/internal/config"
"gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/config"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent"
) )


func init() { func init() {


+ 4
- 4
client/internal/cmdline/test.go View File

@@ -11,10 +11,10 @@ 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"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser"
coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser"
coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator"
) )


func init() { func init() {


+ 17
- 17
client/internal/cmdline/vfstest.go View File

@@ -8,23 +8,23 @@ 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/storage2/client/internal/accessstat"
"gitlink.org.cn/cloudream/storage2/client/internal/config"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/storage2/client/internal/http"
"gitlink.org.cn/cloudream/storage2/client/internal/metacache"
"gitlink.org.cn/cloudream/storage2/client/internal/mount"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfstest"
"gitlink.org.cn/cloudream/storage2/client/internal/services"
"gitlink.org.cn/cloudream/storage2/client/internal/uploader"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/models/datamap"
"gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity"
"gitlink.org.cn/cloudream/storage2/common/pkgs/distlock"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/accessstat"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/config"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/http"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfstest"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/services"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/models/datamap"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent"
) )


// 初始化函数，将ServeHTTP命令注册到命令列表中。 // 初始化函数，将ServeHTTP命令注册到命令列表中。


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

@@ -5,14 +5,14 @@ import (
"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"
"gitlink.org.cn/cloudream/common/utils/config" "gitlink.org.cn/cloudream/common/utils/config"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/storage2/client/internal/http"
mntcfg "gitlink.org.cn/cloudream/storage2/client/internal/mount/config"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity"
hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/http"
mntcfg "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity"
hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub"
) )


type Config struct { type Config struct {


+ 1
- 1
client/internal/db/bucket.go View File

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


"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
) )




+ 1
- 1
client/internal/db/object.go View File

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


"gitlink.org.cn/cloudream/common/utils/sort2" "gitlink.org.cn/cloudream/common/utils/sort2"
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type ObjectDB struct { type ObjectDB struct {


+ 1
- 1
client/internal/db/object_access_stat.go View File

@@ -1,7 +1,7 @@
package db package db


import ( import (
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )


+ 1
- 1
client/internal/db/object_block.go View File

@@ -1,7 +1,7 @@
package db package db


import ( import (
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )




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

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


"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
) )




+ 1
- 1
client/internal/db/package_access_stat.go View File

@@ -1,7 +1,7 @@
package db package db


import ( import (
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )


+ 1
- 1
client/internal/db/pinned_object.go View File

@@ -3,7 +3,7 @@ package db
import ( import (
"time" "time"


"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )




+ 1
- 1
client/internal/db/user_space.go View File

@@ -1,7 +1,7 @@
package db package db


import ( import (
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type UserSpaceDB struct { type UserSpaceDB struct {


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

@@ -6,11 +6,11 @@ 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"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool"
) )


const ( const (


+ 8
- 8
client/internal/downloader/iterator.go View File

@@ -11,14 +11,14 @@ 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/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/storage2/client/types"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/pkgs/distlock"
"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"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/iterator"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


type downloadSpaceInfo struct { type downloadSpaceInfo struct {


+ 1
- 1
client/internal/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/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/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) {


+ 3
- 3
client/internal/downloader/lrc_strip_iterator.go View File

@@ -9,9 +9,9 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/iterator" "gitlink.org.cn/cloudream/common/pkgs/iterator"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/math2"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitchlrc/parser"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitchlrc/parser"
) )


type LRCStripIterator struct { type LRCStripIterator struct {


+ 4
- 4
client/internal/downloader/strategy/selector.go View File

@@ -10,10 +10,10 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/bitmap" "gitlink.org.cn/cloudream/common/pkgs/bitmap"
"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/storage2/client/internal/metacache"
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/consts"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/consts"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


type Request struct { type Request struct {


+ 3
- 3
client/internal/downloader/strip_iterator.go View File

@@ -9,9 +9,9 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/iterator" "gitlink.org.cn/cloudream/common/pkgs/iterator"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/common/utils/math2" "gitlink.org.cn/cloudream/common/utils/math2"
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser"
) )


type downloadBlock struct { type downloadBlock struct {


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

@@ -8,7 +8,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"
cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
) )


type BucketService struct { type BucketService struct {


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

@@ -8,8 +8,8 @@ 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"
cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
cdsapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
cdsapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
) )


type CacheService struct { type CacheService struct {


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

@@ -1,6 +1,6 @@
package http package http


import "gitlink.org.cn/cloudream/storage2/client/types"
import "gitlink.org.cn/cloudream/jcs-pub/client/types"


type Config struct { type Config struct {
Enabled bool `json:"enabled"` Enabled bool `json:"enabled"`


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

@@ -6,7 +6,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"
cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
) )


type MountService struct { type MountService struct {


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

@@ -13,9 +13,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/utils/math2" "gitlink.org.cn/cloudream/common/utils/math2"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type ObjectService struct { type ObjectService struct {


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

@@ -10,8 +10,8 @@ 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"
cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


// PackageService 包服务，负责处理包相关的HTTP请求。 // PackageService 包服务，负责处理包相关的HTTP请求。


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

@@ -12,8 +12,8 @@ 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/utils/math2" "gitlink.org.cn/cloudream/common/utils/math2"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
) )


type PresignedService struct { type PresignedService struct {


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

@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/pkgs/async"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage2/client/internal/services"
cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/services"
cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
) )


type ServerEventChan = async.UnboundChannel[ServerEvent] type ServerEventChan = async.UnboundChannel[ServerEvent]


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

@@ -8,7 +8,7 @@ import (
"github.com/samber/lo" "github.com/samber/lo"
"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/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type TempService struct { type TempService struct {


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

@@ -7,7 +7,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"
cliapi "gitlink.org.cn/cloudream/storage2/client/sdk/api"
cliapi "gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
) )


type UserSpaceService struct { type UserSpaceService struct {


+ 3
- 3
client/internal/metacache/connectivity.go View File

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


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


func (m *MetaCacheHost) AddConnectivity() *Connectivity { func (m *MetaCacheHost) AddConnectivity() *Connectivity {


+ 1
- 1
client/internal/metacache/host.go View File

@@ -3,7 +3,7 @@ package metacache
import ( import (
"time" "time"


"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
) )


type MetaCache interface { type MetaCache interface {


+ 3
- 3
client/internal/metacache/hubmeta.go View File

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


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


func (m *MetaCacheHost) AddHubMeta() *HubMeta { func (m *MetaCacheHost) AddHubMeta() *HubMeta {


+ 4
- 4
client/internal/metacache/storagemeta.go View File

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


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage2/client/types"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


func (m *MetaCacheHost) AddStorageMeta() *UserSpaceMeta { func (m *MetaCacheHost) AddStorageMeta() *UserSpaceMeta {


+ 1
- 1
client/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/storage2/client/internal/mount/config"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config"
) )


type Fuse struct { type Fuse struct {


+ 1
- 1
client/internal/mount/mount.go View File

@@ -2,7 +2,7 @@ package mount


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/pkgs/async"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
) )


type MountEventChan = async.UnboundChannel[MountEvent] type MountEventChan = async.UnboundChannel[MountEvent]


+ 7
- 7
client/internal/mount/mount_linux.go View File

@@ -6,13 +6,13 @@ 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/common/pkgs/async" "gitlink.org.cn/cloudream/common/pkgs/async"
db2 "gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/config"
fuse2 "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs"
"gitlink.org.cn/cloudream/storage2/client/internal/uploader"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
db2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config"
fuse2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type Mount struct { type Mount struct {


+ 5
- 5
client/internal/mount/mount_win.go View File

@@ -4,11 +4,11 @@ package mount


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/async" "gitlink.org.cn/cloudream/common/pkgs/async"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/config"
"gitlink.org.cn/cloudream/storage2/client/internal/uploader"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type Mount struct { type Mount struct {


+ 6
- 6
client/internal/mount/vfs/cache/cache.go View File

@@ -15,12 +15,12 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/trie" "gitlink.org.cn/cloudream/common/pkgs/trie"
"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/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/config"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/uploader"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type CacheEntry interface { type CacheEntry interface {


+ 2
- 2
client/internal/mount/vfs/cache/file.go View File

@@ -13,8 +13,8 @@ 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/storage2/client/internal/mount/fuse"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type FileInfo struct { type FileInfo struct {


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

@@ -1,6 +1,6 @@
package vfs package vfs


import "gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
import "gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"


type FuseDirReader struct { type FuseDirReader struct {
allEntries []fuse.FsEntry allEntries []fuse.FsEntry


+ 4
- 4
client/internal/mount/vfs/fuse.go View File

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


"gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/lo2"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
) )




+ 4
- 4
client/internal/mount/vfs/fuse_bucket.go View File

@@ -6,10 +6,10 @@ import (
"os" "os"
"time" "time"


"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
) )




+ 4
- 4
client/internal/mount/vfs/fuse_dir.go View File

@@ -5,10 +5,10 @@ import (
"os" "os"
"time" "time"


db2 "gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
db2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
) )




+ 3
- 3
client/internal/mount/vfs/fuse_file.go View File

@@ -4,9 +4,9 @@ import (
"os" "os"
"time" "time"


"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
) )




+ 2
- 2
client/internal/mount/vfs/fuse_package.go View File

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


"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
) )


type FusePackage struct { type FusePackage struct {


+ 4
- 4
client/internal/mount/vfs/fuse_root.go View File

@@ -5,10 +5,10 @@ import (
"os" "os"
"time" "time"


db2 "gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
db2 "gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gorm.io/gorm" "gorm.io/gorm"
) )




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

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


import ( import (
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/config"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/storage2/client/internal/mount/vfs/cache"
"gitlink.org.cn/cloudream/storage2/client/internal/uploader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/config"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/fuse"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount/vfs/cache"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader"
) )


type Vfs struct { type Vfs struct {


+ 1
- 1
client/internal/mount/vfstest/fs.go View File

@@ -17,7 +17,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
"gitlink.org.cn/cloudream/storage2/client/internal/mount"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount"
) )


const ( const (


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

@@ -3,7 +3,7 @@ package services
import ( import (
"time" "time"


"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


// BucketService 是对存储桶进行操作的服务类 // BucketService 是对存储桶进行操作的服务类


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

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


cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"


stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
hubmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub"
coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/factory"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
hubmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub"
coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/factory"
) )


type CacheService struct { type CacheService struct {


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

@@ -10,13 +10,13 @@ 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"
"gitlink.org.cn/cloudream/common/utils/sort2" "gitlink.org.cn/cloudream/common/utils/sort2"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/sdk/api"
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/models/datamap"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/ops2"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/plans"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/sdk/api"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/models/datamap"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/plans"
"gorm.io/gorm" "gorm.io/gorm"
) )




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

@@ -5,10 +5,10 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"


"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/models/datamap"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/models/datamap"
) )


// PackageService 提供对包相关操作的服务接口 // PackageService 提供对包相关操作的服务接口


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

@@ -2,14 +2,14 @@ package services


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
"gitlink.org.cn/cloudream/storage2/client/internal/accessstat"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/storage2/client/internal/metacache"
"gitlink.org.cn/cloudream/storage2/client/internal/mount"
"gitlink.org.cn/cloudream/storage2/client/internal/uploader"
"gitlink.org.cn/cloudream/storage2/common/pkgs/sysevent"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/accessstat"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/uploader"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/sysevent"
) )


// Service 结构体封装了分布锁服务和任务管理服务。 // Service 结构体封装了分布锁服务和任务管理服务。


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

@@ -6,14 +6,14 @@ import (
"path" "path"


"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/storage2/client/types"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ioswitch2/parser"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/downloader/strategy"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser"
) )


type UserSpaceService struct { type UserSpaceService struct {


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

@@ -1,8 +1,8 @@
package services package services


import ( import (
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/models/datamap"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/models/datamap"
) )


func getBlockTypeFromRed(red clitypes.Redundancy) string { func getBlockTypeFromRed(red clitypes.Redundancy) string {


+ 5
- 5
client/internal/uploader/create_load.go View File

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


"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/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"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser"
) )


type CreateLoadUploader struct { type CreateLoadUploader struct {


+ 5
- 5
client/internal/uploader/update.go View File

@@ -10,11 +10,11 @@ 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"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/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"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser"
) )


type UpdateUploader struct { type UpdateUploader struct {


+ 10
- 10
client/internal/uploader/uploader.go View File

@@ -12,16 +12,16 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
"gitlink.org.cn/cloudream/common/utils/lo2" "gitlink.org.cn/cloudream/common/utils/lo2"
"gitlink.org.cn/cloudream/common/utils/sort2" "gitlink.org.cn/cloudream/common/utils/sort2"
"gitlink.org.cn/cloudream/storage2/client/internal/db"
"gitlink.org.cn/cloudream/storage2/client/internal/metacache"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
"gitlink.org.cn/cloudream/storage2/common/pkgs/connectivity"
"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"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/db"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/metacache"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/connectivity"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/ops2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2/parser"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool"
) )


type Uploader struct { type Uploader struct {


+ 1
- 1
client/main.go View File

@@ -1,7 +1,7 @@
package main package main


import ( import (
"gitlink.org.cn/cloudream/storage2/client/internal/cmdline"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/cmdline"
_ "google.golang.org/grpc/balancer/grpclb" _ "google.golang.org/grpc/balancer/grpclb"
) )




+ 1
- 1
client/sdk/api/bucket.go View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"


"gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/sdks"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type BucketService struct { type BucketService struct {


+ 1
- 1
client/sdk/api/cache.go View File

@@ -5,7 +5,7 @@ import (
"net/http" "net/http"


"gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/sdks"
cdssdk "gitlink.org.cn/cloudream/storage2/client/types"
cdssdk "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


const CacheMovePackagePath = "/cache/movePackage" const CacheMovePackagePath = "/cache/movePackage"


+ 1
- 1
client/sdk/api/mount.go View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"


"gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/sdks"
"gitlink.org.cn/cloudream/storage2/client/internal/mount"
"gitlink.org.cn/cloudream/jcs-pub/client/internal/mount"
) )


type MountService struct { type MountService struct {


+ 1
- 1
client/sdk/api/object.go View File

@@ -17,7 +17,7 @@ import (
"gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/sdks"
"gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/http2"
"gitlink.org.cn/cloudream/common/utils/serder" "gitlink.org.cn/cloudream/common/utils/serder"
"gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type ObjectService struct { type ObjectService struct {


+ 1
- 1
client/sdk/api/package.go View File

@@ -10,7 +10,7 @@ import (
"gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/sdks"
"gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/http2"
"gitlink.org.cn/cloudream/common/utils/serder" "gitlink.org.cn/cloudream/common/utils/serder"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type PackageService struct { type PackageService struct {


+ 1
- 1
client/sdk/api/presigned.go View File

@@ -10,7 +10,7 @@ import (
v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4" v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
"github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/credentials"
"github.com/google/go-querystring/query" "github.com/google/go-querystring/query"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


type PresignedService struct { type PresignedService struct {


+ 1
- 1
client/sdk/api/storage_test.go View File

@@ -9,7 +9,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"gitlink.org.cn/cloudream/common/pkgs/iterator" "gitlink.org.cn/cloudream/common/pkgs/iterator"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


func Test_PackageGet(t *testing.T) { func Test_PackageGet(t *testing.T) {


+ 1
- 1
client/sdk/api/userspace.go View File

@@ -4,7 +4,7 @@ import (
"net/http" "net/http"


"gitlink.org.cn/cloudream/common/sdks" "gitlink.org.cn/cloudream/common/sdks"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
) )


const UserSpaceLoadPackagePath = "/userspace/loadPackage" const UserSpaceLoadPackagePath = "/userspace/loadPackage"


+ 1
- 1
client/types/types.go View File

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


"github.com/samber/lo" "github.com/samber/lo"
"gitlink.org.cn/cloudream/common/utils/sort2" "gitlink.org.cn/cloudream/common/utils/sort2"
cotypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
cotypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


const ( const (


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

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


import ( import (
"gitlink.org.cn/cloudream/storage2/coordinator/types"
"gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


type LocalMachineInfo struct { type LocalMachineInfo struct {


+ 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"
hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub"
coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator"
hubmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/hub"
scmq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/scanner"
hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub"
coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator"
hubmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/hub"
scmq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/scanner"
) )


var HubMQPool hubmq.Pool var HubMQPool hubmq.Pool


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

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


import "gitlink.org.cn/cloudream/storage2/common/pkgs/servicestats"
import "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/servicestats"


var Stats servicestats.StatsHost var Stats servicestats.StatsHost

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

@@ -1,6 +1,6 @@
package stgglb package stgglb


import cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
import cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"


// 根据当前节点与目标地址的距离关系，选择合适的地址 // 根据当前节点与目标地址的距离关系，选择合适的地址
func SelectGRPCAddress(hub cortypes.Hub, addr cortypes.GRPCAddressInfo) (string, int) { func SelectGRPCAddress(hub cortypes.Hub, addr cortypes.GRPCAddressInfo) (string, int) {


+ 2
- 2
common/models/datamap/datamap.go View File

@@ -6,8 +6,8 @@ import (


"gitlink.org.cn/cloudream/common/pkgs/types" "gitlink.org.cn/cloudream/common/pkgs/types"
"gitlink.org.cn/cloudream/common/utils/serder" "gitlink.org.cn/cloudream/common/utils/serder"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


// 系统事件 // 系统事件


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

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


"gitlink.org.cn/cloudream/common/pkgs/logger" "gitlink.org.cn/cloudream/common/pkgs/logger"
stgglb "gitlink.org.cn/cloudream/storage2/common/globals"
coormq "gitlink.org.cn/cloudream/storage2/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
coormq "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/mq/coordinator"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


type Connectivity struct { type Connectivity 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/storage2/common/pkgs/distlock/lockprovider"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider"
) )


type MetadataLockReqBuilder struct { type MetadataLockReqBuilder struct {


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

@@ -2,8 +2,8 @@ package reqbuilder


import ( import (
"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider"
) )


type MetadataObjectLockReqBuilder struct { type MetadataObjectLockReqBuilder struct {


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

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


"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
"gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


type ShardStoreLockReqBuilder struct { type ShardStoreLockReqBuilder struct {


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

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


"gitlink.org.cn/cloudream/common/pkgs/distlock" "gitlink.org.cn/cloudream/common/pkgs/distlock"
"gitlink.org.cn/cloudream/storage2/common/pkgs/distlock/lockprovider"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


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/storage2/common/pkgs/distlock/lockprovider"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/distlock/lockprovider"
) )


type Service = distlock.Service type Service = distlock.Service


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

@@ -3,8 +3,8 @@ package ioswitch2
import ( import (
"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/storage2/client/types"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
"gitlink.org.cn/cloudream/jcs-pub/client/types"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


type From interface { type From interface {


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

@@ -8,8 +8,8 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec" "gitlink.org.cn/cloudream/common/pkgs/ioswitch/exec"
"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/storage2/common/globals"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


type HttpHubWorker struct { type HttpHubWorker struct {


+ 3
- 3
common/pkgs/ioswitch2/hub_worker.go View File

@@ -8,9 +8,9 @@ import (
"gitlink.org.cn/cloudream/common/pkgs/types" "gitlink.org.cn/cloudream/common/pkgs/types"
"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/storage2/common/globals"
hubrpc "gitlink.org.cn/cloudream/storage2/common/pkgs/grpc/hub"
cortypes "gitlink.org.cn/cloudream/storage2/coordinator/types"
stgglb "gitlink.org.cn/cloudream/jcs-pub/common/globals"
hubrpc "gitlink.org.cn/cloudream/jcs-pub/common/pkgs/grpc/hub"
cortypes "gitlink.org.cn/cloudream/jcs-pub/coordinator/types"
) )


var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo]( var _ = serder.UseTypeUnionExternallyTagged(types.Ref(types.NewTypeUnion[exec.WorkerInfo](


+ 3
- 3
common/pkgs/ioswitch2/ops2/bypass.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"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/jcs-pub/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/storage2/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
) )


// TODO 想办法直接使用ops里的Node，而不是重新实现一遍 // TODO 想办法直接使用ops里的Node，而不是重新实现一遍


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

@@ -11,10 +11,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"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/ec"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ec"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/types"
) )


func init() { func init() {


+ 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"
clitypes "gitlink.org.cn/cloudream/storage2/client/types"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/storage2/common/pkgs/storage/types"
clitypes "gitlink.org.cn/cloudream/jcs-pub/client/types"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/storage/pool"
"gitlink.org.cn/cloudream/jcs-pub/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/storage2/common/pkgs/ioswitch2"
"gitlink.org.cn/cloudream/jcs-pub/common/pkgs/ioswitch2"
) )


type GraphNodeBuilder struct { type GraphNodeBuilder struct {


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

Write Preview
Loading…
Cancel
Save