diff options
author | James Ennis <james.ennis@codethink.co.uk> | 2019-08-13 17:07:57 +0100 |
---|---|---|
committer | James Ennis <james.ennis@codethink.co.uk> | 2019-08-19 12:14:49 +0100 |
commit | 20a636d3fb0422c54acd5783200288dbeecb09cf (patch) | |
tree | aff302f44f0fdab71e5842469ec92ff0b9a7a379 /src/buildstream/_protos/buildstream | |
parent | 5af343359b90dd5a77fbd0fda00e0e1f34ad6ff7 (diff) | |
download | buildstream-20a636d3fb0422c54acd5783200288dbeecb09cf.tar.gz |
artifact.proto: Add the project name to the build dependency information
We also need to store the project name of dependencies in
the proto in order to reconstruct the graph.
This also means that we must include the project name of the
dependencies in the cache key, otherwise the proto and the
cache keys may fall out of sync.
Diffstat (limited to 'src/buildstream/_protos/buildstream')
4 files changed, 98 insertions, 90 deletions
diff --git a/src/buildstream/_protos/buildstream/v2/artifact.proto b/src/buildstream/_protos/buildstream/v2/artifact.proto index d28c8e88e..ead792e15 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact.proto +++ b/src/buildstream/_protos/buildstream/v2/artifact.proto @@ -54,9 +54,10 @@ message Artifact { // Information about the build dependencies message Dependency { - string element_name = 1; - string cache_key = 2; - bool was_workspaced = 3; + string project_name = 1; + string element_name = 2; + string cache_key = 3; + bool was_workspaced = 4; }; repeated Dependency build_deps = 9; diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py index da642ca1c..6ea9c4e10 100644 --- a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py +++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py @@ -22,7 +22,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='buildstream.v2', syntax='proto3', serialized_options=None, - serialized_pb=_b('\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\xde\x04\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\x06 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x07 \x01(\x08\x12\x36\n\x05\x66iles\x18\x08 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x37\n\nbuild_deps\x18\t \x03(\x0b\x32#.buildstream.v2.Artifact.Dependency\x12<\n\x0bpublic_data\x18\n \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12.\n\x04logs\x18\x0b \x03(\x0b\x32 .buildstream.v2.Artifact.LogFile\x12:\n\tbuildtree\x18\x0c \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x1aM\n\nDependency\x12\x14\n\x0c\x65lement_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x03 \x01(\x08\x1aP\n\x07LogFile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x37\n\x06\x64igest\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\">\n\x12GetArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\"m\n\x15UpdateArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12*\n\x08\x61rtifact\x18\x03 \x01(\x0b\x32\x18.buildstream.v2.Artifact2\xb5\x01\n\x0f\x41rtifactService\x12M\n\x0bGetArtifact\x12\".buildstream.v2.GetArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x12S\n\x0eUpdateArtifact\x12%.buildstream.v2.UpdateArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x62\x06proto3') + serialized_pb=_b('\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\xf4\x04\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\x06 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x07 \x01(\x08\x12\x36\n\x05\x66iles\x18\x08 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x37\n\nbuild_deps\x18\t \x03(\x0b\x32#.buildstream.v2.Artifact.Dependency\x12<\n\x0bpublic_data\x18\n \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12.\n\x04logs\x18\x0b \x03(\x0b\x32 .buildstream.v2.Artifact.LogFile\x12:\n\tbuildtree\x18\x0c \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x1a\x63\n\nDependency\x12\x14\n\x0cproject_name\x18\x01 \x01(\t\x12\x14\n\x0c\x65lement_name\x18\x02 \x01(\t\x12\x11\n\tcache_key\x18\x03 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x04 \x01(\x08\x1aP\n\x07LogFile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x37\n\x06\x64igest\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\">\n\x12GetArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\"m\n\x15UpdateArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12*\n\x08\x61rtifact\x18\x03 \x01(\x0b\x32\x18.buildstream.v2.Artifact2\xb5\x01\n\x0f\x41rtifactService\x12M\n\x0bGetArtifact\x12\".buildstream.v2.GetArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x12S\n\x0eUpdateArtifact\x12%.buildstream.v2.UpdateArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x62\x06proto3') , dependencies=[build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2.DESCRIPTOR,google_dot_api_dot_annotations__pb2.DESCRIPTOR,]) @@ -37,22 +37,29 @@ _ARTIFACT_DEPENDENCY = _descriptor.Descriptor( containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='element_name', full_name='buildstream.v2.Artifact.Dependency.element_name', index=0, + name='project_name', full_name='buildstream.v2.Artifact.Dependency.project_name', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='cache_key', full_name='buildstream.v2.Artifact.Dependency.cache_key', index=1, + name='element_name', full_name='buildstream.v2.Artifact.Dependency.element_name', index=1, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='was_workspaced', full_name='buildstream.v2.Artifact.Dependency.was_workspaced', index=2, - number=3, type=8, cpp_type=7, label=1, + name='cache_key', full_name='buildstream.v2.Artifact.Dependency.cache_key', index=2, + number=3, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='was_workspaced', full_name='buildstream.v2.Artifact.Dependency.was_workspaced', index=3, + number=4, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -70,7 +77,7 @@ _ARTIFACT_DEPENDENCY = _descriptor.Descriptor( oneofs=[ ], serialized_start=583, - serialized_end=660, + serialized_end=682, ) _ARTIFACT_LOGFILE = _descriptor.Descriptor( @@ -106,8 +113,8 @@ _ARTIFACT_LOGFILE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=662, - serialized_end=742, + serialized_start=684, + serialized_end=764, ) _ARTIFACT = _descriptor.Descriptor( @@ -214,7 +221,7 @@ _ARTIFACT = _descriptor.Descriptor( oneofs=[ ], serialized_start=136, - serialized_end=742, + serialized_end=764, ) @@ -251,8 +258,8 @@ _GETARTIFACTREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=744, - serialized_end=806, + serialized_start=766, + serialized_end=828, ) @@ -296,8 +303,8 @@ _UPDATEARTIFACTREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=808, - serialized_end=917, + serialized_start=830, + serialized_end=939, ) _ARTIFACT_DEPENDENCY.containing_type = _ARTIFACT @@ -314,41 +321,41 @@ DESCRIPTOR.message_types_by_name['GetArtifactRequest'] = _GETARTIFACTREQUEST DESCRIPTOR.message_types_by_name['UpdateArtifactRequest'] = _UPDATEARTIFACTREQUEST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -Artifact = _reflection.GeneratedProtocolMessageType('Artifact', (_message.Message,), dict( +Artifact = _reflection.GeneratedProtocolMessageType('Artifact', (_message.Message,), { - Dependency = _reflection.GeneratedProtocolMessageType('Dependency', (_message.Message,), dict( - DESCRIPTOR = _ARTIFACT_DEPENDENCY, - __module__ = 'buildstream.v2.artifact_pb2' + 'Dependency' : _reflection.GeneratedProtocolMessageType('Dependency', (_message.Message,), { + 'DESCRIPTOR' : _ARTIFACT_DEPENDENCY, + '__module__' : 'buildstream.v2.artifact_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.Artifact.Dependency) - )) + }) , - LogFile = _reflection.GeneratedProtocolMessageType('LogFile', (_message.Message,), dict( - DESCRIPTOR = _ARTIFACT_LOGFILE, - __module__ = 'buildstream.v2.artifact_pb2' + 'LogFile' : _reflection.GeneratedProtocolMessageType('LogFile', (_message.Message,), { + 'DESCRIPTOR' : _ARTIFACT_LOGFILE, + '__module__' : 'buildstream.v2.artifact_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.Artifact.LogFile) - )) + }) , - DESCRIPTOR = _ARTIFACT, - __module__ = 'buildstream.v2.artifact_pb2' + 'DESCRIPTOR' : _ARTIFACT, + '__module__' : 'buildstream.v2.artifact_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.Artifact) - )) + }) _sym_db.RegisterMessage(Artifact) _sym_db.RegisterMessage(Artifact.Dependency) _sym_db.RegisterMessage(Artifact.LogFile) -GetArtifactRequest = _reflection.GeneratedProtocolMessageType('GetArtifactRequest', (_message.Message,), dict( - DESCRIPTOR = _GETARTIFACTREQUEST, - __module__ = 'buildstream.v2.artifact_pb2' +GetArtifactRequest = _reflection.GeneratedProtocolMessageType('GetArtifactRequest', (_message.Message,), { + 'DESCRIPTOR' : _GETARTIFACTREQUEST, + '__module__' : 'buildstream.v2.artifact_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.GetArtifactRequest) - )) + }) _sym_db.RegisterMessage(GetArtifactRequest) -UpdateArtifactRequest = _reflection.GeneratedProtocolMessageType('UpdateArtifactRequest', (_message.Message,), dict( - DESCRIPTOR = _UPDATEARTIFACTREQUEST, - __module__ = 'buildstream.v2.artifact_pb2' +UpdateArtifactRequest = _reflection.GeneratedProtocolMessageType('UpdateArtifactRequest', (_message.Message,), { + 'DESCRIPTOR' : _UPDATEARTIFACTREQUEST, + '__module__' : 'buildstream.v2.artifact_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateArtifactRequest) - )) + }) _sym_db.RegisterMessage(UpdateArtifactRequest) @@ -359,8 +366,8 @@ _ARTIFACTSERVICE = _descriptor.ServiceDescriptor( file=DESCRIPTOR, index=0, serialized_options=None, - serialized_start=920, - serialized_end=1101, + serialized_start=942, + serialized_end=1123, methods=[ _descriptor.MethodDescriptor( name='GetArtifact', diff --git a/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py index 877cd3011..0b6243a4d 100644 --- a/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py +++ b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py @@ -375,74 +375,74 @@ DESCRIPTOR.message_types_by_name['SourceCapabilities'] = _SOURCECAPABILITIES DESCRIPTOR.message_types_by_name['ServerCapabilities'] = _SERVERCAPABILITIES _sym_db.RegisterFileDescriptor(DESCRIPTOR) -GetReferenceRequest = _reflection.GeneratedProtocolMessageType('GetReferenceRequest', (_message.Message,), dict( - DESCRIPTOR = _GETREFERENCEREQUEST, - __module__ = 'buildstream.v2.buildstream_pb2' +GetReferenceRequest = _reflection.GeneratedProtocolMessageType('GetReferenceRequest', (_message.Message,), { + 'DESCRIPTOR' : _GETREFERENCEREQUEST, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.GetReferenceRequest) - )) + }) _sym_db.RegisterMessage(GetReferenceRequest) -GetReferenceResponse = _reflection.GeneratedProtocolMessageType('GetReferenceResponse', (_message.Message,), dict( - DESCRIPTOR = _GETREFERENCERESPONSE, - __module__ = 'buildstream.v2.buildstream_pb2' +GetReferenceResponse = _reflection.GeneratedProtocolMessageType('GetReferenceResponse', (_message.Message,), { + 'DESCRIPTOR' : _GETREFERENCERESPONSE, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.GetReferenceResponse) - )) + }) _sym_db.RegisterMessage(GetReferenceResponse) -UpdateReferenceRequest = _reflection.GeneratedProtocolMessageType('UpdateReferenceRequest', (_message.Message,), dict( - DESCRIPTOR = _UPDATEREFERENCEREQUEST, - __module__ = 'buildstream.v2.buildstream_pb2' +UpdateReferenceRequest = _reflection.GeneratedProtocolMessageType('UpdateReferenceRequest', (_message.Message,), { + 'DESCRIPTOR' : _UPDATEREFERENCEREQUEST, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateReferenceRequest) - )) + }) _sym_db.RegisterMessage(UpdateReferenceRequest) -UpdateReferenceResponse = _reflection.GeneratedProtocolMessageType('UpdateReferenceResponse', (_message.Message,), dict( - DESCRIPTOR = _UPDATEREFERENCERESPONSE, - __module__ = 'buildstream.v2.buildstream_pb2' +UpdateReferenceResponse = _reflection.GeneratedProtocolMessageType('UpdateReferenceResponse', (_message.Message,), { + 'DESCRIPTOR' : _UPDATEREFERENCERESPONSE, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateReferenceResponse) - )) + }) _sym_db.RegisterMessage(UpdateReferenceResponse) -StatusRequest = _reflection.GeneratedProtocolMessageType('StatusRequest', (_message.Message,), dict( - DESCRIPTOR = _STATUSREQUEST, - __module__ = 'buildstream.v2.buildstream_pb2' +StatusRequest = _reflection.GeneratedProtocolMessageType('StatusRequest', (_message.Message,), { + 'DESCRIPTOR' : _STATUSREQUEST, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.StatusRequest) - )) + }) _sym_db.RegisterMessage(StatusRequest) -StatusResponse = _reflection.GeneratedProtocolMessageType('StatusResponse', (_message.Message,), dict( - DESCRIPTOR = _STATUSRESPONSE, - __module__ = 'buildstream.v2.buildstream_pb2' +StatusResponse = _reflection.GeneratedProtocolMessageType('StatusResponse', (_message.Message,), { + 'DESCRIPTOR' : _STATUSRESPONSE, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.StatusResponse) - )) + }) _sym_db.RegisterMessage(StatusResponse) -GetCapabilitiesRequest = _reflection.GeneratedProtocolMessageType('GetCapabilitiesRequest', (_message.Message,), dict( - DESCRIPTOR = _GETCAPABILITIESREQUEST, - __module__ = 'buildstream.v2.buildstream_pb2' +GetCapabilitiesRequest = _reflection.GeneratedProtocolMessageType('GetCapabilitiesRequest', (_message.Message,), { + 'DESCRIPTOR' : _GETCAPABILITIESREQUEST, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.GetCapabilitiesRequest) - )) + }) _sym_db.RegisterMessage(GetCapabilitiesRequest) -ArtifactCapabilities = _reflection.GeneratedProtocolMessageType('ArtifactCapabilities', (_message.Message,), dict( - DESCRIPTOR = _ARTIFACTCAPABILITIES, - __module__ = 'buildstream.v2.buildstream_pb2' +ArtifactCapabilities = _reflection.GeneratedProtocolMessageType('ArtifactCapabilities', (_message.Message,), { + 'DESCRIPTOR' : _ARTIFACTCAPABILITIES, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.ArtifactCapabilities) - )) + }) _sym_db.RegisterMessage(ArtifactCapabilities) -SourceCapabilities = _reflection.GeneratedProtocolMessageType('SourceCapabilities', (_message.Message,), dict( - DESCRIPTOR = _SOURCECAPABILITIES, - __module__ = 'buildstream.v2.buildstream_pb2' +SourceCapabilities = _reflection.GeneratedProtocolMessageType('SourceCapabilities', (_message.Message,), { + 'DESCRIPTOR' : _SOURCECAPABILITIES, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.SourceCapabilities) - )) + }) _sym_db.RegisterMessage(SourceCapabilities) -ServerCapabilities = _reflection.GeneratedProtocolMessageType('ServerCapabilities', (_message.Message,), dict( - DESCRIPTOR = _SERVERCAPABILITIES, - __module__ = 'buildstream.v2.buildstream_pb2' +ServerCapabilities = _reflection.GeneratedProtocolMessageType('ServerCapabilities', (_message.Message,), { + 'DESCRIPTOR' : _SERVERCAPABILITIES, + '__module__' : 'buildstream.v2.buildstream_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.ServerCapabilities) - )) + }) _sym_db.RegisterMessage(ServerCapabilities) diff --git a/src/buildstream/_protos/buildstream/v2/source_pb2.py b/src/buildstream/_protos/buildstream/v2/source_pb2.py index c91dee0e9..80ecb20e0 100644 --- a/src/buildstream/_protos/buildstream/v2/source_pb2.py +++ b/src/buildstream/_protos/buildstream/v2/source_pb2.py @@ -156,25 +156,25 @@ DESCRIPTOR.message_types_by_name['GetSourceRequest'] = _GETSOURCEREQUEST DESCRIPTOR.message_types_by_name['UpdateSourceRequest'] = _UPDATESOURCEREQUEST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,), dict( - DESCRIPTOR = _SOURCE, - __module__ = 'buildstream.v2.source_pb2' +Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,), { + 'DESCRIPTOR' : _SOURCE, + '__module__' : 'buildstream.v2.source_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.Source) - )) + }) _sym_db.RegisterMessage(Source) -GetSourceRequest = _reflection.GeneratedProtocolMessageType('GetSourceRequest', (_message.Message,), dict( - DESCRIPTOR = _GETSOURCEREQUEST, - __module__ = 'buildstream.v2.source_pb2' +GetSourceRequest = _reflection.GeneratedProtocolMessageType('GetSourceRequest', (_message.Message,), { + 'DESCRIPTOR' : _GETSOURCEREQUEST, + '__module__' : 'buildstream.v2.source_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.GetSourceRequest) - )) + }) _sym_db.RegisterMessage(GetSourceRequest) -UpdateSourceRequest = _reflection.GeneratedProtocolMessageType('UpdateSourceRequest', (_message.Message,), dict( - DESCRIPTOR = _UPDATESOURCEREQUEST, - __module__ = 'buildstream.v2.source_pb2' +UpdateSourceRequest = _reflection.GeneratedProtocolMessageType('UpdateSourceRequest', (_message.Message,), { + 'DESCRIPTOR' : _UPDATESOURCEREQUEST, + '__module__' : 'buildstream.v2.source_pb2' # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateSourceRequest) - )) + }) _sym_db.RegisterMessage(UpdateSourceRequest) |