Skip to content

Commit

Permalink
Implement a retain_options flag in protoc.
Browse files Browse the repository at this point in the history 
This will allow users to force the retention of RETENTION_SOURCE options, which get stripped out by default.

PiperOrigin-RevId: 520555632
  • Loading branch information
@mkruskal-google @copybara-github
mkruskal-google authored and copybara-github committed Mar 30, 2023
1 parent 4ee65df commit 83507c7
Show file tree
Hide file tree
Showing 3 changed files with 124 additions and 50 deletions.
116 changes: 81 additions & 35 deletions src/google/protobuf/compiler/command_line_interface.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,55 @@ std::string PluginName(absl::string_view plugin_prefix,
directive.substr(2, directive.size() - 6));
}


// Get all transitive dependencies of the given file (including the file
// itself), adding them to the given list of FileDescriptorProtos. The
// protos will be ordered such that every file is listed before any file that
// depends on it, so that you can call DescriptorPool::BuildFile() on them
// in order. Any files in *already_seen will not be added, and each file
// added will be inserted into *already_seen. If include_source_code_info is
// true then include the source code information in the FileDescriptorProtos.
// If include_json_name is true, populate the json_name field of
// FieldDescriptorProto for all fields.
struct TransitiveDependencyOptions {
bool include_json_name = false;
bool include_source_code_info = false;
bool retain_options = false;
};

void GetTransitiveDependencies(
const FileDescriptor* file,
absl::flat_hash_set<const FileDescriptor*>* already_seen,
RepeatedPtrField<FileDescriptorProto>* output,
const TransitiveDependencyOptions& options =
TransitiveDependencyOptions()) {
if (!already_seen->insert(file).second) {
// Already saw this file. Skip.
return;
}

// Add all dependencies.
for (int i = 0; i < file->dependency_count(); i++) {
GetTransitiveDependencies(file->dependency(i), already_seen, output,
options);
}

// Add this file.
FileDescriptorProto* new_descriptor = output->Add();
if (options.retain_options) {
file->CopyTo(new_descriptor);
if (options.include_source_code_info) {
file->CopySourceCodeInfoTo(new_descriptor);
}
} else {
*new_descriptor =
StripSourceRetentionOptions(*file, options.include_source_code_info);
}
if (options.include_json_name) {
file->CopyJsonNameTo(new_descriptor);
}
}

} // namespace

// A MultiFileErrorCollector that prints errors to stderr.
Expand Down Expand Up @@ -1454,6 +1503,7 @@ void CommandLineInterface::Clear() {
print_mode_ = PRINT_NONE;
imports_in_descriptor_set_ = false;
source_info_in_descriptor_set_ = false;
retain_options_in_descriptor_set_ = false;
disallow_services_ = false;
direct_dependencies_explicitly_set_ = false;
deterministic_output_ = false;
Expand Down Expand Up @@ -1709,6 +1759,11 @@ CommandLineInterface::ParseArgumentStatus CommandLineInterface::ParseArguments(
"--descriptor_set_out."
<< std::endl;
}
if (retain_options_in_descriptor_set_ && descriptor_set_out_name_.empty()) {
std::cerr << "--retain_options only makes sense when combined with "
"--descriptor_set_out."
<< std::endl;
}

return PARSE_ARGUMENT_DONE_AND_CONTINUE;
}
Expand Down Expand Up @@ -1759,7 +1814,8 @@ bool CommandLineInterface::ParseArgument(const char* arg, std::string* name,

if (*name == "-h" || *name == "--help" || *name == "--disallow_services" ||
*name == "--include_imports" || *name == "--include_source_info" ||
*name == "--version" || *name == "--decode_raw" ||
*name == "--retain_options" || *name == "--version" ||
*name == "--decode_raw" ||
*name == "--print_free_field_numbers" ||
*name == "--experimental_allow_proto3_optional" ||
*name == "--deterministic_output" || *name == "--fatal_warnings") {
Expand Down Expand Up @@ -1954,6 +2010,13 @@ CommandLineInterface::InterpretArgument(const std::string& name,
}
source_info_in_descriptor_set_ = true;

} else if (name == "--retain_options") {
if (retain_options_in_descriptor_set_) {
std::cerr << name << " may only be passed once." << std::endl;
return PARSE_ARGUMENT_FAIL;
}
retain_options_in_descriptor_set_ = true;

} else if (name == "-h" || name == "--help") {
PrintHelpText();
return PARSE_ARGUMENT_DONE_AND_EXIT; // Exit without running compiler.
Expand Down Expand Up @@ -2190,6 +2253,11 @@ Parse PROTO_FILES and generate output based on the options given:
include information about the original
location of each decl in the source file as
well as surrounding comments.
--retain_options When using --descriptor_set_out, do not strip
any options from the FileDescriptorProto.
This results in potentially larger descriptors
that include information about options that were
only meant to be useful during compilation.
--dependency_out=FILE Write a dependency output file in the format
expected by make. This writes the transitive
set of input file paths to FILE
Expand Down Expand Up @@ -2328,7 +2396,7 @@ bool CommandLineInterface::GenerateDependencyManifestFile(

absl::flat_hash_set<const FileDescriptor*> already_seen;
for (int i = 0; i < parsed_files.size(); i++) {
GetTransitiveDependencies(parsed_files[i], false, false, &already_seen,
GetTransitiveDependencies(parsed_files[i], &already_seen,
file_set.mutable_file());
}

Expand Down Expand Up @@ -2410,10 +2478,11 @@ bool CommandLineInterface::GeneratePluginOutput(
absl::flat_hash_set<const FileDescriptor*> already_seen;
for (int i = 0; i < parsed_files.size(); i++) {
request.add_file_to_generate(parsed_files[i]->name());
GetTransitiveDependencies(parsed_files[i],
true, // Include json_name for plugins.
true, // Include source code info.
&already_seen, request.mutable_proto_file());
GetTransitiveDependencies(parsed_files[i], &already_seen,
request.mutable_proto_file(),
{/*.include_json_name =*/true,
/*.include_source_code_info =*/true,
/*.retain_options =*/true});
}

google::protobuf::compiler::Version* version =
Expand Down Expand Up @@ -2575,11 +2644,13 @@ bool CommandLineInterface::WriteDescriptorSet(
}
}
}
TransitiveDependencyOptions options;
options.include_json_name = true;
options.include_source_code_info = source_info_in_descriptor_set_;
options.retain_options = retain_options_in_descriptor_set_;
for (int i = 0; i < parsed_files.size(); i++) {
GetTransitiveDependencies(parsed_files[i],
true, // Include json_name
source_info_in_descriptor_set_, &already_seen,
file_set.mutable_file());
GetTransitiveDependencies(parsed_files[i], &already_seen,
file_set.mutable_file(), options);
}

int fd;
Expand Down Expand Up @@ -2617,31 +2688,6 @@ bool CommandLineInterface::WriteDescriptorSet(
return true;
}

void CommandLineInterface::GetTransitiveDependencies(
const FileDescriptor* file, bool include_json_name,
bool include_source_code_info,
absl::flat_hash_set<const FileDescriptor*>* already_seen,
RepeatedPtrField<FileDescriptorProto>* output) {
if (!already_seen->insert(file).second) {
// Already saw this file. Skip.
return;
}

// Add all dependencies.
for (int i = 0; i < file->dependency_count(); i++) {
GetTransitiveDependencies(file->dependency(i), include_json_name,
include_source_code_info, already_seen, output);
}

// Add this file.
FileDescriptorProto* new_descriptor = output->Add();
*new_descriptor =
StripSourceRetentionOptions(*file, include_source_code_info);
if (include_json_name) {
file->CopyJsonNameTo(new_descriptor);
}
}

const CommandLineInterface::GeneratorInfo*
CommandLineInterface::FindGeneratorByFlag(const std::string& name) const {
auto it = generators_by_flag_name_.find(name);
Expand Down
20 changes: 5 additions & 15 deletions src/google/protobuf/compiler/command_line_interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,21 +309,6 @@ class PROTOC_EXPORT CommandLineInterface {
const GeneratorContextMap& output_directories,
DiskSourceTree* source_tree);

// Get all transitive dependencies of the given file (including the file
// itself), adding them to the given list of FileDescriptorProtos. The
// protos will be ordered such that every file is listed before any file that
// depends on it, so that you can call DescriptorPool::BuildFile() on them
// in order. Any files in *already_seen will not be added, and each file
// added will be inserted into *already_seen. If include_source_code_info is
// true then include the source code information in the FileDescriptorProtos.
// If include_json_name is true, populate the json_name field of
// FieldDescriptorProto for all fields.
static void GetTransitiveDependencies(
const FileDescriptor* file, bool include_json_name,
bool include_source_code_info,
absl::flat_hash_set<const FileDescriptor*>* already_seen,
RepeatedPtrField<FileDescriptorProto>* output);

// Implements the --print_free_field_numbers. This function prints free field
// numbers into stdout for the message and it's nested message types in
// post-order, i.e. nested types first. Printed range are left-right
Expand Down Expand Up @@ -452,6 +437,11 @@ class PROTOC_EXPORT CommandLineInterface {
// SourceCodeInfo from the DescriptorSet.
bool source_info_in_descriptor_set_ = false;

// True if --retain_options was given, meaning that we shouldn't strip any
// options from the DescriptorSet, even if they have RETENTION_SOURCE
// specified.
bool retain_options_in_descriptor_set_ = false;

// Was the --disallow_services flag used?
bool disallow_services_ = false;

Expand Down
38 changes: 38 additions & 0 deletions src/google/protobuf/compiler/command_line_interface_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1731,6 +1731,44 @@ TEST_F(CommandLineInterfaceTest, DescriptorSetOptionRetention) {
EXPECT_EQ(unknown_fields.field(0).varint(), 2);
}

TEST_F(CommandLineInterfaceTest, DescriptorSetOptionRetentionOverride) {
// clang-format off
CreateTempFile(
"foo.proto",
absl::Substitute(R"pb(
syntax = "proto2";
import "$0";
extend google.protobuf.FileOptions {
optional int32 runtime_retention_option = 50001
[retention = RETENTION_RUNTIME];
optional int32 source_retention_option = 50002
[retention = RETENTION_SOURCE];
}
option (runtime_retention_option) = 2;
option (source_retention_option) = 3;)pb",
DescriptorProto::descriptor()->file()->name()));
// clang-format on
std::string descriptor_proto_base_dir = "src";
Run(absl::Substitute(
"protocol_compiler --descriptor_set_out=$$tmpdir/descriptor_set "
"--proto_path=$$tmpdir --retain_options --proto_path=$0 foo.proto",
descriptor_proto_base_dir));
ExpectNoErrors();

FileDescriptorSet descriptor_set;
ReadDescriptorSet("descriptor_set", &descriptor_set);
ASSERT_EQ(descriptor_set.file_size(), 1);
const UnknownFieldSet& unknown_fields =
descriptor_set.file(0).options().unknown_fields();

// We expect all options to be present.
ASSERT_EQ(unknown_fields.field_count(), 2);
EXPECT_EQ(unknown_fields.field(0).number(), 50001);
EXPECT_EQ(unknown_fields.field(1).number(), 50002);
EXPECT_EQ(unknown_fields.field(0).varint(), 2);
EXPECT_EQ(unknown_fields.field(1).varint(), 3);
}

#ifdef _WIN32
// TODO(teboring): Figure out how to write test on windows.
#else
Expand Down

0 comments on commit 83507c7

Please sign in to comment.