From b2174e61224381eeede1e00a1c26888f9f76a19f Mon Sep 17 00:00:00 2001 From: Sydonian <794346190@qq.com> Date: Wed, 23 Oct 2024 14:44:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9B=AE=E5=BD=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B9=8B=E5=90=8E=E7=9A=84=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/internal/http/hub_io.go | 3 +- client/internal/http/bucket.go | 16 ++++----- client/internal/http/cache.go | 3 +- client/internal/http/node.go | 3 +- client/internal/http/object.go | 26 +++++++------- client/internal/http/package.go | 28 +++++++-------- client/internal/http/server.go | 44 ++++++++++++------------ client/internal/http/storage.go | 14 ++++---- client/internal/services/object.go | 5 +-- common/pkgs/ioswitchlrc/parser/passes.go | 6 ++-- 10 files changed, 75 insertions(+), 73 deletions(-) diff --git a/agent/internal/http/hub_io.go b/agent/internal/http/hub_io.go index bae2953..2fdeb48 100644 --- a/agent/internal/http/hub_io.go +++ b/agent/internal/http/hub_io.go @@ -5,7 +5,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "net/http" "time" @@ -195,7 +194,7 @@ func (s *IOService) SendStream(ctx *gin.Context) { } func (s *IOService) ExecuteIOPlan(ctx *gin.Context) { - bodyBytes, err := ioutil.ReadAll(ctx.Request.Body) + bodyBytes, err := io.ReadAll(ctx.Request.Body) if err != nil { logger.Warnf("reading body: %s", err.Error()) ctx.JSON(http.StatusInternalServerError, Failed("400", "internal error")) diff --git a/client/internal/http/bucket.go b/client/internal/http/bucket.go index 515bc20..1fb319d 100644 --- a/client/internal/http/bucket.go +++ b/client/internal/http/bucket.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" ) type BucketService struct { @@ -22,7 +22,7 @@ func (s *Server) Bucket() *BucketService { func (s *BucketService) GetByName(ctx *gin.Context) { log := logger.WithField("HTTP", "Bucket.GetByName") - var req cdssdk.BucketGetByName + var req cdsapi.BucketGetByName if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding query: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -36,7 +36,7 @@ func (s *BucketService) GetByName(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.BucketGetByNameResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.BucketGetByNameResp{ Bucket: bucket, })) } @@ -44,7 +44,7 @@ func (s *BucketService) GetByName(ctx *gin.Context) { func (s *BucketService) Create(ctx *gin.Context) { log := logger.WithField("HTTP", "Bucket.Create") - var req cdssdk.BucketCreate + var req cdsapi.BucketCreate if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -58,7 +58,7 @@ func (s *BucketService) Create(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.BucketCreateResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.BucketCreateResp{ Bucket: bucket, })) } @@ -66,7 +66,7 @@ func (s *BucketService) Create(ctx *gin.Context) { func (s *BucketService) Delete(ctx *gin.Context) { log := logger.WithField("HTTP", "Bucket.Delete") - var req cdssdk.BucketDelete + var req cdsapi.BucketDelete if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -85,7 +85,7 @@ func (s *BucketService) Delete(ctx *gin.Context) { func (s *BucketService) ListUserBuckets(ctx *gin.Context) { log := logger.WithField("HTTP", "Bucket.ListUserBuckets") - var req cdssdk.BucketListUserBucketsReq + var req cdsapi.BucketListUserBucketsReq if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding query: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -99,7 +99,7 @@ func (s *BucketService) ListUserBuckets(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.BucketListUserBucketsResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.BucketListUserBucketsResp{ Buckets: buckets, })) } diff --git a/client/internal/http/cache.go b/client/internal/http/cache.go index ab86fda..0e48f19 100644 --- a/client/internal/http/cache.go +++ b/client/internal/http/cache.go @@ -8,6 +8,7 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" ) type CacheService struct { @@ -25,7 +26,7 @@ type CacheMovePackageReq struct { PackageID *cdssdk.PackageID `json:"packageID" binding:"required"` NodeID *cdssdk.NodeID `json:"nodeID" binding:"required"` } -type CacheMovePackageResp = cdssdk.CacheMovePackageResp +type CacheMovePackageResp = cdsapi.CacheMovePackageResp func (s *CacheService) MovePackage(ctx *gin.Context) { log := logger.WithField("HTTP", "Cache.LoadPackage") diff --git a/client/internal/http/node.go b/client/internal/http/node.go index fa6d729..760c453 100644 --- a/client/internal/http/node.go +++ b/client/internal/http/node.go @@ -7,6 +7,7 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" ) type NodeService struct { @@ -22,7 +23,7 @@ func (s *Server) NodeSvc() *NodeService { type GetNodesReq struct { NodeIDs *[]cdssdk.NodeID `form:"nodeIDs" binding:"required"` } -type GetNodesResp = cdssdk.NodeGetNodesResp +type GetNodesResp = cdsapi.NodeGetNodesResp func (s *ObjectService) GetNodes(ctx *gin.Context) { log := logger.WithField("HTTP", "Node.GetNodes") diff --git a/client/internal/http/object.go b/client/internal/http/object.go index 30b508c..e47668f 100644 --- a/client/internal/http/object.go +++ b/client/internal/http/object.go @@ -11,7 +11,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" stgglb "gitlink.org.cn/cloudream/storage/common/globals" "gitlink.org.cn/cloudream/storage/common/pkgs/downloader" ) @@ -27,7 +27,7 @@ func (s *Server) Object() *ObjectService { } type ObjectUploadReq struct { - Info cdssdk.ObjectUploadInfo `form:"info" binding:"required"` + Info cdsapi.ObjectUploadInfo `form:"info" binding:"required"` Files []*multipart.FileHeader `form:"files"` } @@ -62,20 +62,20 @@ func (s *ObjectService) Upload(ctx *gin.Context) { return } - uploadeds := make([]cdssdk.UploadedObject, len(objs.Objects)) + uploadeds := make([]cdsapi.UploadedObject, len(objs.Objects)) for i, obj := range objs.Objects { err := "" if obj.Error != nil { err = obj.Error.Error() } o := obj.Object - uploadeds[i] = cdssdk.UploadedObject{ + uploadeds[i] = cdsapi.UploadedObject{ Object: &o, Error: err, } } - ctx.JSON(http.StatusOK, OK(cdssdk.ObjectUploadResp{Uploadeds: uploadeds})) + ctx.JSON(http.StatusOK, OK(cdsapi.ObjectUploadResp{Uploadeds: uploadeds})) return } @@ -90,7 +90,7 @@ func (s *ObjectService) Upload(ctx *gin.Context) { func (s *ObjectService) Download(ctx *gin.Context) { log := logger.WithField("HTTP", "Object.Download") - var req cdssdk.ObjectDownload + var req cdsapi.ObjectDownload if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -133,7 +133,7 @@ func (s *ObjectService) Download(ctx *gin.Context) { func (s *ObjectService) UpdateInfo(ctx *gin.Context) { log := logger.WithField("HTTP", "Object.UpdateInfo") - var req cdssdk.ObjectUpdateInfo + var req cdsapi.ObjectUpdateInfo if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -147,13 +147,13 @@ func (s *ObjectService) UpdateInfo(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.ObjectUpdateInfoResp{Successes: sucs})) + ctx.JSON(http.StatusOK, OK(cdsapi.ObjectUpdateInfoResp{Successes: sucs})) } func (s *ObjectService) Move(ctx *gin.Context) { log := logger.WithField("HTTP", "Object.Move") - var req cdssdk.ObjectMove + var req cdsapi.ObjectMove if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -167,13 +167,13 @@ func (s *ObjectService) Move(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.ObjectMoveResp{Successes: sucs})) + ctx.JSON(http.StatusOK, OK(cdsapi.ObjectMoveResp{Successes: sucs})) } func (s *ObjectService) Delete(ctx *gin.Context) { log := logger.WithField("HTTP", "Object.Delete") - var req cdssdk.ObjectDelete + var req cdsapi.ObjectDelete if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -193,7 +193,7 @@ func (s *ObjectService) Delete(ctx *gin.Context) { func (s *ObjectService) GetPackageObjects(ctx *gin.Context) { log := logger.WithField("HTTP", "Object.GetPackageObjects") - var req cdssdk.ObjectGetPackageObjects + var req cdsapi.ObjectGetPackageObjects if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -207,5 +207,5 @@ func (s *ObjectService) GetPackageObjects(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.ObjectGetPackageObjectsResp{Objects: objs})) + ctx.JSON(http.StatusOK, OK(cdsapi.ObjectGetPackageObjectsResp{Objects: objs})) } diff --git a/client/internal/http/package.go b/client/internal/http/package.go index b549dd5..7c98b5c 100644 --- a/client/internal/http/package.go +++ b/client/internal/http/package.go @@ -9,7 +9,7 @@ import ( "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/iterator" "gitlink.org.cn/cloudream/common/pkgs/logger" - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" stgiter "gitlink.org.cn/cloudream/storage/common/pkgs/iterator" ) @@ -27,7 +27,7 @@ func (s *Server) Package() *PackageService { func (s *PackageService) Get(ctx *gin.Context) { log := logger.WithField("HTTP", "Package.Get") - var req cdssdk.PackageGetReq + var req cdsapi.PackageGetReq if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -41,13 +41,13 @@ func (s *PackageService) Get(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.PackageGetResp{Package: *pkg})) + ctx.JSON(http.StatusOK, OK(cdsapi.PackageGetResp{Package: *pkg})) } func (s *PackageService) GetByName(ctx *gin.Context) { log := logger.WithField("HTTP", "Package.GetByName") - var req cdssdk.PackageGetByName + var req cdsapi.PackageGetByName if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding query: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -61,12 +61,12 @@ func (s *PackageService) GetByName(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.PackageGetByNameResp{Package: *pkg})) + ctx.JSON(http.StatusOK, OK(cdsapi.PackageGetByNameResp{Package: *pkg})) } func (s *PackageService) Create(ctx *gin.Context) { log := logger.WithField("HTTP", "Package.Create") - var req cdssdk.PackageCreate + var req cdsapi.PackageCreate if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -80,7 +80,7 @@ func (s *PackageService) Create(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.PackageCreateResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.PackageCreateResp{ Package: pkg, })) } @@ -88,7 +88,7 @@ func (s *PackageService) Create(ctx *gin.Context) { func (s *PackageService) Delete(ctx *gin.Context) { log := logger.WithField("HTTP", "Package.Delete") - var req cdssdk.PackageDelete + var req cdsapi.PackageDelete if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -108,7 +108,7 @@ func (s *PackageService) Delete(ctx *gin.Context) { func (s *PackageService) ListBucketPackages(ctx *gin.Context) { log := logger.WithField("HTTP", "Package.ListBucketPackages") - var req cdssdk.PackageListBucketPackages + var req cdsapi.PackageListBucketPackages if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding query: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -122,7 +122,7 @@ func (s *PackageService) ListBucketPackages(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.PackageListBucketPackagesResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.PackageListBucketPackagesResp{ Packages: pkgs, })) } @@ -130,7 +130,7 @@ func (s *PackageService) ListBucketPackages(ctx *gin.Context) { func (s *PackageService) GetCachedNodes(ctx *gin.Context) { log := logger.WithField("HTTP", "Package.GetCachedNodes") - var req cdssdk.PackageGetCachedNodesReq + var req cdsapi.PackageGetCachedNodesReq if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding query: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -144,13 +144,13 @@ func (s *PackageService) GetCachedNodes(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.PackageGetCachedNodesResp{PackageCachingInfo: resp})) + ctx.JSON(http.StatusOK, OK(cdsapi.PackageGetCachedNodesResp{PackageCachingInfo: resp})) } func (s *PackageService) GetLoadedNodes(ctx *gin.Context) { log := logger.WithField("HTTP", "Package.GetLoadedNodes") - var req cdssdk.PackageGetLoadedNodesReq + var req cdsapi.PackageGetLoadedNodesReq if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding query: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -164,7 +164,7 @@ func (s *PackageService) GetLoadedNodes(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.PackageGetLoadedNodesResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.PackageGetLoadedNodesResp{ NodeIDs: nodeIDs, })) } diff --git a/client/internal/http/server.go b/client/internal/http/server.go index 9a7dd23..7f07656 100644 --- a/client/internal/http/server.go +++ b/client/internal/http/server.go @@ -3,7 +3,7 @@ package http import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/pkgs/logger" - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" "gitlink.org.cn/cloudream/storage/client/internal/services" ) @@ -43,29 +43,29 @@ func (s *Server) initRouters() { initTemp(rt, s) - rt.GET(cdssdk.ObjectDownloadPath, s.Object().Download) - rt.POST(cdssdk.ObjectUploadPath, s.Object().Upload) - rt.GET(cdssdk.ObjectGetPackageObjectsPath, s.Object().GetPackageObjects) - rt.POST(cdssdk.ObjectUpdateInfoPath, s.Object().UpdateInfo) - rt.POST(cdssdk.ObjectMovePath, s.Object().Move) - rt.POST(cdssdk.ObjectDeletePath, s.Object().Delete) + rt.GET(cdsapi.ObjectDownloadPath, s.Object().Download) + rt.POST(cdsapi.ObjectUploadPath, s.Object().Upload) + rt.GET(cdsapi.ObjectGetPackageObjectsPath, s.Object().GetPackageObjects) + rt.POST(cdsapi.ObjectUpdateInfoPath, s.Object().UpdateInfo) + rt.POST(cdsapi.ObjectMovePath, s.Object().Move) + rt.POST(cdsapi.ObjectDeletePath, s.Object().Delete) - rt.GET(cdssdk.PackageGetPath, s.Package().Get) - rt.GET(cdssdk.PackageGetByNamePath, s.Package().GetByName) - rt.POST(cdssdk.PackageCreatePath, s.Package().Create) - rt.POST(cdssdk.PackageDeletePath, s.Package().Delete) - rt.GET(cdssdk.PackageListBucketPackagesPath, s.Package().ListBucketPackages) - rt.GET(cdssdk.PackageGetCachedNodesPath, s.Package().GetCachedNodes) - rt.GET(cdssdk.PackageGetLoadedNodesPath, s.Package().GetLoadedNodes) + rt.GET(cdsapi.PackageGetPath, s.Package().Get) + rt.GET(cdsapi.PackageGetByNamePath, s.Package().GetByName) + rt.POST(cdsapi.PackageCreatePath, s.Package().Create) + rt.POST(cdsapi.PackageDeletePath, s.Package().Delete) + rt.GET(cdsapi.PackageListBucketPackagesPath, s.Package().ListBucketPackages) + rt.GET(cdsapi.PackageGetCachedNodesPath, s.Package().GetCachedNodes) + rt.GET(cdsapi.PackageGetLoadedNodesPath, s.Package().GetLoadedNodes) - rt.POST(cdssdk.StorageLoadPackagePath, s.Storage().LoadPackage) - rt.POST(cdssdk.StorageCreatePackagePath, s.Storage().CreatePackage) - rt.GET(cdssdk.StorageGetPath, s.Storage().Get) + rt.POST(cdsapi.StorageLoadPackagePath, s.Storage().LoadPackage) + rt.POST(cdsapi.StorageCreatePackagePath, s.Storage().CreatePackage) + rt.GET(cdsapi.StorageGetPath, s.Storage().Get) - rt.POST(cdssdk.CacheMovePackagePath, s.Cache().MovePackage) + rt.POST(cdsapi.CacheMovePackagePath, s.Cache().MovePackage) - rt.GET(cdssdk.BucketGetByNamePath, s.Bucket().GetByName) - rt.POST(cdssdk.BucketCreatePath, s.Bucket().Create) - rt.POST(cdssdk.BucketDeletePath, s.Bucket().Delete) - rt.GET(cdssdk.BucketListUserBucketsPath, s.Bucket().ListUserBuckets) + rt.GET(cdsapi.BucketGetByNamePath, s.Bucket().GetByName) + rt.POST(cdsapi.BucketCreatePath, s.Bucket().Create) + rt.POST(cdsapi.BucketDeletePath, s.Bucket().Delete) + rt.GET(cdsapi.BucketListUserBucketsPath, s.Bucket().ListUserBuckets) } diff --git a/client/internal/http/storage.go b/client/internal/http/storage.go index e284b84..eee7205 100644 --- a/client/internal/http/storage.go +++ b/client/internal/http/storage.go @@ -9,7 +9,7 @@ import ( "github.com/gin-gonic/gin" "gitlink.org.cn/cloudream/common/consts/errorcode" "gitlink.org.cn/cloudream/common/pkgs/logger" - cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" ) type StorageService struct { @@ -25,7 +25,7 @@ func (s *Server) Storage() *StorageService { func (s *StorageService) LoadPackage(ctx *gin.Context) { log := logger.WithField("HTTP", "Storage.LoadPackage") - var req cdssdk.StorageLoadPackageReq + var req cdsapi.StorageLoadPackageReq if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -48,7 +48,7 @@ func (s *StorageService) LoadPackage(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.StorageLoadPackageResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.StorageLoadPackageResp{ FullPath: filepath.Join(ret.RemoteBase, ret.PackagePath), PackagePath: ret.PackagePath, LocalBase: ret.LocalBase, @@ -68,7 +68,7 @@ func (s *StorageService) LoadPackage(ctx *gin.Context) { func (s *StorageService) CreatePackage(ctx *gin.Context) { log := logger.WithField("HTTP", "Storage.CreatePackage") - var req cdssdk.StorageCreatePackageReq + var req cdsapi.StorageCreatePackageReq if err := ctx.ShouldBindJSON(&req); err != nil { log.Warnf("binding body: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -92,7 +92,7 @@ func (s *StorageService) CreatePackage(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.StorageCreatePackageResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.StorageCreatePackageResp{ PackageID: packageID, })) return @@ -109,7 +109,7 @@ func (s *StorageService) CreatePackage(ctx *gin.Context) { func (s *StorageService) Get(ctx *gin.Context) { log := logger.WithField("HTTP", "Storage.Get") - var req cdssdk.StorageGet + var req cdsapi.StorageGet if err := ctx.ShouldBindQuery(&req); err != nil { log.Warnf("binding query: %s", err.Error()) ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "missing argument or invalid argument")) @@ -123,7 +123,7 @@ func (s *StorageService) Get(ctx *gin.Context) { return } - ctx.JSON(http.StatusOK, OK(cdssdk.StorageGetResp{ + ctx.JSON(http.StatusOK, OK(cdsapi.StorageGetResp{ Storage: *info, })) } diff --git a/client/internal/services/object.go b/client/internal/services/object.go index 6622211..40262e1 100644 --- a/client/internal/services/object.go +++ b/client/internal/services/object.go @@ -5,6 +5,7 @@ import ( "time" cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" + "gitlink.org.cn/cloudream/common/sdks/storage/cdsapi" mytask "gitlink.org.cn/cloudream/storage/client/internal/task" stgglb "gitlink.org.cn/cloudream/storage/common/globals" stgmod "gitlink.org.cn/cloudream/storage/common/models" @@ -36,7 +37,7 @@ func (svc *ObjectService) WaitUploading(taskID string, waitTimeout time.Duration return false, nil, nil } -func (svc *ObjectService) UpdateInfo(userID cdssdk.UserID, updatings []cdssdk.UpdatingObject) ([]cdssdk.ObjectID, error) { +func (svc *ObjectService) UpdateInfo(userID cdssdk.UserID, updatings []cdsapi.UpdatingObject) ([]cdssdk.ObjectID, error) { coorCli, err := stgglb.CoordinatorMQPool.Acquire() if err != nil { return nil, fmt.Errorf("new coordinator client: %w", err) @@ -51,7 +52,7 @@ func (svc *ObjectService) UpdateInfo(userID cdssdk.UserID, updatings []cdssdk.Up return resp.Successes, nil } -func (svc *ObjectService) Move(userID cdssdk.UserID, movings []cdssdk.MovingObject) ([]cdssdk.ObjectID, error) { +func (svc *ObjectService) Move(userID cdssdk.UserID, movings []cdsapi.MovingObject) ([]cdssdk.ObjectID, error) { coorCli, err := stgglb.CoordinatorMQPool.Acquire() if err != nil { return nil, fmt.Errorf("new coordinator client: %w", err) diff --git a/common/pkgs/ioswitchlrc/parser/passes.go b/common/pkgs/ioswitchlrc/parser/passes.go index 94dfefa..cdf72de 100644 --- a/common/pkgs/ioswitchlrc/parser/passes.go +++ b/common/pkgs/ioswitchlrc/parser/passes.go @@ -63,7 +63,7 @@ func buildFromNode(ctx *GenerateContext, f ioswitchlrc.From) (ops2.FromNode, err switch f := f.(type) { case *ioswitchlrc.FromNode: - t := ctx.DAG.NewIPFSRead(f.Storage.StorageID, types.NewOpen(f.FileHash)) + t := ctx.DAG.NewShardRead(f.Storage.StorageID, types.NewOpen(f.FileHash)) if f.DataIndex == -1 { t.Open.WithNullableLength(repRange.Offset, repRange.Length) @@ -99,7 +99,7 @@ func buildFromNode(ctx *GenerateContext, f ioswitchlrc.From) (ops2.FromNode, err func buildToNode(ctx *GenerateContext, t ioswitchlrc.To) (ops2.ToNode, error) { switch t := t.(type) { case *ioswitchlrc.ToNode: - n := ctx.DAG.NewIPFSWrite(t.FileHashStoreKey) + n := ctx.DAG.NewShardWrite(t.FileHashStoreKey) n.Env().ToEnvWorker(&ioswitchlrc.AgentWorker{Node: t.Node}) n.Env().Pinned = true @@ -196,7 +196,7 @@ func dropUnused(ctx *GenerateContext) { // 为IPFS写入指令存储结果 func storeIPFSWriteResult(ctx *GenerateContext) { - dag.WalkOnlyType[*ops2.IPFSWriteNode](ctx.DAG.Graph, func(n *ops2.IPFSWriteNode) bool { + dag.WalkOnlyType[*ops2.ShardWriteNode](ctx.DAG.Graph, func(n *ops2.ShardWriteNode) bool { if n.FileHashStoreKey == "" { return true }