anyproto/any-sync
1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-08 05:57:03 +09:00
Code Activity

Remove spaceisdeleted

Browse source
This commit is contained in:
mcrakhman 2023-08-21 19:07:40 +02:00
parent 4592760ece
commit 0799e7e638
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
7 changed files with 13 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
commonspace/headsync/headsync.go
View file

@ -3,7 +3,6 @@ package headsync
import (
"context"
"sync/atomic"
"time"
"github.com/anyproto/any-sync/app"
@ -45,9 +44,8 @@ type HeadSync interface {
}
type headSync struct {
spaceId string
spaceIsDeleted *atomic.Bool
syncPeriod int
spaceId string
syncPeriod int
periodicSync periodicsync.PeriodicSync
storage spacestorage.SpaceStorage
@ -74,7 +72,6 @@ func (h *headSync) Init(a *app.App) (err error) {
cfg := a.MustComponent("config").(config.ConfigGetter)
h.syncAcl = a.MustComponent(syncacl.CName).(syncacl.SyncAcl)
h.spaceId = shared.SpaceId
h.spaceIsDeleted = shared.SpaceIsDeleted
h.syncPeriod = cfg.GetSpace().SyncPeriod
h.configuration = a.MustComponent(nodeconf.CName).(nodeconf.NodeConf)
h.log = log.With(zap.String("spaceId", h.spaceId))
@ -87,10 +84,6 @@ func (h *headSync) Init(a *app.App) (err error) {
h.deletionState = a.MustComponent(deletionstate.CName).(deletionstate.ObjectDeletionState)
h.syncer = createDiffSyncer(h)
sync := func(ctx context.Context) (err error) {
// for clients cancelling the sync process
if h.spaceIsDeleted.Load() {
return spacesyncproto.ErrSpaceIsDeleted
}
return h.syncer.Sync(ctx)
}
h.periodicSync = periodicsync.NewPeriodicSync(h.syncPeriod, time.Minute, sync, h.log)
@ -115,9 +108,6 @@ func (h *headSync) Run(ctx context.Context) (err error) {
}
func (h *headSync) HandleRangeRequest(ctx context.Context, req *spacesyncproto.HeadSyncRequest) (resp *spacesyncproto.HeadSyncResponse, err error) {
if h.spaceIsDeleted.Load() {
return nil, spacesyncproto.ErrSpaceIsDeleted
}
return HandleRangeRequest(ctx, h.diff, req)
}

4
commonspace/headsync/headsync_test.go
View file

@ -28,7 +28,6 @@ import (
"github.com/anyproto/any-sync/nodeconf/mock_nodeconf"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
"sync/atomic"
"testing"
)
@ -70,8 +69,7 @@ type headSyncFixture struct {
func newHeadSyncFixture(t *testing.T) *headSyncFixture {
spaceState := &spacestate.SpaceState{
SpaceId: "spaceId",
SpaceIsDeleted: &atomic.Bool{},
SpaceId: "spaceId",
}
ctrl := gomock.NewController(t)
configurationMock := mock_nodeconf.NewMockService(ctrl)

11
commonspace/objectsync/objectsync.go
View file

@ -4,7 +4,6 @@ package objectsync
import (
"context"
"fmt"
"sync/atomic"
"time"
"github.com/anyproto/any-sync/app"
@ -64,8 +63,7 @@ type objectSync struct {
spaceStorage spacestorage.SpaceStorage
metric metric.Metric
spaceIsDeleted *atomic.Bool
handleQueue multiqueue.MultiQueue[HandleMessage]
handleQueue multiqueue.MultiQueue[HandleMessage]
}
func (s *objectSync) Init(a *app.App) (err error) {
@ -77,7 +75,6 @@ func (s *objectSync) Init(a *app.App) (err error) {
if mc != nil {
s.metric = mc.(metric.Metric)
}
s.spaceIsDeleted = sharedData.SpaceIsDeleted
s.spaceId = sharedData.SpaceId
s.handleQueue = multiqueue.New[HandleMessage](s.processHandleMessage, 30)
return nil
@ -160,9 +157,6 @@ func (s *objectSync) processHandleMessage(msg HandleMessage) {
func (s *objectSync) handleRequest(ctx context.Context, senderId string, msg *spacesyncproto.ObjectSyncMessage) (response *spacesyncproto.ObjectSyncMessage, err error) {
log := log.With(zap.String("objectId", msg.ObjectId))
if s.spaceIsDeleted.Load() {
return nil, spacesyncproto.ErrSpaceIsDeleted
}
err = s.checkEmptyFullSync(log, msg)
if err != nil {
return nil, err
@ -176,9 +170,6 @@ func (s *objectSync) handleRequest(ctx context.Context, senderId string, msg *sp
func (s *objectSync) handleMessage(ctx context.Context, senderId string, msg *spacesyncproto.ObjectSyncMessage) (err error) {
log := log.With(zap.String("objectId", msg.ObjectId))
if s.spaceIsDeleted.Load() {
return spacesyncproto.ErrSpaceIsDeleted
}
err = s.checkEmptyFullSync(log, msg)
if err != nil {
return err

14
commonspace/settings/settings.go
View file

@ -2,11 +2,9 @@ package settings
import (
"context"
"github.com/anyproto/any-sync/commonspace/deletionmanager"
"sync/atomic"
"github.com/anyproto/any-sync/accountservice"
"github.com/anyproto/any-sync/app"
"github.com/anyproto/any-sync/commonspace/deletionmanager"
"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
"github.com/anyproto/any-sync/commonspace/object/tree/synctree"
"github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener"
@ -30,11 +28,10 @@ func New() Settings {
}
type settings struct {
account accountservice.Service
storage spacestorage.SpaceStorage
configuration nodeconf.NodeConf
treeBuilder objecttreebuilder.TreeBuilderComponent
spaceIsDeleted *atomic.Bool
account accountservice.Service
storage spacestorage.SpaceStorage
configuration nodeconf.NodeConf
treeBuilder objecttreebuilder.TreeBuilderComponent
settingsObject SettingsObject
}
@ -45,7 +42,6 @@ func (s *settings) Init(a *app.App) (err error) {
s.treeBuilder = a.MustComponent(objecttreebuilder.CName).(objecttreebuilder.TreeBuilderComponent)
sharedState := a.MustComponent(spacestate.CName).(*spacestate.SpaceState)
s.storage = a.MustComponent(spacestorage.CName).(spacestorage.SpaceStorage)
s.spaceIsDeleted = sharedState.SpaceIsDeleted
deps := Deps{
BuildFunc: func(ctx context.Context, id string, listener updatelistener.UpdateListener) (t synctree.SyncTree, err error) {

5
commonspace/space.go
View file

@ -74,7 +74,6 @@ type Space interface {
DeleteTree(ctx context.Context, id string) (err error)
GetNodePeers(ctx context.Context) (peer []peer.Peer, err error)
SetDeleted(isDeleted bool)
HandleMessage(ctx context.Context, msg objectsync.HandleMessage) (err error)
HandleSyncRequest(ctx context.Context, req *spacesyncproto.ObjectSyncMessage) (resp *spacesyncproto.ObjectSyncMessage, err error)
@ -154,10 +153,6 @@ func (s *space) GetNodePeers(ctx context.Context) (peer []peer.Peer, err error)
return s.peerManager.GetNodePeers(ctx)
}
func (s *space) SetDeleted(isDeleted bool) {
s.state.SpaceIsDeleted.Swap(isDeleted)
}
func (s *space) Acl() syncacl.SyncAcl {
return s.aclList.(syncacl.SyncAcl)
}

17
commonspace/spaceservice.go
View file

@ -148,20 +148,11 @@ func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) {
}
}
}
var (
spaceIsClosed = &atomic.Bool{}
spaceIsDeleted = &atomic.Bool{}
)
isDeleted, err := st.IsSpaceDeleted()
if err != nil {
return nil, err
}
spaceIsDeleted.Swap(isDeleted)
spaceIsClosed := &atomic.Bool{}
state := &spacestate.SpaceState{
SpaceId: st.Id(),
SpaceIsDeleted: spaceIsDeleted,
SpaceIsClosed: spaceIsClosed,
TreesUsed: &atomic.Int32{},
SpaceId: st.Id(),
SpaceIsClosed: spaceIsClosed,
TreesUsed: &atomic.Int32{},
}
if s.config.KeepTreeDataInMemory {
state.TreeBuilderFunc = objecttree.BuildObjectTree

1
commonspace/spacestate/shareddata.go
View file

@ -10,7 +10,6 @@ const CName = "common.commonspace.spacestate"
type SpaceState struct {
SpaceId string
SpaceIsDeleted *atomic.Bool
SpaceIsClosed *atomic.Bool
TreesUsed *atomic.Int32
TreeBuilderFunc objecttree.BuildObjectTreeFunc