From e8d30461a2428b8e6b10c357caf2224dda0f61dd Mon Sep 17 00:00:00 2001 From: Zhenghui Wang Date: Wed, 3 Jul 2019 17:16:06 -0700 Subject: [PATCH] add artifacts/execution map to ListEvents() --- api/service.pb.go | 182 ++++++++++++++++++++++----------------- api/service.proto | 2 + api/service.swagger.json | 12 +++ service/service.go | 50 ++++++++++- service/service_test.go | 6 +- 5 files changed, 169 insertions(+), 83 deletions(-) diff --git a/api/service.pb.go b/api/service.pb.go index 2aaabcdba..e4323ed99 100644 --- a/api/service.pb.go +++ b/api/service.pb.go @@ -1211,10 +1211,12 @@ func (m *ListEventsRequest) GetName() string { } type ListEventsResponse struct { - Events []*metadata_store_go_proto.Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Events []*metadata_store_go_proto.Event `protobuf:"bytes,1,rep,name=events,proto3" json:"events,omitempty"` + Artifacts map[int64]*metadata_store_go_proto.Artifact `protobuf:"bytes,2,rep,name=artifacts,proto3" json:"artifacts,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Executions map[int64]*metadata_store_go_proto.Execution `protobuf:"bytes,3,rep,name=executions,proto3" json:"executions,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListEventsResponse) Reset() { *m = ListEventsResponse{} } @@ -1249,6 +1251,20 @@ func (m *ListEventsResponse) GetEvents() []*metadata_store_go_proto.Event { return nil } +func (m *ListEventsResponse) GetArtifacts() map[int64]*metadata_store_go_proto.Artifact { + if m != nil { + return m.Artifacts + } + return nil +} + +func (m *ListEventsResponse) GetExecutions() map[int64]*metadata_store_go_proto.Execution { + if m != nil { + return m.Executions + } + return nil +} + func init() { proto.RegisterType((*CreateArtifactTypeRequest)(nil), "api.CreateArtifactTypeRequest") proto.RegisterType((*CreateArtifactTypeResponse)(nil), "api.CreateArtifactTypeResponse") @@ -1281,86 +1297,94 @@ func init() { proto.RegisterType((*CreateEventRequest)(nil), "api.CreateEventRequest") proto.RegisterType((*ListEventsRequest)(nil), "api.ListEventsRequest") proto.RegisterType((*ListEventsResponse)(nil), "api.ListEventsResponse") + proto.RegisterMapType((map[int64]*metadata_store_go_proto.Artifact)(nil), "api.ListEventsResponse.ArtifactsEntry") + proto.RegisterMapType((map[int64]*metadata_store_go_proto.Execution)(nil), "api.ListEventsResponse.ExecutionsEntry") } func init() { proto.RegisterFile("api/service.proto", fileDescriptor_42c32aec9010f89c) } var fileDescriptor_42c32aec9010f89c = []byte{ - // 1180 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xdd, 0x6f, 0xdb, 0x54, - 0x14, 0x97, 0x37, 0xa8, 0xe8, 0xe9, 0x9a, 0xb0, 0xd3, 0x36, 0x1f, 0xee, 0x47, 0xaa, 0x0b, 0x6c, - 0x59, 0xc6, 0xe2, 0xf5, 0x83, 0x3d, 0x44, 0x50, 0xad, 0x6c, 0xd3, 0x90, 0xd8, 0xc4, 0xd4, 0x01, - 0x12, 0x1d, 0x53, 0x71, 0xc2, 0x6d, 0x17, 0x91, 0xc4, 0x26, 0x76, 0xca, 0x2a, 0x3a, 0xf1, 0x21, - 0x9e, 0x78, 0xd9, 0x03, 0xe2, 0x05, 0x9e, 0xe0, 0x5f, 0xe2, 0x5f, 0xe0, 0x0f, 0x41, 0xbe, 0x3e, - 0xb6, 0xef, 0xb5, 0xaf, 0x4d, 0xd4, 0xf5, 0x2d, 0xf6, 0x39, 0x3e, 0xbf, 0xdf, 0x3d, 0xdf, 0x37, - 0x70, 0xd9, 0x76, 0xfb, 0x96, 0xc7, 0xc7, 0xc7, 0xfd, 0x1e, 0x6f, 0xbb, 0x63, 0xc7, 0x77, 0xf0, - 0xa2, 0xed, 0xf6, 0xcd, 0xf9, 0xe0, 0xbd, 0xed, 0xf6, 0xc3, 0x77, 0xe6, 0xca, 0x91, 0xe3, 0x1c, - 0x0d, 0xb8, 0x25, 0xde, 0x8e, 0x46, 0x8e, 0x6f, 0xfb, 0x7d, 0x67, 0xe4, 0x91, 0x74, 0x99, 0xa4, - 0xe2, 0xa9, 0x3b, 0x39, 0xb4, 0xf8, 0xd0, 0xf5, 0x4f, 0x48, 0xd8, 0x48, 0x0b, 0xfd, 0xfe, 0x90, - 0x7b, 0xbe, 0x3d, 0x74, 0x49, 0xe1, 0xca, 0x70, 0x70, 0x30, 0xe4, 0xbe, 0xfd, 0xb5, 0xed, 0xdb, - 0xa1, 0x96, 0x15, 0x3d, 0x1e, 0x78, 0xbe, 0x33, 0x26, 0x5e, 0xec, 0x09, 0xd4, 0xef, 0x8c, 0xb9, - 0xed, 0xf3, 0xdd, 0xb1, 0xdf, 0x3f, 0xb4, 0x7b, 0xfe, 0xa7, 0x27, 0x2e, 0xdf, 0xe3, 0xdf, 0x4e, - 0xb8, 0xe7, 0xe3, 0x0e, 0xcc, 0xdb, 0xf4, 0xfa, 0xc0, 0x3f, 0x71, 0x79, 0xcd, 0x58, 0x37, 0x9a, - 0x73, 0x9b, 0xf5, 0xb6, 0x64, 0xbc, 0xad, 0x7c, 0x78, 0xc9, 0x96, 0x9e, 0xd8, 0x97, 0x60, 0xea, - 0x8c, 0x7b, 0xae, 0x33, 0xf2, 0xf8, 0x2b, 0x5b, 0x7f, 0x17, 0x2a, 0xf7, 0xb9, 0xaf, 0xe3, 0x8d, - 0xf0, 0xda, 0xc8, 0x1e, 0x86, 0x06, 0x67, 0xf7, 0xc4, 0x6f, 0xf6, 0x05, 0x54, 0x33, 0xda, 0xe7, - 0x44, 0xc4, 0x84, 0xda, 0x83, 0xbe, 0xa7, 0xd8, 0xf6, 0x88, 0x0a, 0x7b, 0x0a, 0x75, 0x8d, 0x8c, - 0x80, 0x6f, 0x43, 0x49, 0x01, 0xf6, 0x6a, 0xc6, 0xfa, 0xc5, 0x62, 0xe4, 0x79, 0x19, 0xd9, 0x63, - 0x16, 0xd4, 0xef, 0xf2, 0x01, 0xd7, 0x87, 0x4f, 0xe7, 0x86, 0x2e, 0x2c, 0xa9, 0x21, 0x89, 0x94, - 0x2b, 0x30, 0xe3, 0xda, 0x63, 0x3e, 0xf2, 0x49, 0x9d, 0x9e, 0x70, 0x03, 0xde, 0x88, 0x20, 0x6b, - 0x17, 0x84, 0x5f, 0x96, 0xb4, 0xec, 0xf6, 0x62, 0x35, 0xf6, 0x31, 0x54, 0xd2, 0x18, 0x74, 0x60, - 0xd9, 0x98, 0x31, 0x9d, 0xb1, 0x26, 0xa0, 0x14, 0xb7, 0xa2, 0xa3, 0x7d, 0x04, 0x0b, 0x8a, 0xe6, - 0xd9, 0x31, 0x5b, 0xb0, 0x28, 0x07, 0xcd, 0x2b, 0x42, 0x7d, 0x00, 0x4b, 0x29, 0x5d, 0xc2, 0xdd, - 0x82, 0xd9, 0xc8, 0x60, 0x14, 0xd7, 0x1c, 0xe0, 0x44, 0x8f, 0x5d, 0x87, 0x25, 0x35, 0x9e, 0x45, - 0xd0, 0x07, 0x51, 0x79, 0xdd, 0x7b, 0xce, 0x7b, 0x93, 0xa0, 0x77, 0xc8, 0xd1, 0xdf, 0x85, 0x12, - 0x8f, 0xde, 0xcb, 0x69, 0x6d, 0x2a, 0x24, 0xd4, 0x4f, 0xe7, 0xb9, 0xfc, 0xc8, 0xbe, 0x82, 0x65, - 0x2d, 0x00, 0x9d, 0xf0, 0x1c, 0x10, 0x6e, 0x88, 0xaa, 0xd4, 0xf2, 0xd7, 0x9d, 0xf8, 0x29, 0xd4, - 0xb2, 0xea, 0xe7, 0xc7, 0x66, 0x39, 0x2c, 0x56, 0x45, 0x27, 0xae, 0x64, 0x1b, 0x4c, 0x9d, 0x90, - 0xd0, 0xef, 0x40, 0x59, 0x45, 0x8f, 0x62, 0x5e, 0x04, 0x5f, 0x52, 0xe0, 0x3d, 0x76, 0x13, 0xcc, - 0x30, 0xfa, 0x53, 0x3b, 0xe4, 0x30, 0x2a, 0xb5, 0xf8, 0x8b, 0xff, 0xab, 0xe7, 0x6d, 0x98, 0x8d, - 0x51, 0xa9, 0xa0, 0x2b, 0x7a, 0x8a, 0x7b, 0x89, 0x22, 0xfb, 0x04, 0xaa, 0x19, 0x1c, 0x3a, 0xb9, - 0x62, 0xd0, 0x98, 0xd6, 0xe0, 0x35, 0x51, 0xac, 0x19, 0xd6, 0xfa, 0x0a, 0x5b, 0x54, 0x55, 0x5f, - 0x09, 0xf8, 0x7a, 0x58, 0xaf, 0xb1, 0xac, 0xb0, 0xb8, 0x1f, 0x41, 0x25, 0xad, 0x4c, 0xe0, 0xb7, - 0x00, 0x62, 0x9b, 0x51, 0xa8, 0xf3, 0xd0, 0x25, 0xcd, 0x60, 0x68, 0xa5, 0x42, 0x5c, 0x84, 0xbf, - 0x03, 0x48, 0x6e, 0x3f, 0xe6, 0xa3, 0xb8, 0x17, 0x34, 0xe1, 0x75, 0x7e, 0x1c, 0x45, 0x76, 0x6e, - 0x13, 0x55, 0x58, 0xa1, 0x19, 0x2a, 0xb0, 0xab, 0x70, 0x59, 0xf0, 0x0f, 0x1e, 0x0a, 0x0f, 0x7a, - 0x1b, 0x50, 0x56, 0xa4, 0x43, 0xb6, 0x60, 0x46, 0xd8, 0x89, 0x0e, 0xa8, 0x43, 0x22, 0x8d, 0xcd, - 0xbf, 0x17, 0xa0, 0xfc, 0x90, 0x44, 0x8f, 0xc3, 0xd5, 0x07, 0x5f, 0x1a, 0x50, 0x52, 0x27, 0x01, - 0x9a, 0xed, 0x60, 0xff, 0xd1, 0x8e, 0x20, 0x73, 0x59, 0x2b, 0x0b, 0xb9, 0xb0, 0xbb, 0x3f, 0xff, - 0xf3, 0xef, 0x6f, 0x17, 0x76, 0xd8, 0xa6, 0x58, 0x97, 0x8e, 0x37, 0xec, 0x81, 0xfb, 0xcc, 0xde, - 0xb0, 0xbe, 0x0f, 0xd3, 0xfa, 0x03, 0x75, 0x8e, 0x5a, 0xad, 0xd6, 0x0b, 0x2b, 0xee, 0xaa, 0x9d, - 0xb8, 0xb3, 0xe3, 0x29, 0xcc, 0x49, 0x33, 0x02, 0xab, 0x02, 0x31, 0x3b, 0x5f, 0xcc, 0x5a, 0x56, - 0x40, 0x3c, 0x3a, 0x82, 0xc7, 0x36, 0xa6, 0x79, 0x04, 0x6e, 0xcc, 0xb2, 0x48, 0x48, 0x58, 0xad, - 0x17, 0xf8, 0xa7, 0x01, 0xf3, 0xca, 0xb0, 0xc0, 0xba, 0xc0, 0xd1, 0x0d, 0x1b, 0xd3, 0xd4, 0x89, - 0x88, 0xc4, 0x63, 0x41, 0xe2, 0x21, 0xde, 0x9c, 0x8a, 0x84, 0xe4, 0x8a, 0xfd, 0x3a, 0x56, 0xd5, - 0x6f, 0x62, 0x11, 0xfe, 0x68, 0x40, 0x49, 0x1d, 0x3e, 0x14, 0x2d, 0xed, 0x44, 0x32, 0x2b, 0xed, - 0x70, 0x07, 0x6d, 0x47, 0x3b, 0x68, 0xfb, 0x5e, 0xb0, 0xa0, 0x46, 0x0e, 0x6a, 0x9d, 0xc5, 0x41, - 0xbf, 0x1b, 0x50, 0x4e, 0xf5, 0x19, 0x94, 0xb3, 0x22, 0x5d, 0x34, 0xe6, 0x8a, 0x5e, 0x48, 0x6e, - 0xba, 0x2f, 0xa8, 0xec, 0xb2, 0x6d, 0x7d, 0xce, 0xa4, 0x1a, 0xb6, 0xf0, 0x54, 0x52, 0xaa, 0x9d, - 0xa4, 0x69, 0xe0, 0x4f, 0x06, 0x5c, 0x92, 0x7b, 0x10, 0xc6, 0xf9, 0x91, 0x61, 0x54, 0xd7, 0x48, - 0x88, 0xce, 0xfb, 0x82, 0xce, 0x2d, 0xdc, 0xd6, 0x79, 0x26, 0x4b, 0x46, 0xe2, 0x12, 0xf8, 0xe6, - 0x2f, 0x03, 0x4a, 0x6a, 0x33, 0xc2, 0x24, 0x45, 0x32, 0xed, 0x8c, 0x8a, 0x49, 0xdf, 0xbd, 0xd8, - 0xe7, 0x82, 0xc9, 0x23, 0x7d, 0x12, 0x17, 0xbb, 0x65, 0xdf, 0xc4, 0x9a, 0xfa, 0x55, 0x22, 0xc3, - 0x5f, 0x0c, 0x28, 0xa7, 0xda, 0x1b, 0xc5, 0x4f, 0xdf, 0xf4, 0x72, 0x93, 0x88, 0x5c, 0xd5, 0x3a, - 0x9b, 0xab, 0x7e, 0x35, 0xa2, 0xbe, 0x29, 0xaf, 0xc5, 0xb8, 0xa6, 0xe9, 0x2f, 0xd2, 0x80, 0x35, - 0x1b, 0xb9, 0x72, 0x72, 0xdb, 0x96, 0x60, 0x75, 0x83, 0xad, 0xe8, 0x4b, 0x28, 0xa4, 0xd3, 0x51, - 0x2f, 0x13, 0xf8, 0x3c, 0xec, 0xc1, 0xca, 0x0d, 0x00, 0x57, 0x33, 0xc5, 0x2d, 0xef, 0x1a, 0xe6, - 0x5a, 0x9e, 0x98, 0x88, 0xbc, 0x2d, 0x88, 0xac, 0x61, 0x21, 0x11, 0x3c, 0x85, 0x72, 0xea, 0xca, - 0x43, 0xc1, 0xd0, 0x5f, 0x9b, 0xa8, 0x98, 0x72, 0x6e, 0x49, 0xac, 0x2d, 0x30, 0x9b, 0x78, 0x65, - 0xba, 0x9e, 0x83, 0xa7, 0x80, 0xd9, 0xab, 0x09, 0xc5, 0x20, 0xf7, 0xce, 0x92, 0x9b, 0x10, 0x84, - 0xde, 0x9a, 0x16, 0xfd, 0xa5, 0x01, 0x0b, 0x9a, 0xdd, 0x15, 0x1b, 0xba, 0x86, 0x21, 0x13, 0x58, - 0xcf, 0x57, 0x20, 0x47, 0xbc, 0x27, 0xa8, 0x58, 0x6c, 0x35, 0xa7, 0x0c, 0x28, 0x0d, 0x52, 0xdb, - 0x68, 0xe0, 0x8f, 0xec, 0xfe, 0x88, 0x6b, 0xd9, 0x32, 0x55, 0x32, 0xa1, 0x91, 0x2b, 0x27, 0x36, - 0xef, 0x08, 0x36, 0x0d, 0x2c, 0x66, 0x13, 0x34, 0xf7, 0x37, 0xd3, 0xab, 0x33, 0xae, 0x64, 0x7a, - 0x95, 0xec, 0x89, 0xd5, 0x1c, 0x29, 0x01, 0x5b, 0x02, 0xf8, 0x1a, 0x5e, 0x9d, 0xb2, 0x87, 0xe0, - 0x0f, 0xb0, 0xa0, 0xd9, 0x6e, 0x29, 0x22, 0xf9, 0x7b, 0x6f, 0x6e, 0x4a, 0x10, 0x81, 0xd6, 0xd4, - 0x04, 0x7a, 0x30, 0x27, 0x6d, 0x53, 0x34, 0xfc, 0xb3, 0xfb, 0x55, 0x2e, 0xe0, 0x5b, 0x02, 0x70, - 0x95, 0x2d, 0xa6, 0x5c, 0x2d, 0x16, 0xa0, 0x4e, 0xb8, 0x72, 0xe1, 0x1f, 0x06, 0x40, 0xb2, 0x4a, - 0x61, 0x25, 0x89, 0x9f, 0xbc, 0x84, 0x99, 0xd5, 0xcc, 0x7b, 0x72, 0xeb, 0x13, 0x01, 0xf2, 0x19, - 0x36, 0x75, 0x20, 0xe9, 0xc3, 0x05, 0xdd, 0x6e, 0x3f, 0x13, 0x02, 0x45, 0x57, 0x9e, 0xaf, 0x1f, - 0xb2, 0xfd, 0xf5, 0xa3, 0xbe, 0xff, 0x6c, 0xd2, 0x6d, 0xf7, 0x9c, 0xa1, 0xf5, 0xcd, 0xa4, 0xcb, - 0x0f, 0x07, 0xce, 0x77, 0xf1, 0x3f, 0x43, 0x81, 0x99, 0xee, 0x8c, 0x38, 0xf5, 0xd6, 0x7f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xa4, 0xaf, 0x9d, 0x9b, 0xc5, 0x12, 0x00, 0x00, + // 1267 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x5b, 0x6f, 0xdc, 0x44, + 0x14, 0x96, 0x13, 0x1a, 0x91, 0x93, 0x66, 0xb7, 0x3d, 0x49, 0x36, 0xbb, 0xce, 0x55, 0x03, 0x24, + 0xe9, 0xa6, 0x5d, 0x37, 0x17, 0x2a, 0xb4, 0x82, 0x88, 0xd0, 0x44, 0x41, 0xa2, 0x15, 0x55, 0x42, + 0x91, 0x48, 0xa9, 0x82, 0x13, 0x26, 0xe9, 0xaa, 0x7b, 0x31, 0x6b, 0x6f, 0xe8, 0x8a, 0x54, 0x5c, + 0xc4, 0x13, 0x2f, 0x7d, 0x40, 0xbc, 0xc0, 0x13, 0xfc, 0x25, 0xfe, 0x02, 0xff, 0x82, 0x17, 0xe4, + 0xf1, 0xb1, 0x3d, 0x63, 0x8f, 0xcd, 0x2a, 0xcd, 0xdb, 0xda, 0xe7, 0xf8, 0x7c, 0xdf, 0x9c, 0xfb, + 0x2c, 0xdc, 0xb4, 0x9d, 0x86, 0xe5, 0xf2, 0xee, 0x79, 0xe3, 0x84, 0xd7, 0x9c, 0x6e, 0xc7, 0xeb, + 0xe0, 0xb0, 0xed, 0x34, 0xcc, 0x71, 0xff, 0xbd, 0xed, 0x34, 0x82, 0x77, 0xe6, 0xec, 0x59, 0xa7, + 0x73, 0xd6, 0xe4, 0x96, 0x78, 0xdb, 0x6e, 0x77, 0x3c, 0xdb, 0x6b, 0x74, 0xda, 0x2e, 0x49, 0x67, + 0x48, 0x2a, 0x9e, 0x8e, 0x7b, 0xa7, 0x16, 0x6f, 0x39, 0x5e, 0x9f, 0x84, 0x0b, 0x49, 0xa1, 0xd7, + 0x68, 0x71, 0xd7, 0xb3, 0x5b, 0x0e, 0x29, 0x2c, 0xb5, 0x9a, 0x47, 0x2d, 0xee, 0xd9, 0x5f, 0xdb, + 0x9e, 0x1d, 0x68, 0x59, 0xe1, 0xe3, 0x91, 0xeb, 0x75, 0xba, 0xc4, 0x8b, 0x3d, 0x81, 0xca, 0xfd, + 0x2e, 0xb7, 0x3d, 0xbe, 0xdd, 0xf5, 0x1a, 0xa7, 0xf6, 0x89, 0xf7, 0x59, 0xdf, 0xe1, 0xfb, 0xfc, + 0x9b, 0x1e, 0x77, 0x3d, 0xdc, 0x82, 0x71, 0x9b, 0x5e, 0x1f, 0x79, 0x7d, 0x87, 0x97, 0x8d, 0x45, + 0x63, 0x65, 0x6c, 0xbd, 0x52, 0x93, 0x8c, 0xd7, 0x94, 0x0f, 0xaf, 0xdb, 0xd2, 0x13, 0xfb, 0x12, + 0x4c, 0x9d, 0x71, 0xd7, 0xe9, 0xb4, 0x5d, 0xfe, 0xda, 0xd6, 0x6f, 0x43, 0x69, 0x8f, 0x7b, 0x3a, + 0xde, 0x08, 0x6f, 0xb4, 0xed, 0x56, 0x60, 0x70, 0x74, 0x5f, 0xfc, 0x66, 0x5f, 0xc0, 0x74, 0x4a, + 0xfb, 0x8a, 0x88, 0x98, 0x50, 0x7e, 0xd0, 0x70, 0x15, 0xdb, 0x2e, 0x51, 0x61, 0x4f, 0xa1, 0xa2, + 0x91, 0x11, 0xf0, 0x87, 0x50, 0x50, 0x80, 0xdd, 0xb2, 0xb1, 0x38, 0x9c, 0x8f, 0x3c, 0x2e, 0x23, + 0xbb, 0xcc, 0x82, 0xca, 0x0e, 0x6f, 0x72, 0x7d, 0xf8, 0x74, 0x6e, 0x38, 0x86, 0x29, 0x35, 0x24, + 0xa1, 0x72, 0x09, 0x46, 0x1c, 0xbb, 0xcb, 0xdb, 0x1e, 0xa9, 0xd3, 0x13, 0xae, 0xc1, 0x9b, 0x21, + 0x64, 0x79, 0x48, 0xf8, 0x65, 0x4a, 0xcb, 0x6e, 0x3f, 0x52, 0x63, 0x9f, 0x40, 0x29, 0x89, 0x41, + 0x07, 0x96, 0x8d, 0x19, 0x83, 0x19, 0x5b, 0x01, 0x94, 0xe2, 0x96, 0x77, 0xb4, 0x8f, 0x61, 0x42, + 0xd1, 0xbc, 0x3c, 0x66, 0x15, 0x26, 0xe5, 0xa0, 0xb9, 0x79, 0xa8, 0x0f, 0x60, 0x2a, 0xa1, 0x4b, + 0xb8, 0x1b, 0x30, 0x1a, 0x1a, 0x0c, 0xe3, 0x9a, 0x01, 0x1c, 0xeb, 0xb1, 0x55, 0x98, 0x52, 0xe3, + 0x99, 0x07, 0x7d, 0x14, 0x96, 0xd7, 0xee, 0x0b, 0x7e, 0xd2, 0xf3, 0x7b, 0x87, 0x1c, 0xfd, 0x6d, + 0x28, 0xf0, 0xf0, 0xbd, 0x9c, 0xd6, 0xa6, 0x42, 0x42, 0xfd, 0x74, 0x9c, 0xcb, 0x8f, 0xec, 0x2b, + 0x98, 0xd1, 0x02, 0xd0, 0x09, 0xaf, 0x00, 0xe1, 0x8e, 0xa8, 0x4a, 0x2d, 0x7f, 0xdd, 0x89, 0x9f, + 0x42, 0x39, 0xad, 0x7e, 0x75, 0x6c, 0x66, 0x82, 0x62, 0x55, 0x74, 0xa2, 0x4a, 0xb6, 0xc1, 0xd4, + 0x09, 0x09, 0xfd, 0x3e, 0x14, 0x55, 0xf4, 0x30, 0xe6, 0x79, 0xf0, 0x05, 0x05, 0xde, 0x65, 0x77, + 0xc1, 0x0c, 0xa2, 0x3f, 0xb0, 0x43, 0x4e, 0xc3, 0x52, 0x8b, 0xbe, 0xf8, 0xbf, 0x7a, 0xde, 0x84, + 0xd1, 0x08, 0x95, 0x0a, 0xba, 0xa4, 0xa7, 0xb8, 0x1f, 0x2b, 0xb2, 0x4f, 0x61, 0x3a, 0x85, 0x43, + 0x27, 0x57, 0x0c, 0x1a, 0x83, 0x1a, 0xbc, 0x25, 0x8a, 0x35, 0xc5, 0x5a, 0x5f, 0x61, 0x93, 0xaa, + 0xea, 0x6b, 0x01, 0xaf, 0x06, 0xf5, 0x1a, 0xc9, 0x72, 0x8b, 0xfb, 0x11, 0x94, 0x92, 0xca, 0x04, + 0x7e, 0x0f, 0x20, 0xb2, 0x19, 0x86, 0x3a, 0x0b, 0x5d, 0xd2, 0xf4, 0x87, 0x56, 0x22, 0xc4, 0x79, + 0xf8, 0x5b, 0x80, 0xe4, 0xf6, 0x73, 0xde, 0x8e, 0x7a, 0xc1, 0x0a, 0x5c, 0xe3, 0xe7, 0x61, 0x64, + 0xc7, 0xd6, 0x51, 0x85, 0x15, 0x9a, 0x81, 0x02, 0x5b, 0x86, 0x9b, 0x82, 0xbf, 0xff, 0x90, 0x7b, + 0xd0, 0x7f, 0x87, 0x00, 0x65, 0x4d, 0x3a, 0x65, 0x15, 0x46, 0x84, 0xa1, 0xf0, 0x84, 0x3a, 0x28, + 0xd2, 0xc0, 0x1d, 0xb9, 0xdf, 0x0d, 0x09, 0xf5, 0xa5, 0x9a, 0xbf, 0xec, 0xa4, 0xed, 0x46, 0xad, + 0xcf, 0xdd, 0x6d, 0x7b, 0xdd, 0xbe, 0xd4, 0x00, 0x71, 0x4f, 0xf1, 0xeb, 0xb0, 0x30, 0xb3, 0x9c, + 0x65, 0x26, 0x8e, 0x4b, 0x60, 0x47, 0xfa, 0xd4, 0x3c, 0x80, 0x82, 0x8a, 0x82, 0x37, 0x60, 0xf8, + 0x39, 0xef, 0x8b, 0x63, 0x0f, 0xef, 0xfb, 0x3f, 0x71, 0x15, 0xae, 0x9d, 0xdb, 0xcd, 0x1e, 0xcf, + 0x1f, 0x6c, 0x81, 0x4e, 0x7d, 0xe8, 0x3d, 0xc3, 0x7c, 0x0c, 0xc5, 0x04, 0xa6, 0xc6, 0xea, 0x6d, + 0xd5, 0x6a, 0x56, 0x56, 0xc4, 0x66, 0xd7, 0xff, 0x9a, 0x80, 0xe2, 0x43, 0xd2, 0x38, 0x08, 0xd6, + 0x46, 0x7c, 0x65, 0x40, 0x41, 0x9d, 0xa2, 0x68, 0x0a, 0x3f, 0x68, 0xc7, 0xb7, 0x39, 0xa3, 0x95, + 0x05, 0x7e, 0x62, 0x3b, 0x3f, 0xfd, 0xfd, 0xcf, 0xaf, 0x43, 0x5b, 0x6c, 0x5d, 0xac, 0x9a, 0xe7, + 0x6b, 0x76, 0xd3, 0x79, 0x66, 0xaf, 0x59, 0xdf, 0x05, 0x2d, 0xe1, 0x03, 0x75, 0x07, 0xb1, 0xaa, + 0xd5, 0x97, 0x56, 0x14, 0x90, 0x7a, 0x34, 0x15, 0xf1, 0x02, 0xc6, 0xa4, 0xf9, 0x8a, 0xd3, 0x02, + 0x31, 0x3d, 0x9b, 0xcd, 0x72, 0x5a, 0x40, 0x3c, 0xea, 0x82, 0xc7, 0x26, 0x26, 0x79, 0xf8, 0x29, + 0x98, 0x66, 0x11, 0x93, 0xb0, 0xaa, 0x2f, 0xf1, 0x0f, 0x03, 0xc6, 0x95, 0x41, 0x8b, 0x95, 0x28, + 0x2d, 0x92, 0x83, 0xda, 0x34, 0x75, 0x22, 0x22, 0x71, 0x20, 0x48, 0x3c, 0xc4, 0xbb, 0x03, 0x91, + 0x90, 0x5c, 0x71, 0x58, 0xc1, 0x69, 0xf5, 0x9b, 0x38, 0x6d, 0x7f, 0x30, 0xa0, 0xa0, 0x0e, 0x6e, + 0x8a, 0x96, 0x76, 0x9a, 0x9b, 0xa5, 0x5a, 0xb0, 0xbf, 0xd7, 0xc2, 0xfd, 0xbd, 0xb6, 0xeb, 0x2f, + 0xf7, 0xa1, 0x83, 0xaa, 0x97, 0x71, 0xd0, 0x6f, 0x06, 0x14, 0x13, 0x3d, 0x1a, 0xe5, 0xac, 0x48, + 0x36, 0x1c, 0x73, 0x56, 0x2f, 0x24, 0x37, 0xed, 0x09, 0x2a, 0xdb, 0x6c, 0x53, 0x9f, 0x33, 0x89, + 0x61, 0x27, 0x3c, 0x15, 0x57, 0x5f, 0x3d, 0x6e, 0xb8, 0xf8, 0xa3, 0x01, 0xd7, 0xe5, 0xfe, 0x8d, + 0x51, 0x7e, 0xa4, 0x18, 0x55, 0x34, 0x12, 0xa2, 0xf3, 0xbe, 0xa0, 0x73, 0x0f, 0x37, 0x75, 0x9e, + 0x49, 0x93, 0x91, 0xb8, 0xf8, 0xbe, 0xf9, 0xd3, 0x80, 0x82, 0xda, 0xc8, 0x31, 0x4e, 0x91, 0xd4, + 0x28, 0xa0, 0x62, 0xd2, 0x77, 0x7e, 0xf6, 0xb9, 0x60, 0xf2, 0x48, 0x9f, 0xc4, 0xf9, 0x6e, 0x39, + 0x34, 0xb1, 0xac, 0x7e, 0x15, 0xcb, 0xf0, 0x67, 0x03, 0x8a, 0x89, 0xd1, 0x40, 0xf1, 0xd3, 0x0f, + 0x8c, 0xcc, 0x24, 0x22, 0x57, 0x55, 0x2f, 0xe7, 0xaa, 0x5f, 0x8c, 0x70, 0xe6, 0xc8, 0x57, 0x0a, + 0x9c, 0xd7, 0xf4, 0x17, 0x69, 0x39, 0x31, 0x17, 0x32, 0xe5, 0xe4, 0xb6, 0x0d, 0xc1, 0xea, 0x0e, + 0x9b, 0xd5, 0x97, 0x50, 0x40, 0xa7, 0xae, 0x5e, 0xc4, 0xf0, 0x45, 0x30, 0xbf, 0x94, 0xdb, 0x13, + 0xce, 0xa5, 0x8a, 0x5b, 0xde, 0xd3, 0xcc, 0xf9, 0x2c, 0x31, 0x11, 0x79, 0x5b, 0x10, 0x99, 0xc7, + 0x5c, 0x22, 0x78, 0x01, 0xc5, 0xc4, 0x75, 0x91, 0x82, 0xa1, 0xbf, 0x72, 0x52, 0x31, 0x65, 0xdc, + 0x30, 0x59, 0x4d, 0x60, 0xae, 0xe0, 0xd2, 0x60, 0x3d, 0x07, 0x2f, 0x00, 0xd3, 0xd7, 0x3a, 0x8a, + 0x41, 0xe6, 0x7d, 0x2f, 0x33, 0x21, 0x08, 0xbd, 0x3a, 0x28, 0xfa, 0x2b, 0x03, 0x26, 0x34, 0x7b, + 0x3f, 0x2e, 0xe8, 0x1a, 0x86, 0x4c, 0x60, 0x31, 0x5b, 0x81, 0x1c, 0xf1, 0xae, 0xa0, 0x62, 0xb1, + 0xb9, 0x8c, 0x32, 0xa0, 0x34, 0x48, 0x6c, 0xf2, 0xbe, 0x3f, 0xd2, 0xbb, 0x37, 0xce, 0xa7, 0xcb, + 0x54, 0xc9, 0x84, 0x85, 0x4c, 0x39, 0xb1, 0x79, 0x47, 0xb0, 0x59, 0xc0, 0x7c, 0x36, 0x7e, 0x73, + 0xbf, 0x91, 0xbc, 0x76, 0xe0, 0x6c, 0xaa, 0x57, 0xc9, 0x9e, 0x98, 0xcb, 0x90, 0x12, 0xb0, 0x25, + 0x80, 0x6f, 0xe1, 0xf2, 0x80, 0x3d, 0x04, 0xbf, 0x87, 0x09, 0xcd, 0xcd, 0x80, 0x22, 0x92, 0x7d, + 0x67, 0xc8, 0x4c, 0x09, 0x22, 0x50, 0x1d, 0x98, 0xc0, 0x09, 0x8c, 0x49, 0x9b, 0x28, 0x0d, 0xff, + 0xf4, 0x6e, 0x9a, 0x09, 0xf8, 0x96, 0x00, 0x9c, 0x63, 0x93, 0x09, 0x57, 0x8b, 0x85, 0xae, 0x1e, + 0xac, 0xab, 0xf8, 0xbb, 0x01, 0x10, 0xaf, 0x79, 0x58, 0x4a, 0xed, 0x7d, 0x01, 0xc6, 0x74, 0xc6, + 0x3e, 0xc8, 0x9e, 0x08, 0x90, 0xc7, 0xb8, 0xa2, 0x03, 0x49, 0x1e, 0xce, 0xef, 0x76, 0x87, 0xa9, + 0x10, 0x28, 0xba, 0xf2, 0x7c, 0xfd, 0x88, 0x1d, 0x2e, 0x9e, 0x35, 0xbc, 0x67, 0xbd, 0xe3, 0xda, + 0x49, 0xa7, 0x65, 0x3d, 0xef, 0x1d, 0xf3, 0xd3, 0x66, 0xe7, 0xdb, 0xe8, 0x5f, 0x35, 0xdf, 0xcc, + 0xf1, 0x88, 0x38, 0xf5, 0xc6, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x83, 0x15, 0xea, 0x01, + 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/service.proto b/api/service.proto index f82eeed92..366619594 100644 --- a/api/service.proto +++ b/api/service.proto @@ -163,6 +163,8 @@ message ListEventsRequest { message ListEventsResponse { repeated ml_metadata.Event events = 1; + map artifacts = 2; + map executions = 3; } service MetadataService { diff --git a/api/service.swagger.json b/api/service.swagger.json index 62857ffd0..b74feb01a 100755 --- a/api/service.swagger.json +++ b/api/service.swagger.json @@ -676,6 +676,18 @@ "$ref": "#/definitions/ml_metadataEvent" }, "collectionFormat": "multi" + }, + "artifacts": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/ml_metadataArtifact" + } + }, + "executions": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/ml_metadataExecution" + } } } }, diff --git a/service/service.go b/service/service.go index 13226984a..70dca7827 100644 --- a/service/service.go +++ b/service/service.go @@ -472,7 +472,55 @@ func (s *Service) ListEvents(ctx context.Context, req *api.ListEventsRequest) (* } events, err = s.store.GetEventsByExecutionIDs([]mlmetadata.ExecutionID{mlmetadata.ExecutionID(id)}) } + artifacts, err := s.getArtifactsInEvents(events) + if err != nil { + return nil, fmt.Errorf("failed to get artifacts in events: %v", err) + } + executions, err := s.getExecutionsInEvents(events) + if err != nil { + return nil, fmt.Errorf("failed to get executions in events: %v", err) + } return &api.ListEventsResponse{ - Events: events, + Events: events, + Artifacts: artifacts, + Executions: executions, }, err } + +func (s *Service) getArtifactsInEvents(events []*mlpb.Event) (map[int64]*mlpb.Artifact, error) { + results := make(map[int64]*mlpb.Artifact) + for _, e := range events { + id := e.GetArtifactId() + if _, exists := results[id]; exists { + continue + } + artifacts, err := s.store.GetArtifactsByID([]mlmetadata.ArtifactID{mlmetadata.ArtifactID(id)}) + if err != nil { + return nil, err + } + if len(artifacts) != 1 { + return nil, fmt.Errorf("internal error: expecting single new Artifact id, got instead : %v", artifacts) + } + results[id] = artifacts[0] + } + return results, nil +} + +func (s *Service) getExecutionsInEvents(events []*mlpb.Event) (map[int64]*mlpb.Execution, error) { + results := make(map[int64]*mlpb.Execution) + for _, e := range events { + id := e.GetExecutionId() + if _, exists := results[id]; exists { + continue + } + executions, err := s.store.GetExecutionsByID([]mlmetadata.ExecutionID{mlmetadata.ExecutionID(id)}) + if err != nil { + return nil, err + } + if len(executions) != 1 { + return nil, fmt.Errorf("internal error: expecting single new execution id, got instead : %v", executions) + } + results[id] = executions[0] + } + return results, nil +} diff --git a/service/service_test.go b/service/service_test.go index e156aa17a..303231945 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -970,7 +970,7 @@ func TestCreateEventsAndList(t *testing.T) { &api.ListEventsRequest{ Name: fmt.Sprintf("artifacts/%d", artifacts[0]), }) - if err != nil || len(resp1.Events) != 2 { + if err != nil || len(resp1.Events) != 2 || len(resp1.GetArtifacts()) != 1 || len(resp1.GetExecutions()) != 2 { t.Fatalf("Expect to find 2 events, but got response %v with err %v\n", resp1, err) } @@ -979,8 +979,8 @@ func TestCreateEventsAndList(t *testing.T) { &api.ListEventsRequest{ Name: fmt.Sprintf("executions/%d", executions[0]), }) - if err != nil || len(resp2.Events) != 2 { - t.Fatalf("Expect to find 2 events, but got response %v with err %v\n", resp1, err) + if err != nil || len(resp2.Events) != 2 || len(resp2.GetArtifacts()) != 2 || len(resp2.GetExecutions()) != 1 { + t.Fatalf("Expect to find 2 events, but got response %v with err %v\n", resp2, err) } }