SharedStore重名为PublicStore

client/internal/services/storage.go

@@ -119,7 +119,7 @@ func (svc *StorageService) LoadPackage(userID cdssdk.UserID, packageID cdssdk.Pa
 			return fmt.Errorf("unsupported download strategy: %T", strg)
 		}
 
-		ft.AddTo(ioswitch2.NewLoadToShared(*destStg.MasterHub, *destStg, path.Join(rootPath, obj.Object.Path)))
+		ft.AddTo(ioswitch2.NewLoadToPublic(*destStg.MasterHub, *destStg, path.Join(rootPath, obj.Object.Path)))
 		// 顺便保存到同存储服务的分片存储中
 		if factory.GetBuilder(*destStg).ShardStoreDesc().Enabled() {
 			ft.AddTo(ioswitch2.NewToShardStore(*destStg.MasterHub, *destStg, ioswitch2.RawStream(), ""))

common/pkgs/ioswitch2/fromto.go

@@ -195,26 +195,26 @@ func (t *ToShardStore) GetRange() math2.Range {
 	return t.Range
 }
 
-type LoadToShared struct {
+type LoadToPublic struct {
 	Hub        cdssdk.Hub
 	Storage    stgmod.StorageDetail
 	ObjectPath string
 }
 
-func NewLoadToShared(hub cdssdk.Hub, storage stgmod.StorageDetail, objectPath string) *LoadToShared {
-	return &LoadToShared{
+func NewLoadToPublic(hub cdssdk.Hub, storage stgmod.StorageDetail, objectPath string) *LoadToPublic {
+	return &LoadToPublic{
 		Hub:        hub,
 		Storage:    storage,
 		ObjectPath: objectPath,
 	}
 }
 
-func (t *LoadToShared) GetStreamIndex() StreamIndex {
+func (t *LoadToPublic) GetStreamIndex() StreamIndex {
 	return StreamIndex{
 		Type: StreamIndexRaw,
 	}
 }
 
-func (t *LoadToShared) GetRange() math2.Range {
+func (t *LoadToPublic) GetRange() math2.Range {
 	return math2.Range{}
 }

common/pkgs/ioswitch2/ops2/shared_store.go

@@ -13,29 +13,29 @@ import (
 )
 
 func init() {
-	exec.UseOp[*SharedLoad]()
+	exec.UseOp[*PublicLoad]()
 }
 
-type SharedLoad struct {
+type PublicLoad struct {
 	Input      exec.VarID
 	StorageID  cdssdk.StorageID
 	ObjectPath string
 }
 
-func (o *SharedLoad) Execute(ctx *exec.ExecContext, e *exec.Executor) error {
+func (o *PublicLoad) Execute(ctx *exec.ExecContext, e *exec.Executor) error {
 	logger.
 		WithField("Input", o.Input).
-		Debugf("load file to shared store")
-	defer logger.Debugf("load file to shared store finished")
+		Debugf("load file to public store")
+	defer logger.Debugf("load file to public store finished")
 
 	stgAgts, err := exec.GetValueByType[*agtpool.AgentPool](ctx)
 	if err != nil {
 		return fmt.Errorf("getting storage manager: %w", err)
 	}
 
-	store, err := stgAgts.GetSharedStore(o.StorageID)
+	store, err := stgAgts.GetPublicStore(o.StorageID)
 	if err != nil {
-		return fmt.Errorf("getting shard store of storage %v: %w", o.StorageID, err)
+		return fmt.Errorf("getting public store of storage %v: %w", o.StorageID, err)
 	}
 
 	input, err := exec.BindVar[*exec.StreamValue](e, ctx.Context, o.Input)
@@ -47,19 +47,19 @@ func (o *SharedLoad) Execute(ctx *exec.ExecContext, e *exec.Executor) error {
 	return store.Write(o.ObjectPath, input.Stream)
 }
 
-func (o *SharedLoad) String() string {
-	return fmt.Sprintf("SharedLoad %v -> %v:%v", o.Input, o.StorageID, o.ObjectPath)
+func (o *PublicLoad) String() string {
+	return fmt.Sprintf("PublicLoad %v -> %v:%v", o.Input, o.StorageID, o.ObjectPath)
 }
 
-type SharedLoadNode struct {
+type PublicLoadNode struct {
 	dag.NodeBase
 	To         ioswitch2.To
 	Storage    stgmod.StorageDetail
 	ObjectPath string
 }
 
-func (b *GraphNodeBuilder) NewSharedLoad(to ioswitch2.To, stg stgmod.StorageDetail, objPath string) *SharedLoadNode {
-	node := &SharedLoadNode{
+func (b *GraphNodeBuilder) NewPublicLoad(to ioswitch2.To, stg stgmod.StorageDetail, objPath string) *PublicLoadNode {
+	node := &PublicLoadNode{
 		To:         to,
 		Storage:    stg,
 		ObjectPath: objPath,
@@ -70,23 +70,23 @@ func (b *GraphNodeBuilder) NewSharedLoad(to ioswitch2.To, stg stgmod.StorageDeta
 	return node
 }
 
-func (t *SharedLoadNode) GetTo() ioswitch2.To {
+func (t *PublicLoadNode) GetTo() ioswitch2.To {
 	return t.To
 }
 
-func (t *SharedLoadNode) SetInput(input *dag.StreamVar) {
+func (t *PublicLoadNode) SetInput(input *dag.StreamVar) {
 	input.To(t, 0)
 }
 
-func (t *SharedLoadNode) Input() dag.StreamInputSlot {
+func (t *PublicLoadNode) Input() dag.StreamInputSlot {
 	return dag.StreamInputSlot{
 		Node:  t,
 		Index: 0,
 	}
 }
 
-func (t *SharedLoadNode) GenerateOp() (exec.Op, error) {
-	return &SharedLoad{
+func (t *PublicLoadNode) GenerateOp() (exec.Op, error) {
+	return &PublicLoad{
 		Input:      t.InputStreams().Get(0).VarID,
 		StorageID:  t.Storage.Storage.StorageID,
 		ObjectPath: t.ObjectPath,

common/pkgs/ioswitch2/parser/gen/generator.go

@@ -361,8 +361,8 @@ func buildToNode(ctx *state.GenerateState, t ioswitch2.To) (ops2.ToNode, error)
 
 		return n, nil
 
-	case *ioswitch2.LoadToShared:
-		n := ctx.DAG.NewSharedLoad(t, t.Storage, t.ObjectPath)
+	case *ioswitch2.LoadToPublic:
+		n := ctx.DAG.NewPublicLoad(t, t.Storage, t.ObjectPath)
 
 		if err := setEnvByAddress(n, t.Hub, t.Hub.Address); err != nil {
 			return nil, err

common/pkgs/storage/agtpool/pool.go

@@ -87,8 +87,8 @@ func (m *AgentPool) GetShardStore(stgID cdssdk.StorageID) (types.ShardStore, err
 	return stg.Agent.GetShardStore()
 }
 
-// 查找指定Storage的SharedStore组件
-func (m *AgentPool) GetSharedStore(stgID cdssdk.StorageID) (types.SharedStore, error) {
+// 查找指定Storage的PublicStore组件
+func (m *AgentPool) GetPublicStore(stgID cdssdk.StorageID) (types.PublicStore, error) {
 	m.lock.Lock()
 	defer m.lock.Unlock()
 
@@ -97,5 +97,5 @@ func (m *AgentPool) GetSharedStore(stgID cdssdk.StorageID) (types.SharedStore, e
 		return nil, types.ErrStorageNotFound
 	}
 
-	return stg.Agent.GetSharedStore()
+	return stg.Agent.GetPublicStore()
 }

common/pkgs/storage/local/agent.go

@@ -8,7 +8,7 @@ import (
 type agent struct {
 	Detail      stgmod.StorageDetail
 	ShardStore  *ShardStore
-	SharedStore *SharedStore
+	PublicStore *PublicStore
 }
 
 func (s *agent) Start(ch *types.StorageEventChan) {
@@ -16,8 +16,8 @@ func (s *agent) Start(ch *types.StorageEventChan) {
 		s.ShardStore.Start(ch)
 	}
 
-	if s.SharedStore != nil {
-		s.SharedStore.Start(ch)
+	if s.PublicStore != nil {
+		s.PublicStore.Start(ch)
 	}
 }
 
@@ -26,8 +26,8 @@ func (s *agent) Stop() {
 		s.ShardStore.Stop()
 	}
 
-	if s.SharedStore != nil {
-		s.SharedStore.Stop()
+	if s.PublicStore != nil {
+		s.PublicStore.Stop()
 	}
 }
 
@@ -43,10 +43,10 @@ func (a *agent) GetShardStore() (types.ShardStore, error) {
 	return a.ShardStore, nil
 }
 
-func (a *agent) GetSharedStore() (types.SharedStore, error) {
-	if a.SharedStore == nil {
+func (a *agent) GetPublicStore() (types.PublicStore, error) {
+	if a.PublicStore == nil {
 		return nil, types.ErrUnsupported
 	}
 
-	return a.SharedStore, nil
+	return a.PublicStore, nil
 }

common/pkgs/storage/local/local.go

@@ -42,18 +42,18 @@ func (b *builder) CreateAgent() (types.StorageAgent, error) {
 		agt.ShardStore = store
 	}
 
-	if b.detail.Storage.SharedStore != nil {
-		local, ok := b.detail.Storage.SharedStore.(*cdssdk.LocalSharedStorage)
+	if b.detail.Storage.PublicStore != nil {
+		local, ok := b.detail.Storage.PublicStore.(*cdssdk.LocalPublicStorage)
 		if !ok {
-			return nil, fmt.Errorf("invalid shared store type %T for local storage", b.detail.Storage.SharedStore)
+			return nil, fmt.Errorf("invalid public store type %T for local storage", b.detail.Storage.PublicStore)
 		}
 
-		store, err := NewSharedStore(agt, *local)
+		store, err := NewPublicStore(agt, *local)
 		if err != nil {
 			return nil, err
 		}
 
-		agt.SharedStore = store
+		agt.PublicStore = store
 	}
 
 	return agt, nil
@@ -63,8 +63,8 @@ func (b *builder) ShardStoreDesc() types.ShardStoreDesc {
 	return &ShardStoreDesc{builder: b}
 }
 
-func (b *builder) SharedStoreDesc() types.SharedStoreDesc {
-	return &SharedStoreDesc{builder: b}
+func (b *builder) PublicStoreDesc() types.PublicStoreDesc {
+	return &PublicStoreDesc{builder: b}
 }
 
 func (b *builder) CreateMultiparter() (types.Multiparter, error) {

common/pkgs/storage/local/shared_store.go

@@ -10,40 +10,40 @@ import (
 	"gitlink.org.cn/cloudream/storage/common/pkgs/storage/types"
 )
 
-type SharedStoreDesc struct {
-	types.EmptySharedStoreDesc
+type PublicStoreDesc struct {
+	types.EmptyPublicStoreDesc
 	builder *builder
 }
 
-func (d *SharedStoreDesc) Enabled() bool {
-	return d.builder.detail.Storage.SharedStore != nil
+func (d *PublicStoreDesc) Enabled() bool {
+	return d.builder.detail.Storage.PublicStore != nil
 }
 
-func (d *SharedStoreDesc) HasBypassWrite() bool {
+func (d *PublicStoreDesc) HasBypassWrite() bool {
 	return false
 }
 
-type SharedStore struct {
+type PublicStore struct {
 	agt *agent
-	cfg cdssdk.LocalSharedStorage
+	cfg cdssdk.LocalPublicStorage
 }
 
-func NewSharedStore(agt *agent, cfg cdssdk.LocalSharedStorage) (*SharedStore, error) {
-	return &SharedStore{
+func NewPublicStore(agt *agent, cfg cdssdk.LocalPublicStorage) (*PublicStore, error) {
+	return &PublicStore{
 		agt: agt,
 		cfg: cfg,
 	}, nil
 }
 
-func (s *SharedStore) Start(ch *types.StorageEventChan) {
+func (s *PublicStore) Start(ch *types.StorageEventChan) {
 	s.getLogger().Infof("component start, LoadBase: %v", s.cfg.LoadBase)
 }
 
-func (s *SharedStore) Stop() {
+func (s *PublicStore) Stop() {
 	s.getLogger().Infof("component stop")
 }
 
-func (s *SharedStore) Write(objPath string, stream io.Reader) error {
+func (s *PublicStore) Write(objPath string, stream io.Reader) error {
 	fullPath := filepath.Join(s.cfg.LoadBase, objPath)
 	err := os.MkdirAll(filepath.Dir(fullPath), 0755)
 	if err != nil {
@@ -64,6 +64,6 @@ func (s *SharedStore) Write(objPath string, stream io.Reader) error {
 	return nil
 }
 
-func (s *SharedStore) getLogger() logger.Logger {
-	return logger.WithField("SharedStore", "Local").WithField("Storage", s.agt.Detail.Storage.String())
+func (s *PublicStore) getLogger() logger.Logger {
+	return logger.WithField("PublicStore", "Local").WithField("Storage", s.agt.Detail.Storage.String())
 }

common/pkgs/storage/mashup/mashup.go

@@ -38,13 +38,13 @@ func (b *builder) ShardStoreDesc() types.ShardStoreDesc {
 	return blder.ShardStoreDesc()
 }
 
-func (b *builder) SharedStoreDesc() types.SharedStoreDesc {
+func (b *builder) PublicStoreDesc() types.PublicStoreDesc {
 	stgType := b.detail.Storage.Type.(*cdssdk.MashupStorageType)
 	detail := b.detail
 	detail.Storage.Type = stgType.Agent
 
 	blder := factory.GetBuilder(detail)
-	return blder.SharedStoreDesc()
+	return blder.PublicStoreDesc()
 }
 
 func (b *builder) CreateMultiparter() (types.Multiparter, error) {

common/pkgs/storage/s3/agent.go

@@ -34,6 +34,6 @@ func (a *Agent) GetShardStore() (types.ShardStore, error) {
 	return a.ShardStore, nil
 }
 
-func (a *Agent) GetSharedStore() (types.SharedStore, error) {
+func (a *Agent) GetPublicStore() (types.PublicStore, error) {
 	return nil, types.ErrUnsupported
 }

common/pkgs/storage/s3/s3.go

@@ -63,8 +63,8 @@ func (b *builder) ShardStoreDesc() types.ShardStoreDesc {
 	return &ShardStoreDesc{builder: b}
 }
 
-func (b *builder) SharedStoreDesc() types.SharedStoreDesc {
-	return &SharedStoreDesc{}
+func (b *builder) PublicStoreDesc() types.PublicStoreDesc {
+	return &PublicStoreDesc{}
 }
 
 func (b *builder) CreateMultiparter() (types.Multiparter, error) {

common/pkgs/storage/s3/shared_store.go

@@ -2,6 +2,6 @@ package s3
 
 import "gitlink.org.cn/cloudream/storage/common/pkgs/storage/types"
 
-type SharedStoreDesc struct {
-	types.EmptySharedStoreDesc
+type PublicStoreDesc struct {
+	types.EmptyPublicStoreDesc
 }

common/pkgs/storage/types/empty_builder.go

@@ -19,8 +19,8 @@ func (b *EmptyBuilder) ShardStoreDesc() ShardStoreDesc {
 	return &EmptyShardStoreDesc{}
 }
 
-func (b *EmptyBuilder) SharedStoreDesc() SharedStoreDesc {
-	return &EmptySharedStoreDesc{}
+func (b *EmptyBuilder) PublicStoreDesc() PublicStoreDesc {
+	return &EmptyPublicStoreDesc{}
 }
 
 // 创建一个分片上传组件
@@ -55,13 +55,13 @@ func (d *EmptyShardStoreDesc) HasBypassHTTPRead() bool {
 	return false
 }
 
-type EmptySharedStoreDesc struct {
+type EmptyPublicStoreDesc struct {
 }
 
-func (d *EmptySharedStoreDesc) Enabled() bool {
+func (d *EmptyPublicStoreDesc) Enabled() bool {
 	return false
 }
 
-func (d *EmptySharedStoreDesc) HasBypassWrite() bool {
+func (d *EmptyPublicStoreDesc) HasBypassWrite() bool {
 	return false
 }

common/pkgs/storage/types/shared_store.go

@@ -4,7 +4,7 @@ import (
 	"io"
 )
 
-type SharedStore interface {
+type PublicStore interface {
 	Start(ch *StorageEventChan)
 	Stop()
 

common/pkgs/storage/types/types.go

@@ -31,7 +31,7 @@ type StorageAgent interface {
 	// 获取分片存储服务
 	GetShardStore() (ShardStore, error)
 	// 获取共享存储服务
-	GetSharedStore() (SharedStore, error)
+	GetPublicStore() (PublicStore, error)
 }
 
 // 创建存储服务的指定组件。
@@ -45,7 +45,7 @@ type StorageBuilder interface {
 	// 是否支持分片存储服务
 	ShardStoreDesc() ShardStoreDesc
 	// 是否支持共享存储服务
-	SharedStoreDesc() SharedStoreDesc
+	PublicStoreDesc() PublicStoreDesc
 	// 创建一个分片上传组件
 	CreateMultiparter() (Multiparter, error)
 	// 创建一个存储服务直传组件
@@ -64,7 +64,7 @@ type ShardStoreDesc interface {
 	HasBypassHTTPRead() bool
 }
 
-type SharedStoreDesc interface {
+type PublicStoreDesc interface {
 	// 是否已启动
 	Enabled() bool
 	// 是否能旁路上传

common/pkgs/uploader/create_load.go

@@ -45,7 +45,7 @@ func (u *CreateLoadUploader) Upload(pa string, size int64, stream io.Reader) err
 	ft.AddFrom(fromExec)
 	for i, stg := range u.targetStgs {
 		ft.AddTo(ioswitch2.NewToShardStore(*stg.MasterHub, stg, ioswitch2.RawStream(), "fileHash"))
-		ft.AddTo(ioswitch2.NewLoadToShared(*stg.MasterHub, stg, path.Join(u.loadRoots[i], pa)))
+		ft.AddTo(ioswitch2.NewLoadToPublic(*stg.MasterHub, stg, path.Join(u.loadRoots[i], pa)))
 		stgIDs = append(stgIDs, stg.Storage.StorageID)
 	}
 

common/pkgs/uploader/update.go

@@ -51,7 +51,7 @@ func (w *UpdateUploader) Upload(pat string, size int64, stream io.Reader) error
 		AddTo(ioswitch2.NewToShardStore(*w.targetStg.MasterHub, w.targetStg, ioswitch2.RawStream(), "fileHash"))
 
 	for i, stg := range w.loadToStgs {
-		ft.AddTo(ioswitch2.NewLoadToShared(*stg.MasterHub, stg, path.Join(w.loadToPath[i], pat)))
+		ft.AddTo(ioswitch2.NewLoadToPublic(*stg.MasterHub, stg, path.Join(w.loadToPath[i], pat)))
 	}
 
 	plans := exec.NewPlanBuilder()

common/pkgs/uploader/uploader.go

@@ -86,8 +86,8 @@ func (u *Uploader) BeginUpdate(userID cdssdk.UserID, pkgID cdssdk.PackageID, aff
 		if stg.MasterHub == nil {
 			return nil, fmt.Errorf("load to storage %v has no master hub", stgID)
 		}
-		if !factory.GetBuilder(stg).SharedStoreDesc().Enabled() {
-			return nil, fmt.Errorf("load to storage %v has no shared store", stgID)
+		if !factory.GetBuilder(stg).PublicStoreDesc().Enabled() {
+			return nil, fmt.Errorf("load to storage %v has no public store", stgID)
 		}
 
 		loadToStgs[i] = stg