anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-11 18:20:33 +09:00
Code Activity

remove mutex trylock

Browse source
This commit is contained in:
Roman Khafizianov 2022-10-26 10:45:21 +02:00
parent 6d4c7e1c43
commit 10e4243bb5
No known key found for this signature in database
GPG key ID: F07A7D55A2684852
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/indexer/indexer.go
View file

@ -354,13 +354,18 @@ func (i *indexer) Reindex(ctx context.Context, reindex reindexFlags) (err error)
defer func() {
i.relationMigratorMu.Lock()
defer i.relationMigratorMu.Unlock()
if i.relationBulkMigration == nil {
return
}
err2 := i.relationBulkMigration.Commit()
i.relationBulkMigration = nil
if err2 != nil {
log.Errorf("reindex relation migration error: %s", err2.Error())
}
}()
i.relationMigratorMu.Lock()
i.relationBulkMigration = i.relationService.CreateBulkMigration()
i.relationMigratorMu.Unlock()
if reindex&reindexFileKeys != 0 {
err = i.anytype.FileStore().RemoveEmpty()
@ -625,10 +630,7 @@ func extractRelationsFromState(s *state.State) []*model.Relation {
}
func (i *indexer) migrateRelations(rels []*model.Relation) {
if !i.relationMigratorMu.TryLock() {
fmt.Println()
return
}
i.relationMigratorMu.Lock()
defer i.relationMigratorMu.Unlock()
if i.relationBulkMigration != nil {
@ -743,7 +745,7 @@ func (i *indexer) index(ctx context.Context, info doc.DocInfo) error {
}
indexDetails, indexLinks := sbType.Indexable()
if info.State.ObjectType() != bundle.TypeKeyRelation.URL() && sbType != smartblock.SmartBlockTypeWorkspace {
if sbType != smartblock.SmartBlockTypeSubObject && sbType != smartblock.SmartBlockTypeWorkspace {
// avoid recursions
i.migrateRelations(extractRelationsFromState(info.State))
}

3
core/indexer/indexer_test.go
View file

@ -113,7 +113,8 @@ func newFixture(t *testing.T) *fixture {
With(source.New())
mockStatus.RegisterMockStatus(fx.ctrl, ta)
mockBuiltinTemplate.RegisterMockBuiltinTemplate(fx.ctrl, ta).EXPECT().Hash().AnyTimes()
mockRelation.RegisterMockRelation(fx.ctrl, ta)
rs := mockRelation.RegisterMockRelation(fx.ctrl, ta)
rs.EXPECT().CreateBulkMigration().Times(1)
require.NoError(t, ta.Start(context.Background()))
return fx
}