diff --git a/client/api/apiproto/api.pb.go b/client/api/apiproto/api.pb.go index 59eaeb5d..61c99e32 100644 --- a/client/api/apiproto/api.pb.go +++ b/client/api/apiproto/api.pb.go @@ -786,6 +786,86 @@ func (m *AllSpacesResponse) GetSpaceIds() []string { return nil } +type LoadSpaceRequest struct { + SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` +} + +func (m *LoadSpaceRequest) Reset() { *m = LoadSpaceRequest{} } +func (m *LoadSpaceRequest) String() string { return proto.CompactTextString(m) } +func (*LoadSpaceRequest) ProtoMessage() {} +func (*LoadSpaceRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_fc31080c27db9707, []int{17} +} +func (m *LoadSpaceRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LoadSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LoadSpaceRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LoadSpaceRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_LoadSpaceRequest.Merge(m, src) +} +func (m *LoadSpaceRequest) XXX_Size() int { + return m.Size() +} +func (m *LoadSpaceRequest) XXX_DiscardUnknown() { + xxx_messageInfo_LoadSpaceRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_LoadSpaceRequest proto.InternalMessageInfo + +func (m *LoadSpaceRequest) GetSpaceId() string { + if m != nil { + return m.SpaceId + } + return "" +} + +type LoadSpaceResponse struct { +} + +func (m *LoadSpaceResponse) Reset() { *m = LoadSpaceResponse{} } +func (m *LoadSpaceResponse) String() string { return proto.CompactTextString(m) } +func (*LoadSpaceResponse) ProtoMessage() {} +func (*LoadSpaceResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_fc31080c27db9707, []int{18} +} +func (m *LoadSpaceResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *LoadSpaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_LoadSpaceResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *LoadSpaceResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_LoadSpaceResponse.Merge(m, src) +} +func (m *LoadSpaceResponse) XXX_Size() int { + return m.Size() +} +func (m *LoadSpaceResponse) XXX_DiscardUnknown() { + xxx_messageInfo_LoadSpaceResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_LoadSpaceResponse proto.InternalMessageInfo + func init() { proto.RegisterType((*CreateSpaceRequest)(nil), "api.CreateSpaceRequest") proto.RegisterType((*CreateSpaceResponse)(nil), "api.CreateSpaceResponse") @@ -804,45 +884,48 @@ func init() { proto.RegisterType((*AllTreesResponse)(nil), "api.AllTreesResponse") proto.RegisterType((*AllSpacesRequest)(nil), "api.AllSpacesRequest") proto.RegisterType((*AllSpacesResponse)(nil), "api.AllSpacesResponse") + proto.RegisterType((*LoadSpaceRequest)(nil), "api.LoadSpaceRequest") + proto.RegisterType((*LoadSpaceResponse)(nil), "api.LoadSpaceResponse") } func init() { proto.RegisterFile("api/apiproto/protos/api.proto", fileDescriptor_fc31080c27db9707) } var fileDescriptor_fc31080c27db9707 = []byte{ - // 517 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x8f, 0xd2, 0x50, - 0x14, 0xa5, 0xc0, 0x7c, 0xf4, 0x60, 0x60, 0xbc, 0x03, 0xd8, 0xd4, 0x58, 0xc9, 0x4b, 0x9c, 0x90, - 0x68, 0x86, 0x38, 0x63, 0x62, 0xe2, 0x6a, 0x70, 0xd8, 0x10, 0x57, 0xe2, 0xac, 0x5c, 0x98, 0xd4, - 0xe9, 0x4b, 0x6c, 0xc2, 0xc7, 0x93, 0x16, 0x33, 0x7f, 0xc1, 0x9d, 0x3f, 0xcb, 0xe5, 0x2c, 0x5d, - 0x1a, 0xf8, 0x23, 0xa6, 0xaf, 0xb7, 0xa5, 0x1f, 0x4c, 0xcc, 0x64, 0x36, 0xf0, 0xee, 0x79, 0xf7, - 0x9c, 0x7b, 0x4b, 0xcf, 0x01, 0xcf, 0x5c, 0xe5, 0x0f, 0x5c, 0xe5, 0xab, 0xe5, 0x22, 0x5c, 0x0c, - 0xf4, 0x67, 0x10, 0xd5, 0xa7, 0xfa, 0x48, 0x35, 0x57, 0xf9, 0xa2, 0x0d, 0xba, 0x5c, 0x4a, 0x37, - 0x94, 0x9f, 0x94, 0x7b, 0x2d, 0x27, 0xf2, 0xfb, 0x4a, 0x06, 0xa1, 0x78, 0x81, 0xe3, 0x1c, 0x1a, - 0xa8, 0xc5, 0x3c, 0x90, 0xd4, 0x44, 0xd5, 0xf7, 0x2c, 0xa3, 0x67, 0xf4, 0xcd, 0x49, 0xd5, 0xf7, - 0x22, 0xf2, 0x48, 0x2e, 0xfd, 0x1f, 0x25, 0x72, 0x0e, 0xbd, 0x83, 0xfc, 0x1a, 0x9d, 0x78, 0xc6, - 0x68, 0x71, 0xbd, 0x9a, 0xc9, 0x79, 0xc8, 0x7c, 0xb2, 0x70, 0x10, 0x44, 0xcc, 0x71, 0xd2, 0x9d, - 0x94, 0xa2, 0x8f, 0x6e, 0x91, 0x72, 0x87, 0xf8, 0x47, 0x74, 0x46, 0x72, 0x2a, 0xef, 0x21, 0x4e, - 0x0e, 0xe0, 0x71, 0xf3, 0xd8, 0xb3, 0xaa, 0xfa, 0x32, 0x83, 0x08, 0x0b, 0xdd, 0xa2, 0x64, 0x3c, - 0x5c, 0x7c, 0x41, 0x73, 0xe8, 0x79, 0x57, 0xf2, 0xe6, 0xe1, 0x53, 0x88, 0x50, 0x0f, 0xe5, 0x4d, - 0x68, 0xd5, 0xf4, 0x8d, 0x3e, 0x8b, 0x31, 0x5a, 0xa9, 0x3e, 0x3f, 0x6f, 0x5e, 0xc6, 0x28, 0xc9, - 0x74, 0xb1, 0xff, 0x4d, 0xba, 0x5e, 0x3a, 0x82, 0x2b, 0xf1, 0x01, 0xad, 0xd1, 0x6a, 0xa6, 0xae, - 0x96, 0x52, 0x3e, 0xfc, 0x17, 0x39, 0xc1, 0xd1, 0x56, 0x8c, 0x17, 0x23, 0xd4, 0xbd, 0xd5, 0x4c, - 0xb1, 0x94, 0x3e, 0x8b, 0x97, 0x68, 0x0d, 0xa7, 0xd3, 0xa8, 0x2d, 0xf8, 0xff, 0x3b, 0x7e, 0x85, - 0x7a, 0xd4, 0x59, 0x7c, 0xa3, 0xd4, 0xc6, 0x5e, 0xf4, 0x0c, 0x81, 0x55, 0xed, 0xd5, 0xfa, 0xe6, - 0x24, 0x2e, 0xc4, 0x39, 0x8e, 0xb6, 0xd2, 0xbc, 0xc2, 0x73, 0xec, 0x85, 0x11, 0x60, 0x19, 0xbd, - 0x5a, 0xbf, 0x71, 0x66, 0x9e, 0x46, 0x96, 0xd7, 0x4b, 0xc6, 0xb8, 0x20, 0x4d, 0xd2, 0xee, 0x4c, - 0x16, 0x12, 0x03, 0x3c, 0xce, 0x60, 0xac, 0x64, 0xe3, 0x90, 0xd7, 0x8a, 0xc5, 0xcc, 0x49, 0x5a, - 0x9f, 0xfd, 0xac, 0xc3, 0xbc, 0x9c, 0xfa, 0x72, 0x1e, 0x0e, 0x95, 0x4f, 0x17, 0x68, 0x64, 0x02, - 0x43, 0x4f, 0xf4, 0xcc, 0x72, 0xb0, 0x6c, 0xab, 0x7c, 0xc1, 0xb3, 0x2e, 0xd0, 0xc8, 0xa4, 0x86, - 0x15, 0xca, 0xe9, 0x62, 0x85, 0x5d, 0x01, 0x1b, 0xa3, 0x99, 0x4f, 0x07, 0xd9, 0x99, 0x69, 0x85, - 0x20, 0xd8, 0x4f, 0x77, 0xde, 0x6d, 0xa5, 0xf2, 0x5e, 0x67, 0xa9, 0x9d, 0x99, 0x62, 0xa9, 0xdd, - 0xe1, 0xa0, 0x37, 0x38, 0x60, 0xf3, 0xd2, 0xb1, 0xee, 0xcb, 0x47, 0xc5, 0x6e, 0xe7, 0x41, 0x66, - 0xbd, 0xc5, 0x61, 0x62, 0x2d, 0x8a, 0x3b, 0x0a, 0xb6, 0xb5, 0x3b, 0x05, 0x74, 0x4b, 0x4c, 0x0c, - 0xc1, 0xc4, 0x82, 0xf5, 0x98, 0x58, 0x72, 0xcd, 0x3b, 0x98, 0xa9, 0x01, 0x28, 0xed, 0xc9, 0x99, - 0xc4, 0xee, 0x16, 0xe1, 0x98, 0xfb, 0xfe, 0xe4, 0xf7, 0xda, 0x31, 0x6e, 0xd7, 0x8e, 0xf1, 0x77, - 0xed, 0x18, 0xbf, 0x36, 0x4e, 0xe5, 0x76, 0xe3, 0x54, 0xfe, 0x6c, 0x9c, 0xca, 0xe7, 0x47, 0xd9, - 0xbf, 0xe0, 0xaf, 0xfb, 0xfa, 0xeb, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x38, 0x60, 0xfe, - 0x5b, 0x99, 0x05, 0x00, 0x00, + // 544 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0x8d, 0x93, 0xf4, 0xc3, 0x13, 0x94, 0xa4, 0x93, 0x0f, 0x2c, 0x23, 0x4c, 0xb4, 0x12, 0x55, + 0x24, 0xaa, 0x46, 0xb4, 0x48, 0x48, 0x9c, 0x1a, 0x9a, 0x4b, 0x04, 0x17, 0x42, 0x4f, 0x1c, 0x90, + 0x4c, 0x77, 0x25, 0x2c, 0x25, 0xf1, 0x12, 0x3b, 0xa8, 0x3f, 0x83, 0x3f, 0x85, 0xc4, 0xb1, 0x47, + 0x8e, 0x28, 0xf9, 0x23, 0xc8, 0xeb, 0xf1, 0xd7, 0x3a, 0x05, 0x55, 0xbd, 0x24, 0x9e, 0xb7, 0xf3, + 0xde, 0xcc, 0xc6, 0xef, 0x29, 0xf0, 0xd4, 0x95, 0xde, 0xc8, 0x95, 0x9e, 0x5c, 0xf9, 0xa1, 0x3f, + 0x52, 0x9f, 0x41, 0x54, 0x9f, 0xaa, 0x47, 0xac, 0xb9, 0xd2, 0x63, 0x5d, 0xc0, 0xcb, 0x95, 0x70, + 0x43, 0xf1, 0x51, 0xba, 0xd7, 0x62, 0x26, 0xbe, 0xad, 0x45, 0x10, 0xb2, 0xe7, 0xd0, 0x29, 0xa0, + 0x81, 0xf4, 0x97, 0x81, 0xc0, 0x26, 0x54, 0x3d, 0x6e, 0x19, 0x03, 0x63, 0x68, 0xce, 0xaa, 0x1e, + 0x8f, 0xc8, 0x13, 0xb1, 0xf2, 0xbe, 0x97, 0xc8, 0x05, 0xf4, 0x0e, 0xf2, 0x4b, 0xe8, 0xc5, 0x33, + 0x26, 0xfe, 0xf5, 0x7a, 0x21, 0x96, 0x21, 0xf1, 0xd1, 0x82, 0x83, 0x20, 0x62, 0x4e, 0x93, 0xee, + 0xa4, 0x64, 0x43, 0xe8, 0xeb, 0x94, 0x3b, 0xc4, 0x3f, 0x40, 0x6f, 0x22, 0xe6, 0xe2, 0x1e, 0xe2, + 0xe8, 0x00, 0x70, 0x6a, 0x9e, 0x72, 0xab, 0xaa, 0x0e, 0x73, 0x08, 0xb3, 0xa0, 0xaf, 0x4b, 0xc6, + 0xc3, 0xd9, 0x67, 0x68, 0x8e, 0x39, 0xbf, 0x12, 0x37, 0x0f, 0x9f, 0x82, 0x08, 0xf5, 0x50, 0xdc, + 0x84, 0x56, 0x4d, 0x9d, 0xa8, 0x67, 0x36, 0x85, 0x56, 0xaa, 0x4f, 0xf7, 0x2d, 0xca, 0x18, 0x25, + 0x99, 0x3e, 0xec, 0x7f, 0x15, 0x2e, 0x4f, 0x47, 0x50, 0xc5, 0xde, 0x41, 0x6b, 0xb2, 0x5e, 0xc8, + 0xab, 0x95, 0x10, 0x0f, 0xff, 0x45, 0x8e, 0xa1, 0x9d, 0x89, 0xd1, 0x62, 0x08, 0x75, 0xbe, 0x5e, + 0x48, 0x92, 0x52, 0xcf, 0xec, 0x05, 0xb4, 0xc6, 0xf3, 0x79, 0xd4, 0x16, 0xfc, 0xff, 0x1d, 0x9f, + 0x40, 0x3d, 0xea, 0xd4, 0xdf, 0x28, 0x76, 0x61, 0x2f, 0xba, 0x43, 0x60, 0x55, 0x07, 0xb5, 0xa1, + 0x39, 0x8b, 0x0b, 0x76, 0x0e, 0xed, 0x4c, 0x9a, 0x56, 0x78, 0x06, 0x7b, 0x61, 0x04, 0x58, 0xc6, + 0xa0, 0x36, 0x6c, 0x9c, 0x99, 0xa7, 0x91, 0xe5, 0xd5, 0x92, 0x31, 0xce, 0x50, 0x91, 0x94, 0x3b, + 0x93, 0x85, 0xd8, 0x08, 0x8e, 0x72, 0x18, 0x29, 0xd9, 0x70, 0x48, 0x6b, 0xc5, 0x62, 0xe6, 0x2c, + 0xad, 0xd9, 0x09, 0xb4, 0xdf, 0xfb, 0x2e, 0xcf, 0x3b, 0xff, 0x1f, 0xb7, 0xea, 0xc0, 0x51, 0xae, + 0x3b, 0x96, 0x3f, 0xfb, 0x59, 0x07, 0xf3, 0x72, 0xee, 0x89, 0x65, 0x38, 0x96, 0x1e, 0x5e, 0x40, + 0x23, 0x97, 0x39, 0x7c, 0xac, 0xd6, 0x2e, 0x67, 0xd3, 0xb6, 0xca, 0x07, 0xb4, 0xee, 0x05, 0x34, + 0x72, 0xc1, 0x23, 0x85, 0x72, 0x40, 0x49, 0x61, 0x57, 0x46, 0xa7, 0xd0, 0x2c, 0x06, 0x0c, 0xed, + 0xdc, 0x34, 0x2d, 0x4b, 0xf6, 0x93, 0x9d, 0x67, 0x99, 0x54, 0x31, 0x2e, 0x24, 0xb5, 0x33, 0x96, + 0x24, 0xb5, 0x3b, 0x5f, 0xf8, 0x0a, 0x0e, 0xc8, 0xff, 0xd8, 0x51, 0x7d, 0xc5, 0xb4, 0xd9, 0xdd, + 0x22, 0x48, 0xac, 0xd7, 0x70, 0x98, 0xb8, 0x13, 0xe3, 0x0e, 0xcd, 0xf9, 0x76, 0x4f, 0x43, 0x33, + 0x62, 0xe2, 0x29, 0x22, 0x6a, 0xee, 0x25, 0x62, 0xc9, 0x78, 0x6f, 0xc0, 0x4c, 0x3d, 0x84, 0x69, + 0x4f, 0xc1, 0x67, 0x76, 0x5f, 0x87, 0x33, 0x6e, 0x6a, 0x10, 0xe2, 0xea, 0xf6, 0x22, 0x6e, 0xc9, + 0x47, 0x6f, 0x8f, 0x7f, 0x6d, 0x1c, 0xe3, 0x76, 0xe3, 0x18, 0x7f, 0x36, 0x8e, 0xf1, 0x63, 0xeb, + 0x54, 0x6e, 0xb7, 0x4e, 0xe5, 0xf7, 0xd6, 0xa9, 0x7c, 0x7a, 0x94, 0xff, 0x07, 0xf8, 0xb2, 0xaf, + 0xbe, 0xce, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xb5, 0x35, 0xcb, 0x18, 0x06, 0x00, 0x00, } func (m *CreateSpaceRequest) Marshal() (dAtA []byte, err error) { @@ -1380,6 +1463,59 @@ func (m *AllSpacesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *LoadSpaceRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *LoadSpaceRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *LoadSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.SpaceId) > 0 { + i -= len(m.SpaceId) + copy(dAtA[i:], m.SpaceId) + i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *LoadSpaceResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *LoadSpaceResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *LoadSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func encodeVarintApi(dAtA []byte, offset int, v uint64) int { offset -= sovApi(v) base := offset @@ -1626,6 +1762,28 @@ func (m *AllSpacesResponse) Size() (n int) { return n } +func (m *LoadSpaceRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.SpaceId) + if l > 0 { + n += 1 + l + sovApi(uint64(l)) + } + return n +} + +func (m *LoadSpaceResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func sovApi(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -3092,6 +3250,138 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *LoadSpaceRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: LoadSpaceRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: LoadSpaceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SpaceId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SpaceId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *LoadSpaceResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: LoadSpaceResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: LoadSpaceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipApi(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/client/api/apiproto/api_drpc.pb.go b/client/api/apiproto/api_drpc.pb.go index 089dd379..a02e0f1a 100644 --- a/client/api/apiproto/api_drpc.pb.go +++ b/client/api/apiproto/api_drpc.pb.go @@ -48,6 +48,7 @@ type DRPCClientApiClient interface { DumpTree(ctx context.Context, in *DumpTreeRequest) (*DumpTreeResponse, error) AllTrees(ctx context.Context, in *AllTreesRequest) (*AllTreesResponse, error) AllSpaces(ctx context.Context, in *AllSpacesRequest) (*AllSpacesResponse, error) + LoadSpace(ctx context.Context, in *LoadSpaceRequest) (*LoadSpaceResponse, error) } type drpcClientApiClient struct { @@ -132,6 +133,15 @@ func (c *drpcClientApiClient) AllSpaces(ctx context.Context, in *AllSpacesReques return out, nil } +func (c *drpcClientApiClient) LoadSpace(ctx context.Context, in *LoadSpaceRequest) (*LoadSpaceResponse, error) { + out := new(LoadSpaceResponse) + err := c.cc.Invoke(ctx, "/api.ClientApi/LoadSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + if err != nil { + return nil, err + } + return out, nil +} + type DRPCClientApiServer interface { CreateSpace(context.Context, *CreateSpaceRequest) (*CreateSpaceResponse, error) DeriveSpace(context.Context, *DeriveSpaceRequest) (*DeriveSpaceResponse, error) @@ -141,6 +151,7 @@ type DRPCClientApiServer interface { DumpTree(context.Context, *DumpTreeRequest) (*DumpTreeResponse, error) AllTrees(context.Context, *AllTreesRequest) (*AllTreesResponse, error) AllSpaces(context.Context, *AllSpacesRequest) (*AllSpacesResponse, error) + LoadSpace(context.Context, *LoadSpaceRequest) (*LoadSpaceResponse, error) } type DRPCClientApiUnimplementedServer struct{} @@ -177,9 +188,13 @@ func (s *DRPCClientApiUnimplementedServer) AllSpaces(context.Context, *AllSpaces return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } +func (s *DRPCClientApiUnimplementedServer) LoadSpace(context.Context, *LoadSpaceRequest) (*LoadSpaceResponse, error) { + return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) +} + type DRPCClientApiDescription struct{} -func (DRPCClientApiDescription) NumMethods() int { return 8 } +func (DRPCClientApiDescription) NumMethods() int { return 9 } func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { switch n { @@ -255,6 +270,15 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei in1.(*AllSpacesRequest), ) }, DRPCClientApiServer.AllSpaces, true + case 8: + return "/api.ClientApi/LoadSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, + func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { + return srv.(DRPCClientApiServer). + LoadSpace( + ctx, + in1.(*LoadSpaceRequest), + ) + }, DRPCClientApiServer.LoadSpace, true default: return "", nil, nil, nil, false } @@ -391,3 +415,19 @@ func (x *drpcClientApi_AllSpacesStream) SendAndClose(m *AllSpacesResponse) error } return x.CloseSend() } + +type DRPCClientApi_LoadSpaceStream interface { + drpc.Stream + SendAndClose(*LoadSpaceResponse) error +} + +type drpcClientApi_LoadSpaceStream struct { + drpc.Stream +} + +func (x *drpcClientApi_LoadSpaceStream) SendAndClose(m *LoadSpaceResponse) error { + if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + return err + } + return x.CloseSend() +} diff --git a/client/api/apiproto/protos/api.proto b/client/api/apiproto/protos/api.proto index 4ac23157..616cfbed 100644 --- a/client/api/apiproto/protos/api.proto +++ b/client/api/apiproto/protos/api.proto @@ -12,6 +12,7 @@ service ClientApi { rpc DumpTree(DumpTreeRequest) returns(DumpTreeResponse); rpc AllTrees(AllTreesRequest) returns(AllTreesResponse); rpc AllSpaces(AllSpacesRequest) returns(AllSpacesResponse); + rpc LoadSpace(LoadSpaceRequest) returns(LoadSpaceResponse); } message CreateSpaceRequest { @@ -82,4 +83,11 @@ message AllSpacesRequest { message AllSpacesResponse { repeated string spaceIds = 1; +} + +message LoadSpaceRequest { + string spaceId = 1; +} + +message LoadSpaceResponse { } \ No newline at end of file diff --git a/client/api/rpchandler.go b/client/api/rpchandler.go index 707afd24..bdabe3d6 100644 --- a/client/api/rpchandler.go +++ b/client/api/rpchandler.go @@ -9,6 +9,15 @@ type rpcHandler struct { controller Controller } +func (r *rpcHandler) LoadSpace(ctx context.Context, request *apiproto.LoadSpaceRequest) (resp *apiproto.LoadSpaceResponse, err error) { + err = r.controller.LoadSpace(request.SpaceId) + if err != nil { + return + } + resp = &apiproto.LoadSpaceResponse{} + return +} + func (r *rpcHandler) CreateSpace(ctx context.Context, request *apiproto.CreateSpaceRequest) (resp *apiproto.CreateSpaceResponse, err error) { id, err := r.controller.CreateSpace() if err != nil { diff --git a/client/storage/spacestorage.go b/client/storage/spacestorage.go index a6cee186..7f65f9ff 100644 --- a/client/storage/spacestorage.go +++ b/client/storage/spacestorage.go @@ -50,7 +50,7 @@ func newSpaceStorage(objDb *badger.DB, spaceId string) (store spacestorage.Space return nil }) if err == badger.ErrKeyNotFound { - err = spacesyncproto.ErrSpaceMissing + err = spacestorage.ErrSpaceStorageMissing } return } @@ -58,7 +58,7 @@ func newSpaceStorage(objDb *badger.DB, spaceId string) (store spacestorage.Space func createSpaceStorage(db *badger.DB, payload spacestorage.SpaceStorageCreatePayload) (store spacestorage.SpaceStorage, err error) { keys := newSpaceKeys(payload.SpaceHeaderWithId.Id) if hasDB(db, keys.HeaderKey()) { - err = spacesyncproto.ErrSpaceExists + err = spacestorage.ErrSpaceStorageExists return } err = spaceValidationFunc(payload) diff --git a/etc/configs/client2.yml b/etc/configs/client2.yml index 5be56006..4ad2654e 100755 --- a/etc/configs/client2.yml +++ b/etc/configs/client2.yml @@ -7,8 +7,8 @@ grpcServer: account: peerId: 12D3KooWEmCHgpYfEWmG558s3TmhKX4ieegQykUJpcLKtciWfwJh peerKey: +6iFHEa4A0gHQxXmzxNv4J7TAiPPlYuOUWk7pb4WvVFJeoVAydioJiY78tm22pceORFqdPFJLHcZN2kDZPYjOg== - signingKey: GghASlDw/5ei2CgbNekiRqKzuxbg0+WcdM2c9Hsy1CVjmB11Hy5AmVU+YGdwliKdgz9szGOOCCNo7Rr2IPpZsQ== - encryptionKey: MIIEowIBAAKCAQEA7sdDktnmkrDsXol+M2gdCZsNKmsNu3LwlSeh/PaQsqL8yYl11I/jUYjKTZcdZkeXiplEwyEgTO8Le+LUZIh2urVwiKcRhC3vMBJiUkGp2gSC2cAsua89593W9hntJI2NhExBvG68vEABz19Zs13w9y4pPOw3FJhEbPZQUjMJPQ+VKN/3tPvgChlJBtAYDGqT8NcUcLXMsCfNWHVPIvL4S3ljdSP6nImtnoMsN7abymi0SiMhQc5ck1Gs80LlReaSmslUHZMkn2K5POu0Lx1/NVJT4LmHIBgOvWZiSTza3Zbth7UavfOPvEMywQwSohsFkx1mVp2EY9CnrHVyu8ooxwIDAQABAoIBACy73CcI96+HweC8NY5/9OC10bOetsXldLkc4bY4o0c0TdOcEx0tj9LYo74Bj5p30yY+LKm57Qk8x5QAHPZwsn2sPFb9pcRzrpn897qdXqrfqXwOCtMGx7xGzVzx4oG0m0yr1KzuuiEyhKRLIsz9zoUges1VG8SZ+kfHpaigsxxjEFPyjAXqodWuUcexaPMeh2sI/S1qT9aKCqYq6ZzUo/yyh0E92jQOKcS1TViY0hpnFmpoFCjKRJQ0TSZGOjJMhBm3XlS74Bts+Gnnc53sX/u+ae7//yaXjXnkPmqz71Glf1sWAo42jwfIKzPpwgcpVCnMtau8pRyTpC5obQ/nvKECgYEA9MuJStZCHQ+KQNF4qia2ZVVSZGE0Cv4kJ1GbAxDuQmeHd6toPoxbc2QuLQAq54xwdLv6va7dHHJYpkDVFqSrFOufArGCUI4iAv2mLR9flcYjO0IJ1uFj/9HXD7lXfgJiNtiCL0wd4TQQmqzV0jSGfkN3260ZbDy+M7nbG4i1u0kCgYEA+bU5pvsG1FyCndRyOrg4JzxOrleo2Hzj471CovrT3K+O7MB+kkf35S6iLwIKVY5iprECWKFcpIi0m+PGE9eC/8kH31O//r3e7WYZAFcCIs/WconhDw9RGfDR6XTzNPUgbRzCde1+1c6QMP5MkA6ZgUhfXt4Crf/GQAeGIHs/M48CgYAL02FYii07diq5ouTvY1tgXdTTIJcBCPH6LEkOxtybvKCguVkZ3HH2ixpn9iAce35bRVGBpFbuLt/1eCBTLbVOF2vhF24yMguWlWZXu7JEbAP7st8C0HSiQSLgkZWWcssH10HCwyyWWouKzVqvAvaUVvINXLljrzOJECtzkxEkcQKBgQCVNeZKUivlj5X5K65KSjQ7tbyqTvU0z4P5XOlJrCoW78yuyeOYE2scxn3hKw3zy85FHvZw8ZMDOjD6CeQdjSTZJU4P8+KBHQHtx5le6576IElbTepu7k8e+hjksJ53YZZLvOiyQQUOS407yWkEl8TATPe4H19oi7LyJczO8fZ1HwKBgFJiABRKJkGWpiMsp9p8QvHG0chZiKAbZ8Qn9dJX+ymwfqerOxcig7dCIKHzMeOQJPImArjzW6jbiQKmXYTZwcc708/bXtiXAf6YMD07KaLd4Y0PsYto/lQkFjQrhTLHS4LxapjPg5nYBrhdF/8rj4vUQgLCxn1tL2CLlrutPrVX + signingKey: PNcZdEvKsu9LShQmgOhKHbBpO1uyHvEM/QO5PUu8rVMuSHBoGvFbcFZNNZ2beFgSr/N9EitzY81QQRoIh5c+Gg== + encryptionKey: MIIEowIBAAKCAQEA3fh3Bd/a3N+7aDwln5rJU6BXL/0D/h2bMXH832d40Oac3OARVxMpxpxT02I6y8uLq0pS41mjtIK4+QtBDfeV+GAcAgvlywu7Be1tM0I5ohMXC0hNnLUCUwOMcQx/ylOjzUdQHna9woZMh2kdhFowViy3KhA/ItR8YpfgTG8VP6DMXW+CxGZR0sxzBVpSGHxGgcdZnrWc5/4vyb5IhY/rAxefQa+lieoFwnTo0jvLBrLhyhryK7SBGd8uwPZRoYJaCTs2BpCrQ7Osc2RDtYPafQnm8tVR2elmc43fN0Sq86PdMl3A0XofCVVW708uCPiq950cXZnJoh1wQeNIqhqpuQIDAQABAoIBAGxo1XjBBBusCdO2zIlPB9UYEn0VjcWmoA1eJqrV1mPwvdwCc3WbnmOqJiavaxftqaFXA3SWayXWUpEPtg4kRdKw3f0B4pFwgT873oGSbqOBv1d7UKygmyoAKa9s81zVzMKNecvnInbHMMlRxWDGy6TK4gphNPTF4pokox+xgSc5cJB7cBtmIZo+8CQA5/q5Xm2W9ih1cRPullmVXuuQYrv2/5oDoBCdaiCAr5WTg4C8pHEOo6z+j7kp9Yeh7Wc4LmEnnCEJKKTbUcNk/pXclpVkMuE983SguyD5Sy3UIXRejSzt+x6KW0k6MolBbRGAlDbVAHxvqp7AQiAIavVCXAECgYEA5ViMqjawjpbIK39DOSozRqaBeFVYrfLI6mkSSQrZqpJzgBvfVo/DDwWP9FgX/TEjDWHBilfylmN8/dcuzJHgQgw/JnckTJbsfnWv71PTxI/YgGEF0L7OmePSY02p3jfHq5zwVg9yW3jPacLTLn99pVjchjShDyzwVjZ5AK2Dm/ECgYEA98R8d3/GjOi0iUacFpks9xlbu4pn7SfCFOBaq5a+EkXSauWMRuGaPbZ5NIn7rWygfPW6r/jZrmCyDbWSoPLsdlqb+oEc0wOCN0dshhMGrzdkZMxpy9GNt15+SDhwQZCK/FI4DdEmlvBkLUIUSySIWVDfwJHnddDHO3EhH6GgUkkCgYAf8mK9vxp+8j/11yddCiTUXZNBWNoeeOhFxtcWN520ZewS108X9rScHhE8Xx0QVszkK07TX4baLgeWMGhDdLqBWMVfLU9wH8HXp7sXIl0oT0VANMOjnUCYLST8UjAsVSbKH/VWd5ZdaYmy2MGkA3xUEPm+9AvPWlosGDBoyMLBcQKBgEOKO0ez/CLjOHuHVPtQDBLbxcbMxuG+Ccj5E55cvDls8RwUsPWNgCc8e7PXvVScHO+TaK2Zj3VahI76JRtcvRrSPly+H2ZiOXfqL2oo+5R97A8SLfDSkegfiRsUz3z/8vMvUnppvjQ9GYHA1plZPxXh1uy+mTLjk7vfbeEahQKJAoGBAIDbI7SL7MmWumSnPPwwxfQ5DaWwdn7yReWKUFlO3WFG9oN15M43NXG3zZoUsPdaeTNcvgDRQ4PmtZ+zQonac+obHNsq8ZZP7KjyFJNrrIgfeUDmdnW8u+UPxPjt1J4YStsLX5Ea+x5uE8qGWmK0xYCUkntBFgENhbD7qDokB1+q apiServer: listenAddrs: - 127.0.0.1:8091 diff --git a/node/storage/spacestorage.go b/node/storage/spacestorage.go index b89c346b..bf51c18b 100644 --- a/node/storage/spacestorage.go +++ b/node/storage/spacestorage.go @@ -110,7 +110,7 @@ func createSpaceStorage(rootPath string, payload spacestorage.SpaceStorageCreate return } if has { - err = spacesyncproto.ErrSpaceExists + err = spacestorage.ErrSpaceStorageExists return } err = spaceValidationFunc(payload) diff --git a/util/cmd/debug/api/client/service.go b/util/cmd/debug/api/client/service.go index 1acdcb91..d09046f3 100644 --- a/util/cmd/debug/api/client/service.go +++ b/util/cmd/debug/api/client/service.go @@ -20,6 +20,7 @@ type Service interface { AddText(ctx context.Context, ip string, request *apiproto.AddTextRequest) (resp *apiproto.AddTextResponse, err error) AllTrees(ctx context.Context, ip string, request *apiproto.AllTreesRequest) (resp *apiproto.AllTreesResponse, err error) AllSpaces(ctx context.Context, ip string, request *apiproto.AllSpacesRequest) (resp *apiproto.AllSpacesResponse, err error) + LoadSpace(ctx context.Context, ip string, request *apiproto.LoadSpaceRequest) (res *apiproto.LoadSpaceResponse, err error) app.Component } @@ -95,3 +96,11 @@ func (s *service) AllSpaces(ctx context.Context, ip string, request *apiproto.Al } return cl.AllSpaces(ctx, request) } + +func (s *service) LoadSpace(ctx context.Context, ip string, request *apiproto.LoadSpaceRequest) (res *apiproto.LoadSpaceResponse, err error) { + cl, err := s.client.GetClient(ctx, ip) + if err != nil { + return + } + return cl.LoadSpace(ctx, request) +} diff --git a/util/cmd/debug/api/service.go b/util/cmd/debug/api/service.go index 8d3afffc..4a8d019d 100644 --- a/util/cmd/debug/api/service.go +++ b/util/cmd/debug/api/service.go @@ -168,6 +168,20 @@ func (s *service) registerClientCommands() { res = resp.DocumentId return }} + s.clientCommands["load-space"] = Command{Cmd: func(server peers.Peer, params []string) (res string, err error) { + if len(params) != 1 { + err = ErrIncorrectParamsCount + return + } + _, err = client.LoadSpace(context.Background(), server.Address, &apiproto.LoadSpaceRequest{ + SpaceId: params[0], + }) + if err != nil { + return + } + res = params[0] + return + }} } func (s *service) registerNodeCommands() {