anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-07 21:37:04 +09:00
Code Activity

GO-4295 Use OR filter

Browse source
This commit is contained in:
kirillston 2025-06-06 14:15:08 +02:00
parent fe9b1cb249
commit ec09e8c3ad
No known key found for this signature in database
GPG key ID: BE4BF014F0ECDFE8
1 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

60
core/block/import/common/objectid/existingobject.go
View file

@ -126,44 +126,32 @@ func (e *existingObject) getExistingRelationOption(snapshot *common.Snapshot, sp
}
func (e *existingObject) getExistingRelation(snapshot *common.Snapshot, spaceID string) string {
keyFilter := database.FilterRequest{
Condition: model.BlockContentDataviewFilter_Equal,
RelationKey: bundle.RelationKeyRelationKey,
Value: snapshot.Snapshot.Data.Details.Get(bundle.RelationKeyRelationKey),
}
nameFilter := database.FilterRequest{
Condition: model.BlockContentDataviewFilter_Equal,
RelationKey: bundle.RelationKeyName,
Value: snapshot.Snapshot.Data.Details.Get(bundle.RelationKeyName),
}
relationsFilters := []database.FilterRequest{
{
Condition: model.BlockContentDataviewFilter_Equal,
RelationKey: bundle.RelationKeyRelationFormat,
Value: snapshot.Snapshot.Data.Details.Get(bundle.RelationKeyRelationFormat),
records, err := e.objectStore.SpaceIndex(spaceID).QueryRaw(&database.Filters{FilterObj: database.FiltersAnd{
database.FilterEq{
Key: bundle.RelationKeyRelationFormat,
Cond: model.BlockContentDataviewFilter_Equal,
Value: snapshot.Snapshot.Data.Details.Get(bundle.RelationKeyRelationFormat),
},
{
Condition: model.BlockContentDataviewFilter_Equal,
RelationKey: bundle.RelationKeyResolvedLayout,
Value: domain.Int64(model.ObjectType_relation),
database.FilterEq{
Key: bundle.RelationKeyResolvedLayout,
Cond: model.BlockContentDataviewFilter_Equal,
Value: domain.Int64(model.ObjectType_relation),
},
database.FiltersOr{
database.FilterEq{
Key: bundle.RelationKeyName,
Cond: model.BlockContentDataviewFilter_Equal,
Value: snapshot.Snapshot.Data.Details.Get(bundle.RelationKeyName),
},
database.FilterEq{
Key: bundle.RelationKeyRelationKey,
Cond: model.BlockContentDataviewFilter_Equal,
Value: snapshot.Snapshot.Data.Details.Get(bundle.RelationKeyRelationKey),
},
},
}}, 1, 0)
if err == nil && len(records) > 0 {
return records[0].Details.GetString(bundle.RelationKeyId)
}
index := e.objectStore.SpaceIndex(spaceID)
// first query relation by relationKey to filter out renamed library objects
ids, _, err := index.QueryObjectIds(database.Query{Filters: append(relationsFilters, keyFilter)})
if err == nil && len(ids) > 0 {
return ids[0]
}
// second query relation by name to filter out similar relations from CSV/Notion import
ids, _, err = index.QueryObjectIds(database.Query{Filters: append(relationsFilters, nameFilter)})
if err == nil && len(ids) > 0 {
return ids[0]
}
return ""
}