reflect/protoregistry: assume unique proto file path
Previously, we liberally permitted mutiple files to be registered that
have the same path. However, doing so causes complexity in various places
that need to assume that file paths are unique. Since unique paths are
the intention of the proto language, we strictly enforce that now.
Change-Id: Ie8fdd57c824c9809a51859cf20c4bc477b6871be
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/182497
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/reflect/protodesc/protodesc.go b/reflect/protodesc/protodesc.go
index 2ee40ca..4135ade 100644
--- a/reflect/protodesc/protodesc.go
+++ b/reflect/protodesc/protodesc.go
@@ -73,19 +73,12 @@
f.Imports[i].IsWeak = true
}
for i, path := range fd.GetDependency() {
- var n int
imp := &f.Imports[i]
- r.RangeFilesByPath(path, func(fd protoreflect.FileDescriptor) bool {
- imp.FileDescriptor = fd
- n++
- return true
- })
- if n > 1 {
- return nil, errors.New("duplicate files for import %q", path)
+ fd, err := r.FindFileByPath(path)
+ if err != nil {
+ fd = prototype.PlaceholderFile(path, "")
}
- if imp.IsWeak || imp.FileDescriptor == nil {
- imp.FileDescriptor = prototype.PlaceholderFile(path, "")
- }
+ imp.FileDescriptor = fd
}
imps := importedFiles(f.Imports)