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

Create storage fixes

Browse source
This commit is contained in:
mcrakhman 2024-11-25 11:57:13 +01:00
parent 471ebf73a4
commit 42639f17a1
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
2 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
commonspace/object/tree/objecttree/objecttree_test.go
View file

@ -306,7 +306,8 @@ func TestObjectTree(t *testing.T) {
IsEncrypted: true,
}, aAccount.Acl)
require.NoError(t, err)
aStore, _ := createStorage(ctx, root, store)
aStore, err := createStorage(ctx, root, store)
require.NoError(t, err)
aTree, err := BuildKeyFilterableObjectTree(aStore, aAccount.Acl)
require.NoError(t, err)
err = aTree.Delete()

51
commonspace/object/tree/objecttree/storage.go
View file

@ -15,7 +15,7 @@ import (
const (
orderKey = "o"
headsKey = "c"
headsKey = "h"
commonSnapshotKey = "s"
idKey = "id"
rawChangeKey = "r"
@ -24,7 +24,6 @@ const (
snapshotIdKey = "i"
prevIdsKey = "p"
headsCollectionName = "heads"
changesCollectionName = "changes"
)
type StorageChange struct {
@ -85,6 +84,16 @@ func createStorage(ctx context.Context, root *treechangeproto.RawTreeChangeWithI
OrderId: firstOrder,
ChangeSize: len(root.RawChange),
}
headsColl, err := store.Collection(ctx, headsCollectionName)
if err != nil {
return nil, err
}
st.headsColl = headsColl
changesColl, err := store.Collection(ctx, root.Id)
if err != nil {
return nil, err
}
st.changesColl = changesColl
orderIdx := anystore.IndexInfo{
Name: orderKey,
Fields: []string{orderKey},
@ -94,16 +103,6 @@ func createStorage(ctx context.Context, root *treechangeproto.RawTreeChangeWithI
if err != nil {
return nil, err
}
headsColl, err := store.Collection(ctx, headsCollectionName)
if err != nil {
return nil, err
}
st.headsColl = headsColl
changesColl, err := store.Collection(ctx, changesCollectionName)
if err != nil {
return nil, err
}
st.changesColl = changesColl
st.arena = &anyenc.Arena{}
defer st.arena.Reset()
doc := newStorageChangeValue(stChange, st.arena)
@ -119,12 +118,13 @@ func createStorage(ctx context.Context, root *treechangeproto.RawTreeChangeWithI
headsDoc := st.arena.NewObject()
headsDoc.Set(headsKey, newStringArrayValue([]string{root.Id}, st.arena))
headsDoc.Set(commonSnapshotKey, st.arena.NewString(root.Id))
err = st.headsColl.Insert(tx.Context(), doc)
headsDoc.Set(idKey, st.arena.NewString(root.Id))
err = st.headsColl.Insert(tx.Context(), headsDoc)
if err != nil {
tx.Rollback()
return nil, err
}
return st, nil
return st, tx.Commit()
}
func newStorage(ctx context.Context, id string, store anystore.DB) (Storage, error) {
@ -133,25 +133,25 @@ func newStorage(ctx context.Context, id string, store anystore.DB) (Storage, err
id: id,
store: store,
}
orderIdx := anystore.IndexInfo{
Name: orderKey,
Fields: []string{orderKey},
Unique: true,
}
err := st.changesColl.EnsureIndex(ctx, orderIdx)
if err != nil {
return nil, err
}
headsColl, err := store.Collection(ctx, headsCollectionName)
if err != nil {
return nil, err
}
st.headsColl = headsColl
changesColl, err := store.Collection(ctx, changesCollectionName)
changesColl, err := store.Collection(ctx, id)
if err != nil {
return nil, err
}
st.changesColl = changesColl
orderIdx := anystore.IndexInfo{
Name: orderKey,
Fields: []string{orderKey},
Unique: true,
}
err = st.changesColl.EnsureIndex(ctx, orderIdx)
if err != nil {
return nil, err
}
st.arena = &anyenc.Arena{}
return st, nil
}
@ -251,7 +251,7 @@ func (s *storage) Delete() error {
tx.Rollback()
return fmt.Errorf("failed to remove document from heads collection: %w", err)
}
return nil
return tx.Commit()
}
func (s *storage) Id() string {
@ -315,6 +315,7 @@ func newStorageChangeValue(ch StorageChange, arena *anyenc.Arena) *anyenc.Value
newVal.Set(snapshotCounterKey, arena.NewNumberInt(ch.SnapshotCounter))
newVal.Set(snapshotIdKey, arena.NewString(ch.SnapshotId))
newVal.Set(changeSizeKey, arena.NewNumberInt(ch.ChangeSize))
newVal.Set(idKey, arena.NewString(ch.Id))
if len(ch.PrevIds) != 0 {
newVal.Set(prevIdsKey, newStringArrayValue(ch.PrevIds, arena))
}