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

Add object type to message for ignore purposes

Browse source 
# Conflicts:
#	commonspace/spacesyncproto/protos/spacesync.proto
#	commonspace/spacesyncproto/spacesync.pb.go
This commit is contained in:
Mikhail Rakhmanov 2025-04-03 11:57:45 +02:00
parent 9ae9722779
commit 12ea073b98
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
8 changed files with 216 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

5
commonspace/object/acl/syncacl/headupdate.go
View file

@ -1,6 +1,7 @@
package syncacl
import (
"github.com/anyproto/any-sync/commonspace/spacesyncproto"
"github.com/anyproto/any-sync/commonspace/sync/objectsync/objectmessages"
"github.com/anyproto/any-sync/consensus/consensusproto"
)
@ -24,6 +25,10 @@ func (h *InnerHeadUpdate) MsgSize() uint64 {
return size + uint64(len(h.head)) + uint64(len(h.root.Id)) + uint64(len(h.root.Payload))
}
func (h *InnerHeadUpdate) ObjectType() spacesyncproto.ObjectType {
return spacesyncproto.ObjectType_Acl
}
func (h *InnerHeadUpdate) Prepare() error {
logMsg := consensusproto.WrapHeadUpdate(&consensusproto.LogHeadUpdate{
Head: h.head,

5
commonspace/object/tree/synctree/headupdate.go
View file

@ -4,6 +4,7 @@ import (
"slices"
"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
"github.com/anyproto/any-sync/commonspace/spacesyncproto"
"github.com/anyproto/any-sync/commonspace/sync/objectsync/objectmessages"
)
@ -21,6 +22,10 @@ func (h *InnerHeadUpdate) MsgSize() (size uint64) {
return uint64(len(h.prepared))
}
func (h *InnerHeadUpdate) ObjectType() spacesyncproto.ObjectType {
return spacesyncproto.ObjectType_Tree
}
func (h *InnerHeadUpdate) Prepare() error {
treeMsg := treechangeproto.WrapHeadUpdate(&treechangeproto.TreeHeadUpdate{
Heads: h.heads,

8
commonspace/spacesyncproto/protos/spacesync.proto
View file

@ -79,6 +79,7 @@ message ObjectSyncMessage {
string replyId = 3;
bytes payload = 4;
string objectId = 5;
ObjectType objectType = 6;
}
// SpacePushRequest is a request to add space on a node containing only one acl record
@ -201,3 +202,10 @@ enum DiffType {
Initial = 0;
Precalculated = 1;
}
// ObjectType is a type of object
enum ObjectType {
Tree = 0;
Acl = 1;
KeyValue = 2;
}

234
commonspace/spacesyncproto/spacesync.pb.go
View file

@ -126,6 +126,35 @@ func (DiffType) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_80e49f1f4ac27799, []int{2}
}
// ObjectType is a type of object
type ObjectType int32
const (
ObjectType_Tree ObjectType = 0
ObjectType_Acl ObjectType = 1
ObjectType_KeyValue ObjectType = 2
)
var ObjectType_name = map[int32]string{
0: "Tree",
1: "Acl",
2: "KeyValue",
}
var ObjectType_value = map[string]int32{
"Tree": 0,
"Acl": 1,
"KeyValue": 2,
}
func (x ObjectType) String() string {
return proto.EnumName(ObjectType_name, int32(x))
}
func (ObjectType) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_80e49f1f4ac27799, []int{3}
}
// HeadSyncRange presenting a request for one range
type HeadSyncRange struct {
From uint64 `protobuf:"varint,1,opt,name=from,proto3" json:"from,omitempty"`
@ -471,6 +500,7 @@ type ObjectSyncMessage struct {
ReplyId string `protobuf:"bytes,3,opt,name=replyId,proto3" json:"replyId,omitempty"`
Payload []byte `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
ObjectId string `protobuf:"bytes,5,opt,name=objectId,proto3" json:"objectId,omitempty"`
ObjectType ObjectType `protobuf:"varint,6,opt,name=objectType,proto3,enum=spacesync.ObjectType" json:"objectType,omitempty"`
}
func (m *ObjectSyncMessage) Reset() { *m = ObjectSyncMessage{} }
@ -549,6 +579,13 @@ func (m *ObjectSyncMessage) GetObjectId() string {
return ""
}
func (m *ObjectSyncMessage) GetObjectType() ObjectType {
if m != nil {
return m.ObjectType
}
return ObjectType_Tree
}
// SpacePushRequest is a request to add space on a node containing only one acl record
type SpacePushRequest struct {
Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
@ -1685,6 +1722,7 @@ func init() {
proto.RegisterEnum("spacesync.ErrCodes", ErrCodes_name, ErrCodes_value)
proto.RegisterEnum("spacesync.SpaceSubscriptionAction", SpaceSubscriptionAction_name, SpaceSubscriptionAction_value)
proto.RegisterEnum("spacesync.DiffType", DiffType_name, DiffType_value)
proto.RegisterEnum("spacesync.ObjectType", ObjectType_name, ObjectType_value)
proto.RegisterType((*HeadSyncRange)(nil), "spacesync.HeadSyncRange")
proto.RegisterType((*HeadSyncResult)(nil), "spacesync.HeadSyncResult")
proto.RegisterType((*HeadSyncResultElement)(nil), "spacesync.HeadSyncResultElement")
@ -1716,89 +1754,92 @@ func init() {
}
var fileDescriptor_80e49f1f4ac27799 = []byte{
// 1308 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x3d, 0x6f, 0xdb, 0xc6,
0x1b, 0x17, 0xe9, 0x17, 0x49, 0x8f, 0x29, 0x85, 0x39, 0x2b, 0xb1, 0xfe, 0x4a, 0xa0, 0x08, 0xc4,
0x1f, 0x85, 0xe1, 0x21, 0x2f, 0x76, 0x51, 0x20, 0x69, 0x3b, 0x38, 0xb6, 0x53, 0xb3, 0x6d, 0x62,
0xe3, 0x94, 0x20, 0x40, 0x81, 0x0e, 0x67, 0xf2, 0x6c, 0xb1, 0xa5, 0x48, 0x95, 0x77, 0x4a, 0xac,
0xb1, 0x53, 0xd7, 0xa2, 0x63, 0xfb, 0x85, 0x3a, 0xa6, 0x5b, 0xc7, 0x22, 0xd9, 0xfb, 0x09, 0x3a,
0x14, 0x77, 0x3c, 0x92, 0x47, 0x89, 0x72, 0x5b, 0x64, 0x91, 0xf9, 0xbc, 0xfd, 0x9e, 0xd7, 0x7b,
0xee, 0x0c, 0x0f, 0xbc, 0x78, 0x3c, 0x8e, 0x23, 0x36, 0x21, 0x1e, 0xbd, 0x27, 0x7f, 0xd9, 0x2c,
0xf2, 0x26, 0x49, 0xcc, 0xe3, 0x7b, 0xf2, 0x97, 0x15, 0xdc, 0xbb, 0x92, 0x81, 0x9a, 0x39, 0xc3,
0xa1, 0xd0, 0x3a, 0xa6, 0xc4, 0x1f, 0xce, 0x22, 0x0f, 0x93, 0xe8, 0x82, 0x22, 0x04, 0xab, 0xe7,
0x49, 0x3c, 0xee, 0x1a, 0x03, 0x63, 0x7b, 0x15, 0xcb, 0x6f, 0xd4, 0x06, 0x93, 0xc7, 0x5d, 0x53,
0x72, 0x4c, 0x1e, 0xa3, 0x0e, 0xac, 0x85, 0xc1, 0x38, 0xe0, 0xdd, 0x95, 0x81, 0xb1, 0xdd, 0xc2,
0x29, 0x81, 0x7a, 0xd0, 0xa0, 0x21, 0x1d, 0xd3, 0x88, 0xb3, 0xee, 0xea, 0xc0, 0xd8, 0x6e, 0xe0,
0x9c, 0x76, 0x2e, 0xa1, 0x9d, 0xbb, 0xa1, 0x6c, 0x1a, 0x72, 0xe1, 0x67, 0x44, 0xd8, 0x48, 0xfa,
0xb1, 0xb0, 0xfc, 0x46, 0x9f, 0x68, 0x08, 0xe6, 0x60, 0x65, 0x7b, 0x63, 0x77, 0x70, 0xb7, 0x88,
0xbd, 0x0c, 0x70, 0x94, 0x2a, 0x16, 0x3e, 0x44, 0x54, 0x5e, 0x3c, 0x8d, 0xf2, 0xa8, 0x24, 0xe1,
0x7c, 0x0c, 0x37, 0x2a, 0x0d, 0x45, 0x52, 0x81, 0x2f, 0xdd, 0x37, 0xb1, 0x19, 0xf8, 0x32, 0x20,
0x4a, 0x7c, 0x99, 0x66, 0x13, 0xcb, 0x6f, 0xe7, 0x27, 0x03, 0xae, 0x15, 0xd6, 0xdf, 0x4d, 0x29,
0xe3, 0xa8, 0x0b, 0x75, 0x19, 0x93, 0x9b, 0x19, 0x67, 0x24, 0xba, 0x0f, 0xeb, 0x89, 0xa8, 0x61,
0x16, 0x7c, 0xb7, 0x2a, 0x78, 0xa1, 0x80, 0x95, 0x1e, 0xda, 0x83, 0x86, 0x1f, 0x9c, 0x9f, 0x3f,
0x9f, 0x4d, 0xa8, 0x8c, 0xba, 0xbd, 0xbb, 0xa9, 0xd9, 0x1c, 0x2a, 0xd1, 0x63, 0xb3, 0x6b, 0xe0,
0x5c, 0xd1, 0xb9, 0x04, 0x5b, 0xcb, 0x68, 0x12, 0x47, 0x8c, 0xa2, 0x3d, 0xa8, 0x27, 0x32, 0x3b,
0xd6, 0x35, 0xa4, 0xef, 0xff, 0x2d, 0x2d, 0x1c, 0xce, 0x34, 0xd1, 0x3d, 0xcd, 0xbb, 0xb9, 0xd4,
0xbb, 0xe6, 0xf9, 0x17, 0x03, 0xae, 0x9f, 0x9c, 0x7d, 0x43, 0x3d, 0x2e, 0xe0, 0x9e, 0x52, 0xc6,
0xc8, 0x05, 0xbd, 0xa2, 0x20, 0xb7, 0xa1, 0x99, 0xa4, 0x55, 0x73, 0xb3, 0xba, 0x16, 0x0c, 0x61,
0x97, 0xd0, 0x49, 0x38, 0x73, 0x7d, 0x99, 0x7b, 0x13, 0x67, 0xa4, 0x90, 0x4c, 0xc8, 0x2c, 0x8c,
0x89, 0x2f, 0x07, 0xc9, 0xc2, 0x19, 0x29, 0x66, 0x2c, 0x96, 0x01, 0xb8, 0x7e, 0x77, 0x4d, 0x1a,
0xe5, 0xb4, 0x43, 0xc1, 0x1e, 0x0a, 0xc7, 0xa7, 0x53, 0x36, 0xca, 0x9a, 0xf5, 0xa0, 0x40, 0x12,
0xb1, 0x6d, 0xec, 0x6e, 0x69, 0x19, 0xa6, 0xda, 0xa9, 0xb8, 0x70, 0xd1, 0x07, 0x38, 0x48, 0xa8,
0x4f, 0x23, 0x1e, 0x90, 0x50, 0x46, 0x6d, 0x61, 0x8d, 0xe3, 0x6c, 0xc2, 0x75, 0xcd, 0x4d, 0x5a,
0x7f, 0xc7, 0xc9, 0x7d, 0x87, 0x61, 0xe6, 0x7b, 0x6e, 0xc0, 0x9c, 0x27, 0xb9, 0xa1, 0xd0, 0x51,
0x8d, 0xfb, 0xef, 0x01, 0x3a, 0xdf, 0x9b, 0x60, 0xe9, 0x12, 0xb4, 0x0f, 0x1b, 0xd2, 0x46, 0xf4,
0x99, 0x26, 0x0a, 0xe7, 0x8e, 0x86, 0x83, 0xc9, 0xeb, 0x61, 0xa1, 0xf0, 0x32, 0xe0, 0x23, 0xd7,
0xc7, 0xba, 0x8d, 0x48, 0x9a, 0x78, 0xa1, 0x02, 0xcc, 0x92, 0x2e, 0x38, 0xc8, 0x01, 0xab, 0xa0,
0xf2, 0x86, 0x95, 0x78, 0x68, 0x17, 0x3a, 0x12, 0x72, 0x48, 0x39, 0x0f, 0xa2, 0x0b, 0x76, 0x5a,
0x6a, 0x61, 0xa5, 0x0c, 0x7d, 0x04, 0x37, 0xab, 0xf8, 0x79, 0x77, 0x97, 0x48, 0x9d, 0xdf, 0x0c,
0xd8, 0xd0, 0x52, 0x12, 0x73, 0x11, 0xc8, 0x06, 0xf1, 0x99, 0xda, 0x28, 0x39, 0x2d, 0xa6, 0x90,
0x07, 0x63, 0xca, 0x38, 0x19, 0x4f, 0x64, 0x6a, 0x2b, 0xb8, 0x60, 0x08, 0xa9, 0xf4, 0x91, 0x9f,
0xc1, 0x26, 0x2e, 0x18, 0xe8, 0x03, 0x68, 0x8b, 0xa1, 0x0c, 0x3c, 0xc2, 0x83, 0x38, 0xfa, 0x82,
0xce, 0x64, 0x36, 0xab, 0x78, 0x8e, 0x2b, 0x96, 0x07, 0xa3, 0x34, 0x8d, 0xda, 0xc2, 0xf2, 0x1b,
0xdd, 0x05, 0xa4, 0x95, 0x38, 0xab, 0xc6, 0xba, 0xd4, 0xa8, 0x90, 0x38, 0xa7, 0xd0, 0x2e, 0x37,
0x0a, 0x0d, 0x16, 0x1b, 0x6b, 0x95, 0xfb, 0x26, 0xa2, 0x0f, 0x2e, 0x22, 0xc2, 0xa7, 0x09, 0x55,
0x6d, 0x2b, 0x18, 0xce, 0x21, 0x74, 0xaa, 0x5a, 0x2f, 0xcf, 0x25, 0x79, 0x5d, 0x42, 0x2d, 0x18,
0x6a, 0x6e, 0xcd, 0x7c, 0x6e, 0x7f, 0x36, 0xa0, 0x33, 0xd4, 0xdb, 0x70, 0x10, 0x47, 0x5c, 0x6c,
0xd0, 0x4f, 0xc1, 0x4a, 0x0f, 0xdf, 0x21, 0x0d, 0x29, 0xa7, 0x15, 0x03, 0x7c, 0xa2, 0x89, 0x8f,
0x6b, 0xb8, 0xa4, 0x8e, 0x1e, 0xa9, 0xec, 0x94, 0xb5, 0x29, 0xad, 0x6f, 0xce, 0x8f, 0x7f, 0x6e,
0xac, 0x2b, 0x3f, 0xae, 0xc3, 0xda, 0x2b, 0x12, 0x4e, 0xa9, 0xd3, 0x07, 0x4b, 0x77, 0xb2, 0x70,
0xe8, 0xf6, 0xd4, 0x9c, 0x28, 0xf1, 0xff, 0xa1, 0xe5, 0xcb, 0xaf, 0xe4, 0x94, 0xd2, 0x24, 0xdf,
0x58, 0x65, 0xa6, 0xf3, 0x35, 0xdc, 0x28, 0x25, 0x3c, 0x8c, 0xc8, 0x84, 0x8d, 0x62, 0x2e, 0x8e,
0x49, 0xaa, 0xe9, 0xbb, 0x7e, 0xba, 0x69, 0x9b, 0x58, 0xe3, 0x2c, 0xc2, 0x9b, 0x55, 0xf0, 0x3f,
0x18, 0x60, 0x65, 0xd0, 0x87, 0x84, 0x13, 0xf4, 0x10, 0xea, 0x5e, 0x5a, 0x53, 0xb5, 0xbd, 0xef,
0xcc, 0x57, 0x61, 0xae, 0xf4, 0x38, 0xd3, 0x17, 0x57, 0x26, 0x53, 0xd1, 0xa9, 0x0a, 0x0e, 0x96,
0xd9, 0x66, 0x59, 0xe0, 0xdc, 0xc2, 0xf9, 0x56, 0xad, 0xa4, 0xe1, 0xf4, 0x8c, 0x79, 0x49, 0x30,
0x11, 0xe3, 0x2c, 0xce, 0x92, 0x5a, 0xe0, 0x59, 0x8a, 0x39, 0x8d, 0x1e, 0xc1, 0x3a, 0xf1, 0x84,
0x96, 0xba, 0x30, 0x9c, 0x05, 0x67, 0x1a, 0xd2, 0xbe, 0xd4, 0xc4, 0xca, 0xc2, 0x71, 0x61, 0x73,
0xdf, 0x0b, 0xf7, 0x7d, 0x1f, 0x53, 0x2f, 0x4e, 0xfc, 0x7f, 0xbe, 0x4f, 0xb5, 0x6b, 0xc0, 0x2c,
0x5d, 0x03, 0xce, 0x97, 0xd0, 0x29, 0x43, 0xa9, 0x6d, 0xda, 0x83, 0x46, 0x22, 0x39, 0x39, 0x58,
0x4e, 0x5f, 0x81, 0xf6, 0xb9, 0x44, 0xfb, 0x8c, 0xf2, 0x14, 0x8d, 0xfd, 0xab, 0xc8, 0x88, 0x17,
0x1e, 0x17, 0xcf, 0x85, 0x8c, 0x74, 0x1e, 0xc0, 0x8d, 0x39, 0x2c, 0x15, 0x9a, 0xbc, 0xed, 0x24,
0x4b, 0x16, 0xd5, 0xc2, 0x19, 0xb9, 0xf3, 0xa7, 0x01, 0x8d, 0xa3, 0x24, 0x39, 0x88, 0x7d, 0xca,
0x50, 0x1b, 0xe0, 0x45, 0x44, 0x2f, 0x27, 0xd4, 0xe3, 0xd4, 0xb7, 0x6b, 0xc8, 0x56, 0xbb, 0xfe,
0x69, 0xc0, 0x58, 0x10, 0x5d, 0xd8, 0x06, 0xba, 0xa6, 0x26, 0xfa, 0xe8, 0x32, 0x60, 0x9c, 0xd9,
0x26, 0xda, 0x84, 0x6b, 0x92, 0xf1, 0x2c, 0xe6, 0x6e, 0x74, 0x40, 0xbc, 0x11, 0xb5, 0x57, 0x10,
0x82, 0xb6, 0x64, 0xba, 0x2c, 0x9d, 0x7c, 0xdf, 0x5e, 0x45, 0x5d, 0xe8, 0xc8, 0x09, 0x64, 0xcf,
0x62, 0xae, 0xe2, 0x0a, 0xce, 0x42, 0x6a, 0xaf, 0xa1, 0x0e, 0xd8, 0x98, 0x7a, 0x34, 0x98, 0x70,
0x97, 0xb9, 0xd1, 0x2b, 0x12, 0x06, 0xbe, 0xbd, 0x2e, 0x30, 0x14, 0xa1, 0x56, 0x94, 0x5d, 0x17,
0x9a, 0x87, 0xd3, 0x74, 0xf5, 0x51, 0x55, 0x27, 0xbb, 0x81, 0x6e, 0xc1, 0xd6, 0xf3, 0x38, 0x7e,
0x4a, 0xa2, 0x99, 0xe2, 0xb1, 0x27, 0x49, 0x3c, 0x16, 0xce, 0xec, 0xa6, 0x08, 0xf8, 0x28, 0x49,
0xe2, 0xe4, 0xe4, 0xfc, 0x9c, 0x51, 0x6e, 0xfb, 0x3b, 0x0f, 0x61, 0x6b, 0xc9, 0xac, 0xa0, 0x16,
0x34, 0x15, 0xf7, 0x8c, 0xda, 0x35, 0x61, 0xfa, 0x22, 0x62, 0x39, 0xc3, 0xd8, 0xd9, 0x81, 0x46,
0xf6, 0x2e, 0x41, 0x1b, 0x50, 0x77, 0xa3, 0x40, 0xdc, 0xc9, 0x76, 0x0d, 0x5d, 0x87, 0xd6, 0x69,
0x42, 0x3d, 0x12, 0x7a, 0xd3, 0x90, 0x88, 0x74, 0x8d, 0xdd, 0xbf, 0x56, 0xa1, 0x99, 0xfa, 0x99,
0x45, 0x1e, 0x3a, 0x80, 0x46, 0xf6, 0x0e, 0x42, 0xbd, 0xca, 0xc7, 0x91, 0x0c, 0xbc, 0x77, 0xab,
0xfa, 0xe1, 0x94, 0x36, 0xf1, 0x89, 0x42, 0x14, 0x77, 0x3f, 0xba, 0xb5, 0x70, 0x53, 0x17, 0x0f,
0x8f, 0xde, 0xed, 0x6a, 0xe1, 0x02, 0x4e, 0x18, 0x56, 0xe1, 0xe4, 0x8f, 0x88, 0x2a, 0x1c, 0xed,
0xf5, 0x80, 0xc1, 0x2e, 0xde, 0x63, 0x43, 0x9e, 0x50, 0x32, 0x46, 0xb7, 0x17, 0xf6, 0xaf, 0xf6,
0x58, 0xeb, 0x5d, 0x29, 0xdd, 0x36, 0xee, 0x1b, 0xe8, 0x18, 0xa0, 0x10, 0xbc, 0x0f, 0x1a, 0x7a,
0x09, 0x5b, 0x05, 0x53, 0x25, 0xf4, 0xfe, 0x41, 0xde, 0x37, 0xd0, 0x09, 0x58, 0xfa, 0xf1, 0x47,
0x7d, 0x4d, 0xbf, 0x62, 0xc5, 0xf4, 0xee, 0x2c, 0x95, 0xe7, 0x75, 0x6c, 0x95, 0x4e, 0x2d, 0x9a,
0xb3, 0x58, 0xd8, 0x0d, 0xbd, 0xc1, 0x72, 0x85, 0x14, 0xf3, 0xf1, 0x87, 0xbf, 0xbe, 0xed, 0x1b,
0x6f, 0xde, 0xf6, 0x8d, 0x3f, 0xde, 0xf6, 0x8d, 0x1f, 0xdf, 0xf5, 0x6b, 0x6f, 0xde, 0xf5, 0x6b,
0xbf, 0xbf, 0xeb, 0xd7, 0xbe, 0xea, 0x2d, 0xff, 0x8f, 0xed, 0x6c, 0x5d, 0xfe, 0xd9, 0xfb, 0x3b,
0x00, 0x00, 0xff, 0xff, 0xd0, 0x97, 0xf7, 0xc0, 0xd6, 0x0d, 0x00, 0x00,
// 1358 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4d, 0x73, 0xdb, 0xc4,
0x1b, 0xb7, 0x14, 0x27, 0xb6, 0x9f, 0x28, 0xae, 0xba, 0x71, 0x1a, 0xff, 0xdd, 0x8e, 0xeb, 0xd1,
0xfc, 0x87, 0xc9, 0x64, 0x86, 0xbe, 0x24, 0xc0, 0x4c, 0x0b, 0x1c, 0xd2, 0x24, 0x25, 0xa2, 0xb4,
0xc9, 0xac, 0x5b, 0x3a, 0xc3, 0x0c, 0x87, 0x8d, 0xb4, 0x49, 0x04, 0xb2, 0x64, 0xb4, 0xeb, 0x36,
0x3e, 0x72, 0xe2, 0xca, 0x70, 0xe4, 0x13, 0x71, 0x2c, 0x9c, 0x38, 0x32, 0xed, 0x9d, 0x4f, 0xc0,
0x81, 0xd9, 0xd5, 0x4a, 0x5a, 0xd9, 0x72, 0x81, 0xe9, 0xc5, 0xd1, 0xf3, 0xf6, 0x7b, 0x5e, 0xf7,
0xd9, 0x0d, 0xdc, 0xf5, 0xe2, 0xd1, 0x28, 0x8e, 0xd8, 0x98, 0x78, 0xf4, 0xb6, 0xfc, 0x65, 0xd3,
0xc8, 0x1b, 0x27, 0x31, 0x8f, 0x6f, 0xcb, 0x5f, 0x56, 0x70, 0x6f, 0x49, 0x06, 0x6a, 0xe5, 0x0c,
0x87, 0xc2, 0xda, 0x11, 0x25, 0xfe, 0x70, 0x1a, 0x79, 0x98, 0x44, 0xe7, 0x14, 0x21, 0xa8, 0x9f,
0x25, 0xf1, 0xa8, 0x6b, 0x0c, 0x8c, 0xad, 0x3a, 0x96, 0xdf, 0xa8, 0x0d, 0x26, 0x8f, 0xbb, 0xa6,
0xe4, 0x98, 0x3c, 0x46, 0x1d, 0x58, 0x0e, 0x83, 0x51, 0xc0, 0xbb, 0x4b, 0x03, 0x63, 0x6b, 0x0d,
0xa7, 0x04, 0xea, 0x41, 0x93, 0x86, 0x74, 0x44, 0x23, 0xce, 0xba, 0xf5, 0x81, 0xb1, 0xd5, 0xc4,
0x39, 0xed, 0x5c, 0x42, 0x3b, 0x77, 0x43, 0xd9, 0x24, 0xe4, 0xc2, 0xcf, 0x05, 0x61, 0x17, 0xd2,
0x8f, 0x85, 0xe5, 0x37, 0xfa, 0x44, 0x43, 0x30, 0x07, 0x4b, 0x5b, 0xab, 0x3b, 0x83, 0x5b, 0x45,
0xec, 0x65, 0x80, 0xc3, 0x54, 0xb1, 0xf0, 0x21, 0xa2, 0xf2, 0xe2, 0x49, 0x94, 0x47, 0x25, 0x09,
0xe7, 0x63, 0xd8, 0xa8, 0x34, 0x14, 0x49, 0x05, 0xbe, 0x74, 0xdf, 0xc2, 0x66, 0xe0, 0xcb, 0x80,
0x28, 0xf1, 0x65, 0x9a, 0x2d, 0x2c, 0xbf, 0x9d, 0x9f, 0x0c, 0xb8, 0x52, 0x58, 0x7f, 0x37, 0xa1,
0x8c, 0xa3, 0x2e, 0x34, 0x64, 0x4c, 0x6e, 0x66, 0x9c, 0x91, 0xe8, 0x0e, 0xac, 0x24, 0xa2, 0x86,
0x59, 0xf0, 0xdd, 0xaa, 0xe0, 0x85, 0x02, 0x56, 0x7a, 0x68, 0x17, 0x9a, 0x7e, 0x70, 0x76, 0xf6,
0x74, 0x3a, 0xa6, 0x32, 0xea, 0xf6, 0xce, 0xba, 0x66, 0x73, 0xa0, 0x44, 0x0f, 0xcc, 0xae, 0x81,
0x73, 0x45, 0xe7, 0x12, 0x6c, 0x2d, 0xa3, 0x71, 0x1c, 0x31, 0x8a, 0x76, 0xa1, 0x91, 0xc8, 0xec,
0x58, 0xd7, 0x90, 0xbe, 0xff, 0xb7, 0xb0, 0x70, 0x38, 0xd3, 0x44, 0xb7, 0x35, 0xef, 0xe6, 0x42,
0xef, 0x9a, 0xe7, 0xdf, 0x0c, 0xb8, 0x7a, 0x7c, 0xfa, 0x0d, 0xf5, 0xb8, 0x80, 0x7b, 0x4c, 0x19,
0x23, 0xe7, 0xf4, 0x2d, 0x05, 0xb9, 0x01, 0xad, 0x24, 0xad, 0x9a, 0x9b, 0xd5, 0xb5, 0x60, 0x08,
0xbb, 0x84, 0x8e, 0xc3, 0xa9, 0xeb, 0xcb, 0xdc, 0x5b, 0x38, 0x23, 0x85, 0x64, 0x4c, 0xa6, 0x61,
0x4c, 0x7c, 0x39, 0x48, 0x16, 0xce, 0x48, 0x31, 0x63, 0xb1, 0x0c, 0xc0, 0xf5, 0xbb, 0xcb, 0xd2,
0x28, 0xa7, 0xd1, 0x87, 0x00, 0xe9, 0xb7, 0x4c, 0x68, 0x45, 0x26, 0xb4, 0xa1, 0x25, 0x74, 0x9c,
0x0b, 0xb1, 0xa6, 0xe8, 0x50, 0xb0, 0x87, 0x42, 0xe7, 0x64, 0xc2, 0x2e, 0xb2, 0x1e, 0xdf, 0x2d,
0x02, 0x10, 0x29, 0xad, 0xee, 0x6c, 0x6a, 0x38, 0xa9, 0x76, 0x2a, 0x2e, 0x22, 0xeb, 0x03, 0xec,
0x27, 0xd4, 0xa7, 0x11, 0x0f, 0x48, 0x28, 0x93, 0xb5, 0xb0, 0xc6, 0x71, 0xd6, 0xe1, 0xaa, 0xe6,
0x26, 0x6d, 0x9b, 0xe3, 0xe4, 0xbe, 0xc3, 0x30, 0xf3, 0x3d, 0x33, 0x97, 0xce, 0xc3, 0xdc, 0x50,
0xe8, 0xa8, 0x7e, 0xff, 0xf7, 0x00, 0x9d, 0xef, 0x4d, 0xb0, 0x74, 0x09, 0xda, 0x83, 0x55, 0x69,
0x23, 0xc6, 0x83, 0x26, 0x0a, 0xe7, 0xa6, 0x86, 0x83, 0xc9, 0xcb, 0x61, 0xa1, 0xf0, 0x3c, 0xe0,
0x17, 0xae, 0x8f, 0x75, 0x1b, 0x91, 0x34, 0xf1, 0x42, 0x05, 0x98, 0x25, 0x5d, 0x70, 0x90, 0x03,
0x56, 0x41, 0xe5, 0x7d, 0x2e, 0xf1, 0xd0, 0x0e, 0x74, 0x24, 0xe4, 0x90, 0x72, 0x1e, 0x44, 0xe7,
0xec, 0xa4, 0xd4, 0xf9, 0x4a, 0x19, 0xfa, 0x08, 0xae, 0x55, 0xf1, 0xf3, 0xa1, 0x58, 0x20, 0x75,
0x7e, 0x35, 0x60, 0x55, 0x4b, 0x49, 0x8c, 0x53, 0x20, 0x1b, 0xc4, 0xa7, 0x6a, 0x11, 0xe5, 0xb4,
0x18, 0x5e, 0x1e, 0x8c, 0x28, 0xe3, 0x64, 0x34, 0x96, 0xa9, 0x2d, 0xe1, 0x82, 0x21, 0xa4, 0xd2,
0x47, 0x7e, 0x74, 0x5b, 0xb8, 0x60, 0xa0, 0xf7, 0xa0, 0x2d, 0x66, 0x39, 0xf0, 0x08, 0x0f, 0xe2,
0xe8, 0x11, 0x9d, 0xca, 0x6c, 0xea, 0x78, 0x86, 0x2b, 0x76, 0x0e, 0xa3, 0x34, 0x8d, 0xda, 0xc2,
0xf2, 0x1b, 0xdd, 0x02, 0xa4, 0x95, 0x38, 0xab, 0xc6, 0x8a, 0xd4, 0xa8, 0x90, 0x38, 0x27, 0xd0,
0x2e, 0x37, 0x0a, 0x0d, 0xe6, 0x1b, 0x6b, 0x95, 0xfb, 0x26, 0xa2, 0x0f, 0xce, 0x23, 0xc2, 0x27,
0x09, 0x55, 0x6d, 0x2b, 0x18, 0xce, 0x01, 0x74, 0xaa, 0x5a, 0x2f, 0x8f, 0x33, 0x79, 0x59, 0x42,
0x2d, 0x18, 0x6a, 0x6e, 0xcd, 0x7c, 0x6e, 0x7f, 0x36, 0xa0, 0x33, 0xd4, 0xdb, 0xb0, 0x1f, 0x47,
0x5c, 0x2c, 0xde, 0x4f, 0xc1, 0x4a, 0x8f, 0xdf, 0x01, 0x0d, 0x29, 0xa7, 0x15, 0x03, 0x7c, 0xac,
0x89, 0x8f, 0x6a, 0xb8, 0xa4, 0x8e, 0xee, 0xab, 0xec, 0x94, 0xb5, 0x29, 0xad, 0xaf, 0xcd, 0x8e,
0x7f, 0x6e, 0xac, 0x2b, 0x3f, 0x68, 0xc0, 0xf2, 0x0b, 0x12, 0x4e, 0xa8, 0xd3, 0x07, 0x4b, 0x77,
0x32, 0x77, 0xe8, 0x76, 0xd5, 0x9c, 0x28, 0xf1, 0xff, 0x61, 0xcd, 0x97, 0x5f, 0xc9, 0x09, 0xa5,
0x49, 0xbe, 0xe8, 0xca, 0x4c, 0xe7, 0x6b, 0xd8, 0x28, 0x25, 0x3c, 0x8c, 0xc8, 0x98, 0x5d, 0xc4,
0x5c, 0x1c, 0x93, 0x54, 0xd3, 0x77, 0xfd, 0x74, 0x41, 0xb7, 0xb0, 0xc6, 0x99, 0x87, 0x37, 0xab,
0xe0, 0x7f, 0x30, 0xc0, 0xca, 0xa0, 0x0f, 0x08, 0x27, 0xe8, 0x1e, 0x34, 0xbc, 0xb4, 0xa6, 0x6a,
0xe9, 0xdf, 0x9c, 0xad, 0xc2, 0x4c, 0xe9, 0x71, 0xa6, 0x2f, 0x6e, 0x5a, 0xa6, 0xa2, 0x53, 0x15,
0x1c, 0x2c, 0xb2, 0xcd, 0xb2, 0xc0, 0xb9, 0x85, 0xf3, 0xad, 0x5a, 0x49, 0xc3, 0xc9, 0x29, 0xf3,
0x92, 0x60, 0x2c, 0xc6, 0x59, 0x9c, 0x25, 0xb5, 0xf7, 0xb3, 0x14, 0x73, 0x1a, 0xdd, 0x87, 0x15,
0xe2, 0x09, 0x2d, 0x75, 0xcf, 0x38, 0x73, 0xce, 0x34, 0xa4, 0x3d, 0xa9, 0x89, 0x95, 0x85, 0xe3,
0xc2, 0xfa, 0x9e, 0x17, 0xee, 0xf9, 0x3e, 0xa6, 0x5e, 0x9c, 0xf8, 0xff, 0x7c, 0x0d, 0x6b, 0xb7,
0x87, 0x59, 0xba, 0x3d, 0x9c, 0x2f, 0xa0, 0x53, 0x86, 0x52, 0xdb, 0xb4, 0x07, 0xcd, 0x44, 0x72,
0x72, 0xb0, 0x9c, 0x7e, 0x0b, 0xda, 0xe7, 0x12, 0xed, 0x33, 0xca, 0x53, 0x34, 0xf6, 0xaf, 0x22,
0x23, 0x5e, 0x78, 0x54, 0xbc, 0x32, 0x32, 0xd2, 0xb9, 0x0b, 0x1b, 0x33, 0x58, 0x2a, 0x34, 0x79,
0x49, 0x4a, 0x96, 0x2c, 0xaa, 0x85, 0x33, 0x72, 0xfb, 0x4f, 0x03, 0x9a, 0x87, 0x49, 0xb2, 0x1f,
0xfb, 0x94, 0xa1, 0x36, 0xc0, 0xb3, 0x88, 0x5e, 0x8e, 0xa9, 0xc7, 0xa9, 0x6f, 0xd7, 0x90, 0xad,
0x76, 0xfd, 0xe3, 0x80, 0xb1, 0x20, 0x3a, 0xb7, 0x0d, 0x74, 0x45, 0x4d, 0xf4, 0xe1, 0x65, 0xc0,
0x38, 0xb3, 0x4d, 0xb4, 0x0e, 0x57, 0x24, 0xe3, 0x49, 0xcc, 0xdd, 0x68, 0x9f, 0x78, 0x17, 0xd4,
0x5e, 0x42, 0x08, 0xda, 0x92, 0xe9, 0xb2, 0x74, 0xf2, 0x7d, 0xbb, 0x8e, 0xba, 0xd0, 0x91, 0x13,
0xc8, 0x9e, 0xc4, 0x5c, 0xc5, 0x15, 0x9c, 0x86, 0xd4, 0x5e, 0x46, 0x1d, 0xb0, 0x31, 0xf5, 0x68,
0x30, 0xe6, 0x2e, 0x73, 0xa3, 0x17, 0x24, 0x0c, 0x7c, 0x7b, 0x45, 0x60, 0x28, 0x42, 0xad, 0x28,
0xbb, 0x21, 0x34, 0x0f, 0x26, 0xe9, 0xea, 0xa3, 0xaa, 0x4e, 0x76, 0x13, 0x5d, 0x87, 0xcd, 0xa7,
0x71, 0xfc, 0x98, 0x44, 0x53, 0xc5, 0x63, 0x0f, 0x93, 0x78, 0x24, 0x9c, 0xd9, 0x2d, 0x11, 0xf0,
0x61, 0x92, 0xc4, 0xc9, 0xf1, 0xd9, 0x19, 0xa3, 0xdc, 0xf6, 0xb7, 0xef, 0xc1, 0xe6, 0x82, 0x59,
0x41, 0x6b, 0xd0, 0x52, 0xdc, 0x53, 0x6a, 0xd7, 0x84, 0xe9, 0xb3, 0x88, 0xe5, 0x0c, 0x63, 0x7b,
0x1b, 0x9a, 0xd9, 0x73, 0x06, 0xad, 0x42, 0xc3, 0x8d, 0x02, 0x71, 0x27, 0xdb, 0x35, 0x74, 0x15,
0xd6, 0x4e, 0x12, 0xea, 0x91, 0xd0, 0x9b, 0x84, 0x44, 0xa4, 0x6b, 0x6c, 0xbf, 0x0f, 0x50, 0xbc,
0x14, 0x50, 0x13, 0xea, 0x4f, 0x13, 0x2a, 0x40, 0x1b, 0xb0, 0xb4, 0xe7, 0x85, 0xb6, 0x81, 0x2c,
0x68, 0x3e, 0xa2, 0xd3, 0x2f, 0xc5, 0x1e, 0xb1, 0xcd, 0x9d, 0xbf, 0xea, 0xd0, 0x4a, 0xc3, 0x9a,
0x46, 0x1e, 0xda, 0x87, 0x66, 0xf6, 0xda, 0x42, 0xbd, 0xca, 0x27, 0x98, 0xcc, 0xb3, 0x77, 0xbd,
0xfa, 0x79, 0x96, 0xf6, 0xfc, 0xa1, 0x42, 0x14, 0x4f, 0x05, 0x74, 0x7d, 0xee, 0x62, 0x2f, 0xde,
0x29, 0xbd, 0x1b, 0xd5, 0xc2, 0x39, 0x9c, 0x30, 0xac, 0xc2, 0xc9, 0xdf, 0x1c, 0x55, 0x38, 0xda,
0x63, 0x03, 0x83, 0x5d, 0xbc, 0xfa, 0x86, 0x3c, 0xa1, 0x64, 0x84, 0x6e, 0xcc, 0xad, 0x6b, 0xed,
0x49, 0xd8, 0x7b, 0xab, 0x74, 0xcb, 0xb8, 0x63, 0xa0, 0xa3, 0xac, 0xca, 0xb2, 0x54, 0xef, 0x80,
0x86, 0x9e, 0xc3, 0x66, 0xc1, 0x54, 0x09, 0xbd, 0x7b, 0x90, 0x77, 0x0c, 0x74, 0x0c, 0x96, 0xbe,
0x2d, 0x50, 0x5f, 0xd3, 0xaf, 0xd8, 0x48, 0xbd, 0x9b, 0x0b, 0xe5, 0x79, 0x1d, 0xd7, 0x4a, 0x87,
0x1c, 0xcd, 0x58, 0xcc, 0xad, 0x92, 0xde, 0x60, 0xb1, 0x42, 0x8a, 0xf9, 0xe0, 0x83, 0x5f, 0x5e,
0xf7, 0x8d, 0x57, 0xaf, 0xfb, 0xc6, 0x1f, 0xaf, 0xfb, 0xc6, 0x8f, 0x6f, 0xfa, 0xb5, 0x57, 0x6f,
0xfa, 0xb5, 0xdf, 0xdf, 0xf4, 0x6b, 0x5f, 0xf5, 0x16, 0xff, 0x5f, 0x78, 0xba, 0x22, 0xff, 0xec,
0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x46, 0x42, 0x1b, 0xb6, 0x3c, 0x0e, 0x00, 0x00,
}
func (m *HeadSyncRange) Marshal() (dAtA []byte, err error) {
@ -2046,6 +2087,11 @@ func (m *ObjectSyncMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if m.ObjectType != 0 {
i = encodeVarintSpacesync(dAtA, i, uint64(m.ObjectType))
i--
dAtA[i] = 0x30
}
if len(m.ObjectId) > 0 {
i -= len(m.ObjectId)
copy(dAtA[i:], m.ObjectId)
@ -2951,6 +2997,9 @@ func (m *ObjectSyncMessage) Size() (n int) {
if l > 0 {
n += 1 + l + sovSpacesync(uint64(l))
}
if m.ObjectType != 0 {
n += 1 + sovSpacesync(uint64(m.ObjectType))
}
return n
}
@ -4097,6 +4146,25 @@ func (m *ObjectSyncMessage) Unmarshal(dAtA []byte) error {
}
m.ObjectId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 6:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ObjectType", wireType)
}
m.ObjectType = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowSpacesync
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.ObjectType |= ObjectType(b&0x7F) << shift
if b < 0x80 {
break
}
}
default:
iNdEx = preIndex
skippy, err := skipSpacesync(dAtA[iNdEx:])

9
commonspace/sync/objectsync/objectmessages/headupdate.go
View file

@ -39,6 +39,7 @@ type InnerHeadUpdate interface {
Prepare() error
Heads() []string
MsgSize() uint64
ObjectType() spacesyncproto.ObjectType
}
type ObjectMeta struct {
@ -51,6 +52,7 @@ type HeadUpdate struct {
Meta ObjectMeta
Bytes []byte
Update InnerHeadUpdate
objectType spacesyncproto.ObjectType
msg *spacesyncproto.ObjectSyncMessage
}
@ -84,6 +86,7 @@ func (h *HeadUpdate) SetProtoMessage(message proto.Message) error {
h.Bytes = msg.GetPayload()
h.Meta.SpaceId = msg.SpaceId
h.Meta.ObjectId = msg.ObjectId
h.objectType = msg.GetObjectType()
return nil
}
@ -97,11 +100,16 @@ func (h *HeadUpdate) ProtoMessage() (proto.Message, error) {
SpaceId: h.Meta.SpaceId,
Payload: payload,
ObjectId: h.Meta.ObjectId,
ObjectType: h.objectType,
}, nil
}
return NewMessage(), nil
}
func (h *HeadUpdate) ObjectType() spacesyncproto.ObjectType {
return h.objectType
}
func (h *HeadUpdate) SpaceId() string {
return h.Meta.SpaceId
}
@ -120,5 +128,6 @@ func (h *HeadUpdate) Copy() drpc.Message {
Bytes: h.Bytes,
Update: h.Update,
msg: h.msg,
objectType: h.objectType,
}
}

4
commonspace/sync/sync.go
View file

@ -12,6 +12,7 @@ import (
"github.com/anyproto/any-sync/app/logger"
"github.com/anyproto/any-sync/commonspace/peermanager"
"github.com/anyproto/any-sync/commonspace/spacestate"
"github.com/anyproto/any-sync/commonspace/spacesyncproto"
"github.com/anyproto/any-sync/commonspace/sync/syncdeps"
"github.com/anyproto/any-sync/metric"
"github.com/anyproto/any-sync/nodeconf"
@ -117,6 +118,9 @@ func (s *syncService) HandleMessage(ctx context.Context, msg drpc.Message) error
if !ok {
return ErrUnexpectedMessage
}
if idMsg.ObjectType() == spacesyncproto.ObjectType_KeyValue {
return nil
}
objectId := idMsg.ObjectId()
err := s.receiveQueue.Add(ctx, objectId, msgCtx{
ctx: ctx,

13
commonspace/sync/sync_test.go
View file

@ -115,6 +115,14 @@ func TestSyncService(t *testing.T) {
}
require.Equal(t, headUpdate, f.syncHandler.headUpdate)
})
t.Run("handle key value message no op", func(t *testing.T) {
f := newFixture(t)
headUpdate := &testMessage{objectId: "objectId", objectType: spacesyncproto.ObjectType_KeyValue}
err := f.HandleMessage(ctx, headUpdate)
require.NoError(t, err)
f.Close(t)
require.Nil(t, f.syncHandler.headUpdate)
})
t.Run("handle message", func(t *testing.T) {
f := newFixture(t)
f.syncHandler.toReceiveData = map[string][]*testResponse{
@ -387,6 +395,11 @@ func (r *testRequest) MsgSize() uint64 {
type testMessage struct {
objectId string
objectType spacesyncproto.ObjectType
}
func (t *testMessage) ObjectType() spacesyncproto.ObjectType {
return t.objectType
}
func (t *testMessage) ObjectId() string {

3
commonspace/sync/syncdeps/message.go
View file

@ -1,6 +1,9 @@
package syncdeps
import "github.com/anyproto/any-sync/commonspace/spacesyncproto"
type Message interface {
ObjectId() string
MsgSize() uint64
ObjectType() spacesyncproto.ObjectType
}