Upgrade linux protobuf

This commit is contained in:
John Colvin committed 2021-12-12 15:56:55 -05:00
1 parent 79f2f356d5
commit 0f3130fb47
689 files changed
+141922 -132057

No files matched your search

@@ -47,6 +47,9 @@ class ServiceDescriptor;
namespace compiler {
namespace java {
// Indicates how closely the two class names match.
enum NameEquality { NO_MATCH, EXACT_EQUAL, EQUAL_IGNORE_CASE };
// Used to get the Java class related names for a given descriptor. It caches
// the results to avoid redundant calculation across multiple name queries.
// Thread-safety note: This class is *not* thread-safe.
@@ -56,63 +59,88 @@ class ClassNameResolver {
~ClassNameResolver();
// Gets the unqualified outer class name for the file.
string GetFileClassName(const FileDescriptor* file, bool immutable);
std::string GetFileClassName(const FileDescriptor* file, bool immutable);
std::string GetFileClassName(const FileDescriptor* file, bool immutable,
bool kotlin);
// Gets the unqualified immutable outer class name of a file.
string GetFileImmutableClassName(const FileDescriptor* file);
std::string GetFileImmutableClassName(const FileDescriptor* file);
// Gets the unqualified default immutable outer class name of a file
// (converted from the proto file's name).
string GetFileDefaultImmutableClassName(const FileDescriptor* file);
std::string GetFileDefaultImmutableClassName(const FileDescriptor* file);
// Check whether there is any type defined in the proto file that has
// the given class name.
bool HasConflictingClassName(const FileDescriptor* file,
const string& classname);
const std::string& classname,
NameEquality equality_mode);
// Gets the name of the outer class that holds descriptor information.
// Descriptors are shared between immutable messages and mutable messages.
// Since both of them are generated optionally, the descriptors need to be
// put in another common place.
string GetDescriptorClassName(const FileDescriptor* file);
std::string GetDescriptorClassName(const FileDescriptor* file);
// Gets the fully-qualified class name corresponding to the given descriptor.
string GetClassName(const Descriptor* descriptor, bool immutable);
string GetClassName(const EnumDescriptor* descriptor, bool immutable);
string GetClassName(const ServiceDescriptor* descriptor, bool immutable);
string GetClassName(const FileDescriptor* descriptor, bool immutable);
std::string GetClassName(const Descriptor* descriptor, bool immutable);
std::string GetClassName(const Descriptor* descriptor, bool immutable,
bool kotlin);
std::string GetClassName(const EnumDescriptor* descriptor, bool immutable);
std::string GetClassName(const EnumDescriptor* descriptor, bool immutable,
bool kotlin);
std::string GetClassName(const ServiceDescriptor* descriptor, bool immutable);
std::string GetClassName(const ServiceDescriptor* descriptor, bool immutable,
bool kotlin);
std::string GetClassName(const FileDescriptor* descriptor, bool immutable);
std::string GetClassName(const FileDescriptor* descriptor, bool immutable,
bool kotlin);
template<class DescriptorType>
string GetImmutableClassName(const DescriptorType* descriptor) {
template <class DescriptorType>
std::string GetImmutableClassName(const DescriptorType* descriptor) {
return GetClassName(descriptor, true);
}
template<class DescriptorType>
string GetMutableClassName(const DescriptorType* descriptor) {
template <class DescriptorType>
std::string GetMutableClassName(const DescriptorType* descriptor) {
return GetClassName(descriptor, false);
}
// Gets the fully qualified name of an extension identifier.
string GetExtensionIdentifierName(const FieldDescriptor* descriptor,
bool immutable);
std::string GetExtensionIdentifierName(const FieldDescriptor* descriptor,
bool immutable);
std::string GetExtensionIdentifierName(const FieldDescriptor* descriptor,
bool immutable, bool kotlin);
// Gets the fully qualified name for generated classes in Java convention.
// Nested classes will be separated using '$' instead of '.'
// For example:
// com.package.OuterClass$OuterMessage$InnerMessage
string GetJavaImmutableClassName(const Descriptor* descriptor);
string GetJavaImmutableClassName(const EnumDescriptor* descriptor);
std::string GetJavaImmutableClassName(const Descriptor* descriptor);
std::string GetJavaImmutableClassName(const EnumDescriptor* descriptor);
std::string GetKotlinFactoryName(const Descriptor* descriptor);
std::string GetKotlinExtensionsClassName(const Descriptor* descriptor);
std::string GetJavaMutableClassName(const Descriptor* descriptor);
std::string GetJavaMutableClassName(const EnumDescriptor* descriptor);
// Gets the outer class and the actual class for downgraded mutable messages.
std::string GetDowngradedFileClassName(const FileDescriptor* file);
std::string GetDowngradedClassName(const Descriptor* descriptor);
private:
// Get the full name of a Java class by prepending the Java package name
// or outer class name.
string GetClassFullName(const string& name_without_package,
const FileDescriptor* file,
bool immutable,
bool multiple_files);
std::string GetClassFullName(const std::string& name_without_package,
const FileDescriptor* file, bool immutable,
bool is_own_file);
std::string GetClassFullName(const std::string& name_without_package,
const FileDescriptor* file, bool immutable,
bool is_own_file, bool kotlin);
// Get the Java Class style full name of a message.
string GetJavaClassFullName(
const string& name_without_package,
const FileDescriptor* file,
bool immutable);
std::string GetJavaClassFullName(const std::string& name_without_package,
const FileDescriptor* file, bool immutable);
std::string GetJavaClassFullName(const std::string& name_without_package,
const FileDescriptor* file, bool immutable,
bool kotlin);
// Caches the result to provide better performance.
std::map<const FileDescriptor*, string> file_immutable_outer_class_names_;
std::map<const FileDescriptor*, std::string>
file_immutable_outer_class_names_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ClassNameResolver);
};
@@ -120,6 +148,6 @@ class ClassNameResolver {
} // namespace java
} // namespace compiler
} // namespace protobuf
} // namespace google
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_NAME_RESOLVER_H__