From 24b82884b0180059f37e15b7a77824e80195237a Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 19 Sep 2019 12:35:48 +0200 Subject: CloseSession: Remove unused proto Initially this RPC was supposed to hand off control to a cat-file being closed to a caller. This decision got reverted and now this RPC can be removed. Closes https://gitlab.com/gitlab-org/gitaly/issues/1810 --- proto/cleanup.proto | 13 ---- proto/go/gitalypb/cleanup.pb.go | 163 ++++++---------------------------------- 2 files changed, 25 insertions(+), 151 deletions(-) (limited to 'proto') diff --git a/proto/cleanup.proto b/proto/cleanup.proto index 276a17e02..c4cc1480d 100644 --- a/proto/cleanup.proto +++ b/proto/cleanup.proto @@ -21,13 +21,6 @@ service CleanupService { target_repository_field: "1" }; } - - rpc CloseSession(CloseSessionRequest) returns (CloseSessionResponse) { - option (op_type) = { - op: MUTATOR - scope_level: SERVER, - }; - } } message ApplyBfgObjectMapRequest { @@ -61,9 +54,3 @@ message ApplyBfgObjectMapStreamResponse { repeated Entry entries = 1; } - -message CloseSessionRequest{ - string session_id = 1; -} - -message CloseSessionResponse{} diff --git a/proto/go/gitalypb/cleanup.pb.go b/proto/go/gitalypb/cleanup.pb.go index 5a6e97aed..e7577fc03 100644 --- a/proto/go/gitalypb/cleanup.pb.go +++ b/proto/go/gitalypb/cleanup.pb.go @@ -252,117 +252,41 @@ func (m *ApplyBfgObjectMapStreamResponse_Entry) GetNewOid() string { return "" } -type CloseSessionRequest struct { - SessionId string `protobuf:"bytes,1,opt,name=session_id,json=sessionId,proto3" json:"session_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CloseSessionRequest) Reset() { *m = CloseSessionRequest{} } -func (m *CloseSessionRequest) String() string { return proto.CompactTextString(m) } -func (*CloseSessionRequest) ProtoMessage() {} -func (*CloseSessionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1b19e990e4662c9c, []int{4} -} - -func (m *CloseSessionRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CloseSessionRequest.Unmarshal(m, b) -} -func (m *CloseSessionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CloseSessionRequest.Marshal(b, m, deterministic) -} -func (m *CloseSessionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CloseSessionRequest.Merge(m, src) -} -func (m *CloseSessionRequest) XXX_Size() int { - return xxx_messageInfo_CloseSessionRequest.Size(m) -} -func (m *CloseSessionRequest) XXX_DiscardUnknown() { - xxx_messageInfo_CloseSessionRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_CloseSessionRequest proto.InternalMessageInfo - -func (m *CloseSessionRequest) GetSessionId() string { - if m != nil { - return m.SessionId - } - return "" -} - -type CloseSessionResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CloseSessionResponse) Reset() { *m = CloseSessionResponse{} } -func (m *CloseSessionResponse) String() string { return proto.CompactTextString(m) } -func (*CloseSessionResponse) ProtoMessage() {} -func (*CloseSessionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1b19e990e4662c9c, []int{5} -} - -func (m *CloseSessionResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CloseSessionResponse.Unmarshal(m, b) -} -func (m *CloseSessionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CloseSessionResponse.Marshal(b, m, deterministic) -} -func (m *CloseSessionResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CloseSessionResponse.Merge(m, src) -} -func (m *CloseSessionResponse) XXX_Size() int { - return xxx_messageInfo_CloseSessionResponse.Size(m) -} -func (m *CloseSessionResponse) XXX_DiscardUnknown() { - xxx_messageInfo_CloseSessionResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_CloseSessionResponse proto.InternalMessageInfo - func init() { proto.RegisterType((*ApplyBfgObjectMapRequest)(nil), "gitaly.ApplyBfgObjectMapRequest") proto.RegisterType((*ApplyBfgObjectMapResponse)(nil), "gitaly.ApplyBfgObjectMapResponse") proto.RegisterType((*ApplyBfgObjectMapStreamRequest)(nil), "gitaly.ApplyBfgObjectMapStreamRequest") proto.RegisterType((*ApplyBfgObjectMapStreamResponse)(nil), "gitaly.ApplyBfgObjectMapStreamResponse") proto.RegisterType((*ApplyBfgObjectMapStreamResponse_Entry)(nil), "gitaly.ApplyBfgObjectMapStreamResponse.Entry") - proto.RegisterType((*CloseSessionRequest)(nil), "gitaly.CloseSessionRequest") - proto.RegisterType((*CloseSessionResponse)(nil), "gitaly.CloseSessionResponse") } func init() { proto.RegisterFile("cleanup.proto", fileDescriptor_1b19e990e4662c9c) } var fileDescriptor_1b19e990e4662c9c = []byte{ - // 430 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xcd, 0x6e, 0xd4, 0x30, - 0x18, 0x94, 0xfb, 0xb3, 0xdd, 0x7c, 0x5d, 0x2a, 0x30, 0x88, 0x2e, 0x29, 0x85, 0x25, 0x87, 0x92, - 0x4b, 0xb3, 0x65, 0xe1, 0x05, 0x68, 0x85, 0x10, 0x07, 0xb4, 0x92, 0x97, 0x13, 0x97, 0x95, 0x37, - 0xfe, 0x08, 0x46, 0x49, 0x6c, 0x6c, 0x97, 0x2a, 0x4f, 0xd2, 0x47, 0xe2, 0xc4, 0x0b, 0xf5, 0x84, - 0x6a, 0x27, 0xd0, 0xaa, 0xbb, 0x94, 0x4b, 0x6f, 0xc9, 0x8c, 0xbf, 0x99, 0xf9, 0xc6, 0x09, 0xdc, - 0xcb, 0x4b, 0xe4, 0xf5, 0xa9, 0xce, 0xb4, 0x51, 0x4e, 0xd1, 0x5e, 0x21, 0x1d, 0x2f, 0x9b, 0x78, - 0x60, 0xbf, 0x72, 0x83, 0x22, 0xa0, 0x49, 0x05, 0xc3, 0xb7, 0x5a, 0x97, 0xcd, 0xf1, 0x97, 0x62, - 0xba, 0xf8, 0x86, 0xb9, 0xfb, 0xc8, 0x35, 0xc3, 0xef, 0xa7, 0x68, 0x1d, 0x9d, 0x00, 0x18, 0xd4, - 0xca, 0x4a, 0xa7, 0x4c, 0x33, 0x24, 0x23, 0x92, 0x6e, 0x4f, 0x68, 0x16, 0x64, 0x32, 0xf6, 0x87, - 0x61, 0x57, 0x4e, 0xd1, 0x7d, 0x00, 0xe5, 0x75, 0xe6, 0x15, 0xd7, 0xc3, 0xb5, 0x11, 0x49, 0x07, - 0x2c, 0x52, 0x9d, 0x72, 0xb2, 0x07, 0x4f, 0x96, 0xd8, 0x59, 0xad, 0x6a, 0x8b, 0x89, 0x85, 0x67, - 0x37, 0xc8, 0x99, 0x33, 0xc8, 0xab, 0x3b, 0x4c, 0xf4, 0x8b, 0xc0, 0xf3, 0x95, 0xae, 0x21, 0x18, - 0x7d, 0x0f, 0x5b, 0x58, 0x3b, 0x23, 0xd1, 0x0e, 0xc9, 0x68, 0x3d, 0xdd, 0x9e, 0x1c, 0x76, 0x9e, - 0xb7, 0x4c, 0x66, 0xef, 0x6a, 0x67, 0x1a, 0xd6, 0x4d, 0xc7, 0x1c, 0x36, 0x3d, 0x42, 0x0f, 0x60, - 0xc3, 0x35, 0x1a, 0xfd, 0x0a, 0x3b, 0x7f, 0x57, 0x08, 0x32, 0x9f, 0x1a, 0x8d, 0xcc, 0xf3, 0x74, - 0x17, 0xb6, 0x54, 0x29, 0xe6, 0x4a, 0x0a, 0x9f, 0x3c, 0x62, 0x3d, 0x55, 0x8a, 0xa9, 0x14, 0x97, - 0x44, 0x8d, 0x67, 0x9e, 0x58, 0x0f, 0x44, 0x8d, 0x67, 0x53, 0x29, 0x92, 0x37, 0xf0, 0xf0, 0xa4, - 0x54, 0x16, 0x67, 0x68, 0xad, 0x54, 0x75, 0xd7, 0xdc, 0x3e, 0x80, 0x0d, 0xc8, 0x5c, 0x0a, 0x6f, - 0x1b, 0xb1, 0xa8, 0x45, 0x3e, 0x88, 0xe4, 0x31, 0x3c, 0xba, 0x3e, 0x15, 0xf2, 0x4f, 0x7e, 0xae, - 0xc1, 0xce, 0x49, 0xf8, 0x8c, 0x66, 0x68, 0x7e, 0xc8, 0x1c, 0x29, 0xc2, 0x83, 0x1b, 0x5b, 0xd3, - 0xd1, 0xca, 0x42, 0xda, 0x00, 0xf1, 0x8b, 0x7f, 0x9c, 0x68, 0xef, 0x3f, 0xba, 0x38, 0x4f, 0x37, - 0xfb, 0x24, 0x26, 0xaf, 0x52, 0x42, 0x1b, 0xd8, 0x5d, 0x51, 0x2e, 0x3d, 0xb8, 0xb5, 0xfd, 0x60, - 0xf9, 0xf2, 0x3f, 0x6f, 0xe9, 0x9a, 0xf1, 0x11, 0xa1, 0x33, 0x18, 0x5c, 0x2d, 0x83, 0xee, 0x75, - 0x3a, 0x4b, 0x8a, 0x8d, 0x9f, 0x2e, 0x27, 0x5b, 0xe5, 0xfe, 0xc5, 0x79, 0xba, 0xd1, 0x27, 0xf7, - 0xc9, 0xf1, 0xd1, 0xe7, 0xcb, 0x83, 0x25, 0x5f, 0x64, 0xb9, 0xaa, 0xc6, 0xe1, 0xf1, 0x50, 0x99, - 0x62, 0x1c, 0xc6, 0xc7, 0xfe, 0x77, 0x1c, 0x17, 0xaa, 0x7d, 0xd7, 0x8b, 0x45, 0xcf, 0x43, 0xaf, - 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2b, 0xc3, 0x76, 0xe4, 0xc8, 0x03, 0x00, 0x00, + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x52, 0x4d, 0x6f, 0xda, 0x40, + 0x10, 0xd5, 0x96, 0x02, 0x65, 0xa0, 0x48, 0xdd, 0x0b, 0xae, 0xab, 0xb6, 0x2e, 0x07, 0xea, 0x0b, + 0x36, 0x75, 0x7f, 0x41, 0xa9, 0xaa, 0x9e, 0x22, 0x24, 0x93, 0x53, 0x2e, 0x68, 0x6d, 0x4f, 0x1c, + 0x47, 0xb6, 0x77, 0xb3, 0x5e, 0x82, 0xfc, 0x4b, 0xf2, 0xab, 0xf2, 0x67, 0x72, 0xcc, 0x29, 0x62, + 0x17, 0xf2, 0x21, 0x42, 0xc8, 0x25, 0x37, 0x7b, 0xde, 0xcc, 0x7b, 0x6f, 0xde, 0x2c, 0x7c, 0x8c, + 0x73, 0x64, 0xe5, 0x52, 0x78, 0x42, 0x72, 0xc5, 0x69, 0x2b, 0xcd, 0x14, 0xcb, 0x6b, 0xbb, 0x57, + 0x9d, 0x31, 0x89, 0x89, 0xa9, 0x0e, 0x0b, 0xb0, 0xfe, 0x08, 0x91, 0xd7, 0xd3, 0xd3, 0x74, 0x16, + 0x9d, 0x63, 0xac, 0x8e, 0x98, 0x08, 0xf1, 0x62, 0x89, 0x95, 0xa2, 0x01, 0x80, 0x44, 0xc1, 0xab, + 0x4c, 0x71, 0x59, 0x5b, 0xc4, 0x21, 0x6e, 0x37, 0xa0, 0x9e, 0xa1, 0xf1, 0xc2, 0x7b, 0x24, 0x7c, + 0xd4, 0x45, 0xbf, 0x02, 0x70, 0xcd, 0xb3, 0x28, 0x98, 0xb0, 0xde, 0x39, 0xc4, 0xed, 0x85, 0x1d, + 0xbe, 0x65, 0x1e, 0x7e, 0x81, 0xcf, 0xcf, 0xc8, 0x55, 0x82, 0x97, 0x15, 0x0e, 0x2b, 0xf8, 0xb6, + 0x03, 0xce, 0x95, 0x44, 0x56, 0xbc, 0xa1, 0xa3, 0x6b, 0x02, 0xdf, 0xf7, 0xaa, 0x1a, 0x63, 0xf4, + 0x3f, 0xb4, 0xb1, 0x54, 0x32, 0xc3, 0xca, 0x22, 0x4e, 0xc3, 0xed, 0x06, 0xe3, 0xad, 0xe6, 0x81, + 0x49, 0xef, 0x5f, 0xa9, 0x64, 0x1d, 0x6e, 0xa7, 0x6d, 0x06, 0x4d, 0x5d, 0xa1, 0x23, 0x78, 0xaf, + 0x6a, 0x81, 0x7a, 0x85, 0xfe, 0xc3, 0x0a, 0x86, 0xe6, 0xb8, 0x16, 0x18, 0x6a, 0x9c, 0x0e, 0xa0, + 0xcd, 0xf3, 0x64, 0xc1, 0xb3, 0x44, 0x3b, 0xef, 0x84, 0x2d, 0x9e, 0x27, 0xb3, 0x2c, 0x59, 0x03, + 0x25, 0xae, 0x34, 0xd0, 0x30, 0x40, 0x89, 0xab, 0x59, 0x96, 0x04, 0x37, 0x04, 0xfa, 0x7f, 0xcd, + 0xe1, 0xe7, 0x28, 0x2f, 0xb3, 0x18, 0x29, 0xc2, 0xa7, 0x1d, 0x9f, 0xd4, 0xd9, 0xbb, 0xc2, 0x26, + 0x6c, 0xfb, 0xc7, 0x0b, 0x1d, 0x9b, 0x8b, 0x75, 0x6e, 0xaf, 0xdc, 0xe6, 0x07, 0x62, 0x93, 0x5f, + 0x2e, 0xa1, 0x35, 0x0c, 0xf6, 0xc4, 0x41, 0x47, 0x07, 0xf3, 0x32, 0x92, 0x3f, 0x5f, 0x99, 0xeb, + 0x13, 0xe1, 0x09, 0x99, 0x4e, 0x4e, 0xd6, 0x83, 0x39, 0x8b, 0xbc, 0x98, 0x17, 0xbe, 0xf9, 0x1c, + 0x73, 0x99, 0xfa, 0x86, 0xce, 0xd7, 0x6f, 0xdd, 0x4f, 0xf9, 0xe6, 0x5f, 0x44, 0x51, 0x4b, 0x97, + 0x7e, 0xdf, 0x05, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xdf, 0x1e, 0xf1, 0x25, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -380,7 +304,6 @@ type CleanupServiceClient interface { // Deprecated in favour of ApplyBfgObjectMapStream ApplyBfgObjectMap(ctx context.Context, opts ...grpc.CallOption) (CleanupService_ApplyBfgObjectMapClient, error) ApplyBfgObjectMapStream(ctx context.Context, opts ...grpc.CallOption) (CleanupService_ApplyBfgObjectMapStreamClient, error) - CloseSession(ctx context.Context, in *CloseSessionRequest, opts ...grpc.CallOption) (*CloseSessionResponse, error) } type cleanupServiceClient struct { @@ -456,21 +379,11 @@ func (x *cleanupServiceApplyBfgObjectMapStreamClient) Recv() (*ApplyBfgObjectMap return m, nil } -func (c *cleanupServiceClient) CloseSession(ctx context.Context, in *CloseSessionRequest, opts ...grpc.CallOption) (*CloseSessionResponse, error) { - out := new(CloseSessionResponse) - err := c.cc.Invoke(ctx, "/gitaly.CleanupService/CloseSession", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - // CleanupServiceServer is the server API for CleanupService service. type CleanupServiceServer interface { // Deprecated in favour of ApplyBfgObjectMapStream ApplyBfgObjectMap(CleanupService_ApplyBfgObjectMapServer) error ApplyBfgObjectMapStream(CleanupService_ApplyBfgObjectMapStreamServer) error - CloseSession(context.Context, *CloseSessionRequest) (*CloseSessionResponse, error) } // UnimplementedCleanupServiceServer can be embedded to have forward compatible implementations. @@ -483,9 +396,6 @@ func (*UnimplementedCleanupServiceServer) ApplyBfgObjectMap(srv CleanupService_A func (*UnimplementedCleanupServiceServer) ApplyBfgObjectMapStream(srv CleanupService_ApplyBfgObjectMapStreamServer) error { return status.Errorf(codes.Unimplemented, "method ApplyBfgObjectMapStream not implemented") } -func (*UnimplementedCleanupServiceServer) CloseSession(ctx context.Context, req *CloseSessionRequest) (*CloseSessionResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CloseSession not implemented") -} func RegisterCleanupServiceServer(s *grpc.Server, srv CleanupServiceServer) { s.RegisterService(&_CleanupService_serviceDesc, srv) @@ -543,33 +453,10 @@ func (x *cleanupServiceApplyBfgObjectMapStreamServer) Recv() (*ApplyBfgObjectMap return m, nil } -func _CleanupService_CloseSession_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CloseSessionRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(CleanupServiceServer).CloseSession(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/gitaly.CleanupService/CloseSession", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CleanupServiceServer).CloseSession(ctx, req.(*CloseSessionRequest)) - } - return interceptor(ctx, in, info, handler) -} - var _CleanupService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.CleanupService", HandlerType: (*CleanupServiceServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "CloseSession", - Handler: _CleanupService_CloseSession_Handler, - }, - }, + Methods: []grpc.MethodDesc{}, Streams: []grpc.StreamDesc{ { StreamName: "ApplyBfgObjectMap", -- cgit v1.2.3